two fixes from Justin Bradford

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

diff --git a/wxPython/demo/simple.py b/wxPython/demo/simple.py
index 3b4cdfca3558adf02dbf53c61f4502748aa8a6ad..07a750c639006bcf2a5374f8de078cdba0aa302f 100644 (file)
--- a/wxPython/demo/simple.py
+++ b/wxPython/demo/simple.py
@@ -5,42 +5,38 @@
 # structure of any wxPython application.
 #----------------------------------------------------------------------
 
 # structure of any wxPython application.
 #----------------------------------------------------------------------
 

-from wxPython.wx import *
+import wx                  # This module uses the new wx namespace

 
 

-class MyFrame(wxFrame):
+class MyFrame(wx.Frame):

     """
     This is MyFrame.  It just shows a few controls on a wxPanel,
     and has a simple menu.
     """
     def __init__(self, parent, title):
     """
     This is MyFrame.  It just shows a few controls on a wxPanel,
     and has a simple menu.
     """
     def __init__(self, parent, title):

-        wxFrame.__init__(self, parent, -1, title, size=(350, 200))
+        wx.Frame.__init__(self, parent, -1, title, size=(350, 200))

 
 

-        menuBar = wxMenuBar()
-        menu = wxMenu()
+        menuBar = wx.MenuBar()
+        menu = wx.Menu()

         menu.Append(101, "E&xit\tAlt-X", "Exit demo")
         menu.Append(101, "E&xit\tAlt-X", "Exit demo")

-        EVT_MENU(self, 101, self.OnButton)
+        wx.EVT_MENU(self, 101, self.OnButton)

         menuBar.Append(menu, "&File")
         self.SetMenuBar(menuBar)
 
         menuBar.Append(menu, "&File")
         self.SetMenuBar(menuBar)
 

-        panel = wxPanel(self, -1)
-        if wxPlatform == "__WXMAC__":
-            text = wxStaticText(panel, -1,
-                                "Hello World!\nWhere is my menu?")
-        else:
-            text = wxStaticText(panel, -1, "Hello World!")
-        text.SetFont(wxFont(12, wxSWISS, wxNORMAL, wxBOLD))
+        panel = wx.Panel(self, -1)
+        text = wx.StaticText(panel, -1, "Hello World!")
+        text.SetFont(wx.Font(12, wx.SWISS, wx.NORMAL, wx.BOLD))

         text.SetSize(text.GetBestSize())
         text.SetSize(text.GetBestSize())

-        btn = wxButton(panel, -1, "Close")
+        btn = wx.Button(panel, -1, "Close")

         btn.SetDefault()
 
         btn.SetDefault()
 

-        sizer = wxBoxSizer(wxVERTICAL)
-        sizer.Add(text, 0, wxALL, 10)
-        sizer.Add(btn, 0, wxALL, 10)
+        sizer = wx.BoxSizer(wx.VERTICAL)
+        sizer.Add(text, 0, wx.ALL, 10)
+        sizer.Add(btn, 0, wx.ALL, 10)

         panel.SetSizer(sizer)
         panel.SetSizer(sizer)

-        panel.SetAutoLayout(true)
+        panel.SetAutoLayout(True)

         panel.Layout()
 
         panel.Layout()
 

-        EVT_BUTTON(self, btn.GetId(), self.OnButton)
+        wx.EVT_BUTTON(self, btn.GetId(), self.OnButton)

 
 
     def OnButton(self, evt):
 
 
     def OnButton(self, evt):


@@ -48,8 +44,9 @@ class MyFrame(wxFrame):
         print "OnButton"
         self.Close()
 
         print "OnButton"
         self.Close()
 

-app = wxPySimpleApp()
+
+app = wx.PySimpleApp()

 frame = MyFrame(None, "Simple wxPython App")
 frame = MyFrame(None, "Simple wxPython App")

-frame.Show(true)
+frame.Show(True)

 app.MainLoop()
 
 app.MainLoop()