X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/77ffb5937e89927b621128789401db8921fe580f..333e57d578e9e0fb6555452b5a53698ffd85ee69:/include/wx/cocoa/toolbar.h?ds=sidebyside diff --git a/include/wx/cocoa/toolbar.h b/include/wx/cocoa/toolbar.h index fe7be92b61..e045df6523 100644 --- a/include/wx/cocoa/toolbar.h +++ b/include/wx/cocoa/toolbar.h @@ -6,7 +6,7 @@ // Created: 2003/08/17 // RCS-ID: $Id$ // Copyright: (c) 2003 David Elliott -// Licence: wxWidgets licence +// Licence: wxWindows licence ///////////////////////////////////////////////////////////////////////////// #ifndef __WX_COCOA_TOOLBAR_H__ @@ -17,7 +17,12 @@ // ======================================================================== // wxToolBar // ======================================================================== +#if defined(__LP64__) || defined(NS_BUILD_32_LIKE_64) +typedef struct CGPoint NSPoint; +#else typedef struct _NSPoint NSPoint; +#endif + class wxToolBarTool; class wxToolBar : public wxToolBarBase @@ -57,10 +62,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 +108,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;