'[1219035] cleanup: miscellaneous' and minor source cleaning.

[wxWidgets.git] / wxPython / demo / StatusBar.py

diff --git a/wxPython/demo/StatusBar.py b/wxPython/demo/StatusBar.py
index 0d1cd908803499d781621471d55c1264135567b1..a718a5683b5e1ae409b94bb6603ea037013a295e 100644 (file)
--- a/wxPython/demo/StatusBar.py
+++ b/wxPython/demo/StatusBar.py
@@ -1,7 +1,3 @@
-# 11/21/2003 - Jeff Grimmett (grimmtooth@softhome.net)
-#
-# o Updated for wx namespace
-# 

 
 import  time
 import  wx
 
 import  time
 import  wx


@@ -14,6 +10,8 @@ class CustomStatusBar(wx.StatusBar):
 
         # This status bar has three fields
         self.SetFieldsCount(3)
 
         # This status bar has three fields
         self.SetFieldsCount(3)

+        # Sets the three fields to be relative widths to each other.
+        self.SetStatusWidths([-2, -1, -2])

         self.log = log
         self.sizeChanged = False
         self.Bind(wx.EVT_SIZE, self.OnSize)
         self.log = log
         self.sizeChanged = False
         self.Bind(wx.EVT_SIZE, self.OnSize)


@@ -86,7 +84,7 @@ class TestCustomStatusBar(wx.Frame):
         self.SetStatusBar(self.sb)
         tc = wx.TextCtrl(self, -1, "", style=wx.TE_READONLY|wx.TE_MULTILINE)
 
         self.SetStatusBar(self.sb)
         tc = wx.TextCtrl(self, -1, "", style=wx.TE_READONLY|wx.TE_MULTILINE)
 

-        self.SetSize((500, 300))
+        self.SetSize((640, 480))

         self.Bind(wx.EVT_CLOSE, self.OnCloseWindow)
 
     def OnCloseWindow(self, event):
         self.Bind(wx.EVT_CLOSE, self.OnCloseWindow)
 
     def OnCloseWindow(self, event):


@@ -96,10 +94,26 @@ class TestCustomStatusBar(wx.Frame):
 
 #---------------------------------------------------------------------------
 
 
 #---------------------------------------------------------------------------
 

+class TestPanel(wx.Panel):
+    def __init__(self, parent, log):
+        self.log = log
+        wx.Panel.__init__(self, parent, -1)
+
+        b = wx.Button(self, -1, "Show the StatusBar sample", (50,50))
+        self.Bind(wx.EVT_BUTTON, self.OnButton, b)
+
+
+    def OnButton(self, evt):
+        win = TestCustomStatusBar(self, self.log)
+        win.Show(True)
+
+#---------------------------------------------------------------------------
+
+

 def runTest(frame, nb, log):
 def runTest(frame, nb, log):

-    win = TestCustomStatusBar(frame, log)
-    frame.otherWin = win
-    win.Show(True)
+    win = TestPanel(nb, log)
+    return win
+

 
 #---------------------------------------------------------------------------
 
 
 #---------------------------------------------------------------------------
 


@@ -121,4 +135,4 @@ field has a clock that shows the current time when it is enabled.
 if __name__ == '__main__':
     import sys,os
     import run
 if __name__ == '__main__':
     import sys,os
     import run

-    run.main(['', os.path.basename(sys.argv[0])])
+    run.main(['', os.path.basename(sys.argv[0])] + sys.argv[1:])