demo tweaks

git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@26166 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775

diff --git a/wxPython/demo/ComboBox.py b/wxPython/demo/ComboBox.py
index 9cebf4211353be64ab5230f539faeb3348867d32..4ab15a6467f257830acbd271bfe97a26420f86ea 100644 (file)
--- 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(
 
         # 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:
 
         # 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 fe35bbfdcaec565042c57899f73bf8db8cb03747..9d2d87fd77a537f1327c1cfce465f24c50f2ee94 100644 (file)
--- 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):
     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
             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)
     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 = ""
 
         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)
         if itemText == self.overviewText:
             self.LoadDemoSource('Main.py')
             self.SetOverview(self.overviewText, overview)

-##            self.nb.Refresh();

             self.window = None
 
         else:
             self.window = None
 
         else:


@@ -703,15 +703,10 @@ class wxPythonDemo(wx.Frame):
                     wx.EndBusyCursor()
                 self.tree.Refresh()
 
                     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.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("")
 
             else:
                 self.ovr.SetPage("")

diff --git a/wxPython/demo/StyledTextCtrl_2.py b/wxPython/demo/StyledTextCtrl_2.py
index 2ad4bf5c2271e89541c2f26d004db3d3ac92c56e..169ddc315610e35495f3ff0645b7955c344d8ffe 100644 (file)
--- a/wxPython/demo/StyledTextCtrl_2.py
+++ b/wxPython/demo/StyledTextCtrl_2.py
@@ -42,9 +42,9 @@ class PythonSTC(stc.StyledTextCtrl):
 
     fold_symbols = 2
     
 
     fold_symbols = 2
     

-    def __init__(self, parent, ID):
+    def __init__(self, parent, ID, style=0):

         stc.StyledTextCtrl.__init__(self, parent, ID,
         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)
 
         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 336f5bf648171ca79b91d50af0a0b6d28d9d2b4c..f420f705d95620ee989975c31e3a94fa505d74e7 100755 (executable)
--- 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))
                 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:
                 frame.SetSize((200, 100))
                 frame.Bind(wx.EVT_BUTTON, self.OnButton, b)
             else: