AuroraMiddleware/gtk
1
0
Fork 1
mirror of https://gitlab.gnome.org/GNOME/gtk.git synced 2024-11-06 00:30:08 +00:00
Code Issues Projects Releases Wiki Activity

API: gdk: GDK_DISPLAY_OBJECT() => GDK_DISPLAY()

Browse Source 
GDK_DISPLAY_OBJECT is now deprecated. No need to keep failures from
gtk1 around.
This commit is contained in:
Benjamin Otte 2010-12-20 17:11:00 +01:00 committed by Matthias Clasen
parent 04d1459fca
commit 85bd61778f
6 changed files with 13 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
docs/reference/gdk/gdk3-sections.txt
View File

@ -148,6 +148,7 @@ gdk_display_supports_shapes
gdk_display_supports_input_shapes gdk_display_supports_input_shapes
gdk_display_supports_composite gdk_display_supports_composite
<SUBSECTION Standard> <SUBSECTION Standard>
GDK_DISPLAY
GDK_DISPLAY_OBJECT GDK_DISPLAY_OBJECT
GDK_IS_DISPLAY GDK_IS_DISPLAY
GDK_TYPE_DISPLAY GDK_TYPE_DISPLAY

6
gdk/gdkdisplay.c
View File

@ -300,10 +300,10 @@ gdk_display_init (GdkDisplay *display)
static void static void
gdk_display_dispose (GObject *object) gdk_display_dispose (GObject *object)
{ {
GdkDisplay *display = GDK_DISPLAY_OBJECT (object); GdkDisplay *display = GDK_DISPLAY (object);
GdkDeviceManager *device_manager; GdkDeviceManager *device_manager;
device_manager = gdk_display_get_device_manager (GDK_DISPLAY_OBJECT (object)); device_manager = gdk_display_get_device_manager (GDK_DISPLAY (object));
g_list_foreach (display->queued_events, (GFunc)gdk_event_free, NULL); g_list_foreach (display->queued_events, (GFunc)gdk_event_free, NULL);
g_list_free (display->queued_events); g_list_free (display->queued_events);
@ -325,7 +325,7 @@ gdk_display_dispose (GObject *object)
static void static void
gdk_display_finalize (GObject *object) gdk_display_finalize (GObject *object)
{ {
GdkDisplay *display = GDK_DISPLAY_OBJECT (object); GdkDisplay *display = GDK_DISPLAY (object);
g_hash_table_foreach_remove (display->device_grabs, g_hash_table_foreach_remove (display->device_grabs,
free_device_grabs_foreach, free_device_grabs_foreach,

5
gdk/gdkdisplay.h
View File

@ -35,7 +35,10 @@
G_BEGIN_DECLS G_BEGIN_DECLS
#define GDK_TYPE_DISPLAY (gdk_display_get_type ()) #define GDK_TYPE_DISPLAY (gdk_display_get_type ())
#define GDK_DISPLAY_OBJECT(object) (G_TYPE_CHECK_INSTANCE_CAST ((object), GDK_TYPE_DISPLAY, GdkDisplay)) #define GDK_DISPLAY(object) (G_TYPE_CHECK_INSTANCE_CAST ((object), GDK_TYPE_DISPLAY, GdkDisplay))
#ifndef GDK_DISABLE_DEPRECATED
#define GDK_DISPLAY_OBJECT(object) GDK_DISPLAY(object)
#endif
#define GDK_DISPLAY_CLASS(klass) (G_TYPE_CHECK_CLASS_CAST ((klass), GDK_TYPE_DISPLAY, GdkDisplayClass)) #define GDK_DISPLAY_CLASS(klass) (G_TYPE_CHECK_CLASS_CAST ((klass), GDK_TYPE_DISPLAY, GdkDisplayClass))
#define GDK_IS_DISPLAY(object) (G_TYPE_CHECK_INSTANCE_TYPE ((object), GDK_TYPE_DISPLAY)) #define GDK_IS_DISPLAY(object) (G_TYPE_CHECK_INSTANCE_TYPE ((object), GDK_TYPE_DISPLAY))
#define GDK_IS_DISPLAY_CLASS(klass) (G_TYPE_CHECK_CLASS_TYPE ((klass), GDK_TYPE_DISPLAY)) #define GDK_IS_DISPLAY_CLASS(klass) (G_TYPE_CHECK_CLASS_TYPE ((klass), GDK_TYPE_DISPLAY))

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

@ -169,7 +169,7 @@ static void
_gdk_display_x11_init (GdkDisplayX11 *display) _gdk_display_x11_init (GdkDisplayX11 *display)
{ {
_gdk_x11_display_manager_add_display (gdk_display_manager_get (), _gdk_x11_display_manager_add_display (gdk_display_manager_get (),
GDK_DISPLAY_OBJECT (display)); GDK_DISPLAY (display));
} }
static void static void
@ -1719,7 +1719,7 @@ gdk_x11_display_ungrab (GdkDisplay *display)
static void static void
gdk_display_x11_dispose (GObject *object) gdk_display_x11_dispose (GObject *object)
{ {
GdkDisplay *display = GDK_DISPLAY_OBJECT (object); GdkDisplay *display = GDK_DISPLAY (object);
GdkDisplayX11 *display_x11 = GDK_DISPLAY_X11 (object); GdkDisplayX11 *display_x11 = GDK_DISPLAY_X11 (object);
gint i; gint i;
@ -1758,7 +1758,7 @@ gdk_display_x11_finalize (GObject *object)
g_free (display_x11->motif_target_lists); g_free (display_x11->motif_target_lists);
} }
_gdk_x11_cursor_display_finalize (GDK_DISPLAY_OBJECT(display_x11)); _gdk_x11_cursor_display_finalize (GDK_DISPLAY (display_x11));
/* Atom Hashtable */ /* Atom Hashtable */
g_hash_table_destroy (display_x11->atom_from_virtual); g_hash_table_destroy (display_x11->atom_from_virtual);

2
gdk/x11/gdkmain-x11.c
View File

@ -250,7 +250,7 @@ gdk_x_error (Display *xdisplay,
if (xdisplay == gdk_display->xdisplay) if (xdisplay == gdk_display->xdisplay)
{ {
error_display = GDK_DISPLAY_OBJECT (gdk_display); error_display = GDK_DISPLAY (gdk_display);
g_slist_free (displays); g_slist_free (displays);
displays = NULL; displays = NULL;
} }

2
gtk/gtktooltip.c
View File

@ -1284,7 +1284,7 @@ tooltip_popup_timeout (gpointer data)
GdkDisplay *display; GdkDisplay *display;
GtkTooltip *tooltip; GtkTooltip *tooltip;
display = GDK_DISPLAY_OBJECT (data); display = GDK_DISPLAY (data);
tooltip = g_object_get_data (G_OBJECT (display), tooltip = g_object_get_data (G_OBJECT (display),
"gdk-display-current-tooltip"); "gdk-display-current-tooltip");