compilation fix after last change

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

diff --git a/src/msw/renderer.cpp b/src/msw/renderer.cpp
index 15f86caaa3aa5a4a47e11f6608d2f9a00e286ea0..b820b38bb8ce1ef0d0887a26b51407362ae14612 100644 (file)
--- a/src/msw/renderer.cpp
+++ b/src/msw/renderer.cpp
@@ -33,8 +33,8 @@
 
 #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/uxtheme.h"

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


@@ -118,13 +118,14 @@ public:
 
     static wxRendererNative& Get();
 
 
     static wxRendererNative& Get();
 

-    virtual void DrawHeaderButton(wxWindow *win,
+    virtual int DrawHeaderButton(wxWindow *win,

                                   wxDC& dc,
                                   const wxRect& rect,
                                   int flags = 0,
                                   wxDC& dc,
                                   const wxRect& rect,
                                   int flags = 0,

+                                  wxHeaderSortIconType sortArrow = wxHDR_SORT_ICON_NONE,

                                   wxHeaderButtonParams* params = NULL);
     virtual int GetHeaderButtonHeight(wxWindow *win);
                                   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,


@@ -153,6 +154,12 @@ public:
                                 const wxRect& rect,
                                 int flags = 0);
 
                                 const wxRect& rect,
                                 int flags = 0);
 

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

     virtual wxSplitterRenderParams GetSplitterParams(const wxWindow *win);
 private:
     DECLARE_NO_COPY_CLASS(wxRendererXP)
     virtual wxSplitterRenderParams GetSplitterParams(const wxWindow *win);
 private:
     DECLARE_NO_COPY_CLASS(wxRendererXP)


@@ -208,22 +215,30 @@ wxRendererMSW::DrawComboBoxDropButton(wxWindow * WXUNUSED(win),
 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);
+    }

 
 

-    ::DrawFrameControl(GetHdcOf(dc), &r, DFC_BUTTON, style);
+    RECT rc;
+    wxCopyRectToRECT(rect, rc);
+
+    ::DrawFrameControl(GetHdcOf(dc), &rc, DFC_BUTTON, style);

 }
 
 // ============================================================================
 }
 
 // ============================================================================


@@ -281,18 +296,18 @@ wxRendererXP::DrawComboBoxDropButton(wxWindow * win,
 
 }
 
 
 }
 

-void
+int

 wxRendererXP::DrawHeaderButton(wxWindow *win,
                                wxDC& dc,
                                const wxRect& rect,
                                int flags,
 wxRendererXP::DrawHeaderButton(wxWindow *win,
                                wxDC& dc,
                                const wxRect& rect,
                                int flags,

+                               wxHeaderSortIconType sortArrow,

                                wxHeaderButtonParams* params)
 {
     wxUxThemeHandle hTheme(win, L"HEADER");
     if ( !hTheme )
     {
                                wxHeaderButtonParams* params)
 {
     wxUxThemeHandle hTheme(win, L"HEADER");
     if ( !hTheme )
     {

-        m_rendererNative.DrawHeaderButton(win, dc, rect, flags, params);
-        return;
+        return m_rendererNative.DrawHeaderButton(win, dc, rect, flags, sortArrow, params);

     }
 
     RECT r;
     }
 
     RECT r;


@@ -318,9 +333,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
     // Add any extras that are specified in flags and params

-    DrawHeaderButtonContents(win, dc, rect, flags, params);
+    return DrawHeaderButtonContents(win, dc, rect, flags, sortArrow, params);

 }
 
 
 }
 
 


@@ -332,10 +347,10 @@ wxRendererXP::GetHeaderButtonHeight(wxWindow *win)
     {
         return m_rendererNative.GetHeaderButtonHeight(win);
     }
     {
         return m_rendererNative.GetHeaderButtonHeight(win);
     }

-    
+

     HRESULT hr;
     int value = -1;
     HRESULT hr;
     int value = -1;

-    
+

     hr = wxUxThemeEngine::Get()->GetThemeMetric( hTheme,
                                                  NULL,
                                                  HP_HEADERITEM,
     hr = wxUxThemeEngine::Get()->GetThemeMetric( hTheme,
                                                  NULL,
                                                  HP_HEADERITEM,


@@ -460,6 +475,40 @@ wxRendererXP::DrawPushButton(wxWindow * win,
 
 }
 
 
 }
 

+void
+wxRendererXP::DrawItemSelectionRect(wxWindow * WXUNUSED(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_BTNSHADOW));
+        }
+    }
+    else // !selected
+    {
+        brush = *wxTRANSPARENT_BRUSH;
+    }
+
+    dc.SetBrush(brush);
+
+    // unlike for wxRendererGeneric, on windows we _never_ want to draw
+    // the outline of the rectangle:
+    dc.SetPen(*wxTRANSPARENT_PEN);
+
+    dc.DrawRectangle( rect );
+}
+
+
+

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