diff options
author | Chris Toshok <toshok@ximian.com> | 2002-11-15 10:47:18 +0800 |
---|---|---|
committer | Chris Toshok <toshok@src.gnome.org> | 2002-11-15 10:47:18 +0800 |
commit | b39be5377514b9bc3c43b7f5172645edd683e683 (patch) | |
tree | 0d55ddbc296c5451fb0af8ca4ffd5295963375a3 /e-util/e-sorter.c | |
parent | b9b2089527b62590f70625208d7d68579a51124d (diff) | |
download | gsoc2013-evolution-b39be5377514b9bc3c43b7f5172645edd683e683.tar.gz gsoc2013-evolution-b39be5377514b9bc3c43b7f5172645edd683e683.tar.zst gsoc2013-evolution-b39be5377514b9bc3c43b7f5172645edd683e683.zip |
deal with EBitArray/ESorter being a GObject now.
2002-11-14 Chris Toshok <toshok@ximian.com>
* gal/widgets/e-selection-model-array.c: deal with
EBitArray/ESorter being a GObject now.
* gal/widgets/e-selection-model-simple.c: same.
* gal/util/e-bit-array.[ch]: this derives from GObject now.
* gal/util/e-sorter.[ch]: same.
* gal/util/e-sorter-array.[ch]: same.
svn path=/trunk/; revision=18774
Diffstat (limited to 'e-util/e-sorter.c')
-rw-r--r-- | e-util/e-sorter.c | 31 |
1 files changed, 14 insertions, 17 deletions
diff --git a/e-util/e-sorter.c b/e-util/e-sorter.c index 2040241abe..adee6d0d98 100644 --- a/e-util/e-sorter.c +++ b/e-util/e-sorter.c @@ -23,18 +23,15 @@ #include <config.h> #include <stdlib.h> -#include <gtk/gtksignal.h> #include <string.h> #include "gal/util/e-util.h" #include "e-sorter.h" #define d(x) -#define PARENT_TYPE gtk_object_get_type() +#define PARENT_TYPE G_TYPE_OBJECT -static GtkObjectClass *parent_class; - -#define ES_CLASS(es) ((ESorterClass *)((GTypeInstance *)(es))->g_class) +static GObjectClass *parent_class; static gint es_model_to_sorted (ESorter *es, int row); static gint es_sorted_to_model (ESorter *es, int row); @@ -45,7 +42,7 @@ static gboolean es_needs_sorting(ESorter *es); static void es_class_init (ESorterClass *klass) { - parent_class = gtk_type_class (PARENT_TYPE); + parent_class = g_type_class_ref (PARENT_TYPE); klass->model_to_sorted = es_model_to_sorted; klass->sorted_to_model = es_sorted_to_model; @@ -64,7 +61,7 @@ E_MAKE_TYPE(e_sorter, "ESorter", ESorter, es_class_init, es_init, PARENT_TYPE) ESorter * e_sorter_new (void) { - ESorter *es = gtk_type_new (E_SORTER_TYPE); + ESorter *es = g_object_new (E_SORTER_TYPE, NULL); return es; } @@ -106,8 +103,8 @@ e_sorter_model_to_sorted (ESorter *es, int row) g_return_val_if_fail(es != NULL, -1); g_return_val_if_fail(row >= 0, -1); - if (ES_CLASS(es)->model_to_sorted) - return ES_CLASS(es)->model_to_sorted (es, row); + if (E_SORTER_GET_CLASS(es)->model_to_sorted) + return E_SORTER_GET_CLASS(es)->model_to_sorted (es, row); else return -1; } @@ -118,8 +115,8 @@ e_sorter_sorted_to_model (ESorter *es, int row) g_return_val_if_fail(es != NULL, -1); g_return_val_if_fail(row >= 0, -1); - if (ES_CLASS(es)->sorted_to_model) - return ES_CLASS(es)->sorted_to_model (es, row); + if (E_SORTER_GET_CLASS(es)->sorted_to_model) + return E_SORTER_GET_CLASS(es)->sorted_to_model (es, row); else return -1; } @@ -130,8 +127,8 @@ e_sorter_get_model_to_sorted_array (ESorter *es, int **array, int *count) { g_return_if_fail(es != NULL); - if (ES_CLASS(es)->get_model_to_sorted_array) - ES_CLASS(es)->get_model_to_sorted_array (es, array, count); + if (E_SORTER_GET_CLASS(es)->get_model_to_sorted_array) + E_SORTER_GET_CLASS(es)->get_model_to_sorted_array (es, array, count); } void @@ -139,8 +136,8 @@ e_sorter_get_sorted_to_model_array (ESorter *es, int **array, int *count) { g_return_if_fail(es != NULL); - if (ES_CLASS(es)->get_sorted_to_model_array) - ES_CLASS(es)->get_sorted_to_model_array (es, array, count); + if (E_SORTER_GET_CLASS(es)->get_sorted_to_model_array) + E_SORTER_GET_CLASS(es)->get_sorted_to_model_array (es, array, count); } @@ -149,8 +146,8 @@ e_sorter_needs_sorting(ESorter *es) { g_return_val_if_fail (es != NULL, FALSE); - if (ES_CLASS(es)->needs_sorting) - return ES_CLASS(es)->needs_sorting (es); + if (E_SORTER_GET_CLASS(es)->needs_sorting) + return E_SORTER_GET_CLASS(es)->needs_sorting (es); else return FALSE; } |