diff options
| author | Vicent Marti | 2008-11-10 11:24:55 +0000 |
|---|---|---|
| committer | Vicent Marti | 2008-11-10 11:24:55 +0000 |
| commit | b98f89c7f0c6ada45cb33dd650f1502c09fe6aa8 (patch) | |
| tree | e33b48cbfb98bc453f8f1c229649e48b0e3d9d15 /engines/scumm | |
| parent | 631c679e404c895eecd50cdba0c40a16a539106e (diff) | |
| download | scummvm-rg350-b98f89c7f0c6ada45cb33dd650f1502c09fe6aa8.tar.gz scummvm-rg350-b98f89c7f0c6ada45cb33dd650f1502c09fe6aa8.tar.bz2 scummvm-rg350-b98f89c7f0c6ada45cb33dd650f1502c09fe6aa8.zip | |
Merged GUI::Theme and Gui::ThemeEngine into the same class, GUI::ThemeEngine.
Massive cleanup.
svn-id: r34983
Diffstat (limited to 'engines/scumm')
| -rw-r--r-- | engines/scumm/dialogs.cpp | 10 |
1 files changed, 5 insertions, 5 deletions
diff --git a/engines/scumm/dialogs.cpp b/engines/scumm/dialogs.cpp index 382a0a9338..6e126f0872 100644 --- a/engines/scumm/dialogs.cpp +++ b/engines/scumm/dialogs.cpp @@ -36,7 +36,7 @@ #endif #include "gui/about.h" -#include "gui/theme.h" + #include "gui/newgui.h" #include "gui/ListWidget.h" #include "gui/ThemeEval.h" @@ -214,7 +214,7 @@ static const ResString string_map_table_v345[] = { #pragma mark - ScummDialog::ScummDialog(String name) : GUI::Dialog(name) { - _backgroundType = GUI::Theme::kDialogBackgroundSpecial; + _backgroundType = GUI::ThemeEngine::kDialogBackgroundSpecial; } #pragma mark - @@ -235,7 +235,7 @@ enum { SaveLoadChooser::SaveLoadChooser(const String &title, const String &buttonLabel, bool saveMode, ScummEngine *engine) : Dialog("ScummSaveLoad"), _saveMode(saveMode), _list(0), _chooseButton(0), _gfxWidget(0), _vm(engine) { - _backgroundType = GUI::Theme::kDialogBackgroundSpecial; + _backgroundType = GUI::ThemeEngine::kDialogBackgroundSpecial; new StaticTextWidget(this, "ScummSaveLoad.Title", title); @@ -637,7 +637,7 @@ HelpDialog::HelpDialog(const GameSettings &game) _title = new StaticTextWidget(this, "ScummHelp.Title", ""); _page = 1; - _backgroundType = GUI::Theme::kDialogBackgroundDefault; + _backgroundType = GUI::ThemeEngine::kDialogBackgroundDefault; _numPages = ScummHelp::numPages(_game.id); @@ -851,7 +851,7 @@ ValueDisplayDialog::ValueDisplayDialog(const Common::String& label, int minVal, void ValueDisplayDialog::drawDialog() { const int labelWidth = _w - 8 - _percentBarWidth; - g_gui.theme()->drawDialogBackground(Common::Rect(_x, _y, _x+_w, _y+_h), GUI::Theme::kDialogBackgroundDefault); + g_gui.theme()->drawDialogBackground(Common::Rect(_x, _y, _x+_w, _y+_h), GUI::ThemeEngine::kDialogBackgroundDefault); g_gui.theme()->drawText(Common::Rect(_x+4, _y+4, _x+labelWidth+4, _y+g_gui.theme()->getFontHeight()+4), _label); g_gui.theme()->drawSlider(Common::Rect(_x+4+labelWidth, _y+4, _x+_w-4, _y+_h-4), |