HDC() fix was wrong, may have been just a problem with mismatched parens.

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

diff --git a/src/msw/renderer.cpp b/src/msw/renderer.cpp
index d5fe089eea3b92e6b471206b9798f36395921b42..33ce2d7b879bc85e73a8606550fb56c38bc2e12b 100644 (file)
--- a/src/msw/renderer.cpp
+++ b/src/msw/renderer.cpp
@@ -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()).HDC(), &r, DFC_SCROLL, style);
+    ::DrawFrameControl(GraphicsHDC((wxMSWDCImpl*)dc.GetImpl()), &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()).HDC(), &r, DFC_BUTTON, style);
+    ::DrawFrameControl(GraphicsHDC((wxMSWDCImpl*)dc.GetImpl()), &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()).HDC(), &rc, DFC_BUTTON, style);
+    ::DrawFrameControl(GraphicsHDC((wxMSWDCImpl*)dc.GetImpl()), &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()).HDC(), &rc);
+    ::DrawFocusRect(GraphicsHDC((wxMSWDCImpl*)dc.GetImpl()), &rc);

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


@@ -513,7 +513,7 @@ void wxRendererMSW::DrawRadioButton(wxWindow* win, wxDC& dc, const wxRect& rect,
     wxUxThemeEngine::Get()->DrawThemeBackground
                             (
                                 hTheme,
     wxUxThemeEngine::Get()->DrawThemeBackground
                             (
                                 hTheme,

-                                GraphicsHDC(&dc).HDC(),
+                                GraphicsHDC(&dc),

                                 BP_RADIOBUTTON,
                                 state,
                                 &r,
                                 BP_RADIOBUTTON,
                                 state,
                                 &r,