X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/2bda0e173844e8e0f8acf4e8ad8b5c26e5c6fe5d..b039c367cd7c1085d4175d3f87710a6f00e28fb4:/include/wx/msw/private.h diff --git a/include/wx/msw/private.h b/include/wx/msw/private.h index 5a3635e748..c764c5641f 100644 --- a/include/wx/msw/private.h +++ b/include/wx/msw/private.h @@ -5,12 +5,12 @@ // Modified by: // Created: 01/02/97 // RCS-ID: $Id$ -// Copyright: (c) Julian Smart and Markus Holzem -// Licence: wxWindows license +// Copyright: (c) Julian Smart +// Licence: wxWindows licence ///////////////////////////////////////////////////////////////////////////// -#ifndef __PRIVATEH__ -#define __PRIVATEH__ +#ifndef _WX_PRIVATE_H_ +#define _WX_PRIVATE_H_ #include "wx/defs.h" @@ -38,9 +38,18 @@ void WXDLLEXPORT wxFillLogFont(LOGFONT *logFont, wxFont *font); wxFont WXDLLEXPORT wxCreateFontFromLogFont(LOGFONT *logFont); // , bool createNew = TRUE); #ifdef __GNUWIN32__ -#define CASTWNDPROC (long unsigned) +# define CASTWNDPROC (long unsigned) #else -#define CASTWNDPROC +# ifdef __BORLANDC__ +# define CASTWNDPROC +# else +# if defined (__WIN32__) && defined(STRICT) + typedef long (_stdcall * WndProcCast) (HWND, unsigned int, unsigned int, long); +# define CASTWNDPROC (WndProcCast) +# else +# define CASTWNDPROC +# endif +# endif #endif #if !defined(APIENTRY) // NT defines APIENTRY, 3.x not @@ -143,4 +152,4 @@ void WXDLLEXPORT wxAddControlHandle(WXHWND hWnd, wxWindow *item); #endif #endif - // __PRIVATEH__ + // _WX_PRIVATE_H_