projects
/
pspp-builds.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Remove marshaller from helper.c and use a generated one instead
[pspp-builds.git]
/
lib
/
gtksheet
/
gtksheet.h
diff --git
a/lib/gtksheet/gtksheet.h
b/lib/gtksheet/gtksheet.h
index 8dc213321149b62dd470bc7de87c7e120c3052dc..92c4248eff1c6fb42f6974db8103e6a30aa32a86 100644
(file)
--- a/
lib/gtksheet/gtksheet.h
+++ b/
lib/gtksheet/gtksheet.h
@@
-30,9
+30,7
@@
#include "gtkextra-sheet.h"
#include "gsheetmodel.h"
#include "gtkextra-sheet.h"
#include "gsheetmodel.h"
-#include "gsheet-column-iface.h"
-#include "gsheet-row-iface.h"
-
+#include "psppire-axis.h"
G_BEGIN_DECLS
G_BEGIN_DECLS
@@
-47,6
+45,7
@@
enum
#define GTK_TYPE_SHEET_RANGE (gtk_sheet_range_get_type ())
#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)
#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 _GtkSheetClass GtkSheetClass;
typedef struct _GtkSheetCellAttr GtkSheetCellAttr;
-typedef struct _GtkSheetCell GtkSheetCell;
+
typedef struct _GtkSheetHoverTitle GtkSheetHoverTitle;
struct _GtkSheetCellAttr
{
GtkJustification justification;
typedef struct _GtkSheetHoverTitle GtkSheetHoverTitle;
struct _GtkSheetCellAttr
{
GtkJustification justification;
- const PangoFontDescription *font_desc;
GdkColor foreground;
GdkColor background;
GtkSheetCellBorder border;
gboolean is_editable;
GdkColor foreground;
GdkColor background;
GtkSheetCellBorder border;
gboolean is_editable;
- gboolean is_visible;
-};
-
-struct _GtkSheetCell
-{
- gint row;
- gint col;
};
};
-
struct _GtkSheetHoverTitle
{
GtkWidget *window;
struct _GtkSheetHoverTitle
{
GtkWidget *window;
@@
-97,8
+87,8
@@
struct _GtkSheet
GtkBin parent;
gboolean dispose_has_run;
GtkBin parent;
gboolean dispose_has_run;
-
GSheetColumn *column_geometry
;
-
GSheetRow *row_geometry
;
+
PsppireAxis *haxis
;
+
PsppireAxis *vaxis
;
guint16 flags;
guint16 flags;
@@
-110,10
+100,6
@@
struct _GtkSheet
GdkColor color[n_COLORS];
gboolean show_grid;
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;
gint16 column_requisition;
gint16 row_requisition;
@@
-126,10
+112,6
@@
struct _GtkSheet
/* The GtkEntry used for editing the cells */
GtkWidget *entry_widget;
/* 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;
/* The type of entry_widget */
GtkType entry_type;
@@
-237,23
+219,16
@@
GtkType gtk_sheet_range_get_type (void);
/* create a new sheet */
/* create a new sheet */
-GtkWidget * gtk_sheet_new (GSheetRow *vgeo, GSheetColumn *hgeo,
- GSheetModel *model);
+GtkWidget * gtk_sheet_new (GSheetModel *model);
/* create a new sheet with custom entry */
GtkWidget *
/* 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);
/* Change entry */
void gtk_sheet_change_entry (GtkSheet *sheet, GtkType entry_type);
-Gtk
Widget
*gtk_sheet_get_entry (GtkSheet *sheet);
+Gtk
Entry
*gtk_sheet_get_entry (GtkSheet *sheet);
void gtk_sheet_get_selected_range (GtkSheet *sheet,
void gtk_sheet_get_selected_range (GtkSheet *sheet,