X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/184b5d99a5382cd7a19888c85aff11f8a21af2f6..9a29912f608e082001ee53b9873323c4bcd71f21:/include/wx/msw/private.h diff --git a/include/wx/msw/private.h b/include/wx/msw/private.h index 8963d452e3..54d0d96e88 100644 --- a/include/wx/msw/private.h +++ b/include/wx/msw/private.h @@ -41,11 +41,26 @@ WXDLLEXPORT wxFont wxCreateFontFromLogFont(LOGFONT *logFont); // , bool createNe # define CASTWNDPROC (long unsigned) #else # ifdef __BORLANDC__ + +# ifdef __WIN32__ # define CASTWNDPROC +# else + typedef int (pascal * WndProcCast) (); +# define CASTWNDPROC (WndProcCast) +# endif + # else # if defined (__WIN32__) && defined(STRICT) typedef long (_stdcall * WndProcCast) (HWND, unsigned int, unsigned int, long); # define CASTWNDPROC (WndProcCast) +# elif defined(__WIN16__) +# ifdef __BORLANDC__ + typedef int (pascal * WndProcCast) (); +# define CASTWNDPROC (WndProcCast) +# else + typedef int (PASCAL * WndProcCast) (); +# define CASTWNDPROC (WndProcCast) +# endif # else # define CASTWNDPROC # endif @@ -162,5 +177,14 @@ inline bool wxStyleHasBorder(long style) #define WS_EX_CLIENTEDGE 0 #endif +#if defined(__WIN95__) && defined(__WXDEBUG__) && wxUSE_DBWIN32 +#ifdef OutputDebugString +#undef OutputDebugString +#endif + +#define OutputDebugString OutputDebugStringW95 +extern void OutputDebugStringW95(const char*, ...); +#endif + #endif // _WX_PRIVATE_H_