[Scummvm-cvs-logs] SF.net SVN: scummvm:[35688] scummvm/trunk/gui

[fingolfin at users.sourceforge.net]

Revision: 35688
          http://scummvm.svn.sourceforge.net/scummvm/?rev=35688&view=rev
Author:   fingolfin
Date:     2009-01-02 22:29:13 +0000 (Fri, 02 Jan 2009)

Log Message:
-----------
Fix compilation on Mac OS X; tiny simplification

Modified Paths:
--------------
    scummvm/trunk/gui/GuiManager.cpp
    scummvm/trunk/gui/ThemeEngine.cpp

Modified: scummvm/trunk/gui/GuiManager.cpp
===================================================================
--- scummvm/trunk/gui/GuiManager.cpp	2009-01-02 22:16:33 UTC (rev 35687)
+++ scummvm/trunk/gui/GuiManager.cpp	2009-01-02 22:29:13 UTC (rev 35688)
@@ -35,10 +35,6 @@
 
 #include "graphics/cursorman.h"
 
-#ifdef MACOSX
-#include <CoreFoundation/CoreFoundation.h>
-#endif
-
 DECLARE_SINGLETON(GUI::GuiManager);
 
 namespace GUI {

Modified: scummvm/trunk/gui/ThemeEngine.cpp
===================================================================
--- scummvm/trunk/gui/ThemeEngine.cpp	2009-01-02 22:16:33 UTC (rev 35687)
+++ scummvm/trunk/gui/ThemeEngine.cpp	2009-01-02 22:29:13 UTC (rev 35688)
@@ -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::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:


This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.