Amebis/wxWidgets
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

The CASTWNDPROC logic was not necessary since this file always includes

Browse Source 
<windows.h>. 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
This commit is contained in:
Guillermo Rodriguez Garcia
2000-04-10 21:54:24 +00:00
parent 25935ea919
commit 2d853594de
1 changed files with 9 additions and 36 deletions
Download Patch File Download Diff File Expand all files Collapse all files

45
include/wx/msw/private.h
View File

@@ -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 // this defines a CASTWNDPROC macro which casts a pointer to the type of a
// window proc // window proc
#ifdef __GNUWIN32_OLD__ #ifdef __GNUWIN32_OLD__
# define CASTWNDPROC (long unsigned) #define CASTWNDPROC (long unsigned)
#else #else
# ifdef __BORLANDC__ #if defined(STRICT) || defined(__GNUC__)
typedef WNDPROC WndProcCast;
# ifdef __WIN32__ #else
#if __BORLANDC__ > 0x530 typedef FARPROC WndProcCast;
typedef long (__stdcall * WndProcCast)( HWND__*, unsigned int, unsigned int, long) ; #endif
#else #define CASTWNDPROC (WndProcCast)
typedef int (pascal * WndProcCast) (); #endif // __GNUWIN32_OLD__
#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
// --------------------------------------------------------------------------- // ---------------------------------------------------------------------------
// some stuff for old Windows versions (FIXME: what does it do here??) // some stuff for old Windows versions (FIXME: what does it do here??)