diff options
| author | Matthias Clasen <mclasen@redhat.com> | 2016-11-23 19:31:16 -0500 |
|---|---|---|
| committer | Matthias Clasen <mclasen@redhat.com> | 2016-11-23 19:31:16 -0500 |
| commit | 3414f10badc821b7f727e3aad21735d2c4a7596c (patch) | |
| tree | e1dc8c0a02daf569e7553eb58bcc39951dc356c4 /gdk | |
| parent | 1af817e2549fd7c676fd3ff23f0d2bc5ac18432a (diff) | |
| download | gtk+-3414f10badc821b7f727e3aad21735d2c4a7596c.tar.gz | |
Drop the GDK_PRIVATE_CALL mechanism
We don't need to do this extra complication anymore, since
we're now living inside a single shared library.
Diffstat (limited to 'gdk')
| -rw-r--r-- | gdk/Makefile.am | 1 | ||||
| -rw-r--r-- | gdk/gdk-private.c | 22 | ||||
| -rw-r--r-- | gdk/gdk-private.h | 36 |
3 files changed, 0 insertions, 59 deletions
diff --git a/gdk/Makefile.am b/gdk/Makefile.am index 9549144834..f4522c0636 100644 --- a/gdk/Makefile.am +++ b/gdk/Makefile.am @@ -121,7 +121,6 @@ gdk_private_headers = \ gdkx.h gdk_c_sources = \ - gdk-private.c \ gdk.c \ gdkapplaunchcontext.c \ gdkcairo.c \ diff --git a/gdk/gdk-private.c b/gdk/gdk-private.c deleted file mode 100644 index c765934745..0000000000 --- a/gdk/gdk-private.c +++ /dev/null @@ -1,22 +0,0 @@ -#include "config.h" -#include "gdk-private.h" - -GdkPrivateVTable * -gdk__private__ (void) -{ - static GdkPrivateVTable table = { - gdk_device_grab_info, - gdk_display_open_default, - gdk_add_option_entries, - gdk_pre_parse, - gdk_gl_get_flags, - gdk_gl_set_flags, - gdk_window_freeze_toplevel_updates, - gdk_window_thaw_toplevel_updates, - gdk_display_get_rendering_mode, - gdk_display_set_rendering_mode, - gdk_window_move_to_rect - }; - - return &table; -} diff --git a/gdk/gdk-private.h b/gdk/gdk-private.h index ba16b92177..a0d102fae8 100644 --- a/gdk/gdk-private.h +++ b/gdk/gdk-private.h @@ -4,8 +4,6 @@ #include <gdk/gdk.h> #include "gdk/gdkinternals.h" -#define GDK_PRIVATE_CALL(symbol) (gdk__private__ ()->symbol) - GdkDisplay * gdk_display_open_default (void); gboolean gdk_device_grab_info (GdkDisplay *display, @@ -35,38 +33,4 @@ void gdk_window_move_to_rect (GdkWindow *window, gint rect_anchor_dx, gint rect_anchor_dy); -typedef struct { - /* add all private functions here, initialize them in gdk-private.c */ - gboolean (* gdk_device_grab_info) (GdkDisplay *display, - GdkDevice *device, - GdkWindow **grab_window, - gboolean *owner_events); - - GdkDisplay *(* gdk_display_open_default) (void); - - void (* gdk_add_option_entries) (GOptionGroup *group); - void (* gdk_pre_parse) (void); - - GdkGLFlags (* gdk_gl_get_flags) (void); - void (* gdk_gl_set_flags) (GdkGLFlags flags); - - void (* gdk_window_freeze_toplevel_updates) (GdkWindow *window); - void (* gdk_window_thaw_toplevel_updates) (GdkWindow *window); - - GdkRenderingMode (* gdk_display_get_rendering_mode) (GdkDisplay *display); - void (* gdk_display_set_rendering_mode) (GdkDisplay *display, - GdkRenderingMode mode); - - void (* gdk_window_move_to_rect) (GdkWindow *window, - const GdkRectangle *rect, - GdkGravity rect_anchor, - GdkGravity window_anchor, - GdkAnchorHints anchor_hints, - gint rect_anchor_dx, - gint rect_anchor_dy); -} GdkPrivateVTable; - -GDK_AVAILABLE_IN_ALL -GdkPrivateVTable * gdk__private__ (void); - #endif /* __GDK__PRIVATE_H__ */ |