]> git.saurik.com Git - wxWidgets.git/blobdiff - src/msw/renderer.cpp
(dirty) fix rendering upon startup of the surface
[wxWidgets.git] / src / msw / renderer.cpp
index bba35b0154993da8f3e7b6e7d17b4fd9a09bdd7a..8c31c761927c3a0cc4684f852283bf37e6efc17f 100644 (file)
     #include "wx/settings.h"
 #endif //WX_PRECOMP
 
     #include "wx/settings.h"
 #endif //WX_PRECOMP
 
+#include "wx/scopeguard.h"
 #include "wx/splitter.h"
 #include "wx/renderer.h"
 #include "wx/splitter.h"
 #include "wx/renderer.h"
-#include "wx/msw/uxtheme.h"
 #include "wx/msw/private.h"
 #include "wx/msw/private.h"
+#include "wx/msw/dc.h"
+#include "wx/msw/uxtheme.h"
+
+#if wxUSE_GRAPHICS_CONTEXT
+// TODO remove this dependency (gdiplus needs the macros)
+#ifndef max
+#define max(a,b)            (((a) > (b)) ? (a) : (b))
+#endif
+
+#ifndef min
+#define min(a,b)            (((a) < (b)) ? (a) : (b))
+#endif
+
+#include "wx/dcgraph.h"
+#include "gdiplus.h"
+using namespace Gdiplus;
+#endif // wxUSE_GRAPHICS_CONTEXT
 
 // tmschema.h is in Win32 Platform SDK and might not be available with earlier
 // compilers
 #ifndef CP_DROPDOWNBUTTON
     #define BP_PUSHBUTTON      1
 
 // tmschema.h is in Win32 Platform SDK and might not be available with earlier
 // compilers
 #ifndef CP_DROPDOWNBUTTON
     #define BP_PUSHBUTTON      1
+    #define BP_RADIOBUTTON     2
     #define BP_CHECKBOX        3
     #define BP_CHECKBOX        3
+    #define RBS_UNCHECKEDNORMAL 1
+    #define RBS_CHECKEDNORMAL   (RBS_UNCHECKEDNORMAL + 4)
+    #define RBS_MIXEDNORMAL     (RBS_CHECKEDNORMAL + 4)
     #define CBS_UNCHECKEDNORMAL 1
     #define CBS_CHECKEDNORMAL   (CBS_UNCHECKEDNORMAL + 4)
     #define CBS_MIXEDNORMAL     (CBS_CHECKEDNORMAL + 4)
     #define CBS_UNCHECKEDNORMAL 1
     #define CBS_CHECKEDNORMAL   (CBS_UNCHECKEDNORMAL + 4)
     #define CBS_MIXEDNORMAL     (CBS_CHECKEDNORMAL + 4)
     #define HP_HEADERSORTARROW  4
     #define HSAS_SORTEDUP       1
     #define HSAS_SORTEDDOWN     2
     #define HP_HEADERSORTARROW  4
     #define HSAS_SORTEDUP       1
     #define HSAS_SORTEDDOWN     2
+
+    #define EP_EDITTEXT         1
+    #define ETS_NORMAL          1
+    #define ETS_HOT             2
+    #define ETS_SELECTED        3
+    #define ETS_DISABLED        4
+    #define ETS_FOCUSED         5
+    #define ETS_READONLY        6
+    #define ETS_ASSIST          7
+    #define TMT_FILLCOLOR       3802
+    #define TMT_TEXTCOLOR       3803
+    #define TMT_BORDERCOLOR     3801
+    #define TMT_EDGEFILLCOLOR   3808
+#endif
+
+
+// ----------------------------------------------------------------------------
+// If the DC is a wxGCDC then pull out the HDC from the GraphicsContext when
+// it is needed, and handle the Release when done.
+
+class GraphicsHDC
+{
+public:
+    GraphicsHDC(wxDC* dc)
+    {
+#if wxUSE_GRAPHICS_CONTEXT
+        m_graphics = NULL;
+        wxGCDC* gcdc = wxDynamicCast(dc, wxGCDC);
+        if (gcdc) {
+            m_graphics = (Graphics*)gcdc->GetGraphicsContext()->GetNativeContext();
+            m_hdc = m_graphics->GetHDC();
+        }
+        else
+#endif
+            m_hdc = GetHdcOf(*((wxMSWDCImpl*)dc->GetImpl()));
+    }
+
+    ~GraphicsHDC()
+    {
+#if wxUSE_GRAPHICS_CONTEXT
+        if (m_graphics)
+            m_graphics->ReleaseHDC(m_hdc);
+#endif
+    }
+
+    operator HDC() const { return m_hdc; }
+
+private:
+    HDC         m_hdc;
+#if wxUSE_GRAPHICS_CONTEXT
+    Graphics*   m_graphics;
+#endif
+};
+
+#if defined(__WXWINCE__)
+    #ifndef DFCS_FLAT
+        #define DFCS_FLAT 0
+    #endif
+    #ifndef DFCS_MONO
+        #define DFCS_MONO 0
+    #endif
 #endif
 
 #endif
 
