diff options
Diffstat (limited to 'gdk')
| -rw-r--r-- | gdk/gdkcursor.h | 2 | ||||
| -rw-r--r-- | gdk/gdkevents.c | 6 | ||||
| -rw-r--r-- | gdk/gdkevents.h | 4 | ||||
| -rw-r--r-- | gdk/gdkkeys.h | 2 | ||||
| -rw-r--r-- | gdk/gdkmain.h | 4 | ||||
| -rw-r--r-- | gdk/gdkpango.h | 2 | ||||
| -rw-r--r-- | gdk/gdkselection.h | 3 | ||||
| -rw-r--r-- | gdk/gdkvisual.h | 2 | ||||
| -rw-r--r-- | gdk/gdkwindow.c | 10 | ||||
| -rw-r--r-- | gdk/x11/gdkproperty-x11.c | 7 | ||||
| -rw-r--r-- | gdk/x11/gdkx11property.h | 2 | ||||
| -rw-r--r-- | gdk/x11/gdkx11screen.h | 2 | ||||
| -rw-r--r-- | gdk/x11/gdkx11utils.h | 6 |
13 files changed, 2 insertions, 50 deletions
diff --git a/gdk/gdkcursor.h b/gdk/gdkcursor.h index 8968bbc3d7..48286f701e 100644 --- a/gdk/gdkcursor.h +++ b/gdk/gdkcursor.h @@ -219,10 +219,8 @@ GType gdk_cursor_get_type (void) G_GNUC_CONST; GDK_AVAILABLE_IN_ALL GdkCursor* gdk_cursor_new_for_display (GdkDisplay *display, GdkCursorType cursor_type); -#ifndef GDK_MULTIHEAD_SAFE GDK_AVAILABLE_IN_ALL GdkCursor* gdk_cursor_new (GdkCursorType cursor_type); -#endif GDK_AVAILABLE_IN_ALL GdkCursor* gdk_cursor_new_from_pixbuf (GdkDisplay *display, GdkPixbuf *pixbuf, diff --git a/gdk/gdkevents.c b/gdk/gdkevents.c index 04ff0aca82..0cfde38cd4 100644 --- a/gdk/gdkevents.c +++ b/gdk/gdkevents.c @@ -479,11 +479,7 @@ gdk_event_put (const GdkEvent *event) if (event->any.window) display = gdk_window_get_display (event->any.window); else - { - GDK_NOTE (MULTIHEAD, - g_message ("Falling back to default display for gdk_event_put()")); - display = gdk_display_get_default (); - } + display = gdk_display_get_default (); gdk_display_put_event (display, event); } diff --git a/gdk/gdkevents.h b/gdk/gdkevents.h index ae0b681112..d681de7a88 100644 --- a/gdk/gdkevents.h +++ b/gdk/gdkevents.h @@ -1305,14 +1305,10 @@ void gdk_set_show_events (gboolean show_events); GDK_AVAILABLE_IN_ALL gboolean gdk_get_show_events (void); -#ifndef GDK_MULTIHEAD_SAFE - GDK_AVAILABLE_IN_ALL gboolean gdk_setting_get (const gchar *name, GValue *value); -#endif /* GDK_MULTIHEAD_SAFE */ - G_END_DECLS #endif /* __GDK_EVENTS_H__ */ diff --git a/gdk/gdkkeys.h b/gdk/gdkkeys.h index 281b550edf..9749467a90 100644 --- a/gdk/gdkkeys.h +++ b/gdk/gdkkeys.h @@ -80,10 +80,8 @@ struct _GdkKeymapKey GDK_AVAILABLE_IN_ALL GType gdk_keymap_get_type (void) G_GNUC_CONST; -#ifndef GDK_MULTIHEAD_SAFE GDK_AVAILABLE_IN_ALL GdkKeymap* gdk_keymap_get_default (void); -#endif GDK_AVAILABLE_IN_ALL GdkKeymap* gdk_keymap_get_for_display (GdkDisplay *display); diff --git a/gdk/gdkmain.h b/gdk/gdkmain.h index 1e488ca4c5..c574f34471 100644 --- a/gdk/gdkmain.h +++ b/gdk/gdkmain.h @@ -95,8 +95,6 @@ GdkGrabStatus gdk_keyboard_grab (GdkWindow *window, guint32 time_); #endif /* GDK_MULTIDEVICE_SAFE */ -#ifndef GDK_MULTIHEAD_SAFE - #ifndef GDK_MULTIDEVICE_SAFE GDK_DEPRECATED_IN_3_0_FOR(gdk_device_ungrab) void gdk_pointer_ungrab (guint32 time_); @@ -122,8 +120,6 @@ void gdk_set_double_click_time (guint msec); GDK_AVAILABLE_IN_ALL void gdk_beep (void); -#endif /* GDK_MULTIHEAD_SAFE */ - GDK_AVAILABLE_IN_ALL void gdk_flush (void); diff --git a/gdk/gdkpango.h b/gdk/gdkpango.h index 348f8f3336..af2abf404b 100644 --- a/gdk/gdkpango.h +++ b/gdk/gdkpango.h @@ -31,10 +31,8 @@ G_BEGIN_DECLS GDK_AVAILABLE_IN_ALL PangoContext *gdk_pango_context_get_for_screen (GdkScreen *screen); -#ifndef GDK_MULTIHEAD_SAFE GDK_AVAILABLE_IN_ALL PangoContext *gdk_pango_context_get (void); -#endif /* Get a clip region to draw only part of a layout or diff --git a/gdk/gdkselection.h b/gdk/gdkselection.h index 6520624bfe..396982508b 100644 --- a/gdk/gdkselection.h +++ b/gdk/gdkselection.h @@ -152,7 +152,6 @@ G_BEGIN_DECLS /* Selections */ -#ifndef GDK_MULTIHEAD_SAFE GDK_AVAILABLE_IN_ALL gboolean gdk_selection_owner_set (GdkWindow *owner, GdkAtom selection, @@ -160,8 +159,6 @@ gboolean gdk_selection_owner_set (GdkWindow *owner, gboolean send_event); GDK_AVAILABLE_IN_ALL GdkWindow* gdk_selection_owner_get (GdkAtom selection); -#endif/* GDK_MULTIHEAD_SAFE */ - GDK_AVAILABLE_IN_ALL gboolean gdk_selection_owner_set_for_display (GdkDisplay *display, GdkWindow *owner, diff --git a/gdk/gdkvisual.h b/gdk/gdkvisual.h index 189a8268d3..3d0f76e527 100644 --- a/gdk/gdkvisual.h +++ b/gdk/gdkvisual.h @@ -82,7 +82,6 @@ typedef enum GDK_AVAILABLE_IN_ALL GType gdk_visual_get_type (void) G_GNUC_CONST; -#ifndef GDK_MULTIHEAD_SAFE GDK_AVAILABLE_IN_ALL gint gdk_visual_get_best_depth (void); GDK_AVAILABLE_IN_ALL @@ -108,7 +107,6 @@ void gdk_query_visual_types (GdkVisualType **visual_types, GDK_AVAILABLE_IN_ALL GList* gdk_list_visuals (void); -#endif GDK_AVAILABLE_IN_ALL GdkScreen *gdk_visual_get_screen (GdkVisual *visual); diff --git a/gdk/gdkwindow.c b/gdk/gdkwindow.c index c66c8ee204..70931ba858 100644 --- a/gdk/gdkwindow.c +++ b/gdk/gdkwindow.c @@ -1243,9 +1243,6 @@ gdk_window_new (GdkWindow *parent, if (!parent) { - GDK_NOTE (MULTIHEAD, - g_warning ("gdk_window_new(): no parent specified reverting to parent = default root window")); - screen = gdk_screen_get_default (); parent = gdk_screen_get_root_window (screen); } @@ -6034,12 +6031,7 @@ gdk_window_get_geometry (GdkWindow *window, GdkWindowImplClass *impl_class; if (!window) - { - GDK_NOTE (MULTIHEAD, - g_message ("gdk_window_get_geometry(): Window needs " - "to be non-NULL to be multi head safe")); - window = gdk_screen_get_root_window ((gdk_screen_get_default ())); - } + window = gdk_screen_get_root_window ((gdk_screen_get_default ())); g_return_if_fail (GDK_IS_WINDOW (window)); diff --git a/gdk/x11/gdkproperty-x11.c b/gdk/x11/gdkproperty-x11.c index 00bf0984b4..12203c994d 100644 --- a/gdk/x11/gdkproperty-x11.c +++ b/gdk/x11/gdkproperty-x11.c @@ -469,8 +469,6 @@ _gdk_x11_window_get_property (GdkWindow *window, { GdkScreen *screen = gdk_screen_get_default (); window = gdk_screen_get_root_window (screen); - - GDK_NOTE (MULTIHEAD, g_message ("gdk_property_get(): window is NULL\n")); } else if (!GDK_WINDOW_IS_X11 (window)) return FALSE; @@ -607,8 +605,6 @@ _gdk_x11_window_change_property (GdkWindow *window, screen = gdk_screen_get_default (); window = gdk_screen_get_root_window (screen); - - GDK_NOTE (MULTIHEAD, g_message ("gdk_property_change(): window is NULL\n")); } else if (!GDK_WINDOW_IS_X11 (window)) return; @@ -658,9 +654,6 @@ _gdk_x11_window_delete_property (GdkWindow *window, { GdkScreen *screen = gdk_screen_get_default (); window = gdk_screen_get_root_window (screen); - - GDK_NOTE (MULTIHEAD, - g_message ("gdk_property_delete(): window is NULL\n")); } else if (!GDK_WINDOW_IS_X11 (window)) return; diff --git a/gdk/x11/gdkx11property.h b/gdk/x11/gdkx11property.h index ac610e0bf6..55d4fbaf46 100644 --- a/gdk/x11/gdkx11property.h +++ b/gdk/x11/gdkx11property.h @@ -49,7 +49,6 @@ Atom gdk_x11_get_xatom_by_name_for_display (GdkDisplay *displa GDK_AVAILABLE_IN_ALL const gchar * gdk_x11_get_xatom_name_for_display (GdkDisplay *display, Atom xatom); -#ifndef GDK_MULTIHEAD_SAFE GDK_AVAILABLE_IN_ALL Atom gdk_x11_atom_to_xatom (GdkAtom atom); GDK_AVAILABLE_IN_ALL @@ -58,7 +57,6 @@ GDK_AVAILABLE_IN_ALL Atom gdk_x11_get_xatom_by_name (const gchar *atom_name); GDK_AVAILABLE_IN_ALL const gchar * gdk_x11_get_xatom_name (Atom xatom); -#endif G_END_DECLS diff --git a/gdk/x11/gdkx11screen.h b/gdk/x11/gdkx11screen.h index cc707dd104..6b29a7840f 100644 --- a/gdk/x11/gdkx11screen.h +++ b/gdk/x11/gdkx11screen.h @@ -61,10 +61,8 @@ int gdk_x11_screen_get_screen_number (GdkScreen *screen); GDK_AVAILABLE_IN_ALL const char* gdk_x11_screen_get_window_manager_name (GdkScreen *screen); -#ifndef GDK_MULTIHEAD_SAFE GDK_AVAILABLE_IN_ALL gint gdk_x11_get_default_screen (void); -#endif /** * GDK_SCREEN_XDISPLAY: diff --git a/gdk/x11/gdkx11utils.h b/gdk/x11/gdkx11utils.h index 573e2ecce1..0fa34bcf6c 100644 --- a/gdk/x11/gdkx11utils.h +++ b/gdk/x11/gdkx11utils.h @@ -36,21 +36,17 @@ G_BEGIN_DECLS -#ifndef GDK_MULTIHEAD_SAFE GDK_AVAILABLE_IN_ALL Window gdk_x11_get_default_root_xwindow (void); GDK_AVAILABLE_IN_ALL Display *gdk_x11_get_default_xdisplay (void); -#endif -#ifndef GDK_MULTIHEAD_SAFE /** * GDK_ROOT_WINDOW: * * Obtains the Xlib window id of the root window of the current screen. */ #define GDK_ROOT_WINDOW() (gdk_x11_get_default_root_xwindow ()) -#endif /** * GDK_XID_TO_POINTER: @@ -71,12 +67,10 @@ Display *gdk_x11_get_default_xdisplay (void); */ #define GDK_POINTER_TO_XID(pointer) GPOINTER_TO_UINT(pointer) -#ifndef GDK_MULTIHEAD_SAFE GDK_AVAILABLE_IN_ALL void gdk_x11_grab_server (void); GDK_AVAILABLE_IN_ALL void gdk_x11_ungrab_server (void); -#endif G_END_DECLS |