don't try to remove -g flag from CFLAGS, it is not necessary and doesn't work correct...

[wxWidgets.git] / src / os2 / toolbar.cpp

diff --git a/src/os2/toolbar.cpp b/src/os2/toolbar.cpp
index fcdc62b7aa0741216116b46fa61236f95aa8d664..40f561de27a1cdad1d8e542326175c7ebec7c379 100644 (file)
--- a/src/os2/toolbar.cpp
+++ b/src/os2/toolbar.cpp
@@ -84,17 +84,19 @@ class wxToolBarTool : public wxToolBarToolBase
 public:
     inline wxToolBarTool( wxToolBar*      pTbar
                          ,int             vId
+                         ,const wxString& rsLabel
                          ,const wxBitmap& rBitmap1
                          ,const wxBitmap& rBitmap2
-                         ,bool            bToggle
+                         ,wxItemKind      vKind
                          ,wxObject*       pClientData
                          ,const wxString& rShortHelpString
                          ,const wxString& rLongHelpString
                         ) : wxToolBarToolBase( pTbar
                                               ,vId
+                                              ,rsLabel
                                               ,rBitmap1
                                               ,rBitmap2
-                                              ,bToggle
+                                              ,vKind
                                               ,pClientData
                                               ,rShortHelpString
                                               ,rLongHelpString
@@ -132,9 +134,10 @@ private:
 
 wxToolBarToolBase* wxToolBar::CreateTool(
   int                               nId
+, const wxString&                   rsLabel
 , const wxBitmap&                   rBitmap1
 , const wxBitmap&                   rBitmap2
-, bool                              bToggle
+, wxItemKind                        vKind
 , wxObject*                         pClientData
 , const wxString&                   rShortHelpString
 , const wxString&                   rLongHelpString
@@ -142,9 +145,10 @@ wxToolBarToolBase* wxToolBar::CreateTool(
 {
     return(new wxToolBarTool( this
                              ,nId
+                             ,rsLabel
                              ,rBitmap1
                              ,rBitmap2
-                             ,bToggle
+                             ,vKind
                              ,pClientData
                              ,rShortHelpString
                              ,rLongHelpString
@@ -187,6 +191,7 @@ bool wxToolBar::Create(
                        ,rPos
                        ,rSize
                        ,lStyle
+                      , wxDefaultValidator
                        ,rName
                       ))
         return(FALSE);
@@ -217,7 +222,7 @@ bool wxToolBar::Create(
     wxRGBToColour(m_backgroundColour, GetSysColor(COLOR_BTNFACE));
     m_foregroundColour = *wxBLACK;
 
-    SetFont(wxSystemSettings::GetSystemFont(wxSYS_DEFAULT_GUI_FONT));
+    SetFont(wxSystemSettings::GetFont(wxSYS_DEFAULT_GUI_FONT));
 
     // position it
     int x = pos.x;
@@ -918,8 +923,7 @@ void wxToolBar::OnMouseEvent(
 }
 
 MRESULT wxToolBar::OS2WindowProc(
-  HWND                              hWnd
-, WXUINT                            ulMsg
+  WXUINT                            ulMsg
 , MPARAM                            wParam
 , MPARAM                            lParam
 )