Hopefully the right fix this time.

git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@57319 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775

diff --git a/src/msw/renderer.cpp b/src/msw/renderer.cpp
index 33ce2d7b879bc85e73a8606550fb56c38bc2e12b..528196f636b6afe03f723661fa6428bae48108cb 100644 (file)
--- a/src/msw/renderer.cpp
+++ b/src/msw/renderer.cpp
@@ -128,7 +128,7 @@ public:
         }
         else
 #endif
         }
         else
 #endif

-            m_hdc = GetHdcOf(*dc);
+            m_hdc = GetHdcOf(*((wxMSWDCImpl*)dc->GetImpl()));

     }
 
     ~GraphicsHDC()
     }
 
     ~GraphicsHDC()


@@ -320,7 +320,7 @@ wxRendererMSW::DrawComboBoxDropButton(wxWindow * WXUNUSED(win),
     if ( flags & wxCONTROL_PRESSED )
         style |= DFCS_PUSHED | DFCS_FLAT;
 
     if ( flags & wxCONTROL_PRESSED )
         style |= DFCS_PUSHED | DFCS_FLAT;
 

-    ::DrawFrameControl(GraphicsHDC((wxMSWDCImpl*)dc.GetImpl()), &r, DFC_SCROLL, style);
+    ::DrawFrameControl(GraphicsHDC(&dc), &r, DFC_SCROLL, style);

 }
 
 void
 }
 
 void


@@ -344,7 +344,7 @@ wxRendererMSW::DrawCheckBox(wxWindow * WXUNUSED(win),
     if ( flags & wxCONTROL_CURRENT )
         style |= DFCS_HOT;
 
     if ( flags & wxCONTROL_CURRENT )
         style |= DFCS_HOT;
 

-    ::DrawFrameControl(GraphicsHDC((wxMSWDCImpl*)dc.GetImpl()), &r, DFC_BUTTON, style);
+    ::DrawFrameControl(GraphicsHDC(&dc), &r, DFC_BUTTON, style);

 }
 
 void
 }
 
 void


@@ -373,7 +373,7 @@ wxRendererMSW::DrawPushButton(wxWindow * WXUNUSED(win),
     RECT rc;
     wxCopyRectToRECT(rect, rc);
 
     RECT rc;
     wxCopyRectToRECT(rect, rc);
 

-    ::DrawFrameControl(GraphicsHDC((wxMSWDCImpl*)dc.GetImpl()), &rc, DFC_BUTTON, style);
+    ::DrawFrameControl(GraphicsHDC(&dc), &rc, DFC_BUTTON, style);

 }
 
 void wxRendererMSW::DrawFocusRect(wxWindow * WXUNUSED(win),
 }
 
 void wxRendererMSW::DrawFocusRect(wxWindow * WXUNUSED(win),


@@ -384,7 +384,7 @@ void wxRendererMSW::DrawFocusRect(wxWindow * WXUNUSED(win),
     RECT rc;
     wxCopyRectToRECT(rect, rc);
 
     RECT rc;
     wxCopyRectToRECT(rect, rc);
 

-    ::DrawFocusRect(GraphicsHDC((wxMSWDCImpl*)dc.GetImpl()), &rc);
+    ::DrawFocusRect(GraphicsHDC(&dc), &rc);

 }
 
 wxSize wxRendererMSW::GetCheckBoxSize(wxWindow * WXUNUSED(win))
 }
 
 wxSize wxRendererMSW::GetCheckBoxSize(wxWindow * WXUNUSED(win))