X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/a0a302dcba6d7f6828f221f7341ee8a8cbcd8e96..6c905cb7fdc856317f1e1db9c6d6aaa93c67920c:/include/wx/msw/private.h

diff --git a/include/wx/msw/private.h b/include/wx/msw/private.h
index de33833bea..bef4c75a13 100644
--- a/include/wx/msw/private.h
+++ b/include/wx/msw/private.h
@@ -41,11 +41,26 @@ WXDLLEXPORT wxFont wxCreateFontFromLogFont(LOGFONT *logFont); // , bool createNe
 #  define CASTWNDPROC (long unsigned)
 #else
 #  ifdef __BORLANDC__
+
+#  ifdef __WIN32__
 #    define CASTWNDPROC
+#  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
+       typedef int (PASCAL * WndProcCast) ();
+#      define CASTWNDPROC (WndProcCast)
+#    endif
 #    else
 #      define CASTWNDPROC
 #    endif
@@ -162,6 +177,10 @@ inline bool wxStyleHasBorder(long style)
   #define WS_EX_CLIENTEDGE 0
 #endif
 
+#if defined(__WIN32__) && !defined(WS_EX_CLIENTEDGE)
+  #define WS_EX_CLIENTEDGE 0x00000200L
+#endif
+
 #if defined(__WIN95__) && defined(__WXDEBUG__) && wxUSE_DBWIN32
 #ifdef OutputDebugString
 #undef OutputDebugString