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

No changes, just refactor wxToolBarToolBase ctors.

Browse Source 
Add the usual Init() function for common initialization.

git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@62847 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
This commit is contained in:
Vadim Zeitlin
2009-12-10 02:59:11 +00:00
parent 2600776164
commit a7daf7ea0e
1 changed files with 35 additions and 21 deletions
Download Patch File Download Diff File Expand all files Collapse all files

56
include/wx/tbarbase.h
View File

@@ -60,6 +60,7 @@ public:
// ctors & dtor // ctors & dtor
// ------------ // ------------
// generic ctor for any kind of tool
wxToolBarToolBase(wxToolBarBase *tbar = NULL, wxToolBarToolBase(wxToolBarBase *tbar = NULL,
int toolid = wxID_SEPARATOR, int toolid = wxID_SEPARATOR,
const wxString& label = wxEmptyString, const wxString& label = wxEmptyString,
@@ -71,40 +72,34 @@ public:
const wxString& longHelpString = wxEmptyString) const wxString& longHelpString = wxEmptyString)
: m_label(label), : m_label(label),
m_shortHelpString(shortHelpString), m_shortHelpString(shortHelpString),
m_longHelpString(longHelpString), m_longHelpString(longHelpString)
m_dropdownMenu(NULL)
{ {
m_tbar = tbar; Init
m_id = toolid; (
if (m_id == wxID_ANY) tbar,
m_id = wxWindow::NewControlId(); toolid == wxID_SEPARATOR ? wxTOOL_STYLE_SEPARATOR
: wxTOOL_STYLE_BUTTON,
toolid == wxID_ANY ? wxWindow::NewControlId()
: toolid,
kind
);
m_clientData = clientData; m_clientData = clientData;
m_bmpNormal = bmpNormal; m_bmpNormal = bmpNormal;
m_bmpDisabled = bmpDisabled; m_bmpDisabled = bmpDisabled;
m_kind = kind;
m_enabled = true;
m_toggled = false;
m_toolStyle = toolid == wxID_SEPARATOR ? wxTOOL_STYLE_SEPARATOR
: wxTOOL_STYLE_BUTTON;
} }
// ctor for controls only
wxToolBarToolBase(wxToolBarBase *tbar, wxToolBarToolBase(wxToolBarBase *tbar,
wxControl *control, wxControl *control,
const wxString& label) const wxString& label)
: m_label(label) : m_label(label)
{ {
m_tbar = tbar; Init(tbar, wxTOOL_STYLE_CONTROL, control->GetId(), wxITEM_MAX);
m_control = control; m_control = control;
m_id = control->GetId(); }
m_kind = wxITEM_MAX; // invalid value
m_enabled = true;
m_toggled = false;
m_toolStyle = wxTOOL_STYLE_CONTROL; m_toolStyle = wxTOOL_STYLE_CONTROL;
@@ -206,6 +201,25 @@ public:
wxMenu *GetDropdownMenu() const { return m_dropdownMenu; } wxMenu *GetDropdownMenu() const { return m_dropdownMenu; }
protected: protected:
// common part of all ctors
void Init(wxToolBarBase *tbar,
wxToolBarToolStyle style,
int toolid,
wxItemKind kind)
{
m_tbar = tbar;
m_toolStyle = style;
m_id = toolid;
m_kind = kind;
m_clientData = NULL;
m_toggled = false;
m_enabled = true;
m_dropdownMenu = NULL;
}
wxToolBarBase *m_tbar; // the toolbar to which we belong (may be NULL) wxToolBarBase *m_tbar; // the toolbar to which we belong (may be NULL)
// tool parameters // tool parameters