From 21b2eef7e509b540a8f9f6a6366d99b1681bbcb8 Mon Sep 17 00:00:00 2001 From: Vadim Zeitlin Date: Sat, 29 Jun 2019 19:33:45 +0200 Subject: [PATCH] Make platform test slightly more readable Also add a comment explaining what are we doing here. And fix the #endif comment to match the updated #if condition. No real changes. --- include/wx/generic/treectlg.h | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/include/wx/generic/treectlg.h b/include/wx/generic/treectlg.h index 36843e3924..c171916537 100644 --- a/include/wx/generic/treectlg.h +++ b/include/wx/generic/treectlg.h @@ -360,7 +360,9 @@ private: wxDECLARE_NO_COPY_CLASS(wxGenericTreeCtrl); }; -#if !defined(__WXMSW__) && ! defined(__WXQT__) || defined(__WXUNIVERSAL__) +// Also define wxTreeCtrl to be wxGenericTreeCtrl on all platforms without a +// native version, i.e. all but MSW and Qt. +#if !(defined(__WXMSW__) || defined(__WXQT__)) || defined(__WXUNIVERSAL__) /* * wxTreeCtrl has to be a real class or we have problems with * the run-time information. @@ -383,7 +385,7 @@ public: { } }; -#endif // !__WXMSW__ || __WXUNIVERSAL__ +#endif // !(__WXMSW__ || __WXQT__) || __WXUNIVERSAL__ #endif // wxUSE_TREECTRL