X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/ea9aa80e7c667e2951ac0967da903d2b9ec5e2b6..44a007122460fd4967021656a30dbf85161fc53f:/include/wx/msw/wince/tbarwce.h diff --git a/include/wx/msw/wince/tbarwce.h b/include/wx/msw/wince/tbarwce.h index d9fefa88cc..8b4618e2a4 100644 --- a/include/wx/msw/wince/tbarwce.h +++ b/include/wx/msw/wince/tbarwce.h @@ -12,10 +12,6 @@ #ifndef _WX_BARWCE_H_ #define _WX_BARWCE_H_ -#if defined(__GNUG__) && !defined(NO_GCC_PRAGMA) - #pragma interface "tbarwce.h" -#endif - #if wxUSE_TOOLBAR #include "wx/dynarray.h" @@ -23,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 @@ -67,21 +63,22 @@ 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() DECLARE_DYNAMIC_CLASS(wxToolBar) - DECLARE_NO_COPY_CLASS(wxToolBar) + wxDECLARE_NO_COPY_CLASS(wxToolBar); }; #else // 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 @@ -152,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; @@ -160,7 +158,7 @@ protected: private: DECLARE_EVENT_TABLE() DECLARE_DYNAMIC_CLASS(wxToolMenuBar) - DECLARE_NO_COPY_CLASS(wxToolMenuBar) + wxDECLARE_NO_COPY_CLASS(wxToolMenuBar); }; #endif