]> git.saurik.com Git - wxWidgets.git/commitdiff
projects / wxWidgets.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | patch | inline | side by side (parent: f97c9b5)
Some updates and fixes
authorRobin Dunn <robin@alldunn.com>
Sun, 13 Feb 2000 06:01:58 +0000 (06:01 +0000)
committerRobin Dunn <robin@alldunn.com>
Sun, 13 Feb 2000 06:01:58 +0000 (06:01 +0000)
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@5987 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775

utils/wxPython/CHANGES.txt patch | blob | blame | history
utils/wxPython/demo/Main.py patch | blob | blame | history
utils/wxPython/demo/data/tables.htm patch | blob | blame | history
utils/wxPython/demo/data/test.htm patch | blob | blame | history
utils/wxPython/demo/wxHtmlWindow.py patch | blob | blame | history
utils/wxPython/demo/wxMVCTree.py patch | blob | blame | history
utils/wxPython/demo/wxMask.py patch | blob | blame | history
utils/wxPython/distrib/wxPython.wse patch | blob | blame | history
utils/wxPython/distrib/zipit.bat patch | blob | blame | history
utils/wxPython/lib/mvctree.py patch | blob | blame | history

diff --git a/utils/wxPython/CHANGES.txt b/utils/wxPython/CHANGES.txt
index a70c4b279c6d6564c21dfb7348e0db3768ae80eb..5a1c3ee82e70289c55d7918a8e63a44be4bee6af 100644 (file)
--- 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 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 e82eee115c8a9934cc63162da2f770e997453708..6b526172343868b241051238eaa7cc72dac80577 100644 (file)
--- 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.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()
                     #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 b27eb5e3f5a34aa32b16602dfaf43d21a171c9b2..2d1b7cb0a514ec82dbd243a333d2cb8c50ee1731 100644 (file)
--- a/utils/wxPython/demo/data/tables.htm
+++ b/utils/wxPython/demo/data/tables.htm
@@ -13,7 +13,10 @@ tests page...</H3>
 
 (yes, really, see bellow:)
 <BR>Click <a href="test.htm">here</a> to go to original testing page...
 
 (yes, really, see bellow:)
 <BR>Click <a href="test.htm">here</a> to go to original testing page...
-<BR>Click <a href="../../docs/html/man.htm">here</a> to go to manuals...
+<BR>Click
+<a href="http://www.lpthe.jussieu.fr/~zeitlin/wxWindows/docs/">here</a>
+to go to manuals...
+
 <BR>&nbsp;
 <CENTER><TABLE CELLSPACING=5 BORDER COLS=2 WIDTH="40%" NOSAVE >
 <TR ALIGN=CENTER NOSAVE>
 <BR>&nbsp;
 <CENTER><TABLE CELLSPACING=5 BORDER COLS=2 WIDTH="40%" NOSAVE >
 <TR ALIGN=CENTER NOSAVE>
diff --git a/utils/wxPython/demo/data/test.htm b/utils/wxPython/demo/data/test.htm
index 8b65e2aaa648002bded37c22141816606f925080..8ab006086e91178bb1b74d39b6f4ee2cb6ba00af 100644 (file)
--- a/utils/wxPython/demo/data/test.htm
+++ b/utils/wxPython/demo/data/test.htm
@@ -6,7 +6,7 @@
    2.0.35 i686) [Netscape]">
 <TITLE>wxPython does wxHTML!</TITLE>
 </HEAD>
    2.0.35 i686) [Netscape]">
 <TITLE>wxPython does wxHTML!</TITLE>
 </HEAD>
-<BODY TEXT="#000000" BGCOLOR="#008800" LINK="#0000FF" VLINK="#FF0000" ALINK="#000088">
+<BODY TEXT="#000000" BGCOLOR="#007f00" LINK="#0000FF" VLINK="#FF0000" ALINK="#000088">
 
 <b><a href="tables.htm">click here to go to tables test page!</a></b>
 <p>
 
 <b><a href="tables.htm">click here to go to tables test page!</a></b>
 <p>
diff --git a/utils/wxPython/demo/wxHtmlWindow.py b/utils/wxPython/demo/wxHtmlWindow.py
index 5991378be85f447eabcfd04a6333ec754fe7cea4..eb2aac73e3f64761e873b456ee90974cd303c9ef 100644 (file)
--- 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)
 
         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):
 
 
 class TestHtmlPanel(wxPanel):
@@ -49,9 +49,9 @@ class TestHtmlPanel(wxPanel):
         self.box.Add(self.html, 1, wxGROW)
 
         subbox = wxBoxSizer(wxHORIZONTAL)
         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)
 
         btn = wxButton(self, 1202, "Load File")
         EVT_BUTTON(self, 1202, self.OnLoadFile)
@@ -87,8 +87,8 @@ class TestHtmlPanel(wxPanel):
         self.OnShowDefault(None)
 
 
         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 8630080db02222bb0f6a2109a2abe540dd312940..af7760cb9dc3a4cb17c38e330e8c5d998bf8632a 100644 (file)
--- 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)
     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!
     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)
     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
     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.
 
 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 6f64860e34c0b4ba7fa5e690497ade0f7d4e69e7..168aec2bc70fa73da42a81c9b2a66b0d5375eb8c 100644 (file)
--- 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:
         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
             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 12dca79c7b8f78bcbbac8f73d396631050d0c55e..551c784423441e8eef3b964e41d3d905df21bec6 100644 (file)
--- 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
   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
   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
   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
   Flags=0000001010010010
 end
 item: Install File
diff --git a/utils/wxPython/distrib/zipit.bat b/utils/wxPython/distrib/zipit.bat
index b5e36c61368856b1b4efe831e03be7965a3129d6..6a32acca72270625a9295ed33bd0f9086cf4ea0d 100755 (executable)
--- 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
 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
 
 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
 
 
 zip -r wxPython\wxPython-docs-%1.zip wxPython\docs
diff --git a/utils/wxPython/lib/mvctree.py b/utils/wxPython/lib/mvctree.py
index 05ff67ab9602b7e5443fcabd74843ef217fec1d1..f268d9eb416a42a0684057ca55138079f5f797e9 100644 (file)
--- 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
 
         EVT_KEY_DOWN(self, self.OnKeyDown)
         self.doubleBuffered = true
 
+
     def Refresh(self):
         if self.doubleBuffered:
             self.painter.ClearBuffer()
     def Refresh(self):
         if self.doubleBuffered:
             self.painter.ClearBuffer()
wxWidgets (Impactor)