aboutsummaryrefslogtreecommitdiffstats
path: root/widgets/misc
diff options
context:
space:
mode:
Diffstat (limited to 'widgets/misc')
-rw-r--r--widgets/misc/e-canvas-vbox.c2
-rw-r--r--widgets/misc/e-canvas.c21
-rw-r--r--widgets/misc/e-canvas.h2
-rw-r--r--widgets/misc/e-reflow-model.c2
-rw-r--r--widgets/misc/e-reflow.c2
-rw-r--r--widgets/misc/e-selection-model-array.c4
-rw-r--r--widgets/misc/e-selection-model-simple.c2
-rw-r--r--widgets/misc/e-selection-model.c4
-rw-r--r--widgets/misc/e-selection-model.h2
9 files changed, 21 insertions, 20 deletions
diff --git a/widgets/misc/e-canvas-vbox.c b/widgets/misc/e-canvas-vbox.c
index e3ca3ce5d1..2bbff343ed 100644
--- a/widgets/misc/e-canvas-vbox.c
+++ b/widgets/misc/e-canvas-vbox.c
@@ -53,7 +53,7 @@ enum {
ARG_WIDTH,
ARG_MINIMUM_WIDTH,
ARG_HEIGHT,
- ARG_SPACING,
+ ARG_SPACING
};
GtkType
diff --git a/widgets/misc/e-canvas.c b/widgets/misc/e-canvas.c
index 594591f011..378bc31e56 100644
--- a/widgets/misc/e-canvas.c
+++ b/widgets/misc/e-canvas.c
@@ -800,8 +800,9 @@ e_canvas_item_invoke_reflow (GnomeCanvasItem *item, int flags)
if (item->object.flags & E_CANVAS_ITEM_NEEDS_REFLOW) {
ECanvasItemReflowFunc func;
- func = gtk_object_get_data (GTK_OBJECT (item),
- "ECanvasItem::reflow_callback");
+ func = (ECanvasItemReflowFunc)
+ gtk_object_get_data (GTK_OBJECT (item),
+ "ECanvasItem::reflow_callback");
if (func)
func (item, flags);
}
@@ -917,7 +918,7 @@ e_canvas_item_set_cursor (GnomeCanvasItem *item, gpointer id)
for (list = canvas->selection; list; list = g_list_next(list)) {
info = list->data;
- func = gtk_object_get_data(GTK_OBJECT(info->item), "ECanvasItem::selection_callback");
+ func = (ECanvasItemSelectionFunc)gtk_object_get_data(GTK_OBJECT(info->item), "ECanvasItem::selection_callback");
if (func)
func(info->item, flags, info->id);
g_message ("ECANVAS: free info (2): item %p, id %p",
@@ -938,7 +939,7 @@ e_canvas_item_set_cursor (GnomeCanvasItem *item, gpointer id)
g_message ("ECANVAS: new info item %p, id %p", item, id);
flags = E_CANVAS_ITEM_SELECTION_SELECT | E_CANVAS_ITEM_SELECTION_CURSOR;
- func = gtk_object_get_data(GTK_OBJECT(item), "ECanvasItem::selection_callback");
+ func = (ECanvasItemSelectionFunc)gtk_object_get_data(GTK_OBJECT(item), "ECanvasItem::selection_callback");
if (func)
func(item, flags, id);
@@ -969,7 +970,7 @@ e_canvas_item_add_selection (GnomeCanvasItem *item, gpointer id)
canvas = E_CANVAS(item->canvas);
if (canvas->cursor) {
- func = gtk_object_get_data(GTK_OBJECT(canvas->cursor->item), "ECanvasItem::selection_callback");
+ func = (ECanvasItemSelectionFunc)gtk_object_get_data(GTK_OBJECT(canvas->cursor->item), "ECanvasItem::selection_callback");
if (func)
func(canvas->cursor->item, flags, canvas->cursor->id);
}
@@ -984,11 +985,11 @@ e_canvas_item_add_selection (GnomeCanvasItem *item, gpointer id)
if (search->item == item) {
ECanvasItemSelectionCompareFunc compare_func;
- compare_func = gtk_object_get_data(GTK_OBJECT(search->item), "ECanvasItem::selection_compare_callback");
+ compare_func = (ECanvasItemSelectionCompareFunc)gtk_object_get_data(GTK_OBJECT(search->item), "ECanvasItem::selection_compare_callback");
if (compare_func(search->item, search->id, id, 0) == 0) {
canvas->cursor = search;
- func = gtk_object_get_data(GTK_OBJECT(item), "ECanvasItem::selection_callback");
+ func = (ECanvasItemSelectionFunc)gtk_object_get_data(GTK_OBJECT(item), "ECanvasItem::selection_callback");
if (func)
func(item, flags, search->id);
return;
@@ -1002,7 +1003,7 @@ e_canvas_item_add_selection (GnomeCanvasItem *item, gpointer id)
info->id = id;
g_message ("ECANVAS: new info (2): item %p, id %p", item, id);
- func = gtk_object_get_data(GTK_OBJECT(item), "ECanvasItem::selection_callback");
+ func = (ECanvasItemSelectionFunc)gtk_object_get_data(GTK_OBJECT(item), "ECanvasItem::selection_callback");
if (func)
func(item, flags, id);
@@ -1031,11 +1032,11 @@ e_canvas_item_remove_selection (GnomeCanvasItem *item, gpointer id)
if (info->item == item) {
ECanvasItemSelectionCompareFunc compare_func;
- compare_func = gtk_object_get_data(GTK_OBJECT(info->item), "ECanvasItem::selection_compare_callback");
+ compare_func = (ECanvasItemSelectionCompareFunc)gtk_object_get_data(GTK_OBJECT(info->item), "ECanvasItem::selection_compare_callback");
if (compare_func(info->item, info->id, id, 0) == 0) {
ECanvasItemSelectionFunc func;
- func = gtk_object_get_data(GTK_OBJECT(info->item), "ECanvasItem::selection_callback");
+ func = (ECanvasItemSelectionFunc) gtk_object_get_data(GTK_OBJECT(info->item), "ECanvasItem::selection_callback");
if (func)
func(info->item, flags, info->id);
canvas->selection = g_list_remove_link(canvas->selection, list);
diff --git a/widgets/misc/e-canvas.h b/widgets/misc/e-canvas.h
index 1e8397b301..ee25a4b6bf 100644
--- a/widgets/misc/e-canvas.h
+++ b/widgets/misc/e-canvas.h
@@ -66,7 +66,7 @@ enum {
enum {
E_CANVAS_ITEM_SELECTION_SELECT = 1 << 0, /* TRUE = select. FALSE = unselect. */
E_CANVAS_ITEM_SELECTION_CURSOR = 1 << 1, /* TRUE = has become cursor. FALSE = not cursor. */
- E_CANVAS_ITEM_SELECTION_DELETE_DATA = 1 << 2,
+ E_CANVAS_ITEM_SELECTION_DELETE_DATA = 1 << 2
};
typedef struct {
diff --git a/widgets/misc/e-reflow-model.c b/widgets/misc/e-reflow-model.c
index 0cf218e829..8e75b8249e 100644
--- a/widgets/misc/e-reflow-model.c
+++ b/widgets/misc/e-reflow-model.c
@@ -32,7 +32,7 @@
#define d(x)
-d(static gint depth = 0);
+d(static gint depth = 0;)
static GtkObjectClass *e_reflow_model_parent_class;
diff --git a/widgets/misc/e-reflow.c b/widgets/misc/e-reflow.c
index f628dec126..6b4ff4a416 100644
--- a/widgets/misc/e-reflow.c
+++ b/widgets/misc/e-reflow.c
@@ -63,7 +63,7 @@ enum {
ARG_HEIGHT,
ARG_EMPTY_MESSAGE,
ARG_MODEL,
- ARG_COLUMN_WIDTH,
+ ARG_COLUMN_WIDTH
};
enum {
diff --git a/widgets/misc/e-selection-model-array.c b/widgets/misc/e-selection-model-array.c
index 2ed1f0a6be..76efe13de3 100644
--- a/widgets/misc/e-selection-model-array.c
+++ b/widgets/misc/e-selection-model-array.c
@@ -35,7 +35,7 @@ static ESelectionModelClass *parent_class;
enum {
ARG_0,
ARG_CURSOR_ROW,
- ARG_CURSOR_COL,
+ ARG_CURSOR_COL
};
void
@@ -547,4 +547,4 @@ e_selection_model_array_class_init (ESelectionModelArrayClass *klass)
}
E_MAKE_TYPE(e_selection_model_array, "ESelectionModelArray", ESelectionModelArray,
- e_selection_model_array_class_init, e_selection_model_array_init, PARENT_TYPE);
+ e_selection_model_array_class_init, e_selection_model_array_init, PARENT_TYPE)
diff --git a/widgets/misc/e-selection-model-simple.c b/widgets/misc/e-selection-model-simple.c
index 0d87cdc779..23257d071d 100644
--- a/widgets/misc/e-selection-model-simple.c
+++ b/widgets/misc/e-selection-model-simple.c
@@ -53,7 +53,7 @@ e_selection_model_simple_class_init (ESelectionModelSimpleClass *klass)
}
E_MAKE_TYPE(e_selection_model_simple, "ESelectionModelSimple", ESelectionModelSimple,
- e_selection_model_simple_class_init, e_selection_model_simple_init, PARENT_TYPE);
+ e_selection_model_simple_class_init, e_selection_model_simple_init, PARENT_TYPE)
/**
* e_selection_model_simple_new
diff --git a/widgets/misc/e-selection-model.c b/widgets/misc/e-selection-model.c
index b7472e99f5..aea1ad9163 100644
--- a/widgets/misc/e-selection-model.c
+++ b/widgets/misc/e-selection-model.c
@@ -47,7 +47,7 @@ enum {
ARG_0,
ARG_SORTER,
ARG_SELECTION_MODE,
- ARG_CURSOR_MODE,
+ ARG_CURSOR_MODE
};
inline static void
@@ -215,7 +215,7 @@ e_selection_model_class_init (ESelectionModelClass *klass)
}
E_MAKE_TYPE(e_selection_model, "ESelectionModel", ESelectionModel,
- e_selection_model_class_init, e_selection_model_init, PARENT_TYPE);
+ e_selection_model_class_init, e_selection_model_init, PARENT_TYPE)
/**
* e_selection_model_is_row_selected
diff --git a/widgets/misc/e-selection-model.h b/widgets/misc/e-selection-model.h
index fde97a0035..c9219a7e48 100644
--- a/widgets/misc/e-selection-model.h
+++ b/widgets/misc/e-selection-model.h
@@ -48,7 +48,7 @@ typedef void (*EForeachFunc) (int model_row,
typedef enum {
E_CURSOR_LINE,
E_CURSOR_SIMPLE,
- E_CURSOR_SPREADSHEET,
+ E_CURSOR_SPREADSHEET
} ECursorMode;
typedef struct {
generated by cgit v1.2.3 (git 2.25.1) at 2024-11-17 15:06:39 +0800