X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/7dafb55fdec4ef71567ee1ccbf16d4461df8198f..8e77fd8bca165aab9709649d79a7cbc6a172d4e1:/include/wx/cocoa/toolbar.h diff --git a/include/wx/cocoa/toolbar.h b/include/wx/cocoa/toolbar.h index d8ccd336b9..29b4b632bf 100644 --- a/include/wx/cocoa/toolbar.h +++ b/include/wx/cocoa/toolbar.h @@ -17,10 +17,15 @@ // ======================================================================== // 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 +class WXDLLIMPEXP_CORE wxToolBar : public wxToolBarBase { DECLARE_DYNAMIC_CLASS(wxToolBar) // ------------------------------------------------------------------------ @@ -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;