-#if defined(__WXWINCE__) && !defined(DFCS_FLAT)
-    #define DFCS_FLAT 0
+#ifndef DFCS_HOT
+    #define DFCS_HOT 0x1000
 #endif
 
 #endif
 
+// ----------------------------------------------------------------------------
+// methods common to wxRendererMSW and wxRendererXP
+// ----------------------------------------------------------------------------
+
+class wxRendererMSWBase : public wxDelegateRendererNative
+{
+public:
+    wxRendererMSWBase() { }
+    wxRendererMSWBase(wxRendererNative& rendererNative)
+        : wxDelegateRendererNative(rendererNative) { }
+
+    void DrawFocusRect(wxWindow * win,
+                        wxDC& dc,
+                        const wxRect& rect,
+                        int flags = 0);
+
+    void DrawItemSelectionRect(wxWindow *win,
+                                wxDC& dc,
+                                const wxRect& rect,
+                                int flags = 0);
+};
+
 // ----------------------------------------------------------------------------
 // wxRendererMSW: wxRendererNative implementation for "old" Win32 systems
 // ----------------------------------------------------------------------------
 
 // ----------------------------------------------------------------------------
 // wxRendererMSW: wxRendererNative implementation for "old" Win32 systems
 // ----------------------------------------------------------------------------
 
-class WXDLLEXPORT wxRendererMSW : public wxDelegateRendererNative
+class wxRendererMSW : public wxRendererMSWBase
 {
 public:
     wxRendererMSW() { }
 {
 public:
     wxRendererMSW() { }
@@ -96,13 +200,42 @@ public:
                                         const wxRect& rect,
                                         int flags = 0);
 
                                         const wxRect& rect,
                                         int flags = 0);
 
+    virtual void DrawCheckBox(wxWindow *win,
+                              wxDC& dc,
+                              const wxRect& rect,
+                              int flags = 0);
+
     virtual void DrawPushButton(wxWindow *win,
                                 wxDC& dc,
                                 const wxRect& rect,
                                 int flags = 0);
 
     virtual void DrawPushButton(wxWindow *win,
                                 wxDC& dc,
                                 const wxRect& rect,
                                 int flags = 0);
 
+    virtual void DrawChoice(wxWindow* win,
+                            wxDC& dc,
+                            const wxRect& rect,
+                            int flags=0);
+
+    virtual void DrawComboBox(wxWindow* win,
+                                wxDC& dc,
+                                const wxRect& rect,
+                                int flags=0);
+
+    virtual void DrawTextCtrl(wxWindow* win,
+                                wxDC& dc,
+                                const wxRect& rect,
+                                int flags=0);
+
+    virtual void DrawRadioButton(wxWindow* win,
+                                wxDC& dc,
+                                const wxRect& rect,
+                                int flags=0);
+
+    virtual wxSize GetCheckBoxSize(wxWindow *win);
+
+    virtual int GetHeaderButtonHeight(wxWindow *win);
+
 private:
 private:
