fixes

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

diff --git a/wxPython/demo/wxPopupWindow.py b/wxPython/demo/wxPopupWindow.py
index 809024a675e4b04eb4b28a0dae03cbce596454bd..0ee3df748cc6f33373573044495e72e42b6cb2f1 100644 (file)
--- a/wxPython/demo/wxPopupWindow.py
+++ b/wxPython/demo/wxPopupWindow.py
@@ -1,5 +1,12 @@
 from wxPython.wx import *
 
 from wxPython.wx import *
 

+havePopupWindow = 1
+try:
+    wxPopupWindow
+except NameError:
+    havePopupWindow = 0
+    wxPopupWindow = wxPopupTransientWindow = wxWindow
+

 #---------------------------------------------------------------------------
 
 class TestPopup(wxPopupWindow):
 #---------------------------------------------------------------------------
 
 class TestPopup(wxPopupWindow):


@@ -48,31 +55,10 @@ class TestPopup(wxPopupWindow):
         self.ReleaseMouse()
 
     def OnRightUp(self, evt):
         self.ReleaseMouse()
 
     def OnRightUp(self, evt):

-        self.Show(false)
+        self.Show(False)

         self.Destroy()
 
 
         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):
 class TestTransientPopup(wxPopupTransientWindow):
     """Adds a bit of text and mouse movement to the wxPopupWindow"""
     def __init__(self, parent, style, log):


@@ -94,7 +80,7 @@ class TestTransientPopup(wxPopupTransientWindow):
 
     def ProcessLeftDown(self, evt):
         self.log.write("ProcessLeftDown\n")
 
     def ProcessLeftDown(self, evt):
         self.log.write("ProcessLeftDown\n")

-        return false
+        return False

 
     def OnDismiss(self):
         self.log.write("OnDismiss\n")
 
     def OnDismiss(self):
         self.log.write("OnDismiss\n")


@@ -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 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):
 
 
     def OnShowPopup(self, evt):


@@ -126,7 +113,7 @@ class TestPanel(wxPanel):
         sz =  btn.GetSize()
         win.Position(pos, (0, sz.height))
 
         sz =  btn.GetSize()
         win.Position(pos, (0, sz.height))
 

-        win.Show(true)
+        win.Show(True)

 
 
     def OnShowPopupTransient(self, evt):
 
 
     def OnShowPopupTransient(self, evt):


@@ -142,23 +129,50 @@ class TestPanel(wxPanel):
         win.Popup()
 
 
         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):
 
 #---------------------------------------------------------------------------
 
 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 = """\
 """
 
 overview = """\
 """

+
+
+
+
+if __name__ == '__main__':
+    import sys,os
+    import run
+    run.main(['', os.path.basename(sys.argv[0])])
+