X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/6244848856584171db8cd74a7ff227250e46cc54..3ad5e06b4aefdcef8a1ec2ec563540e055462e66:/include/wx/msw/private.h

diff --git a/include/wx/msw/private.h b/include/wx/msw/private.h
index 54d0d96e88..dcf23526ab 100644
--- a/include/wx/msw/private.h
+++ b/include/wx/msw/private.h
@@ -111,7 +111,7 @@ VOID    WINAPI ibAdjustWindowRect( HWND hWnd, LPRECT lprc ) ;
  *
  */
 
-#if CTL3D
+#if wxUSE_CTL3D
 #include <wx/msw/ctl3d/ctl3d.h>
 #endif
 
@@ -177,12 +177,20 @@ 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
+
+#ifndef __TWIN32__
 #ifdef OutputDebugString
 #undef OutputDebugString
 #endif
 
 #define OutputDebugString OutputDebugStringW95
+#endif
+
 extern void OutputDebugStringW95(const char*, ...);
 #endif