wxCheckListBox doesn't require wxUSE_OWNER_DRAWN when using WXUNIVERSAL

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

diff --git a/wxPython/demo/PopupWindow.py b/wxPython/demo/PopupWindow.py
index daea319286cd72793595a390e9b0e71fb2e6ff44..238f715f86af14ff5a3bf5e9f229d54e3b1471ba 100644 (file)
--- a/wxPython/demo/PopupWindow.py
+++ b/wxPython/demo/PopupWindow.py
@@ -9,9 +9,7 @@
 import  wx
 
 havePopupWindow = 1
 import  wx
 
 havePopupWindow = 1

-try:
-    wx.PopupWindow
-except NameError:
+if wx.Platform == '__WXMAC__':

     havePopupWindow = 0
     wx.PopupWindow = wx.PopupTransientWindow = wx.Window
 
     havePopupWindow = 0
     wx.PopupWindow = wx.PopupTransientWindow = wx.Window
 


@@ -50,7 +48,10 @@ class TestPopup(wx.PopupWindow):
         st.Bind(wx.EVT_LEFT_UP, self.OnMouseLeftUp)
         st.Bind(wx.EVT_RIGHT_UP, self.OnRightUp)
 
         st.Bind(wx.EVT_LEFT_UP, self.OnMouseLeftUp)
         st.Bind(wx.EVT_RIGHT_UP, self.OnRightUp)
 

+        wx.CallAfter(self.Refresh)
+

     def OnMouseLeftDown(self, evt):
     def OnMouseLeftDown(self, evt):

+        self.Refresh()

         self.ldPos = evt.GetEventObject().ClientToScreen(evt.GetPosition())
         self.wPos = self.ClientToScreen((0,0))
         self.CaptureMouse()
         self.ldPos = evt.GetEventObject().ClientToScreen(evt.GetPosition())
         self.wPos = self.ClientToScreen((0,0))
         self.CaptureMouse()


@@ -75,9 +76,8 @@ class TestTransientPopup(wx.PopupTransientWindow):
     def __init__(self, parent, style, log):
         wx.PopupTransientWindow.__init__(self, parent, style)
         self.log = log
     def __init__(self, parent, style, log):
         wx.PopupTransientWindow.__init__(self, parent, style)
         self.log = log

-        panel = wx.Panel(self, -1)
-        panel.SetBackgroundColour("#FFB6C1")
-        st = wx.StaticText(panel, -1,
+        self.SetBackgroundColour("#FFB6C1")
+        st = wx.StaticText(self, -1,

                           "wx.PopupTransientWindow is a\n"
                           "wx.PopupWindow which disappears\n"
                           "automatically when the user\n"
                           "wx.PopupTransientWindow is a\n"
                           "wx.PopupWindow which disappears\n"
                           "automatically when the user\n"


@@ -87,8 +87,7 @@ class TestTransientPopup(wx.PopupTransientWindow):
                           ,
                           pos=(10,10))
         sz = st.GetBestSize()
                           ,
                           pos=(10,10))
         sz = st.GetBestSize()

-        panel.SetSize( (sz.width+20, sz.height+20) )
-        self.SetSize(panel.GetSize())
+        self.SetSize( (sz.width+20, sz.height+20) )

 
     def ProcessLeftDown(self, evt):
         self.log.write("ProcessLeftDown\n")
 
     def ProcessLeftDown(self, evt):
         self.log.write("ProcessLeftDown\n")


@@ -131,7 +130,9 @@ class TestPanel(wx.Panel):
 
 
     def OnShowPopupTransient(self, evt):
 
 
     def OnShowPopupTransient(self, evt):

-        win = TestTransientPopup(self, wx.SIMPLE_BORDER, self.log)
+        win = TestTransientPopup(self,
+                                 wx.SIMPLE_BORDER,
+                                 self.log)

 
         # Show the popup right below or above the button
         # depending on available screen space...
 
         # Show the popup right below or above the button
         # depending on available screen space...


@@ -195,13 +196,10 @@ def runTest(frame, nb, log):
         win = TestPanel(nb, log)
         return win
     else:
         win = TestPanel(nb, log)
         return win
     else:

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

 
 #---------------------------------------------------------------------------
 
 
 #---------------------------------------------------------------------------
 


@@ -213,5 +211,5 @@ overview = """\
 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:])