Made a label class derived from the guichan label class which utilizes

the palette colors. While technically, this can be accomplished through
other means, it's rather clumsy overall, and is prone to introducing in
programmer errors.

This commit finally catches every case where text is used, and applies
the text color from the color dialog to each of them appropriately.

Signed-off-by: Ira Rice <irarice@gmail.com>

1 files changed, 5 insertions, 5 deletions

diff --git a/src/gui/setup_audio.cpp b/src/gui/setup_audio.cpp
index 3c26f14b..08eda848 100644
--- a/src/gui/setup_audio.cpp
+++ b/src/gui/setup_audio.cpp
@@ -20,9 +20,8 @@
  *  Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
  */
 
-#include <guichan/widgets/label.hpp>
-
 #include "checkbox.h"
+#include "label.h"
 #include "ok_dialog.h"
 #include "setup_audio.h"
 #include "slider.h"
@@ -45,8 +44,8 @@ Setup_Audio::Setup_Audio():
 {
     setOpaque(false);
 
-    gcn::Label *sfxLabel = new gcn::Label(_("Sfx volume"));
-    gcn::Label *musicLabel = new gcn::Label(_("Music volume"));
+    gcn::Label *sfxLabel = new Label(_("Sfx volume"));
+    gcn::Label *musicLabel = new Label(_("Music volume"));
 
     mSfxSlider->setActionEventId("sfx");
     mMusicSlider->setActionEventId("music");
@@ -80,7 +79,8 @@ void Setup_Audio::apply()
     if (mSoundCheckBox->isSelected())
     {
         config.setValue("sound", 1);
-        try {
+        try
+        {
             sound.init();
         }
         catch (const char *err)