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

Patches from Tomo

Browse Source 
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@25268 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
This commit is contained in:
Robin Dunn 2004-01-20 23:26:57 +00:00
parent 90548138ac
commit 317d155040
3 changed files with 15 additions and 17 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
wxPython/demo/CalendarCtrl.py
View File

@ -27,8 +27,9 @@ class TestPanel(wx.Panel):
self.OnChangeMonth()
def OnButton(self, evt):
self.cal.Destroy()
self.cal = None
if self.cal is not None:
self.cal.Destroy()
self.cal = None
def OnCalSelected(self, evt):
self.log.write('OnCalSelected: %s\n' % evt.GetDate())

15
wxPython/demo/Sizers.py
View File

@ -98,8 +98,8 @@ def makeSimpleBox7(win):
#----------------------------------------------------------------------
def makeSimpleBox8(win):
box = wxBoxSizer(wx.VERTICAL)
box.Add(wxButton(win, 1010, "one"), 0, wx.EXPAND)
box = wx.BoxSizer(wx.VERTICAL)
box.Add(wx.Button(win, 1010, "one"), 0, wx.EXPAND)
box.Add((0,0), 1)
box.Add(wx.Button(win, 1010, "two"), 0, wx.ALIGN_CENTER)
box.Add((0,0), 1)
@ -271,7 +271,7 @@ def makeGrid3(win):
(wx.Button(win, -1, 'two'), 0, wx.EXPAND),
(wx.Button(win, -1, 'three'), 0, wx.EXPAND),
(wx.Button(win, -1, 'four'), 0, wx.EXPAND),
#(wxButton(win, 1010, 'five'), 0, wxEXPAND),
#(wx.Button(win, 1010, 'five'), 0, wx.EXPAND),
((175, 50)),
(wx.Button(win, -1, 'six'), 0, wx.EXPAND),
(wx.Button(win, -1, 'seven'), 0, wx.EXPAND),
@ -440,14 +440,14 @@ theTests = [
("", None, ""),
("Simple Grid", makeGrid1,
"This is an example of the wxGridSizer. In this case all row heights "
"This is an example of the wx.GridSizer. In this case all row heights "
"and column widths are kept the same as all the others and all items "
"fill their available space. The horizontal and vertical gaps are set to "
"2 pixels each."
),
("More Grid Features", makeGrid2,
"This is another example of the wxGridSizer. This one has no gaps in the grid, "
"This is another example of the wx.GridSizer. This one has no gaps in the grid, "
"but various cells are given different alignment options and some of them "
"hold nested sizers."
),
@ -469,7 +469,7 @@ theTests = [
("Proportional resize", makeSimpleBoxShaped,
"Managed items can preserve their original aspect ratio. The last item has the "
"wxSHAPED flag set and will resize proportional to its original size."
"wx.SHAPED flag set and will resize proportional to its original size."
),
("Proportional resize with Alignments", makeShapes,
@ -553,9 +553,6 @@ def runTest(frame, nb, log):
return win
overview = ""
#wxSizer.__doc__ + '\n' + '-' * 80 + '\n' + \
#wxBoxSizer.__doc__ + '\n' + '-' * 80 + '\n' + \
#wxBorderSizer.__doc__
#----------------------------------------------------------------------

12
wxPython/demo/SplitTree.py
View File

@ -67,7 +67,7 @@ class TestValueWindow(gizmos.TreeCompanionWindow):
text = text + tree.GetItemText(itemId)
pen = wx.Pen(
wx.SystemSettings_GetSystemColour(wx.SYS_COLOUR_3DLIGHT),
wx.SystemSettings_GetColour(wx.SYS_COLOUR_3DLIGHT),
1, wx.SOLID
)
@ -97,11 +97,11 @@ class TestPanel(wx.Panel):
)
splitter.SetSashSize(2)
tree = TestTree(splitter, -1, style = wx.TR_HAS_BUTTONS |
wx.TR_NO_LINES |
wx.TR_ROW_LINES |
#wx.TR_HIDE_ROOT |
wx.NO_BORDER )
tree = TestTree(splitter, style = wx.TR_HAS_BUTTONS |
wx.TR_NO_LINES |
wx.TR_ROW_LINES |
#wx.TR_HIDE_ROOT |
wx.NO_BORDER )
valueWindow = TestValueWindow(splitter, style=wx.NO_BORDER)