X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/edef87c8274bd4cadcccc4ff107aeb1815e48460..c01d5de838da68f602ede699050962072e412ab2:/src/msw/ownerdrw.cpp?ds=sidebyside diff --git a/src/msw/ownerdrw.cpp b/src/msw/ownerdrw.cpp index 13926d36db..c7b56a1dbc 100644 --- a/src/msw/ownerdrw.cpp +++ b/src/msw/ownerdrw.cpp @@ -100,16 +100,16 @@ IMPLEMENT_DYNAMIC_CLASS(wxMSWSystemMenuFontModule, wxModule) // a UDT. Will produce errors if applied using infix notation. // // shut it down -#ifdef __VISUALC__ - #if __VISUALC__ <= 1300 +#if defined __VISUALC__ && __VISUALC__ <= 1300 + #if __VISUALC__ >= 1200 #pragma warning(push) - #pragma warning(disable: 4284) #define POP_WARNINGS #endif + #pragma warning(disable: 4284) #endif #include "wx/hashset.h" -WX_DECLARE_HASH_SET(wxOwnerDrawn*, wxPointerHash, wxPointerEqual, OwnerDrawnSet) +WX_DECLARE_HASH_SET(wxOwnerDrawn*, wxPointerHash, wxPointerEqual, OwnerDrawnSet); #ifdef POP_WARNINGS #pragma warning(pop)