X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/d427503c3696486ef84cd0e5081884ccd8d6b434..108a0f648f39ccbde662959c0da57c9312a80ff4:/include/wx/msw/private.h diff --git a/include/wx/msw/private.h b/include/wx/msw/private.h index b9decc997c..02b9577313 100644 --- a/include/wx/msw/private.h +++ b/include/wx/msw/private.h @@ -77,8 +77,12 @@ WXDLLEXPORT_DATA(extern HFONT) wxSTATUS_LINE_FONT; typedef int (pascal * WndProcCast) (); # define CASTWNDPROC (WndProcCast) # else - typedef int (PASCAL * WndProcCast) (); -# define CASTWNDPROC (WndProcCast) +# if defined(__VISUALC__) && defined(STRICT) +# define CASTWNDPROC (WNDPROC) +# else + typedef int (PASCAL * WndProcCast) (); +# define CASTWNDPROC (WndProcCast) +# endif # endif # else # define CASTWNDPROC @@ -105,8 +109,10 @@ WXDLLEXPORT_DATA(extern HFONT) wxSTATUS_LINE_FONT; #endif #if !defined(__WIN32__) // 3.x uses FARPROC for dialogs +#ifndef STRICT #define DLGPROC FARPROC #endif +#endif #if wxUSE_PENWIN WXDLLEXPORT void wxRegisterPenWin();