summaryrefslogtreecommitdiff
path: root/gtk/gtklistitem.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/gtklistitem.c
parent90461d7def6e605e410713d954307864285e8776 (diff)
downloadgtk+-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/gtklistitem.c')
-rw-r--r--gtk/gtklistitem.c53
1 files changed, 25 insertions, 28 deletions
diff --git a/gtk/gtklistitem.c b/gtk/gtklistitem.c
index 9ca79f5383..2deb15d2b1 100644
--- a/gtk/gtklistitem.c
+++ b/gtk/gtklistitem.c
@@ -113,6 +113,31 @@ gtk_list_item_class_init (GtkListItemClass *class)
parent_class = gtk_type_class (gtk_item_get_type ());
+ widget_class->realize = gtk_list_item_realize;
+ widget_class->size_request = gtk_list_item_size_request;
+ widget_class->size_allocate = gtk_list_item_size_allocate;
+ widget_class->style_set = gtk_list_item_style_set;
+ widget_class->draw_focus = gtk_list_item_draw_focus;
+ widget_class->button_press_event = gtk_list_item_button_press;
+ widget_class->expose_event = gtk_list_item_expose;
+ widget_class->focus_in_event = gtk_list_item_focus_in;
+ widget_class->focus_out_event = gtk_list_item_focus_out;
+
+ item_class->select = gtk_real_list_item_select;
+ item_class->deselect = gtk_real_list_item_deselect;
+ item_class->toggle = gtk_real_list_item_toggle;
+
+ class->toggle_focus_row = NULL;
+ class->select_all = NULL;
+ class->unselect_all = NULL;
+ class->undo_selection = NULL;
+ class->start_selection = NULL;
+ class->end_selection = NULL;
+ class->extend_selection = NULL;
+ class->scroll_horizontal = NULL;
+ class->scroll_vertical = NULL;
+ class->toggle_add_mode = NULL;
+
list_item_signals[TOGGLE_FOCUS_ROW] =
gtk_signal_new ("toggle_focus_row",
GTK_RUN_LAST | GTK_RUN_ACTION,
@@ -185,34 +210,6 @@ gtk_list_item_class_init (GtkListItemClass *class)
gtk_marshal_VOID__ENUM_FLOAT,
GTK_TYPE_NONE, 2, GTK_TYPE_SCROLL_TYPE, GTK_TYPE_FLOAT);
- gtk_object_class_add_signals (object_class, list_item_signals, LAST_SIGNAL);
-
- widget_class->realize = gtk_list_item_realize;
- widget_class->size_request = gtk_list_item_size_request;
- widget_class->size_allocate = gtk_list_item_size_allocate;
- widget_class->style_set = gtk_list_item_style_set;
- widget_class->draw_focus = gtk_list_item_draw_focus;
- widget_class->button_press_event = gtk_list_item_button_press;
- widget_class->expose_event = gtk_list_item_expose;
- widget_class->focus_in_event = gtk_list_item_focus_in;
- widget_class->focus_out_event = gtk_list_item_focus_out;
-
- item_class->select = gtk_real_list_item_select;
- item_class->deselect = gtk_real_list_item_deselect;
- item_class->toggle = gtk_real_list_item_toggle;
-
- class->toggle_focus_row = NULL;
- class->select_all = NULL;
- class->unselect_all = NULL;
- class->undo_selection = NULL;
- class->start_selection = NULL;
- class->end_selection = NULL;
- class->extend_selection = NULL;
- class->scroll_horizontal = NULL;
- class->scroll_vertical = NULL;
- class->toggle_add_mode = NULL;
-
-
binding_set = gtk_binding_set_by_class (class);
gtk_binding_entry_add_signal (binding_set, GDK_Up, 0,
"scroll_vertical", 2,