From: Robin Dunn Date: Mon, 15 Mar 2004 22:45:00 +0000 (+0000) Subject: Give BitmapButton its own demo, get rid of ErrorDialogs X-Git-Url: https://git.saurik.com/wxWidgets.git/commitdiff_plain/8b7fa2d9691bc34339e38684a798e9ab3f711e13 Give BitmapButton its own demo, get rid of ErrorDialogs git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@26216 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775 --- diff --git a/wxPython/demo/BitmapButton.py b/wxPython/demo/BitmapButton.py new file mode 100644 index 0000000000..c28562d38b --- /dev/null +++ b/wxPython/demo/BitmapButton.py @@ -0,0 +1,70 @@ + +import wx +import images + +#---------------------------------------------------------------------- + +class TestPanel(wx.Panel): + def __init__(self, parent, log): + wx.Panel.__init__(self, parent, -1, + style=wx.NO_FULL_REPAINT_ON_RESIZE) + self.log = log + + if 0: # a test case for catching wx.PyAssertionError + + #wx.GetApp().SetAssertMode(wx.PYAPP_ASSERT_SUPPRESS) + #wx.GetApp().SetAssertMode(wx.PYAPP_ASSERT_EXCEPTION) + #wx.GetApp().SetAssertMode(wx.PYAPP_ASSERT_DIALOG) + #wx.GetApp().SetAssertMode(wx.PYAPP_ASSERT_EXCEPTION | wx.PYAPP_ASSERT_DIALOG) + + try: + bmp = wx.Bitmap("nosuchfile.bmp", wx.BITMAP_TYPE_BMP) + mask = wx.MaskColour(bmp, wx.BLUE) + except wx.PyAssertionError: + self.log.write("Caught wx.PyAssertionError! I will fix the problem.\n") + bmp = images.getTest2Bitmap() + mask = wx.MaskColour(bmp, wx.BLUE) + else: + bmp = images.getTest2Bitmap() + mask = wx.MaskColour(bmp, wx.BLUE) + + bmp.SetMask(mask) + b = wx.BitmapButton(self, 30, bmp, (20, 20), + (bmp.GetWidth()+10, bmp.GetHeight()+10)) + b.SetToolTipString("This is a bitmap button.") + self.Bind(wx.EVT_BUTTON, self.OnClick, b) + + + def OnClick(self, event): + self.log.write("Click! (%d)\n" % event.GetId()) + + +#---------------------------------------------------------------------- + +def runTest(frame, nb, log): + win = TestPanel(nb, log) + return win + +#---------------------------------------------------------------------- + + +overview = """ +

StaticBitmap

+ +

A StaticBitmap control displays a bitmap. It can have a separate bitmap for each button state: normal, selected, disabled.

+ +

The bitmaps to be displayed should have a small number of colours, such as 16, +to avoid palette problems.

+ +

A bitmap can be derived from most image formats using the wx.Image class.

+ + +""" + + + +if __name__ == '__main__': + import sys,os + import run + run.main(['', os.path.basename(sys.argv[0])] + sys.argv[1:]) + diff --git a/wxPython/demo/Button.py b/wxPython/demo/Button.py index 49d0a1aad4..85fbae4c77 100644 --- a/wxPython/demo/Button.py +++ b/wxPython/demo/Button.py @@ -1,6 +1,5 @@ import wx -import images #---------------------------------------------------------------------- @@ -15,46 +14,17 @@ class TestPanel(wx.Panel): b.SetDefault() b.SetSize(b.GetBestSize()) - b = wx.Button(self, 20, "HELLO AGAIN!", (20, 80), (120, 45)) + b = wx.Button(self, 20, "HELLO AGAIN!", (20, 80)) ##, (120, 45)) self.Bind(wx.EVT_BUTTON, self.OnClick, b) b.SetToolTipString("This is a Hello button...") - if 0: # a test case for catching wx.PyAssertionError - - #wx.GetApp().SetAssertMode(wx.PYAPP_ASSERT_SUPPRESS) - #wx.GetApp().SetAssertMode(wx.PYAPP_ASSERT_EXCEPTION) - #wx.GetApp().SetAssertMode(wx.PYAPP_ASSERT_DIALOG) - #wx.GetApp().SetAssertMode(wx.PYAPP_ASSERT_EXCEPTION | wx.PYAPP_ASSERT_DIALOG) - - try: - bmp = wx.Bitmap("nosuchfile.bmp", wx.BITMAP_TYPE_BMP) - mask = wx.MaskColour(bmp, wx.BLUE) - except wx.PyAssertionError: - self.log.write("Caught wx.PyAssertionError! I will fix the problem.\n") - bmp = images.getTest2Bitmap() - mask = wx.MaskColour(bmp, wx.BLUE) - else: - bmp = images.getTest2Bitmap() - mask = wx.MaskColour(bmp, wx.BLUE) - - bmp.SetMask(mask) - b = wx.BitmapButton(self, 30, bmp, (260, 20), - (bmp.GetWidth()+10, bmp.GetHeight()+10)) - b.SetToolTipString("This is a bitmap button.") - self.Bind(wx.EVT_BUTTON, self.OnClick, b) - - b = wx.Button(self, 40, "Flat Button?", (20,150), style=wx.NO_BORDER) - b.SetToolTipString("This button has a style flag of wx.NO_BORDER") + b.SetToolTipString("This button has a style flag of wx.NO_BORDER. On some platforms that will give it a flattened look.") self.Bind(wx.EVT_BUTTON, self.OnClick, b) def OnClick(self, event): self.log.write("Click! (%d)\n" % event.GetId()) - ##wxLogDebug("debug message") - - -## wxLog_SetLogLevel(wxLOG_Message) # ignore everything above wxLOG_Message #---------------------------------------------------------------------- diff --git a/wxPython/demo/Main.py b/wxPython/demo/Main.py index 14abd512b7..574387f1e1 100644 --- a/wxPython/demo/Main.py +++ b/wxPython/demo/Main.py @@ -68,7 +68,7 @@ _treeList = [ # dialogs from libraries ('More Dialogs', [ - 'ErrorDialogs', + ##'ErrorDialogs', 'ImageBrowser', 'MultipleChoiceDialog', 'ScrolledMessageDialog', @@ -76,6 +76,7 @@ _treeList = [ # core controls ('Core Windows/Controls', [ + 'BitmapButton', 'Button', 'CheckBox', 'CheckListBox', @@ -173,7 +174,7 @@ _treeList = [ ('Process and Events', [ 'EventManager', 'KeyEvents', - 'OOR', + ##'OOR', 'Process', 'PythonEvents', 'Threads', diff --git a/wxPython/wx/lib/ErrorDialogs.py b/wxPython/wx/lib/ErrorDialogs.py index 5be4ea7119..bff5bb0173 100644 --- a/wxPython/wx/lib/ErrorDialogs.py +++ b/wxPython/wx/lib/ErrorDialogs.py @@ -142,6 +142,23 @@ FOR INTERNATIONAL [NON-ENGLISH-SPEAKING] USE: """ + +#---------------------------------------------------------------------- +import warnings + +warningmsg = r"""\ + +##############################################################\ +# THIS MODULE IS DEPRECATED | +##############################################################/ + +""" + +warnings.warn(warningmsg, DeprecationWarning, stacklevel=2) + +#---------------------------------------------------------------------- + + _debug = 0 #_debug = 1 # uncomment to display some information (to stdout) Version = 1.3