fixed the last of the off-by-one errors (some are refixed, again...)

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

diff --git a/wxPython/demo/wxToolBar.py b/wxPython/demo/wxToolBar.py
index 81f6009ad718015ab675c5216eaa7d0164b90230..d2a2267866c74c2eca068e99ec59bd61af758c95 100644 (file)
--- a/wxPython/demo/wxToolBar.py
+++ b/wxPython/demo/wxToolBar.py
@@ -1,6 +1,8 @@
 
 from wxPython.wx import *
 
 
 from wxPython.wx import *
 

+import images
+

 #---------------------------------------------------------------------------
 
 class TestToolBar(wxFrame):
 #---------------------------------------------------------------------------
 
 class TestToolBar(wxFrame):


@@ -8,47 +10,49 @@ class TestToolBar(wxFrame):
         wxFrame.__init__(self, parent, -1, 'Test ToolBar',
                          wxPoint(0,0), wxSize(500, 300))
         self.log = log
         wxFrame.__init__(self, parent, -1, 'Test ToolBar',
                          wxPoint(0,0), wxSize(500, 300))
         self.log = log

+        self.timer = None
+        EVT_CLOSE(self, self.OnCloseWindow)

 
         wxWindow(self, -1).SetBackgroundColour(wxNamedColour("WHITE"))
 
 
         wxWindow(self, -1).SetBackgroundColour(wxNamedColour("WHITE"))
 

-        tb = self.CreateToolBar(wxTB_HORIZONTAL|wxNO_BORDER) #|wxTB_FLAT)
-        #tb = wxToolBar(self, -1, wxDefaultPosition, wxDefaultSize,
+        tb = self.CreateToolBar(wxTB_HORIZONTAL|wxNO_BORDER|wxTB_FLAT)
+        # wxTB_VERTICAL
+        #tb = wxToolBarSimple(self, -1, wxDefaultPosition, wxDefaultSize,

         #               wxTB_HORIZONTAL | wxNO_BORDER | wxTB_FLAT)
         #self.SetToolBar(tb)
 
         self.CreateStatusBar()
 
         #               wxTB_HORIZONTAL | wxNO_BORDER | wxTB_FLAT)
         #self.SetToolBar(tb)
 
         self.CreateStatusBar()
 

-        tb.AddSimpleTool(10, wxBitmap('bitmaps/new.bmp',   wxBITMAP_TYPE_BMP),
-                         "New", "Long help for 'New'")
+        tb.AddSimpleTool(10, images.getNewBitmap(), "New", "Long help for 'New'")

         EVT_TOOL(self, 10, self.OnToolClick)
         EVT_TOOL_RCLICKED(self, 10, self.OnToolRClick)
 
         EVT_TOOL(self, 10, self.OnToolClick)
         EVT_TOOL_RCLICKED(self, 10, self.OnToolRClick)
 

-        tb.AddSimpleTool(20, wxBitmap('bitmaps/open.bmp',  wxBITMAP_TYPE_BMP), "Open")
+        tb.AddSimpleTool(20, images.getOpenBitmap(), "Open", "Long help for 'Open'")

         EVT_TOOL(self, 20, self.OnToolClick)
         EVT_TOOL_RCLICKED(self, 20, self.OnToolRClick)
 
         tb.AddSeparator()
         EVT_TOOL(self, 20, self.OnToolClick)
         EVT_TOOL_RCLICKED(self, 20, self.OnToolRClick)
 
         tb.AddSeparator()

-        tb.AddSimpleTool(30, wxBitmap('bitmaps/copy.bmp',  wxBITMAP_TYPE_BMP), "Copy")
+        tb.AddSimpleTool(30, images.getCopyBitmap(), "Copy", "Long help for 'Copy'")

         EVT_TOOL(self, 30, self.OnToolClick)
         EVT_TOOL_RCLICKED(self, 30, self.OnToolRClick)
 
         EVT_TOOL(self, 30, self.OnToolClick)
         EVT_TOOL_RCLICKED(self, 30, self.OnToolRClick)
 

-        tb.AddSimpleTool(40, wxBitmap('bitmaps/paste.bmp', wxBITMAP_TYPE_BMP), "Paste")
+        tb.AddSimpleTool(40, images.getPasteBitmap(), "Paste", "Long help for 'Paste'")

         EVT_TOOL(self, 40, self.OnToolClick)
         EVT_TOOL_RCLICKED(self, 40, self.OnToolRClick)
 
         tb.AddSeparator()
 
         EVT_TOOL(self, 40, self.OnToolClick)
         EVT_TOOL_RCLICKED(self, 40, self.OnToolRClick)
 
         tb.AddSeparator()
 

