projects
/
wxWidgets.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
wxAny initial commit (closes #10932)
[wxWidgets.git]
/
src
/
cocoa
/
toolbar.mm
diff --git
a/src/cocoa/toolbar.mm
b/src/cocoa/toolbar.mm
index f6211e3c7901186c8e18870a4400ba596ce4d504..7d923ed9c284c30fc43528e9a0a489c74245ac46 100644
(file)
--- a/
src/cocoa/toolbar.mm
+++ b/
src/cocoa/toolbar.mm
@@
-60,8
+60,8
@@
public:
CreateButtonCell();
}
CreateButtonCell();
}
- wxToolBarTool(wxToolBar *tbar, wxControl *control)
- : wxToolBarToolBase(tbar, control)
+ wxToolBarTool(wxToolBar *tbar, wxControl *control
, const wxString& label
)
+ : wxToolBarToolBase(tbar, control
, label
)
{
Init();
}
{
Init();
}
@@
-208,9
+208,10
@@
wxToolBarToolBase *wxToolBar::CreateTool(int toolid,
clientData, shortHelpString, longHelpString);
}
clientData, shortHelpString, longHelpString);
}
-wxToolBarToolBase *wxToolBar::CreateTool(wxControl *control)
+wxToolBarToolBase *
+wxToolBar::CreateTool(wxControl *control, const wxString& label)
{
{
- return new wxToolBarTool(this, control);
+ return new wxToolBarTool(this, control
, label
);
}
void wxToolBar::SetWindowStyleFlag( long style )
}
void wxToolBar::SetWindowStyleFlag( long style )