Fix a compiler warning.

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

diff --git a/gtk/gtkclist.h b/gtk/gtkclist.h
index 568c31f32fe8671d76ab7f91490e925372697651..5375ea1c2eb2c78e620b32d2e6a1bc445f58515d 100644 (file)
--- a/gtk/gtkclist.h
+++ b/gtk/gtkclist.h
@@ -39,9 +39,9 @@
 #include <gtk/gtkvscrollbar.h>
 #include <gtk/gtkenums.h>
 
-#ifdef __cplusplus
-extern "C" {
-#endif /* __cplusplus */
+
+G_BEGIN_DECLS
+
 
 /* clist flags */
 enum {
@@ -151,9 +151,8 @@ struct _GtkCList
   
   guint16 flags;
   
-  /* mem chunks */
-  GMemChunk *row_mem_chunk;
-  GMemChunk *cell_mem_chunk;
+  gpointer reserved1;
+  gpointer reserved2;
 
   guint freeze_count;
   
@@ -239,6 +238,9 @@ struct _GtkCList
   GtkSortType sort_type;
   GtkCListCompareFunc compare;
   gint sort_column;
+
+  gint drag_highlight_row;
+  GtkCListDragPos drag_highlight_pos;
 };
 
 struct _GtkCListClass
@@ -628,16 +630,16 @@ gint gtk_clist_get_pixtext (GtkCList   *clist,
 /* sets the foreground color of a row, the color must already
  * be allocated
  */
-void gtk_clist_set_foreground (GtkCList *clist,
-                              gint      row,
-                              GdkColor *color);
+void gtk_clist_set_foreground (GtkCList       *clist,
+                              gint            row,
+                              const GdkColor *color);
 
 /* sets the background color of a row, the color must already
  * be allocated
  */
-void gtk_clist_set_background (GtkCList *clist,
-                              gint      row,
-                              GdkColor *color);
+void gtk_clist_set_background (GtkCList       *clist,
+                              gint            row,
+                              const GdkColor *color);
 
 /* set / get cell styles */
 void gtk_clist_set_cell_style (GtkCList *clist,
@@ -782,9 +784,9 @@ PangoLayout *_gtk_clist_create_cell_layout (GtkCList       *clist,
                                            GtkCListRow    *clist_row,
                                            gint            column);
 
-#ifdef __cplusplus
-}
-#endif                         /* __cplusplus */
+
+G_END_DECLS
+
 
 #endif                         /* __GTK_CLIST_H__ */