Added Brian Victor's Patch

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

diff --git a/wxPython/demo/wxFrame.py b/wxPython/demo/wxFrame.py
index 6fbc2d013f796afe51b97a111308b38e88f0d823..b2028e6eb57b7bed1e3acdc56e7d1911b0698ad5 100644 (file)
--- a/wxPython/demo/wxFrame.py
+++ b/wxPython/demo/wxFrame.py
@@ -1,18 +1,25 @@
+# 11/18/2003 - Jeff Grimmett (grimmtooth@softhome.net)
+#
+# o Updated for wx namespace
+# 
 
-from wxPython.wx import *
+import  wx
 
 #---------------------------------------------------------------------------
 
-class MyFrame(wxFrame):
-    def __init__(self, parent, ID, title, pos=wxDefaultPosition,
-                 size=wxDefaultSize, style=wxDEFAULT_FRAME_STYLE):
-        wxFrame.__init__(self, parent, ID, title, pos, size, style)
-        panel = wxPanel(self, -1)
+class MyFrame(wx.Frame):
+    def __init__(
+            self, parent, ID, title, pos=wx.DefaultPosition,
+            size=wx.DefaultSize, style=wx.DEFAULT_FRAME_STYLE
+            ):
 
-        button = wxButton(panel, 1003, "Close Me")
-        button.SetPosition(wxPoint(15, 15))
-        EVT_BUTTON(self, 1003, self.OnCloseMe)
-        EVT_CLOSE(self, self.OnCloseWindow)
+        wx.Frame.__init__(self, parent, ID, title, pos, size, style)
+        panel = wx.Panel(self, -1)
+
+        button = wx.Button(panel, 1003, "Close Me")
+        button.SetPosition((15, 15))
+        self.Bind(wx.EVT_BUTTON, self.OnCloseMe, button)
+        self.Bind(wx.EVT_CLOSE, self.OnCloseWindow)
 
 
     def OnCloseMe(self, event):
@@ -25,7 +32,7 @@ class MyFrame(wxFrame):
 
 def runTest(frame, nb, log):
     win = MyFrame(frame, -1, "This is a wxFrame", size=(350, 200),
-                  style = wxDEFAULT_FRAME_STYLE)# |  wxFRAME_TOOL_WINDOW )
+                  style = wx.DEFAULT_FRAME_STYLE)# |  wx.FRAME_TOOL_WINDOW )
     frame.otherWin = win
     win.Show(True)
 
@@ -33,20 +40,30 @@ def runTest(frame, nb, log):
 #---------------------------------------------------------------------------
 
 
-
-
-
-
-
-
-
-
 overview = """\
+A Frame is a window whose size and position can (usually) be changed by 
+the user. It usually has thick borders and a title bar, and can optionally 
+contain a menu bar, toolbar and status bar. A frame can contain any window 
+that is not a Frame or Dialog. It is one of the most fundamental of the 
+wxWindows components. 
+
+A Frame that has a status bar and toolbar created via the 
+<code>CreateStatusBar</code> / <code>CreateToolBar</code> functions manages 
+these windows, and adjusts the value returned by <code>GetClientSize</code>
+to reflect the remaining size available to application windows.
+
+By itself, a Frame is not too useful, but with the addition of Panels and
+other child objects, it encompasses the framework around which most user
+interfaces are constructed.
+
+If you plan on using Sizers and auto-layout features, be aware that the Frame
+class lacks the ability to handle these features unless it contains a Panel.
+The Panel has all the necessary functionality to both control the size of
+child components, and also communicate that information in a useful way to
+the Frame itself.
 """
 
 
-
-
 if __name__ == '__main__':
     import sys,os
     import run