mir/libreoffice
2
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

ImplInitMenuButtonData can be folded into ctor now

Browse Source 
because theres no ResId loader anymore

Change-Id: Id90786d710fe75e47c162fd00ad7fd672b9cee30
This commit is contained in:
Caolán McNamara
2016-10-28 13:03:42 +01:00
parent 624ff6633c
commit d3e33f7ba8
2 changed files with 6 additions and 14 deletions
Download Patch File Download Diff File Expand all files Collapse all files

1
include/vcl/menubtn.hxx
View File

@@ -40,7 +40,6 @@ private:
Link<MenuButton*,void> maActivateHdl; Link<MenuButton*,void> maActivateHdl;
Link<MenuButton*,void> maSelectHdl; Link<MenuButton*,void> maSelectHdl;
SAL_DLLPRIVATE void ImplInitMenuButtonData();
DECL_DLLPRIVATE_LINK( ImplMenuTimeoutHdl, Timer*, void ); DECL_DLLPRIVATE_LINK( ImplMenuTimeoutHdl, Timer*, void );
MenuButton( const MenuButton & ) = delete; MenuButton( const MenuButton & ) = delete;

19
vcl/source/control/menubtn.cxx
View File

@@ -26,16 +26,6 @@
#include <vcl/svapp.hxx> #include <vcl/svapp.hxx>
#include <vcl/settings.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 ) void MenuButton::ImplInit( vcl::Window* pParent, WinBits nStyle )
{ {
if ( !(nStyle & WB_NOTABSTOP) ) if ( !(nStyle & WB_NOTABSTOP) )
@@ -73,10 +63,13 @@ OString MenuButton::GetCurItemIdent() const
} }
MenuButton::MenuButton( vcl::Window* pParent, WinBits nWinBits ) MenuButton::MenuButton( vcl::Window* pParent, WinBits nWinBits )
: PushButton( WINDOW_MENUBUTTON ) : PushButton(WINDOW_MENUBUTTON)
, mpMenuTimer(nullptr)
, mnCurItemId(0)
, mbDelayMenu(false)
{ {
ImplInitMenuButtonData(); mnDDStyle = PushButtonDropdownStyle::MenuButton;
ImplInit( pParent, nWinBits ); ImplInit(pParent, nWinBits);
} }
MenuButton::~MenuButton() MenuButton::~MenuButton()