wxUniv toolbar compilation fixes

git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@14792 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2002-03-26 11:30:45 +00:00
parent fcb35b5f05
commit d448aec3f3
2 changed files with 27 additions and 24 deletions
--- a/include/wx/univ/toolbar.h
+++ b/include/wx/univ/toolbar.h
@@ -80,12 +80,13 @@ protected:
    virtual void DoSetToggle(wxToolBarToolBase *tool, bool toggle);

    virtual wxToolBarToolBase *CreateTool(int id,
-                                          const wxBitmap& bitmap1,
-                                          const wxBitmap& bitmap2,
-                                          bool toggle,
+                                          const wxString& label,
+                                          const wxBitmap& bmpNormal,
+                                          const wxBitmap& bmpDisabled,
+                                          wxItemKind kind,
                                          wxObject *clientData,
-                                          const wxString& shortHelpString,
-                                          const wxString& longHelpString);
+                                          const wxString& shortHelp,
+                                          const wxString& longHelp);
    virtual wxToolBarToolBase *CreateTool(wxControl *control);

    // implement wxUniversal methods