projects
/
wxWidgets.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
updated samples/html/widget to avoid confusion
[wxWidgets.git]
/
wxPython
/
demo
/
Main.py
diff --git
a/wxPython/demo/Main.py
b/wxPython/demo/Main.py
index 10912629becbadf7b2b558a6c699fc17ba664f2d..b4bca26df9ac6f47998daf6c9d4b7e12fbcad920 100644
(file)
--- a/
wxPython/demo/Main.py
+++ b/
wxPython/demo/Main.py
@@
-109,6
+109,7
@@
def opj(path):
#---------------------------------------------------------------------------
class wxPythonDemo(wxFrame):
#---------------------------------------------------------------------------
class wxPythonDemo(wxFrame):
+ overviewText = "wxPython Overview"
def __init__(self, parent, id, title):
wxFrame.__init__(self, parent, -1, title, size = (800, 600),
def __init__(self, parent, id, title):
wxFrame.__init__(self, parent, -1, title, size = (800, 600),
@@
-192,7
+193,7
@@
class wxPythonDemo(wxFrame):
wxTR_HAS_VARIABLE_ROW_HEIGHT)
#self.tree.SetBackgroundColour(wxNamedColour("Pink"))
wxTR_HAS_VARIABLE_ROW_HEIGHT)
#self.tree.SetBackgroundColour(wxNamedColour("Pink"))
- root = self.tree.AddRoot("Overview")
+ root = self.tree.AddRoot("
wxPython
Overview")
firstChild = None
for item in _treeList:
child = self.tree.AppendItem(root, item[0])
firstChild = None
for item in _treeList:
child = self.tree.AppendItem(root, item[0])
@@
-217,12
+218,12
@@
class wxPythonDemo(wxFrame):
# the notebook...
if 0: # the old way
self.ovr = wxHtmlWindow(self.nb, -1, size=(400, 400))
# the notebook...
if 0: # the old way
self.ovr = wxHtmlWindow(self.nb, -1, size=(400, 400))
- self.nb.AddPage(self.ovr,
"Overview"
)
+ self.nb.AddPage(self.ovr,
self.overviewText
)
else: # hopefully I can remove this hacky code soon, see bug #216861
panel = wxPanel(self.nb, -1, style=wxCLIP_CHILDREN)
self.ovr = wxHtmlWindow(panel, -1, size=(400, 400))
else: # hopefully I can remove this hacky code soon, see bug #216861
panel = wxPanel(self.nb, -1, style=wxCLIP_CHILDREN)
self.ovr = wxHtmlWindow(panel, -1, size=(400, 400))
- self.nb.AddPage(panel,
"Overview"
)
+ self.nb.AddPage(panel,
self.overviewText
)
def OnOvrSize(evt, ovr=self.ovr):
ovr.SetSize(evt.GetSize())
def OnOvrSize(evt, ovr=self.ovr):
ovr.SetSize(evt.GetSize())
@@
-231,7
+232,7
@@
class wxPythonDemo(wxFrame):
EVT_ERASE_BACKGROUND(panel, EmptyHandler)
EVT_ERASE_BACKGROUND(panel, EmptyHandler)
- self.SetOverview(
"Overview"
, overview)
+ self.SetOverview(
self.overviewText
, overview)
# Set up a TextCtrl on the Demo Code Notebook page
# Set up a TextCtrl on the Demo Code Notebook page
@@
-327,9
+328,9
@@
class wxPythonDemo(wxFrame):
self.nb.SetSelection(0)
self.nb.DeletePage(2)
self.nb.SetSelection(0)
self.nb.DeletePage(2)
- if itemText ==
'Overview'
:
+ if itemText ==
self.overviewText
:
self.GetDemoFile('Main.py')
self.GetDemoFile('Main.py')
- self.SetOverview(
'Overview'
, overview)
+ self.SetOverview(
self.overviewText
, overview)
self.nb.Refresh();
self.window = None
self.nb.Refresh();
self.window = None
@@
-340,7
+341,7
@@
class wxPythonDemo(wxFrame):
try:
self.GetDemoFile(itemText + '.py')
module = __import__(itemText, globals())
try:
self.GetDemoFile(itemText + '.py')
module = __import__(itemText, globals())
- self.SetOverview(itemText, module.overview)
+ self.SetOverview(itemText
+ " Overview"
, module.overview)
finally:
wxEndBusyCursor()
finally:
wxEndBusyCursor()