Rename gsheetmodel to psppiresheetmodel

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

diff --git a/lib/gtksheet/gtksheet.h b/lib/gtksheet/gtksheet.h
index 468708d346072aa170cb4c3dfb929a801dacac81..bdefc41bbb8db83c1b7cdf3ad43ee149f712659c 100644 (file)
--- a/lib/gtksheet/gtksheet.h
+++ b/lib/gtksheet/gtksheet.h
@@ -29,10 +29,8 @@
 #include <gtk/gtk.h>
 
 #include "gtkextra-sheet.h"
-#include "gsheetmodel.h"
-#include "gsheet-column-iface.h"
-#include "gsheet-row-iface.h"
-
+#include "psppire-sheetmodel.h"
+#include "psppire-axis.h"
 
 G_BEGIN_DECLS
 
@@ -47,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)
@@ -56,28 +55,19 @@ enum
 
 typedef struct _GtkSheetClass GtkSheetClass;
 typedef struct _GtkSheetCellAttr     GtkSheetCellAttr;
-typedef struct _GtkSheetCell GtkSheetCell;
+
 typedef struct _GtkSheetHoverTitle GtkSheetHoverTitle;
 
 
 struct _GtkSheetCellAttr
 {
   GtkJustification justification;
-  const PangoFontDescription *font_desc;
   GdkColor foreground;
   GdkColor background;
   GtkSheetCellBorder border;
   gboolean is_editable;
-  gboolean is_visible;
 };
 
-struct _GtkSheetCell
-{
-  gint row;
-  gint col;
-};
-
-
 struct _GtkSheetHoverTitle
 {
   GtkWidget *window;
@@ -97,12 +87,12 @@ struct _GtkSheet
   GtkBin parent;
 
   gboolean dispose_has_run;
-  GSheetColumn *column_geometry;
-  GSheetRow *row_geometry;
+  PsppireAxis *haxis;
+  PsppireAxis *vaxis;
 
   guint16 flags;
 
-  GSheetModel *model;
+  PsppireSheetModel *model;
 
   GtkSelectionMode selection_mode;
 
@@ -110,26 +100,12 @@ struct _GtkSheet
   GdkColor color[n_COLORS];
   gboolean show_grid;
 
-  /* allocation rectangle after the container_border_width
-     and the width of the shadow border */
-  GdkRectangle internal_allocation;
-
-  gint16 column_requisition;
-  gint16 row_requisition;
-
-  gboolean rows_resizable;
-  gboolean columns_resizable;
-
   /* active cell */
   GtkSheetCell active_cell;
 
   /* The GtkEntry used for editing the cells */
   GtkWidget *entry_widget;
 
-  /* The widget containing entry_widget, or
-     entry_widget itself if no container */
-  GtkWidget *entry_container;
-
   /* The type of entry_widget */
   GtkType entry_type;
 
@@ -194,13 +170,15 @@ struct _GtkSheet
   /* Used for the subtitle (popups) */
   gint motion_timer;
   GtkSheetHoverTitle *hover_window;
+
+  gulong update_handler_id;
 };
 
 struct _GtkSheetClass
 {
   GtkBinClass parent_class;
 
- void (*set_scroll_adjustments) (GtkSheet *sheet,
+ gboolean (*set_scroll_adjustments) (GtkSheet *sheet,
                                 GtkAdjustment *hadjustment,
                                 GtkAdjustment *vadjustment);
 
@@ -222,9 +200,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);
 
@@ -237,23 +212,16 @@ GtkType gtk_sheet_range_get_type (void);
 
 
 /* create a new sheet */
-GtkWidget * gtk_sheet_new (GSheetRow *vgeo, GSheetColumn *hgeo,
-                          GSheetModel *model);
+GtkWidget * gtk_sheet_new (PsppireSheetModel *model);
 
 /* create a new sheet with custom entry */
 GtkWidget *
-gtk_sheet_new_with_custom_entry        (GSheetRow *vgeo,
-                                        GSheetColumn *hgeo,
-                                        GtkType entry_type);
-void
-gtk_sheet_construct_with_custom_entry  (GtkSheet *sheet,
-                                        GSheetRow *vgeo,
-                                        GSheetColumn *hgeo,
-                                        GtkType entry_type);
+gtk_sheet_new_with_custom_entry (GtkType entry_type);
+
 /* Change entry */
 void gtk_sheet_change_entry            (GtkSheet *sheet, GtkType entry_type);
 
-GtkWidget *gtk_sheet_get_entry    (GtkSheet *sheet);
+GtkEntry *gtk_sheet_get_entry    (GtkSheet *sheet);
 
 
 void gtk_sheet_get_selected_range (GtkSheet *sheet,
@@ -299,11 +267,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
@@ -322,9 +288,9 @@ gboolean gtk_sheet_get_attributes       (const GtkSheet *sheet,
                                        GtkSheetCellAttr *attributes);
 
 void gtk_sheet_set_model (GtkSheet *sheet,
-                                  GSheetModel *model);
+                                  PsppireSheetModel *model);
 
-GSheetModel * gtk_sheet_get_model (const GtkSheet *sheet);
+PsppireSheetModel * gtk_sheet_get_model (const GtkSheet *sheet);
 
 
 G_END_DECLS