Document steps needed to update to newer Scintilla. (From memory, will need to be...

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

diff --git a/src/msw/renderer.cpp b/src/msw/renderer.cpp
index d5fe089eea3b92e6b471206b9798f36395921b42..46f438191514712ab9304290f0c51d11ab71f5f0 100644 (file)
--- a/src/msw/renderer.cpp
+++ b/src/msw/renderer.cpp
@@ -6,7 +6,7 @@
 // Created:     20.07.2003
 // RCS-ID:      $Id$
 // Copyright:   (c) 2003 Vadim Zeitlin <vadim@wxwindows.org>
 // Created:     20.07.2003
 // RCS-ID:      $Id$
 // Copyright:   (c) 2003 Vadim Zeitlin <vadim@wxwindows.org>

-// License:     wxWindows licence
+// Licence:     wxWindows licence

 ///////////////////////////////////////////////////////////////////////////////
 
 // ============================================================================
 ///////////////////////////////////////////////////////////////////////////////
 
 // ============================================================================


@@ -31,27 +31,13 @@
     #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/msw/private.h"
 #include "wx/scopeguard.h"
 #include "wx/splitter.h"
 #include "wx/renderer.h"
 #include "wx/msw/private.h"

-#include "wx/msw/dc.h"

 #include "wx/msw/uxtheme.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 "gdiplus.h"
-using namespace Gdiplus;
-#endif
-

 // tmschema.h is in Win32 Platform SDK and might not be available with earlier
 // compilers
 #ifndef CP_DROPDOWNBUTTON
 // tmschema.h is in Win32 Platform SDK and might not be available with earlier
 // compilers
 #ifndef CP_DROPDOWNBUTTON


@@ -107,46 +93,13 @@ using namespace Gdiplus;
     #define TMT_TEXTCOLOR       3803
     #define TMT_BORDERCOLOR     3801
     #define TMT_EDGEFILLCOLOR   3808
     #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(*dc);
-    }

 
 

-    ~GraphicsHDC()
-    {
-#if wxUSE_GRAPHICS_CONTEXT
-        if (m_graphics)
-            m_graphics->ReleaseHDC(m_hdc);
+    #define WP_MINBUTTON 15
+    #define WP_MAXBUTTON 17
+    #define WP_CLOSEBUTTON 18
+    #define WP_RESTOREBUTTON 21
+    #define WP_HELPBUTTON 23

 #endif
 #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
 
 #if defined(__WXWINCE__)
     #ifndef DFCS_FLAT


@@ -161,11 +114,33 @@ private:
     #define DFCS_HOT 0x1000
 #endif
 
     #define DFCS_HOT 0x1000
 #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() { }


@@ -180,44 +155,72 @@ public:
     virtual void DrawCheckBox(wxWindow *win,
                               wxDC& dc,
                               const wxRect& rect,
     virtual void DrawCheckBox(wxWindow *win,
                               wxDC& dc,
                               const wxRect& rect,

-                              int flags = 0);
+                              int flags = 0)
+    {
+        DoDrawButton(DFCS_BUTTONCHECK, win, dc, rect, flags);
+    }

 
     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 DrawFocusRect(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 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 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 DrawTextCtrl(wxWindow* win, 
-                                wxDC& dc, 
-                                const wxRect& rect, 
-                                int flags=0);
+    virtual void DrawRadioBitmap(wxWindow* win,
+                                 wxDC& dc,
+                                 const wxRect& rect,
+                                 int flags = 0)
+    {
+        DoDrawButton(DFCS_BUTTONRADIO, win, dc, rect, flags);
+    }

 
 

-    virtual void DrawRadioButton(wxWindow* win, 
-                                wxDC& dc, 
-                                const wxRect& rect, 
-                                int flags=0);
+    virtual void DrawTitleBarBitmap(wxWindow *win,
+                                    wxDC& dc,
+                                    const wxRect& rect,
+                                    wxTitleBarButton button,
+                                    int flags = 0);

 
     virtual wxSize GetCheckBoxSize(wxWindow *win);
 
     virtual int GetHeaderButtonHeight(wxWindow *win);
 
 
     virtual wxSize GetCheckBoxSize(wxWindow *win);
 
     virtual int GetHeaderButtonHeight(wxWindow *win);
 

+    virtual int GetHeaderButtonMargin(wxWindow *win);
+

 private:
 private:

-    DECLARE_NO_COPY_CLASS(wxRendererMSW)
+    // wrapper of DrawFrameControl()
+    void DoDrawFrameControl(UINT type,
+                            UINT kind,
+                            wxWindow *win,
+                            wxDC& dc,
+                            const wxRect& rect,
+                            int flags);
+
+    // common part of Draw{PushButton,CheckBox,RadioBitmap}(): wraps
+    // DrawFrameControl(DFC_BUTTON)
+    void DoDrawButton(UINT kind,
+                      wxWindow *win,
+                      wxDC& dc,
+                      const wxRect& rect,
+                      int flags)
+    {
+        DoDrawFrameControl(DFC_BUTTON, kind, win, dc, rect, flags);
+    }
+
+    wxDECLARE_NO_COPY_CLASS(wxRendererMSW);

 };
 
 // ----------------------------------------------------------------------------
 };
 
 // ----------------------------------------------------------------------------


