]> git.saurik.com Git - wxWidgets.git/blobdiff - wxPython/demo/MDISashDemo.py
projects / wxWidgets.git / blobdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | inline | side by side
'[1219035] cleanup: miscellaneous' and minor source cleaning.
[wxWidgets.git] / wxPython / demo / MDISashDemo.py
diff --git a/wxPython/demo/MDISashDemo.py b/wxPython/demo/MDISashDemo.py
index 4b2b08ffd745a8b1d5e612f82937ce6b96ac87ed..d5d86905a07e202895f4f163f21aedc47a201e89 100644 (file)
--- a/wxPython/demo/MDISashDemo.py
+++ b/wxPython/demo/MDISashDemo.py
@@ -1,140 +1,151 @@
 #!/usr/bin/env python
 
 #!/usr/bin/env python
 
-from wxPython.wx import *
-from wxScrolledWindow import MyCanvas
+import wx
+
+import ScrolledWindow
 
 #----------------------------------------------------------------------
 
 #----------------------------------------------------------------------
+# There are better ways to do IDs, but this demo requires that the window
+# IDs be in a specific range. There are better ways to do that, too, but
+# this will do for purposes of this demo.
+
+ID_Menu_New         = 5004
+ID_Menu_Exit        = 5005
+
+ID_WINDOW_TOP       = 5000
+ID_WINDOW_LEFT1     = 5001
+ID_WINDOW_LEFT2     = 5002
+ID_WINDOW_BOTTOM    = 5003
 
 
-class MyParentFrame(wxMDIParentFrame):
-    ID_WINDOW_TOP    = 5100
-    ID_WINDOW_LEFT1  = 5101
-    ID_WINDOW_LEFT2  = 5102
-    ID_WINDOW_BOTTOM = 5103
+#----------------------------------------------------------------------
 
 
+class MyParentFrame(wx.MDIParentFrame):
     def __init__(self):
     def __init__(self):
-        wxMDIParentFrame.__init__(self, None, -1, "MDI Parent", size=(600,400),
-                                  style = wxDEFAULT_FRAME_STYLE | wxHSCROLL | wxVSCROLL)
+        wx.MDIParentFrame.__init__(
+            self, None, -1, "MDI Parent", size=(600,400),
+            style = wx.DEFAULT_FRAME_STYLE | wx.HSCROLL | wx.VSCROLL
+            )
 
         self.winCount = 0
 
         self.winCount = 0
-        menu = wxMenu()
-        menu.Append(5000, "&New Window")
+        menu = wx.Menu()
+        menu.Append(ID_Menu_New, "&New Window")
         menu.AppendSeparator()
         menu.AppendSeparator()
-        menu.Append(5001, "E&xit")
+        menu.Append(ID_Menu_Exit, "E&xit")
 
 
-        menubar = wxMenuBar()
+        menubar = wx.MenuBar()
         menubar.Append(menu, "&File")
         self.SetMenuBar(menubar)
 
         #self.CreateStatusBar()
 
         menubar.Append(menu, "&File")
         self.SetMenuBar(menubar)
 
         #self.CreateStatusBar()
 
-        EVT_MENU(self, 5000, self.OnNewWindow)
-        EVT_MENU(self, 5001, self.OnExit)
+        self.Bind(wx.EVT_MENU, self.OnNewWindow, id=ID_Menu_New)
+        self.Bind(wx.EVT_MENU, self.OnExit, id=ID_Menu_Exit)
 
 
+        self.Bind(
+            wx.EVT_SASH_DRAGGED_RANGE, self.OnSashDrag, id=ID_WINDOW_TOP, 
+            id2=ID_WINDOW_BOTTOM
+            )
 
 
-        EVT_SASH_DRAGGED_RANGE(self,
-                               self.ID_WINDOW_TOP, self.ID_WINDOW_BOTTOM,
-                               self.OnSashDrag)
-        EVT_SIZE(self, self.OnSize)
+        self.Bind(wx.EVT_SIZE, self.OnSize)
 
 
         # Create some layout windows
         # A window like a toolbar
 
 
         # Create some layout windows
         # A window like a toolbar
