GUI: Move addClearButton() from options.cpp to widget.cpp

This is so it can be used outside options.cpp
scummvm · Dec 13, 2011 · c6e001a · c6e001a
1 parent d6ee598
commit c6e001a
Show file tree

Hide file tree

Showing 5 changed files with 19 additions and 18 deletions.
diff --git a/gui/options.cpp b/gui/options.cpp
@@ -1033,22 +1033,6 @@ void OptionsDialog::saveMusicDeviceSetting(PopUpWidget *popup, Common::String se
 		ConfMan.removeKey(setting, _domain);
 }
 
-ButtonWidget *addClearButton(GuiObject *boss, const Common::String &name, uint32 cmd) {
-	ButtonWidget *button;
-
-#ifndef DISABLE_FANCY_THEMES
-	if (g_gui.xmlEval()->getVar("Globals.ShowSearchPic") == 1 && g_gui.theme()->supportsImages()) {
-		button = new PicButtonWidget(boss, name, _("Clear value"), cmd);
-		((PicButtonWidget *)button)->useThemeTransparency(true);
-		((PicButtonWidget *)button)->setGfx(g_gui.theme()->getImageSurface(ThemeEngine::kImageEraser));
-	} else
-#endif
-		button = new ButtonWidget(boss, name, "C", _("Clear value"), cmd);
-
-	return button;
-}
-
-
 int OptionsDialog::getSubtitleMode(bool subtitles, bool speech_mute) {
 	if (_guioptions.contains(GUIO_NOSUBTITLES))
 		return kSubtitlesSpeech; // Speech only

diff --git a/gui/options.h b/gui/options.h
@@ -43,8 +43,6 @@ class GuiObject;
 class RadiobuttonGroup;
 class RadiobuttonWidget;
 
-ButtonWidget *addClearButton(GuiObject *boss, const Common::String &name, uint32 cmd);
-
 class OptionsDialog : public Dialog {
 public:
 	OptionsDialog(const Common::String &domain, int x, int y, int w, int h);

diff --git a/gui/widget.cpp b/gui/widget.cpp
@@ -23,6 +23,7 @@
 #include "common/system.h"
 #include "common/rect.h"
 #include "common/textconsole.h"
+#include "common/translation.h"
 #include "graphics/pixelformat.h"
 #include "gui/widget.h"
 #include "gui/gui-manager.h"
@@ -302,6 +303,21 @@ void ButtonWidget::setLabel(const Common::String &label) {
 	StaticTextWidget::setLabel(cleanupHotkey(label));
 }
 
+ButtonWidget *addClearButton(GuiObject *boss, const Common::String &name, uint32 cmd) {
+	ButtonWidget *button;
+
+#ifndef DISABLE_FANCY_THEMES
+	if (g_gui.xmlEval()->getVar("Globals.ShowSearchPic") == 1 && g_gui.theme()->supportsImages()) {
+		button = new PicButtonWidget(boss, name, _("Clear value"), cmd);
+		((PicButtonWidget *)button)->useThemeTransparency(true);
+		((PicButtonWidget *)button)->setGfx(g_gui.theme()->getImageSurface(ThemeEngine::kImageEraser));
+	} else
+#endif
+		button = new ButtonWidget(boss, name, "C", _("Clear value"), cmd);
+
+	return button;
+}
+
 #pragma mark -
 
 PicButtonWidget::PicButtonWidget(GuiObject *boss, int x, int y, int w, int h, const char *tooltip, uint32 cmd, uint8 hotkey)

diff --git a/gui/widget.h b/gui/widget.h
@@ -354,6 +354,8 @@ class ContainerWidget : public Widget {
 	void drawWidget();
 };
 
+ButtonWidget *addClearButton(GuiObject *boss, const Common::String &name, uint32 cmd);
+
 } // End of namespace GUI
 
 #endif
diff --git a/po/POTFILES b/po/POTFILES
@@ -13,6 +13,7 @@ gui/options.cpp
 gui/saveload.cpp
 gui/themebrowser.cpp
 gui/ThemeEngine.cpp
+gui/widget.cpp
 
 base/main.cpp