X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/dbc38199c0d74ba6cddeced769765a2e445e380d..e7300ec6d9ebbd1cfa2fcf12c0ce6e5aee85a152:/src/msw/ownerdrw.cpp

diff --git a/src/msw/ownerdrw.cpp b/src/msw/ownerdrw.cpp
index 37ea1f8b81..fe811c55d6 100644
--- a/src/msw/ownerdrw.cpp
+++ b/src/msw/ownerdrw.cpp
@@ -23,7 +23,7 @@
 
 #ifndef WX_PRECOMP
   #include "wx/window.h"
-//  #include "wx/msw/private.h"
+  #include "wx/msw/private.h"
   #include "wx/font.h"
   #include "wx/bitmap.h"
   #include "wx/dcmemory.h"
@@ -191,29 +191,12 @@ bool wxOwnerDrawn::OnDrawItem(wxDC& dc,
 
     HFONT hPrevFont = (HFONT) ::SelectObject(hdc, hfont);
    
-
-#if wxUSE_UNICODE_MSLU
-	if ( wxGetOsVersion() == wxWIN95 /* using unicows.dll */ )
-	{
-		// VS: There's yet another bug in MSLU: DrawStateW behaves
-		//     like if it was expecting char*, not wchar_t* input.
-		//     We have to use DrawStateA explicitly.
-		DrawStateA(hdc, NULL, NULL,
-				   (LPARAM)(const char*)m_strName.mb_str(wxConvLocal),
-				   m_strName.length(),
-                   x, rc.y, rc.GetWidth(), rc.GetHeight(),
-                   DST_PREFIXTEXT | 
-					   (st & wxODDisabled ? DSS_DISABLED : 0));
-	}
-	else
-#else
 	DrawState(hdc, NULL, NULL,
               (LPARAM)m_strName.c_str(), m_strName.length(),
               x, rc.y, rc.GetWidth(), rc.GetHeight(),
               DST_PREFIXTEXT | (st & wxODDisabled ? DSS_DISABLED : 0));
-#endif
 
-	 if ( !m_strAccel.empty() )
+    if ( !m_strAccel.empty() )
     {
         RECT r;
         r.top = rc.GetTop();