aboutsummaryrefslogtreecommitdiffstats
path: root/lib/egg/egg-editable-toolbar.h
diff options
context:
space:
mode:
authorMarco Pesenti Gritti <marco@src.gnome.org>2003-08-30 01:17:42 +0800
committerMarco Pesenti Gritti <marco@src.gnome.org>2003-08-30 01:17:42 +0800
commit07f0c900d6ade15ceb7ef418aa0ea7dabd1909c4 (patch)
treeffa40aa822515f159aa944d613b711bc921e6522 /lib/egg/egg-editable-toolbar.h
parent322e9bc21fbd27e9ee920b1908d04ba4302381df (diff)
downloadgsoc2013-epiphany-07f0c900d6ade15ceb7ef418aa0ea7dabd1909c4.tar
gsoc2013-epiphany-07f0c900d6ade15ceb7ef418aa0ea7dabd1909c4.tar.gz
gsoc2013-epiphany-07f0c900d6ade15ceb7ef418aa0ea7dabd1909c4.tar.bz2
gsoc2013-epiphany-07f0c900d6ade15ceb7ef418aa0ea7dabd1909c4.tar.lz
gsoc2013-epiphany-07f0c900d6ade15ceb7ef418aa0ea7dabd1909c4.tar.xz
gsoc2013-epiphany-07f0c900d6ade15ceb7ef418aa0ea7dabd1909c4.tar.zst
gsoc2013-epiphany-07f0c900d6ade15ceb7ef418aa0ea7dabd1909c4.zip
Part of gtk 2.3 port, changelog too long to paste it
Diffstat (limited to 'lib/egg/egg-editable-toolbar.h')
-rwxr-xr-xlib/egg/egg-editable-toolbar.h7
1 files changed, 4 insertions, 3 deletions
diff --git a/lib/egg/egg-editable-toolbar.h b/lib/egg/egg-editable-toolbar.h
index 6460d724a..577d6ab93 100755
--- a/lib/egg/egg-editable-toolbar.h
+++ b/lib/egg/egg-editable-toolbar.h
@@ -20,8 +20,9 @@
#define EGG_EDITABLE_TOOLBAR_H
#include "egg-toolbars-model.h"
-#include "egg-menu-merge.h"
+#include <gtk/gtkuimanager.h>
+#include <gtk/gtkselection.h>
#include <gtk/gtkvbox.h>
G_BEGIN_DECLS
@@ -54,7 +55,7 @@ struct EggEditableToolbarClass
};
GType egg_editable_toolbar_get_type (void);
-GtkWidget *egg_editable_toolbar_new (EggMenuMerge *merge,
+GtkWidget *egg_editable_toolbar_new (GtkUIManager *merge,
EggToolbarsModel *model);
void egg_editable_toolbar_set_edit_mode (EggEditableToolbar *etoolbar,
gboolean mode);
@@ -69,7 +70,7 @@ void egg_editable_toolbar_set_drag_dest (EggEditableToolbar *etoolbar,
/* Private Functions */
-GtkWidget *_egg_editable_toolbar_new_separator_image ();
+GtkWidget *_egg_editable_toolbar_new_separator_image (void);
G_END_DECLS