IMHO these are the correct flags for borland

[wxWidgets.git] / src / msw / ownerdrw.cpp

diff --git a/src/msw/ownerdrw.cpp b/src/msw/ownerdrw.cpp
index 65477ba9057e11d9eb811251d947eabdcfa12082..15dcd0d3f172fc9054b489004a0216794018ca8f 100644 (file)
--- a/src/msw/ownerdrw.cpp
+++ b/src/msw/ownerdrw.cpp
@@ -31,11 +31,7 @@
 #include "wx/ownerdrw.h"
 #include "wx/menuitem.h"
 
-#include <windows.h>
-
-#ifdef DrawText
-#undef DrawText
-#endif
+#include "wx/msw/private.h"
 
 // ============================================================================
 // implementation of wxOwnerDrawn class
@@ -89,7 +85,7 @@ bool wxOwnerDrawn::OnMeasureItem(size_t *pwidth, size_t *pheight)
 // Win32 GDI functions and not wxWindows ones. Might help to whoever decides to
 // port this code to X. (VZ)
 
-#if defined(__WIN32__) && !defined(__SC__)
+#if defined(__WIN32__) && !defined(__SC__) && !defined(__TWIN32__)
 #define   O_DRAW_NATIVE_API     // comments below explain why I use it
 #endif