[beast/devel: 5/7] GXK: variable and struct field fixups for C++

[Tim Janik <timj src gnome org>]

commit 5c24b25fabf24354cb79ca9ca47f53ab8b09fbf3
Author: Tim Janik <timj gnu org>
Date:   Tue Dec 18 20:20:13 2012 +0100

    GXK: variable and struct field fixups for C++

 beast-gtk/gxk/gxkmenubutton.h |    4 ++--
 beast-gtk/gxk/gxkparam.h      |    6 +++---
 beast-gtk/gxk/gxkstock.h      |   16 ++++++++--------
 beast-gtk/gxk/gxkutils.h      |    2 +-
 4 files changed, 14 insertions(+), 14 deletions(-)
---
diff --git a/beast-gtk/gxk/gxkmenubutton.h b/beast-gtk/gxk/gxkmenubutton.h
index 9c6a4c5..e8cd219 100644
--- a/beast-gtk/gxk/gxkmenubutton.h
+++ b/beast-gtk/gxk/gxkmenubutton.h
@@ -46,8 +46,8 @@ typedef struct {
   GxkAssortment *assortment_object;
   gint           icon_size, old_icon_size;
   gint           width, height;
-  guint8         mode;
-  guint8         relief;
+  GxkMenuButtonMode mode;
+  GtkReliefStyle    relief;
 } GxkMenuButton;
 typedef GtkEventBoxClass GxkMenuButtonClass;
 GType   gxk_menu_button_get_type          (void);
diff --git a/beast-gtk/gxk/gxkparam.h b/beast-gtk/gxk/gxkparam.h
index af22132..ccf2a41 100644
--- a/beast-gtk/gxk/gxkparam.h
+++ b/beast-gtk/gxk/gxkparam.h
@@ -110,18 +110,18 @@ GObject*  gxk_param_get_object          (GxkParam           *param);
 
 /* --- param view/editor --- */
 typedef struct {
-  gchar      *name, *nick;
+  const char *name, *nick;
 } GxkParamEditorIdent;
 typedef struct {
   GxkParamEditorIdent ident;
   struct {
     GType        type;
-    const gchar *type_name;
+    const char  *type_name;
     guint        all_int_nums : 1;
     guint        all_float_nums : 1;
   }              type_match;
   struct {
-    gchar      *options;        /* required pspec options */
+    const char *options;        /* required pspec options */
     gint8       rating;
     guint       editing : 1;
   }             features;
diff --git a/beast-gtk/gxk/gxkstock.h b/beast-gtk/gxk/gxkstock.h
index 8cb3cc9..1e1fb4d 100644
--- a/beast-gtk/gxk/gxkstock.h
+++ b/beast-gtk/gxk/gxkstock.h
@@ -65,14 +65,14 @@ void	    gxk_stock_register_items	(guint			 n_items,
 
 
 /* --- internal --- */
-extern guint	gxk_size_button;
-extern guint	gxk_size_big_button;
-extern guint	gxk_size_canvas;
-extern guint	gxk_size_toolbar;
-extern guint	gxk_size_menu;
-extern guint	gxk_size_tabulator;
-extern guint	gxk_size_info_sign;
-extern guint	gxk_size_palette;
+extern GtkIconSize	gxk_size_button;
+extern GtkIconSize	gxk_size_big_button;
+extern GtkIconSize	gxk_size_canvas;
+extern GtkIconSize	gxk_size_toolbar;
+extern GtkIconSize	gxk_size_menu;
+extern GtkIconSize	gxk_size_tabulator;
+extern GtkIconSize	gxk_size_info_sign;
+extern GtkIconSize	gxk_size_palette;
 
 
 G_END_DECLS
diff --git a/beast-gtk/gxk/gxkutils.h b/beast-gtk/gxk/gxkutils.h
index 634270b..68cbb4e 100644
--- a/beast-gtk/gxk/gxkutils.h
+++ b/beast-gtk/gxk/gxkutils.h
@@ -131,7 +131,7 @@ GtkWidget*	gxk_file_selection_split	(GtkFileSelection	 *fs,
 
 /* --- GObject convenience --- */
 typedef struct {
-  gchar        *type_name;
+  const char   *type_name;
   GType         parent;
   GType        *type_id;
   gconstpointer type_data;	/* e.g. GEnumValue array */