Amebis/wxWidgets
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Fixing some demos to look and act better

Browse Source 
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@10848 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
This commit is contained in:
Robin Dunn
2001-07-05 17:27:59 +00:00
parent 8cd3898690
commit b166c70307
8 changed files with 54 additions and 29 deletions
Download Patch File Download Diff File Expand all files Collapse all files

18
wxPython/demo/ColourDB.py
View File

@@ -60,6 +60,8 @@ class TestWindow(wxScrolledWindow):
dc = evt.GetDC() dc = evt.GetDC()
if not dc: if not dc:
dc = wxClientDC(self) dc = wxClientDC(self)
rect = self.GetUpdateRegion().GetBox()
dc.SetClippingRegion(rect.x, rect.y, rect.width, rect.height)
self.TileBackground(dc) self.TileBackground(dc)
@@ -86,7 +88,7 @@ class TestWindow(wxScrolledWindow):
stop = pixStop / self.lineHeight stop = pixStop / self.lineHeight
else: else:
start = 0 start = 0
stop = len(numColours) stop = numColours
for line in range(max(0,start), min(stop,numColours)): for line in range(max(0,start), min(stop,numColours)):
clr = colours[line] clr = colours[line]
@@ -100,12 +102,24 @@ class TestWindow(wxScrolledWindow):
dc.EndDrawing() dc.EndDrawing()
# On wxGTK there needs to be a panel under wxScrolledWindows if they are
# going to be in a wxNotebook...
class TestPanel(wxPanel):
def __init__(self, parent):
wxPanel.__init__(self, parent, -1)
self.win = TestWindow(self)
EVT_SIZE(self, self.OnSize)
def OnSize(self, evt):
self.win.SetSize(evt.GetSize())
#---------------------------------------------------------------------- #----------------------------------------------------------------------
def runTest(frame, nb, log): def runTest(frame, nb, log):
win = TestWindow(nb) win = TestPanel(nb)
return win return win
#---------------------------------------------------------------------- #----------------------------------------------------------------------

4
wxPython/demo/GridSimple.py
View File

@@ -4,10 +4,10 @@ from wxPython.lib.mixins.grid import wxGridAutoEditMixin
#--------------------------------------------------------------------------- #---------------------------------------------------------------------------
class SimpleGrid(wxGrid, wxGridAutoEditMixin): class SimpleGrid(wxGrid): ##, wxGridAutoEditMixin):
def __init__(self, parent, log): def __init__(self, parent, log):
wxGrid.__init__(self, parent, -1) wxGrid.__init__(self, parent, -1)
wxGridAutoEditMixin.__init__(self) ##wxGridAutoEditMixin.__init__(self)
self.log = log self.log = log
self.moveTo = None self.moveTo = None

3
wxPython/demo/GridStdEdRend.py
View File

@@ -146,8 +146,7 @@ Renderers used together.
self.SetColAttr(edCol, attr) self.SetColAttr(edCol, attr)
# There is a bug in wxGTK for this method... # There is a bug in wxGTK for this method...
if wxPlatform != '__WXGTK__': self.AutoSizeColumns(true)
self.AutoSizeColumns(true)
self.AutoSizeRows(true) self.AutoSizeRows(true)
EVT_GRID_CELL_LEFT_DCLICK(self, self.OnLeftDClick) EVT_GRID_CELL_LEFT_DCLICK(self, self.OnLeftDClick)

4
wxPython/demo/wxDragImage.py
View File

@@ -138,12 +138,12 @@ class DragCanvas(wxScrolledWindow):
dc.DestroyClippingRegion() dc.DestroyClippingRegion()
def OnEraseBackground(self, evt): def OnEraseBackground(self, evt):
dc = evt.GetDC() dc = evt.GetDC()
if not dc: if not dc:
dc = wxClientDC(self) dc = wxClientDC(self)
rect = self.GetUpdateRegion().GetBox()
dc.SetClippingRegion(rect.x, rect.y, rect.width, rect.height)
self.TileBackground(dc) self.TileBackground(dc)

2
wxPython/demo/wxFrame.py
View File

