Use non-deprecated macros.

[pspp-builds.git] / lib / gtk-contrib / psppire-sheet.h

diff --git a/lib/gtk-contrib/psppire-sheet.h b/lib/gtk-contrib/psppire-sheet.h
index 27c2ed549b2d993cebc916c7573fe7896be3d2b2..eccffe84c0bf9237fc21cd8c0f1a2da3df8809ea 100644 (file)
--- a/lib/gtk-contrib/psppire-sheet.h
+++ b/lib/gtk-contrib/psppire-sheet.h
@@ -53,7 +53,7 @@
 
 G_BEGIN_DECLS
 
-/* sheet->state */
+/* sheet->select_status */
 enum
 {
   PSPPIRE_SHEET_NORMAL,
@@ -65,11 +65,12 @@ enum
 
 #define PSPPIRE_TYPE_SHEET_RANGE (psppire_sheet_range_get_type ())
 #define PSPPIRE_TYPE_SHEET_CELL (psppire_sheet_cell_get_type ())
-#define PSPPIRE_TYPE_SHEET (psppire_sheet_get_type ())
 
-#define PSPPIRE_SHEET(obj)          GTK_CHECK_CAST (obj, psppire_sheet_get_type (), PsppireSheet)
-#define PSPPIRE_SHEET_CLASS(klass)  GTK_CHECK_CLASS_CAST (klass, psppire_sheet_get_type (), PsppireSheetClass)
-#define PSPPIRE_IS_SHEET(obj)       GTK_CHECK_TYPE (obj, psppire_sheet_get_type ())
+
+#define PSPPIRE_TYPE_SHEET          (psppire_sheet_get_type ())
+#define PSPPIRE_SHEET(obj)          G_TYPE_CHECK_INSTANCE_CAST ((obj), PSPPIRE_TYPE_SHEET, PsppireSheet)
+#define PSPPIRE_SHEET_CLASS(klass)  G_TYPE_CHECK_CLASS_CAST ((klass),  PSPPIRE_TYPE_SHEET, PsppireSheetClass)
+#define PSPPIRE_IS_SHEET(obj)       G_TYPE_CHECK_INSTANCE_TYPE ((obj), PSPPIRE_TYPE_SHEET)
 
 
 typedef struct _PsppireSheetClass PsppireSheetClass;
@@ -112,8 +113,6 @@ struct _PsppireSheet
 
   PsppireSheetModel *model;
 
-  GtkSelectionMode selection_mode;
-
   /* Component colors */
   GdkColor color[n_COLORS];
   gboolean show_grid;
@@ -125,16 +124,13 @@ struct _PsppireSheet
   GtkWidget *entry_widget;
 
   /* The type of entry_widget */
-  GtkType entry_type;
-
-  /* expanding selection */
-  PsppireSheetCell selection_cell;
+  GType entry_type;
 
   /* global selection button */
   GtkWidget *button;
 
   /* sheet state */
-  gint state;
+  gint select_status;
 
   /* selected range */
   PsppireSheetRange range;
@@ -229,7 +225,7 @@ struct _PsppireSheetClass
 };
 
 GType psppire_sheet_get_type (void);
-GtkType psppire_sheet_range_get_type (void);
+GType psppire_sheet_range_get_type (void);
 
 
 /* create a new sheet */
@@ -237,10 +233,10 @@ GtkWidget * psppire_sheet_new (PsppireSheetModel *model);
 
 /* create a new sheet with custom entry */
 GtkWidget *
-psppire_sheet_new_with_custom_entry (GtkType entry_type);
+psppire_sheet_new_with_custom_entry (GType entry_type);
 
 /* Change entry */
-void psppire_sheet_change_entry                (PsppireSheet *sheet, GtkType entry_type);
+void psppire_sheet_change_entry                (PsppireSheet *sheet, GType entry_type);
 
 GtkEntry *psppire_sheet_get_entry    (PsppireSheet *sheet);