Don't use wxCHECK_W32API_VERSION() in #if when it can be undefined.

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

diff --git a/src/msw/renderer.cpp b/src/msw/renderer.cpp
index 4c748fd526a5e2404d534e04240063fbb3049b27..46f438191514712ab9304290f0c51d11ab71f5f0 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"


@@ -197,6 +198,8 @@ public:
 
     virtual int GetHeaderButtonHeight(wxWindow *win);
 
 
     virtual int GetHeaderButtonHeight(wxWindow *win);
 

+    virtual int GetHeaderButtonMargin(wxWindow *win);
+

 private:
     // wrapper of DrawFrameControl()
     void DoDrawFrameControl(UINT type,
 private:
     // wrapper of DrawFrameControl()
     void DoDrawFrameControl(UINT type,


@@ -392,8 +395,12 @@ wxRendererMSW::DrawComboBoxDropButton(wxWindow * WXUNUSED(win),
                                       const wxRect& rect,
                                       int flags)
 {
                                       const wxRect& rect,
                                       int flags)
 {

+    wxCHECK_RET( dc.GetImpl(), wxT("Invalid wxDC") );
+
+    wxRect adjustedRect = dc.GetImpl()->MSWApplyGDIPlusTransform(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 )


@@ -412,8 +419,12 @@ wxRendererMSW::DoDrawFrameControl(UINT type,
                                   const wxRect& rect,
                                   int flags)
 {
                                   const wxRect& rect,
                                   int flags)
 {

+    wxCHECK_RET( dc.GetImpl(), wxT("Invalid wxDC") );
+
+    wxRect adjustedRect = dc.GetImpl()->MSWApplyGDIPlusTransform(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 )


@@ -426,6 +437,11 @@ wxRendererMSW::DoDrawFrameControl(UINT type,
         style |= DFCS_PUSHED;
     if ( flags & wxCONTROL_CURRENT )
         style |= DFCS_HOT;
         style |= DFCS_PUSHED;
     if ( flags & wxCONTROL_CURRENT )
         style |= DFCS_HOT;

+    if ( flags & wxCONTROL_UNDETERMINED )
+        // Using DFCS_BUTTON3STATE here doesn't work (as might be expected),
+        // use the following two styles to get the same look of a check box
+        // in the undetermined state.
+        style |= DFCS_INACTIVE | DFCS_CHECKED;

 
     ::DrawFrameControl(GetHdcOf(dc.GetTempHDC()), &r, type, style);
 }
 
     ::DrawFrameControl(GetHdcOf(dc.GetTempHDC()), &r, type, style);
 }


@@ -517,6 +533,11 @@ int wxRendererMSW::GetHeaderButtonHeight(wxWindow * WXUNUSED(win))
     return Header_Layout(hwndHeader, &hdl) ? wp.cy : DEFAULT_HEIGHT;
 }
 
     return Header_Layout(hwndHeader, &hdl) ? wp.cy : DEFAULT_HEIGHT;
 }
 

+int wxRendererMSW::GetHeaderButtonMargin(wxWindow *WXUNUSED(win))
+{
+    return 10;
+}
+

 // Uses the theme to draw the border and fill for something like a wxTextCtrl
 void wxRendererMSW::DrawTextCtrl(wxWindow* win, wxDC& dc, const wxRect& rect, int flags)
 {
 // Uses the theme to draw the border and fill for something like a wxTextCtrl
 void wxRendererMSW::DrawTextCtrl(wxWindow* win, wxDC& dc, const wxRect& rect, int flags)
 {


@@ -608,8 +629,12 @@ wxRendererXP::DrawComboBoxDropButton(wxWindow * win,
         return;
     }
 
         return;
     }
 

+    wxCHECK_RET( dc.GetImpl(), wxT("Invalid wxDC") );
+
+    wxRect adjustedRect = dc.GetImpl()->MSWApplyGDIPlusTransform(rect);
+

     RECT r;
     RECT r;

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

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


@@ -647,8 +672,12 @@ wxRendererXP::DrawHeaderButton(wxWindow *win,
         return m_rendererNative.DrawHeaderButton(win, dc, rect, flags, sortArrow, params);
     }
 
         return m_rendererNative.DrawHeaderButton(win, dc, rect, flags, sortArrow, params);
     }
 

+    wxCHECK_MSG( dc.GetImpl(), -1, wxT("Invalid wxDC") );
+
+    wxRect adjustedRect = dc.GetImpl()->MSWApplyGDIPlusTransform(rect);
+

     RECT r;
     RECT r;

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

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


@@ -689,8 +718,12 @@ wxRendererXP::DrawTreeItemButton(wxWindow *win,
         return;
     }
 
         return;
     }
 

+    wxCHECK_RET( dc.GetImpl(), wxT("Invalid wxDC") );
+
+    wxRect adjustedRect = dc.GetImpl()->MSWApplyGDIPlusTransform(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


@@ -727,8 +760,12 @@ wxRendererXP::DoDrawButtonLike(HTHEME htheme,
                                const wxRect& rect,
                                int flags)
 {
                                const wxRect& rect,
                                int flags)
 {

+    wxCHECK_RET( dc.GetImpl(), wxT("Invalid wxDC") );
+
+    wxRect adjustedRect = dc.GetImpl()->MSWApplyGDIPlusTransform(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