From 2c9eb3a5725420394322ecedb1556d59b5b4bcaa Mon Sep 17 00:00:00 2001 From: Tim Janik Date: Wed, 13 Dec 2000 01:34:41 +0000 Subject: doh, this was broken beyond believe. Tue Dec 12 23:46:44 2000 Tim Janik * gtk/stock-icons/Makefile.am: doh, this was broken beyond believe. * gtk/gtkbox.c: change property types from (u)long to (u)int for ::position and ::padding. * gtk/gtkcontainer.c: make ::border_width an INT property. * gtk/gtkpacker.c: make ::position an INT property. * gtk/gtkscrolledwindow.c (gtk_scrolled_window_adjustment_changed): guard against NULL h/v scrollbars, since this is used at construction time. * gtk/gtkclist.[hc]: nuked gtk_clist_construct(), implemented internal gtk_clist_constructor(). * gtk/gtkctree.[hc]: nuked gtk_ctree_construct(), implemented gtk_ctree_constructor(). * gtk/gtkprogressbar.c (gtk_progress_bar_class_init): property ::pulse_step should use ARG_PULSE_STEP, not ARG_FRACTION. * docs/reference/Makefile.am: fun stuff, disabled docs generation again, gtk-scan.c needs to introspec paramspecs, not GtkAgs. * gtk/gtkwidget.[hc]: removed gtk_widget_setv(), gtk_widget_getv(), gtk_widget_newv() and gtk_widget_get(). (gtk_widget_new): use g_object_new_valist(). (gtk_widget_set): use g_object_set_valist(). * gtk/gtkobject.[hc]: removed gtk_object_arg_get_info(), gtk_object_getv(), gtk_object_query_args(), gtk_object_newv(), gtk_object_class_add_signals(), gtk_object_class_user_signal_new(), gtk_object_class_user_signal_newv(), gtk_object_arg_set(), gtk_object_arg_get(), gtk_object_args_collect(), gtk_object_default_construct(), gtk_object_constructed(), GTK_CONSTRUCTED and GTK_OBJECT_CONSTRUCTED(). removed nsignals, signals and n_args members from GtkObjectClass. (gtk_object_new): use g_object_new_valist(). (gtk_object_set): use g_object_set_valist(). (gtk_object_get): use g_object_get_valist(). * gtk/gtkcompat.h: define gtk_object_default_construct(). * gtk/gtktypeutils.c (gtk_type_new): create constructed objects via g_object_new(). * gtk/*.c: removed gtk_object_class_add_signals() from class_init() fucntions, cleaned up method assignments (make sure your structures are setup properly before calling out). removed all GTK_CONSTRUCTED hacks ;) --- gtk/gtkimcontext.c | 8 +++----- 1 file changed, 3 insertions(+), 5 deletions(-) (limited to 'gtk/gtkimcontext.c') diff --git a/gtk/gtkimcontext.c b/gtk/gtkimcontext.c index 6d619470cf..9475d05056 100644 --- a/gtk/gtkimcontext.c +++ b/gtk/gtkimcontext.c @@ -72,6 +72,9 @@ gtk_im_context_class_init (GtkIMContextClass *klass) object_class = (GtkObjectClass*) klass; + klass->get_preedit_string = gtk_im_context_real_get_preedit_string; + klass->filter_keypress = gtk_im_context_real_filter_keypress; + im_context_signals[PREEDIT_START] = gtk_signal_new ("preedit_start", GTK_RUN_LAST, @@ -104,11 +107,6 @@ gtk_im_context_class_init (GtkIMContextClass *klass) gtk_marshal_VOID__POINTER, GTK_TYPE_NONE, 1, GTK_TYPE_STRING); - - klass->get_preedit_string = gtk_im_context_real_get_preedit_string; - klass->filter_keypress = gtk_im_context_real_filter_keypress; - - gtk_object_class_add_signals (object_class, im_context_signals, LAST_SIGNAL); } static void -- cgit v1.2.1