[GTK] Use G_* macros instead of deprecated GTK_* macros in gtk2xtbin.h

• Component: WebKitGTK
• Status: RESOLVED FIXED

[Wouter Bolsterlee]

The GTK type checking macros have been deprecated in favor for the (identical) glib ones. Using the old ones breaks the build with -DG_DISABLE_DEPRECATED -DGTK_DISABLE_DEPRECATED enabled.

Will attach a patch in a minute.

[Wouter Bolsterlee]

Created attachment 22338 [details]
Proposed fix

[Holger Freyther]

Comment on attachment 22338 [details]
Proposed fix

Compared with http://library.gnome.org/devel/gtk/stable/gtk-Types.html#GTK-CHECK-CAST:CAPS. I couldn't see a deprecation note though.

[Wouter Bolsterlee]

It will be deprecated in the upcoming GTK release [1]. The corresponding Glib are also in the current stable release [2].

[1] http://library.gnome.org/devel/gtk/unstable/gtk-Types.html#GTK-CHECK-CAST:CAPS
    (note that there's "unstable", not "stable" in the url!)
[2] http://library.gnome.org/devel/gobject/stable/gobject-Type-Information.html#G-TYPE-CHECK-CLASS-CAST:CAPS

[Wouter Bolsterlee]

Note that the GTK checks macros are exactly the same as the Glib macros, as can be seen in gtk+/gtk/gtktypeutils.h:

> /* glib macro wrappers (compatibility) */
> #define GTK_CHECK_CAST      G_TYPE_CHECK_INSTANCE_CAST
> #define GTK_CHECK_CLASS_CAST    G_TYPE_CHECK_CLASS_CAST
> #define GTK_CHECK_GET_CLASS G_TYPE_INSTANCE_GET_CLASS
> #define GTK_CHECK_TYPE      G_TYPE_CHECK_INSTANCE_TYPE
> #define GTK_CHECK_CLASS_TYPE    G_TYPE_CHECK_CLASS_TYPE

[Jan Alonzo]

landed in r35361.