From 550bf181d2e754425aa592f61108a0a0c9139256 Mon Sep 17 00:00:00 2001 From: Owen Taylor Date: Thu, 31 Oct 2002 21:12:23 +0000 Subject: Add a --screen option for setting the default screen. (Based on a patch Thu Oct 31 12:40:39 2002 Owen Taylor * gdk/gdk.[ch] gdk/gdkglobals.c gdk/gdkinternals.h gdk/{x11,win32,linux-fb}/gdkscreen-{x11,win32,linux-fb}.c: Add a --screen option for setting the default screen. (Based on a patch from Balamurali Viswanathan, #81145) * gdk/gdk.c gdkdisplay.h gtk/gtkmain.c: Add gdk_display_open_default_libgtk_only(), so gtk_init_check() and gdk_init_check() can share the same behavior w.r.t. --screen. * gdk/gdk.[ch]: Make gdk_get_display_arg_name() G_CONST_RETURN. * gdk/x11/gdkselection-x11.c (gdk_selection_property_get): Suppress a spurious warning. * tests/testgtkrc: Remove someleft-over commented out includes that could be confusing. --- gdk/gdk.h | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'gdk/gdk.h') diff --git a/gdk/gdk.h b/gdk/gdk.h index 44b7391e93..811c484935 100644 --- a/gdk/gdk.h +++ b/gdk/gdk.h @@ -85,8 +85,8 @@ void gdk_set_use_xshm (gboolean use_xshm); gboolean gdk_get_use_xshm (void); #endif /* GDK_DISABLE_DEPRECATED */ -gchar* gdk_get_display (void); -gchar* gdk_get_display_arg_name (void); +gchar* gdk_get_display (void); +G_CONST_RETURN gchar* gdk_get_display_arg_name (void); #ifndef GDK_DISABLE_DEPRECATED gint gdk_input_add_full (gint source, -- cgit v1.2.1