From 60b7bc037fcb6222c0a134f440045536374692a5 Mon Sep 17 00:00:00 2001 From: Tim S Date: Fri, 1 Jun 2018 08:49:48 -0400 Subject: [PATCH] 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