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/win32/win32.cpp | |
| 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/win32/win32.cpp')
| -rw-r--r-- | backends/platform/sdl/win32/win32.cpp | 30 |
1 files changed, 5 insertions, 25 deletions
diff --git a/backends/platform/sdl/win32/win32.cpp b/backends/platform/sdl/win32/win32.cpp index 5f860ad32d..0f70c00b40 100644 --- a/backends/platform/sdl/win32/win32.cpp +++ b/backends/platform/sdl/win32/win32.cpp @@ -35,9 +35,8 @@ #include "common/error.h" #include "common/textconsole.h" -#include <SDL_syswm.h> // For setting the icon - #include "backends/platform/sdl/win32/win32.h" +#include "backends/platform/sdl/win32/win32-window.h" #include "backends/saves/windows/windows-saves.h" #include "backends/fs/windows/windows-fs-factory.h" #include "backends/taskbar/win32/win32-taskbar.h" @@ -50,9 +49,12 @@ void OSystem_Win32::init() { // Initialize File System Factory _fsFactory = new WindowsFilesystemFactory(); + // Create Win32 specific window + _window = new SdlWindow_Win32(); + #if defined(USE_TASKBAR) // Initialize taskbar manager - _taskbarManager = new Win32TaskbarManager(); + _taskbarManager = new Win32TaskbarManager(_window); #endif // Invoke parent implementation of this method @@ -126,28 +128,6 @@ bool OSystem_Win32::displayLogFile() { return false; } -void OSystem_Win32::setupIcon() { - HMODULE handle = GetModuleHandle(NULL); - HICON ico = LoadIcon(handle, MAKEINTRESOURCE(1001 /* IDI_ICON */)); - if (ico) { - SDL_SysWMinfo wminfo; - SDL_VERSION(&wminfo.version); - if (SDL_GetWMInfo(&wminfo)) { - // Replace the handle to the icon associated with the window class by our custom icon - SetClassLongPtr(wminfo.window, GCLP_HICON, (ULONG_PTR)ico); - - // Since there wasn't any default icon, we can't use the return value from SetClassLong - // to check for errors (it would be 0 in both cases: error or no previous value for the - // icon handle). Instead we check for the last-error code value. - if (GetLastError() == ERROR_SUCCESS) - return; - } - } - - // If no icon has been set, fallback to default path - OSystem_SDL::setupIcon(); -} - Common::String OSystem_Win32::getDefaultConfigFileName() { char configFile[MAXPATHLEN]; |