why was this class made a wxControlContainer (rev. 1.7), this doesn't seem to make...

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

diff --git a/src/univ/toolbar.cpp b/src/univ/toolbar.cpp
index fafb168d02de42e17de369ecd73b597305f24139..ccdff2fd2c40a07b424ffa4942009fe3e68ee5ff 100644 (file)
--- a/src/univ/toolbar.cpp
+++ b/src/univ/toolbar.cpp
@@ -104,8 +104,8 @@ public:
         m_underMouse = false;
     }
 
         m_underMouse = false;
     }
 

-    wxToolBarTool(wxToolBar *tbar, wxControl *control)
-        : wxToolBarToolBase(tbar, control)
+    wxToolBarTool(wxToolBar *tbar, wxControl *control, const wxString& label)
+        : wxToolBarToolBase(tbar, control, label)

     {
         // no position yet
         m_x =
     {
         // no position yet
         m_x =


@@ -190,6 +190,8 @@ bool wxToolBar::Create(wxWindow *parent,
         return false;
     }
 
         return false;
     }
 

+    FixupStyle();
+

     CreateInputHandler(wxINP_HANDLER_TOOLBAR);
 
     SetInitialSize(size);
     CreateInputHandler(wxINP_HANDLER_TOOLBAR);
 
     SetInitialSize(size);


@@ -326,9 +328,10 @@ wxToolBarToolBase *wxToolBar::CreateTool(int id,
                              clientData, shortHelp, longHelp);
 }
 
                              clientData, shortHelp, longHelp);
 }
 

-wxToolBarToolBase *wxToolBar::CreateTool(wxControl *control)
+wxToolBarToolBase *
+wxToolBar::CreateTool(wxControl *control, const wxString& label)

 {
 {

-    return new wxToolBarTool(this, control);
+    return new wxToolBarTool(this, control, label);

 }
 
 // ----------------------------------------------------------------------------
 }
 
 // ----------------------------------------------------------------------------