X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/ae090fdb7f4be47466b5728ad37065923b48c8c3..159b66c02a8f1c724d1af3c768ad5d90f4c8a0e2:/include/wx/msw/private.h?ds=inline diff --git a/include/wx/msw/private.h b/include/wx/msw/private.h index 1c4136e33a..3193fa73c3 100644 --- a/include/wx/msw/private.h +++ b/include/wx/msw/private.h @@ -14,8 +14,17 @@ #ifndef _WX_PRIVATE_H_ #define _WX_PRIVATE_H_ +#ifndef STRICT + #define STRICT 1 +#endif + #include +#ifdef __WXMICROWIN__ +/* Extra prototypes and symbols not defined by MicroWindows */ +#include "wx/msw/microwin.h" +#endif + // undefine conflicting symbols which were defined in windows.h #include "wx/msw/winundef.h" @@ -184,7 +193,7 @@ extern LONG APIENTRY _EXPORT // --------------------------------------------------------------------------- // a wrapper macro for ZeroMemory() -#ifdef __WIN32__ +#if defined(__WIN32__) && !defined(__WXMICROWIN__) #define wxZeroMemory(obj) ::ZeroMemory(&obj, sizeof(obj)) #else #define wxZeroMemory(obj) memset((void*) & obj, 0, sizeof(obj)) @@ -293,6 +302,9 @@ private: #define GetHfont() ((HFONT)GetHFONT()) #define GetHfontOf(font) ((HFONT)(font).GetHFONT()) +#define GetHrgn() ((HRGN)GetHRGN()) +#define GetHrgnOf(rgn) ((HRGN)(rgn).GetHRGN()) + #endif // wxUSE_GUI // ---------------------------------------------------------------------------