rewrote wxLocale to work in Unicode mode and support charsets better

[wxWidgets.git] / include / wx / univ / toolbar.h

diff --git a/include/wx/univ/toolbar.h b/include/wx/univ/toolbar.h
index 52d53e606b1770fc67d11357d43276e247a6bf6a..823888bda40f264e01a0f8cc0fee93d457421a17 100644 (file)
--- a/include/wx/univ/toolbar.h
+++ b/include/wx/univ/toolbar.h
@@ -129,11 +129,12 @@ private:
     wxCoord m_maxWidth,
             m_maxHeight;
     
-    // the current tool or NULL
+    // the tool over which the mouse currently is or NULL
     wxToolBarToolBase *m_toolCurrent;
 
-    // the currently pressed tool or NULL
-    wxToolBarToolBase *m_toolPressed;
+    // the tool which currently has the mouse capture (i.e. the one user is
+    // pressing) or NULL
+    wxToolBarTool *m_toolPressed;
 
     DECLARE_DYNAMIC_CLASS(wxToolBar)
 };
@@ -151,6 +152,8 @@ public:
     virtual bool HandleKey(wxInputConsumer *consumer,
                            const wxKeyEvent& event,
                            bool pressed);
+    virtual bool HandleMouse(wxInputConsumer *consumer,
+                             const wxMouseEvent& event);
     virtual bool HandleMouseMove(wxInputConsumer *consumer, const wxMouseEvent& event);
     virtual bool HandleFocus(wxInputConsumer *consumer, const wxFocusEvent& event);
     virtual bool HandleActivation(wxInputConsumer *consumer, bool activated);