X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/2432b92dd7a837db13d3938a56c1959decd03203..86fdd27b451ec92f4573f125fec73c44421ee744:/src/msw/ownerdrw.cpp

diff --git a/src/msw/ownerdrw.cpp b/src/msw/ownerdrw.cpp
index 65477ba905..15dcd0d3f1 100644
--- 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