@@ -226,10 +229,10 @@ 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();
 


@@ -261,26 +264,107 @@ public:
     virtual void DrawCheckBox(wxWindow *win,
                               wxDC& dc,
                               const wxRect& rect,
     virtual void DrawCheckBox(wxWindow *win,
                               wxDC& dc,
                               const wxRect& rect,

-                              int flags = 0);
+                              int flags = 0)
+    {
+        if ( !DoDrawXPButton(BP_CHECKBOX, win, dc, rect, flags) )
+            m_rendererNative.DrawCheckBox(win, dc, rect, flags);
+    }

 
     virtual void DrawPushButton(wxWindow *win,
                                 wxDC& dc,
                                 const wxRect& rect,
 
     virtual void DrawPushButton(wxWindow *win,
                                 wxDC& dc,
                                 const wxRect& rect,

-                                int flags = 0);
+                                int flags = 0)
+    {
+        if ( !DoDrawXPButton(BP_PUSHBUTTON, win, dc, rect, flags) )
+            m_rendererNative.DrawPushButton(win, dc, rect, flags);
+    }

 
 

-    virtual void DrawItemSelectionRect(wxWindow *win,
-                                       wxDC& dc,
-                                       const wxRect& rect,
-                                       int flags = 0 );
+    virtual void DrawRadioBitmap(wxWindow *win,
+                                 wxDC& dc,
+                                 const wxRect& rect,
+                                 int flags = 0)
+    {
+        if ( !DoDrawXPButton(BP_RADIOBUTTON, win, dc, rect, flags) )
+            m_rendererNative.DrawRadioBitmap(win, dc, rect, flags);
+    }

 
 

+    virtual void DrawTitleBarBitmap(wxWindow *win,
+                                    wxDC& dc,
+                                    const wxRect& rect,
+                                    wxTitleBarButton button,
+                                    int flags = 0);

 
     virtual wxSplitterRenderParams GetSplitterParams(const wxWindow *win);
 
     virtual wxSplitterRenderParams GetSplitterParams(const wxWindow *win);

+

 private:
 private:

-    DECLARE_NO_COPY_CLASS(wxRendererXP)
+    // wrapper around DrawThemeBackground() translating flags to NORMAL/HOT/
+    // PUSHED/DISABLED states (and so suitable for drawing anything
+    // button-like)
+    void DoDrawButtonLike(HTHEME htheme,
+                          int part,
+                          wxDC& dc,
+                          const wxRect& rect,
+                          int flags);
+
+    // common part of DrawCheckBox(), DrawPushButton() and DrawRadioBitmap()
+    bool DoDrawXPButton(int kind,
+                        wxWindow *win,
+                        wxDC& dc,
+                        const wxRect& rect,
+                        int flags);
+
+    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(GetHdcOf(dc.GetTempHDC()), &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
 // ============================================================================


@@ -311,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 )


