From cce9fc7f1538076055fa0452686c9af7fa7165ba Mon Sep 17 00:00:00 2001 From: Tim S Date: Thu, 31 May 2018 13:42:00 -0400 Subject: [PATCH 1/4] Update wxGTK defines to match code --- docs/doxygen/mainpages/const_cpp.h | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/docs/doxygen/mainpages/const_cpp.h b/docs/doxygen/mainpages/const_cpp.h index 6114326616..d02a4732e2 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{__WXGTK127__, GTK+ 1.2.7 or higher} @itemdef{__WXGTK20__, GTK+ 2.0 or higher} -@itemdef{__WXGTK24__, GTK+ 2.4 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} From e3a9643d2a84833ffeb178e399417ffdee3ce388 Mon Sep 17 00:00:00 2001 From: Tim S Date: Thu, 31 May 2018 13:48:37 -0400 Subject: [PATCH 2/4] Replace use of __WXGTK24__ with __WXGTK__ --- samples/widgets/clrpicker.cpp | 2 +- samples/widgets/dirpicker.cpp | 2 +- samples/widgets/filepicker.cpp | 2 +- samples/widgets/fontpicker.cpp | 2 +- 4 files changed, 4 insertions(+), 4 deletions(-) diff --git a/samples/widgets/clrpicker.cpp b/samples/widgets/clrpicker.cpp index eff222e606..adcb4b268f 100644 --- a/samples/widgets/clrpicker.cpp +++ b/samples/widgets/clrpicker.cpp @@ -119,7 +119,7 @@ wxEND_EVENT_TABLE() // implementation // ============================================================================ -#if defined(__WXGTK24__) +#if defined(__WXGTK__) #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..238b97caa1 100644 --- a/samples/widgets/dirpicker.cpp +++ b/samples/widgets/dirpicker.cpp @@ -127,7 +127,7 @@ wxEND_EVENT_TABLE() // implementation // ============================================================================ -#if defined(__WXGTK24__) +#if defined(__WXGTK__) #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..db99b77e5b 100644 --- a/samples/widgets/filepicker.cpp +++ b/samples/widgets/filepicker.cpp @@ -144,7 +144,7 @@ wxEND_EVENT_TABLE() // implementation // ============================================================================ -#if defined(__WXGTK24__) +#if defined(__WXGTK__) #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..106fa02038 100644 --- a/samples/widgets/fontpicker.cpp +++ b/samples/widgets/fontpicker.cpp @@ -119,7 +119,7 @@ wxEND_EVENT_TABLE() // implementation // ============================================================================ -#if defined(__WXGTK24__) +#if defined(__WXGTK__) #define FAMILY_CTRLS NATIVE_CTRLS #else #define FAMILY_CTRLS GENERIC_CTRLS From 60b7bc037fcb6222c0a134f440045536374692a5 Mon Sep 17 00:00:00 2001 From: Tim S Date: Fri, 1 Jun 2018 08:49:48 -0400 Subject: [PATCH 3/4] Replace use of __WXGTK24__ with __WXGTK20__ Corrected the change to WXGTK by using WXGTK20 instead --- samples/widgets/clrpicker.cpp | 2 +- samples/widgets/dirpicker.cpp | 2 +- samples/widgets/filepicker.cpp | 2 +- samples/widgets/fontpicker.cpp | 2 +- 4 files changed, 4 insertions(+), 4 deletions(-) diff --git a/samples/widgets/clrpicker.cpp b/samples/widgets/clrpicker.cpp index adcb4b268f..1c428a0db4 100644 --- a/samples/widgets/clrpicker.cpp +++ b/samples/widgets/clrpicker.cpp @@ -119,7 +119,7 @@ wxEND_EVENT_TABLE() // implementation // ============================================================================ -#if defined(__WXGTK__) +#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 238b97caa1..003f3b51ad 100644 --- a/samples/widgets/dirpicker.cpp +++ b/samples/widgets/dirpicker.cpp @@ -127,7 +127,7 @@ wxEND_EVENT_TABLE() // implementation // ============================================================================ -#if defined(__WXGTK__) +#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 db99b77e5b..14236781ad 100644 --- a/samples/widgets/filepicker.cpp +++ b/samples/widgets/filepicker.cpp @@ -144,7 +144,7 @@ wxEND_EVENT_TABLE() // implementation // ============================================================================ -#if defined(__WXGTK__) +#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 106fa02038..d753592796 100644 --- a/samples/widgets/fontpicker.cpp +++ b/samples/widgets/fontpicker.cpp @@ -119,7 +119,7 @@ wxEND_EVENT_TABLE() // implementation // ============================================================================ -#if defined(__WXGTK__) +#if defined(__WXGTK20__) #define FAMILY_CTRLS NATIVE_CTRLS #else #define FAMILY_CTRLS GENERIC_CTRLS From f295dfdd0c618b919357f0b6a3c9454836f4cc1d Mon Sep 17 00:00:00 2001 From: Tim S Date: Fri, 1 Jun 2018 09:03:39 -0400 Subject: [PATCH 4/4] Add (2.6) to "GTK+ 2.0 or higher" --- docs/doxygen/mainpages/const_cpp.h | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/docs/doxygen/mainpages/const_cpp.h b/docs/doxygen/mainpages/const_cpp.h index d02a4732e2..98f0105a79 100644 --- a/docs/doxygen/mainpages/const_cpp.h +++ b/docs/doxygen/mainpages/const_cpp.h @@ -27,7 +27,7 @@ using @ifdef_ and not @if_. @itemdef{__WXDFB__, wxUniversal using DirectFB} @itemdef{__WXGTK__, GTK+} @itemdef{__WXGTK127__, GTK+ 1.2.7 or higher} -@itemdef{__WXGTK20__, GTK+ 2.0 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}