Amebis/wxWidgets
1
0
Fork 0
Code Issues Pull Requests Actions 8 Packages Projects Releases Wiki Activity

Document the non-deprecated version of InsertTool, and some other tweaks.

Browse Source 
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@70855 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
This commit is contained in:
Robin Dunn
2012-03-10 00:01:15 +00:00
parent f2b6dd8c50
commit b23ea17884
1 changed files with 12 additions and 16 deletions
Download Patch File Download Diff File Expand all files Collapse all files

28
interface/wx/toolbar.h
View File

@@ -98,7 +98,6 @@ public:
wxControl *GetControl() const; wxControl *GetControl() const;
wxToolBarBase *GetToolBar() const; wxToolBarBase *GetToolBar() const;
// style/kind
bool IsStretchable() const; bool IsStretchable() const;
bool IsButton() const; bool IsButton() const;
bool IsControl() const; bool IsControl() const;
@@ -108,12 +107,10 @@ public:
wxItemKind GetKind() const; wxItemKind GetKind() const;
void MakeStretchable(); void MakeStretchable();
// state
bool IsEnabled() const; bool IsEnabled() const;
bool IsToggled() const; bool IsToggled() const;
bool CanBeToggled() const; bool CanBeToggled() const;
// attributes
const wxBitmap& GetNormalBitmap() const; const wxBitmap& GetNormalBitmap() const;
const wxBitmap& GetDisabledBitmap() const; const wxBitmap& GetDisabledBitmap() const;
@@ -125,7 +122,6 @@ public:
wxObject *GetClientData() const; wxObject *GetClientData() const;
// modifiers: return true if the state really changed
virtual bool Enable(bool enable); virtual bool Enable(bool enable);
virtual bool Toggle(bool toggle); virtual bool Toggle(bool toggle);
virtual bool SetToggle(bool toggle); virtual bool SetToggle(bool toggle);
@@ -137,14 +133,11 @@ public:
virtual void SetLabel(const wxString& label); virtual void SetLabel(const wxString& label);
void SetClientData(wxObject *clientData); void SetClientData(wxObject *clientData);
// add tool to/remove it from a toolbar
virtual void Detach(); virtual void Detach();
virtual void Attach(wxToolBarBase *tbar); virtual void Attach(wxToolBarBase *tbar);
// these methods are only for tools of wxITEM_DROPDOWN kind (but even such
// tools can have a NULL associated menu)
virtual void SetDropdownMenu(wxMenu *menu); virtual void SetDropdownMenu(wxMenu *menu);
wxMenu *GetDropdownMenu() const { return m_dropdownMenu; } wxMenu *GetDropdownMenu() const;
}; };
@@ -724,13 +717,16 @@ public:
the overload taking @a tool parameter the caller is responsible for the overload taking @a tool parameter the caller is responsible for
deleting the tool in the latter case. deleting the tool in the latter case.
*/ */
wxToolBarToolBase* InsertTool(size_t pos, int toolId, wxToolBarToolBase* InsertTool( size_t pos,
const wxBitmap& bitmap1, int toolId,
const wxBitmap& bitmap2 = wxNullBitmap, const wxString& label,
bool isToggle = false, const wxBitmap& bitmap,
wxObject* clientData = NULL, const wxBitmap& bmpDisabled = wxNullBitmap,
const wxString& shortHelpString = wxEmptyString, wxItemKind kind = wxITEM_NORMAL,
const wxString& longHelpString = wxEmptyString); const wxString& shortHelp = wxEmptyString,
const wxString& longHelp = wxEmptyString,
wxObject *clientData = NULL);
wxToolBarToolBase* InsertTool(size_t pos, wxToolBarToolBase* InsertTool(size_t pos,
wxToolBarToolBase* tool); wxToolBarToolBase* tool);
//@} //@}
@@ -981,7 +977,7 @@ public:
/** /**
Factory function to create a new toolbar tool. Factory function to create a new toolbar tool.
*/ */
virtual wxToolBarToolBase *CreateTool(int toolid, virtual wxToolBarToolBase *CreateTool(int toolId,
const wxString& label, const wxString& label,
const wxBitmap& bmpNormal, const wxBitmap& bmpNormal,
const wxBitmap& bmpDisabled = wxNullBitmap, const wxBitmap& bmpDisabled = wxNullBitmap,