diff options
| author | Matthias Clasen <mclasen@redhat.com> | 2018-06-20 14:21:24 +0000 |
|---|---|---|
| committer | Matthias Clasen <mclasen@redhat.com> | 2018-06-20 14:21:24 +0000 |
| commit | cd99f82e0c16e565490480ff8d9f9e1ffbc23018 (patch) | |
| tree | 0c05b45702d39f3b41e465babfe4eabb6fb929a7 /gdk/gdkdisplayprivate.h | |
| parent | 07d6c533468c003262093cc0a9f9b9abcc470d6d (diff) | |
| parent | 29fee2e80890d778af2f028fb10e133e2c77edd0 (diff) | |
| download | gtk+-cd99f82e0c16e565490480ff8d9f9e1ffbc23018.tar.gz | |
Merge branch 'master' into 'issue1084'
# Conflicts:
# gdk/gdk.c
Diffstat (limited to 'gdk/gdkdisplayprivate.h')
| -rw-r--r-- | gdk/gdkdisplayprivate.h | 4 |
1 files changed, 1 insertions, 3 deletions
diff --git a/gdk/gdkdisplayprivate.h b/gdk/gdkdisplayprivate.h index 28a656c9d8..12bdd4ecd1 100644 --- a/gdk/gdkdisplayprivate.h +++ b/gdk/gdkdisplayprivate.h @@ -146,7 +146,6 @@ struct _GdkDisplayClass void (*create_surface_impl) (GdkDisplay *display, GdkSurface *surface, GdkSurface *real_parent, - GdkEventMask event_mask, GdkSurfaceAttr *attributes); GdkKeymap * (*get_keymap) (GdkDisplay *display); @@ -233,10 +232,9 @@ void _gdk_display_event_data_copy (GdkDisplay *display GdkEvent *new_event); void _gdk_display_event_data_free (GdkDisplay *display, GdkEvent *event); -void _gdk_display_create_surface_impl (GdkDisplay *display, +void gdk_display_create_surface_impl (GdkDisplay *display, GdkSurface *surface, GdkSurface *real_parent, - GdkEventMask event_mask, GdkSurfaceAttr *attributes); GdkSurface * _gdk_display_create_surface (GdkDisplay *display); |