summaryrefslogtreecommitdiff
path: root/gtk/gtkstyle.c
diff options
context:
space:
mode:
authorOwen Taylor <otaylor@redhat.com>2002-08-05 18:52:28 +0000
committerOwen Taylor <otaylor@src.gnome.org>2002-08-05 18:52:28 +0000
commit090a1ac1cb4a6f4e1e1a578c573d2a82179461c3 (patch)
treed1e30210967e4bbf6edf8658725d5f3617475194 /gtk/gtkstyle.c
parentd1696ea84f062bd741aaf39fcddb5126ebd38201 (diff)
downloadgtk+-090a1ac1cb4a6f4e1e1a578c573d2a82179461c3.tar.gz
Add a note that yes, we do know what () means and we can't change it.
Mon Aug 5 14:50:13 2002 Owen Taylor <otaylor@redhat.com> * gtk/gtkitemfactory.h: Add a note that yes, we do know what () means and we can't change it. Fixes for warnings reported by David L. Cooper II * tests/testtext.c: Warning fixes. Fix order of arguments to gtk_message_dialog_new(). (#85891) * gtk/gtktreeitem.c (gtk_tree_item_paint): Fix incorrect use GTK_STATE_INSENSITIVE for a shadow type. (Not clear what the drawing intent was, but it's ENABLE_BROKEN anyways.) (#85880) * gtk/gtktexttypes.c: Use character literals instead of direct constants to avoid warning. (#85878) * gtk/theme-bits/decompose-bits.c gtk/gtkstyle.c: Fix some signed/unsigned problems (#85876) * gtk/gtksignal.c (gtk_signal_newv): Add an explicit cast from GtkSignalRunType to GSignalFlags. (#85875) * gtk/gtkitemfactory.c (gtk_item_factory_add_item): Fix use of guint instead of GdkModifierType (#85871) * gtk/gtkimmulticontext.c (gtk_im_multicontext_append_menuitems): Fix signed/unsigned problem (#85870) * gtk/gtkimcontext.c (gtk_im_context_class_init): Get rid of GtkType/Signal*. (Fixes #85869 as a side effect) * gtk/gtkdnd.c (gtk_drag_get_cursor): Fix some signed/unsigned warnings (#85865)
Diffstat (limited to 'gtk/gtkstyle.c')
-rw-r--r--gtk/gtkstyle.c42
1 files changed, 21 insertions, 21 deletions
diff --git a/gtk/gtkstyle.c b/gtk/gtkstyle.c
index 06216faace..a0847c63db 100644
--- a/gtk/gtkstyle.c
+++ b/gtk/gtkstyle.c
@@ -345,74 +345,74 @@ typedef enum {
/*
* Extracted from check-13.png, width=13, height=13
*/
-static char check_black_bits[] = {
+static guchar check_black_bits[] = {
0x00,0x00,0xfe,0x0f,0x02,0x00,0x02,0x00,0x02,0x00,0x02,0x00,0x02,0x00,0x02,
0x00,0x02,0x00,0x02,0x00,0x02,0x00,0x02,0x00,0x00,0x00,0x00,0x00};
-static char check_dark_bits[] = {
+static guchar check_dark_bits[] = {
0xff,0x1f,0x01,0x00,0x01,0x00,0x01,0x00,0x01,0x00,0x01,0x00,0x01,0x00,0x01,
0x00,0x01,0x00,0x01,0x00,0x01,0x00,0x01,0x00,0x01,0x00,0x00,0x00};
-static char check_mid_bits[] = {
+static guchar check_mid_bits[] = {
0x00,0x00,0x00,0x00,0x00,0x08,0x00,0x08,0x00,0x08,0x00,0x08,0x00,0x08,0x00,
0x08,0x00,0x08,0x00,0x08,0x00,0x08,0xfc,0x0f,0x00,0x00,0x00,0x00};
-static char check_light_bits[] = {
+static guchar check_light_bits[] = {
0x00,0x00,0x00,0x10,0x00,0x10,0x00,0x10,0x00,0x10,0x00,0x10,0x00,0x10,0x00,
0x10,0x00,0x10,0x00,0x10,0x00,0x10,0x00,0x10,0xfe,0x1f,0x00,0x00};
-static char check_text_bits[] = {
+static guchar check_text_bits[] = {
0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x02,0x00,0x03,0x80,0x01,0x80,0x00,0x58,
0x00,0x60,0x00,0x40,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00};
-static char check_aa_bits[] = {
+static guchar check_aa_bits[] = {
0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x04,0x00,0x00,0x00,0x00,0x58,0x00,0xa0,
0x00,0x10,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00};
-static char check_base_bits[] = {
+static guchar check_base_bits[] = {
0x00,0x00,0x00,0x00,0xfc,0x07,0xfc,0x07,0xfc,0x07,0xfc,0x07,0xfc,0x07,0xfc,
0x07,0xfc,0x07,0xfc,0x07,0xfc,0x07,0x00,0x00,0x00,0x00,0x00,0x00};
/*
* Extracted from check-13-inconsistent-ssp.png, width=13, height=13
*/
-static char check_inconsistent_text_bits[] = {
+static guchar check_inconsistent_text_bits[] = {
0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0xf8,0x03,0xf8,
0x03,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00};
-static char check_inconsistent_aa_bits[] = {
+static guchar check_inconsistent_aa_bits[] = {
0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,
0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00};
/*
* Extracted from radio-13-ssp.png, width=13, height=13
*/
-static char radio_black_bits[] = {
+static guchar radio_black_bits[] = {
0x00,0x00,0xf0,0x01,0x0c,0x02,0x04,0x00,0x02,0x00,0x02,0x00,0x02,0x00,0x02,
0x00,0x02,0x00,0x04,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00};
-static char radio_dark_bits[] = {
+static guchar radio_dark_bits[] = {
0xf0,0x00,0x0c,0x02,0x02,0x04,0x02,0x04,0x01,0x08,0x01,0x08,0x01,0x08,0x01,
0x08,0x00,0x04,0x02,0x04,0x0c,0x03,0xf0,0x00,0x00,0x00,0x00,0x00};
-static char radio_mid_bits[] = {
+static guchar radio_mid_bits[] = {
0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,
0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00};
-static char radio_light_bits[] = {
+static guchar radio_light_bits[] = {
0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x10,0x00,0x10,0x00,0x10,0x00,
0x10,0x00,0x08,0x00,0x08,0x00,0x04,0x00,0x03,0xf0,0x00,0x00,0x00};
-static char radio_text_bits[] = {
+static guchar radio_text_bits[] = {
0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0xe0,0x00,0xf0,0x01,0xf0,0x01,0xf0,
0x01,0xe0,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00};
-static char radio_aa_bits[] = {
+static guchar radio_aa_bits[] = {
0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,
0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00};
-static char radio_base_bits[] = {
+static guchar radio_base_bits[] = {
0x00,0x00,0x00,0x00,0xf0,0x01,0xf8,0x03,0xfc,0x07,0xfc,0x07,0xfc,0x07,0xfc,
0x07,0xfc,0x03,0xf8,0x03,0xf0,0x00,0x00,0x00,0x00,0x00,0x00,0x00};
/*
* Extracted from radio-13-inconsistent-ssp.png, width=13, height=13
*/
-static char radio_inconsistent_text_bits[] = {
+static guchar radio_inconsistent_text_bits[] = {
0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0xf8,0x03,0x00,
0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00};
-static char radio_inconsistent_aa_bits[] = {
+static guchar radio_inconsistent_aa_bits[] = {
0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0xf8,0x03,0x00,0x00,0xf8,
0x03,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00};
static struct {
- char *bits;
+ guchar *bits;
GList *bmap_list; /* list of GdkBitmap */
} indicator_parts[] = {
{ check_aa_bits, NULL },
@@ -2078,7 +2078,7 @@ get_indicator_for_screen (GdkDrawable *drawable,
}
bitmap = gdk_bitmap_create_from_data (drawable,
- indicator_parts[part].bits,
+ (gchar *)indicator_parts[part].bits,
INDICATOR_PART_SIZE, INDICATOR_PART_SIZE);
indicator_parts[part].bmap_list = g_list_prepend (indicator_parts[part].bmap_list, bitmap);
@@ -4274,7 +4274,7 @@ gtk_default_draw_focus (GtkStyle *style,
GdkGC *gc;
gboolean free_dash_list = FALSE;
gint line_width = 1;
- gchar *dash_list = "\1\1";
+ gint8 *dash_list = "\1\1";
gint dash_len;
gc = style->fg_gc[state_type];