X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/324eeecb3cdc9522e136af6670443148772b412a..c099b53353ec8c689681a1bc8f5117a584e4098d:/include/wx/palmos/toolbar.h diff --git a/include/wx/palmos/toolbar.h b/include/wx/palmos/toolbar.h index d31ac94067..a0db54f1c3 100644 --- a/include/wx/palmos/toolbar.h +++ b/include/wx/palmos/toolbar.h @@ -12,15 +12,11 @@ #ifndef _WX_TBAR95_H_ #define _WX_TBAR95_H_ -#if defined(__GNUG__) && !defined(NO_GCC_PRAGMA) - #pragma interface "toolbar.h" -#endif - #if wxUSE_TOOLBAR #include "wx/dynarray.h" -class WXDLLEXPORT wxToolBar : public wxToolBarBase +class WXDLLIMPEXP_CORE wxToolBar : public wxToolBarBase { public: // ctors and dtor @@ -87,7 +83,8 @@ protected: wxObject *clientData, const wxString& shortHelp, const wxString& longHelp); - virtual wxToolBarToolBase *CreateTool(wxControl *control); + virtual wxToolBarToolBase *CreateTool(wxControl *control, + const wxString& label); // return the appropriate size and flags for the toolbar control virtual wxSize DoGetBestSize() const; @@ -107,7 +104,7 @@ protected: private: DECLARE_EVENT_TABLE() DECLARE_DYNAMIC_CLASS(wxToolBar) - DECLARE_NO_COPY_CLASS(wxToolBar) + wxDECLARE_NO_COPY_CLASS(wxToolBar); }; #endif // wxUSE_TOOLBAR