@@ -25,7 +25,7 @@ class MyFrame(wxFrame):
def runTest(frame, nb, log): def runTest(frame, nb, log):
win = MyFrame(frame, -1, "This is a wxFrame", size=(350, 200), win = MyFrame(frame, -1, "This is a wxFrame", size=(350, 200),
style = wxDEFAULT_FRAME_STYLE | wxFRAME_TOOL_WINDOW ) style = wxDEFAULT_FRAME_STYLE)# | wxFRAME_TOOL_WINDOW )
frame.otherWin = win frame.otherWin = win
win.Show(true) win.Show(true)

12
wxPython/demo/wxMask.py
View File

@@ -91,12 +91,22 @@ class TestMaskWindow(wxScrolledWindow):
i = i + 1 i = i + 1
# On wxGTK there needs to be a panel under wxScrolledWindows if they are
# going to be in a wxNotebook...
class TestPanel(wxPanel):
def __init__(self, parent, ID):
wxPanel.__init__(self, parent, ID)
self.win = TestMaskWindow(self)
EVT_SIZE(self, self.OnSize)
def OnSize(self, evt):
self.win.SetSize(evt.GetSize())
#---------------------------------------------------------------------- #----------------------------------------------------------------------
def runTest(frame, nb, log): def runTest(frame, nb, log):
win = TestMaskWindow(nb) win = TestPanel(nb, -1)
return win return win
#---------------------------------------------------------------------- #----------------------------------------------------------------------

32
wxPython/demo/wxStyledTextCtrl_2.py
View File

@@ -29,8 +29,8 @@ else:
'mono' : 'Courier', 'mono' : 'Courier',
'helv' : 'Helvetica', 'helv' : 'Helvetica',
'other': 'new century schoolbook', 'other': 'new century schoolbook',
'size' : 11, 'size' : 13,
'size2': 9, 'size2': 11,
} }
@@ -85,33 +85,33 @@ class PythonSTC(wxStyledTextCtrl):
# Python styles # Python styles
# White space # White space
self.StyleSetSpec(wxSTC_P_DEFAULT, "fore:#808080") self.StyleSetSpec(wxSTC_P_DEFAULT, "fore:#808080,face:%(helv)s,size:%(size)d" % faces)
# Comment # Comment
self.StyleSetSpec(wxSTC_P_COMMENTLINE, "fore:#007F00,face:%(other)s" % faces) self.StyleSetSpec(wxSTC_P_COMMENTLINE, "fore:#007F00,face:%(other)s,size:%(size)d" % faces)
# Number # Number
self.StyleSetSpec(wxSTC_P_NUMBER, "fore:#007F7F") self.StyleSetSpec(wxSTC_P_NUMBER, "fore:#007F7F,size:%(size)d" % faces)
# String # String
self.StyleSetSpec(wxSTC_P_STRING, "fore:#7F007F,italic,face:%(times)s" % faces) self.StyleSetSpec(wxSTC_P_STRING, "fore:#7F007F,italic,face:%(times)s,size:%(size)d" % faces)
# Single quoted string # Single quoted string
self.StyleSetSpec(wxSTC_P_CHARACTER, "fore:#7F007F,italic,face:%(times)s" % faces) self.StyleSetSpec(wxSTC_P_CHARACTER, "fore:#7F007F,italic,face:%(times)s,size:%(size)d" % faces)
# Keyword # Keyword
self.StyleSetSpec(wxSTC_P_WORD, "fore:#00007F,bold") self.StyleSetSpec(wxSTC_P_WORD, "fore:#00007F,bold,size:%(size)d" % faces)
# Triple quotes # Triple quotes
self.StyleSetSpec(wxSTC_P_TRIPLE, "fore:#7F0000") self.StyleSetSpec(wxSTC_P_TRIPLE, "fore:#7F0000,size:%(size)d" % faces)
# Triple double quotes # Triple double quotes
self.StyleSetSpec(wxSTC_P_TRIPLEDOUBLE, "fore:#7F0000") self.StyleSetSpec(wxSTC_P_TRIPLEDOUBLE, "fore:#7F0000,size:%(size)d" % faces)
# Class name definition # Class name definition
self.StyleSetSpec(wxSTC_P_CLASSNAME, "fore:#0000FF,bold,underline") self.StyleSetSpec(wxSTC_P_CLASSNAME, "fore:#0000FF,bold,underline,size:%(size)d" % faces)
# Function or method name definition # Function or method name definition
self.StyleSetSpec(wxSTC_P_DEFNAME, "fore:#007F7F,bold") self.StyleSetSpec(wxSTC_P_DEFNAME, "fore:#007F7F,bold,size:%(size)d" % faces)
# Operators # Operators
self.StyleSetSpec(wxSTC_P_OPERATOR, "bold") self.StyleSetSpec(wxSTC_P_OPERATOR, "bold,size:%(size)d" % faces)
# Identifiers # Identifiers
#self.StyleSetSpec(wxSTC_P_IDENTIFIER, "bold")#,fore:#FF00FF") self.StyleSetSpec(wxSTC_P_IDENTIFIER, "fore:#808080,face:%(helv)s,size:%(size)d" % faces)
# Comment-blocks # Comment-blocks
self.StyleSetSpec(wxSTC_P_COMMENTBLOCK, "fore:#7F7F7F") self.StyleSetSpec(wxSTC_P_COMMENTBLOCK, "fore:#7F7F7F,size:%(size)d" % faces)
# End of line where string is not closed # End of line where string is not closed
self.StyleSetSpec(wxSTC_P_STRINGEOL, "fore:#000000,face:%(mono)s,back:#E0C0E0,eolfilled" % faces) self.StyleSetSpec(wxSTC_P_STRINGEOL, "fore:#000000,face:%(mono)s,back:#E0C0E0,eolfilled,size:%(size)d" % faces)
self.SetCaretForeground("BLUE") self.SetCaretForeground("BLUE")

