fixed typo in wxString::swap() which was completely broken

[wxWidgets.git] / include / wx / os2 / toolbar.h

diff --git a/include/wx/os2/toolbar.h b/include/wx/os2/toolbar.h
index 828fc4dd67d1ae8446d6738c3cac8dc44a3f56b4..12d177e51e18be785f9dc5f9294f322adc9f1134 100644 (file)
--- a/include/wx/os2/toolbar.h
+++ b/include/wx/os2/toolbar.h
@@ -15,8 +15,6 @@
 #if wxUSE_TOOLBAR
 #include "wx/tbarbase.h"
 
-WXDLLEXPORT_DATA(extern const wxChar*) wxToolBarNameStr;
-
 class WXDLLEXPORT wxToolBar: public wxToolBarBase
 {
 public:
@@ -87,9 +85,10 @@ protected:
     virtual void DoSetToggle(wxToolBarToolBase *tool, bool toggle);
 
     virtual wxToolBarToolBase* CreateTool( int             vId
-                                          ,const wxBitmap& rBitmap1
-                                          ,const wxBitmap& rBitmap2
-                                          ,bool            bToggle
+                                          ,const wxString& rsLabel
+                                          ,const wxBitmap& rBitmapNormal
+                                          ,const wxBitmap& rBitmapDisabled
+                                          ,wxItemKind      vKind
                                           ,wxObject*       pClientData
                                           ,const wxString& rShortHelpString
                                           ,const wxString& rLongHelpString
@@ -100,8 +99,7 @@ protected:
     void UpdateSize(void);
 
     // override WndProc to process WM_SIZE
-    virtual MRESULT OS2WindowProc( HWND     hWnd
-                                  ,WXUINT   ulMsg
+    virtual MRESULT OS2WindowProc( WXUINT   ulMsg
                                   ,WXWPARAM wParam
                                   ,WXLPARAM lParam
                                  );