From b166c70307f14952b3844837c98602425020e1c5 Mon Sep 17 00:00:00 2001 From: Robin Dunn Date: Thu, 5 Jul 2001 17:27:59 +0000 Subject: [PATCH] Fixing some demos to look and act better git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@10848 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775 --- wxPython/demo/ColourDB.py | 18 ++++++++++++++-- wxPython/demo/GridSimple.py | 4 ++-- wxPython/demo/GridStdEdRend.py | 3 +-- wxPython/demo/wxDragImage.py | 4 ++-- wxPython/demo/wxFrame.py | 2 +- wxPython/demo/wxMask.py | 12 ++++++++++- wxPython/demo/wxStyledTextCtrl_2.py | 32 ++++++++++++++--------------- wxPython/setup.py | 8 +++++--- 8 files changed, 54 insertions(+), 29 deletions(-) diff --git a/wxPython/demo/ColourDB.py b/wxPython/demo/ColourDB.py index 1f0978818d..9187807513 100644 --- a/wxPython/demo/ColourDB.py +++ b/wxPython/demo/ColourDB.py @@ -60,6 +60,8 @@ class TestWindow(wxScrolledWindow): dc = evt.GetDC() if not dc: dc = wxClientDC(self) + rect = self.GetUpdateRegion().GetBox() + dc.SetClippingRegion(rect.x, rect.y, rect.width, rect.height) self.TileBackground(dc) @@ -86,7 +88,7 @@ class TestWindow(wxScrolledWindow): stop = pixStop / self.lineHeight else: start = 0 - stop = len(numColours) + stop = numColours for line in range(max(0,start), min(stop,numColours)): clr = colours[line] @@ -100,12 +102,24 @@ class TestWindow(wxScrolledWindow): 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): - win = TestWindow(nb) + win = TestPanel(nb) return win #---------------------------------------------------------------------- diff --git a/wxPython/demo/GridSimple.py b/wxPython/demo/GridSimple.py index 96a4a200f5..c073d48932 100644 --- a/wxPython/demo/GridSimple.py +++ b/wxPython/demo/GridSimple.py @@ -4,10 +4,10 @@ from wxPython.lib.mixins.grid import wxGridAutoEditMixin #--------------------------------------------------------------------------- -class SimpleGrid(wxGrid, wxGridAutoEditMixin): +class SimpleGrid(wxGrid): ##, wxGridAutoEditMixin): def __init__(self, parent, log): wxGrid.__init__(self, parent, -1) - wxGridAutoEditMixin.__init__(self) + ##wxGridAutoEditMixin.__init__(self) self.log = log self.moveTo = None diff --git a/wxPython/demo/GridStdEdRend.py b/wxPython/demo/GridStdEdRend.py index 5ad7c752d5..b4a3db3c36 100644 --- a/wxPython/demo/GridStdEdRend.py +++ b/wxPython/demo/GridStdEdRend.py @@ -146,8 +146,7 @@ Renderers used together. self.SetColAttr(edCol, attr) # There is a bug in wxGTK for this method... - if wxPlatform != '__WXGTK__': - self.AutoSizeColumns(true) + self.AutoSizeColumns(true) self.AutoSizeRows(true) EVT_GRID_CELL_LEFT_DCLICK(self, self.OnLeftDClick) diff --git a/wxPython/demo/wxDragImage.py b/wxPython/demo/wxDragImage.py index d4124ae7fd..d53fb4c67b 100644 --- a/wxPython/demo/wxDragImage.py +++ b/wxPython/demo/wxDragImage.py @@ -138,12 +138,12 @@ class DragCanvas(wxScrolledWindow): dc.DestroyClippingRegion() - - def OnEraseBackground(self, evt): dc = evt.GetDC() if not dc: dc = wxClientDC(self) + rect = self.GetUpdateRegion().GetBox() + dc.SetClippingRegion(rect.x, rect.y, rect.width, rect.height) self.TileBackground(dc) diff --git a/wxPython/demo/wxFrame.py b/wxPython/demo/wxFrame.py index 8f4e1a17d7..3eac8d119c 100644 --- a/wxPython/demo/wxFrame.py +++ b/wxPython/demo/wxFrame.py @@ -25,7 +25,7 @@ class MyFrame(wxFrame): def runTest(frame, nb, log): 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 win.Show(true) diff --git a/wxPython/demo/wxMask.py b/wxPython/demo/wxMask.py index c1fec35388..7c1f7ccfc6 100644 --- a/wxPython/demo/wxMask.py +++ b/wxPython/demo/wxMask.py @@ -91,12 +91,22 @@ class TestMaskWindow(wxScrolledWindow): 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): - win = TestMaskWindow(nb) + win = TestPanel(nb, -1) return win #---------------------------------------------------------------------- diff --git a/wxPython/demo/wxStyledTextCtrl_2.py b/wxPython/demo/wxStyledTextCtrl_2.py index f1e602048e..a6f80f6623 100644 --- a/wxPython/demo/wxStyledTextCtrl_2.py +++ b/wxPython/demo/wxStyledTextCtrl_2.py @@ -29,8 +29,8 @@ else: 'mono' : 'Courier', 'helv' : 'Helvetica', 'other': 'new century schoolbook', - 'size' : 11, - 'size2': 9, + 'size' : 13, + 'size2': 11, } @@ -85,33 +85,33 @@ class PythonSTC(wxStyledTextCtrl): # Python styles # White space - self.StyleSetSpec(wxSTC_P_DEFAULT, "fore:#808080") + self.StyleSetSpec(wxSTC_P_DEFAULT, "fore:#808080,face:%(helv)s,size:%(size)d" % faces) # 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 - self.StyleSetSpec(wxSTC_P_NUMBER, "fore:#007F7F") + self.StyleSetSpec(wxSTC_P_NUMBER, "fore:#007F7F,size:%(size)d" % faces) # 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 - 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 - self.StyleSetSpec(wxSTC_P_WORD, "fore:#00007F,bold") + self.StyleSetSpec(wxSTC_P_WORD, "fore:#00007F,bold,size:%(size)d" % faces) # Triple quotes - self.StyleSetSpec(wxSTC_P_TRIPLE, "fore:#7F0000") + self.StyleSetSpec(wxSTC_P_TRIPLE, "fore:#7F0000,size:%(size)d" % faces) # Triple double quotes - self.StyleSetSpec(wxSTC_P_TRIPLEDOUBLE, "fore:#7F0000") + self.StyleSetSpec(wxSTC_P_TRIPLEDOUBLE, "fore:#7F0000,size:%(size)d" % faces) # 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 - self.StyleSetSpec(wxSTC_P_DEFNAME, "fore:#007F7F,bold") + self.StyleSetSpec(wxSTC_P_DEFNAME, "fore:#007F7F,bold,size:%(size)d" % faces) # Operators - self.StyleSetSpec(wxSTC_P_OPERATOR, "bold") + self.StyleSetSpec(wxSTC_P_OPERATOR, "bold,size:%(size)d" % faces) # 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 - 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 - 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") diff --git a/wxPython/setup.py b/wxPython/setup.py index 8a3f7ad185..2cf5322bf1 100755 --- a/wxPython/setup.py +++ b/wxPython/setup.py @@ -16,7 +16,7 @@ from my_distutils import run_swig, contrib_copy_tree VERSION = "2.3.1" DESCRIPTION = "Cross platform GUI toolkit for Python" AUTHOR = "Robin Dunn" -AUTHOR_EMAIL = "robin@alldunn.com" +AUTHOR_EMAIL = "Robin Dunn " URL = "http://wxPython.org/" LICENCE = "wxWindows (LGPL derivative)" LONG_DESCRIPTION = """\ @@ -91,8 +91,9 @@ if bcpp_compiling: # Check for build flags on the command line #---------------------------------------------------------------------- -for flag in ['BUILD_GLCANVAS', 'BUILD_OGL', 'BUILD_STC', 'CORE_ONLY', - 'USE_SWIG', 'IN_CVS_TREE', 'FINAL', 'HYBRID', ]: +for flag in ['BUILD_GLCANVAS', 'BUILD_OGL', 'BUILD_STC', 'BUILD_XRC', + 'CORE_ONLY', 'USE_SWIG', 'IN_CVS_TREE', + 'FINAL', 'HYBRID', ]: for x in range(len(sys.argv)): if string.find(sys.argv[x], flag) == 0: pos = string.find(sys.argv[x], '=') + 1 @@ -115,6 +116,7 @@ if CORE_ONLY: BUILD_GLCANVAS = 0 BUILD_OGL = 0 BUILD_STC = 0 + BUILD_XRC = 0 #---------------------------------------------------------------------- # Setup some platform specific stuff -- 2.49.0