summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
Diffstat
-rw-r--r--ChangeLog36
-rw-r--r--ChangeLog.pre-2-1036
-rw-r--r--ChangeLog.pre-2-236
-rw-r--r--ChangeLog.pre-2-436
-rw-r--r--ChangeLog.pre-2-636
-rw-r--r--ChangeLog.pre-2-836
-rw-r--r--gtk/gtkdnd.c8
-rw-r--r--gtk/gtkimcontext.c76
-rw-r--r--gtk/gtkimmulticontext.c2
-rw-r--r--gtk/gtkitemfactory.c3
-rw-r--r--gtk/gtkitemfactory.h5
-rw-r--r--gtk/gtksignal.c3
-rw-r--r--gtk/gtkstyle.c42
-rw-r--r--gtk/gtktexttypes.c2
-rw-r--r--gtk/gtktreeitem.c2
-rw-r--r--gtk/theme-bits/decompose-bits.c2
-rw-r--r--tests/testtext.c6
17 files changed, 298 insertions, 69 deletions
diff --git a/ChangeLog b/ChangeLog
index d86962768..a31148c41 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,39 @@
+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)
+
2002-08-04 Matthias Clasen <maclas@gmx.de>
* gtk/gtkmain.c (gtk_check_version): Fix for binary compatibility
diff --git a/ChangeLog.pre-2-10 b/ChangeLog.pre-2-10
index d86962768..a31148c41 100644
--- a/ChangeLog.pre-2-10
+++ b/ChangeLog.pre-2-10
@@ -1,3 +1,39 @@
+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)
+
2002-08-04 Matthias Clasen <maclas@gmx.de>
* gtk/gtkmain.c (gtk_check_version): Fix for binary compatibility
diff --git a/ChangeLog.pre-2-2 b/ChangeLog.pre-2-2
index d86962768..a31148c41 100644
--- a/ChangeLog.pre-2-2
+++ b/ChangeLog.pre-2-2
@@ -1,3 +1,39 @@
+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)
+
2002-08-04 Matthias Clasen <maclas@gmx.de>
* gtk/gtkmain.c (gtk_check_version): Fix for binary compatibility
diff --git a/ChangeLog.pre-2-4 b/ChangeLog.pre-2-4
index d86962768..a31148c41 100644
--- a/ChangeLog.pre-2-4
+++ b/ChangeLog.pre-2-4
@@ -1,3 +1,39 @@
+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)
+
2002-08-04 Matthias Clasen <maclas@gmx.de>
* gtk/gtkmain.c (gtk_check_version): Fix for binary compatibility
diff --git a/ChangeLog.pre-2-6 b/ChangeLog.pre-2-6
index d86962768..a31148c41 100644
--- a/ChangeLog.pre-2-6
+++ b/ChangeLog.pre-2-6
@@ -1,3 +1,39 @@
+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)
+
2002-08-04 Matthias Clasen <maclas@gmx.de>
* gtk/gtkmain.c (gtk_check_version): Fix for binary compatibility
diff --git a/ChangeLog.pre-2-8 b/ChangeLog.pre-2-8
index d86962768..a31148c41 100644
--- a/ChangeLog.pre-2-8
+++ b/ChangeLog.pre-2-8
@@ -1,3 +1,39 @@
+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)
+
2002-08-04 Matthias Clasen <maclas@gmx.de>
* gtk/gtkmain.c (gtk_check_version): Fix for binary compatibility
diff --git a/gtk/gtkdnd.c b/gtk/gtkdnd.c
index e11c07960..2dc5daddf 100644
--- a/gtk/gtkdnd.c
+++ b/gtk/gtkdnd.c
@@ -341,8 +341,8 @@ static const guchar action_none_mask_bits[] = {
static struct {
GdkDragAction action;
- const char *bits;
- const char *mask;
+ const guchar *bits;
+ const guchar *mask;
GdkCursor *cursor;
} drag_cursors[] = {
{ GDK_ACTION_DEFAULT, 0 },
@@ -577,10 +577,10 @@ gtk_drag_get_cursor (GdkDisplay *display,
GdkWindow *window = gdk_screen_get_root_window (screen);
GdkPixmap *pixmap =
- gdk_bitmap_create_from_data (window, drag_cursors[i].bits, CURSOR_WIDTH, CURSOR_HEIGHT);
+ gdk_bitmap_create_from_data (window, (gchar *)drag_cursors[i].bits, CURSOR_WIDTH, CURSOR_HEIGHT);
GdkPixmap *mask =
- gdk_bitmap_create_from_data (window, drag_cursors[i].mask, CURSOR_WIDTH, CURSOR_HEIGHT);
+ gdk_bitmap_create_from_data (window, (gchar *)drag_cursors[i].mask, CURSOR_WIDTH, CURSOR_HEIGHT);
drag_cursors[i].cursor = gdk_cursor_new_from_pixmap (pixmap, mask, &fg, &bg, 0, 0);
diff --git a/gtk/gtkimcontext.c b/gtk/gtkimcontext.c
index 5f1067b52..180d9d300 100644
--- a/gtk/gtkimcontext.c
+++ b/gtk/gtkimcontext.c
@@ -17,6 +17,8 @@
* Boston, MA 02111-1307, USA.
*/
+#define GTK_DISABLE_DEPRECATED
+
#include "gtkimcontext.h"
#include "gtkmain.h" /* For _gtk_boolean_handled_accumulator */
#include "gtkmarshalers.h"
@@ -93,56 +95,60 @@ gtk_im_context_class_init (GtkIMContextClass *klass)
klass->set_surrounding = gtk_im_context_real_set_surrounding;
im_context_signals[PREEDIT_START] =
- gtk_signal_new ("preedit_start",
- GTK_RUN_LAST,
- GTK_CLASS_TYPE (object_class),
- GTK_SIGNAL_OFFSET (GtkIMContextClass, preedit_start),
- _gtk_marshal_VOID__VOID,
- GTK_TYPE_NONE, 0);
+ g_signal_new ("preedit_start",
+ G_TYPE_FROM_CLASS (object_class),
+ G_SIGNAL_RUN_LAST,
+ G_STRUCT_OFFSET (GtkIMContextClass, preedit_start),
+ NULL, NULL,
+ _gtk_marshal_VOID__VOID,
+ G_TYPE_NONE, 0);
im_context_signals[PREEDIT_END] =
- gtk_signal_new ("preedit_end",
- GTK_RUN_LAST,
- GTK_CLASS_TYPE (object_class),
- GTK_SIGNAL_OFFSET (GtkIMContextClass, preedit_end),
- _gtk_marshal_VOID__VOID,
- GTK_TYPE_NONE, 0);
+ g_signal_new ("preedit_end",
+ G_TYPE_FROM_CLASS (object_class),
+ G_SIGNAL_RUN_LAST,
+ G_STRUCT_OFFSET (GtkIMContextClass, preedit_end),
+ NULL, NULL,
+ _gtk_marshal_VOID__VOID,
+ G_TYPE_NONE, 0);
im_context_signals[PREEDIT_CHANGED] =
- gtk_signal_new ("preedit_changed",
- GTK_RUN_LAST,
- GTK_CLASS_TYPE (object_class),
- GTK_SIGNAL_OFFSET (GtkIMContextClass, preedit_changed),
- _gtk_marshal_VOID__VOID,
- GTK_TYPE_NONE, 0);
+ g_signal_new ("preedit_changed",
+ G_TYPE_FROM_CLASS (object_class),
+ G_SIGNAL_RUN_LAST,
+ G_STRUCT_OFFSET (GtkIMContextClass, preedit_changed),
+ NULL, NULL,
+ _gtk_marshal_VOID__VOID,
+ G_TYPE_NONE, 0);
im_context_signals[COMMIT] =
- gtk_signal_new ("commit",
- GTK_RUN_LAST,
- GTK_CLASS_TYPE (object_class),
- GTK_SIGNAL_OFFSET (GtkIMContextClass, commit),
- _gtk_marshal_VOID__STRING,
- GTK_TYPE_NONE, 1,
- GTK_TYPE_STRING);
+ g_signal_new ("commit",
+ G_TYPE_FROM_CLASS (object_class),
+ G_SIGNAL_RUN_LAST,
+ G_STRUCT_OFFSET (GtkIMContextClass, commit),
+ NULL, NULL,
+ _gtk_marshal_VOID__STRING,
+ G_TYPE_NONE, 1,
+ G_TYPE_STRING);
im_context_signals[RETRIEVE_SURROUNDING] =
g_signal_new ("retrieve_surrounding",
- GTK_CLASS_TYPE (object_class),
- GTK_RUN_LAST,
- GTK_SIGNAL_OFFSET (GtkIMContextClass, retrieve_surrounding),
+ G_TYPE_FROM_CLASS (object_class),
+ G_SIGNAL_RUN_LAST,
+ G_STRUCT_OFFSET (GtkIMContextClass, retrieve_surrounding),
_gtk_boolean_handled_accumulator, NULL,
_gtk_marshal_BOOLEAN__VOID,
- GTK_TYPE_BOOL, 0);
+ G_TYPE_BOOLEAN, 0);
im_context_signals[DELETE_SURROUNDING] =
g_signal_new ("delete_surrounding",
- GTK_CLASS_TYPE (object_class),
- GTK_RUN_LAST,
- GTK_SIGNAL_OFFSET (GtkIMContextClass, delete_surrounding),
+ G_TYPE_FROM_CLASS (object_class),
+ G_SIGNAL_RUN_LAST,
+ G_STRUCT_OFFSET (GtkIMContextClass, delete_surrounding),
_gtk_boolean_handled_accumulator, NULL,
_gtk_marshal_BOOLEAN__INT_INT,
- GTK_TYPE_BOOL, 2,
- GTK_TYPE_INT,
- GTK_TYPE_INT);
+ G_TYPE_BOOLEAN, 2,
+ G_TYPE_INT,
+ G_TYPE_INT);
}
static void
diff --git a/gtk/gtkimmulticontext.c b/gtk/gtkimmulticontext.c
index 92279de98..196802c10 100644
--- a/gtk/gtkimmulticontext.c
+++ b/gtk/gtkimmulticontext.c
@@ -471,7 +471,7 @@ gtk_im_multicontext_append_menuitems (GtkIMMulticontext *context,
GtkMenuShell *menushell)
{
const GtkIMContextInfo **contexts;
- gint n_contexts, i;
+ guint n_contexts, i;
GSList *group = NULL;
_gtk_im_module_list (&contexts, &n_contexts);
diff --git a/gtk/gtkitemfactory.c b/gtk/gtkitemfactory.c
index d23872879..c2575b11d 100644
--- a/gtk/gtkitemfactory.c
+++ b/gtk/gtkitemfactory.c
@@ -345,7 +345,8 @@ gtk_item_factory_add_item (GtkItemFactory *ifactory,
GtkItemFactoryClass *class;
GtkItemFactoryItem *item;
gchar *fpath;
- guint keyval, mods;
+ guint keyval;
+ GdkModifierType mods;
g_return_if_fail (widget != NULL);
g_return_if_fail (item_type != NULL);
diff --git a/gtk/gtkitemfactory.h b/gtk/gtkitemfactory.h
index d7f017844..6dcd7cd36 100644
--- a/gtk/gtkitemfactory.h
+++ b/gtk/gtkitemfactory.h
@@ -43,6 +43,11 @@ typedef void (*GtkPrintFunc) (gpointer func_data,
const gchar *str);
typedef gchar * (*GtkTranslateFunc) (const gchar *path,
gpointer func_data);
+/* We use () here to mean unspecified arguments. This is deprecated
+ * as of C99, but we can't change it without breaking compatibility.
+ * (Note that if we are included from a C++ program () will mean
+ * (void) so an explicit cast will be needed.)
+ */
typedef void (*GtkItemFactoryCallback) ();
typedef void (*GtkItemFactoryCallback1) (gpointer callback_data,
guint callback_action,
diff --git a/gtk/gtksignal.c b/gtk/gtksignal.c
index 9ee26ad35..30c2dde92 100644
--- a/gtk/gtksignal.c
+++ b/gtk/gtksignal.c
@@ -43,7 +43,8 @@ gtk_signal_newv (const gchar *name,
closure = function_offset ? g_signal_type_cclosure_new (object_type, function_offset) : 0;
- return g_signal_newv (name, object_type, signal_flags, closure, NULL, NULL, marshaller, return_val, n_params, params);
+ return g_signal_newv (name, object_type, (GSignalFlags)signal_flags, closure,
+ NULL, NULL, marshaller, return_val, n_params, params);
}
guint
diff --git a/gtk/gtkstyle.c b/gtk/gtkstyle.c
index 06216faac..a0847c63d 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];
diff --git a/gtk/gtktexttypes.c b/gtk/gtktexttypes.c
index d6f964abf..dfe095af3 100644
--- a/gtk/gtktexttypes.c
+++ b/gtk/gtktexttypes.c
@@ -3,7 +3,7 @@
/* These are used to represent embedded non-character objects
* if you return a string representation of a text buffer
*/
-const gchar gtk_text_unknown_char_utf8[] = { 0xEF, 0xBF, 0xBC, '\0' };
+const gchar gtk_text_unknown_char_utf8[] = { '\xEF', '\xBF', '\xBC', '\0' };
static inline gboolean
inline_byte_begins_utf8_char (const gchar *byte)
diff --git a/gtk/gtktreeitem.c b/gtk/gtktreeitem.c
index f3a8cb673..aa63e09c9 100644
--- a/gtk/gtktreeitem.c
+++ b/gtk/gtktreeitem.c
@@ -634,7 +634,7 @@ gtk_tree_item_paint (GtkWidget *widget,
{
if (!GTK_WIDGET_IS_SENSITIVE (widget))
gtk_paint_flat_box(widget->style, widget->window,
- widget->state, GTK_STATE_INSENSITIVE,
+ widget->state, GTK_SHADOW_NONE,
area, widget, "treeitem",
0, 0, -1, -1);
else
diff --git a/gtk/theme-bits/decompose-bits.c b/gtk/theme-bits/decompose-bits.c
index 9de556acb..3b6cd8518 100644
--- a/gtk/theme-bits/decompose-bits.c
+++ b/gtk/theme-bits/decompose-bits.c
@@ -46,7 +46,7 @@ do_part (GdkPixbuf *pixbuf,
color3 = pixels + part3_index * n_channels;
pixels += rowstride;
- printf ("static char %s_%s_bits[] = {\n", base_name, part_name);
+ printf ("static guchar %s_%s_bits[] = {\n", base_name, part_name);
printf (" ");
while (height--)
diff --git a/tests/testtext.c b/tests/testtext.c
index efef05860..1b222d051 100644
--- a/tests/testtext.c
+++ b/tests/testtext.c
@@ -104,7 +104,7 @@ typedef gboolean (*FileselOKFunc) (const char *filename, gpointer data);
static void
filesel_ok_cb (GtkWidget *button, GtkWidget *filesel)
{
- FileselOKFunc ok_func = g_object_get_data (G_OBJECT (filesel), "ok-func");
+ FileselOKFunc ok_func = (FileselOKFunc)g_object_get_data (G_OBJECT (filesel), "ok-func");
gpointer data = g_object_get_data (G_OBJECT (filesel), "ok-data");
gint *result = g_object_get_data (G_OBJECT (filesel), "ok-result");
@@ -139,7 +139,7 @@ filesel_run (GtkWindow *parent,
gtk_file_selection_set_filename (GTK_FILE_SELECTION (filesel), start_file);
- g_object_set_data (G_OBJECT (filesel), "ok-func", func);
+ g_object_set_data (G_OBJECT (filesel), "ok-func", (gpointer)func);
g_object_set_data (G_OBJECT (filesel), "ok-data", data);
g_object_set_data (G_OBJECT (filesel), "ok-result", &result);
@@ -1844,9 +1844,9 @@ buffer_search (Buffer *buffer,
}
dialog = gtk_message_dialog_new (GTK_WINDOW (view->window),
+ GTK_DIALOG_DESTROY_WITH_PARENT,
GTK_MESSAGE_INFO,
GTK_BUTTONS_OK,
- GTK_DIALOG_DESTROY_WITH_PARENT,
"%d strings found and marked in red",
i);
View Lorry Controller Status