Make _gdk_windowing_args const.

2006-04-03  Matthias Clasen  <mclasen@redhat.com>

	* gdk/gdkinternals.h:
	* gdk/x11/gdkmain-x11.c:
	* gdk/win32/gdkmain-win32.c:
	* gdk/directfb/gdkdisplay-directfb.c:
	* gdk/quartz/gdkmain-quartz.c: Make _gdk_windowing_args const.
This commit is contained in:
Matthias Clasen 2006-04-03 20:36:52 +00:00 committed by Matthias Clasen
parent ac180cb0e4
commit aff3329de1
7 changed files with 19 additions and 7 deletions

View File

@ -1,6 +1,12 @@
2006-04-03 Matthias Clasen <mclasen@redhat.com> 2006-04-03 Matthias Clasen <mclasen@redhat.com>
* gdk/win32/gdkpixmap-win32.c: Include gdksreen.h (#337032, * gdk/gdkinternals.h:
* gdk/x11/gdkmain-x11.c:
* gdk/win32/gdkmain-win32.c:
* gdk/directfb/gdkdisplay-directfb.c:
* gdk/quartz/gdkmain-quartz.c: Make _gdk_windowing_args const.
* gdk/win32/gdkpixmap-win32.c: Include gdkscreen.h (#337032,
Kazuki IWAMOTO) Kazuki IWAMOTO)
* gtk/gtkprogressbar.c (gtk_progress_bar_set_text): Mention * gtk/gtkprogressbar.c (gtk_progress_bar_set_text): Mention

View File

@ -1,6 +1,12 @@
2006-04-03 Matthias Clasen <mclasen@redhat.com> 2006-04-03 Matthias Clasen <mclasen@redhat.com>
* gdk/win32/gdkpixmap-win32.c: Include gdksreen.h (#337032, * gdk/gdkinternals.h:
* gdk/x11/gdkmain-x11.c:
* gdk/win32/gdkmain-win32.c:
* gdk/directfb/gdkdisplay-directfb.c:
* gdk/quartz/gdkmain-quartz.c: Make _gdk_windowing_args const.
* gdk/win32/gdkpixmap-win32.c: Include gdkscreen.h (#337032,
Kazuki IWAMOTO) Kazuki IWAMOTO)
* gtk/gtkprogressbar.c (gtk_progress_bar_set_text): Mention * gtk/gtkprogressbar.c (gtk_progress_bar_set_text): Mention

View File

@ -50,7 +50,7 @@ static gint gdk_directfb_glyph_surface_cache = 8;
static gchar *directfb_args; static gchar *directfb_args;
GOptionEntry _gdk_windowing_args[] = const GOptionEntry _gdk_windowing_args[] =
{ {
{ "dfb",0,0,G_OPTION_ARG_STRING,&directfb_args,N_("directfb arg"),N_("sdl|system")}, { "dfb",0,0,G_OPTION_ARG_STRING,&directfb_args,N_("directfb arg"),N_("sdl|system")},
{ "dfb-help",0,0,G_OPTION_ARG_NONE, NULL,NULL}, { "dfb-help",0,0,G_OPTION_ARG_NONE, NULL,NULL},

View File

@ -261,7 +261,7 @@ void _gdk_cursor_destroy (GdkCursor *cursor);
void _gdk_windowing_init (void); void _gdk_windowing_init (void);
extern GOptionEntry _gdk_windowing_args[]; extern const GOptionEntry _gdk_windowing_args[];
void _gdk_windowing_set_default_display (GdkDisplay *display); void _gdk_windowing_set_default_display (GdkDisplay *display);
gchar *_gdk_windowing_substitute_screen_number (const gchar *display_name, gchar *_gdk_windowing_substitute_screen_number (const gchar *display_name,

View File

@ -23,7 +23,7 @@
#include "gdk.h" #include "gdk.h"
#include <ApplicationServices/ApplicationServices.h> #include <ApplicationServices/ApplicationServices.h>
GOptionEntry _gdk_windowing_args[] = { const GOptionEntry _gdk_windowing_args[] = {
{ NULL } { NULL }
}; };

View File

@ -55,7 +55,7 @@ static gboolean gdk_synchronize = FALSE;
static gboolean dummy; static gboolean dummy;
GOptionEntry _gdk_windowing_args[] = { const GOptionEntry _gdk_windowing_args[] = {
{ "sync", 0, 0, G_OPTION_ARG_NONE, &gdk_synchronize, { "sync", 0, 0, G_OPTION_ARG_NONE, &gdk_synchronize,
/* Description of --sync in --help output */ N_("Don't batch GDI requests"), NULL }, /* Description of --sync in --help output */ N_("Don't batch GDI requests"), NULL },
{ "no-wintab", 0, 0, G_OPTION_ARG_NONE, &_gdk_input_ignore_wintab, { "no-wintab", 0, 0, G_OPTION_ARG_NONE, &_gdk_input_ignore_wintab,

View File

@ -87,7 +87,7 @@ static int gdk_x_io_error (Display *display);
static GSList *gdk_error_traps = NULL; /* List of error traps */ static GSList *gdk_error_traps = NULL; /* List of error traps */
static GSList *gdk_error_trap_free_list = NULL; /* Free list */ static GSList *gdk_error_trap_free_list = NULL; /* Free list */
GOptionEntry _gdk_windowing_args[] = { const GOptionEntry _gdk_windowing_args[] = {
{ "sync", 0, 0, G_OPTION_ARG_NONE, &_gdk_synchronize, { "sync", 0, 0, G_OPTION_ARG_NONE, &_gdk_synchronize,
/* Description of --sync in --help output */ N_("Make X calls synchronous"), NULL }, /* Description of --sync in --help output */ N_("Make X calls synchronous"), NULL },
{ NULL } { NULL }