summaryrefslogtreecommitdiff
path: root/gtk/gtkoldeditable.c
diff options
context:
space:
mode:
authorTim Janik <timj@gtk.org>2000-12-13 01:34:41 +0000
committerTim Janik <timj@src.gnome.org>2000-12-13 01:34:41 +0000
commit2c9eb3a5725420394322ecedb1556d59b5b4bcaa (patch)
tree20b8260cee065e2f83ff7bb4f15788f28acfa26a /gtk/gtkoldeditable.c
parent90461d7def6e605e410713d954307864285e8776 (diff)
downloadgdk-pixbuf-2c9eb3a5725420394322ecedb1556d59b5b4bcaa.tar.gz
doh, this was broken beyond believe.
Tue Dec 12 23:46:44 2000 Tim Janik <timj@gtk.org> * 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 ;)
Diffstat (limited to 'gtk/gtkoldeditable.c')
-rw-r--r--gtk/gtkoldeditable.c66
1 files changed, 32 insertions, 34 deletions
diff --git a/gtk/gtkoldeditable.c b/gtk/gtkoldeditable.c
index a085d0639..ee3bdbb79 100644
--- a/gtk/gtkoldeditable.c
+++ b/gtk/gtkoldeditable.c
@@ -174,6 +174,38 @@ gtk_old_editable_class_init (GtkOldEditableClass *class)
widget_class = (GtkWidgetClass*) class;
parent_class = gtk_type_class (GTK_TYPE_WIDGET);
+
+ object_class->set_arg = gtk_old_editable_set_arg;
+ object_class->get_arg = gtk_old_editable_get_arg;
+
+ widget_class->selection_clear_event = gtk_old_editable_selection_clear;
+ widget_class->selection_received = gtk_old_editable_selection_received;
+ widget_class->selection_get = gtk_old_editable_selection_get;
+
+ class->insert_text = NULL;
+ class->delete_text = NULL;
+
+ class->activate = NULL;
+ class->set_editable = gtk_old_editable_real_set_editable;
+
+ class->move_cursor = NULL;
+ class->move_word = NULL;
+ class->move_page = NULL;
+ class->move_to_row = NULL;
+ class->move_to_column = NULL;
+
+ class->kill_char = NULL;
+ class->kill_word = NULL;
+ class->kill_line = NULL;
+
+ class->cut_clipboard = gtk_old_editable_real_cut_clipboard;
+ class->copy_clipboard = gtk_old_editable_real_copy_clipboard;
+ class->paste_clipboard = gtk_old_editable_real_paste_clipboard;
+
+ class->update_text = NULL;
+ class->get_chars = NULL;
+ class->set_selection = NULL;
+ class->set_position = NULL;
editable_signals[CHANGED] =
gtk_signal_new ("changed",
@@ -322,42 +354,8 @@ gtk_old_editable_class_init (GtkOldEditableClass *class)
gtk_marshal_NONE__NONE,
GTK_TYPE_NONE, 0);
- gtk_object_class_add_signals (object_class, editable_signals, LAST_SIGNAL);
-
gtk_object_add_arg_type ("GtkOldEditable::text_position", GTK_TYPE_INT, GTK_ARG_READWRITE, ARG_TEXT_POSITION);
gtk_object_add_arg_type ("GtkOldEditable::editable", GTK_TYPE_BOOL, GTK_ARG_READWRITE, ARG_EDITABLE);
-
- object_class->set_arg = gtk_old_editable_set_arg;
- object_class->get_arg = gtk_old_editable_get_arg;
-
- widget_class->selection_clear_event = gtk_old_editable_selection_clear;
- widget_class->selection_received = gtk_old_editable_selection_received;
- widget_class->selection_get = gtk_old_editable_selection_get;
-
- class->insert_text = NULL;
- class->delete_text = NULL;
-
- class->activate = NULL;
- class->set_editable = gtk_old_editable_real_set_editable;
-
- class->move_cursor = NULL;
- class->move_word = NULL;
- class->move_page = NULL;
- class->move_to_row = NULL;
- class->move_to_column = NULL;
-
- class->kill_char = NULL;
- class->kill_word = NULL;
- class->kill_line = NULL;
-
- class->cut_clipboard = gtk_old_editable_real_cut_clipboard;
- class->copy_clipboard = gtk_old_editable_real_copy_clipboard;
- class->paste_clipboard = gtk_old_editable_real_paste_clipboard;
-
- class->update_text = NULL;
- class->get_chars = NULL;
- class->set_selection = NULL;
- class->set_position = NULL;
}
static void