From 6415bd553fc16863a7dcf5a6242a4aec270f0dcc Mon Sep 17 00:00:00 2001 From: Vadim Zeitlin Date: Sun, 9 Sep 2018 02:35:26 +0200 Subject: [PATCH] Partially revert "CMake: Fix building and running samples" This reverts part of 573e887a4c00bd3e050d7ca27a3546467969feba, see https://github.com/wxWidgets/wxWidgets/pull/666 because it broke the use of the generic dialogs in the sample under MSW (they were not used any more, even if they were supposed to) and the explanation in the original commit message doesn't seem correct: the WXUSINGDLL check is precisely supposed to check if we're using a static build of wxWidgets (presumably because of DLL export complications when not using it) and seems to work as expected. This allows to test generic dialogs in the sample again under MSW. --- samples/dialogs/dialogs.h | 16 ++++++++++++---- 1 file changed, 12 insertions(+), 4 deletions(-) diff --git a/samples/dialogs/dialogs.h b/samples/dialogs/dialogs.h index 45063772cb..9d37f4b69b 100644 --- a/samples/dialogs/dialogs.h +++ b/samples/dialogs/dialogs.h @@ -28,6 +28,12 @@ of MSW, MAC and OS2 #define USE_WXUNIVERSAL 0 #endif +#ifdef WXUSINGDLL + #define USE_DLL 1 +#else + #define USE_DLL 0 +#endif + #if defined(__WXMSW__) #define USE_WXMSW 1 #else @@ -52,14 +58,16 @@ of MSW, MAC and OS2 #define USE_WXGTK 0 #endif +#define USE_GENERIC_DIALOGS (!USE_WXUNIVERSAL && !USE_DLL) + #define USE_COLOURDLG_GENERIC \ - ((USE_WXMSW || USE_WXMAC) && USE_WXUNIVERSAL && wxUSE_COLOURDLG) + ((USE_WXMSW || USE_WXMAC) && USE_GENERIC_DIALOGS && wxUSE_COLOURDLG) #define USE_DIRDLG_GENERIC \ - ((USE_WXMSW || USE_WXMAC) && USE_WXUNIVERSAL && wxUSE_DIRDLG) + ((USE_WXMSW || USE_WXMAC) && USE_GENERIC_DIALOGS && wxUSE_DIRDLG) #define USE_FILEDLG_GENERIC \ - ((USE_WXMSW || USE_WXMAC) && USE_WXUNIVERSAL && wxUSE_FILEDLG) + ((USE_WXMSW || USE_WXMAC) && USE_GENERIC_DIALOGS && wxUSE_FILEDLG) #define USE_FONTDLG_GENERIC \ - ((USE_WXMSW || USE_WXMACFONTDLG) && USE_WXUNIVERSAL && wxUSE_FONTDLG) + ((USE_WXMSW || USE_WXMACFONTDLG) && USE_GENERIC_DIALOGS && wxUSE_FONTDLG) // Turn USE_MODAL_PRESENTATION to 0 if there is any reason for not presenting difference // between modal and modeless dialogs (ie. not implemented it in your port yet)