Changed floats to doubles in wxexpr.h; added a flag in accel.h (wxACCEL_NONE for

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

diff --git a/include/wx/msw/private.h b/include/wx/msw/private.h
index adaeb99ffc45bf6a38d970bd139ef1d0b91bee23..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$
-// 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"
 
@@ -43,7 +43,7 @@ wxFont WXDLLEXPORT wxCreateFontFromLogFont(LOGFONT *logFont); // , bool createNe
 #  ifdef __BORLANDC__
 #    define CASTWNDPROC
 #  else
-#    ifdef __WIN32__
+#    if defined (__WIN32__) && defined(STRICT)
        typedef long (_stdcall * WndProcCast) (HWND, unsigned int, unsigned int, long);
 #      define CASTWNDPROC (WndProcCast)
 #    else
@@ -152,4 +152,4 @@ void WXDLLEXPORT wxAddControlHandle(WXHWND hWnd, wxWindow *item);
 #endif
 
 #endif
-    // __PRIVATEH__
+    // _WX_PRIVATE_H_