diff options
| author | Max Horn | 2008-11-12 14:30:16 +0000 |
|---|---|---|
| committer | Max Horn | 2008-11-12 14:30:16 +0000 |
| commit | c0f82d351894df16e23690b4361e66bed0fb6f84 (patch) | |
| tree | f6ddb6d08e8dbe0637a5e5dcfb13d4a4fa5c21c0 /engines | |
| parent | 144be21bed1001c4a72739ef7656908cbf71e909 (diff) | |
| download | scummvm-rg350-c0f82d351894df16e23690b4361e66bed0fb6f84.tar.gz scummvm-rg350-c0f82d351894df16e23690b4361e66bed0fb6f84.tar.bz2 scummvm-rg350-c0f82d351894df16e23690b4361e66bed0fb6f84.zip | |
Renamed Graphics::TextAlignment -> Graphics::TextAlign and merged it with GUI::ThemeEngine::TextAlignVertical
svn-id: r35023
Diffstat (limited to 'engines')
| -rw-r--r-- | engines/dialogs.cpp | 10 | ||||
| -rw-r--r-- | engines/parallaction/saveload.cpp | 6 | ||||
| -rw-r--r-- | engines/scumm/dialogs.cpp | 4 |
3 files changed, 9 insertions, 11 deletions
diff --git a/engines/dialogs.cpp b/engines/dialogs.cpp index 0032006ca7..fb634bee97 100644 --- a/engines/dialogs.cpp +++ b/engines/dialogs.cpp @@ -49,8 +49,6 @@ using GUI::CommandSender; using GUI::StaticTextWidget; using GUI::kCloseCmd; -using GUI::kTextAlignCenter; -using GUI::kTextAlignLeft; using GUI::WIDGET_ENABLED; typedef GUI::OptionsDialog GUI_OptionsDialog; @@ -80,15 +78,15 @@ MainMenuDialog::MainMenuDialog(Engine *engine) _logo->setGfx(g_gui.theme()->getImageSurface(GUI::ThemeEngine::kImageLogoSmall)); } else { StaticTextWidget *title = new StaticTextWidget(this, "GlobalMenu.Title", "ScummVM"); - title->setAlign(GUI::kTextAlignCenter); + title->setAlign(Graphics::kTextAlignCenter); } #else StaticTextWidget *title = new StaticTextWidget(this, "GlobalMenu.Title", "ScummVM"); - title->setAlign(GUI::kTextAlignCenter); + title->setAlign(Graphics::kTextAlignCenter); #endif StaticTextWidget *version = new StaticTextWidget(this, "GlobalMenu.Version", gScummVMVersionDate); - version->setAlign(GUI::kTextAlignCenter); + version->setAlign(Graphics::kTextAlignCenter); new GUI::ButtonWidget(this, "GlobalMenu.Resume", "Resume", kPlayCmd, 'P'); @@ -223,7 +221,7 @@ void MainMenuDialog::reflowLayout() { GUI::StaticTextWidget *title = (StaticTextWidget *)findWidget("GlobalMenu.Title"); if (!title) { title = new StaticTextWidget(this, "GlobalMenu.Title", "ScummVM"); - title->setAlign(GUI::kTextAlignCenter); + title->setAlign(Graphics::kTextAlignCenter); } if (_logo) { diff --git a/engines/parallaction/saveload.cpp b/engines/parallaction/saveload.cpp index f012c1c76b..afa6b34499 100644 --- a/engines/parallaction/saveload.cpp +++ b/engines/parallaction/saveload.cpp @@ -259,9 +259,9 @@ SaveLoadChooser::SaveLoadChooser(const String &title, const String &buttonLabel) _gfxWidget = new GUI::GraphicsWidget(this, 0, 0, 10, 10); - _date = new GUI::StaticTextWidget(this, 0, 0, 10, 10, "No date saved", GUI::kTextAlignCenter); - _time = new GUI::StaticTextWidget(this, 0, 0, 10, 10, "No time saved", GUI::kTextAlignCenter); - _playtime = new GUI::StaticTextWidget(this, 0, 0, 10, 10, "No playtime saved", GUI::kTextAlignCenter); + _date = new GUI::StaticTextWidget(this, 0, 0, 10, 10, "No date saved", Graphics::kTextAlignCenter); + _time = new GUI::StaticTextWidget(this, 0, 0, 10, 10, "No time saved", Graphics::kTextAlignCenter); + _playtime = new GUI::StaticTextWidget(this, 0, 0, 10, 10, "No playtime saved", Graphics::kTextAlignCenter); // Buttons new GUI::ButtonWidget(this, "ScummSaveLoad.Cancel", "Cancel", GUI::kCloseCmd, 0); diff --git a/engines/scumm/dialogs.cpp b/engines/scumm/dialogs.cpp index 1cb4e8a41d..42020dd4dc 100644 --- a/engines/scumm/dialogs.cpp +++ b/engines/scumm/dialogs.cpp @@ -62,8 +62,8 @@ using GUI::CommandSender; using GUI::StaticTextWidget; using GUI::kCloseCmd; -using GUI::kTextAlignCenter; -using GUI::kTextAlignLeft; +using Graphics::kTextAlignCenter; +using Graphics::kTextAlignLeft; using GUI::WIDGET_ENABLED; typedef GUI::OptionsDialog GUI_OptionsDialog; |