Fix a compiler warning

[~andy/gtk] / gtk / gtktreeviewcolumn.h

diff --git a/gtk/gtktreeviewcolumn.h b/gtk/gtktreeviewcolumn.h
index 83caa8ad2c291cb31df57333b6fc591556880cc6..a2edd2090aaad8363a029e10de11d3c61eea7c69 100644 (file)
--- a/gtk/gtktreeviewcolumn.h
+++ b/gtk/gtktreeviewcolumn.h
@@ -28,9 +28,9 @@
 /* Not needed, retained for compatibility -Yosh */
 #include <gtk/gtkobject.h>
 
-#ifdef __cplusplus
-extern "C" {
-#endif /* __cplusplus */
+
+G_BEGIN_DECLS
+
 
 #define GTK_TYPE_TREE_VIEW_COLUMN           (gtk_tree_view_column_get_type ())
 #define GTK_TREE_VIEW_COLUMN(obj)           (G_TYPE_CHECK_INSTANCE_CAST ((obj), GTK_TYPE_TREE_VIEW_COLUMN, GtkTreeViewColumn))
@@ -104,6 +104,7 @@ struct _GtkTreeViewColumn
   guint maybe_reordered     : 1;
   guint reorderable         : 1;
   guint use_resized_width   : 1;
+  guint expand              : 1;
 };
 
 struct _GtkTreeViewColumnClass
@@ -119,11 +120,11 @@ struct _GtkTreeViewColumnClass
   void (*_gtk_reserved4) (void);
 };
 
-GType                   gtk_tree_view_column_get_type            (void);
+GType                   gtk_tree_view_column_get_type            (void) G_GNUC_CONST;
 GtkTreeViewColumn      *gtk_tree_view_column_new                 (void);
 GtkTreeViewColumn      *gtk_tree_view_column_new_with_attributes (const gchar             *title,
                                                                  GtkCellRenderer         *cell,
-                                                                 ...);
+                                                                 ...) G_GNUC_NULL_TERMINATED;
 void                    gtk_tree_view_column_pack_start          (GtkTreeViewColumn       *tree_column,
                                                                  GtkCellRenderer         *cell,
                                                                  gboolean                 expand);
@@ -138,7 +139,7 @@ void                    gtk_tree_view_column_add_attribute       (GtkTreeViewCol
                                                                  gint                     column);
 void                    gtk_tree_view_column_set_attributes      (GtkTreeViewColumn       *tree_column,
                                                                  GtkCellRenderer         *cell_renderer,
-                                                                 ...);
+                                                                 ...) G_GNUC_NULL_TERMINATED;
 void                    gtk_tree_view_column_set_cell_data_func  (GtkTreeViewColumn       *tree_column,
                                                                  GtkCellRenderer         *cell_renderer,
                                                                  GtkTreeCellDataFunc      func,
@@ -177,6 +178,9 @@ void                    gtk_tree_view_column_clicked             (GtkTreeViewCol
 void                    gtk_tree_view_column_set_title           (GtkTreeViewColumn       *tree_column,
                                                                  const gchar             *title);
 G_CONST_RETURN gchar   *gtk_tree_view_column_get_title           (GtkTreeViewColumn       *tree_column);
+void                    gtk_tree_view_column_set_expand          (GtkTreeViewColumn       *tree_column,
+                                                                 gboolean                 expand);
+gboolean                gtk_tree_view_column_get_expand          (GtkTreeViewColumn       *tree_column);
 void                    gtk_tree_view_column_set_clickable       (GtkTreeViewColumn       *tree_column,
                                                                  gboolean                 clickable);
 gboolean                gtk_tree_view_column_get_clickable       (GtkTreeViewColumn       *tree_column);
@@ -226,11 +230,11 @@ gboolean                gtk_tree_view_column_cell_get_position   (GtkTreeViewCol
                                                                  GtkCellRenderer         *cell_renderer,
                                                                  gint                    *start_pos,
                                                                  gint                    *width);
+void                    gtk_tree_view_column_queue_resize        (GtkTreeViewColumn       *tree_column);
+
 
+G_END_DECLS
 
-#ifdef __cplusplus
-}
-#endif /* __cplusplus */
 
 #endif /* __GTK_TREE_VIEW_COLUMN_H__ */