Add palette inheritance to progressbar class.

4 files changed, 6 insertions, 6 deletions

diff --git a/src/gui/widgets/playerbox.cpp b/src/gui/widgets/playerbox.cpp
index 5156b4bb6..697174fa2 100644
--- a/src/gui/widgets/playerbox.cpp
+++ b/src/gui/widgets/playerbox.cpp
@@ -36,8 +36,8 @@
 #include "debug.h"
 
 PlayerBox::PlayerBox(Being *const being, const std::string &skin) :
-    ScrollArea(),
     Widget2(),
+    ScrollArea(),
     mBeing(being),
     mAlpha(1.0),
     mSkin(nullptr),
diff --git a/src/gui/widgets/playerbox.h b/src/gui/widgets/playerbox.h
index 9f9a784ec..bc93b2e3f 100644
--- a/src/gui/widgets/playerbox.h
+++ b/src/gui/widgets/playerbox.h
@@ -40,8 +40,8 @@ class Skin;
  *
  * \ingroup GUI
  */
-class PlayerBox final : public gcn::ScrollArea,
-                        public Widget2
+class PlayerBox final : public Widget2,
+                        public gcn::ScrollArea
 {
     public:
         /**
diff --git a/src/gui/widgets/progressbar.cpp b/src/gui/widgets/progressbar.cpp
index 485529c2c..75aa3063c 100644
--- a/src/gui/widgets/progressbar.cpp
+++ b/src/gui/widgets/progressbar.cpp
@@ -40,11 +40,11 @@
 int ProgressBar::mInstances = 0;
 float ProgressBar::mAlpha = 1.0;
 
-ProgressBar::ProgressBar(float progress,
+ProgressBar::ProgressBar(const Widget2 *const widget, float progress,
                          const int width, const int height,
                          const int color):
     gcn::Widget(),
-    Widget2(),
+    Widget2(widget),
     gcn::WidgetListener(),
     mProgress(progress),
     mProgressToGo(progress),
diff --git a/src/gui/widgets/progressbar.h b/src/gui/widgets/progressbar.h
index 646aec97f..c754bcb6b 100644
--- a/src/gui/widgets/progressbar.h
+++ b/src/gui/widgets/progressbar.h
@@ -50,7 +50,7 @@ class ProgressBar final : public gcn::Widget,
         /**
          * Constructor, initializes the progress with the given value.
          */
-        ProgressBar(float progress = 0.0f,
+        ProgressBar(const Widget2 *const widget, float progress = 0.0f,
                     const int width = 40, const int height = 7,
                     const int color = -1);