a little whitespace cleanup

[wxWidgets.git] / wxPython / samples / pySketch / pySketch.py

diff --git a/wxPython/samples/pySketch/pySketch.py b/wxPython/samples/pySketch/pySketch.py
index 262a9abbcd35b20cd9322fef777a2c4d8b677b43..cf580fa5004b08d079e762ce319b10caba68d656 100644 (file)
--- a/wxPython/samples/pySketch/pySketch.py
+++ b/wxPython/samples/pySketch/pySketch.py
@@ -45,6 +45,8 @@
 import sys
 import cPickle, os.path
 import wx
 import sys
 import cPickle, os.path
 import wx

+from wx.lib.buttons import GenBitmapButton
+

 
 import traceback, types
 
 
 import traceback, types
 


@@ -208,25 +210,22 @@ class DrawingFrame(wx.Frame):
 
         # Create our toolbar.
 
 
         # Create our toolbar.
 

+        tsize = (16,16)

         self.toolbar = self.CreateToolBar(wx.TB_HORIZONTAL |
                                           wx.NO_BORDER | wx.TB_FLAT)
 
         self.toolbar.AddSimpleTool(wx.ID_NEW,
         self.toolbar = self.CreateToolBar(wx.TB_HORIZONTAL |
                                           wx.NO_BORDER | wx.TB_FLAT)
 
         self.toolbar.AddSimpleTool(wx.ID_NEW,

-                                   wx.Bitmap("images/new.bmp",
-                                            wx.BITMAP_TYPE_BMP),
+                                   wx.ArtProvider.GetBitmap(wx.ART_NEW, wx.ART_TOOLBAR, tsize),

                                    "New")
         self.toolbar.AddSimpleTool(wx.ID_OPEN,
                                    "New")
         self.toolbar.AddSimpleTool(wx.ID_OPEN,

-                                   wx.Bitmap("images/open.bmp",
-                                            wx.BITMAP_TYPE_BMP),
+                                   wx.ArtProvider.GetBitmap(wx.ART_FILE_OPEN, wx.ART_TOOLBAR, tsize),

                                    "Open")
         self.toolbar.AddSimpleTool(wx.ID_SAVE,
                                    "Open")
         self.toolbar.AddSimpleTool(wx.ID_SAVE,

-                                   wx.Bitmap("images/save.bmp",
-                                            wx.BITMAP_TYPE_BMP),
+                                   wx.ArtProvider.GetBitmap(wx.ART_FILE_SAVE, wx.ART_TOOLBAR, tsize),

                                    "Save")
         self.toolbar.AddSeparator()
         self.toolbar.AddSimpleTool(menu_UNDO,
                                    "Save")
         self.toolbar.AddSeparator()
         self.toolbar.AddSimpleTool(menu_UNDO,

-                                   wx.Bitmap("images/undo.bmp",
-                                            wx.BITMAP_TYPE_BMP),
+                                   wx.ArtProvider.GetBitmap(wx.ART_UNDO, wx.ART_TOOLBAR, tsize),

                                    "Undo")
         self.toolbar.AddSeparator()
         self.toolbar.AddSimpleTool(menu_DUPLICATE,
                                    "Undo")
         self.toolbar.AddSeparator()
         self.toolbar.AddSimpleTool(menu_DUPLICATE,


@@ -414,7 +413,6 @@ class DrawingFrame(wx.Frame):
         """ Respond to the user clicking on one of our tool icons.
         """
         iconID = event.GetEventObject().GetId()
         """ Respond to the user clicking on one of our tool icons.
         """
         iconID = event.GetEventObject().GetId()

-        print iconID

         if   iconID == id_SELECT:   self.doChooseSelectTool()
         elif iconID == id_LINE:     self.doChooseLineTool()
         elif iconID == id_RECT:     self.doChooseRectTool()
         if   iconID == id_SELECT:   self.doChooseSelectTool()
         elif iconID == id_LINE:     self.doChooseLineTool()
         elif iconID == id_RECT:     self.doChooseRectTool()


@@ -795,14 +793,14 @@ class DrawingFrame(wx.Frame):
         menu.Enable(menu_MOVE_BACKWARD, obj != self.contents[-1])
         menu.Enable(menu_MOVE_TO_BACK,  obj != self.contents[-1])
 
         menu.Enable(menu_MOVE_BACKWARD, obj != self.contents[-1])
         menu.Enable(menu_MOVE_TO_BACK,  obj != self.contents[-1])
 

-        EVT_MENU(self, menu_DUPLICATE,     self.doDuplicate)
-        EVT_MENU(self, menu_EDIT_TEXT,     self.doEditText)
-        EVT_MENU(self, menu_DELETE,        self.doDelete)
-        EVT_MENU(self, menu_MOVE_FORWARD,  self.doMoveForward)
-        EVT_MENU(self, menu_MOVE_TO_FRONT, self.doMoveToFront)
-        EVT_MENU(self, menu_MOVE_BACKWARD, self.doMoveBackward)
-        EVT_MENU(self, menu_MOVE_TO_BACK,  self.doMoveToBack)
-
+        self.Bind(wx.EVT_MENU, self.doDuplicate, id=menu_DUPLICATE)
+        self.Bind(wx.EVT_MENU, self.doEditText, id=menu_EDIT_TEXT)
+        self.Bind(wx.EVT_MENU, self.doDelete, id=menu_DELETE)
+        self.Bind(wx.EVT_MENU, self.doMoveForward, id=menu_MOVE_FORWARD)
+        self.Bind(wx.EVT_MENU, self.doMoveToFront, id=menu_MOVE_TO_FRONT)
+        self.Bind(wx.EVT_MENU, self.doMoveBackward, id=menu_MOVE_BACKWARD)
+        self.Bind(wx.EVT_MENU, self.doMoveToBack, id=menu_MOVE_TO_BACK)  
+                            

         # Show the pop-up menu.
 
         clickPt = wx.Point(mousePt.x + self.drawPanel.GetPosition().x,
         # Show the pop-up menu.
 
         clickPt = wx.Point(mousePt.x + self.drawPanel.GetPosition().x,


@@ -2232,7 +2230,7 @@ class DrawingObject:
 
 #----------------------------------------------------------------------------
 
 
 #----------------------------------------------------------------------------
 

-class ToolPaletteIcon(wx.BitmapButton):
+class ToolPaletteIcon(GenBitmapButton):

     """ An icon appearing in the tool palette area of our sketching window.
 
         Note that this is actually implemented as a wx.Bitmap rather
     """ An icon appearing in the tool palette area of our sketching window.
 
         Note that this is actually implemented as a wx.Bitmap rather


@@ -2251,7 +2249,7 @@ class ToolPaletteIcon(wx.BitmapButton):
             The icon name is used to get the appropriate bitmap for this icon.
         """
         bmp = wx.Bitmap("images/" + iconName + "Icon.bmp", wx.BITMAP_TYPE_BMP)
             The icon name is used to get the appropriate bitmap for this icon.
         """
         bmp = wx.Bitmap("images/" + iconName + "Icon.bmp", wx.BITMAP_TYPE_BMP)

-        wx.BitmapButton.__init__(self, parent, iconID, bmp, wx.DefaultPosition,
+        GenBitmapButton.__init__(self, parent, iconID, bmp, wx.DefaultPosition,

                                 wx.Size(bmp.GetWidth(), bmp.GetHeight()))
         self.SetToolTip(wx.ToolTip(toolTip))
 
                                 wx.Size(bmp.GetWidth(), bmp.GetHeight()))
         self.SetToolTip(wx.ToolTip(toolTip))