From 49965a6282c0f8273ba30ddc48d877334c39bd2a Mon Sep 17 00:00:00 2001
From: Andrei Karas <akaras@inbox.ru>
Date: Fri, 18 Oct 2013 16:13:40 +0300
Subject: move virtual member calls from listbox constuctor into postInit.

---
 src/gui/widgets/listbox.cpp           | 3 +++
 src/gui/widgets/listbox.h             | 2 ++
 src/gui/widgets/popuplist.cpp         | 2 ++
 src/gui/widgets/tabs/setup_colors.cpp | 2 ++
 src/gui/widgets/tabs/setup_input.cpp  | 1 +
 src/gui/widgets/tabs/setup_video.cpp  | 2 ++
 6 files changed, 12 insertions(+)

(limited to 'src/gui/widgets')

diff --git a/src/gui/widgets/listbox.cpp b/src/gui/widgets/listbox.cpp
index b6d31c239..ba6b47e22 100644
--- a/src/gui/widgets/listbox.cpp
+++ b/src/gui/widgets/listbox.cpp
@@ -73,7 +73,10 @@ ListBox::ListBox(const Widget2 *const widget,
         mRowHeight = font->getHeight() + 2 * mItemPadding;
     else
         mRowHeight = 13;
+}
 
+void ListBox::postInit()
+{
     adjustSize();
 }
 
diff --git a/src/gui/widgets/listbox.h b/src/gui/widgets/listbox.h
index fa5906077..3f4637e73 100644
--- a/src/gui/widgets/listbox.h
+++ b/src/gui/widgets/listbox.h
@@ -53,6 +53,8 @@ class ListBox : public gcn::ListBox,
 
         virtual ~ListBox();
 
+        void postInit();
+
         /**
          * Draws the list box.
          */
diff --git a/src/gui/widgets/popuplist.cpp b/src/gui/widgets/popuplist.cpp
index 5fd38a785..346539348 100644
--- a/src/gui/widgets/popuplist.cpp
+++ b/src/gui/widgets/popuplist.cpp
@@ -42,6 +42,8 @@ PopupList::PopupList(DropDown *const widget,
     mPressedIndex(-2),
     mModal(modal)
 {
+    mListBox->postInit();
+
     setFocusable(true);
 
     mListBox->setDistributeMousePressed(true);
diff --git a/src/gui/widgets/tabs/setup_colors.cpp b/src/gui/widgets/tabs/setup_colors.cpp
index c29da4a8a..db4b2faae 100644
--- a/src/gui/widgets/tabs/setup_colors.cpp
+++ b/src/gui/widgets/tabs/setup_colors.cpp
@@ -77,6 +77,8 @@ Setup_Colors::Setup_Colors(const Widget2 *const widget) :
     mBlueSlider(new Slider(0, 255)),
     mBlueText(new TextField(this))
 {
+    mColorBox->postInit();
+
     // TRANSLATORS: settings colors tab name
     setName(_("Colors"));
     mColorBox->addSelectionListener(this);
diff --git a/src/gui/widgets/tabs/setup_input.cpp b/src/gui/widgets/tabs/setup_input.cpp
index 35fa4204a..3d4203244 100644
--- a/src/gui/widgets/tabs/setup_input.cpp
+++ b/src/gui/widgets/tabs/setup_input.cpp
@@ -107,6 +107,7 @@ Setup_Input::Setup_Input(const Widget2 *const widget) :
     mKeySetting(false),
     mActionDataSize(new int [9])
 {
+    mKeyList->postInit();
     inputManager.setSetupInput(this);
     // TRANSLATORS: setting tab name
     setName(_("Input"));
diff --git a/src/gui/widgets/tabs/setup_video.cpp b/src/gui/widgets/tabs/setup_video.cpp
index bd53763cc..647274125 100644
--- a/src/gui/widgets/tabs/setup_video.cpp
+++ b/src/gui/widgets/tabs/setup_video.cpp
@@ -215,6 +215,8 @@ Setup_Video::Setup_Video(const Widget2 *const widget) :
     // TRANSLATORS: video settings checkbox
     mNoFrameCheckBox(new CheckBox(this, _("No frame"), mNoFrame))
 {
+    mModeList->postInit();
+
     // TRANSLATORS: video settings tab name
     setName(_("Video"));
 
-- 
cgit v1.2.3-70-g09d2