Refactor all code common to X11 OpenGL implementations into glx11.h/.cpp

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

diff --git a/include/wx/cocoa/toolbar.h b/include/wx/cocoa/toolbar.h
index d8ccd336b920b1d65f785b3c5924db80ffef05cd..09ca34917b77225ff0d2edd092c7160008ed8554 100644 (file)
--- a/include/wx/cocoa/toolbar.h
+++ b/include/wx/cocoa/toolbar.h
@@ -57,10 +57,12 @@ protected:
 // Cocoa
 // ------------------------------------------------------------------------
 protected:
+    virtual bool Cocoa_acceptsFirstMouse(bool &acceptsFirstMouse, WX_NSEvent theEvent);
     virtual bool Cocoa_drawRect(const NSRect &rect);
     virtual bool Cocoa_mouseDown(WX_NSEvent theEvent);
     virtual bool Cocoa_mouseDragged(WX_NSEvent theEvent);
     wxToolBarTool *CocoaFindToolForPosition(const NSPoint& pos) const;
+    void CocoaToolClickEnded();
 // ------------------------------------------------------------------------
 // Implementation
 // ------------------------------------------------------------------------
@@ -101,7 +103,8 @@ protected:
                                           wxObject *clientData,
                                           const wxString& shortHelpString,
                                           const wxString& longHelpString);
-    virtual wxToolBarToolBase *CreateTool(wxControl *control);
+    virtual wxToolBarToolBase *CreateTool(wxControl *control,
+                                          const wxString& label);
 
     wxSize m_bestSize;
     wxFrame *m_owningFrame;