Remove the gsheet-row-* modules and replaced with psppire-axis-*

[pspp-builds.git] / lib / gtksheet / gtksheet.h

diff --git a/lib/gtksheet/gtksheet.h b/lib/gtksheet/gtksheet.h
index 983c5f0aa45d27ae7d9918564c3a1f87e44f7a36..ba2294f84bedbbf28f2352f8da955259a5b4fed2 100644 (file)
--- a/lib/gtksheet/gtksheet.h
+++ b/lib/gtksheet/gtksheet.h
@@ -30,27 +30,11 @@
 
 #include "gtkextra-sheet.h"
 #include "gsheetmodel.h"
-#include "gsheet-column-iface.h"
-#include "gsheet-row-iface.h"
-
+#include "psppire-axis.h"
 
 G_BEGIN_DECLS
 
-
-typedef enum
-{
-  GTK_SHEET_FOREGROUND,
-  GTK_SHEET_BACKGROUND,
-  GTK_SHEET_FONT,
-  GTK_SHEET_JUSTIFICATION,
-  GTK_SHEET_BORDER,
-  GTK_SHEET_BORDER_COLOR,
-  GTK_SHEET_IS_EDITABLE,
-  GTK_SHEET_IS_VISIBLE
-} GtkSheetAttrType;
-
 /* sheet->state */
-
 enum
 {
   GTK_SHEET_NORMAL,
@@ -61,6 +45,7 @@ enum
 
 
 #define GTK_TYPE_SHEET_RANGE (gtk_sheet_range_get_type ())
+#define GTK_TYPE_SHEET_CELL (gtk_sheet_cell_get_type ())
 #define GTK_TYPE_SHEET (gtk_sheet_get_type ())
 
 #define GTK_SHEET(obj)          GTK_CHECK_CAST (obj, gtk_sheet_get_type (), GtkSheet)
@@ -68,11 +53,9 @@ enum
 #define GTK_IS_SHEET(obj)       GTK_CHECK_TYPE (obj, gtk_sheet_get_type ())
 
 
-
-
 typedef struct _GtkSheetClass GtkSheetClass;
 typedef struct _GtkSheetCellAttr     GtkSheetCellAttr;
-typedef struct _GtkSheetCell GtkSheetCell;
+
 typedef struct _GtkSheetHoverTitle GtkSheetHoverTitle;
 
 
@@ -87,13 +70,6 @@ struct _GtkSheetCellAttr
   gboolean is_visible;
 };
 
-struct _GtkSheetCell
-{
-  gint row;
-  gint col;
-};
-
-
 struct _GtkSheetHoverTitle
 {
   GtkWidget *window;
@@ -113,8 +89,8 @@ struct _GtkSheet
   GtkBin parent;
 
   gboolean dispose_has_run;
-  GSheetColumn *column_geometry;
-  GSheetRow *row_geometry;
+  PsppireAxis *haxis;
+  PsppireAxis *vaxis;
 
   guint16 flags;
 
@@ -149,6 +125,9 @@ struct _GtkSheet
   /* The type of entry_widget */
   GtkType entry_type;
 
+  /* Handler of the "changed" callback for the entry widget */
+  glong entry_handler_id;
+
   /* expanding selection */
   GtkSheetCell selection_cell;
 
@@ -161,14 +140,9 @@ struct _GtkSheet
   /* selected range */
   GtkSheetRange range;
 
-  /*the scrolling window and it's height and width to
+  /* the scrolling window and its height and width to
    * make things a little speedier */
   GdkWindow *sheet_window;
-  guint sheet_window_width;
-  guint sheet_window_height;
-
-  /* sheet backing pixmap */
-  GdkPixmap *pixmap;
 
   /* border shadow style */
   GtkShadowType shadow_type;
@@ -243,9 +217,6 @@ struct _GtkSheetClass
                                gint row, gint column,
                                gint *new_row, gint *new_column);
 
- gboolean (*deactivate)                (GtkSheet *sheet,
-                               gint row, gint column);
-
  gboolean (*activate)          (GtkSheet *sheet,
                                gint row, gint column);
 
@@ -258,19 +229,14 @@ GtkType gtk_sheet_range_get_type (void);
 
 
 /* create a new sheet */
-GtkWidget * gtk_sheet_new (GSheetRow *vgeo, GSheetColumn *hgeo,
+GtkWidget * gtk_sheet_new (void *vgeo, void *hgeo,
                           GSheetModel *model);
 
 /* create a new sheet with custom entry */
 GtkWidget *
-gtk_sheet_new_with_custom_entry        (GSheetRow *vgeo,
-                                        GSheetColumn *hgeo,
+gtk_sheet_new_with_custom_entry        (void *vgeo,
+                                        void *hgeo,
                                         GtkType entry_type);
-void
-gtk_sheet_construct_with_custom_entry  (GtkSheet *sheet,
-                                        GSheetRow *vgeo,
-                                        GSheetColumn *hgeo,
-                                        GtkType entry_type);
 /* Change entry */
 void gtk_sheet_change_entry            (GtkSheet *sheet, GtkType entry_type);
 
@@ -320,11 +286,9 @@ void gtk_sheet_get_visible_range (GtkSheet *sheet, GtkSheetRange *range);
 /* obvious */
 void gtk_sheet_unselect_range          (GtkSheet *sheet);
 
-/* set active cell where the entry will be displayed
- * returns FALSE if current cell can't be deactivated or
- * requested cell can't be activated */
-gboolean gtk_sheet_set_active_cell (GtkSheet *sheet,
-                                       gint row, gint column);
+/* set active cell where the entry will be displayed */
+void gtk_sheet_set_active_cell (GtkSheet *sheet,
+                               gint row, gint column);
 
 /* Sets *ROW and *COLUMN to be the coordinates of the active cell.
    ROW and/or COLUMN may be null if the caller is not interested in their
@@ -335,13 +299,6 @@ void gtk_sheet_get_active_cell (GtkSheet *sheet,
 /* get cell contents */
 gchar *gtk_sheet_cell_get_text (const GtkSheet *sheet, gint row, gint col);
 
-/* clear cell contents */
-void gtk_sheet_cell_clear      (GtkSheet *sheet, gint row, gint col);
-
-/* clear range contents. If range==NULL the whole sheet will be cleared */
-void gtk_sheet_range_clear     (GtkSheet *sheet,
-                                        const GtkSheetRange *range);
-
 
 /* get cell attributes of the given cell */
 /* TRUE means that the cell is currently allocated */
@@ -349,7 +306,7 @@ gboolean gtk_sheet_get_attributes       (const GtkSheet *sheet,
                                        gint row, gint col,
                                        GtkSheetCellAttr *attributes);
 
-void           gtk_sheet_set_model (GtkSheet *sheet,
+void gtk_sheet_set_model (GtkSheet *sheet,
                                   GSheetModel *model);
 
 GSheetModel * gtk_sheet_get_model (const GtkSheet *sheet);