Associate/Disassociate now check for non-NULL pointer instead of requiring

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

diff --git a/wxPython/demo/infoframe.py b/wxPython/demo/infoframe.py
index 7f197714606378acc0853cad929657e980bb1904..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()
         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)
         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")
         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()
 ##             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)
 ##             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")
 ##             menu.Append(mID,"&Disable output","Close output frame")
 ##             EVT_MENU(self,mID,output.DisableOutput)
 ##             menubar.Append(menu,"&Output")