Data constness fixes. (#75754)

This commit is contained in:
Matthias Clasen 2002-12-10 21:39:53 +00:00
parent 329c090ec1
commit 14ee65b66a
26 changed files with 180 additions and 42 deletions

View File

@ -1,3 +1,26 @@
2002-12-10 Matthias Clasen <maclas@gmx.de>
* gtk/tree_plus.xpm:
* gtk/tree_plus.xbm:
* gtk/tree_minus.xpm:
* gtk/tree_minus.xbm:
* gtk/line-wrap.xbm:
* gtk/line-arrow.xbm:
* gtk/gtktextview.c:
* gtk/gtktextutil.c:
* gtk/gtkstyle.c:
* gtk/gtkstock.c:
* gtk/gtksizegroup.c:
* gtk/gtkselection.c:
* gtk/gtkoptionmenu.c:
* gtk/gtklist.c:
* gtk/gtkfilesel.c:
* gtk/gtkentry.c:
* gtk/gtkcolorsel.c:
* gtk/gtkclist.c:
* gtk/gtkclipboard.c:
* gtk/gtkbutton.c: Data constness fixes. (#75754)
Tue Dec 10 14:37:41 2002 Owen Taylor <otaylor@redhat.com>
* gdk/x11/gdkevents-x11.c (gdk_event_translate)

View File

@ -1,3 +1,26 @@
2002-12-10 Matthias Clasen <maclas@gmx.de>
* gtk/tree_plus.xpm:
* gtk/tree_plus.xbm:
* gtk/tree_minus.xpm:
* gtk/tree_minus.xbm:
* gtk/line-wrap.xbm:
* gtk/line-arrow.xbm:
* gtk/gtktextview.c:
* gtk/gtktextutil.c:
* gtk/gtkstyle.c:
* gtk/gtkstock.c:
* gtk/gtksizegroup.c:
* gtk/gtkselection.c:
* gtk/gtkoptionmenu.c:
* gtk/gtklist.c:
* gtk/gtkfilesel.c:
* gtk/gtkentry.c:
* gtk/gtkcolorsel.c:
* gtk/gtkclist.c:
* gtk/gtkclipboard.c:
* gtk/gtkbutton.c: Data constness fixes. (#75754)
Tue Dec 10 14:37:41 2002 Owen Taylor <otaylor@redhat.com>
* gdk/x11/gdkevents-x11.c (gdk_event_translate)

View File

@ -1,3 +1,26 @@
2002-12-10 Matthias Clasen <maclas@gmx.de>
* gtk/tree_plus.xpm:
* gtk/tree_plus.xbm:
* gtk/tree_minus.xpm:
* gtk/tree_minus.xbm:
* gtk/line-wrap.xbm:
* gtk/line-arrow.xbm:
* gtk/gtktextview.c:
* gtk/gtktextutil.c:
* gtk/gtkstyle.c:
* gtk/gtkstock.c:
* gtk/gtksizegroup.c:
* gtk/gtkselection.c:
* gtk/gtkoptionmenu.c:
* gtk/gtklist.c:
* gtk/gtkfilesel.c:
* gtk/gtkentry.c:
* gtk/gtkcolorsel.c:
* gtk/gtkclist.c:
* gtk/gtkclipboard.c:
* gtk/gtkbutton.c: Data constness fixes. (#75754)
Tue Dec 10 14:37:41 2002 Owen Taylor <otaylor@redhat.com>
* gdk/x11/gdkevents-x11.c (gdk_event_translate)

View File

@ -1,3 +1,26 @@
2002-12-10 Matthias Clasen <maclas@gmx.de>
* gtk/tree_plus.xpm:
* gtk/tree_plus.xbm:
* gtk/tree_minus.xpm:
* gtk/tree_minus.xbm:
* gtk/line-wrap.xbm:
* gtk/line-arrow.xbm:
* gtk/gtktextview.c:
* gtk/gtktextutil.c:
* gtk/gtkstyle.c:
* gtk/gtkstock.c:
* gtk/gtksizegroup.c:
* gtk/gtkselection.c:
* gtk/gtkoptionmenu.c:
* gtk/gtklist.c:
* gtk/gtkfilesel.c:
* gtk/gtkentry.c:
* gtk/gtkcolorsel.c:
* gtk/gtkclist.c:
* gtk/gtkclipboard.c:
* gtk/gtkbutton.c: Data constness fixes. (#75754)
Tue Dec 10 14:37:41 2002 Owen Taylor <otaylor@redhat.com>
* gdk/x11/gdkevents-x11.c (gdk_event_translate)

View File

@ -1,3 +1,26 @@
2002-12-10 Matthias Clasen <maclas@gmx.de>
* gtk/tree_plus.xpm:
* gtk/tree_plus.xbm:
* gtk/tree_minus.xpm:
* gtk/tree_minus.xbm:
* gtk/line-wrap.xbm:
* gtk/line-arrow.xbm:
* gtk/gtktextview.c:
* gtk/gtktextutil.c:
* gtk/gtkstyle.c:
* gtk/gtkstock.c:
* gtk/gtksizegroup.c:
* gtk/gtkselection.c:
* gtk/gtkoptionmenu.c:
* gtk/gtklist.c:
* gtk/gtkfilesel.c:
* gtk/gtkentry.c:
* gtk/gtkcolorsel.c:
* gtk/gtkclist.c:
* gtk/gtkclipboard.c:
* gtk/gtkbutton.c: Data constness fixes. (#75754)
Tue Dec 10 14:37:41 2002 Owen Taylor <otaylor@redhat.com>
* gdk/x11/gdkevents-x11.c (gdk_event_translate)

View File

@ -1,3 +1,26 @@
2002-12-10 Matthias Clasen <maclas@gmx.de>
* gtk/tree_plus.xpm:
* gtk/tree_plus.xbm:
* gtk/tree_minus.xpm:
* gtk/tree_minus.xbm:
* gtk/line-wrap.xbm:
* gtk/line-arrow.xbm:
* gtk/gtktextview.c:
* gtk/gtktextutil.c:
* gtk/gtkstyle.c:
* gtk/gtkstock.c:
* gtk/gtksizegroup.c:
* gtk/gtkselection.c:
* gtk/gtkoptionmenu.c:
* gtk/gtklist.c:
* gtk/gtkfilesel.c:
* gtk/gtkentry.c:
* gtk/gtkcolorsel.c:
* gtk/gtkclist.c:
* gtk/gtkclipboard.c:
* gtk/gtkbutton.c: Data constness fixes. (#75754)
Tue Dec 10 14:37:41 2002 Owen Taylor <otaylor@redhat.com>
* gdk/x11/gdkevents-x11.c (gdk_event_translate)

View File

@ -38,8 +38,8 @@
#define CHILD_SPACING 1
static GtkBorder default_default_border = { 1, 1, 1, 1 };
static GtkBorder default_default_outside_border = { 0, 0, 0, 0 };
static const GtkBorder default_default_border = { 1, 1, 1, 1 };
static const GtkBorder default_default_outside_border = { 0, 0, 0, 0 };
/* Time out before giving up on getting a key release when animatng
* the close button.

View File

@ -87,10 +87,10 @@ enum {
TARGET_UTF8_STRING
};
static const gchar *request_contents_key = "gtk-request-contents";
static const gchar request_contents_key[] = "gtk-request-contents";
static GQuark request_contents_key_id = 0;
static const gchar *clipboards_owned_key = "gtk-clipboards-owned";
static const gchar clipboards_owned_key[] = "gtk-clipboards-owned";
static GQuark clipboards_owned_key_id = 0;
static GObjectClass *parent_class;

View File

@ -463,7 +463,7 @@ static void drag_dest_cell (GtkCList *clist,
static GtkContainerClass *parent_class = NULL;
static guint clist_signals[LAST_SIGNAL] = {0};
static GtkTargetEntry clist_target_table = { "gtk-clist-drag-reorder", 0, 0};
static const GtkTargetEntry clist_target_table = { "gtk-clist-drag-reorder", 0, 0};
GtkType
gtk_clist_get_type (void)

View File

@ -173,7 +173,7 @@ static void default_change_palette_func (GdkScreen *screen,
static gpointer parent_class = NULL;
static guint color_selection_signals[LAST_SIGNAL] = { 0 };
static gchar* default_colors = "black:white:gray50:red:purple:blue:light blue:green:yellow:orange:lavender:brown:goldenrod4:dodger blue:pink:light green:gray10:gray30:gray75:gray90";
static const gchar default_colors[] = "black:white:gray50:red:purple:blue:light blue:green:yellow:orange:lavender:brown:goldenrod4:dodger blue:pink:light green:gray10:gray30:gray75:gray90";
static GtkColorSelectionChangePaletteFunc noscreen_change_palette_hook = default_noscreen_change_palette_func;
static GtkColorSelectionChangePaletteWithScreenFunc change_palette_hook = default_change_palette_func;

View File

@ -93,7 +93,7 @@ typedef enum {
CURSOR_DND
} CursorType;
static GtkTargetEntry target_table[] = {
static const GtkTargetEntry target_table[] = {
{ "UTF8_STRING", 0, 0 },
{ "COMPOUND_TEXT", 0, 0 },
{ "TEXT", 0, 0 },

View File

@ -1016,11 +1016,11 @@ static void
file_selection_setup_dnd (GtkFileSelection *filesel)
{
GtkWidget *eventbox;
static GtkTargetEntry drop_types[] = {
static const GtkTargetEntry drop_types[] = {
{ "text/uri-list", 0, TARGET_URILIST}
};
static gint n_drop_types = sizeof(drop_types)/sizeof(drop_types[0]);
static GtkTargetEntry drag_types[] = {
static const GtkTargetEntry drag_types[] = {
{ "text/uri-list", 0, TARGET_URILIST},
{ "UTF8_STRING", 0, TARGET_UTF8_STRING },
{ "STRING", 0, 0 },
@ -1199,7 +1199,7 @@ gtk_file_selection_set_filename (GtkFileSelection *filesel,
G_CONST_RETURN gchar*
gtk_file_selection_get_filename (GtkFileSelection *filesel)
{
static gchar nothing[2] = "";
static const gchar nothing[2] = "";
static gchar something[MAXPATHLEN*2];
char *sys_filename;
const char *text;
@ -2519,7 +2519,7 @@ static gchar*
cmpl_completion_fullname (const gchar *text,
CompletionState *cmpl_state)
{
static char nothing[2] = "";
static const char nothing[2] = "";
if (!cmpl_state_okay (cmpl_state))
{

View File

@ -168,9 +168,9 @@ static void gtk_list_drag_begin (GtkWidget *widget,
static GtkContainerClass *parent_class = NULL;
static guint list_signals[LAST_SIGNAL] = { 0 };
static const gchar *vadjustment_key = "gtk-vadjustment";
static const gchar vadjustment_key[] = "gtk-vadjustment";
static guint vadjustment_key_id = 0;
static const gchar *hadjustment_key = "gtk-hadjustment";
static const gchar hadjustment_key[] = "gtk-hadjustment";
static guint hadjustment_key_id = 0;
GtkType

View File

@ -48,7 +48,7 @@ struct _GtkOptionMenuProps
gint focus_pad;
};
static GtkOptionMenuProps default_props = {
static const GtkOptionMenuProps default_props = {
TRUE,
{ 7, 13 },
{ 7, 5, 2, 2 }, /* Left, right, top, bottom */

View File

@ -156,7 +156,7 @@ static GList *current_incrs = NULL;
static GList *current_selections = NULL;
static GdkAtom gtk_selection_atoms[LAST_ATOM];
static const char *gtk_selection_handler_key = "gtk-selection-handlers";
static const char gtk_selection_handler_key[] = "gtk-selection-handlers";
/****************
* Target Lists *

View File

@ -47,7 +47,7 @@ static void add_widget_to_closure (GtkWidget *widget,
GSList **widgets);
static GQuark size_groups_quark;
static const gchar *size_groups_tag = "gtk-size-groups";
static const gchar size_groups_tag[] = "gtk-size-groups";
static GSList *
get_size_groups (GtkWidget *widget)

View File

@ -260,7 +260,7 @@ gtk_stock_item_free (GtkStockItem *item)
g_free (item);
}
static GtkStockItem builtin_items [] =
static const GtkStockItem builtin_items [] =
{
/* KEEP IN SYNC with gtkiconfactory.c stock icons, when appropriate */

View File

@ -319,8 +319,8 @@ static GdkFont *gtk_style_get_font_internal (GtkStyle *style);
* Data for default check and radio buttons
*/
static GtkRequisition default_option_indicator_size = { 7, 13 };
static GtkBorder default_option_indicator_spacing = { 7, 5, 2, 2 };
static const GtkRequisition default_option_indicator_size = { 7, 13 };
static const GtkBorder default_option_indicator_spacing = { 7, 5, 2, 2 };
#define INDICATOR_PART_SIZE 13
@ -446,19 +446,19 @@ static struct {
};
/* --- variables --- */
static GdkColor gtk_default_normal_fg = { 0, 0, 0, 0 };
static GdkColor gtk_default_active_fg = { 0, 0, 0, 0 };
static GdkColor gtk_default_prelight_fg = { 0, 0, 0, 0 };
static GdkColor gtk_default_selected_fg = { 0, 0xffff, 0xffff, 0xffff };
static GdkColor gtk_default_insensitive_fg = { 0, 0x7530, 0x7530, 0x7530 };
static const GdkColor gtk_default_normal_fg = { 0, 0, 0, 0 };
static const GdkColor gtk_default_active_fg = { 0, 0, 0, 0 };
static const GdkColor gtk_default_prelight_fg = { 0, 0, 0, 0 };
static const GdkColor gtk_default_selected_fg = { 0, 0xffff, 0xffff, 0xffff };
static const GdkColor gtk_default_insensitive_fg = { 0, 0x7530, 0x7530, 0x7530 };
static GdkColor gtk_default_normal_bg = { 0, 0xdcdc, 0xdada, 0xd5d5 };
static GdkColor gtk_default_active_bg = { 0, 0xbaba, 0xb5b5, 0xabab };
static GdkColor gtk_default_prelight_bg = { 0, 0xeeee, 0xebeb, 0xe7e7 };
static GdkColor gtk_default_selected_bg = { 0, 0x4b4b, 0x6969, 0x8383 };
static GdkColor gtk_default_insensitive_bg = { 0, 0xdcdc, 0xdada, 0xd5d5 };
static GdkColor gtk_default_selected_base = { 0, 0x4b4b, 0x6969, 0x8383 };
static GdkColor gtk_default_active_base = { 0, 0x8080, 0x7d7d, 0x7474 };
static const GdkColor gtk_default_normal_bg = { 0, 0xdcdc, 0xdada, 0xd5d5 };
static const GdkColor gtk_default_active_bg = { 0, 0xbaba, 0xb5b5, 0xabab };
static const GdkColor gtk_default_prelight_bg = { 0, 0xeeee, 0xebeb, 0xe7e7 };
static const GdkColor gtk_default_selected_bg = { 0, 0x4b4b, 0x6969, 0x8383 };
static const GdkColor gtk_default_insensitive_bg = { 0, 0xdcdc, 0xdada, 0xd5d5 };
static const GdkColor gtk_default_selected_base = { 0, 0x4b4b, 0x6969, 0x8383 };
static const GdkColor gtk_default_active_base = { 0, 0x8080, 0x7d7d, 0x7474 };
static gpointer parent_class = NULL;
@ -4917,7 +4917,7 @@ get_insensitive_layout (GdkDrawable *drawable,
{
#define gray50_width 2
#define gray50_height 2
static char gray50_bits[] = {
static const char gray50_bits[] = {
0x02, 0x01
};
@ -6202,7 +6202,7 @@ _gtk_get_insertion_cursor_gc (GtkWidget *widget,
}
else
{
static GdkColor gray = { 0, 0x8888, 0x8888, 0x8888 };
static const GdkColor gray = { 0, 0x8888, 0x8888, 0x8888 };
if (!cursor_info->secondary_gc)
cursor_info->secondary_gc = make_cursor_gc (widget,

View File

@ -42,7 +42,7 @@ struct _GtkTextUtilCallbackInfo
gpointer data;
};
static GtkUnicodeMenuEntry bidi_menu_entries[] = {
static const GtkUnicodeMenuEntry bidi_menu_entries[] = {
{ N_("LRM _Left-to-right mark"), 0x200E },
{ N_("RLM _Right-to-left mark"), 0x200F },
{ N_("LRE Left-to-right _embedding"), 0x202A },

View File

@ -81,7 +81,7 @@
*
*/
#if 0
#if 1
#define DEBUG_VALIDATION_AND_SCROLLING
#endif
@ -399,7 +399,7 @@ enum
TARGET_TEXT_BUFFER_CONTENTS
};
static GtkTargetEntry target_table[] = {
static const GtkTargetEntry target_table[] = {
{ "GTK_TEXT_BUFFER_CONTENTS", GTK_TARGET_SAME_APP,
TARGET_TEXT_BUFFER_CONTENTS },
{ "UTF8_STRING", 0, TARGET_UTF8_STRING },

View File

@ -1,4 +1,4 @@
#define line_arrow_width 6
#define line_arrow_height 9
static unsigned char line_arrow_bits[] = {
static const unsigned char line_arrow_bits[] = {
0x00, 0x00, 0x04, 0x0c, 0x18, 0x3f, 0x18, 0x0c, 0x04};

View File

@ -1,4 +1,4 @@
#define line_wrap_width 6
#define line_wrap_height 9
static unsigned char line_wrap_bits[] = {
static const unsigned char line_wrap_bits[] = {
0x1e, 0x3e, 0x30, 0x30, 0x39, 0x1f, 0x0f, 0x0f, 0x1f, };

View File

@ -1,5 +1,5 @@
#define tree_minus_width 9
#define tree_minus_height 9
static char tree_minus_bits[] = {
static const char tree_minus_bits[] = {
0xff,0xff,0x01,0xff,0x01,0xff,0x01,0xff,0x7d,0xff,0x01,0xff,0x01,0xff,0x01,
0xff,0xff,0xff};

View File

@ -1,5 +1,5 @@
/* XPM */
static char *tree_minus[] = {
static const char *tree_minus[] = {
/* width height num_colors chars_per_pixel */
" 9 9 2 1",
/* colors */

View File

@ -1,5 +1,5 @@
#define tree_plus_width 9
#define tree_plus_height 9
static char tree_plus_bits[] = {
static const char tree_plus_bits[] = {
0xff,0xff,0x01,0xff,0x11,0xff,0x11,0xff,0x7d,0xff,0x11,0xff,0x11,0xff,0x01,
0xff,0xff,0xff};

View File

@ -1,5 +1,5 @@
/* XPM */
static char *tree_plus[] = {
static const char *tree_plus[] = {
/* width height num_colors chars_per_pixel */
" 9 9 2 1",
/* colors */