projects
/
pspp
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Remove gtk_sheet_move_query function
[pspp]
/
lib
/
gtksheet
/
gsheet-hetero-column.c
diff --git
a/lib/gtksheet/gsheet-hetero-column.c
b/lib/gtksheet/gsheet-hetero-column.c
index 8b9b9b9c3b1884e7e8dded596ed9d7f6174721a6..42b1035f5851f0c3edd1ded4bf0b389d331d6bf8 100644
(file)
--- a/
lib/gtksheet/gsheet-hetero-column.c
+++ b/
lib/gtksheet/gsheet-hetero-column.c
@@
-59,7
+59,7
@@
g_sheet_hetero_column_get_type (void)
NULL
};
NULL
};
- hetero_column_type =
+ hetero_column_type =
g_type_register_static (G_TYPE_OBJECT, "g_sheet_hetero_column",
&hetero_column_info, 0);
g_type_register_static (G_TYPE_OBJECT, "g_sheet_hetero_column",
&hetero_column_info, 0);
@@
-73,7
+73,7
@@
g_sheet_hetero_column_get_type (void)
static GtkSheetButton default_button;
static GtkSheetButton default_button;
-
+
/**
/**
@@
-91,12
+91,12
@@
g_sheet_hetero_column_new (gint default_width, gint n_columns)
retval = g_object_new (G_TYPE_SHEET_HETERO_COLUMN, NULL);
retval = g_object_new (G_TYPE_SHEET_HETERO_COLUMN, NULL);
- hg = G_SHEET_HETERO_COLUMN(retval);
+ hg = G_SHEET_HETERO_COLUMN
(retval);
hg->n_columns = n_columns;
hg->default_width = default_width;
hg->n_columns = n_columns;
hg->default_width = default_width;
- hg->col = g_new0(struct GSheetHeteroColumnUnit, n_columns);
+ hg->col = g_new0
(struct GSheetHeteroColumnUnit, n_columns);
- for (i = 0 ; i < hg->n_columns; ++i )
+ for (i = 0 ; i < hg->n_columns; ++i )
{
hg->col[i].button = default_button;
}
{
hg->col[i].button = default_button;
}
@@
-104,52
+104,44
@@
g_sheet_hetero_column_new (gint default_width, gint n_columns)
return retval;
}
return retval;
}
-static gint
-g_sheet_hetero_column_get_width
(const GSheetColumn *geom, gint
i)
+static gint
+g_sheet_hetero_column_get_width
(const GSheetColumn *geom, glong
i)
{
{
- GSheetHeteroColumn *hg = G_SHEET_HETERO_COLUMN(geom);
+ GSheetHeteroColumn *hg = G_SHEET_HETERO_COLUMN (geom);
+
+ g_return_val_if_fail (i < hg->n_columns, -1);
- g_return_val_if_fail(i < hg->n_columns, -1);
-
return hg->col[i].width;
}
return hg->col[i].width;
}
-static g
int
-g_sheet_hetero_column_get_sensitivity
(const GSheetColumn *geom, gint
u)
+static g
boolean
+g_sheet_hetero_column_get_sensitivity
(const GSheetColumn *geom, glong
u)
{
return TRUE;
}
{
return TRUE;
}
-static gint
-g_sheet_hetero_column_get_visibility(const GSheetColumn *geom, gint u)
-{
- return TRUE;
-}
-
-
-
static gchar *
static gchar *
-g_sheet_hetero_column_get_button_label
(const GSheetColumn *geom, gint
u)
+g_sheet_hetero_column_get_button_label
(const GSheetColumn *geom, glong
u)
{
{
- GSheetHeteroColumn *hg = G_SHEET_HETERO_COLUMN(geom);
+ GSheetHeteroColumn *hg = G_SHEET_HETERO_COLUMN
(geom);
- return g_locale_to_utf8(hg->col[u].button.label, -1, 0, 0, 0);
+ return g_locale_to_utf8
(hg->col[u].button.label, -1, 0, 0, 0);
}
static GtkJustification
}
static GtkJustification
-g_sheet_hetero_column_get_justification
(const GSheetColumn *geom, gint
u)
+g_sheet_hetero_column_get_justification
(const GSheetColumn *geom, glong
u)
{
{
- return GTK_JUSTIFY_
FILL
;
+ return GTK_JUSTIFY_
LEFT
;
}
}
-static g
int
-g_sheet_hetero_column_get_column_count(const GSheetColumn *geom)
+static g
long
+g_sheet_hetero_column_get_column_count
(const GSheetColumn *geom)
{
{
- GSheetHeteroColumn *hg = G_SHEET_HETERO_COLUMN(geom);
+ GSheetHeteroColumn *hg = G_SHEET_HETERO_COLUMN
(geom);
return hg->n_columns;
}
return hg->n_columns;
}
@@
-165,7
+157,6
@@
g_sheet_hetero_column_class_init (GSheetHeteroColumnClass *class)
object_class->finalize = g_sheet_hetero_column_finalize;
default_button.label=NULL;
object_class->finalize = g_sheet_hetero_column_finalize;
default_button.label=NULL;
- default_button.child=NULL;
default_button.state=GTK_STATE_NORMAL;
default_button.justification=GTK_JUSTIFY_CENTER;
default_button.label_visible = TRUE;
default_button.state=GTK_STATE_NORMAL;
default_button.justification=GTK_JUSTIFY_CENTER;
default_button.label_visible = TRUE;
@@
-177,20
+168,20
@@
g_sheet_hetero_column_init (GSheetHeteroColumn *o)
{
}
{
}
-static void
+static void
g_sheet_hetero_column_finalize (GObject *object)
{
g_sheet_hetero_column_finalize (GObject *object)
{
- GSheetHeteroColumn *hg = G_SHEET_HETERO_COLUMN(object);
+ GSheetHeteroColumn *hg = G_SHEET_HETERO_COLUMN
(object);
- g_free(hg->col);
+ g_free
(hg->col);
}
}
-static void
-hetero_column_set_width
(GSheetColumn *geo, gint
i, gint size)
+static void
+hetero_column_set_width
(GSheetColumn *geo, glong
i, gint size)
{
{
- GSheetHeteroColumn *hg = G_SHEET_HETERO_COLUMN(geo);
+ GSheetHeteroColumn *hg = G_SHEET_HETERO_COLUMN
(geo);
- g_return_if_fail(i < hg->n_columns);
+ g_return_if_fail
(i < hg->n_columns);
hg->col[i].width = size;
}
hg->col[i].width = size;
}
@@
-203,7
+194,6
@@
g_sheet_column_init (GSheetColumnIface *iface)
iface->get_width = g_sheet_hetero_column_get_width ;
iface->set_width = hetero_column_set_width ;
iface->get_sensitivity = g_sheet_hetero_column_get_sensitivity ;
iface->get_width = g_sheet_hetero_column_get_width ;
iface->set_width = hetero_column_set_width ;
iface->get_sensitivity = g_sheet_hetero_column_get_sensitivity ;
- iface->get_visibility = g_sheet_hetero_column_get_visibility ;
iface->get_justification = g_sheet_hetero_column_get_justification;
iface->get_column_count = g_sheet_hetero_column_get_column_count;
iface->get_justification = g_sheet_hetero_column_get_justification;
iface->get_column_count = g_sheet_hetero_column_get_column_count;
@@
-211,27
+201,27
@@
g_sheet_column_init (GSheetColumnIface *iface)
}
}
-void
-g_sheet_hetero_column_set_button_label(GSheetHeteroColumn *geo,
- g
int
i, const gchar *label)
+void
+g_sheet_hetero_column_set_button_label
(GSheetHeteroColumn *geo,
+ g
long
i, const gchar *label)
{
{
- g_return_if_fail(i < geo->n_columns);
+ g_return_if_fail (i < geo->n_columns);
+
+ g_free (geo->col[i].button.label);
+ geo->col[i].button.label = g_malloc (strlen (label) + 1);
- g_free(geo->col[i].button.label);
- geo->col[i].button.label = g_malloc(strlen(label) + 1);
-
- g_stpcpy(geo->col[i].button.label, label);
+ g_stpcpy (geo->col[i].button.label, label);
}
}
-inline void
-g_sheet_hetero_column_set_width
(GSheetHeteroColumn *geo, gint
i, gint size)
+void
+g_sheet_hetero_column_set_width
(GSheetHeteroColumn *geo, glong
i, gint size)
{
{
- GSheetColumn *iface = G_SHEET_COLUMN(geo);
+ GSheetColumn *iface = G_SHEET_COLUMN
(geo);
- hetero_column_set_width(iface, i, size);
+ hetero_column_set_width
(iface, i, size);
}
}