@@ -320,19 +408,25 @@ 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(GetHdcOf(dc.GetTempHDC()), &r, DFC_SCROLL, style);

 }
 
 void
 }
 
 void

-wxRendererMSW::DrawCheckBox(wxWindow * WXUNUSED(win),
-                            wxDC& dc,
-                            const wxRect& rect,
-                            int flags)
+wxRendererMSW::DoDrawFrameControl(UINT type,
+                                  UINT kind,
+                                  wxWindow * WXUNUSED(win),
+                                  wxDC& dc,
+                                  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_BUTTONCHECK;
+    int style = kind;

     if ( flags & wxCONTROL_CHECKED )
         style |= DFCS_CHECKED;
     if ( flags & wxCONTROL_DISABLED )
     if ( flags & wxCONTROL_CHECKED )
         style |= DFCS_CHECKED;
     if ( flags & wxCONTROL_DISABLED )


@@ -343,23 +437,22 @@ wxRendererMSW::DrawCheckBox(wxWindow * WXUNUSED(win),
         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(GraphicsHDC((wxMSWDCImpl*)dc.GetImpl()).HDC(), &r, DFC_BUTTON, style);
+    ::DrawFrameControl(GetHdcOf(dc.GetTempHDC()), &r, type, style);

 }
 
 void
 }
 
 void

-wxRendererMSW::DrawPushButton(wxWindow * WXUNUSED(win),
+wxRendererMSW::DrawPushButton(wxWindow *win,

                               wxDC& dc,
                               const wxRect& rectOrig,
                               int flags)
 {
     wxRect rect(rectOrig);
                               wxDC& dc,
                               const wxRect& rectOrig,
                               int flags)
 {
     wxRect rect(rectOrig);

-
-    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
     if ( flags & wxCONTROL_ISDEFAULT )
     {
         // DrawFrameControl() doesn't seem to support default buttons so we


@@ -370,21 +463,45 @@ wxRendererMSW::DrawPushButton(wxWindow * WXUNUSED(win),
         rect.Deflate(1);
     }
 
         rect.Deflate(1);
     }
 

-    RECT rc;
-    wxCopyRectToRECT(rect, rc);
-
-    ::DrawFrameControl(GraphicsHDC((wxMSWDCImpl*)dc.GetImpl()).HDC(), &rc, DFC_BUTTON, style);
+    DoDrawButton(DFCS_BUTTONPUSH, win, dc, rect, flags);

 }
 
 }
 

