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

Some updates and fixes

Browse Source 
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@5987 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
This commit is contained in:
Robin Dunn
2000-02-13 06:01:58 +00:00
parent f97c9b5bf2
commit 854862f58d
10 changed files with 32 additions and 17 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
utils/wxPython/CHANGES.txt
View File

@@ -8,7 +8,8 @@ New in 2.1.14
Fixed wxTreeCtrl.HitTest to return both the tree item as well as the 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. 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.

1
utils/wxPython/demo/Main.py
View File

@@ -277,6 +277,7 @@ class wxPythonDemo(wxFrame):
self.nb.AddPage(self.window, 'Demo') self.nb.AddPage(self.window, 'Demo')
#self.nb.ResizeChildren() #self.nb.ResizeChildren()
self.nb.SetSelection(2) self.nb.SetSelection(2)
#self.window.Refresh()
#self.nb.ResizeChildren() #self.nb.ResizeChildren()
#if self.window.GetAutoLayout(): #if self.window.GetAutoLayout():
# self.window.Layout() # self.window.Layout()

5
utils/wxPython/demo/data/tables.htm
View File

@@ -13,7 +13,10 @@ tests page...</H3>
(yes, really, see bellow:) (yes, really, see bellow:)
<BR>Click <a href="test.htm">here</a> to go to original testing page... <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; <BR>&nbsp;
<CENTER><TABLE CELLSPACING=5 BORDER COLS=2 WIDTH="40%" NOSAVE > <CENTER><TABLE CELLSPACING=5 BORDER COLS=2 WIDTH="40%" NOSAVE >
<TR ALIGN=CENTER NOSAVE> <TR ALIGN=CENTER NOSAVE>

2
utils/wxPython/demo/data/test.htm
View File

@@ -6,7 +6,7 @@
2.0.35 i686) [Netscape]"> 2.0.35 i686) [Netscape]">
<TITLE>wxPython does wxHTML!</TITLE> <TITLE>wxPython does wxHTML!</TITLE>
</HEAD> </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> <b><a href="tables.htm">click here to go to tables test page!</a></b>
<p> <p>

14
utils/wxPython/demo/wxHtmlWindow.py
View File

@@ -26,8 +26,8 @@ class MyHtmlWindow(wxHtmlWindow):
self.log.WriteText('OnSetTitle: %s\n' % title) self.log.WriteText('OnSetTitle: %s\n' % title)
self.base_OnSetTitle(title) self.base_OnSetTitle(title)
def __del__(self): ## def __del__(self):
print 'MyHtmlWindow.__del__' ## print 'MyHtmlWindow.__del__'
class TestHtmlPanel(wxPanel): class TestHtmlPanel(wxPanel):
@@ -49,9 +49,9 @@ class TestHtmlPanel(wxPanel):
self.box.Add(self.html, 1, wxGROW) self.box.Add(self.html, 1, wxGROW)
subbox = wxBoxSizer(wxHORIZONTAL) subbox = wxBoxSizer(wxHORIZONTAL)
btn = wxButton(self, 1201, "Show Default") ## btn = wxButton(self, 1201, "Show Default")
EVT_BUTTON(self, 1201, self.OnShowDefault) ## EVT_BUTTON(self, 1201, self.OnShowDefault)
subbox.Add(btn, 1, wxGROW | wxALL, 2) ## subbox.Add(btn, 1, wxGROW | wxALL, 2)
btn = wxButton(self, 1202, "Load File") btn = wxButton(self, 1202, "Load File")
EVT_BUTTON(self, 1202, self.OnLoadFile) EVT_BUTTON(self, 1202, self.OnLoadFile)
@@ -87,8 +87,8 @@ class TestHtmlPanel(wxPanel):
self.OnShowDefault(None) self.OnShowDefault(None)
def __del__(self): ## def __del__(self):
print 'TestHtmlPanel.__del__' ## print 'TestHtmlPanel.__del__'

9
utils/wxPython/demo/wxMVCTree.py
View File

