aboutsummaryrefslogtreecommitdiff
path: root/gui/browser.h
diff options
context:
space:
mode:
authorYotam Barnoy2010-10-31 11:08:43 +0000
committerYotam Barnoy2010-10-31 11:08:43 +0000
commit94c8d0a14df429a1b25bd9f5c5d75497fd0ddbd1 (patch)
tree3df2a4ae7967c56d464729669fc06ce4e93dff36 /gui/browser.h
parent8df4278ba8cfbf71228e1927f9db635a9a30a57f (diff)
parentdca3c8d8bfc6c4db38cf8e8291818dd472041d4e (diff)
downloadscummvm-rg350-94c8d0a14df429a1b25bd9f5c5d75497fd0ddbd1.tar.gz
scummvm-rg350-94c8d0a14df429a1b25bd9f5c5d75497fd0ddbd1.tar.bz2
scummvm-rg350-94c8d0a14df429a1b25bd9f5c5d75497fd0ddbd1.zip
Updated with latest from trunk
svn-id: r53976
Diffstat (limited to 'gui/browser.h')
-rw-r--r--gui/browser.h6
1 files changed, 1 insertions, 5 deletions
diff --git a/gui/browser.h b/gui/browser.h
index 8dc7eda43a..1fef041a5a 100644
--- a/gui/browser.h
+++ b/gui/browser.h
@@ -29,10 +29,6 @@
#include "common/str.h"
#include "common/fs.h"
-#ifdef MACOSX
-#include <Carbon/Carbon.h>
-#endif
-
namespace GUI {
class ListWidget;
@@ -54,7 +50,7 @@ public:
protected:
#ifdef MACOSX
- CFStringRef _titleRef;
+ const void *_titleRef;
#else
ListWidget *_fileList;
StaticTextWidget *_currentPath;