-        tool = tb.AddTool(50, wxBitmap('bitmaps/tog1.bmp', wxBITMAP_TYPE_BMP),
+        tool = tb.AddTool(50, images.getTog1Bitmap(),

                           shortHelpString="Toggle this", isToggle=true)
         EVT_TOOL(self, 50, self.OnToolClick)
                           shortHelpString="Toggle this", isToggle=true)
         EVT_TOOL(self, 50, self.OnToolClick)

-        EVT_TOOL_RCLICKED(self, 50, self.OnToolRClick)

 
 

-        tb.AddTool(60, wxBitmap('bitmaps/tog1.bmp', wxBITMAP_TYPE_BMP),
-                   wxBitmap('bitmaps/tog2.bmp', wxBITMAP_TYPE_BMP),
+        tb.AddTool(60, images.getTog1Bitmap(), images.getTog2Bitmap(),

                    shortHelpString="Toggle with 2 bitmaps", isToggle=true)
         EVT_TOOL(self, 60, self.OnToolClick)
                    shortHelpString="Toggle with 2 bitmaps", isToggle=true)
         EVT_TOOL(self, 60, self.OnToolClick)

-        EVT_TOOL_RCLICKED(self, 60, self.OnToolRClick)

 
 

+        EVT_TOOL_ENTER(self, -1, self.OnToolEnter)
+        EVT_TOOL_RCLICKED(self, -1, self.OnToolRClick)  # Match all
+        EVT_TIMER(self, -1, self.OnClearSB)

 
         tb.AddSeparator()
         cbID = wxNewId()
 
         tb.AddSeparator()
         cbID = wxNewId()


@@ -57,12 +61,8 @@ class TestToolBar(wxFrame):
         EVT_COMBOBOX(self, cbID, self.OnCombo)
 
         tb.Realize()
         EVT_COMBOBOX(self, cbID, self.OnCombo)
 
         tb.Realize()

-        EVT_CLOSE(self, self.OnCloseWindow)

 
 
 
 

-    def OnCloseWindow(self, event):
-        self.Destroy()
-

     def OnToolClick(self, event):
         self.log.WriteText("tool %s clicked\n" % event.GetId())
 
     def OnToolClick(self, event):
         self.log.WriteText("tool %s clicked\n" % event.GetId())
 


@@ -72,6 +72,27 @@ class TestToolBar(wxFrame):
     def OnCombo(self, event):
         self.log.WriteText("combobox item selected: %s\n" % event.GetString())
 
     def OnCombo(self, event):
         self.log.WriteText("combobox item selected: %s\n" % event.GetString())
 

+    def OnToolEnter(self, event):
+        self.log.WriteText('OnToolEnter: %s, %s\n' % (event.GetId(), event.GetInt()))
+        if self.timer is None:
+            self.timer = wxTimer(self)
+        if self.timer.IsRunning():
+            self.timer.Stop()
+        self.timer.Start(2000)
+        event.Skip()
+
+
+    def OnClearSB(self, event):  # called for the timer event handler
+        self.SetStatusText("")
+        self.timer.Stop()
+        self.timer = None
+
+
+    def OnCloseWindow(self, event):
+        if self.timer is not None:
+            self.timer.Stop()
+            self.timer = None
+        self.Destroy()

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


@@ -98,37 +119,5 @@ def runTest(frame, nb, log):
 
 
 overview = """\
 
 
 overview = """\

-The name wxToolBar is defined to be a synonym for one of the following classes:
-
-wxToolBar95 The native Windows 95 toolbar. Used on Windows 95, NT 4 and above.
-
-wxToolBarMSW A Windows implementation. Used on 16-bit Windows.
-
-wxToolBarGTK The GTK toolbar.
-
-wxToolBarSimple A simple implementation, with scrolling. Used on platforms with no native toolbar control, or where scrolling is required.
-
-wxToolBar()
------------------------
-
-Default constructor.
-
-wxToolBar(wxWindow* parent, wxWindowID id, const wxPoint& pos = wxDefaultPosition, const wxSize& size = wxDefaultSize, long style = wxTB_HORIZONTAL | wxNO_BORDER, const wxString& name = wxPanelNameStr)
-
-Constructs a toolbar.
-
-Parameters
--------------------
-
-parent = Pointer to a parent window.
-
-id = Window identifier. If -1, will automatically create an identifier.
-
-pos = Window position. wxDefaultPosition is (-1, -1) which indicates that wxWindows should generate a default position for the window. If using the wxWindow class directly, supply an actual position.
-
-size = Window size. wxDefaultSize is (-1, -1) which indicates that wxWindows should generate a default size for the window.
-
-style = Window style. See wxToolBar for details.

 
 

-name = Window name.

 """
 """