callisto-debian/gtk3
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

win32: do not use g_clear_pointer also on the clipboard window

Browse Source 
A follow up on the previous patch. We should use DestroyWindow
directly since it has a different calling convention than
the expected callback for g_clear_pointer
This commit is contained in:
Ignacio Casal Quinteiro 2015-11-13 12:58:45 +01:00
parent 2ad243d43d
commit d74a08b80f
1 changed files with 6 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
gdk/win32/gdkdisplay-win32.c
View File

@ -720,8 +720,12 @@ gdk_win32_display_dispose (GObject *object)
display_win32->hwnd = NULL; display_win32->hwnd = NULL;
} }
g_clear_pointer (&display_win32->clipboard_hwnd, (GDestroyNotify)DestroyWindow); if (display_win32->clipboard_hwnd != NULL)
_hwnd_next_viewer = NULL; {
DestroyWindow (display_win32->clipboard_hwnd);
display_win32->clipboard_hwnd = NULL;
_hwnd_next_viewer = NULL;
}
G_OBJECT_CLASS (gdk_win32_display_parent_class)->dispose (object); G_OBJECT_CLASS (gdk_win32_display_parent_class)->dispose (object);
} }