Fix "warning: operation on 'y' may be undefined".

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

diff --git a/wxPython/demo/ToggleButton.py b/wxPython/demo/ToggleButton.py
index 7beec9983a6bb3e7db7d39035f3bcb89cd0f17c9..f03dd7f4b77c5564fd8a58853158c5c72f756d48 100644 (file)
--- a/wxPython/demo/ToggleButton.py
+++ b/wxPython/demo/ToggleButton.py
@@ -1,15 +1,8 @@
-# 11/21/2003 - Jeff Grimmett (grimmtooth@softhome.net)
-#
-# o Updated for wx namespace
-# 

 
 import  wx
 
 haveToggleBtn = 1
 
 import  wx
 
 haveToggleBtn = 1

-
-try:
-    wx.ToggleButton
-except NameError:
+if wx.Platform == "__WXX11__":

     haveToggleBtn = 0
 
 #----------------------------------------------------------------------
     haveToggleBtn = 0
 
 #----------------------------------------------------------------------


@@ -41,17 +34,17 @@ def runTest(frame, nb, log):
         win = TestPanel(nb, log)
         return win
     else:
         win = TestPanel(nb, log)
         return win
     else:

-        dlg = wx.MessageDialog(frame, 'wxToggleButton is not available on this platform.',
-                          'Sorry', wx.OK | wx.ICON_INFORMATION)
-        dlg.ShowModal()
-        dlg.Destroy()
+        from Main import MessagePanel
+        win = MessagePanel(nb, 'wx.ToggleButton is not available on this platform.',
+                           'Sorry', wx.ICON_WARNING)
+        return win

 
 
 #----------------------------------------------------------------------
 
 
 overview = """\
 
 
 #----------------------------------------------------------------------
 
 
 overview = """\

-wxToggleButton is a button that stays pressed when clicked by the user. 
+wx.ToggleButton is a button that stays pressed when clicked by the user. 

 In other words, it is similar to wxCheckBox in functionality but looks like a 
 wxButton.
 
 In other words, it is similar to wxCheckBox in functionality but looks like a 
 wxButton.
 


@@ -64,4 +57,4 @@ This class is only available under wxMSW and wxGTK currently.
 if __name__ == '__main__':
     import sys,os
     import run
 if __name__ == '__main__':
     import sys,os
     import run

-    run.main(['', os.path.basename(sys.argv[0])])
+    run.main(['', os.path.basename(sys.argv[0])] + sys.argv[1:])