diff options
| author | Caolán McNamara <caolanm@redhat.com> | 2016-10-28 13:03:42 +0100 |
|---|---|---|
| committer | Caolán McNamara <caolanm@redhat.com> | 2016-10-28 13:03:45 +0100 |
| commit | d3e33f7ba85bf80c130aff3a3957c56b625c34cf (patch) | |
| tree | 4754eb137058e1222398bc7402fce237ead3e1f5 /vcl/source/control | |
| parent | 624ff6633c40ab678573a7a38fa3c83c41e0af17 (diff) | |
ImplInitMenuButtonData can be folded into ctor now
because theres no ResId loader anymore
Change-Id: Id90786d710fe75e47c162fd00ad7fd672b9cee30
Diffstat (limited to 'vcl/source/control')
| -rw-r--r-- | vcl/source/control/menubtn.cxx | 19 |
1 files changed, 6 insertions, 13 deletions
diff --git a/vcl/source/control/menubtn.cxx b/vcl/source/control/menubtn.cxx index 6d1c6773a3d4..b3a01670b245 100644 --- a/vcl/source/control/menubtn.cxx +++ b/vcl/source/control/menubtn.cxx @@ -26,16 +26,6 @@ #include <vcl/svapp.hxx> #include <vcl/settings.hxx> -void MenuButton::ImplInitMenuButtonData() -{ - mnDDStyle = PushButtonDropdownStyle::MenuButton; - - mpMenuTimer = nullptr; - mpMenu = nullptr; - mnCurItemId = 0; - mbDelayMenu = false; -} - void MenuButton::ImplInit( vcl::Window* pParent, WinBits nStyle ) { if ( !(nStyle & WB_NOTABSTOP) ) @@ -73,10 +63,13 @@ OString MenuButton::GetCurItemIdent() const } MenuButton::MenuButton( vcl::Window* pParent, WinBits nWinBits ) - : PushButton( WINDOW_MENUBUTTON ) + : PushButton(WINDOW_MENUBUTTON) + , mpMenuTimer(nullptr) + , mnCurItemId(0) + , mbDelayMenu(false) { - ImplInitMenuButtonData(); - ImplInit( pParent, nWinBits ); + mnDDStyle = PushButtonDropdownStyle::MenuButton; + ImplInit(pParent, nWinBits); } MenuButton::~MenuButton() |