WXFARPROC prototyped as `typedef int (__stdcall *WXFARPROC)()' (does Borland

[wxWidgets.git] / include / wx / msw / private.h

diff --git a/include/wx/msw/private.h b/include/wx/msw/private.h
index 5a3635e74804f0e00bb9eca0170c3749febedef8..c764c5641fb981b29cd6d53115b7a5f784a30522 100644 (file)
--- 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$
 // 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"
 
 
 #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__
 wxFont WXDLLEXPORT wxCreateFontFromLogFont(LOGFONT *logFont); // , bool createNew = TRUE);
 
 #ifdef __GNUWIN32__

-#define CASTWNDPROC (long unsigned)
+#  define CASTWNDPROC (long unsigned)

 #else
 #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
 #endif
 
 #if !defined(APIENTRY) // NT defines APIENTRY, 3.x not


@@ -143,4 +152,4 @@ void WXDLLEXPORT wxAddControlHandle(WXHWND hWnd, wxWindow *item);
 #endif
 
 #endif
 #endif
 
 #endif

-    // __PRIVATEH__
+    // _WX_PRIVATE_H_