added labels support for toolbar controls for wxMac and wxMSW (modified patch 1613603)

git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@44903 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2007-03-18 23:13:18 +00:00
parent 88c23b64c7
commit cdb11cb99e
13 changed files with 235 additions and 105 deletions
--- a/include/wx/univ/toolbar.h
+++ b/include/wx/univ/toolbar.h
@@ -98,7 +98,8 @@ protected:
                                          wxObject *clientData,
                                          const wxString& shortHelp,
                                          const wxString& longHelp);
-    virtual wxToolBarToolBase *CreateTool(wxControl *control);
+    virtual wxToolBarToolBase *CreateTool(wxControl *control,
+                                          const wxString& label);

    virtual wxSize DoGetBestClientSize() const;
    virtual void DoSetSize(int x, int y,