-    DECLARE_NO_COPY_CLASS(wxRendererMSW)
+    wxDECLARE_NO_COPY_CLASS(wxRendererMSW);
 };
 
 // ----------------------------------------------------------------------------
 };
 
 // ----------------------------------------------------------------------------
@@ -111,21 +244,20 @@ private:
 
 #if wxUSE_UXTHEME
 
 
 #if wxUSE_UXTHEME
 
-class WXDLLEXPORT wxRendererXP : public wxDelegateRendererNative
+class wxRendererXP : public wxRendererMSWBase
 {
 public:
 {
 public:
-    wxRendererXP() : wxDelegateRendererNative(wxRendererMSW::Get()) { }
+    wxRendererXP() : wxRendererMSWBase(wxRendererMSW::Get()) { }
 
     static wxRendererNative& Get();
 
 
     static wxRendererNative& Get();
 
-    virtual void DrawHeaderButton(wxWindow *win,
+    virtual int DrawHeaderButton(wxWindow *win,
                                   wxDC& dc,
                                   const wxRect& rect,
                                   int flags = 0,
                                   wxHeaderSortIconType sortArrow = wxHDR_SORT_ICON_NONE,
                                   wxHeaderButtonParams* params = NULL);
                                   wxDC& dc,
                                   const wxRect& rect,
                                   int flags = 0,
                                   wxHeaderSortIconType sortArrow = wxHDR_SORT_ICON_NONE,
                                   wxHeaderButtonParams* params = NULL);
-    virtual int GetHeaderButtonHeight(wxWindow *win);
-    
+
     virtual void DrawTreeItemButton(wxWindow *win,
                                     wxDC& dc,
                                     const wxRect& rect,
     virtual void DrawTreeItemButton(wxWindow *win,
                                     wxDC& dc,
                                     const wxRect& rect,
@@ -156,11 +288,58 @@ public:
 
     virtual wxSplitterRenderParams GetSplitterParams(const wxWindow *win);
 private:
 
     virtual wxSplitterRenderParams GetSplitterParams(const wxWindow *win);
 private:
-    DECLARE_NO_COPY_CLASS(wxRendererXP)
+    wxDECLARE_NO_COPY_CLASS(wxRendererXP);
 };
 
 #endif // wxUSE_UXTHEME
 
 };
 
 #endif // wxUSE_UXTHEME
 
+
+// ============================================================================
+// wxRendererMSWBase implementation
+// ============================================================================
+
+void wxRendererMSWBase::DrawFocusRect(wxWindow * WXUNUSED(win),
+                                      wxDC& dc,
+                                      const wxRect& rect,
+                                      int WXUNUSED(flags))
+{
+    RECT rc;
+    wxCopyRectToRECT(rect, rc);
+
+    ::DrawFocusRect(GraphicsHDC(&dc), &rc);
+}
+
+void wxRendererMSWBase::DrawItemSelectionRect(wxWindow *win,
+                                              wxDC& dc,
+                                              const wxRect& rect,
+                                              int flags)
+{
+    wxBrush brush;
+    if ( flags & wxCONTROL_SELECTED )
+    {
+        if ( flags & wxCONTROL_FOCUSED )
+        {
+            brush = wxBrush(wxSystemSettings::GetColour(wxSYS_COLOUR_HIGHLIGHT));
+        }
+        else // !focused
+        {
+            brush = wxBrush(wxSystemSettings::GetColour(wxSYS_COLOUR_BTNFACE));
+        }
+    }
+    else // !selected
+    {
+        brush = *wxTRANSPARENT_BRUSH;
+    }
+
+    dc.SetBrush(brush);
+    dc.SetPen(*wxTRANSPARENT_PEN);
+    dc.DrawRectangle( rect );
+
+    if ((flags & wxCONTROL_FOCUSED) && (flags & wxCONTROL_CURRENT))
+        DrawFocusRect( win, dc, rect, flags );
+}
+
+
 // ============================================================================
 // wxRendererNative and wxRendererMSW implementation
 // ============================================================================
 // ============================================================================
 // wxRendererNative and wxRendererMSW implementation
 // ============================================================================
@@ -192,10 +371,7 @@ wxRendererMSW::DrawComboBoxDropButton(wxWindow * WXUNUSED(win),
                                       int flags)
 {
     RECT r;
                                       int flags)
 {
     RECT r;
-    r.left = rect.GetLeft();
-    r.top = rect.GetTop();
-    r.bottom = rect.y + rect.height;
-    r.right = rect.x + rect.width;
+    wxCopyRectToRECT(rect, r);
 
     int style = DFCS_SCROLLCOMBOBOX;
     if ( flags & wxCONTROL_DISABLED )
 
     int style = DFCS_SCROLLCOMBOBOX;
     if ( flags & wxCONTROL_DISABLED )
@@ -203,28 +379,195 @@ wxRendererMSW::DrawComboBoxDropButton(wxWindow * WXUNUSED(win),
     if ( flags & wxCONTROL_PRESSED )
         style |= DFCS_PUSHED | DFCS_FLAT;
 
     if ( flags & wxCONTROL_PRESSED )
         style |= DFCS_PUSHED | DFCS_FLAT;
 
-    ::DrawFrameControl(GetHdcOf(dc), &r, DFC_SCROLL, style);
+    ::DrawFrameControl(GraphicsHDC(&dc), &r, DFC_SCROLL, style);
+}
+
+void
+wxRendererMSW::DrawCheckBox(wxWindow * WXUNUSED(win),
+                            wxDC& dc,
+                            const wxRect& rect,
+                            int flags)
+{
+    RECT r;
+    wxCopyRectToRECT(rect, r);
+
+    int style = DFCS_BUTTONCHECK;
+    if ( flags & wxCONTROL_CHECKED )
+        style |= DFCS_CHECKED;
+    if ( flags & wxCONTROL_DISABLED )
+        style |= DFCS_INACTIVE;
+    if ( flags & wxCONTROL_FLAT )
+        style |= DFCS_MONO;
+    if ( flags & wxCONTROL_PRESSED )
+        style |= DFCS_PUSHED;
+    if ( flags & wxCONTROL_CURRENT )
+        style |= DFCS_HOT;
+
+    ::DrawFrameControl(GraphicsHDC(&dc), &r, DFC_BUTTON, style);
 }
 
 void
 wxRendererMSW::DrawPushButton(wxWindow * WXUNUSED(win),
                               wxDC& dc,
 }
 
 void
 wxRendererMSW::DrawPushButton(wxWindow * WXUNUSED(win),
                               wxDC& dc,
-                              const wxRect& rect,
+                              const wxRect& rectOrig,
                               int flags)
 {
                               int flags)
 {
-    RECT r;
-    r.left = rect.GetLeft();
-    r.top = rect.GetTop();
-    r.bottom = rect.y + rect.height;
-    r.right = rect.x + rect.width;
+    wxRect rect(rectOrig);
 
     int style = DFCS_BUTTONPUSH;
     if ( flags & wxCONTROL_DISABLED )
         style |= DFCS_INACTIVE;
     if ( flags & wxCONTROL_PRESSED )
         style |= DFCS_PUSHED | DFCS_FLAT;
 
     int style = DFCS_BUTTONPUSH;
     if ( flags & wxCONTROL_DISABLED )
         style |= DFCS_INACTIVE;
     if ( flags & wxCONTROL_PRESSED )
         style |= DFCS_PUSHED | DFCS_FLAT;
+    if ( flags & wxCONTROL_ISDEFAULT )
+    {
+        // DrawFrameControl() doesn't seem to support default buttons so we
+        // have to draw the border ourselves
+        wxDCPenChanger pen(dc, *wxBLACK_PEN);
+        wxDCBrushChanger brush(dc, *wxTRANSPARENT_BRUSH);
+        dc.DrawRectangle(rect);
+        rect.Deflate(1);
+    }
+
+    RECT rc;
+    wxCopyRectToRECT(rect, rc);
+
+    ::DrawFrameControl(GraphicsHDC(&dc), &rc, DFC_BUTTON, style);
+}
+
+wxSize wxRendererMSW::GetCheckBoxSize(wxWindow * WXUNUSED(win))
+{
+    return wxSize(::GetSystemMetrics(SM_CXMENUCHECK),
+                  ::GetSystemMetrics(SM_CYMENUCHECK));
+}
+
+int wxRendererMSW::GetHeaderButtonHeight(wxWindow * WXUNUSED(win))
+{
+    // some "reasonable" value returned in case of error, it doesn't really
+    // correspond to anything but it's better than returning 0
+    static const int DEFAULT_HEIGHT = 20;
+
+
+    // create a temporary header window just to get its geometry
+    HWND hwndHeader = ::CreateWindow(WC_HEADER, NULL, 0,
+                                     0, 0, 0, 0, NULL, NULL, NULL, NULL);
+    if ( !hwndHeader )
+        return DEFAULT_HEIGHT;
+
+    wxON_BLOCK_EXIT1( ::DestroyWindow, hwndHeader );
+
+    // initialize the struct filled with the values by Header_Layout()
+    RECT parentRect = { 0, 0, 100, 100 };
+    WINDOWPOS wp = { 0, 0, 0, 0, 0, 0, 0 };
+    HDLAYOUT hdl = { &parentRect, &wp };
+
+    return Header_Layout(hwndHeader, &hdl) ? wp.cy : DEFAULT_HEIGHT;
+}
+
+// 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)
+{
+    wxColour fill;
+    wxColour bdr;
+    COLORREF cref;
+
+#if wxUSE_UXTHEME
+    wxUxThemeHandle hTheme(win, L"EDIT");
+    if (hTheme)
+    {
+        wxUxThemeEngine::Get()->GetThemeColor(hTheme, EP_EDITTEXT,
+                                              ETS_NORMAL, TMT_FILLCOLOR, &cref);
+        fill = wxRGBToColour(cref);
+
+        int etsState;
+        if ( flags & wxCONTROL_DISABLED )
+            etsState = ETS_DISABLED;
+        else
+            etsState = ETS_NORMAL;
+
+        wxUxThemeEngine::Get()->GetThemeColor(hTheme, EP_EDITTEXT,
+                                              etsState, TMT_BORDERCOLOR, &cref);
+        bdr = wxRGBToColour(cref);
+    }
+    else
+#endif
+    {
+        fill = wxSystemSettings::GetColour(wxSYS_COLOUR_WINDOW);
+        bdr = *wxBLACK;
+    }
+
+    dc.SetPen( bdr );
+    dc.SetBrush( fill );
+    dc.DrawRectangle(rect);
+}
+
+
+// Draw the equivallent of a wxComboBox
+void wxRendererMSW::DrawComboBox(wxWindow* win, wxDC& dc, const wxRect& rect, int flags)
+{
+    // Draw the main part of the control same as TextCtrl
+    DrawTextCtrl(win, dc, rect, flags);
+
+    // Draw the button inside the border, on the right side
+    wxRect br(rect);
+    br.height -= 2;
+    br.x += br.width - br.height - 1;
+    br.width = br.height;
+    br.y += 1;
+
+    DrawComboBoxDropButton(win, dc, br, flags);
+}
+
+
+void wxRendererMSW::DrawChoice(wxWindow* win, wxDC& dc,
+                           const wxRect& rect, int flags)
+{
+    DrawComboBox(win, dc, rect, flags);
+}
+
+
+// Draw a themed radio button
+void wxRendererMSW::DrawRadioButton(wxWindow* win, wxDC& dc, const wxRect& rect, int flags)
+{
+#if wxUSE_UXTHEME
+    wxUxThemeHandle hTheme(win, L"BUTTON");
+    if ( !hTheme )
+#endif
+    {
+        // ??? m_rendererNative.DrawRadioButton(win, dc, rect, flags);
+        return;
+    }
+
+#if wxUSE_UXTHEME
+    RECT r;
+    wxCopyRectToRECT(rect, r);
 
 
-    ::DrawFrameControl(GetHdcOf(dc), &r, DFC_BUTTON, style);
+    int state;
+    if ( flags & wxCONTROL_CHECKED )
+        state = RBS_CHECKEDNORMAL;
+    else if ( flags & wxCONTROL_UNDETERMINED )
+        state = RBS_MIXEDNORMAL;
+    else
+        state = RBS_UNCHECKEDNORMAL;
+
+    // RBS_XXX is followed by RBX_XXXGOT, then RBS_XXXPRESSED and DISABLED
+    if ( flags & wxCONTROL_CURRENT )
+        state += 1;
+    else if ( flags & wxCONTROL_PRESSED )
+        state += 2;
+    else if ( flags & wxCONTROL_DISABLED )
+        state += 3;
+
+    wxUxThemeEngine::Get()->DrawThemeBackground
+                            (
+                                hTheme,
+                                GraphicsHDC(&dc),
+                                BP_RADIOBUTTON,
+                                state,
+                                &r,
+                                NULL
+                            );
+#endif
 }
 
 // ============================================================================
 }
 
 // ============================================================================
@@ -273,7 +616,7 @@ wxRendererXP::DrawComboBoxDropButton(wxWindow * win,
     wxUxThemeEngine::Get()->DrawThemeBackground
                             (
                                 hTheme,
     wxUxThemeEngine::Get()->DrawThemeBackground
                             (
                                 hTheme,
-                                GetHdcOf(dc),
+                                GetHdcOf(*((wxMSWDCImpl*)dc.GetImpl())),
                                 CP_DROPDOWNBUTTON,
                                 state,
                                 &r,
                                 CP_DROPDOWNBUTTON,
                                 state,
                                 &r,
@@ -282,7 +625,7 @@ wxRendererXP::DrawComboBoxDropButton(wxWindow * win,
 
 }
 
 
 }
 
-void
+int
 wxRendererXP::DrawHeaderButton(wxWindow *win,
                                wxDC& dc,
                                const wxRect& rect,
 wxRendererXP::DrawHeaderButton(wxWindow *win,
                                wxDC& dc,
                                const wxRect& rect,
@@ -293,8 +636,7 @@ wxRendererXP::DrawHeaderButton(wxWindow *win,
     wxUxThemeHandle hTheme(win, L"HEADER");
     if ( !hTheme )
     {
     wxUxThemeHandle hTheme(win, L"HEADER");
     if ( !hTheme )
     {
-        m_rendererNative.DrawHeaderButton(win, dc, rect, flags, sortArrow, params);
-        return;
+        return m_rendererNative.DrawHeaderButton(win, dc, rect, flags, sortArrow, params);
     }
 
     RECT r;
     }
 
     RECT r;
@@ -310,7 +652,7 @@ wxRendererXP::DrawHeaderButton(wxWindow *win,
     wxUxThemeEngine::Get()->DrawThemeBackground
                             (
                                 hTheme,
     wxUxThemeEngine::Get()->DrawThemeBackground
                             (
                                 hTheme,
-                                GetHdcOf(dc),
+                                GetHdcOf(*((wxMSWDCImpl*)dc.GetImpl())),
                                 HP_HEADERITEM,
                                 state,
                                 &r,
                                 HP_HEADERITEM,
                                 state,
                                 &r,
@@ -320,34 +662,9 @@ wxRendererXP::DrawHeaderButton(wxWindow *win,
     // NOTE: Using the theme to draw HP_HEADERSORTARROW doesn't do anything.
     // Why?  If this can be fixed then draw the sort arrows using the theme
     // and then clear those flags before calling DrawHeaderButtonContents.
     // NOTE: Using the theme to draw HP_HEADERSORTARROW doesn't do anything.
     // Why?  If this can be fixed then draw the sort arrows using the theme
     // and then clear those flags before calling DrawHeaderButtonContents.
-    
-    // Add any extras that are specified in flags and params
-    DrawHeaderButtonContents(win, dc, rect, flags, sortArrow, params);
-}
-
 
 
-int
-wxRendererXP::GetHeaderButtonHeight(wxWindow *win)
-{
-    wxUxThemeHandle hTheme(win, L"HEADER");
-    if ( !hTheme )
-    {
-        return m_rendererNative.GetHeaderButtonHeight(win);
-    }
-    
-    HRESULT hr;
-    int value = -1;
-    
-    hr = wxUxThemeEngine::Get()->GetThemeMetric( hTheme,
-                                                 NULL,
-                                                 HP_HEADERITEM,
-                                                 HIS_NORMAL,
-                                                 TMT_HEIGHT,
-                                                 &value );
-    if ( hr == S_OK )
-        return value;
-    else
-        return 20;
+    // Add any extras that are specified in flags and params
+    return DrawHeaderButtonContents(win, dc, rect, flags, sortArrow, params);
 }
 
 
 }
 
 
@@ -371,7 +688,7 @@ wxRendererXP::DrawTreeItemButton(wxWindow *win,
     wxUxThemeEngine::Get()->DrawThemeBackground
                             (
                                 hTheme,
     wxUxThemeEngine::Get()->DrawThemeBackground
                             (
                                 hTheme,
-                                GetHdcOf(dc),
+                                GetHdcOf(*((wxMSWDCImpl*)dc.GetImpl())),
                                 TVP_GLYPH,
                                 state,
                                 &r,
                                 TVP_GLYPH,
                                 state,
                                 &r,
@@ -379,6 +696,8 @@ wxRendererXP::DrawTreeItemButton(wxWindow *win,
                             );
 }
 
                             );
 }
 
+
+
 void
 wxRendererXP::DrawCheckBox(wxWindow *win,
                            wxDC& dc,
 void
 wxRendererXP::DrawCheckBox(wxWindow *win,
                            wxDC& dc,
@@ -403,18 +722,25 @@ wxRendererXP::DrawCheckBox(wxWindow *win,
     else
         state = CBS_UNCHECKEDNORMAL;
 
     else
         state = CBS_UNCHECKEDNORMAL;
 
-    // CBS_XXX is followed by CBX_XXXGOT, then CBS_XXXPRESSED and DISABLED
-    if ( flags & wxCONTROL_CURRENT )
-        state += 1;
+    // CBS_XXX is followed by CBX_XXXHOT, then CBS_XXXPRESSED and DISABLED
+    enum
+    {
+        CBS_HOT_OFFSET = 1,
+        CBS_PRESSED_OFFSET = 2,
+        CBS_DISABLED_OFFSET = 3
+    };
+
+    if ( flags & wxCONTROL_DISABLED )
+        state += CBS_DISABLED_OFFSET;
     else if ( flags & wxCONTROL_PRESSED )
     else if ( flags & wxCONTROL_PRESSED )
-        state += 2;
-    else if ( flags & wxCONTROL_DISABLED )
-        state += 3;
+        state += CBS_PRESSED_OFFSET;
+    else if ( flags & wxCONTROL_CURRENT )
+        state += CBS_HOT_OFFSET;
 
     wxUxThemeEngine::Get()->DrawThemeBackground
                             (
                                 hTheme,
 
     wxUxThemeEngine::Get()->DrawThemeBackground
                             (
                                 hTheme,
-                                GetHdcOf(dc),
+                                GetHdcOf(*((wxMSWDCImpl*)dc.GetImpl())),
                                 BP_CHECKBOX,
                                 state,
                                 &r,
                                 BP_CHECKBOX,
                                 state,
                                 &r,
@@ -453,15 +779,15 @@ wxRendererXP::DrawPushButton(wxWindow * win,
     wxUxThemeEngine::Get()->DrawThemeBackground
                             (
                                 hTheme,
     wxUxThemeEngine::Get()->DrawThemeBackground
                             (
                                 hTheme,
-                                GetHdcOf(dc),
+                                GetHdcOf(*((wxMSWDCImpl*)dc.GetImpl())),
                                 BP_PUSHBUTTON,
                                 state,
                                 &r,
                                 NULL
                             );
                                 BP_PUSHBUTTON,
                                 state,
                                 &r,
                                 NULL
                             );
-
 }
 
 }
 
+
 // ----------------------------------------------------------------------------
 // splitter drawing
 // ----------------------------------------------------------------------------
 // ----------------------------------------------------------------------------
 // splitter drawing
 // ----------------------------------------------------------------------------