X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/299647acac7960652aadb008775429c1f8ea9b8d..89e94a4bffda38bdb53d875f022982273f9580f2:/wxPython/demo/PopupControl.py?ds=sidebyside
diff --git a/wxPython/demo/PopupControl.py b/wxPython/demo/PopupControl.py
index d312a9319c..3cb7230171 100644
--- a/wxPython/demo/PopupControl.py
+++ b/wxPython/demo/PopupControl.py
@@ -1,15 +1,3 @@
-# 11/20/2003 - Jeff Grimmett (grimmtooth@softhome.net)
-#
-# o Updated for wx namespace
-#
-# 11/30/2003 - Jeff Grimmett (grimmtooth@softhome.net)
-#
-# o Is it just me or are the graphics for the control not lining up right?
-#
-# 12/20/2003 - Jeff Grimmett (grimmtooth@softhome.net)
-#
-# o wxPopupControl -> PopupControl
-#
import wx
import wx.lib.popupctl as pop
@@ -80,8 +68,14 @@ class TestPanel(wx.Panel):
#----------------------------------------------------------------------
def runTest(frame, nb, log):
- win = TestPanel(nb, log)
- return win
+ if wx.Platform == "__WXMAC__":
+ from Main import MessagePanel
+ win = MessagePanel(nb, 'This demo currently fails on the Mac.',
+ 'Sorry', wx.ICON_WARNING)
+ return win
+ else:
+ win = TestPanel(nb, log)
+ return win
#----------------------------------------------------------------------
@@ -89,12 +83,12 @@ overview = """
PopupControl
PopupControl is a class that can display a value and has a button
-that will popup another window similar to how a wxComboBox works. The
+that will popup another window similar to how a wx.ComboBox works. The
popup window can contain whatever is needed to edit the value. This
-example uses a wxCalendarCtrl.
+example uses a wx.CalendarCtrl.
-Currently a wxDialog is used for the popup. Eventually a
-wxPopupWindow should be used...
+
Currently a wx.Dialog is used for the popup. Eventually a
+wx.PopupWindow should be used...
"""
@@ -103,5 +97,5 @@ wxPopupWindow should be used...
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:])