X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/a9102b3671a45d116d781b0c8e90d2e9a84fbdcb..3c029873c66cfdc0dcbf52958970273435ba02fc:/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 bcf66439ca..a32bab2f4e 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" @@ -67,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() @@ -116,6 +113,9 @@ public: // implementation only from now on // ------------------------------- + // Override in order to bypass wxToolBar's overridden function + virtual WXLRESULT MSWWindowProc(WXUINT nMsg, WXWPARAM wParam, WXLPARAM lParam); + virtual bool MSWCommand(WXUINT param, WXWORD id); // Return HMENU for the menu associated with the commandbar