diff options
| author | Owen Taylor <otaylor@redhat.com> | 2002-08-05 18:52:28 +0000 |
|---|---|---|
| committer | Owen Taylor <otaylor@src.gnome.org> | 2002-08-05 18:52:28 +0000 |
| commit | 090a1ac1cb4a6f4e1e1a578c573d2a82179461c3 (patch) | |
| tree | d1e30210967e4bbf6edf8658725d5f3617475194 /gtk/gtkimcontext.c | |
| parent | d1696ea84f062bd741aaf39fcddb5126ebd38201 (diff) | |
| download | gdk-pixbuf-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/gtkimcontext.c')
| -rw-r--r-- | gtk/gtkimcontext.c | 76 |
1 files changed, 41 insertions, 35 deletions
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 |