diff options
| author | Christian Persch <chpe@cvs.gnome.org> | 2004-06-16 20:31:08 +0800 |
|---|---|---|
| committer | Christian Persch <chpe@src.gnome.org> | 2004-06-16 20:31:08 +0800 |
| commit | e107b8c04820a45b8b4daca62e767cdfd8e62e23 (patch) | |
| tree | 536c5f23466c16b391603b2634ca32f58fddbf6c /lib/egg/egg-editable-toolbar.h | |
| parent | a6c12b524b75382eb362e400df3b40c23bf24067 (diff) | |
| download | gsoc2013-epiphany-e107b8c04820a45b8b4daca62e767cdfd8e62e23.tar gsoc2013-epiphany-e107b8c04820a45b8b4daca62e767cdfd8e62e23.tar.gz gsoc2013-epiphany-e107b8c04820a45b8b4daca62e767cdfd8e62e23.tar.bz2 gsoc2013-epiphany-e107b8c04820a45b8b4daca62e767cdfd8e62e23.tar.lz gsoc2013-epiphany-e107b8c04820a45b8b4daca62e767cdfd8e62e23.tar.xz gsoc2013-epiphany-e107b8c04820a45b8b4daca62e767cdfd8e62e23.tar.zst gsoc2013-epiphany-e107b8c04820a45b8b4daca62e767cdfd8e62e23.zip | |
Go back to construction the toolbar when the model is set, fixes bug
2004-06-16 Christian Persch <chpe@cvs.gnome.org>
* lib/egg/egg-editable-toolbar.c:
(egg_editable_toolbar_disconnect_model),
(egg_editable_toolbar_deconstruct),
(egg_editable_toolbar_set_model),
(egg_editable_toolbar_class_init), (egg_editable_toolbar_finalize),
(egg_editable_toolbar_new), (egg_editable_toolbar_new_with_model),
(egg_editable_toolbar_set_fixed):
* lib/egg/egg-editable-toolbar.h:
* lib/egg/egg-toolbars-model.c: (egg_toolbars_model_get_flags),
(parse_toolbars):
* src/bookmarks/ephy-bookmarksbar.c:
(ephy_bookmarksbar_set_window), (ephy_bookmarksbar_class_init):
* src/ephy-window.c: (ephy_window_fullscreen),
(ephy_window_unfullscreen), (ephy_window_init):
* src/toolbar.c: (toolbar_style_changed_cb), (parent_set_cb),
(toolbar_init), (toolbar_finalize), (toolbar_new):
Go back to construction the toolbar when the model is set, fixes
bug #144191.
2004-06-15 Marco Pesenti Gritti <marco@gnome.org>
Diffstat (limited to 'lib/egg/egg-editable-toolbar.h')
| -rwxr-xr-x | lib/egg/egg-editable-toolbar.h | 15 |
1 files changed, 11 insertions, 4 deletions
diff --git a/lib/egg/egg-editable-toolbar.h b/lib/egg/egg-editable-toolbar.h index 0e5b72cd9..d0dfb9811 100755 --- a/lib/egg/egg-editable-toolbar.h +++ b/lib/egg/egg-editable-toolbar.h @@ -1,5 +1,6 @@ /* - * Copyright (C) 2003 Marco Pesenti Gritti + * Copyright (C) 2003-2004 Marco Pesenti Gritti + * Copyright (C) 2004 Christian Persch * * This program is free software; you can redistribute it and/or modify * it under the terms of the GNU General Public License as published by @@ -14,6 +15,8 @@ * You should have received a copy of the GNU General Public License * along with this program; if not, write to the Free Software * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. + * + * $Id$ */ #ifndef EGG_EDITABLE_TOOLBAR_H @@ -24,6 +27,7 @@ #include <gtk/gtkuimanager.h> #include <gtk/gtkselection.h> #include <gtk/gtkvbox.h> +#include <gtk/gtktoolitem.h> #include <gtk/gtktoolbar.h> G_BEGIN_DECLS @@ -58,7 +62,10 @@ struct EggEditableToolbarClass }; GType egg_editable_toolbar_get_type (void); -GtkWidget *egg_editable_toolbar_new (GtkUIManager *merge, +GtkWidget *egg_editable_toolbar_new (GtkUIManager *merge); +GtkWidget *egg_editable_toolbar_new_with_model (GtkUIManager *merge, + EggToolbarsModel *model); +void egg_editable_toolbar_set_model (EggEditableToolbar *etoolbar, EggToolbarsModel *model); EggToolbarsModel *egg_editable_toolbar_get_model (EggEditableToolbar *etoolbar); void egg_editable_toolbar_set_edit_mode (EggEditableToolbar *etoolbar, @@ -72,8 +79,8 @@ void egg_editable_toolbar_set_drag_dest (EggEditableToolbar *etoolbar, const GtkTargetEntry *targets, gint n_targets, const char *toolbar_name); -GtkToolbar *egg_editable_toolbar_set_fixed (EggEditableToolbar *etoolbar, - GtkWidget *fixed); +void egg_editable_toolbar_set_fixed (EggEditableToolbar *etoolbar, + GtkToolItem *fixed); /* Private Functions */ |