X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/8907154c1a8a6882c6797d1f16393ddfb23e7f3a..99c4be680622f58a48a04dfe0835b59d2c41afea:/include/wx/msw/wince/tbarwce.h?ds=sidebyside diff --git a/include/wx/msw/wince/tbarwce.h b/include/wx/msw/wince/tbarwce.h index 616b5c8234..9d92442765 100644 --- a/include/wx/msw/wince/tbarwce.h +++ b/include/wx/msw/wince/tbarwce.h @@ -19,7 +19,7 @@ // Smartphones don't have toolbars, so use a dummy class #ifdef __SMARTPHONE__ -class WXDLLEXPORT wxToolBar : public wxToolBarBase +class WXDLLIMPEXP_CORE wxToolBar : public wxToolBarBase { public: // ctors and dtor @@ -63,7 +63,8 @@ protected: wxObject *clientData, const wxString& shortHelp, const wxString& longHelp); - virtual wxToolBarToolBase *CreateTool(wxControl *control); + virtual wxToolBarToolBase *CreateTool(wxControl *control, + const wxString& label); private: DECLARE_EVENT_TABLE() @@ -75,9 +76,9 @@ private: // For __POCKETPC__ -#include "wx/msw/tbar95.h" +#include "wx/msw/toolbar.h" -class WXDLLEXPORT wxToolMenuBar : public wxToolBar +class WXDLLIMPEXP_CORE wxToolMenuBar : public wxToolBar { public: // ctors and dtor @@ -148,7 +149,8 @@ protected: wxObject *clientData, const wxString& shortHelp, const wxString& longHelp); - virtual wxToolBarToolBase *CreateTool(wxControl *control); + virtual wxToolBarToolBase *CreateTool(wxControl *control, + const wxString& label); // The menubar associated with this toolbar wxMenuBar* m_menuBar;