-void wxRendererMSW::DrawFocusRect(wxWindow * WXUNUSED(win),
+void
+wxRendererMSW::DrawTitleBarBitmap(wxWindow *win,

                                   wxDC& dc,
                                   const wxRect& rect,
                                   wxDC& dc,
                                   const wxRect& rect,

-                                  int WXUNUSED(flags))
+                                  wxTitleBarButton button,
+                                  int flags)

 {
 {

-    RECT rc;
-    wxCopyRectToRECT(rect, rc);
+    UINT kind;
+    switch ( button )
+    {
+        case wxTITLEBAR_BUTTON_CLOSE:
+            kind = DFCS_CAPTIONCLOSE;
+            break;
+
+        case wxTITLEBAR_BUTTON_MAXIMIZE:
+            kind = DFCS_CAPTIONMAX;
+            break;
+
+        case wxTITLEBAR_BUTTON_ICONIZE:
+            kind = DFCS_CAPTIONMIN;
+            break;
+
+        case wxTITLEBAR_BUTTON_RESTORE:
+            kind = DFCS_CAPTIONRESTORE;
+            break;

 
 

-    ::DrawFocusRect(GraphicsHDC((wxMSWDCImpl*)dc.GetImpl()).HDC(), &rc);
+        case wxTITLEBAR_BUTTON_HELP:
+            kind = DFCS_CAPTIONHELP;
+            break;
+
+        default:
+            wxFAIL_MSG( "unsupported title bar button" );
+            return;
+    }
+
+    DoDrawFrameControl(DFC_CAPTION, kind, win, dc, rect, flags);

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


@@ -416,13 +533,18 @@ 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)
 {
     wxColour fill;
     wxColour bdr;
     COLORREF cref;
 // 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)
 #if wxUSE_UXTHEME
     wxUxThemeHandle hTheme(win, L"EDIT");
     if (hTheme)


@@ -436,10 +558,10 @@ void wxRendererMSW::DrawTextCtrl(wxWindow* win, wxDC& dc, const wxRect& rect, in
             etsState = ETS_DISABLED;
         else
             etsState = ETS_NORMAL;
             etsState = ETS_DISABLED;
         else
             etsState = ETS_NORMAL;

-        
+

         wxUxThemeEngine::Get()->GetThemeColor(hTheme, EP_EDITTEXT,
                                               etsState, TMT_BORDERCOLOR, &cref);
         wxUxThemeEngine::Get()->GetThemeColor(hTheme, EP_EDITTEXT,
                                               etsState, TMT_BORDERCOLOR, &cref);

-        bdr = wxRGBToColour(cref);        
+        bdr = wxRGBToColour(cref);

     }
     else
 #endif
     }
     else
 #endif


@@ -447,19 +569,19 @@ void wxRendererMSW::DrawTextCtrl(wxWindow* win, wxDC& dc, const wxRect& rect, in
         fill = wxSystemSettings::GetColour(wxSYS_COLOUR_WINDOW);
         bdr = *wxBLACK;
     }
         fill = wxSystemSettings::GetColour(wxSYS_COLOUR_WINDOW);
         bdr = *wxBLACK;
     }

-    
+

     dc.SetPen( bdr );
     dc.SetBrush( fill );
     dc.DrawRectangle(rect);
 }
 
 
     dc.SetPen( bdr );
     dc.SetBrush( fill );
     dc.DrawRectangle(rect);
 }
 
 

-// Draw the equivallent of a wxComboBox
+// Draw the equivalent 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
 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);    
-    
+    DrawTextCtrl(win, dc, rect, flags);
+

     // Draw the button inside the border, on the right side
     wxRect br(rect);
     br.height -= 2;
     // Draw the button inside the border, on the right side
     wxRect br(rect);
     br.height -= 2;


@@ -477,51 +599,6 @@ void wxRendererMSW::DrawChoice(wxWindow* win, wxDC& dc,
     DrawComboBox(win, dc, rect, 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);
-
-    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).HDC(),
-                                BP_RADIOBUTTON,
-                                state,
-                                &r,
-                                NULL
-                            );
-#endif
-}
-

 // ============================================================================
 // wxRendererXP implementation
 // ============================================================================
 // ============================================================================
 // wxRendererXP implementation
 // ============================================================================


@@ -552,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 )


