diff --git a/docs/doxygen/mainpages/const_cpp.h b/docs/doxygen/mainpages/const_cpp.h index 6114326616..98f0105a79 100644 --- a/docs/doxygen/mainpages/const_cpp.h +++ b/docs/doxygen/mainpages/const_cpp.h @@ -26,10 +26,11 @@ using @ifdef_ and not @if_. @itemdef{__WXBASE__, Only wxBase, no GUI features (same as @c wxUSE_GUI == 0)} @itemdef{__WXDFB__, wxUniversal using DirectFB} @itemdef{__WXGTK__, GTK+} -@itemdef{__WXGTK12__, GTK+ 1.2 or higher} -@itemdef{__WXGTK20__, GTK+ 2.0 or higher} -@itemdef{__WXGTK24__, GTK+ 2.4 or higher} +@itemdef{__WXGTK127__, GTK+ 1.2.7 or higher} +@itemdef{__WXGTK20__, GTK+ 2.0 (2.6) or higher} @itemdef{__WXGTK210__, GTK+ 2.10 or higher} +@itemdef{__WXGTK218__, GTK+ 2.18 or higher} +@itemdef{__WXGTK220__, GTK+ 2.20 or higher} @itemdef{__WXMAC__, old define, same as __WXOSX__} @itemdef{__WXMOTIF__, Motif} @itemdef{__WXMOTIF20__, Motif 2.0 or higher} diff --git a/samples/widgets/clrpicker.cpp b/samples/widgets/clrpicker.cpp index eff222e606..1c428a0db4 100644 --- a/samples/widgets/clrpicker.cpp +++ b/samples/widgets/clrpicker.cpp @@ -119,7 +119,7 @@ wxEND_EVENT_TABLE() // implementation // ============================================================================ -#if defined(__WXGTK24__) +#if defined(__WXGTK20__) #define FAMILY_CTRLS NATIVE_CTRLS #else #define FAMILY_CTRLS GENERIC_CTRLS diff --git a/samples/widgets/dirpicker.cpp b/samples/widgets/dirpicker.cpp index ab4a9b5cd1..003f3b51ad 100644 --- a/samples/widgets/dirpicker.cpp +++ b/samples/widgets/dirpicker.cpp @@ -127,7 +127,7 @@ wxEND_EVENT_TABLE() // implementation // ============================================================================ -#if defined(__WXGTK24__) +#if defined(__WXGTK20__) #define FAMILY_CTRLS NATIVE_CTRLS #else #define FAMILY_CTRLS GENERIC_CTRLS diff --git a/samples/widgets/filepicker.cpp b/samples/widgets/filepicker.cpp index bfb0b4fca9..14236781ad 100644 --- a/samples/widgets/filepicker.cpp +++ b/samples/widgets/filepicker.cpp @@ -144,7 +144,7 @@ wxEND_EVENT_TABLE() // implementation // ============================================================================ -#if defined(__WXGTK24__) +#if defined(__WXGTK20__) #define FAMILY_CTRLS NATIVE_CTRLS #else #define FAMILY_CTRLS GENERIC_CTRLS diff --git a/samples/widgets/fontpicker.cpp b/samples/widgets/fontpicker.cpp index 6afb19ba04..d753592796 100644 --- a/samples/widgets/fontpicker.cpp +++ b/samples/widgets/fontpicker.cpp @@ -119,7 +119,7 @@ wxEND_EVENT_TABLE() // implementation // ============================================================================ -#if defined(__WXGTK24__) +#if defined(__WXGTK20__) #define FAMILY_CTRLS NATIVE_CTRLS #else #define FAMILY_CTRLS GENERIC_CTRLS