Fixed bad merge...

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

diff --git a/wxPython/demo/infoframe.py b/wxPython/demo/infoframe.py
index 99507a654725318a571c4d1e8ca9353570f494bf..24ea6570e1ebe9fc6269929164ed3b5913627678 100644 (file)
--- a/wxPython/demo/infoframe.py
+++ b/wxPython/demo/infoframe.py
@@ -9,10 +9,10 @@ class MyFrame(wxFrame):
         wxFrame.__init__(self,None,-1,"Close me...",size=(300,100))
         menubar = wxMenuBar()
         menu = wxMenu()
-        mID = NewId()
+        mID = wxNewId()
         menu.Append(mID,"&Enable output","Display output frame")
         EVT_MENU(self,mID,output.EnableOutput)
-        mID = NewId()
+        mID = wxNewId()
         menu.Append(mID,"&Disable output","Close output frame")
         EVT_MENU(self,mID,output.DisableOutput)
         menubar.Append(menu,"&Output")
@@ -63,10 +63,10 @@ if __name__ == "__main__":
 ##             EVT_CLOSE(self,self.OnClose)
 ##             menubar = wxMenuBar()
 ##             menu = wxMenu()
-##             mID = NewId()
+##             mID = wxNewId()
 ##             menu.Append(mID,"&Enable output","Display output frame")
 ##             EVT_MENU(self,mID,output.EnableOutput)
-##             mID = NewId()
+##             mID = wxNewId()
 ##             menu.Append(mID,"&Disable output","Close output frame")
 ##             EVT_MENU(self,mID,output.DisableOutput)
 ##             menubar.Append(menu,"&Output")
@@ -82,14 +82,14 @@ if __name__ == "__main__":
         outputWindowClass = wxPyInformationalMessagesFrame
         def OnInit(self):
             frame = MyFrame(self.stdioWin)
-            frame.Show(TRUE)
+            frame.Show(True)
             self.SetTopWindow(frame)
             if isinstance(sys.stdout,wxPyInformationalMessagesFrame):
                 sys.stdout.SetParent(frame)
                 #self.redirectStdio(None)# this is done automatically
                 # by the MyApp(1) call below
             print "Starting.\n",
-            return true
+            return True
 
     app = MyApp(1)
     app.MainLoop()