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 /gui/widget.cpp | |
| 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 'gui/widget.cpp')
| -rw-r--r-- | gui/widget.cpp | 14 |
1 files changed, 7 insertions, 7 deletions
diff --git a/gui/widget.cpp b/gui/widget.cpp index 1fcf7bc357..433c58dd58 100644 --- a/gui/widget.cpp +++ b/gui/widget.cpp @@ -34,13 +34,13 @@ namespace GUI { Widget::Widget(GuiObject *boss, int x, int y, int w, int h) : GuiObject(x, y, w, h), _type(0), _boss(boss), - _id(0), _flags(0), _hasFocus(false), _state(Theme::kStateEnabled) { + _id(0), _flags(0), _hasFocus(false), _state(ThemeEngine::kStateEnabled) { init(); } Widget::Widget(GuiObject *boss, const Common::String &name) : GuiObject(name), _type(0), _boss(boss), - _id(0), _flags(0), _hasFocus(false), _state(Theme::kStateDisabled) { + _id(0), _flags(0), _hasFocus(false), _state(ThemeEngine::kStateDisabled) { init(); } @@ -74,11 +74,11 @@ void Widget::clearFlags(int flags) { void Widget::updateState(int oldFlags, int newFlags) { if (newFlags & WIDGET_ENABLED) { - _state = Theme::kStateEnabled; + _state = ThemeEngine::kStateEnabled; if (newFlags & WIDGET_HILITED) - _state = Theme::kStateHighlight; + _state = ThemeEngine::kStateHighlight; } else { - _state = Theme::kStateDisabled; + _state = ThemeEngine::kStateDisabled; } } @@ -96,7 +96,7 @@ void Widget::draw() { // Draw border if (_flags & WIDGET_BORDER) { - gui->theme()->drawWidgetBackground(Common::Rect(_x, _y, _x+_w, _y+_h), 0, Theme::kWidgetBackgroundBorder); + gui->theme()->drawWidgetBackground(Common::Rect(_x, _y, _x+_w, _y+_h), 0, ThemeEngine::kWidgetBackgroundBorder); _x += 4; _y += 4; _w -= 8; @@ -386,7 +386,7 @@ ContainerWidget::ContainerWidget(GuiObject *boss, const Common::String &name) : } void ContainerWidget::drawWidget() { - g_gui.theme()->drawWidgetBackground(Common::Rect(_x, _y, _x + _w, _y + _h), 0, Theme::kWidgetBackgroundBorder); + g_gui.theme()->drawWidgetBackground(Common::Rect(_x, _y, _x + _w, _y + _h), 0, ThemeEngine::kWidgetBackgroundBorder); } } // End of namespace GUI |