diff options
| author | Max Horn | 2009-01-02 22:29:13 +0000 |
|---|---|---|
| committer | Max Horn | 2009-01-02 22:29:13 +0000 |
| commit | 6a7e4e3c15f0f27f2d5f5baa4e11e0ca596bf45d (patch) | |
| tree | 3ae9b68646890724ca9913e60c04970a58d9b836 | |
| parent | 3558cf0e5ee9abed62ee8d358c5f03dfca242b3b (diff) | |
| download | scummvm-rg350-6a7e4e3c15f0f27f2d5f5baa4e11e0ca596bf45d.tar.gz scummvm-rg350-6a7e4e3c15f0f27f2d5f5baa4e11e0ca596bf45d.tar.bz2 scummvm-rg350-6a7e4e3c15f0f27f2d5f5baa4e11e0ca596bf45d.zip | |
Fix compilation on Mac OS X; tiny simplification
svn-id: r35688
| -rw-r--r-- | gui/GuiManager.cpp | 4 | ||||
| -rw-r--r-- | gui/ThemeEngine.cpp | 6 |
2 files changed, 5 insertions, 5 deletions
diff --git a/gui/GuiManager.cpp b/gui/GuiManager.cpp index 4b84901e7d..cebb48a00e 100644 --- a/gui/GuiManager.cpp +++ b/gui/GuiManager.cpp @@ -35,10 +35,6 @@ #include "graphics/cursorman.h" -#ifdef MACOSX -#include <CoreFoundation/CoreFoundation.h> -#endif - DECLARE_SINGLETON(GUI::GuiManager); namespace GUI { diff --git a/gui/ThemeEngine.cpp b/gui/ThemeEngine.cpp index 6e622ac758..839137e1da 100644 --- a/gui/ThemeEngine.cpp +++ b/gui/ThemeEngine.cpp @@ -43,6 +43,10 @@ #include "gui/ThemeParser.h" #include "gui/ThemeData.h" +#ifdef MACOSX +#include <CoreFoundation/CoreFoundation.h> +#endif + #define GUI_ENABLE_BUILTIN_THEME namespace GUI { @@ -1280,7 +1284,7 @@ Common::String ThemeEngine::getThemeFile(const Common::String &id) { Common::FSNode node(id); // If the given id is a full path we'll just use it - if (node.exists() && (node.isDirectory() || (node.getName().hasSuffix(".zip") && !node.isDirectory()))) + if (node.exists() && (node.isDirectory() || node.getName().hasSuffix(".zip"))) return id; // FIXME: |