check for wxUSE_TIMER in headers, not the files including them

[wxWidgets.git] / include / wx / msw / wince / tbarwce.h

diff --git a/include/wx/msw/wince/tbarwce.h b/include/wx/msw/wince/tbarwce.h
index bcf66439ca220973c62493bf1f4d8206c7124f6a..a32bab2f4e8e0afe4ac53e79434b59c99d12af5b 100644 (file)
--- 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_
 
 #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"
 #if wxUSE_TOOLBAR
 
 #include "wx/dynarray.h"


@@ -67,7 +63,8 @@ protected:
                                           wxObject *clientData,
                                           const wxString& shortHelp,
                                           const wxString& longHelp);
                                           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()
 
 private:
     DECLARE_EVENT_TABLE()


@@ -116,6 +113,9 @@ public:
     // implementation only from now on
     // -------------------------------
 
     // 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
     virtual bool MSWCommand(WXUINT param, WXWORD id);
 
     // Return HMENU for the menu associated with the commandbar