-        win = wxSashLayoutWindow(self, self.ID_WINDOW_TOP, style = wxNO_BORDER|wxSW_3D)
+        win = wx.SashLayoutWindow(self, ID_WINDOW_TOP, style=wx.NO_BORDER|wx.SW_3D)
         win.SetDefaultSize((1000, 30))
         win.SetDefaultSize((1000, 30))
-        win.SetOrientation(wxLAYOUT_HORIZONTAL)
-        win.SetAlignment(wxLAYOUT_TOP)
-        win.SetBackgroundColour(wxColour(255, 0, 0))
-        win.SetSashVisible(wxSASH_BOTTOM, true)
+        win.SetOrientation(wx.LAYOUT_HORIZONTAL)
+        win.SetAlignment(wx.LAYOUT_TOP)
+        win.SetBackgroundColour(wx.Colour(255, 0, 0))
+        win.SetSashVisible(wx.SASH_BOTTOM, True)
 
         self.topWindow = win
 
 
         # A window like a statusbar
 
         self.topWindow = win
 
 
         # A window like a statusbar
-        win = wxSashLayoutWindow(self, self.ID_WINDOW_BOTTOM, style = wxNO_BORDER|wxSW_3D)
+        win = wx.SashLayoutWindow(self, ID_WINDOW_BOTTOM, style=wx.NO_BORDER|wx.SW_3D)
         win.SetDefaultSize((1000, 30))
         win.SetDefaultSize((1000, 30))
-        win.SetOrientation(wxLAYOUT_HORIZONTAL)
-        win.SetAlignment(wxLAYOUT_BOTTOM)
-        win.SetBackgroundColour(wxColour(0, 0, 255))
-        win.SetSashVisible(wxSASH_TOP, true)
+        win.SetOrientation(wx.LAYOUT_HORIZONTAL)
+        win.SetAlignment(wx.LAYOUT_BOTTOM)
+        win.SetBackgroundColour(wx.Colour(0, 0, 255))
+        win.SetSashVisible(wx.SASH_TOP, True)
 
         self.bottomWindow = win
 
 
         # A window to the left of the client window
 
         self.bottomWindow = win
 
 
         # A window to the left of the client window
-        win =  wxSashLayoutWindow(self, self.ID_WINDOW_LEFT1, style = wxNO_BORDER|wxSW_3D)
+        win =  wx.SashLayoutWindow(self, ID_WINDOW_LEFT1, style=wx.NO_BORDER|wx.SW_3D)
         win.SetDefaultSize((120, 1000))
         win.SetDefaultSize((120, 1000))
-        win.SetOrientation(wxLAYOUT_VERTICAL)
-        win.SetAlignment(wxLAYOUT_LEFT)
-        win.SetBackgroundColour(wxColour(0, 255, 0))
-        win.SetSashVisible(wxSASH_RIGHT, TRUE)
+        win.SetOrientation(wx.LAYOUT_VERTICAL)
+        win.SetAlignment(wx.LAYOUT_LEFT)
+        win.SetBackgroundColour(wx.Colour(0, 255, 0))
+        win.SetSashVisible(wx.SASH_RIGHT, True)
         win.SetExtraBorderSize(10)
         win.SetExtraBorderSize(10)
-        textWindow = wxTextCtrl(win, -1, "", wxDefaultPosition, wxDefaultSize,
-                                wxTE_MULTILINE|wxSUNKEN_BORDER)
+        textWindow = wx.TextCtrl(win, -1, "", style=wx.TE_MULTILINE|wx.SUNKEN_BORDER)
         textWindow.SetValue("A sub window")
 
         self.leftWindow1 = win
 
 
         # Another window to the left of the client window
         textWindow.SetValue("A sub window")
 
         self.leftWindow1 = win
 
 
         # Another window to the left of the client window
-        win = wxSashLayoutWindow(self, self.ID_WINDOW_LEFT2, style = wxNO_BORDER|wxSW_3D)
+        win = wx.SashLayoutWindow(self, ID_WINDOW_LEFT2, style=wx.NO_BORDER|wx.SW_3D)
         win.SetDefaultSize((120, 1000))
         win.SetDefaultSize((120, 1000))
