Re: GdkLibrary

[Sven Neumann <sven gimp org>]

Hi Owen,

Owen Taylor <otaylor redhat com> writes:

> If you provide the patch to add argc, argv, gtk-windowing-init(), I'll
> check it over; I'd rather see this than GDK_ARG_WINDOWING_OPTION;
> GDK_ARG_WINDOWING_OPTION seems to be very specific to the DirectFB way
> of doing things, and confusing because most of the time it _won't_ be
> used for windowing system specific options

well, here's the patch (against GTK+ HEAD as of today).


Salut, Sven

Index: gdk/gdk.c
===================================================================
RCS file: /cvs/gnome/gtk+/gdk/gdk.c,v
retrieving revision 1.143
diff -u -p -r1.143 gdk.c
--- gdk/gdk.c	20 Jun 2002 23:59:03 -0000	1.143
+++ gdk/gdk.c	16 Jul 2002 11:12:29 -0000
@@ -345,7 +345,7 @@ gdk_parse_args (int    *argc,
 
   /* Do any setup particular to the windowing system
    */
-  _gdk_windowing_init ();
+  _gdk_windowing_init (argc, argv);
 }
 
 /** 
Index: gdk/gdkinternals.h
===================================================================
RCS file: /cvs/gnome/gtk+/gdk/gdkinternals.h,v
retrieving revision 1.19
diff -u -p -r1.19 gdkinternals.h
--- gdk/gdkinternals.h	18 Jun 2002 23:23:28 -0000	1.19
+++ gdk/gdkinternals.h	16 Jul 2002 11:12:29 -0000
@@ -231,8 +231,9 @@ void _gdk_colormap_real_destroy (GdkColo
 void _gdk_cursor_destroy (GdkCursor *cursor);
 
 extern GdkArgDesc _gdk_windowing_args[];
-void         _gdk_windowing_init                   (void);
-void         _gdk_windowing_set_default_display    (GdkDisplay *display);
+void     _gdk_windowing_init                    (gint       *argc,
+                                                 gchar    ***argv);
+void     _gdk_windowing_set_default_display     (GdkDisplay *display);
 
 void     _gdk_windowing_window_get_offsets      (GdkWindow  *window,
 						 gint       *x_offset,
Index: gdk/win32/gdkmain-win32.c
===================================================================
RCS file: /cvs/gnome/gtk+/gdk/win32/gdkmain-win32.c,v
retrieving revision 1.32
diff -u -p -r1.32 gdkmain-win32.c
--- gdk/win32/gdkmain-win32.c	20 Jun 2002 23:59:12 -0000	1.32
+++ gdk/win32/gdkmain-win32.c	16 Jul 2002 11:12:29 -0000
@@ -67,7 +67,8 @@ DllMain(HINSTANCE hinstDLL,
 }
 
 void
-_gdk_windowing_init (void)
+_gdk_windowing_init (gint    *argc,
+                     gchar ***argv)
 {
   gchar buf[10];
 
Index: gdk/x11/gdkmain-x11.c
===================================================================
RCS file: /cvs/gnome/gtk+/gdk/x11/gdkmain-x11.c,v
retrieving revision 1.148
diff -u -p -r1.148 gdkmain-x11.c
--- gdk/x11/gdkmain-x11.c	20 Jun 2002 23:59:19 -0000	1.148
+++ gdk/x11/gdkmain-x11.c	16 Jul 2002 11:12:30 -0000
@@ -96,7 +96,8 @@ GdkArgDesc _gdk_windowing_args[] = {
 };
 
 void
-_gdk_windowing_init (void)
+_gdk_windowing_init (gint    *argc,
+                     gchar ***argv)
 {
   _gdk_x11_initialize_locale ();