[gnumeric] SheetObjectWidget: clean up class accesses.
- From: Morten Welinder <mortenw src gnome org>
- To: svn-commits-list gnome org
- Subject: [gnumeric] SheetObjectWidget: clean up class accesses.
- Date: Mon, 18 May 2009 16:55:37 -0400 (EDT)
commit 3ec4b53eb98bd0529749e3c34616d0e3de2f8bc8
Author: Morten Welinder <terra gnome org>
Date: Mon May 18 16:54:35 2009 -0400
SheetObjectWidget: clean up class accesses.
---
ChangeLog | 2 ++
src/sheet-object-widget.c | 35 +++++++++--------------------------
2 files changed, 11 insertions(+), 26 deletions(-)
diff --git a/ChangeLog b/ChangeLog
index 4745ac5..71085fa 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,5 +1,7 @@
2009-05-18 Morten Welinder <terra gnome org>
+ * src/sheet-object-widget.c: Clean up class accesses.
+
* src/graph.c (gnm_go_data_date_conv): New function.
* src/workbook-view.c (wb_view_set_property): Normalize booleans.
diff --git a/src/sheet-object-widget.c b/src/sheet-object-widget.c
index 94d3230..98a805e 100644
--- a/src/sheet-object-widget.c
+++ b/src/sheet-object-widget.c
@@ -774,6 +774,8 @@ SOW_MAKE_TYPE (button, Button,
#define SHEET_WIDGET_ADJUSTMENT_TYPE (sheet_widget_adjustment_get_type())
#define SHEET_WIDGET_ADJUSTMENT(obj) (G_TYPE_CHECK_INSTANCE_CAST ((obj), SHEET_WIDGET_ADJUSTMENT_TYPE, SheetWidgetAdjustment))
#define DEP_TO_ADJUSTMENT(d_ptr) (SheetWidgetAdjustment *)(((char *)d_ptr) - G_STRUCT_OFFSET(SheetWidgetAdjustment, dep))
+#define SHEET_WIDGET_ADJUSTMENT_CLASS(k) (G_TYPE_CHECK_CLASS_CAST ((k), SHEET_WIDGET_ADJUSTMENT_TYPE, SheetWidgetAdjustmentClass))
+#define SWA_CLASS(so) (SHEET_WIDGET_ADJUSTMENT_CLASS (G_OBJECT_GET_CLASS(so)))
typedef struct {
SheetObjectWidget sow;
@@ -890,10 +892,6 @@ static void
sheet_widget_adjustment_set_horizontal (SheetWidgetAdjustment *swa,
gboolean horizontal)
{
- SheetObjectWidgetClass *sow_class =
- G_TYPE_INSTANCE_GET_CLASS (swa,
- sheet_object_widget_get_type(),
- SheetObjectWidgetClass);
GList *ptr;
horizontal = !!horizontal;
@@ -904,7 +902,8 @@ sheet_widget_adjustment_set_horizontal (SheetWidgetAdjustment *swa,
/* Change direction for all realized widgets. */
for (ptr = swa->sow.realized_list; ptr != NULL; ptr = ptr->next) {
FooCanvasItem *item = FOO_CANVAS_ITEM (ptr->data);
- GtkWidget *neww = sow_class->create_widget (SHEET_OBJECT (swa));
+ GtkWidget *neww =
+ SOW_CLASS (swa)->create_widget (SHEET_OBJECT (swa));
gtk_widget_show (neww);
foo_canvas_item_set (item, "widget", neww, NULL);
}
@@ -966,10 +965,7 @@ sheet_widget_adjustment_init_full (SheetWidgetAdjustment *swa,
static void
sheet_widget_adjustment_init (SheetWidgetAdjustment *swa)
{
- SheetWidgetAdjustmentClass *klass =
- G_TYPE_INSTANCE_GET_CLASS (swa,
- sheet_widget_adjustment_get_type(),
- SheetWidgetAdjustmentClass);
+ SheetWidgetAdjustmentClass *klass = SWA_CLASS (swa);
gboolean horizontal = (klass->vtype == G_TYPE_NONE);
sheet_widget_adjustment_init_full (swa, NULL, horizontal);
}
@@ -1107,11 +1103,7 @@ static void
sheet_widget_adjustment_user_config_impl (SheetObject *so, SheetControl *sc, char const *undo_label, char const *dialog_label)
{
SheetWidgetAdjustment *swa = SHEET_WIDGET_ADJUSTMENT (so);
- SheetWidgetAdjustmentClass *swa_class =
- G_TYPE_INSTANCE_GET_CLASS (swa,
- sheet_widget_adjustment_get_type(),
- SheetWidgetAdjustmentClass);
-
+ SheetWidgetAdjustmentClass *swa_class = SWA_CLASS (swa);
WBCGtk *wbcg = scg_wbcg (SHEET_CONTROL_GUI (sc));
AdjustmentConfigState *state;
GtkWidget *table;
@@ -1242,10 +1234,7 @@ sheet_widget_adjustment_write_xml_sax (SheetObject const *so, GsfXMLOut *output,
GnmConventions const *convs)
{
SheetWidgetAdjustment const *swa = SHEET_WIDGET_ADJUSTMENT (so);
- SheetWidgetAdjustmentClass *swa_class =
- G_TYPE_INSTANCE_GET_CLASS (swa,
- sheet_widget_adjustment_get_type(),
- SheetWidgetAdjustmentClass);
+ SheetWidgetAdjustmentClass *swa_class = SWA_CLASS (so);
gsf_xml_out_add_float (output, "Min", swa->adjustment->lower, 2);
gsf_xml_out_add_float (output, "Max", swa->adjustment->upper, 2); /* allow scrolling to max */
@@ -1265,10 +1254,7 @@ sheet_widget_adjustment_prep_sax_parser (SheetObject *so, GsfXMLIn *xin,
GnmConventions const *convs)
{
SheetWidgetAdjustment *swa = SHEET_WIDGET_ADJUSTMENT (so);
- SheetWidgetAdjustmentClass *swa_class =
- G_TYPE_INSTANCE_GET_CLASS (swa,
- sheet_widget_adjustment_get_type(),
- SheetWidgetAdjustmentClass);
+ SheetWidgetAdjustmentClass *swa_class = SWA_CLASS (so);
swa->horizontal = (swa_class->vtype == G_TYPE_NONE);
for (; attrs != NULL && attrs[0] && attrs[1] ; attrs += 2) {
@@ -1303,10 +1289,7 @@ sheet_widget_adjustment_read_xml_dom (SheetObject *so, char const *typename,
xmlNodePtr tree)
{
SheetWidgetAdjustment *swa = SHEET_WIDGET_ADJUSTMENT (so);
- SheetWidgetAdjustmentClass *swa_class =
- G_TYPE_INSTANCE_GET_CLASS (swa,
- sheet_widget_adjustment_get_type(),
- SheetWidgetAdjustmentClass);
+ SheetWidgetAdjustmentClass *swa_class = SWA_CLASS (so);
double tmp;
gboolean b;
[
Date Prev][
Date Next] [
Thread Prev][
Thread Next]
[
Thread Index]
[
Date Index]
[
Author Index]