Moved the cleanup code to an EVT_WINDOW_DESTROY handler.

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

diff --git a/src/msw/ownerdrw.cpp b/src/msw/ownerdrw.cpp
index 37ea1f8b81a7a34c9b1f5a191961ccdb1a771a18..fe811c55d6faaf2f6afcaca12bb058629e284f33 100644 (file)
--- 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();