8
wxPython/setup.py
View File

@@ -16,7 +16,7 @@ from my_distutils import run_swig, contrib_copy_tree
VERSION = "2.3.1" VERSION = "2.3.1"
DESCRIPTION = "Cross platform GUI toolkit for Python" DESCRIPTION = "Cross platform GUI toolkit for Python"
AUTHOR = "Robin Dunn" AUTHOR = "Robin Dunn"
AUTHOR_EMAIL = "robin@alldunn.com" AUTHOR_EMAIL = "Robin Dunn <robin@alldunn.com>"
URL = "http://wxPython.org/" URL = "http://wxPython.org/"
LICENCE = "wxWindows (LGPL derivative)" LICENCE = "wxWindows (LGPL derivative)"
LONG_DESCRIPTION = """\ LONG_DESCRIPTION = """\
@@ -91,8 +91,9 @@ if bcpp_compiling:
# Check for build flags on the command line # Check for build flags on the command line
#---------------------------------------------------------------------- #----------------------------------------------------------------------
for flag in ['BUILD_GLCANVAS', 'BUILD_OGL', 'BUILD_STC', 'CORE_ONLY', for flag in ['BUILD_GLCANVAS', 'BUILD_OGL', 'BUILD_STC', 'BUILD_XRC',
'USE_SWIG', 'IN_CVS_TREE', 'FINAL', 'HYBRID', ]: 'CORE_ONLY', 'USE_SWIG', 'IN_CVS_TREE',
'FINAL', 'HYBRID', ]:
for x in range(len(sys.argv)): for x in range(len(sys.argv)):
if string.find(sys.argv[x], flag) == 0: if string.find(sys.argv[x], flag) == 0:
pos = string.find(sys.argv[x], '=') + 1 pos = string.find(sys.argv[x], '=') + 1
@@ -115,6 +116,7 @@ if CORE_ONLY:
BUILD_GLCANVAS = 0 BUILD_GLCANVAS = 0
BUILD_OGL = 0 BUILD_OGL = 0
BUILD_STC = 0 BUILD_STC = 0
BUILD_XRC = 0
#---------------------------------------------------------------------- #----------------------------------------------------------------------
# Setup some platform specific stuff # Setup some platform specific stuff