diff --git a/utils/wxPython/CHANGES.txt b/utils/wxPython/CHANGES.txt index a70c4b279c..5a1c3ee82e 100644 --- a/utils/wxPython/CHANGES.txt +++ b/utils/wxPython/CHANGES.txt @@ -8,7 +8,8 @@ New in 2.1.14 Fixed wxTreeCtrl.HitTest to return both the tree item as well as the flags that clairify where the click was in relation to the item. -Fixed problem in wxTreeCtrl.GetBoundingBox +Fixed thread state problem in wxTreeCtrl.GetBoundingBox and +GetSelections. diff --git a/utils/wxPython/demo/Main.py b/utils/wxPython/demo/Main.py index e82eee115c..6b52617234 100644 --- a/utils/wxPython/demo/Main.py +++ b/utils/wxPython/demo/Main.py @@ -277,6 +277,7 @@ class wxPythonDemo(wxFrame): self.nb.AddPage(self.window, 'Demo') #self.nb.ResizeChildren() self.nb.SetSelection(2) + #self.window.Refresh() #self.nb.ResizeChildren() #if self.window.GetAutoLayout(): # self.window.Layout() diff --git a/utils/wxPython/demo/data/tables.htm b/utils/wxPython/demo/data/tables.htm index b27eb5e3f5..2d1b7cb0a5 100644 --- a/utils/wxPython/demo/data/tables.htm +++ b/utils/wxPython/demo/data/tables.htm @@ -13,7 +13,10 @@ tests page... (yes, really, see bellow:)
Click here to go to original testing page... -
Click here to go to manuals... +
Click +here +to go to manuals... +
 
diff --git a/utils/wxPython/demo/data/test.htm b/utils/wxPython/demo/data/test.htm index 8b65e2aaa6..8ab006086e 100644 --- a/utils/wxPython/demo/data/test.htm +++ b/utils/wxPython/demo/data/test.htm @@ -6,7 +6,7 @@ 2.0.35 i686) [Netscape]"> wxPython does wxHTML! - +click here to go to tables test page!

