diff options
author | Tim Janik <timj@gtk.org> | 2000-12-13 01:34:41 +0000 |
---|---|---|
committer | Tim Janik <timj@src.gnome.org> | 2000-12-13 01:34:41 +0000 |
commit | 2c9eb3a5725420394322ecedb1556d59b5b4bcaa (patch) | |
tree | 20b8260cee065e2f83ff7bb4f15788f28acfa26a /gtk/gtkmenushell.c | |
parent | 90461d7def6e605e410713d954307864285e8776 (diff) | |
download | gtk+-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/gtkmenushell.c')
-rw-r--r-- | gtk/gtkmenushell.c | 46 |
1 files changed, 22 insertions, 24 deletions
diff --git a/gtk/gtkmenushell.c b/gtk/gtkmenushell.c index bb3e7f7894..145b7b7521 100644 --- a/gtk/gtkmenushell.c +++ b/gtk/gtkmenushell.c @@ -192,6 +192,28 @@ gtk_menu_shell_class_init (GtkMenuShellClass *klass) parent_class = gtk_type_class (gtk_container_get_type ()); + widget_class->map = gtk_menu_shell_map; + widget_class->realize = gtk_menu_shell_realize; + widget_class->button_press_event = gtk_menu_shell_button_press; + widget_class->button_release_event = gtk_menu_shell_button_release; + widget_class->key_press_event = gtk_menu_shell_key_press; + widget_class->enter_notify_event = gtk_menu_shell_enter_notify; + widget_class->leave_notify_event = gtk_menu_shell_leave_notify; + + container_class->add = gtk_menu_shell_add; + container_class->remove = gtk_menu_shell_remove; + container_class->forall = gtk_menu_shell_forall; + container_class->child_type = gtk_menu_shell_child_type; + + klass->submenu_placement = GTK_TOP_BOTTOM; + klass->deactivate = gtk_real_menu_shell_deactivate; + klass->selection_done = NULL; + klass->move_current = gtk_real_menu_shell_move_current; + klass->activate_current = gtk_real_menu_shell_activate_current; + klass->cancel = gtk_real_menu_shell_cancel; + klass->select_item = gtk_menu_shell_real_select_item; + klass->insert = gtk_menu_shell_real_insert; + menu_shell_signals[DEACTIVATE] = gtk_signal_new ("deactivate", GTK_RUN_FIRST, @@ -229,30 +251,6 @@ gtk_menu_shell_class_init (GtkMenuShellClass *klass) GTK_SIGNAL_OFFSET (GtkMenuShellClass, cancel), gtk_marshal_VOID__VOID, GTK_TYPE_NONE, 0); - - gtk_object_class_add_signals (object_class, menu_shell_signals, LAST_SIGNAL); - - widget_class->map = gtk_menu_shell_map; - widget_class->realize = gtk_menu_shell_realize; - widget_class->button_press_event = gtk_menu_shell_button_press; - widget_class->button_release_event = gtk_menu_shell_button_release; - widget_class->key_press_event = gtk_menu_shell_key_press; - widget_class->enter_notify_event = gtk_menu_shell_enter_notify; - widget_class->leave_notify_event = gtk_menu_shell_leave_notify; - - container_class->add = gtk_menu_shell_add; - container_class->remove = gtk_menu_shell_remove; - container_class->forall = gtk_menu_shell_forall; - container_class->child_type = gtk_menu_shell_child_type; - - klass->submenu_placement = GTK_TOP_BOTTOM; - klass->deactivate = gtk_real_menu_shell_deactivate; - klass->selection_done = NULL; - klass->move_current = gtk_real_menu_shell_move_current; - klass->activate_current = gtk_real_menu_shell_activate_current; - klass->cancel = gtk_real_menu_shell_cancel; - klass->select_item = gtk_menu_shell_real_select_item; - klass->insert = gtk_menu_shell_real_insert; binding_set = gtk_binding_set_by_class (klass); gtk_binding_entry_add_signal (binding_set, |