X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/355b4d3de54b76db87439fa2142c7334a6e48f85..015dca24cabea5750e808e7c5f9505165b023c90:/include/wx/os2/private.h diff --git a/include/wx/os2/private.h b/include/wx/os2/private.h index 02a11b3ac5..d5481d7add 100644 --- a/include/wx/os2/private.h +++ b/include/wx/os2/private.h @@ -20,8 +20,21 @@ #define INCL_WINSYS #define INCL_SHLERRORS #define INCL_DOS +#define INCL_WINATOM +#define INCL_WIN #include +#if defined(__WATCOMC__) && ( __WATCOMC__ < 1240 ) + // missing in OpenWatcom 1.3 but added in 1.4 + inline HATOMTBL APIENTRY WinQuerySystemAtomTable(VOID){return NULL;} + inline ULONG APIENTRY WinQueryAtomName(HATOMTBL,ATOM,PCSZ,ULONG){return 0;} + inline LONG APIENTRY GpiPointArc(HPS,PPOINTL){return GPI_ERROR;} + inline BOOL APIENTRY WinDrawPointer(HPS,LONG,LONG,HPOINTER,ULONG){return FALSE;} + inline HPOINTER APIENTRY WinCreatePointerIndirect(HWND,PPOINTERINFO){return NULLHANDLE;} + inline BOOL APIENTRY WinGetMaxPosition(HWND,PSWP){return FALSE;} + inline BOOL APIENTRY WinGetMinPosition(HWND,PSWP,PPOINTL){return FALSE;} +#endif + #if defined(__WATCOMC__) && defined(__WXMOTIF__) #include #define I_NEED_OS2_H @@ -286,7 +299,7 @@ extern HBITMAP wxInvertMask(HBITMAP hbmpMask, int w = 0, int h = 0); // global data // --------------------------------------------------------------------------- -#ifdef __WXOS2__ +#ifdef __WXPM__ // The MakeProcInstance version of the function wxSubclassedGenericControlProc WXDLLEXPORT_DATA(extern int) wxGenericControlSubClassProc; WXDLLEXPORT_DATA(extern wxChar*) wxBuffer; @@ -297,7 +310,7 @@ WXDLLEXPORT_DATA(extern HINSTANCE) wxhInstance; // global functions // --------------------------------------------------------------------------- -#ifdef __WXOS2__ +#ifdef __WXPM__ extern "C" { WXDLLEXPORT HINSTANCE wxGetInstance();