AuroraMiddleware/gtk
1
0
Fork 1
mirror of https://gitlab.gnome.org/GNOME/gtk.git synced 2024-12-25 21:21:21 +00:00
Code Issues Projects Releases Wiki Activity

Hide GdkWindow libgtk_only API in the private vtable

Browse Source 
These are the last two global GDK symbols that have a libgtk_only
suffix.

https://bugzilla.gnome.org/show_bug.cgi?id=739781
This commit is contained in:
Emmanuele Bassi 2014-11-07 14:33:53 +00:00 committed by Matthias Clasen
parent 585af218a3
commit cdcd3ca359
7 changed files with 38 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
gdk/gdk-private.c
View File

@ -11,6 +11,8 @@ gdk__private__ (void)
gdk_pre_parse,
gdk_gl_get_flags,
gdk_gl_set_flags,
gdk_window_freeze_toplevel_updates,
gdk_window_thaw_toplevel_updates,
};
return &table;

5
gdk/gdk-private.h
View File

@ -20,6 +20,9 @@ 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);
typedef struct {
/* add all private functions here, initialize them in gdk-private.c */
gboolean (* gdk_device_grab_info) (GdkDisplay *display,
@ -33,6 +36,8 @@ typedef struct {
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);
} GdkPrivateVTable;
GDK_AVAILABLE_IN_ALL

20
gdk/gdkwindow.c
View File

@ -4380,9 +4380,17 @@ gdk_window_thaw_updates (GdkWindow *window)
*
* This function is not part of the GDK public API and is only
* for use by GTK+.
**/
*
* Deprecated: 3.16: This symbol was never meant to be used outside of GTK+
*/
void
gdk_window_freeze_toplevel_updates_libgtk_only (GdkWindow *window)
{
gdk_window_freeze_toplevel_updates (window);
}
void
gdk_window_freeze_toplevel_updates (GdkWindow *window)
{
g_return_if_fail (GDK_IS_WINDOW (window));
g_return_if_fail (window->window_type != GDK_WINDOW_CHILD);
@ -4400,9 +4408,17 @@ gdk_window_freeze_toplevel_updates_libgtk_only (GdkWindow *window)
*
* This function is not part of the GDK public API and is only
* for use by GTK+.
**/
*
* Deprecated: 3.16: This symbol was never meant to be used outside of GTK+
*/
void
gdk_window_thaw_toplevel_updates_libgtk_only (GdkWindow *window)
{
gdk_window_thaw_toplevel_updates (window);
}
void
gdk_window_thaw_toplevel_updates (GdkWindow *window)
{
g_return_if_fail (GDK_IS_WINDOW (window));
g_return_if_fail (window->window_type != GDK_WINDOW_CHILD);

4
gdk/gdkwindow.h
View File

@ -1037,9 +1037,9 @@ void gdk_window_freeze_updates (GdkWindow *window);
GDK_AVAILABLE_IN_ALL
void gdk_window_thaw_updates (GdkWindow *window);
GDK_AVAILABLE_IN_ALL
GDK_DEPRECATED_IN_3_16
void gdk_window_freeze_toplevel_updates_libgtk_only (GdkWindow *window);
GDK_AVAILABLE_IN_ALL
GDK_DEPRECATED_IN_3_16
void gdk_window_thaw_toplevel_updates_libgtk_only (GdkWindow *window);
GDK_AVAILABLE_IN_ALL

5
gdk/x11/gdkdisplay-x11.c
View File

@ -38,6 +38,7 @@
#include "gdkprivate-x11.h"
#include "gdkscreen-x11.h"
#include "gdkglcontext-x11.h"
#include "gdk-private.h"
#include <glib.h>
#include <glib/gprintf.h>
@ -704,7 +705,7 @@ gdk_x11_display_translate_event (GdkEventTranslator *translator,
}
if (toplevel)
gdk_window_freeze_toplevel_updates_libgtk_only (window);
gdk_window_freeze_toplevel_updates (window);
_gdk_x11_window_grab_check_unmap (window, xevent->xany.serial);
}
@ -728,7 +729,7 @@ gdk_x11_display_translate_event (GdkEventTranslator *translator,
0);
if (toplevel)
gdk_window_thaw_toplevel_updates_libgtk_only (window);
gdk_window_thaw_toplevel_updates (window);
}
break;

3
gdk/x11/gdkwindow-x11.c
View File

@ -38,6 +38,7 @@
#include "gdkdisplay-x11.h"
#include "gdkglcontext-x11.h"
#include "gdkprivate-x11.h"
#include "gdk-private.h"
#include <stdlib.h>
#include <stdio.h>
@ -1129,7 +1130,7 @@ _gdk_x11_display_create_window_impl (GdkDisplay *display,
connect_frame_clock (window);
if (GDK_WINDOW_TYPE (window) != GDK_WINDOW_CHILD)
gdk_window_freeze_toplevel_updates_libgtk_only (window);
gdk_window_freeze_toplevel_updates (window);
}
static GdkEventMask

8
gtk/gtkwindow.c
View File

@ -63,6 +63,8 @@
#include "inspector/init.h"
#include "inspector/window.h"
#include "gdk/gdk-private.h"
#ifdef GDK_WINDOWING_X11
#include "x11/gdkx.h"
#endif
@ -7396,7 +7398,8 @@ gtk_window_configure_event (GtkWidget *widget,
if (priv->configure_request_count > 0)
{
priv->configure_request_count -= 1;
gdk_window_thaw_toplevel_updates_libgtk_only (gtk_widget_get_window (widget));
GDK_PRIVATE_CALL (gdk_window_thaw_toplevel_updates) (gtk_widget_get_window (widget));
}
/*
@ -9281,7 +9284,8 @@ gtk_window_move_resize (GtkWindow *window)
{
/* Increment the number of have-not-yet-received-notify requests */
priv->configure_request_count += 1;
gdk_window_freeze_toplevel_updates_libgtk_only (gdk_window);
GDK_PRIVATE_CALL (gdk_window_freeze_toplevel_updates) (gdk_window);
/* for GTK_RESIZE_QUEUE toplevels, we are now awaiting a new
* configure event in response to our resizing request.