diff options
| author | Johannes Schickel | 2015-03-05 01:10:34 +0100 |
|---|---|---|
| committer | Johannes Schickel | 2015-03-05 01:10:34 +0100 |
| commit | 4d13d44f8a2db8f887e285dbcbd3bb75ccc0ae2e (patch) | |
| tree | 9fd0cb9d8b0965a2c823e690f7d467c9ff3c5aea /backends/platform/sdl/macosx | |
| parent | cecb9a9ecc1ec1897fdd27e1bafc7f6d494cd6af (diff) | |
| parent | b5ac3ecb1f25b2d47fd99a3c4fd3b1cddcb695c6 (diff) | |
| download | scummvm-rg350-4d13d44f8a2db8f887e285dbcbd3bb75ccc0ae2e.tar.gz scummvm-rg350-4d13d44f8a2db8f887e285dbcbd3bb75ccc0ae2e.tar.bz2 scummvm-rg350-4d13d44f8a2db8f887e285dbcbd3bb75ccc0ae2e.zip | |
Merge pull request #572 from lordhoto/sdl2-support
SDL: Add experimental support for SDL2
Diffstat (limited to 'backends/platform/sdl/macosx')
| -rw-r--r-- | backends/platform/sdl/macosx/macosx.cpp | 5 | ||||
| -rw-r--r-- | backends/platform/sdl/macosx/macosx.h | 1 |
2 files changed, 3 insertions, 3 deletions
diff --git a/backends/platform/sdl/macosx/macosx.cpp b/backends/platform/sdl/macosx/macosx.cpp index c48076c42f..fa9f3ad16c 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,8 +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) { 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 |