X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/655719367ac5e131d9642e5783f3ecf64d1a3385..55bfbcb92b41ab1c6a0d490f2f3fcadefc069bb7:/include/wx/cocoa/toolbar.h diff --git a/include/wx/cocoa/toolbar.h b/include/wx/cocoa/toolbar.h index d8ccd336b9..09ca34917b 100644 --- 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;