Various fixes and (hopefully temporary) workarounds for using the newest version of sip

This commit is contained in:
Robin Dunn
2017-01-21 18:26:12 -08:00
parent 7696944dbd
commit 2c2e00dbe0
11 changed files with 106 additions and 87 deletions

View File

@@ -40,6 +40,25 @@
#include <wx/wx.h>
//--------------------------------------------------------------------------
// TODO: find a way to not need to do this.
// It is needed because SIP is putting :: on the front of the type, and when
// it's a macro the compiler complains about "expected unqualified-id". The
// risk is that it may be possible for wxLongLong_t to be a type that is not
// actually fully compatible with "long long", causing problems when passing
// into, or returning from wx APIs.
// If they are macros then undef them and make some typedefs instead
#ifdef wxLongLong_t
#undef wxLongLong_t
typedef long long wxLongLong_t;
#endif
#ifdef wxULongLong_t
#undef wxULongLong_t
typedef unsigned long long wxULongLong_t;
#endif
//--------------------------------------------------------------------------
// The API items that can be inline functions or macros.
// These are made available simply by #including this header file.