From 2d853594de9dbe2ee8be6d15f96c25efd40ebd29 Mon Sep 17 00:00:00 2001 From: Guillermo Rodriguez Garcia Date: Mon, 10 Apr 2000 21:54:24 +0000 Subject: [PATCH] The CASTWNDPROC logic was not necessary since this file always includes . Replaced with a typedef to WNDPROC or FARPROC (depending on whether STRICT mode is being used). Change proposed by Christoph Schulz git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/branches/WX_2_2_BRANCH@7105 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775 --- include/wx/msw/private.h | 45 ++++++++-------------------------------- 1 file changed, 9 insertions(+), 36 deletions(-) diff --git a/include/wx/msw/private.h b/include/wx/msw/private.h index 127e2b52fd..f8d268066d 100644 --- a/include/wx/msw/private.h +++ b/include/wx/msw/private.h @@ -67,44 +67,17 @@ WXDLLEXPORT_DATA(extern HFONT) wxSTATUS_LINE_FONT; // this defines a CASTWNDPROC macro which casts a pointer to the type of a // window proc + #ifdef __GNUWIN32_OLD__ -# define CASTWNDPROC (long unsigned) + #define CASTWNDPROC (long unsigned) #else -# ifdef __BORLANDC__ - -# ifdef __WIN32__ -#if __BORLANDC__ > 0x530 - typedef long (__stdcall * WndProcCast)( HWND__*, unsigned int, unsigned int, long) ; -#else - typedef int (pascal * WndProcCast) (); -#endif -# define CASTWNDPROC (WndProcCast) -# 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 -# if defined(__VISUALC__) && defined(STRICT) -# define CASTWNDPROC (WNDPROC) -# else - typedef int (PASCAL * WndProcCast) (); -# define CASTWNDPROC (WndProcCast) -# endif -# endif -# else -# define CASTWNDPROC -# endif -# endif -#endif + #if defined(STRICT) || defined(__GNUC__) + typedef WNDPROC WndProcCast; + #else + typedef FARPROC WndProcCast; + #endif + #define CASTWNDPROC (WndProcCast) +#endif // __GNUWIN32_OLD__ // --------------------------------------------------------------------------- // some stuff for old Windows versions (FIXME: what does it do here??)