-        win.SetOrientation(wxLAYOUT_VERTICAL)
-        win.SetAlignment(wxLAYOUT_LEFT)
-        win.SetBackgroundColour(wxColour(0, 255, 255))
-        win.SetSashVisible(wxSASH_RIGHT, TRUE)
+        win.SetOrientation(wx.LAYOUT_VERTICAL)
+        win.SetAlignment(wx.LAYOUT_LEFT)
+        win.SetBackgroundColour(wx.Colour(0, 255, 255))
+        win.SetSashVisible(wx.SASH_RIGHT, True)
 
         self.leftWindow2 = win
 
 
     def OnSashDrag(self, event):
 
         self.leftWindow2 = win
 
 
     def OnSashDrag(self, event):
-        if event.GetDragStatus() == wxSASH_STATUS_OUT_OF_RANGE:
+        if event.GetDragStatus() == wx.SASH_STATUS_OUT_OF_RANGE:
             return
 
         eID = event.GetId()
             return
 
         eID = event.GetId()
-        if eID == self.ID_WINDOW_TOP:
-            self.topWindow.SetDefaultSize(wxSize(1000, event.GetDragRect().height))
-
-        elif eID == self.ID_WINDOW_LEFT1:
-            self.leftWindow1.SetDefaultSize(wxSize(event.GetDragRect().width, 1000))
+        
+        if eID == ID_WINDOW_TOP:
+            self.topWindow.SetDefaultSize((1000, event.GetDragRect().height))
 
 
+        elif eID == ID_WINDOW_LEFT1:
+            self.leftWindow1.SetDefaultSize((event.GetDragRect().width, 1000))
 
 
-        elif eID == self.ID_WINDOW_LEFT2:
-            self.leftWindow2.SetDefaultSize(wxSize(event.GetDragRect().width, 1000))
+        elif eID == ID_WINDOW_LEFT2:
+            self.leftWindow2.SetDefaultSize((event.GetDragRect().width, 1000))
 
 
-        elif eID == self.ID_WINDOW_BOTTOM:
-            self.bottomWindow.SetDefaultSize(wxSize(1000, event.GetDragRect().height))
+        elif eID == ID_WINDOW_BOTTOM:
+            self.bottomWindow.SetDefaultSize((1000, event.GetDragRect().height))
 
 
-        wxLayoutAlgorithm().LayoutMDIFrame(self)
+        wx.LayoutAlgorithm().LayoutMDIFrame(self)
         self.GetClientWindow().Refresh()
 
 
     def OnSize(self, event):
         self.GetClientWindow().Refresh()
 
 
     def OnSize(self, event):
-        wxLayoutAlgorithm().LayoutMDIFrame(self)
+        wx.LayoutAlgorithm().LayoutMDIFrame(self)
 
 
     def OnExit(self, evt):
 
 
     def OnExit(self, evt):
-        self.Close(true)
+        self.Close(True)
 
 
     def OnNewWindow(self, evt):
         self.winCount = self.winCount + 1
 
 
     def OnNewWindow(self, evt):
         self.winCount = self.winCount + 1
-        win = wxMDIChildFrame(self, -1, "Child Window: %d" % self.winCount)
-        canvas = MyCanvas(win)
-        win.Show(true)
+        win = wx.MDIChildFrame(self, -1, "Child Window: %d" % self.winCount)
+        canvas = ScrolledWindow.MyCanvas(win)
+        win.Show(True)
 
 
 #----------------------------------------------------------------------
 
 if __name__ == '__main__':
 
 
 #----------------------------------------------------------------------
 
 if __name__ == '__main__':
-    class MyApp(wxApp):
+    class MyApp(wx.App):
         def OnInit(self):
         def OnInit(self):
+            wx.InitAllImageHandlers()
             frame = MyParentFrame()
             frame = MyParentFrame()
-            frame.Show(true)
+            frame.Show(True)
             self.SetTopWindow(frame)
             self.SetTopWindow(frame)
-            return true
-
+            return True
 
 
-    app = MyApp(0)
+    app = MyApp(False)
     app.MainLoop()
 
 
     app.MainLoop()
 
 
wxWidgets (Impactor)