diff options
| author | Paul Gilbert | 2015-10-12 15:18:03 -0400 |
|---|---|---|
| committer | Paul Gilbert | 2015-10-12 15:18:03 -0400 |
| commit | b0016071ecf3f5ffbc6f1619af610ab648bbba3a (patch) | |
| tree | f00f6b17bfd3475200e454cdfc09eba94d764f01 /backends/platform/sdl/macosx | |
| parent | 652a6623156b6c6bba8ca49e038945fd0c2b7780 (diff) | |
| parent | fbcf667b6a57593a2b85622ad1e1380c8aef7210 (diff) | |
| download | scummvm-rg350-b0016071ecf3f5ffbc6f1619af610ab648bbba3a.tar.gz scummvm-rg350-b0016071ecf3f5ffbc6f1619af610ab648bbba3a.tar.bz2 scummvm-rg350-b0016071ecf3f5ffbc6f1619af610ab648bbba3a.zip | |
Merge branch 'msvc_2015' into xeen
Diffstat (limited to 'backends/platform/sdl/macosx')
| -rw-r--r-- | backends/platform/sdl/macosx/macosx.cpp | 7 | ||||
| -rw-r--r-- | backends/platform/sdl/macosx/macosx.h | 1 |
2 files changed, 3 insertions, 5 deletions
diff --git a/backends/platform/sdl/macosx/macosx.cpp b/backends/platform/sdl/macosx/macosx.cpp index c48076c42f..38a2d7441c 100644 --- a/backends/platform/sdl/macosx/macosx.cpp +++ b/backends/platform/sdl/macosx/macosx.cpp @@ -47,6 +47,9 @@ OSystem_MacOSX::OSystem_MacOSX() } void OSystem_MacOSX::init() { + // Use an iconless window on OS X, as we use a nicer external icon there. + _window = new SdlIconlessWindow(); + #if defined(USE_TASKBAR) // Initialize taskbar manager _taskbarManager = new MacOSXTaskbarManager(); @@ -101,10 +104,6 @@ void OSystem_MacOSX::addSysArchivesToSearchSet(Common::SearchSet &s, int priorit } } -void OSystem_MacOSX::setupIcon() { - // Don't set icon on OS X, as we use a nicer external icon there. -} - bool OSystem_MacOSX::hasFeature(Feature f) { if (f == kFeatureDisplayLogFile) return true; diff --git a/backends/platform/sdl/macosx/macosx.h b/backends/platform/sdl/macosx/macosx.h index 50cef60353..c8b4beaeec 100644 --- a/backends/platform/sdl/macosx/macosx.h +++ b/backends/platform/sdl/macosx/macosx.h @@ -38,7 +38,6 @@ public: virtual void init(); virtual void initBackend(); virtual void addSysArchivesToSearchSet(Common::SearchSet &s, int priority = 0); - virtual void setupIcon(); }; #endif |