fixed all the other ports broken by controls labels in wxToolBar patch commit

git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@44906 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
This commit is contained in:
Vadim Zeitlin
2007-03-18 23:57:20 +00:00
parent 2a015b8917
commit 07d02e9ee0
13 changed files with 46 additions and 30 deletions

View File

@@ -54,10 +54,10 @@ public:
virtual void SetToolNormalBitmap(int id, const wxBitmap& bitmap);
virtual void SetToolDisabledBitmap(int id, const wxBitmap& bitmap);
static wxVisualAttributes
GetClassDefaultAttributes(wxWindowVariant variant = wxWINDOW_VARIANT_NORMAL);
// implementation from now on
// --------------------------
@@ -75,7 +75,7 @@ protected:
void GtkSetStyle();
virtual GdkWindow *GTKGetWindow(wxArrayGdkWindows& windows) const;
// implement base class pure virtuals
virtual bool DoInsertTool(size_t pos, wxToolBarToolBase *tool);
virtual bool DoDeleteTool(size_t pos, wxToolBarToolBase *tool);
@@ -92,7 +92,8 @@ protected:
wxObject *clientData,
const wxString& shortHelpString,
const wxString& longHelpString);
virtual wxToolBarToolBase *CreateTool(wxControl *control);
virtual wxToolBarToolBase *CreateTool(wxControl *control,
const wxString& label);
private:
DECLARE_DYNAMIC_CLASS(wxToolBar)