VC6 (harmless) warning fix
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@34580 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
This commit is contained in:
parent
b0c5cd0ff3
commit
9ba4b498e3
@ -103,9 +103,28 @@ IMPLEMENT_DYNAMIC_CLASS(wxMSWSystemMenuFontModule, wxModule)
|
||||
#pragma warning "TODO: remove gs_menuItems hack"
|
||||
#endif
|
||||
|
||||
// VC++ 6 gives a warning here:
|
||||
//
|
||||
// return type for 'OwnerDrawnSet_wxImplementation_HashTable::iterator::
|
||||
// operator ->' is 'class wxOwnerDrawn ** ' (ie; not a UDT or reference to
|
||||
// a UDT. Will produce errors if applied using infix notation.
|
||||
//
|
||||
// shut it down
|
||||
#ifdef __VISUALC__
|
||||
#if __VISUALC__ <= 1300
|
||||
#pragma warning(push)
|
||||
#pragma warning(disable: 4284)
|
||||
#define POP_WARNINGS
|
||||
#endif
|
||||
#endif
|
||||
|
||||
#include "wx/hashset.h"
|
||||
WX_DECLARE_HASH_SET(wxOwnerDrawn*, wxPointerHash, wxPointerEqual, OwnerDrawnSet);
|
||||
|
||||
#ifdef POP_WARNINGS
|
||||
#pragma warning(pop)
|
||||
#endif
|
||||
|
||||
static OwnerDrawnSet gs_menuItems;
|
||||
|
||||
// ============================================================================
|
||||
|
Loading…
Reference in New Issue
Block a user