X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/c4e7c2aa5822f9a6e97d8d7848b95ea2eadcd98b..4540e33bb6bf41cc0c951d0345dd093179d9af05:/include/wx/msw/private.h

diff --git a/include/wx/msw/private.h b/include/wx/msw/private.h
index 4e81d182ef..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,10 +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
-typedef long (_stdcall * WndProcCast) (HWND, unsigned int, unsigned int, long);
-#define CASTWNDPROC (WndProcCast)
+#  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
@@ -144,4 +152,4 @@ void WXDLLEXPORT wxAddControlHandle(WXHWND hWnd, wxWindow *item);
 #endif
 
 #endif
-    // __PRIVATEH__
+    // _WX_PRIVATE_H_