@@ -27,6 +27,8 @@ def runTest(frame, nb, log):
global logger global logger
logger = log logger = log
p = wxMVCTree(nb, -1) p = wxMVCTree(nb, -1)
#f = wxFrame(frame, -1, "wxMVCTree")
#p = wxMVCTree(f, -1)
p.SetAssumeChildren(true) p.SetAssumeChildren(true)
p.SetModel(LateFSTreeModel(os.path.normpath(os.getcwd() + os.sep +'..'))) p.SetModel(LateFSTreeModel(os.path.normpath(os.getcwd() + os.sep +'..')))
#Uncomment this to enable live filename editing! #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_ADD_ITEM(p, p.GetId(), add)
EVT_MVCTREE_DELETE_ITEM(p, p.GetId(), delitem) EVT_MVCTREE_DELETE_ITEM(p, p.GetId(), delitem)
EVT_MVCTREE_KEY_DOWN(p, p.GetId(), key) EVT_MVCTREE_KEY_DOWN(p, p.GetId(), key)
return p return p
#frame.otherWin = f
#f.Show(true)
#return None
overview = """\ 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. 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.

4
utils/wxPython/demo/wxMask.py
View File

@@ -81,8 +81,8 @@ class TestMaskWindow(wxScrolledWindow):
mdc = wxMemoryDC() mdc = wxMemoryDC()
i = 0 i = 0
for text, code in logicList: for text, code in logicList:
x,y = 120+100*(i%4), 20+100*(i/4) x,y = 120+150*(i%4), 20+100*(i/4)
dc.DrawText(text, x,y-20) dc.DrawText(text, x, y-20)
mdc.SelectObject(self.bmp_withcolourmask) mdc.SelectObject(self.bmp_withcolourmask)
dc.Blit(x,y, cx,cy, mdc, 0,0, code, true) dc.Blit(x,y, cx,cy, mdc, 0,0, code, true)
i = i + 1 i = i + 1

6
utils/wxPython/distrib/wxPython.wse
View File

@@ -17,7 +17,7 @@ item: Global
Patch Flags=0000000000001001 Patch Flags=0000000000001001
Patch Threshold=85 Patch Threshold=85
Patch Memory=4000 Patch Memory=4000
EXE Filename=wxPython-2.1.12.exe EXE Filename=wxPython-2.1.13.exe
FTP Cluster Size=20 FTP Cluster Size=20
Per-User Version ID=1 Per-User Version ID=1
Dialogs Version=6 Dialogs Version=6
@@ -815,8 +815,8 @@ item: Install File
Flags=0000001010000011 Flags=0000001010000011
end end
item: Install File item: Install File
Source=e:\projects\wx\lib\wx21_12.dll Source=e:\projects\wx\lib\wx21_13.dll
Destination=%SYS%\wx21_12.dll Destination=%SYS%\wx21_13.dll
Flags=0000001010010010 Flags=0000001010010010
end end
item: Install File item: Install File

4
utils/wxPython/distrib/zipit.bat
View File

@@ -13,12 +13,12 @@ mkdir wxPython\docs
mkdir wxPython\docs\wx mkdir wxPython\docs\wx
copy %WXWIN%\docs\html\wx\*.gif wxPython\docs\wx copy %WXWIN%\docs\html\wx\*.gif wxPython\docs\wx
copy %WXWIN%\docs\html\wx\*.htm 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 mkdir wxPython\docs\ogl
copy %WXWIN%\docs\html\ogl\*.gif wxPython\docs\ogl copy %WXWIN%\docs\html\ogl\*.gif wxPython\docs\ogl
copy %WXWIN%\docs\html\ogl\*.htm 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

1
utils/wxPython/lib/mvctree.py
View File

@@ -770,6 +770,7 @@ class wxMVCTree(wxScrolledWindow):
EVT_KEY_DOWN(self, self.OnKeyDown) EVT_KEY_DOWN(self, self.OnKeyDown)
self.doubleBuffered = true self.doubleBuffered = true
def Refresh(self): def Refresh(self):
if self.doubleBuffered: if self.doubleBuffered:
self.painter.ClearBuffer() self.painter.ClearBuffer()