X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/2d3a90ce7a7899d7d0385b4b503038b3516d3e9e..b9ac87bc5cbe46227195e32c44e25831f8206e3c:/wxPython/demo/wxPopupWindow.py

diff --git a/wxPython/demo/wxPopupWindow.py b/wxPython/demo/wxPopupWindow.py
index c9ac6d4c18..0ee3df748c 100644
--- a/wxPython/demo/wxPopupWindow.py
+++ b/wxPython/demo/wxPopupWindow.py
@@ -1,5 +1,12 @@
 from wxPython.wx import *
 
+havePopupWindow = 1
+try:
+    wxPopupWindow
+except NameError:
+    havePopupWindow = 0
+    wxPopupWindow = wxPopupTransientWindow = wxWindow
+
 #---------------------------------------------------------------------------
 
 class TestPopup(wxPopupWindow):
@@ -48,34 +55,10 @@ class TestPopup(wxPopupWindow):
         self.ReleaseMouse()
 
     def OnRightUp(self, evt):
-        self.Show(false)
+        self.Show(False)
         self.Destroy()
 
 
-class TestPopupWithListbox(wxPopupWindow):
-    def __init__(self, parent, style, log):
-        wxPopupWindow.__init__(self, parent, style)
-        import keyword
-        self.lb = wxListBox(self, -1, choices = keyword.kwlist)
-
-        #sz = self.lb.GetBestSize()
-        self.SetSize((150, 75)) #sz)
-        self.lb.SetSize(self.GetClientSize())
-        self.lb.SetFocus()
-
-        EVT_LEFT_DOWN(self.lb, self.OnLeft)
-        EVT_LISTBOX(self, -1, self.OnListBox)
-
-
-    def OnLeft(self, evt):
-        print "OnLeft", evt.GetEventObject()
-        evt.Skip()
-    def OnListBox(self, evt):
-        print "OnListBox", evt.GetEventObject()
-        evt.Skip()
-
-
-
 class TestTransientPopup(wxPopupTransientWindow):
     """Adds a bit of text and mouse movement to the wxPopupWindow"""
     def __init__(self, parent, style, log):
@@ -97,7 +80,7 @@ class TestTransientPopup(wxPopupTransientWindow):
 
     def ProcessLeftDown(self, evt):
         self.log.write("ProcessLeftDown\n")
-        return false
+        return False
 
     def OnDismiss(self):
         self.log.write("OnDismiss\n")
@@ -115,8 +98,9 @@ class TestPanel(wxPanel):
         b = wxButton(self, -1, "Show wxPopupTransientWindow", (25, 95))
         EVT_BUTTON(self, b.GetId(), self.OnShowPopupTransient)
 
-        b = wxButton(self, -1, "Show wxPopupWindow with listbox", (25, 140))
-        EVT_BUTTON(self, b.GetId(), self.OnShowPopupListbox)
+        if 0:
+            b = wxButton(self, -1, "Show wxPopupWindow with listbox", (25, 140))
+            EVT_BUTTON(self, b.GetId(), self.OnShowPopupListbox)
 
 
     def OnShowPopup(self, evt):
@@ -129,7 +113,7 @@ class TestPanel(wxPanel):
         sz =  btn.GetSize()
         win.Position(pos, (0, sz.height))
 
-        win.Show(true)
+        win.Show(True)
 
 
     def OnShowPopupTransient(self, evt):
@@ -155,13 +139,40 @@ class TestPanel(wxPanel):
         sz =  btn.GetSize()
         win.Position(pos, (0, sz.height))
 
-        win.Show(true)
+        win.Show(True)
+
+class TestPopupWithListbox(wxPopupWindow):
+    def __init__(self, parent, style, log):
+        wxPopupWindow.__init__(self, parent, style)
+        import keyword
+        self.lb = wxListBox(self, -1, choices = keyword.kwlist)
+        #sz = self.lb.GetBestSize()
+        self.SetSize((150, 75)) #sz)
+        self.lb.SetSize(self.GetClientSize())
+        self.lb.SetFocus()
+        EVT_LEFT_DOWN(self.lb, self.OnLeft)
+        EVT_LISTBOX(self, -1, self.OnListBox)
+
+    def OnLeft(self, evt):
+        print "OnLeft", evt.GetEventObject()
+        evt.Skip()
+    def OnListBox(self, evt):
+        print "OnListBox", evt.GetEventObject()
+        evt.Skip()
+
+
 
 #---------------------------------------------------------------------------
 
 def runTest(frame, nb, log):
-    win = TestPanel(nb, log)
-    return win
+    if havePopupWindow:
+        win = TestPanel(nb, log)
+        return win
+    else:
+        dlg = wxMessageDialog(frame, 'wxPopupWindow is not available on this platform.',
+                          'Sorry', wxOK | wxICON_INFORMATION)
+        dlg.ShowModal()
+        dlg.Destroy()
 
 #---------------------------------------------------------------------------
 
@@ -170,3 +181,12 @@ def runTest(frame, nb, log):
 
 overview = """\
 """
+
+
+
+
+if __name__ == '__main__':
+    import sys,os
+    import run
+    run.main(['', os.path.basename(sys.argv[0])])
+