summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorMatthias Clasen <mclasen@redhat.com>2019-05-07 15:01:45 +0000
committerMatthias Clasen <mclasen@redhat.com>2019-05-07 15:01:45 +0000
commit7bd9cdc8fb85cd4049d8cb96285b067d214a7770 (patch)
treea270dfaebbd1a2decdc555ea9660cc427e64dfd4
parent8af587c189e3d9b73be5751e2d07bd76626c4e0f (diff)
parent02d4fbe29e4278c202beaca93d64f1867ca79ac2 (diff)
downloadgtk+-7bd9cdc8fb85cd4049d8cb96285b067d214a7770.tar.gz
Merge branch 'gdk-win32-unimplement-vfuncs-3.24' into 'gtk-3-24'
GdkSurface - Don't call unimplemented NULL set_startup_id() vfunc on Win32 See merge request GNOME/gtk!826
-rw-r--r--gdk/gdkwindow.c5
1 files changed, 4 insertions, 1 deletions
diff --git a/gdk/gdkwindow.c b/gdk/gdkwindow.c
index 14164092d0..6601a32c9c 100644
--- a/gdk/gdkwindow.c
+++ b/gdk/gdkwindow.c
@@ -10500,7 +10500,10 @@ void
gdk_window_set_startup_id (GdkWindow *window,
const gchar *startup_id)
{
- GDK_WINDOW_IMPL_GET_CLASS (window->impl)->set_startup_id (window, startup_id);
+ GdkWindowImplClass *klass = GDK_WINDOW_IMPL_GET_CLASS (window->impl);
+
+ if (klass->set_startup_id)
+ klass->set_startup_id (window, startup_id);
}
/**