rename wxRendererNative::DrawRadioButton() to DrawOptionButton() to avoid conflict...

[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..9d9244276537f69b62e741b83ed617baf2b2b519 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_
 
-#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,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()
@@ -79,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
@@ -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
@@ -149,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;