fix Union(empty rect) bug

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

diff --git a/wxPython/demo/wxPopupWindow.py b/wxPython/demo/wxPopupWindow.py
index 809024a675e4b04eb4b28a0dae03cbce596454bd..014e21c8a23fa8ed42eb3d46aa55afe480b7fd2e 100644 (file)
--- 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):
@@ -52,27 +59,6 @@ class TestPopup(wxPopupWindow):
         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):
@@ -112,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):
@@ -142,23 +129,50 @@ class TestPanel(wxPanel):
         win.Popup()
 
 
-##     def OnShowPopupListbox(self, evt):
-##         win = TestPopupWithListbox(self, wxNO_BORDER, self.log)
+    def OnShowPopupListbox(self, evt):
+        win = TestPopupWithListbox(self, wxNO_BORDER, self.log)
+
+        # Show the popup right below or above the button
+        # depending on available screen space...
+        btn = evt.GetEventObject()
+        pos = btn.ClientToScreen( (0,0) )
+        sz =  btn.GetSize()
+        win.Position(pos, (0, sz.height))
+
+        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()
 
-##         # Show the popup right below or above the button
-##         # depending on available screen space...
-##         btn = evt.GetEventObject()
-##         pos = btn.ClientToScreen( (0,0) )
-##         sz =  btn.GetSize()
-##         win.Position(pos, (0, sz.height))
 
-##         win.Show(true)
 
 #---------------------------------------------------------------------------
 
 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()
 
 #---------------------------------------------------------------------------
 
@@ -167,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])])
+