Relintai/sdl2_frt
1
0
Fork 0
mirror of https://github.com/Relintai/sdl2_frt.git synced 2025-01-12 05:41:10 +01:00
Code Issues Packages Projects Releases Wiki Activity

Clean up parent window when destroying a window

Browse Source
This commit is contained in:
Sam Lantinga 2017-06-16 10:50:29 -07:00
parent 0a75192d85
commit 1b5614b3f5
2 changed files with 11 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

13
src/video/windows/SDL_windowswindow.c
View File

@ -114,7 +114,7 @@ WIN_SetWindowPositionInternal(_THIS, SDL_Window * window, UINT flags)
} }
static int static int
SetupWindowData(_THIS, SDL_Window * window, HWND hwnd, SDL_bool created) SetupWindowData(_THIS, SDL_Window * window, HWND hwnd, HWND parent, SDL_bool created)
{ {
SDL_VideoData *videodata = (SDL_VideoData *) _this->driverdata; SDL_VideoData *videodata = (SDL_VideoData *) _this->driverdata;
SDL_WindowData *data; SDL_WindowData *data;
@ -126,6 +126,7 @@ SetupWindowData(_THIS, SDL_Window * window, HWND hwnd, SDL_bool created)
} }
data->window = window; data->window = window;
data->hwnd = hwnd; data->hwnd = hwnd;
data->parent = parent;
data->hdc = GetDC(hwnd); data->hdc = GetDC(hwnd);
data->hinstance = (HINSTANCE) GetWindowLongPtr(hwnd, GWLP_HINSTANCE); data->hinstance = (HINSTANCE) GetWindowLongPtr(hwnd, GWLP_HINSTANCE);
data->created = created; data->created = created;
@ -300,8 +301,11 @@ WIN_CreateWindow(_THIS, SDL_Window * window)
WIN_PumpEvents(_this); WIN_PumpEvents(_this);
if (SetupWindowData(_this, window, hwnd, SDL_TRUE) < 0) { if (SetupWindowData(_this, window, hwnd, parent, SDL_TRUE) < 0) {
DestroyWindow(hwnd); DestroyWindow(hwnd);
if (parent) {
DestroyWindow(parent);
}
return -1; return -1;
} }
@ -362,7 +366,7 @@ WIN_CreateWindowFrom(_THIS, SDL_Window * window, const void *data)
SDL_stack_free(title); SDL_stack_free(title);
} }
if (SetupWindowData(_this, window, hwnd, SDL_FALSE) < 0) { if (SetupWindowData(_this, window, hwnd, NULL, SDL_FALSE) < 0) {
return -1; return -1;
} }
@ -680,6 +684,9 @@ WIN_DestroyWindow(_THIS, SDL_Window * window)
RemoveProp(data->hwnd, TEXT("SDL_WindowData")); RemoveProp(data->hwnd, TEXT("SDL_WindowData"));
if (data->created) { if (data->created) {
DestroyWindow(data->hwnd); DestroyWindow(data->hwnd);
if (data->parent) {
DestroyWindow(data->parent);
}
} else { } else {
/* Restore any original event handler... */ /* Restore any original event handler... */
if (data->wndproc != NULL) { if (data->wndproc != NULL) {

1
src/video/windows/SDL_windowswindow.h
View File

@ -31,6 +31,7 @@ typedef struct
{ {
SDL_Window *window; SDL_Window *window;
HWND hwnd; HWND hwnd;
HWND parent;
HDC hdc; HDC hdc;
HDC mdc; HDC mdc;
HINSTANCE hinstance; HINSTANCE hinstance;