From 2f57f4684ba1945e7bdf87c8ecea4a6e926cf223 Mon Sep 17 00:00:00 2001 From: Sven Neumann Date: Tue, 16 Jul 2002 16:11:49 +0000 Subject: [PATCH] gdk/gdk.c gdk/gdkinternals.h gdk/win32/gdkmain-win32.c pass argc and argv 2002-07-16 Sven Neumann * gdk/gdk.c * gdk/gdkinternals.h * gdk/win32/gdkmain-win32.c * gdk/x11/gdkmain-x11.c: pass argc and argv to the GDK backend in _gdk_windowing_init() so that the backend has a chance to process the command-line arguments (GTK+-DirectFB needs this). --- ChangeLog | 9 +++++++++ ChangeLog.pre-2-10 | 9 +++++++++ ChangeLog.pre-2-2 | 9 +++++++++ ChangeLog.pre-2-4 | 9 +++++++++ ChangeLog.pre-2-6 | 9 +++++++++ ChangeLog.pre-2-8 | 9 +++++++++ gdk/gdk.c | 2 +- gdk/gdkinternals.h | 5 +++-- gdk/win32/gdkmain-win32.c | 3 ++- gdk/x11/gdkmain-x11.c | 3 ++- 10 files changed, 62 insertions(+), 5 deletions(-) diff --git a/ChangeLog b/ChangeLog index f7d9681644..6017d288d7 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,3 +1,12 @@ +2002-07-16 Sven Neumann + + * gdk/gdk.c + * gdk/gdkinternals.h + * gdk/win32/gdkmain-win32.c + * gdk/x11/gdkmain-x11.c: pass argc and argv to the GDK backend in + _gdk_windowing_init() so that the backend has a chance to process + the command-line arguments (GTK+-DirectFB needs this). + 2002-07-10 jacob berkman * gtk/gtkoptionmenu.c (gtk_option_menu_scroll_event): activate the diff --git a/ChangeLog.pre-2-10 b/ChangeLog.pre-2-10 index f7d9681644..6017d288d7 100644 --- a/ChangeLog.pre-2-10 +++ b/ChangeLog.pre-2-10 @@ -1,3 +1,12 @@ +2002-07-16 Sven Neumann + + * gdk/gdk.c + * gdk/gdkinternals.h + * gdk/win32/gdkmain-win32.c + * gdk/x11/gdkmain-x11.c: pass argc and argv to the GDK backend in + _gdk_windowing_init() so that the backend has a chance to process + the command-line arguments (GTK+-DirectFB needs this). + 2002-07-10 jacob berkman * gtk/gtkoptionmenu.c (gtk_option_menu_scroll_event): activate the diff --git a/ChangeLog.pre-2-2 b/ChangeLog.pre-2-2 index f7d9681644..6017d288d7 100644 --- a/ChangeLog.pre-2-2 +++ b/ChangeLog.pre-2-2 @@ -1,3 +1,12 @@ +2002-07-16 Sven Neumann + + * gdk/gdk.c + * gdk/gdkinternals.h + * gdk/win32/gdkmain-win32.c + * gdk/x11/gdkmain-x11.c: pass argc and argv to the GDK backend in + _gdk_windowing_init() so that the backend has a chance to process + the command-line arguments (GTK+-DirectFB needs this). + 2002-07-10 jacob berkman * gtk/gtkoptionmenu.c (gtk_option_menu_scroll_event): activate the diff --git a/ChangeLog.pre-2-4 b/ChangeLog.pre-2-4 index f7d9681644..6017d288d7 100644 --- a/ChangeLog.pre-2-4 +++ b/ChangeLog.pre-2-4 @@ -1,3 +1,12 @@ +2002-07-16 Sven Neumann + + * gdk/gdk.c + * gdk/gdkinternals.h + * gdk/win32/gdkmain-win32.c + * gdk/x11/gdkmain-x11.c: pass argc and argv to the GDK backend in + _gdk_windowing_init() so that the backend has a chance to process + the command-line arguments (GTK+-DirectFB needs this). + 2002-07-10 jacob berkman * gtk/gtkoptionmenu.c (gtk_option_menu_scroll_event): activate the diff --git a/ChangeLog.pre-2-6 b/ChangeLog.pre-2-6 index f7d9681644..6017d288d7 100644 --- a/ChangeLog.pre-2-6 +++ b/ChangeLog.pre-2-6 @@ -1,3 +1,12 @@ +2002-07-16 Sven Neumann + + * gdk/gdk.c + * gdk/gdkinternals.h + * gdk/win32/gdkmain-win32.c + * gdk/x11/gdkmain-x11.c: pass argc and argv to the GDK backend in + _gdk_windowing_init() so that the backend has a chance to process + the command-line arguments (GTK+-DirectFB needs this). + 2002-07-10 jacob berkman * gtk/gtkoptionmenu.c (gtk_option_menu_scroll_event): activate the diff --git a/ChangeLog.pre-2-8 b/ChangeLog.pre-2-8 index f7d9681644..6017d288d7 100644 --- a/ChangeLog.pre-2-8 +++ b/ChangeLog.pre-2-8 @@ -1,3 +1,12 @@ +2002-07-16 Sven Neumann + + * gdk/gdk.c + * gdk/gdkinternals.h + * gdk/win32/gdkmain-win32.c + * gdk/x11/gdkmain-x11.c: pass argc and argv to the GDK backend in + _gdk_windowing_init() so that the backend has a chance to process + the command-line arguments (GTK+-DirectFB needs this). + 2002-07-10 jacob berkman * gtk/gtkoptionmenu.c (gtk_option_menu_scroll_event): activate the diff --git a/gdk/gdk.c b/gdk/gdk.c index 873184042e..ee77ef78b9 100644 --- a/gdk/gdk.c +++ b/gdk/gdk.c @@ -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); } /** diff --git a/gdk/gdkinternals.h b/gdk/gdkinternals.h index a804882c5a..c31dc1615c 100644 --- a/gdk/gdkinternals.h +++ b/gdk/gdkinternals.h @@ -231,8 +231,9 @@ void _gdk_colormap_real_destroy (GdkColormap *colormap); 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, diff --git a/gdk/win32/gdkmain-win32.c b/gdk/win32/gdkmain-win32.c index eb09f05b58..a762cee78e 100644 --- a/gdk/win32/gdkmain-win32.c +++ b/gdk/win32/gdkmain-win32.c @@ -67,7 +67,8 @@ DllMain(HINSTANCE hinstDLL, } void -_gdk_windowing_init (void) +_gdk_windowing_init (gint *argc, + gchar ***argv) { gchar buf[10]; diff --git a/gdk/x11/gdkmain-x11.c b/gdk/x11/gdkmain-x11.c index 6bf483b6b6..36b1d2be2b 100644 --- a/gdk/x11/gdkmain-x11.c +++ b/gdk/x11/gdkmain-x11.c @@ -96,7 +96,8 @@ GdkArgDesc _gdk_windowing_args[] = { }; void -_gdk_windowing_init (void) +_gdk_windowing_init (gint *argc, + gchar ***argv) { _gdk_x11_initialize_locale ();