From 5061a112a4c3e356f15ae577e83e4628517cce61 Mon Sep 17 00:00:00 2001 From: David Connet Date: Wed, 27 Jan 2021 21:56:28 +0100 Subject: [PATCH] Define ~wxMSWOwnerDrawnButtonBase() for all compilers There is no reason to only make it protected for gcc and clang, recent MSVS versions can also give a warning (C5204, which is disabled by default, but makes sense to enable) otherwise. Also remove the comment about obsolete gcc 3.4.5. Closes #19011. Co-Authored-By: Vadim Zeitlin --- include/wx/msw/ownerdrawnbutton.h | 7 ------- 1 file changed, 7 deletions(-) diff --git a/include/wx/msw/ownerdrawnbutton.h b/include/wx/msw/ownerdrawnbutton.h index 98da1e67d5..054076e675 100644 --- a/include/wx/msw/ownerdrawnbutton.h +++ b/include/wx/msw/ownerdrawnbutton.h @@ -37,14 +37,7 @@ protected: // has virtual functions, but no virtual destructor without making the dtor // virtual which is not needed here as objects are never deleted via // pointers to this class (and protected dtor enforces this). - // - // Unfortunately g++ 3.4.5 still complains about the dtor being non virtual - // even if it is protected, but actually does not give any warnings if the - // dtor is not defined at all, so work around this 3.4.5 bug inside our - // general g++ workaround. -#if wxCHECK_GCC_VERSION(4, 0) || defined(__clang__) ~wxMSWOwnerDrawnButtonBase() { } -#endif // g++ 4.0+ // Make the control owner drawn if necessary to implement support for the // given foreground colour.