perso
/
finalcut
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

Remove virtual call from constructor in FToggleButton::FToggleButton

This commit is contained in:
Markus Gans 2018-09-22 03:20:58 +02:00
parent be7e8072fe
commit 368f74c497
2 changed files with 9 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
src/ftogglebutton.cpp
View File

@ -64,8 +64,7 @@ FToggleButton::FToggleButton (const FString& txt, FWidget* parent)
, focus_inside_group(true) , focus_inside_group(true)
, text() , text()
{ {
init(); init(txt);
setText(txt);
if ( parent && parent->isInstanceOf("FButtonGroup") ) if ( parent && parent->isInstanceOf("FButtonGroup") )
{ {
@ -612,6 +611,13 @@ void FToggleButton::setGroup (FButtonGroup* btngroup)
button_group = btngroup; button_group = btngroup;
} }
//----------------------------------------------------------------------
void FToggleButton::init (const FString& txt)
{
setText(txt);
init();
}
//---------------------------------------------------------------------- //----------------------------------------------------------------------
void FToggleButton::init() void FToggleButton::init()
{ {

1
src/include/final/ftogglebutton.h
View File

@ -153,6 +153,7 @@ class FToggleButton : public FWidget
void setGroup (FButtonGroup*); void setGroup (FButtonGroup*);
// Methods // Methods
void init (const FString&);
void init(); void init();
int getHotkeyPos (wchar_t[], wchar_t[], uInt); int getHotkeyPos (wchar_t[], wchar_t[], uInt);
void drawText (wchar_t[], int, uInt); void drawText (wchar_t[], int, uInt);