X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/a3b466481eac25cbef1d35aaf6ee9d94167a07b9..9026ad85a9792a6e5a6b41320886b154c38a9d0d:/src/msw/ownerdrw.cpp

diff --git a/src/msw/ownerdrw.cpp b/src/msw/ownerdrw.cpp
index 3f1358dcb6..be1ce8d47e 100644
--- a/src/msw/ownerdrw.cpp
+++ b/src/msw/ownerdrw.cpp
@@ -21,13 +21,18 @@
 #endif
 
 #ifndef WX_PRECOMP
+  #include "wx/window.h"
+  #include "wx/msw/private.h"
+  #include "wx/font.h"
+  #include "wx/bitmap.h"
+  #include "wx/dcmemory.h"
   #include "wx/menu.h"
+  #include "wx/utils.h"
 #endif
 
 #include "wx/ownerdrw.h"
 #include "wx/menuitem.h"
 
-#include <windows.h>
 
 // ============================================================================
 // implementation of wxOwnerDrawn class
@@ -45,7 +50,7 @@ wxOwnerDrawn::wxOwnerDrawn(const wxString& str,
   m_nMarginWidth = ms_nLastMarginWidth;
 }
 
-#if defined(__WXMSW__) && defined(__WIN32__)
+#if defined(__WXMSW__) && defined(__WIN32__) && defined(SM_CXMENUCHECK)
   size_t wxOwnerDrawn::ms_nDefaultMarginWidth = GetSystemMetrics(SM_CXMENUCHECK);
 #else   // # what is the reasonable default?
   size_t wxOwnerDrawn::ms_nDefaultMarginWidth = 15;
@@ -81,7 +86,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)
 
-#ifdef __WIN32__
+#if defined(__WIN32__) && !defined(__SC__) && !defined(__TWIN32__)
 #define   O_DRAW_NATIVE_API     // comments below explain why I use it
 #endif
 
@@ -173,7 +178,9 @@ bool wxOwnerDrawn::OnDrawItem(wxDC& dc, const wxRect& rc, wxODAction act, wxODSt
 
         // then draw a check mark into it
       RECT rect = { 0, 0, GetMarginWidth(), m_nHeight };
+#ifndef __SC__
       DrawFrameControl(hdcMem, &rect, DFC_MENU, DFCS_MENUCHECK);
+#endif
 
         // finally copy it to screen DC and clean up
       BitBlt(hdc, rc.x, rc.y, GetMarginWidth(), m_nHeight,