From 7018c41f9371c09c3c8f5586506a85b6a17df592 Mon Sep 17 00:00:00 2001 From: "Alejandro G. Castro" Date: Fri, 5 Jun 2009 12:21:36 +0200 Subject: [PATCH] Replaced gtk 2.14 deprecated symbols * hildon/hildon-calendar-popup.h: * hildon/hildon-caption.h: * hildon/hildon-code-dialog.h: * hildon/hildon-controlbar.h: * hildon/hildon-date-editor.h: * hildon/hildon-dialog.h: * hildon/hildon-get-password-dialog.h: * hildon/hildon-hvolumebar.h: * hildon/hildon-login-dialog.h: * hildon/hildon-note.h: * hildon/hildon-number-editor.h: * hildon/hildon-range-editor.h: * hildon/hildon-seekbar.h: * hildon/hildon-set-password-dialog.h: * hildon/hildon-sort-dialog.h: * hildon/hildon-time-editor.h: * hildon/hildon-time-picker.h: * hildon/hildon-volumebar-range.h: * hildon/hildon-volumebar.h: * hildon/hildon-vvolumebar.h: * hildon/hildon-weekday-picker.h: * hildon/hildon-window.h: * hildon/hildon-wizard-dialog.h: Replaced the deprecated GTK macros with the current replacements Fixes: NB#120941 (HildonWindow using deprecated GTK_CHECK* macros) --- ChangeLog | 29 +++++++++++++++++++++++++++++ hildon/hildon-calendar-popup.h | 9 +++++---- hildon/hildon-caption.h | 9 +++++---- hildon/hildon-code-dialog.h | 9 +++++---- hildon/hildon-controlbar.h | 9 +++++---- hildon/hildon-date-editor.h | 8 ++++---- hildon/hildon-dialog.h | 7 ++++--- hildon/hildon-get-password-dialog.h | 9 +++++---- hildon/hildon-hvolumebar.h | 9 +++++---- hildon/hildon-login-dialog.h | 9 +++++---- hildon/hildon-note.h | 9 +++++---- hildon/hildon-number-editor.h | 9 +++++---- hildon/hildon-range-editor.h | 9 +++++---- hildon/hildon-seekbar.h | 8 ++++---- hildon/hildon-set-password-dialog.h | 9 +++++---- hildon/hildon-sort-dialog.h | 9 +++++---- hildon/hildon-time-editor.h | 9 +++++---- hildon/hildon-time-picker.h | 8 ++++---- hildon/hildon-volumebar-range.h | 8 ++++---- hildon/hildon-volumebar.h | 9 +++++---- hildon/hildon-vvolumebar.h | 9 +++++---- hildon/hildon-weekday-picker.h | 9 +++++---- hildon/hildon-window.h | 9 +++++---- hildon/hildon-wizard-dialog.h | 9 +++++---- 24 files changed, 139 insertions(+), 91 deletions(-) diff --git a/ChangeLog b/ChangeLog index 2f6f9da..7d6b3e6 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,3 +1,32 @@ +2009-06-05 Alejandro G. Castro + + * hildon/hildon-calendar-popup.h: + * hildon/hildon-caption.h: + * hildon/hildon-code-dialog.h: + * hildon/hildon-controlbar.h: + * hildon/hildon-date-editor.h: + * hildon/hildon-dialog.h: + * hildon/hildon-get-password-dialog.h: + * hildon/hildon-hvolumebar.h: + * hildon/hildon-login-dialog.h: + * hildon/hildon-note.h: + * hildon/hildon-number-editor.h: + * hildon/hildon-range-editor.h: + * hildon/hildon-seekbar.h: + * hildon/hildon-set-password-dialog.h: + * hildon/hildon-sort-dialog.h: + * hildon/hildon-time-editor.h: + * hildon/hildon-time-picker.h: + * hildon/hildon-volumebar-range.h: + * hildon/hildon-volumebar.h: + * hildon/hildon-vvolumebar.h: + * hildon/hildon-weekday-picker.h: + * hildon/hildon-window.h: + * hildon/hildon-wizard-dialog.h: Replaced the deprecated GTK + macros with the current replacements + + Fixes: NB#120941 (HildonWindow using deprecated GTK_CHECK* macros) + 2009-06-04 Claudio Saavedra * hildon/hildon-color-button.c (hildon_color_button_init): Use diff --git a/hildon/hildon-calendar-popup.h b/hildon/hildon-calendar-popup.h index 99810e5..a6aab4a 100644 --- a/hildon/hildon-calendar-popup.h +++ b/hildon/hildon-calendar-popup.h @@ -38,17 +38,18 @@ typedef struct _HildonCalendarPopupClass Hildon #define HILDON_TYPE_CALENDAR_POPUP \ (hildon_calendar_popup_get_type()) -#define HILDON_CALENDAR_POPUP(obj) (GTK_CHECK_CAST (obj,\ +#define HILDON_CALENDAR_POPUP(obj) \ + (G_TYPE_CHECK_INSTANCE_CAST (obj, \ HILDON_TYPE_CALENDAR_POPUP, HildonCalendarPopup)) -#define HILDON_CALENDAR_POPUP_CLASS(klass) (GTK_CHECK_CLASS_CAST ((klass), \ +#define HILDON_CALENDAR_POPUP_CLASS(klass) (G_TYPE_CHECK_CLASS_CAST ((klass), \ HILDON_TYPE_CALENDAR_POPUP, HildonCalendarPopupClass)) -#define HILDON_IS_CALENDAR_POPUP(obj) (GTK_CHECK_TYPE (obj,\ +#define HILDON_IS_CALENDAR_POPUP(obj) (G_TYPE_CHECK_INSTANCE_TYPE (obj,\ HILDON_TYPE_CALENDAR_POPUP)) #define HILDON_IS_CALENDAR_POPUP_CLASS(klass) \ - (GTK_CHECK_CLASS_TYPE ((klass), HILDON_TYPE_CALENDAR_POPUP)) + (G_TYPE_CHECK_CLASS_TYPE ((klass), HILDON_TYPE_CALENDAR_POPUP)) #define HILDON_CALENDAR_POPUP_GET_CLASS(obj) \ ((HildonCalendarPopupClass *) G_OBJECT_GET_CLASS(obj)) diff --git a/hildon/hildon-caption.h b/hildon/hildon-caption.h index e1851b9..2336a9c 100644 --- a/hildon/hildon-caption.h +++ b/hildon/hildon-caption.h @@ -38,17 +38,18 @@ typedef struct _HildonCaptionClass HildonCaptio #define HILDON_TYPE_CAPTION (hildon_caption_get_type()) #define HILDON_CAPTION(obj) \ - (GTK_CHECK_CAST (obj, HILDON_TYPE_CAPTION, HildonCaption)) + (G_TYPE_CHECK_INSTANCE_CAST (obj, \ + HILDON_TYPE_CAPTION, HildonCaption)) #define HILDON_CAPTION_CLASS(klass) \ - (GTK_CHECK_CLASS_CAST ((klass),\ + (G_TYPE_CHECK_CLASS_CAST ((klass),\ HILDON_TYPE_CAPTION, HildonCaptionClass)) #define HILDON_IS_CAPTION(obj) \ - (GTK_CHECK_TYPE (obj, HILDON_TYPE_CAPTION)) + (G_TYPE_CHECK_INSTANCE_TYPE (obj, HILDON_TYPE_CAPTION)) #define HILDON_IS_CAPTION_CLASS(klass) \ - (GTK_CHECK_CLASS_TYPE ((klass), HILDON_TYPE_CAPTION)) + (G_TYPE_CHECK_CLASS_TYPE ((klass), HILDON_TYPE_CAPTION)) /** * HildonCaptionStatus: diff --git a/hildon/hildon-code-dialog.h b/hildon/hildon-code-dialog.h index 577fd85..6fb917d 100644 --- a/hildon/hildon-code-dialog.h +++ b/hildon/hildon-code-dialog.h @@ -35,17 +35,18 @@ G_BEGIN_DECLS (hildon_code_dialog_get_type()) #define HILDON_CODE_DIALOG(obj) \ - (GTK_CHECK_CAST (obj, HILDON_TYPE_CODE_DIALOG, HildonCodeDialog)) + (G_TYPE_CHECK_INSTANCE_CAST (obj, \ + HILDON_TYPE_CODE_DIALOG, HildonCodeDialog)) #define HILDON_CODE_DIALOG_CLASS(klass) \ - (GTK_CHECK_CLASS_CAST ((klass),\ + (G_TYPE_CHECK_CLASS_CAST ((klass),\ HILDON_TYPE_CODE_DIALOG, HildonCodeDialogClass)) #define HILDON_IS_CODE_DIALOG(obj) \ - (GTK_CHECK_TYPE (obj, HILDON_TYPE_CODE_DIALOG)) + (G_TYPE_CHECK_INSTANCE_TYPE (obj, HILDON_TYPE_CODE_DIALOG)) #define HILDON_IS_CODE_DIALOG_CLASS(klass) \ - (GTK_CHECK_CLASS_TYPE ((klass), HILDON_TYPE_CODE_DIALOG)) + (G_TYPE_CHECK_CLASS_TYPE ((klass), HILDON_TYPE_CODE_DIALOG)) #define HILDON_CODE_DIALOG_GET_CLASS(obj) \ ((HildonCodeDialogClass *) G_OBJECT_GET_CLASS(obj)) diff --git a/hildon/hildon-controlbar.h b/hildon/hildon-controlbar.h index f3aaf34..fef579e 100644 --- a/hildon/hildon-controlbar.h +++ b/hildon/hildon-controlbar.h @@ -34,18 +34,19 @@ G_BEGIN_DECLS #define HILDON_TYPE_CONTROLBAR \ (hildon_controlbar_get_type()) -#define HILDON_CONTROLBAR(obj) (GTK_CHECK_CAST (obj,\ +#define HILDON_CONTROLBAR(obj) \ + (G_TYPE_CHECK_INSTANCE_CAST (obj, \ HILDON_TYPE_CONTROLBAR, HildonControlbar)) #define HILDON_CONTROLBAR_CLASS(klass) \ - (GTK_CHECK_CLASS_CAST ((klass),\ + (G_TYPE_CHECK_CLASS_CAST ((klass),\ HILDON_TYPE_CONTROLBAR, HildonControlbarClass)) #define HILDON_IS_CONTROLBAR(obj) \ - (GTK_CHECK_TYPE (obj, HILDON_TYPE_CONTROLBAR)) + (G_TYPE_CHECK_INSTANCE_TYPE (obj, HILDON_TYPE_CONTROLBAR)) #define HILDON_IS_CONTROLBAR_CLASS(klass) \ - (GTK_CHECK_CLASS_TYPE ((klass),\ + (G_TYPE_CHECK_CLASS_TYPE ((klass),\ HILDON_TYPE_CONTROLBAR)) #define HILDON_CONTROLBAR_GET_CLASS(obj) \ diff --git a/hildon/hildon-date-editor.h b/hildon/hildon-date-editor.h index 02c91db..ad6be83 100644 --- a/hildon/hildon-date-editor.h +++ b/hildon/hildon-date-editor.h @@ -37,19 +37,19 @@ G_BEGIN_DECLS (hildon_date_editor_get_type()) #define HILDON_DATE_EDITOR(obj) \ - (GTK_CHECK_CAST (obj,\ + (G_TYPE_CHECK_INSTANCE_CAST (obj,\ HILDON_TYPE_DATE_EDITOR, HildonDateEditor)) #define HILDON_DATE_EDITOR_CLASS(klass) \ - (GTK_CHECK_CLASS_CAST ((klass),\ + (G_TYPE_CHECK_CLASS_CAST ((klass),\ HILDON_TYPE_DATE_EDITOR, HildonDateEditorClass)) #define HILDON_IS_DATE_EDITOR(obj) \ - (GTK_CHECK_TYPE (obj,\ + (G_TYPE_CHECK_INSTANCE_TYPE (obj,\ HILDON_TYPE_DATE_EDITOR)) #define HILDON_IS_DATE_EDITOR_CLASS(klass) \ - (GTK_CHECK_CLASS_TYPE ((klass),\ + (G_TYPE_CHECK_CLASS_TYPE ((klass),\ HILDON_TYPE_DATE_EDITOR)) typedef struct _HildonDateEditor HildonDateEditor; diff --git a/hildon/hildon-dialog.h b/hildon/hildon-dialog.h index 37ebd07..37f0a8a 100644 --- a/hildon/hildon-dialog.h +++ b/hildon/hildon-dialog.h @@ -37,14 +37,15 @@ G_BEGIN_DECLS (hildon_dialog_get_type ()) #define HILDON_DIALOG(obj) \ - (GTK_CHECK_CAST (obj, HILDON_TYPE_DIALOG, HildonDialog)) + (G_TYPE_CHECK_INSTANCE_CAST (obj, \ + HILDON_TYPE_DIALOG, HildonDialog)) #define HILDON_DIALOG_CLASS(klass) \ - (GTK_CHECK_CLASS_CAST ((klass),\ + (G_TYPE_CHECK_CLASS_CAST ((klass),\ HILDON_TYPE_DIALOG, HildonDialogClass)) #define HILDON_IS_DIALOG(obj) \ - (GTK_CHECK_TYPE (obj, HILDON_TYPE_DIALOG)) + (G_TYPE_CHECK_INSTANCE_TYPE (obj, HILDON_TYPE_DIALOG)) #define HILDON_IS_DIALOG_CLASS(klass) \ (GTK_CHECH_CLASS_TYPE ((klass), HILDON_TYPE_DIALOG)) diff --git a/hildon/hildon-get-password-dialog.h b/hildon/hildon-get-password-dialog.h index 46999cb..e903940 100644 --- a/hildon/hildon-get-password-dialog.h +++ b/hildon/hildon-get-password-dialog.h @@ -35,18 +35,19 @@ G_BEGIN_DECLS (hildon_get_password_dialog_get_type()) #define HILDON_GET_PASSWORD_DIALOG(obj) \ - (GTK_CHECK_CAST (obj, HILDON_TYPE_GET_PASSWORD_DIALOG,\ + (G_TYPE_CHECK_INSTANCE_CAST (obj, \ + HILDON_TYPE_GET_PASSWORD_DIALOG, \ HildonGetPasswordDialog)) #define HILDON_GET_PASSWORD_DIALOG_CLASS(klass) \ - (GTK_CHECK_CLASS_CAST ((klass), HILDON_TYPE_GET_PASSWORD_DIALOG, \ + (G_TYPE_CHECK_CLASS_CAST ((klass), HILDON_TYPE_GET_PASSWORD_DIALOG, \ HildonGetPasswordDialogClass)) #define HILDON_IS_GET_PASSWORD_DIALOG(obj) \ - (GTK_CHECK_TYPE (obj, HILDON_TYPE_GET_PASSWORD_DIALOG)) + (G_TYPE_CHECK_INSTANCE_TYPE (obj, HILDON_TYPE_GET_PASSWORD_DIALOG)) #define HILDON_IS_GET_PASSWORD_DIALOG_CLASS(klass) \ - (GTK_CHECK_CLASS_TYPE ((klass), HILDON_TYPE_GET_PASSWORD_DIALOG)) + (G_TYPE_CHECK_CLASS_TYPE ((klass), HILDON_TYPE_GET_PASSWORD_DIALOG)) typedef struct _HildonGetPasswordDialog HildonGetPasswordDialog; diff --git a/hildon/hildon-hvolumebar.h b/hildon/hildon-hvolumebar.h index cd19e67..34017c7 100644 --- a/hildon/hildon-hvolumebar.h +++ b/hildon/hildon-hvolumebar.h @@ -33,17 +33,18 @@ G_BEGIN_DECLS #define HILDON_TYPE_HVOLUMEBAR (hildon_hvolumebar_get_type()) -#define HILDON_HVOLUMEBAR(obj) (GTK_CHECK_CAST (obj,\ +#define HILDON_HVOLUMEBAR(obj) \ + (G_TYPE_CHECK_INSTANCE_CAST (obj, \ HILDON_TYPE_HVOLUMEBAR, HildonHVolumebar)) #define HILDON_HVOLUMEBAR_CLASS(klass) \ - (GTK_CHECK_CLASS_CAST ((klass),\ + (G_TYPE_CHECK_CLASS_CAST ((klass),\ HILDON_TYPE_HVOLUMEBAR, HildonHVolumebarClass)) -#define HILDON_IS_HVOLUMEBAR(obj) (GTK_CHECK_TYPE (obj,\ +#define HILDON_IS_HVOLUMEBAR(obj) (G_TYPE_CHECK_INSTANCE_TYPE (obj,\ HILDON_TYPE_HVOLUMEBAR)) -#define HILDON_IS_HVOLUMEBAR_CLASS(klass) (GTK_CHECK_CLASS_TYPE ((klass),\ +#define HILDON_IS_HVOLUMEBAR_CLASS(klass) (G_TYPE_CHECK_CLASS_TYPE ((klass),\ HILDON_TYPE_HVOLUMEBAR)) #define HILDON_HVOLUMEBAR_GET_CLASS(obj) \ diff --git a/hildon/hildon-login-dialog.h b/hildon/hildon-login-dialog.h index 93b78e6..bb5b440 100644 --- a/hildon/hildon-login-dialog.h +++ b/hildon/hildon-login-dialog.h @@ -35,18 +35,19 @@ G_BEGIN_DECLS (hildon_login_dialog_get_type ()) #define HILDON_LOGIN_DIALOG(obj) \ - (GTK_CHECK_CAST (obj, HILDON_TYPE_LOGIN_DIALOG, \ + (G_TYPE_CHECK_INSTANCE_CAST (obj, \ + HILDON_TYPE_LOGIN_DIALOG, \ HildonLoginDialog)) #define HILDON_LOGIN_DIALOG_CLASS(klass) \ - (GTK_CHECK_CLASS_CAST ((klass), HILDON_TYPE_LOGIN_DIALOG, \ + (G_TYPE_CHECK_CLASS_CAST ((klass), HILDON_TYPE_LOGIN_DIALOG, \ HildonLoginDialogClass)) #define HILDON_IS_LOGIN_DIALOG(obj) \ - (GTK_CHECK_TYPE (obj, HILDON_TYPE_LOGIN_DIALOG)) + (G_TYPE_CHECK_INSTANCE_TYPE (obj, HILDON_TYPE_LOGIN_DIALOG)) #define HILDON_IS_LOGIN_DIALOG_CLASS(klass) \ - (GTK_CHECK_CLASS_TYPE ((klass), \ + (G_TYPE_CHECK_CLASS_TYPE ((klass), \ HILDON_TYPE_LOGIN_DIALOG)) typedef struct _HildonLoginDialog HildonLoginDialog; diff --git a/hildon/hildon-note.h b/hildon/hildon-note.h index 8e67cfd..d67f6c6 100644 --- a/hildon/hildon-note.h +++ b/hildon/hildon-note.h @@ -33,17 +33,18 @@ G_BEGIN_DECLS (hildon_note_get_type()) #define HILDON_NOTE(obj) \ - (GTK_CHECK_CAST (obj, HILDON_TYPE_NOTE, HildonNote)) + (G_TYPE_CHECK_INSTANCE_CAST (obj, \ + HILDON_TYPE_NOTE, HildonNote)) #define HILDON_NOTE_CLASS(klass) \ - (GTK_CHECK_CLASS_CAST ((klass), \ + (G_TYPE_CHECK_CLASS_CAST ((klass), \ HILDON_TYPE_NOTE, HildonNoteClass)) #define HILDON_IS_NOTE(obj) \ - (GTK_CHECK_TYPE (obj, HILDON_TYPE_NOTE)) + (G_TYPE_CHECK_INSTANCE_TYPE (obj, HILDON_TYPE_NOTE)) #define HILDON_IS_NOTE_CLASS(klass) \ - (GTK_CHECK_CLASS_TYPE ((klass), HILDON_TYPE_NOTE)) + (G_TYPE_CHECK_CLASS_TYPE ((klass), HILDON_TYPE_NOTE)) typedef struct _HildonNote HildonNote; diff --git a/hildon/hildon-number-editor.h b/hildon/hildon-number-editor.h index 7f46590..9b46fb3 100644 --- a/hildon/hildon-number-editor.h +++ b/hildon/hildon-number-editor.h @@ -35,17 +35,18 @@ G_BEGIN_DECLS (hildon_number_editor_get_type()) #define HILDON_NUMBER_EDITOR(obj) \ - (GTK_CHECK_CAST (obj, HILDON_TYPE_NUMBER_EDITOR, HildonNumberEditor)) + (G_TYPE_CHECK_INSTANCE_CAST (obj, \ + HILDON_TYPE_NUMBER_EDITOR, HildonNumberEditor)) #define HILDON_NUMBER_EDITOR_CLASS(klass) \ - (GTK_CHECK_CLASS_CAST ((klass), HILDON_TYPE_NUMBER_EDITOR, \ + (G_TYPE_CHECK_CLASS_CAST ((klass), HILDON_TYPE_NUMBER_EDITOR, \ HildonNumberEditorClass)) #define HILDON_IS_NUMBER_EDITOR(obj) \ - (GTK_CHECK_TYPE (obj, HILDON_TYPE_NUMBER_EDITOR)) + (G_TYPE_CHECK_INSTANCE_TYPE (obj, HILDON_TYPE_NUMBER_EDITOR)) #define HILDON_IS_NUMBER_EDITOR_CLASS(klass) \ - (GTK_CHECK_CLASS_TYPE ((klass), HILDON_TYPE_NUMBER_EDITOR)) + (G_TYPE_CHECK_CLASS_TYPE ((klass), HILDON_TYPE_NUMBER_EDITOR)) #define HILDON_NUMBER_EDITOR_GET_CLASS(obj) \ ((HildonNumberEditorClass *) G_OBJECT_GET_CLASS(obj)) diff --git a/hildon/hildon-range-editor.h b/hildon/hildon-range-editor.h index 5f10e60..3438b4b 100644 --- a/hildon/hildon-range-editor.h +++ b/hildon/hildon-range-editor.h @@ -35,17 +35,18 @@ G_BEGIN_DECLS (hildon_range_editor_get_type()) #define HILDON_RANGE_EDITOR(obj) \ - (GTK_CHECK_CAST (obj, HILDON_TYPE_RANGE_EDITOR, HildonRangeEditor)) + (G_TYPE_CHECK_INSTANCE_CAST (obj, \ + HILDON_TYPE_RANGE_EDITOR, HildonRangeEditor)) #define HILDON_RANGE_EDITOR_CLASS(klass) \ - (GTK_CHECK_CLASS_CAST ((klass),\ + (G_TYPE_CHECK_CLASS_CAST ((klass),\ HILDON_TYPE_RANGE_EDITOR, HildonRangeEditorClass)) #define HILDON_IS_RANGE_EDITOR(obj) \ - (GTK_CHECK_TYPE (obj, HILDON_TYPE_RANGE_EDITOR)) + (G_TYPE_CHECK_INSTANCE_TYPE (obj, HILDON_TYPE_RANGE_EDITOR)) #define HILDON_IS_RANGE_EDITOR_CLASS(klass) \ - (GTK_CHECK_CLASS_TYPE ((klass), HILDON_TYPE_RANGE_EDITOR)) + (G_TYPE_CHECK_CLASS_TYPE ((klass), HILDON_TYPE_RANGE_EDITOR)) #define HILDON_RANGE_EDITOR_GET_CLASS(obj) \ ((HildonRangeEditorClass *) G_OBJECT_GET_CLASS(obj)) diff --git a/hildon/hildon-seekbar.h b/hildon/hildon-seekbar.h index 1937076..25732ad 100644 --- a/hildon/hildon-seekbar.h +++ b/hildon/hildon-seekbar.h @@ -35,18 +35,18 @@ G_BEGIN_DECLS (hildon_seekbar_get_type()) #define HILDON_SEEKBAR(obj) \ - (GTK_CHECK_CAST (obj,\ + (G_TYPE_CHECK_INSTANCE_CAST (obj,\ HILDON_TYPE_SEEKBAR, HildonSeekbar)) #define HILDON_SEEKBAR_CLASS(klass) \ - (GTK_CHECK_CLASS_CAST ((klass),\ + (G_TYPE_CHECK_CLASS_CAST ((klass),\ HILDON_TYPE_SEEKBAR, HildonSeekbarClass)) #define HILDON_IS_SEEKBAR(obj) \ - (GTK_CHECK_TYPE (obj, HILDON_TYPE_SEEKBAR)) + (G_TYPE_CHECK_INSTANCE_TYPE (obj, HILDON_TYPE_SEEKBAR)) #define HILDON_IS_SEEKBAR_CLASS(klass) \ - (GTK_CHECK_CLASS_TYPE ((klass),\ + (G_TYPE_CHECK_CLASS_TYPE ((klass),\ HILDON_TYPE_SEEKBAR)) #define HILDON_SEEKBAR_GET_CLASS(obj) \ diff --git a/hildon/hildon-set-password-dialog.h b/hildon/hildon-set-password-dialog.h index 4c360eb..1862d5c 100644 --- a/hildon/hildon-set-password-dialog.h +++ b/hildon/hildon-set-password-dialog.h @@ -35,18 +35,19 @@ G_BEGIN_DECLS (hildon_set_password_dialog_get_type()) #define HILDON_SET_PASSWORD_DIALOG(obj) \ - (GTK_CHECK_CAST (obj, HILDON_TYPE_SET_PASSWORD_DIALOG,\ + (G_TYPE_CHECK_INSTANCE_CAST (obj, \ + HILDON_TYPE_SET_PASSWORD_DIALOG,\ HildonSetPasswordDialog)) #define HILDON_SET_PASSWORD_DIALOG_CLASS(klass) \ - (GTK_CHECK_CLASS_CAST ((klass), HILDON_TYPE_SET_PASSWORD_DIALOG, \ + (G_TYPE_CHECK_CLASS_CAST ((klass), HILDON_TYPE_SET_PASSWORD_DIALOG, \ HildonSetPasswordDialogClass)) #define HILDON_IS_SET_PASSWORD_DIALOG(obj) \ - (GTK_CHECK_TYPE (obj, HILDON_TYPE_SET_PASSWORD_DIALOG)) + (G_TYPE_CHECK_INSTANCE_TYPE (obj, HILDON_TYPE_SET_PASSWORD_DIALOG)) #define HILDON_IS_SET_PASSWORD_DIALOG_CLASS(klass) \ - (GTK_CHECK_CLASS_TYPE ((klass), HILDON_TYPE_SET_PASSWORD_DIALOG)) + (G_TYPE_CHECK_CLASS_TYPE ((klass), HILDON_TYPE_SET_PASSWORD_DIALOG)) typedef struct _HildonSetPasswordDialog HildonSetPasswordDialog; diff --git a/hildon/hildon-sort-dialog.h b/hildon/hildon-sort-dialog.h index 0653e89..761c46e 100644 --- a/hildon/hildon-sort-dialog.h +++ b/hildon/hildon-sort-dialog.h @@ -40,17 +40,18 @@ typedef struct _HildonSortDialogClass HildonSor (hildon_sort_dialog_get_type()) #define HILDON_SORT_DIALOG(obj) \ - (GTK_CHECK_CAST (obj, HILDON_TYPE_SORT_DIALOG, HildonSortDialog)) + (G_TYPE_CHECK_INSTANCE_CAST (obj, \ + HILDON_TYPE_SORT_DIALOG, HildonSortDialog)) #define HILDON_SORT_DIALOG_CLASS(klass) \ - (GTK_CHECK_CLASS_CAST ((klass), HILDON_TYPE_SORT_DIALOG, \ + (G_TYPE_CHECK_CLASS_CAST ((klass), HILDON_TYPE_SORT_DIALOG, \ HildonSortDialogClass)) #define HILDON_IS_SORT_DIALOG(obj) \ - (GTK_CHECK_TYPE (obj, HILDON_TYPE_SORT_DIALOG)) + (G_TYPE_CHECK_INSTANCE_TYPE (obj, HILDON_TYPE_SORT_DIALOG)) #define HILDON_IS_SORT_DIALOG_CLASS(klass) \ - (GTK_CHECK_CLASS_TYPE ((klass), HILDON_TYPE_SORT_DIALOG)) + (G_TYPE_CHECK_CLASS_TYPE ((klass), HILDON_TYPE_SORT_DIALOG)) #define HILDON_SORT_DIALOG_GET_CLASS(obj) \ ((HildonSortDialogClass *) G_OBJECT_GET_CLASS(obj)) diff --git a/hildon/hildon-time-editor.h b/hildon/hildon-time-editor.h index f1f09b9..110c977 100644 --- a/hildon/hildon-time-editor.h +++ b/hildon/hildon-time-editor.h @@ -35,17 +35,18 @@ G_BEGIN_DECLS (hildon_time_editor_get_type()) #define HILDON_TIME_EDITOR(obj) \ - (GTK_CHECK_CAST (obj, HILDON_TYPE_TIME_EDITOR, HildonTimeEditor)) + (G_TYPE_CHECK_INSTANCE_CAST (obj, \ + HILDON_TYPE_TIME_EDITOR, HildonTimeEditor)) #define HILDON_TIME_EDITOR_CLASS(klass) \ - (GTK_CHECK_CLASS_CAST ((klass), HILDON_TYPE_TIME_EDITOR, \ + (G_TYPE_CHECK_CLASS_CAST ((klass), HILDON_TYPE_TIME_EDITOR, \ HildonTimeEditorClass)) #define HILDON_IS_TIME_EDITOR(obj) \ - (GTK_CHECK_TYPE (obj, HILDON_TYPE_TIME_EDITOR)) + (G_TYPE_CHECK_INSTANCE_TYPE (obj, HILDON_TYPE_TIME_EDITOR)) #define HILDON_IS_TIME_EDITOR_CLASS(klass) \ - (GTK_CHECK_CLASS_TYPE ((klass), HILDON_TYPE_TIME_EDITOR)) + (G_TYPE_CHECK_CLASS_TYPE ((klass), HILDON_TYPE_TIME_EDITOR)) typedef enum { diff --git a/hildon/hildon-time-picker.h b/hildon/hildon-time-picker.h index e36d777..de1f716 100644 --- a/hildon/hildon-time-picker.h +++ b/hildon/hildon-time-picker.h @@ -39,21 +39,21 @@ typedef struct _HildonTimePickerClass HildonTim (hildon_time_picker_get_type()) #define HILDON_TIME_PICKER(obj) \ - (GTK_CHECK_CAST (obj, \ + (G_TYPE_CHECK_INSTANCE_CAST (obj, \ HILDON_TYPE_TIME_PICKER, \ HildonTimePicker)) #define HILDON_TIME_PICKER_CLASS(klass) \ - (GTK_CHECK_CLASS_CAST ((klass), \ + (G_TYPE_CHECK_CLASS_CAST ((klass), \ HILDON_TYPE_TIME_PICKER,\ HildonTimePickerClass)) #define HILDON_IS_TIME_PICKER(obj) \ - (GTK_CHECK_TYPE (obj, \ + (G_TYPE_CHECK_INSTANCE_TYPE (obj, \ HILDON_TYPE_TIME_PICKER)) #define HILDON_IS_TIME_PICKER_CLASS(klass) \ - (GTK_CHECK_CLASS_TYPE ((klass),\ + (G_TYPE_CHECK_CLASS_TYPE ((klass),\ HILDON_TYPE_TIME_PICKER)) #define HILDON_TIME_PICKER_GET_CLASS(obj) \ diff --git a/hildon/hildon-volumebar-range.h b/hildon/hildon-volumebar-range.h index 9e5eb59..f61c412 100644 --- a/hildon/hildon-volumebar-range.h +++ b/hildon/hildon-volumebar-range.h @@ -38,19 +38,19 @@ G_BEGIN_DECLS (hildon_volumebar_range_get_type()) #define HILDON_VOLUMEBAR_RANGE(obj) \ - (GTK_CHECK_CAST (obj,\ + (G_TYPE_CHECK_INSTANCE_CAST (obj, \ HILDON_TYPE_VOLUMEBAR_RANGE, HildonVolumebarRange)) #define HILDON_VOLUMEBAR_RANGE_CLASS(klass) \ - (GTK_CHECK_CLASS_CAST ((klass),\ + (G_TYPE_CHECK_CLASS_CAST ((klass),\ HILDON_TYPE_VOLUMEBAR_RANGE, HildonVolumebarRangeClass)) #define HILDON_IS_VOLUMEBAR_RANGE(obj) \ - (GTK_CHECK_TYPE (obj,\ + (G_TYPE_CHECK_INSTANCE_TYPE (obj,\ HILDON_TYPE_VOLUMEBAR_RANGE)) #define HILDON_IS_VOLUMEBAR_RANGE_CLASS(klass) \ - (GTK_CHECK_CLASS_TYPE ((klass), \ + (G_TYPE_CHECK_CLASS_TYPE ((klass), \ HILDON_TYPE_VOLUMEBAR_RANGE)) typedef struct _HildonVolumebarRange HildonVolumebarRange; diff --git a/hildon/hildon-volumebar.h b/hildon/hildon-volumebar.h index 510f7ab..9cead0c 100644 --- a/hildon/hildon-volumebar.h +++ b/hildon/hildon-volumebar.h @@ -36,18 +36,19 @@ G_BEGIN_DECLS #define HILDON_TYPE_VOLUMEBAR \ (hildon_volumebar_get_type()) -#define HILDON_VOLUMEBAR(obj) (GTK_CHECK_CAST (obj,\ +#define HILDON_VOLUMEBAR(obj) \ + (G_TYPE_CHECK_INSTANCE_CAST (obj,\ HILDON_TYPE_VOLUMEBAR, HildonVolumebar)) #define HILDON_VOLUMEBAR_CLASS(klass) \ - (GTK_CHECK_CLASS_CAST ((klass),\ + (G_TYPE_CHECK_CLASS_CAST ((klass),\ HILDON_TYPE_VOLUMEBAR, HildonVolumebarClass)) -#define HILDON_IS_VOLUMEBAR(obj) (GTK_CHECK_TYPE (obj,\ +#define HILDON_IS_VOLUMEBAR(obj) (G_TYPE_CHECK_INSTANCE_TYPE (obj,\ HILDON_TYPE_VOLUMEBAR)) #define HILDON_IS_VOLUMEBAR_CLASS(klass) \ - (GTK_CHECK_CLASS_TYPE ((klass), HILDON_TYPE_VOLUMEBAR)) + (G_TYPE_CHECK_CLASS_TYPE ((klass), HILDON_TYPE_VOLUMEBAR)) #define HILDON_VOLUMEBAR_GET_CLASS(obj) \ ((HildonVolumebarClass *) G_OBJECT_GET_CLASS(obj)) diff --git a/hildon/hildon-vvolumebar.h b/hildon/hildon-vvolumebar.h index ba1c471..bf58c93 100644 --- a/hildon/hildon-vvolumebar.h +++ b/hildon/hildon-vvolumebar.h @@ -35,17 +35,18 @@ G_BEGIN_DECLS (hildon_vvolumebar_get_type()) #define HILDON_VVOLUMEBAR(obj) \ - (GTK_CHECK_CAST (obj, HILDON_TYPE_VVOLUMEBAR, HildonVVolumebar)) + (G_TYPE_CHECK_INSTANCE_CAST (obj, \ + HILDON_TYPE_VVOLUMEBAR, HildonVVolumebar)) #define HILDON_VVOLUMEBAR_CLASS(klass) \ - (GTK_CHECK_CLASS_CAST ((klass),\ + (G_TYPE_CHECK_CLASS_CAST ((klass),\ HILDON_TYPE_VVOLUMEBAR, HildonVVolumebarClass)) #define HILDON_IS_VVOLUMEBAR(obj) \ - (GTK_CHECK_TYPE (obj, HILDON_TYPE_VVOLUMEBAR)) + (G_TYPE_CHECK_INSTANCE_TYPE (obj, HILDON_TYPE_VVOLUMEBAR)) #define HILDON_IS_VVOLUMEBAR_CLASS(klass) \ - (GTK_CHECK_CLASS_TYPE ((klass), HILDON_TYPE_VVOLUMEBAR)) + (G_TYPE_CHECK_CLASS_TYPE ((klass), HILDON_TYPE_VVOLUMEBAR)) #define HILDON_VVOLUMEBAR_GET_CLASS(obj) \ ((HildonVVolumebarClass *) G_OBJECT_GET_CLASS(obj)) diff --git a/hildon/hildon-weekday-picker.h b/hildon/hildon-weekday-picker.h index afba2a9..bf7b833 100644 --- a/hildon/hildon-weekday-picker.h +++ b/hildon/hildon-weekday-picker.h @@ -39,18 +39,19 @@ typedef struct _HildonWeekdayPickerClass Hildon (hildon_weekday_picker_get_type()) #define HILDON_WEEKDAY_PICKER(obj) \ - (GTK_CHECK_CAST (obj, HILDON_TYPE_WEEKDAY_PICKER, \ + (G_TYPE_CHECK_INSTANCE_CAST (obj, \ + HILDON_TYPE_WEEKDAY_PICKER, \ HildonWeekdayPicker)) #define HILDON_WEEKDAY_PICKER_CLASS(klass) \ - (GTK_CHECK_CLASS_CAST ((klass), \ + (G_TYPE_CHECK_CLASS_CAST ((klass), \ HILDON_TYPE_WEEKDAY_PICKER, HildonWeekdayPickerClass)) #define HILDON_IS_WEEKDAY_PICKER(obj) \ - (GTK_CHECK_TYPE (obj, HILDON_TYPE_WEEKDAY_PICKER)) + (G_TYPE_CHECK_INSTANCE_TYPE (obj, HILDON_TYPE_WEEKDAY_PICKER)) #define HILDON_IS_WEEKDAY_PICKER_CLASS(klass) \ - (GTK_CHECK_CLASS_TYPE ((klass), HILDON_TYPE_WEEKDAY_PICKER)) + (G_TYPE_CHECK_CLASS_TYPE ((klass), HILDON_TYPE_WEEKDAY_PICKER)) #define HILDON_WEEKDAY_PICKER_GET_CLASS(obj) \ ((HildonWeekdayPickerClass *) G_OBJECT_GET_CLASS(obj)) diff --git a/hildon/hildon-window.h b/hildon/hildon-window.h index e5d8d49..be0f03b 100644 --- a/hildon/hildon-window.h +++ b/hildon/hildon-window.h @@ -37,17 +37,18 @@ G_BEGIN_DECLS (hildon_window_get_type()) #define HILDON_WINDOW(obj) \ - (GTK_CHECK_CAST (obj, HILDON_TYPE_WINDOW, HildonWindow)) + (G_TYPE_CHECK_INSTANCE_CAST (obj, \ + HILDON_TYPE_WINDOW, HildonWindow)) #define HILDON_WINDOW_CLASS(klass) \ - (GTK_CHECK_CLASS_CAST ((klass),\ + (G_TYPE_CHECK_CLASS_CAST ((klass),\ HILDON_TYPE_WINDOW, HildonWindowClass)) #define HILDON_IS_WINDOW(obj) \ - (GTK_CHECK_TYPE (obj, HILDON_TYPE_WINDOW)) + (G_TYPE_CHECK_INSTANCE_TYPE (obj, HILDON_TYPE_WINDOW)) #define HILDON_IS_WINDOW_CLASS(klass) \ - (GTK_CHECK_CLASS_TYPE ((klass), HILDON_TYPE_WINDOW)) + (G_TYPE_CHECK_CLASS_TYPE ((klass), HILDON_TYPE_WINDOW)) #define HILDON_WINDOW_GET_CLASS(obj) \ ((HildonWindowClass *) G_OBJECT_GET_CLASS(obj)) diff --git a/hildon/hildon-wizard-dialog.h b/hildon/hildon-wizard-dialog.h index a39abe4..d298c4b 100644 --- a/hildon/hildon-wizard-dialog.h +++ b/hildon/hildon-wizard-dialog.h @@ -33,19 +33,20 @@ G_BEGIN_DECLS #define HILDON_TYPE_WIZARD_DIALOG \ (hildon_wizard_dialog_get_type()) -#define HILDON_WIZARD_DIALOG(obj) (GTK_CHECK_CAST ((obj), \ +#define HILDON_WIZARD_DIALOG(obj) \ + (G_TYPE_CHECK_INSTANCE_CAST ((obj), \ HILDON_TYPE_WIZARD_DIALOG, HildonWizardDialog)) #define HILDON_WIZARD_DIALOG_CLASS(klass) \ - (GTK_CHECK_CLASS_CAST ((klass), \ + (G_TYPE_CHECK_CLASS_CAST ((klass), \ HILDON_TYPE_WIZARD_DIALOG, HildonWizardDialogClass)) #define HILDON_IS_WIZARD_DIALOG(obj) \ - (GTK_CHECK_TYPE ((obj), \ + (G_TYPE_CHECK_INSTANCE_TYPE ((obj), \ HILDON_TYPE_WIZARD_DIALOG)) #define HILDON_IS_WIZARD_DIALOG_CLASS(klass) \ - (GTK_CHECK_CLASS_TYPE ((klass), \ + (G_TYPE_CHECK_CLASS_TYPE ((klass), \ HILDON_TYPE_WIZARD_DIALOG)) typedef struct _HildonWizardDialog HildonWizardDialog; -- 1.7.9.5