diff options
| author | Damon Chaplin <damon@helixcode.com> | 2000-07-17 14:22:18 +0800 |
|---|---|---|
| committer | Damon Chaplin <damon@src.gnome.org> | 2000-07-17 14:22:18 +0800 |
| commit | 4c3eaff412bf29bf8eb5e5dda2f11a9b24a46abb (patch) | |
| tree | 0c5573bb616e7dd351bb3ed7f5d441daddfdf381 /widgets/shortcut-bar/e-icon-bar.c | |
| parent | 237f2dc92b27da3e11c2ea4fcea7b45f7196f583 (diff) | |
| download | gsoc2013-evolution-4c3eaff412bf29bf8eb5e5dda2f11a9b24a46abb.tar gsoc2013-evolution-4c3eaff412bf29bf8eb5e5dda2f11a9b24a46abb.tar.gz gsoc2013-evolution-4c3eaff412bf29bf8eb5e5dda2f11a9b24a46abb.tar.bz2 gsoc2013-evolution-4c3eaff412bf29bf8eb5e5dda2f11a9b24a46abb.tar.lz gsoc2013-evolution-4c3eaff412bf29bf8eb5e5dda2f11a9b24a46abb.tar.xz gsoc2013-evolution-4c3eaff412bf29bf8eb5e5dda2f11a9b24a46abb.tar.zst gsoc2013-evolution-4c3eaff412bf29bf8eb5e5dda2f11a9b24a46abb.zip | |
new files implementing a simple model for the shortcuts, so we can have
2000-07-16 Damon Chaplin <damon@helixcode.com>
* e-shortcut-model.[hc]: new files implementing a simple model for
the shortcuts, so we can have multiple views.
* Makefile.am (libshortcut_bar_a_SOURCES): added e-shortcut-model.[hc]
* e-shortcut-bar.[hc]: updated to use the model.
* e-icon-bar.c (e_icon_bar_item_pressed): set mouse_over_item_num as
well as pressed_item_num to fix bug.
svn path=/trunk/; revision=4186
Diffstat (limited to 'widgets/shortcut-bar/e-icon-bar.c')
| -rw-r--r-- | widgets/shortcut-bar/e-icon-bar.c | 6 |
1 files changed, 4 insertions, 2 deletions
diff --git a/widgets/shortcut-bar/e-icon-bar.c b/widgets/shortcut-bar/e-icon-bar.c index 73346b8535..832506201d 100644 --- a/widgets/shortcut-bar/e-icon-bar.c +++ b/widgets/shortcut-bar/e-icon-bar.c @@ -27,6 +27,7 @@ * icons and descriptions. It provides 2 views - large icons and small icons. */ +#include <config.h> #include <gtk/gtkmain.h> #include <gtk/gtksignal.h> #include <gdk-pixbuf/gnome-canvas-pixbuf.h> @@ -296,8 +297,6 @@ e_icon_bar_destroy (GtkObject *object) icon_bar = E_ICON_BAR (object); - GTK_OBJECT_CLASS (parent_class)->destroy (object); - for (item_num = 0; item_num < icon_bar->items->len; item_num++) { item = &g_array_index (icon_bar->items, EIconBarItem, item_num); @@ -311,6 +310,8 @@ e_icon_bar_destroy (GtkObject *object) gtk_timeout_remove (icon_bar->auto_scroll_timeout_id); icon_bar->auto_scroll_timeout_id = 0; } + + GTK_OBJECT_CLASS (parent_class)->destroy (object); } @@ -1037,6 +1038,7 @@ e_icon_bar_item_pressed (EIconBar *icon_bar, button = event->button.button; if (button == 1 && item_num != -1) { + icon_bar->mouse_over_item_num = item_num; icon_bar->pressed_item_num = item_num; icon_bar->pressed_x = event->button.x; icon_bar->pressed_y = event->button.y; |