X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/3b60ea2f22359e044a667dcf33e41040f6c97e26..09b895cb4a954494063eb17d3dc302a654fd99e5:/include/wx/cocoa/toolbar.h diff --git a/include/wx/cocoa/toolbar.h b/include/wx/cocoa/toolbar.h index 6371c261de..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) // ------------------------------------------------------------------------ @@ -103,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;