From 1109efff73c6f11040c1d491d99141423d6e6aeb Mon Sep 17 00:00:00 2001
From: Nickolay V. Shmyrev <nshmyrev@src.gnome.org>
Date: Mon, 06 Jun 2005 21:23:46 +0000
Subject: Fix gcc 4.0 warnings. Second part

---
(limited to 'cut-n-paste/toolbar-editor/egg-toolbars-model.h')

diff --git a/cut-n-paste/toolbar-editor/egg-toolbars-model.h b/cut-n-paste/toolbar-editor/egg-toolbars-model.h
index 11d9bbe..aaaa214 100644
--- a/cut-n-paste/toolbar-editor/egg-toolbars-model.h
+++ b/cut-n-paste/toolbar-editor/egg-toolbars-model.h
@@ -14,6 +14,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_TOOLBARS_MODEL_H
@@ -25,7 +27,6 @@
 
 G_BEGIN_DECLS
 
-
 #define EGG_TYPE_TOOLBARS_MODEL             (egg_toolbars_model_get_type ())
 #define EGG_TOOLBARS_MODEL(obj)             (G_TYPE_CHECK_INSTANCE_CAST ((obj), EGG_TYPE_TOOLBARS_MODEL, EggToolbarsModel))
 #define EGG_TOOLBARS_MODEL_CLASS(klass)     (G_TYPE_CHECK_CLASS_CAST ((klass), EGG_TYPE_TOOLBARS_MODEL, EggToolbarsModelClass))
@@ -42,10 +43,11 @@ typedef struct EggToolbarsModelClass	EggToolbarsModelClass;
 typedef enum
 {
   EGG_TB_MODEL_NOT_REMOVABLE	 = 1 << 0,
-  EGG_TB_MODEL_ICONS_ONLY	 = 1 << 1,
-  EGG_TB_MODEL_TEXT_ONLY	 = 1 << 2,
-  EGG_TB_MODEL_ICONS_TEXT	 = 1 << 3,
-  EGG_TB_MODEL_ICONS_TEXT_HORIZ	 = 1 << 4,
+  EGG_TB_MODEL_BOTH		 = 1 << 1,
+  EGG_TB_MODEL_BOTH_HORIZ	 = 1 << 2,
+  EGG_TB_MODEL_ICONS		 = 1 << 3,
+  EGG_TB_MODEL_TEXT		 = 1 << 4,
+  EGG_TB_MODEL_STYLES_MASK	 = 0x1F,
   EGG_TB_MODEL_ACCEPT_ITEMS_ONLY = 1 << 5
 } EggTbModelFlags;
 
@@ -91,6 +93,7 @@ struct EggToolbarsModelClass
 			    const char       *type);
 };
 
+GType		  egg_toolbars_model_flags_get_type (void);
 GType		  egg_toolbars_model_get_type       (void);
 EggToolbarsModel *egg_toolbars_model_new	    (void);
 gboolean          egg_toolbars_model_load           (EggToolbarsModel *model,
--
cgit v0.9.1