@@ -568,7 +649,7 @@ wxRendererXP::DrawComboBoxDropButton(wxWindow * win,
     wxUxThemeEngine::Get()->DrawThemeBackground
                             (
                                 hTheme,
     wxUxThemeEngine::Get()->DrawThemeBackground
                             (
                                 hTheme,

-                                GetHdcOf(*((wxMSWDCImpl*)dc.GetImpl())),
+                                GetHdcOf(dc.GetTempHDC()),

                                 CP_DROPDOWNBUTTON,
                                 state,
                                 &r,
                                 CP_DROPDOWNBUTTON,
                                 state,
                                 &r,


@@ -591,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 )


@@ -604,7 +689,7 @@ wxRendererXP::DrawHeaderButton(wxWindow *win,
     wxUxThemeEngine::Get()->DrawThemeBackground
                             (
                                 hTheme,
     wxUxThemeEngine::Get()->DrawThemeBackground
                             (
                                 hTheme,

-                                GetHdcOf(*((wxMSWDCImpl*)dc.GetImpl())),
+                                GetHdcOf(dc.GetTempHDC()),

                                 HP_HEADERITEM,
                                 state,
                                 &r,
                                 HP_HEADERITEM,
                                 state,
                                 &r,


@@ -633,14 +718,18 @@ 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
                             (
                                 hTheme,
 
     int state = flags & wxCONTROL_EXPANDED ? GLPS_OPENED : GLPS_CLOSED;
     wxUxThemeEngine::Get()->DrawThemeBackground
                             (
                                 hTheme,

-                                GetHdcOf(*((wxMSWDCImpl*)dc.GetImpl())),
+                                GetHdcOf(dc.GetTempHDC()),

                                 TVP_GLYPH,
                                 state,
                                 &r,
                                 TVP_GLYPH,
                                 state,
                                 &r,


@@ -648,52 +737,73 @@ wxRendererXP::DrawTreeItemButton(wxWindow *win,
                             );
 }
 
                             );
 }
 

+bool
+wxRendererXP::DoDrawXPButton(int kind,
+                             wxWindow *win,
+                             wxDC& dc,
+                             const wxRect& rect,
+                             int flags)
+{
+    wxUxThemeHandle hTheme(win, L"BUTTON");
+    if ( !hTheme )
+        return false;
+
+    DoDrawButtonLike(hTheme, kind, dc, rect, flags);

 
 

+    return true;
+}

 
 void
 
 void

-wxRendererXP::DrawCheckBox(wxWindow *win,
-                           wxDC& dc,
-                           const wxRect& rect,
-                           int flags)
+wxRendererXP::DoDrawButtonLike(HTHEME htheme,
+                               int part,
+                               wxDC& dc,
+                               const wxRect& rect,
+                               int flags)

 {
 {

-    wxUxThemeHandle hTheme(win, L"BUTTON");
-    if ( !hTheme )
-    {
-        m_rendererNative.DrawCheckBox(win, dc, rect, flags);
-        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_CHECKED )
-        state = CBS_CHECKEDNORMAL;
-    else if ( flags & wxCONTROL_UNDETERMINED )
-        state = CBS_MIXEDNORMAL;
-    else
-        state = CBS_UNCHECKEDNORMAL;
+    // the base state is always 1, whether it is PBS_NORMAL,
+    // {CBS,RBS}_UNCHECKEDNORMAL or CBS_NORMAL
+    int state = 1;

 
 

-    // CBS_XXX is followed by CBX_XXXHOT, then CBS_XXXPRESSED and DISABLED
+    // XBS_XXX is followed by XBX_XXXHOT, then XBS_XXXPRESSED and DISABLED

     enum
     {
     enum
     {

-        CBS_HOT_OFFSET = 1,
-        CBS_PRESSED_OFFSET = 2,
-        CBS_DISABLED_OFFSET = 3
+        NORMAL_OFFSET,
+        HOT_OFFSET,
+        PRESSED_OFFSET,
+        DISABLED_OFFSET,
+        STATES_COUNT

     };
 
     };
 

+    // in both RBS_ and CBS_ enums CHECKED elements are offset by 4 from base
+    // (UNCHECKED) ones and MIXED are offset by 4 again as there are all states
+    // from the above enum in between them
+    if ( flags & wxCONTROL_CHECKED )
+        state += STATES_COUNT;
+    else if ( flags & wxCONTROL_UNDETERMINED )
+        state += 2*STATES_COUNT;
+

     if ( flags & wxCONTROL_DISABLED )
     if ( flags & wxCONTROL_DISABLED )

-        state += CBS_DISABLED_OFFSET;
+        state += DISABLED_OFFSET;

     else if ( flags & wxCONTROL_PRESSED )
     else if ( flags & wxCONTROL_PRESSED )

-        state += CBS_PRESSED_OFFSET;
+        state += PRESSED_OFFSET;

     else if ( flags & wxCONTROL_CURRENT )
     else if ( flags & wxCONTROL_CURRENT )

-        state += CBS_HOT_OFFSET;
+        state += HOT_OFFSET;
+    // wxCONTROL_ISDEFAULT flag is only valid for push buttons
+    else if ( part == BP_PUSHBUTTON && (flags & wxCONTROL_ISDEFAULT) )
+        state = PBS_DEFAULTED;

 
     wxUxThemeEngine::Get()->DrawThemeBackground
                             (
 
     wxUxThemeEngine::Get()->DrawThemeBackground
                             (

-                                hTheme,
-                                GetHdcOf(*((wxMSWDCImpl*)dc.GetImpl())),
-                                BP_CHECKBOX,
+                                htheme,
+                                GetHdcOf(dc.GetTempHDC()),
+                                part,

                                 state,
                                 &r,
                                 NULL
                                 state,
                                 &r,
                                 NULL


@@ -701,76 +811,49 @@ wxRendererXP::DrawCheckBox(wxWindow *win,
 }
 
 void
 }
 
 void

-wxRendererXP::DrawPushButton(wxWindow * win,
-                             wxDC& dc,
-                             const wxRect& rect,
-                             int flags)
+wxRendererXP::DrawTitleBarBitmap(wxWindow *win,
+                                 wxDC& dc,
+                                 const wxRect& rect,
+                                 wxTitleBarButton button,
+                                 int flags)

 {
 {

-    wxUxThemeHandle hTheme(win, L"BUTTON");
+    wxUxThemeHandle hTheme(win, L"WINDOW");

     if ( !hTheme )
     {
     if ( !hTheme )
     {

-        m_rendererNative.DrawPushButton(win, dc, rect, flags);
+        m_rendererNative.DrawTitleBarBitmap(win, dc, rect, button, flags);

         return;
     }
 
         return;
     }
 

-    RECT r;
-    wxCopyRectToRECT(rect, r);
+    int part;
+    switch ( button )
+    {
+        case wxTITLEBAR_BUTTON_CLOSE:
+            part = WP_CLOSEBUTTON;
+            break;

 
 

-    int state;
-    if ( flags & wxCONTROL_PRESSED )
-        state = PBS_PRESSED;
-    else if ( flags & wxCONTROL_CURRENT )
-        state = PBS_HOT;
-    else if ( flags & wxCONTROL_DISABLED )
-        state = PBS_DISABLED;
-    else if ( flags & wxCONTROL_ISDEFAULT )
-        state = PBS_DEFAULTED;
-    else
-        state = PBS_NORMAL;
+        case wxTITLEBAR_BUTTON_MAXIMIZE:
+            part = WP_MAXBUTTON;
+            break;

 
 

-    wxUxThemeEngine::Get()->DrawThemeBackground
-                            (
-                                hTheme,
-                                GetHdcOf(*((wxMSWDCImpl*)dc.GetImpl())),
-                                BP_PUSHBUTTON,
-                                state,
-                                &r,
-                                NULL
-                            );
-}
+        case wxTITLEBAR_BUTTON_ICONIZE:
+            part = WP_MINBUTTON;
+            break;

 
 

-void
-wxRendererXP::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 );
+        case wxTITLEBAR_BUTTON_RESTORE:
+            part = WP_RESTOREBUTTON;
+            break;

 
 

-    if ((flags & wxCONTROL_FOCUSED) && (flags & wxCONTROL_CURRENT))
-        DrawFocusRect( win, dc, rect, flags );
-}
+        case wxTITLEBAR_BUTTON_HELP:
+            part = WP_HELPBUTTON;
+            break;

 
 

+        default:
+            wxFAIL_MSG( "unsupported title bar button" );
+            return;
+    }

 
 

+    DoDrawButtonLike(hTheme, part, dc, rect, flags);
+}

 
 // ----------------------------------------------------------------------------
 // splitter drawing
 
 // ----------------------------------------------------------------------------
 // splitter drawing