Small cleanup

[evince.git] / cut-n-paste / toolbar-editor / egg-editable-toolbar.h

diff --git a/cut-n-paste/toolbar-editor/egg-editable-toolbar.h b/cut-n-paste/toolbar-editor/egg-editable-toolbar.h
index 2aa087b5fc29c66782cc5c95bd883ad26914a850..669af4150e8892525b01bca22724581d2148e437 100644 (file)
--- a/cut-n-paste/toolbar-editor/egg-editable-toolbar.h
+++ b/cut-n-paste/toolbar-editor/egg-editable-toolbar.h
@@ -1,6 +1,6 @@
 /*
 /*

- *  Copyright (C) 2003-2004 Marco Pesenti Gritti
- *  Copyright (C) 2004 Christian Persch
+ *  Copyright (C) 2003, 2004  Marco Pesenti Gritti
+ *  Copyright (C) 2003, 2004, 2005  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
  *
  *  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,7 +14,7 @@
  *
  *  You should have received a copy of the GNU General Public License
  *  along with this program; if not, write to the Free Software
  *
  *  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.
+ *  Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.

  *
  *  $Id$
  */
  *
  *  $Id$
  */


@@ -24,16 +24,10 @@
 
 #include "egg-toolbars-model.h"
 
 
 #include "egg-toolbars-model.h"
 

-#include <gtk/gtkuimanager.h>
-#include <gtk/gtkselection.h>
-#include <gtk/gtkvbox.h>
-#include <gtk/gtktoolitem.h>
-#include <gtk/gtktoolbar.h>
+#include <gtk/gtk.h>

 
 G_BEGIN_DECLS
 
 
 G_BEGIN_DECLS
 

-typedef struct EggEditableToolbarClass EggEditableToolbarClass;
-

 #define EGG_TYPE_EDITABLE_TOOLBAR             (egg_editable_toolbar_get_type ())
 #define EGG_EDITABLE_TOOLBAR(obj)             (G_TYPE_CHECK_INSTANCE_CAST ((obj), EGG_TYPE_EDITABLE_TOOLBAR, EggEditableToolbar))
 #define EGG_EDITABLE_TOOLBAR_CLASS(klass)     (G_TYPE_CHECK_CLASS_CAST ((klass), EGG_TYPE_EDITABLE_TOOLBAR, EggEditableToolbarClass))
 #define EGG_TYPE_EDITABLE_TOOLBAR             (egg_editable_toolbar_get_type ())
 #define EGG_EDITABLE_TOOLBAR(obj)             (G_TYPE_CHECK_INSTANCE_CAST ((obj), EGG_TYPE_EDITABLE_TOOLBAR, EggEditableToolbar))
 #define EGG_EDITABLE_TOOLBAR_CLASS(klass)     (G_TYPE_CHECK_CLASS_CAST ((klass), EGG_TYPE_EDITABLE_TOOLBAR, EggEditableToolbarClass))


@@ -41,11 +35,11 @@ typedef struct EggEditableToolbarClass EggEditableToolbarClass;
 #define EGG_IS_EDITABLE_TOOLBAR_CLASS(klass)  (G_TYPE_CHECK_CLASS_TYPE ((klass), EGG_TYPE_EDITABLE_TOOLBAR))
 #define EGG_EDITABLE_TOOLBAR_GET_CLASS(obj)   (G_TYPE_INSTANCE_GET_CLASS ((obj), EGG_TYPE_EDITABLE_TOOLBAR, EggEditableToolbarClass))
 
 #define EGG_IS_EDITABLE_TOOLBAR_CLASS(klass)  (G_TYPE_CHECK_CLASS_TYPE ((klass), EGG_TYPE_EDITABLE_TOOLBAR))
 #define EGG_EDITABLE_TOOLBAR_GET_CLASS(obj)   (G_TYPE_INSTANCE_GET_CLASS ((obj), EGG_TYPE_EDITABLE_TOOLBAR, EggEditableToolbarClass))
 

+typedef struct _EggEditableToolbar        EggEditableToolbar;
+typedef struct _EggEditableToolbarPrivate EggEditableToolbarPrivate;
+typedef struct _EggEditableToolbarClass   EggEditableToolbarClass;

 
 

