diff options
Diffstat (limited to 'widgets/misc/e-selection-model.h')
| -rw-r--r-- | widgets/misc/e-selection-model.h | 17 |
1 files changed, 9 insertions, 8 deletions
diff --git a/widgets/misc/e-selection-model.h b/widgets/misc/e-selection-model.h index 0326aa60e5..a78bdfd9c3 100644 --- a/widgets/misc/e-selection-model.h +++ b/widgets/misc/e-selection-model.h @@ -32,11 +32,12 @@ extern "C" { #endif /* __cplusplus */ -#define E_SELECTION_MODEL_TYPE (e_selection_model_get_type ()) -#define E_SELECTION_MODEL(o) (GTK_CHECK_CAST ((o), E_SELECTION_MODEL_TYPE, ESelectionModel)) -#define E_SELECTION_MODEL_CLASS(k) (GTK_CHECK_CLASS_CAST((k), E_SELECTION_MODEL_TYPE, ESelectionModelClass)) -#define E_IS_SELECTION_MODEL(o) (GTK_CHECK_TYPE ((o), E_SELECTION_MODEL_TYPE)) -#define E_IS_SELECTION_MODEL_CLASS(k) (GTK_CHECK_CLASS_TYPE ((k), E_SELECTION_MODEL_TYPE)) +#define E_SELECTION_MODEL_TYPE (e_selection_model_get_type ()) +#define E_SELECTION_MODEL(o) (G_TYPE_CHECK_INSTANCE_CAST ((o), E_SELECTION_MODEL_TYPE, ESelectionModel)) +#define E_SELECTION_MODEL_CLASS(k) (G_TYPE_CHECK_CLASS_CAST((k), E_SELECTION_MODEL_TYPE, ESelectionModelClass)) +#define E_IS_SELECTION_MODEL(o) (G_TYPE_CHECK_INSTANCE_TYPE ((o), E_SELECTION_MODEL_TYPE)) +#define E_IS_SELECTION_MODEL_CLASS(k) (G_TYPE_CHECK_CLASS_TYPE ((k), E_SELECTION_MODEL_TYPE)) +#define E_SELECTION_MODEL_GET_CLASS(o) (G_TYPE_INSTANCE_GET_CLASS ((o), E_SELECTION_MODEL_TYPE, ESelectionModelClass)) #ifndef _E_FOREACH_FUNC_H_ #define _E_FOREACH_FUNC_H_ @@ -52,7 +53,7 @@ typedef enum { } ECursorMode; typedef struct { - GtkObject base; + GObject base; ESorter *sorter; @@ -63,7 +64,7 @@ typedef struct { } ESelectionModel; typedef struct { - GtkObjectClass parent_class; + GObjectClass parent_class; /* Virtual methods */ gboolean (*is_row_selected) (ESelectionModel *esm, int row); @@ -97,7 +98,7 @@ typedef struct { } ESelectionModelClass; -GtkType e_selection_model_get_type (void); +GType e_selection_model_get_type (void); void e_selection_model_do_something (ESelectionModel *esm, guint row, guint col, |