Applied wxImage -> wxCursor patch, tool window event table fix

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

diff --git a/include/wx/os2/toolbar.h b/include/wx/os2/toolbar.h
index 828fc4dd67d1ae8446d6738c3cac8dc44a3f56b4..566bbb530a900ce6543110197d4d5170acc89b1d 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:
@@ -100,8 +98,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
                                  );