-typedef struct EggEditableToolbar EggEditableToolbar;
-typedef struct EggEditableToolbarPrivate EggEditableToolbarPrivate;
-
-struct EggEditableToolbar
+struct _EggEditableToolbar

 {
   GtkVBox parent_object;
 
 {
   GtkVBox parent_object;
 


@@ -53,7 +47,7 @@ struct EggEditableToolbar
   EggEditableToolbarPrivate *priv;
 };
 
   EggEditableToolbarPrivate *priv;
 };
 

-struct EggEditableToolbarClass
+struct _EggEditableToolbarClass

 {
   GtkVBoxClass parent_class;
 
 {
   GtkVBoxClass parent_class;
 


@@ -62,12 +56,15 @@ struct EggEditableToolbarClass
 };
 
 GType               egg_editable_toolbar_get_type        (void);
 };
 
 GType               egg_editable_toolbar_get_type        (void);

-GtkWidget         *egg_editable_toolbar_new             (GtkUIManager         *manager);
+GtkWidget         *egg_editable_toolbar_new             (GtkUIManager         *manager,
+                                                         const char           *visibility_path);

 GtkWidget         *egg_editable_toolbar_new_with_model  (GtkUIManager         *manager,
 GtkWidget         *egg_editable_toolbar_new_with_model  (GtkUIManager         *manager,

-                                                         EggToolbarsModel     *model);
+                                                         EggToolbarsModel     *model,
+                                                         const char           *visibility_path);

 void               egg_editable_toolbar_set_model       (EggEditableToolbar   *etoolbar,
                                                          EggToolbarsModel     *model);
 EggToolbarsModel   *egg_editable_toolbar_get_model       (EggEditableToolbar   *etoolbar);
 void               egg_editable_toolbar_set_model       (EggEditableToolbar   *etoolbar,
                                                          EggToolbarsModel     *model);
 EggToolbarsModel   *egg_editable_toolbar_get_model       (EggEditableToolbar   *etoolbar);

+GtkUIManager       *egg_editable_toolbar_get_manager     (EggEditableToolbar   *etoolbar);

 void               egg_editable_toolbar_set_edit_mode   (EggEditableToolbar   *etoolbar,
                                                          gboolean              mode);
 gboolean           egg_editable_toolbar_get_edit_mode   (EggEditableToolbar   *etoolbar);
 void               egg_editable_toolbar_set_edit_mode   (EggEditableToolbar   *etoolbar,
                                                          gboolean              mode);
 gboolean           egg_editable_toolbar_get_edit_mode   (EggEditableToolbar   *etoolbar);


@@ -75,13 +72,15 @@ void                    egg_editable_toolbar_show            (EggEditableToolbar   *etoolbar,
                                                          const char           *name);
 void               egg_editable_toolbar_hide            (EggEditableToolbar   *etoolbar,
                                                          const char           *name);
                                                          const char           *name);
 void               egg_editable_toolbar_hide            (EggEditableToolbar   *etoolbar,
                                                          const char           *name);

-void               egg_editable_toolbar_set_drag_dest   (EggEditableToolbar   *etoolbar,
-                                                         const GtkTargetEntry *targets,
-                                                         gint                  n_targets,
-                                                         const char           *toolbar_name);

 void               egg_editable_toolbar_set_fixed       (EggEditableToolbar   *etoolbar,
 void               egg_editable_toolbar_set_fixed       (EggEditableToolbar   *etoolbar,

-                                                         GtkToolItem          *fixed);
+                                                         GtkToolbar           *fixed_toolbar);
+
+GtkWidget *         egg_editable_toolbar_get_selected    (EggEditableToolbar   *etoolbar);
+void                egg_editable_toolbar_set_selected    (EggEditableToolbar   *etoolbar,
+                                                         GtkWidget            *widget);

 
 

+void              egg_editable_toolbar_add_visibility    (EggEditableToolbar   *etoolbar,
+                                                         const char           *path);

 
 /* Private Functions */
 
 
 /* Private Functions */