diff --git a/utils/wxPython/demo/wxHtmlWindow.py b/utils/wxPython/demo/wxHtmlWindow.py index 5991378be8..eb2aac73e3 100644 --- a/utils/wxPython/demo/wxHtmlWindow.py +++ b/utils/wxPython/demo/wxHtmlWindow.py @@ -26,8 +26,8 @@ class MyHtmlWindow(wxHtmlWindow): self.log.WriteText('OnSetTitle: %s\n' % title) self.base_OnSetTitle(title) - def __del__(self): - print 'MyHtmlWindow.__del__' +## def __del__(self): +## print 'MyHtmlWindow.__del__' class TestHtmlPanel(wxPanel): @@ -49,9 +49,9 @@ class TestHtmlPanel(wxPanel): self.box.Add(self.html, 1, wxGROW) subbox = wxBoxSizer(wxHORIZONTAL) - btn = wxButton(self, 1201, "Show Default") - EVT_BUTTON(self, 1201, self.OnShowDefault) - subbox.Add(btn, 1, wxGROW | wxALL, 2) +## btn = wxButton(self, 1201, "Show Default") +## EVT_BUTTON(self, 1201, self.OnShowDefault) +## subbox.Add(btn, 1, wxGROW | wxALL, 2) btn = wxButton(self, 1202, "Load File") EVT_BUTTON(self, 1202, self.OnLoadFile) @@ -87,8 +87,8 @@ class TestHtmlPanel(wxPanel): self.OnShowDefault(None) - def __del__(self): - print 'TestHtmlPanel.__del__' +## def __del__(self): +## print 'TestHtmlPanel.__del__' diff --git a/utils/wxPython/demo/wxMVCTree.py b/utils/wxPython/demo/wxMVCTree.py index 8630080db0..af7760cb9d 100644 --- a/utils/wxPython/demo/wxMVCTree.py +++ b/utils/wxPython/demo/wxMVCTree.py @@ -27,6 +27,8 @@ def runTest(frame, nb, log): global logger logger = log p = wxMVCTree(nb, -1) + #f = wxFrame(frame, -1, "wxMVCTree") + #p = wxMVCTree(f, -1) p.SetAssumeChildren(true) p.SetModel(LateFSTreeModel(os.path.normpath(os.getcwd() + os.sep +'..'))) #Uncomment this to enable live filename editing! @@ -39,7 +41,14 @@ def runTest(frame, nb, log): EVT_MVCTREE_ADD_ITEM(p, p.GetId(), add) EVT_MVCTREE_DELETE_ITEM(p, p.GetId(), delitem) EVT_MVCTREE_KEY_DOWN(p, p.GetId(), key) + return p + #frame.otherWin = f + #f.Show(true) + #return None + + + overview = """\ wxMVCTree is a control which handles hierarchical data. It is constructed in model-view-controller architecture, so the display of that data, and the content of the data can be changed greatly without affecting the other parts. diff --git a/utils/wxPython/demo/wxMask.py b/utils/wxPython/demo/wxMask.py index 6f64860e34..168aec2bc7 100644 --- a/utils/wxPython/demo/wxMask.py +++ b/utils/wxPython/demo/wxMask.py @@ -81,8 +81,8 @@ class TestMaskWindow(wxScrolledWindow): mdc = wxMemoryDC() i = 0 for text, code in logicList: - x,y = 120+100*(i%4), 20+100*(i/4) - dc.DrawText(text, x,y-20) + x,y = 120+150*(i%4), 20+100*(i/4) + dc.DrawText(text, x, y-20) mdc.SelectObject(self.bmp_withcolourmask) dc.Blit(x,y, cx,cy, mdc, 0,0, code, true) i = i + 1 diff --git a/utils/wxPython/distrib/wxPython.wse b/utils/wxPython/distrib/wxPython.wse index 12dca79c7b..551c784423 100644 --- a/utils/wxPython/distrib/wxPython.wse +++ b/utils/wxPython/distrib/wxPython.wse @@ -17,7 +17,7 @@ item: Global Patch Flags=0000000000001001 Patch Threshold=85 Patch Memory=4000 - EXE Filename=wxPython-2.1.12.exe + EXE Filename=wxPython-2.1.13.exe FTP Cluster Size=20 Per-User Version ID=1 Dialogs Version=6 @@ -815,8 +815,8 @@ item: Install File Flags=0000001010000011 end item: Install File - Source=e:\projects\wx\lib\wx21_12.dll - Destination=%SYS%\wx21_12.dll + Source=e:\projects\wx\lib\wx21_13.dll + Destination=%SYS%\wx21_13.dll Flags=0000001010010010 end item: Install File diff --git a/utils/wxPython/distrib/zipit.bat b/utils/wxPython/distrib/zipit.bat index b5e36c6136..6a32acca72 100755 --- a/utils/wxPython/distrib/zipit.bat +++ b/utils/wxPython/distrib/zipit.bat @@ -13,12 +13,12 @@ mkdir wxPython\docs mkdir wxPython\docs\wx copy %WXWIN%\docs\html\wx\*.gif wxPython\docs\wx copy %WXWIN%\docs\html\wx\*.htm wxPython\docs\wx -copy wxPython\docs\wx.htm wxPython\docs\wx\index.htm +copy wxPython\docs\wx\wx.htm wxPython\docs\wx\index.htm mkdir wxPython\docs\ogl copy %WXWIN%\docs\html\ogl\*.gif wxPython\docs\ogl copy %WXWIN%\docs\html\ogl\*.htm wxPython\docs\ogl -copy wxPython\docs\ogl.htm wxPython\docs\ogl\index.htm +copy wxPython\docs\ogl\ogl.htm wxPython\docs\ogl\index.htm zip -r wxPython\wxPython-docs-%1.zip wxPython\docs diff --git a/utils/wxPython/lib/mvctree.py b/utils/wxPython/lib/mvctree.py index 05ff67ab96..f268d9eb41 100644 --- a/utils/wxPython/lib/mvctree.py +++ b/utils/wxPython/lib/mvctree.py @@ -770,6 +770,7 @@ class wxMVCTree(wxScrolledWindow): EVT_KEY_DOWN(self, self.OnKeyDown) self.doubleBuffered = true + def Refresh(self): if self.doubleBuffered: self.painter.ClearBuffer()