fix GTKGetLabel() and DoApplyWidgetStyle(): children are GtkWidget, not GtkBoxChild

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

diff --git a/src/msw/renderer.cpp b/src/msw/renderer.cpp
index 9d1e4d79e448f402e778b014627c1b5481ba0447..380ad2e383487e24a90b7b0b461f8160c24bdf68 100644 (file)
--- a/src/msw/renderer.cpp
+++ b/src/msw/renderer.cpp
@@ -31,6 +31,7 @@
     #include "wx/settings.h"
 #endif //WX_PRECOMP
 
     #include "wx/settings.h"
 #endif //WX_PRECOMP
 

+#include "wx/dcgraph.h"

 #include "wx/scopeguard.h"
 #include "wx/splitter.h"
 #include "wx/renderer.h"
 #include "wx/scopeguard.h"
 #include "wx/splitter.h"
 #include "wx/renderer.h"


@@ -113,6 +114,28 @@
     #define DFCS_HOT 0x1000
 #endif
 
     #define DFCS_HOT 0x1000
 #endif
 

+// When we're using GDI+, the DC might have transforms applied to it,
+// but the renderer APIs don't respect them. So we need to apply
+// the transforms to the rect ourselves.
+inline
+wxRect applyGDIPlusTransformsToRect(wxDC& dc, const wxRect& r)
+{
+    wxRect rect = r;
+#if wxUSE_GRAPHICS_CONTEXT
+    wxGCDC* gcdc = dynamic_cast<wxGCDC*>(&dc);
+    if (gcdc) 
+    {
+        double xtrans = 0;
+        double ytrans = 0;
+        wxGraphicsContext* gc = gcdc->GetGraphicsContext();
+        gc->GetTransform().TransformPoint(&xtrans, &ytrans);
+        rect.x = rect.x + (int)xtrans;
+        rect.y = rect.y + (int)ytrans;
+    }
+#endif
+    return rect;
+}
+

 // ----------------------------------------------------------------------------
 // methods common to wxRendererMSW and wxRendererXP
 // ----------------------------------------------------------------------------
 // ----------------------------------------------------------------------------
 // methods common to wxRendererMSW and wxRendererXP
 // ----------------------------------------------------------------------------


@@ -394,8 +417,10 @@ wxRendererMSW::DrawComboBoxDropButton(wxWindow * WXUNUSED(win),
                                       const wxRect& rect,
                                       int flags)
 {
                                       const wxRect& rect,
                                       int flags)
 {

+    wxRect adjustedRect = applyGDIPlusTransformsToRect(dc, rect);
+    

     RECT r;
     RECT r;

-    wxCopyRectToRECT(rect, r);
+    wxCopyRectToRECT(adjustedRect, r);

 
     int style = DFCS_SCROLLCOMBOBOX;
     if ( flags & wxCONTROL_DISABLED )
 
     int style = DFCS_SCROLLCOMBOBOX;
     if ( flags & wxCONTROL_DISABLED )


@@ -414,8 +439,10 @@ wxRendererMSW::DoDrawFrameControl(UINT type,
                                   const wxRect& rect,
                                   int flags)
 {
                                   const wxRect& rect,
                                   int flags)
 {

+    wxRect adjustedRect = applyGDIPlusTransformsToRect(dc, rect);
+

     RECT r;
     RECT r;

-    wxCopyRectToRECT(rect, r);
+    wxCopyRectToRECT(adjustedRect, r);

 
     int style = kind;
     if ( flags & wxCONTROL_CHECKED )
 
     int style = kind;
     if ( flags & wxCONTROL_CHECKED )


@@ -615,8 +642,10 @@ wxRendererXP::DrawComboBoxDropButton(wxWindow * win,
         return;
     }
 
         return;
     }
 

+    wxRect adjustedRect = applyGDIPlusTransformsToRect(dc, rect);
+

     RECT r;
     RECT r;

-    wxCopyRectToRECT(rect, r);
+    wxCopyRectToRECT(adjustedRect, r);

 
     int state;
     if ( flags & wxCONTROL_PRESSED )
 
     int state;
     if ( flags & wxCONTROL_PRESSED )


@@ -654,8 +683,10 @@ wxRendererXP::DrawHeaderButton(wxWindow *win,
         return m_rendererNative.DrawHeaderButton(win, dc, rect, flags, sortArrow, params);
     }
 
         return m_rendererNative.DrawHeaderButton(win, dc, rect, flags, sortArrow, params);
     }
 

+    wxRect adjustedRect = applyGDIPlusTransformsToRect(dc, rect);
+

     RECT r;
     RECT r;

-    wxCopyRectToRECT(rect, r);
+    wxCopyRectToRECT(adjustedRect, r);

 
     int state;
     if ( flags & wxCONTROL_PRESSED )
 
     int state;
     if ( flags & wxCONTROL_PRESSED )


@@ -696,8 +727,10 @@ wxRendererXP::DrawTreeItemButton(wxWindow *win,
         return;
     }
 
         return;
     }
 

+    wxRect adjustedRect = applyGDIPlusTransformsToRect(dc, rect);
+

     RECT r;
     RECT r;

-    wxCopyRectToRECT(rect, r);
+    wxCopyRectToRECT(adjustedRect, r);

 
     int state = flags & wxCONTROL_EXPANDED ? GLPS_OPENED : GLPS_CLOSED;
     wxUxThemeEngine::Get()->DrawThemeBackground
 
     int state = flags & wxCONTROL_EXPANDED ? GLPS_OPENED : GLPS_CLOSED;
     wxUxThemeEngine::Get()->DrawThemeBackground


@@ -734,8 +767,10 @@ wxRendererXP::DoDrawButtonLike(HTHEME htheme,
                                const wxRect& rect,
                                int flags)
 {
                                const wxRect& rect,
                                int flags)
 {

+    wxRect adjustedRect = applyGDIPlusTransformsToRect(dc, rect);
+

     RECT r;
     RECT r;

-    wxCopyRectToRECT(rect, r);
+    wxCopyRectToRECT(adjustedRect, r);

 
     // the base state is always 1, whether it is PBS_NORMAL,
     // {CBS,RBS}_UNCHECKEDNORMAL or CBS_NORMAL
 
     // the base state is always 1, whether it is PBS_NORMAL,
     // {CBS,RBS}_UNCHECKEDNORMAL or CBS_NORMAL