From a5d9c77bb86ba15dd3701b4d6a3539619f89d876 Mon Sep 17 00:00:00 2001 From: Robin Dunn Date: Wed, 10 Mar 2004 04:04:52 +0000 Subject: [PATCH] demo tweaks git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@26166 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775 --- wxPython/demo/ComboBox.py | 2 +- wxPython/demo/Main.py | 9 ++------- wxPython/demo/StyledTextCtrl_2.py | 4 ++-- wxPython/demo/run.py | 2 -- 4 files changed, 5 insertions(+), 12 deletions(-) diff --git a/wxPython/demo/ComboBox.py b/wxPython/demo/ComboBox.py index 9cebf42113..4ab15a6467 100644 --- a/wxPython/demo/ComboBox.py +++ b/wxPython/demo/ComboBox.py @@ -40,7 +40,7 @@ class TestComboBox(wx.Panel): # This combobox is created with no values initially. cb = wx.ComboBox( - self, 501, "default value", (90, 80), (95, -1), [], wx.CB_SIMPLE) + self, 501, "default value", (90, 80), (95, -1), [], wx.CB_DROPDOWN) # Here we dynamically add our values to the second combobox. for item in sampleList: diff --git a/wxPython/demo/Main.py b/wxPython/demo/Main.py index fe35bbfdca..9d2d87fd77 100644 --- a/wxPython/demo/Main.py +++ b/wxPython/demo/Main.py @@ -263,7 +263,7 @@ try: from StyledTextCtrl_2 import PythonSTC class DemoCodeViewer(PythonSTC): def __init__(self, parent, ID): - PythonSTC.__init__(self, parent, ID) + PythonSTC.__init__(self, parent, ID, wx.BORDER_NONE) self.SetUpEditor() # Some methods to make it compatible with how the wxTextCtrl is used @@ -431,6 +431,7 @@ class wxPythonDemo(wx.Frame): def __init__(self, parent, id, title): wx.Frame.__init__(self, parent, -1, title, size = (800, 600), style=wx.DEFAULT_FRAME_STYLE|wx.NO_FULL_REPAINT_ON_RESIZE) + self.cwd = os.getcwd() self.curOverview = "" @@ -684,7 +685,6 @@ class wxPythonDemo(wx.Frame): if itemText == self.overviewText: self.LoadDemoSource('Main.py') self.SetOverview(self.overviewText, overview) -## self.nb.Refresh(); self.window = None else: @@ -703,15 +703,10 @@ class wxPythonDemo(wx.Frame): wx.EndBusyCursor() self.tree.Refresh() - # in case runTest is modal, make sure things look right... -## self.nb.Refresh(); -## wx.SafeYield() - self.window = module.runTest(self, self.nb, self) ### if self.window is not None: self.nb.AddPage(self.window, 'Demo') self.nb.SetSelection(2) -## self.nb.Refresh() # without this wxMac has troubles showing the just added page else: self.ovr.SetPage("") diff --git a/wxPython/demo/StyledTextCtrl_2.py b/wxPython/demo/StyledTextCtrl_2.py index 2ad4bf5c22..169ddc3156 100644 --- a/wxPython/demo/StyledTextCtrl_2.py +++ b/wxPython/demo/StyledTextCtrl_2.py @@ -42,9 +42,9 @@ class PythonSTC(stc.StyledTextCtrl): fold_symbols = 2 - def __init__(self, parent, ID): + def __init__(self, parent, ID, style=0): stc.StyledTextCtrl.__init__(self, parent, ID, - style = wx.NO_FULL_REPAINT_ON_RESIZE) + style = style|wx.NO_FULL_REPAINT_ON_RESIZE) self.CmdKeyAssign(ord('B'), stc.STC_SCMOD_CTRL, stc.STC_CMD_ZOOMIN) self.CmdKeyAssign(ord('N'), stc.STC_SCMOD_CTRL, stc.STC_CMD_ZOOMOUT) diff --git a/wxPython/demo/run.py b/wxPython/demo/run.py index 336f5bf648..f420f705d9 100755 --- a/wxPython/demo/run.py +++ b/wxPython/demo/run.py @@ -93,8 +93,6 @@ class RunDemoApp(wx.App): frect = frame.otherWin.GetRect() p = wx.Panel(frame, -1) b = wx.Button(p, -1, " Exit ", (10,10)) - p.Fit() - #frame.SetClientSize(p.GetSize()) frame.SetSize((200, 100)) frame.Bind(wx.EVT_BUTTON, self.OnButton, b) else: -- 2.45.2