Fix up NSSlider code to not use class posing and instantiate the proper type (now...

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

diff --git a/src/msw/renderer.cpp b/src/msw/renderer.cpp
index 9a6fb82c73da803cf7a06b729e969a8b93709044..7961dc3184bb6cc0d248e180e21ff6cd39748af8 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


@@ -76,8 +76,17 @@
     #define HSAS_SORTEDDOWN     2
 #endif
 
     #define HSAS_SORTEDDOWN     2
 #endif
 

-#if defined(__WXWINCE__) && !defined(DFCS_FLAT)
-    #define DFCS_FLAT 0
+#if defined(__WXWINCE__)
+    #ifndef DFCS_FLAT
+        #define DFCS_FLAT 0
+    #endif
+    #ifndef DFCS_MONO
+        #define DFCS_MONO 0
+    #endif
+#endif
+
+#ifndef DFCS_HOT
+    #define DFCS_HOT 0x1000

 #endif
 
 // ----------------------------------------------------------------------------
 #endif
 
 // ----------------------------------------------------------------------------


@@ -96,6 +105,11 @@ 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,
     virtual void DrawPushButton(wxWindow *win,
                                 wxDC& dc,
                                 const wxRect& rect,


@@ -118,14 +132,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,
                                   wxHeaderSortIconType sortArrow = wxHDR_SORT_ICON_NONE,
                                   wxHeaderButtonParams* params = NULL);
     virtual int GetHeaderButtonHeight(wxWindow *win);
                                   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,


@@ -154,6 +168,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)


@@ -192,10 +212,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 )


@@ -206,6 +223,30 @@ wxRendererMSW::DrawComboBoxDropButton(wxWindow * WXUNUSED(win),
     ::DrawFrameControl(GetHdcOf(dc), &r, DFC_SCROLL, style);
 }
 
     ::DrawFrameControl(GetHdcOf(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(GetHdcOf(dc), &r, DFC_BUTTON, style);
+}
+

 void
 wxRendererMSW::DrawPushButton(wxWindow * WXUNUSED(win),
                               wxDC& dc,
 void
 wxRendererMSW::DrawPushButton(wxWindow * WXUNUSED(win),
                               wxDC& dc,


@@ -226,7 +267,7 @@ wxRendererMSW::DrawPushButton(wxWindow * WXUNUSED(win),
         wxDCPenChanger pen(dc, *wxBLACK_PEN);
         wxDCBrushChanger brush(dc, *wxTRANSPARENT_BRUSH);
         dc.DrawRectangle(rect);
         wxDCPenChanger pen(dc, *wxBLACK_PEN);
         wxDCBrushChanger brush(dc, *wxTRANSPARENT_BRUSH);
         dc.DrawRectangle(rect);

-        rect.Inflate(1);
+        rect.Deflate(1);

     }
 
     RECT rc;
     }
 
     RECT rc;


@@ -290,7 +331,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,


@@ -301,8 +342,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;


@@ -328,9 +368,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, sortArrow, params);
+    return DrawHeaderButtonContents(win, dc, rect, flags, sortArrow, params);

 }
 
 
 }
 
 


@@ -342,10 +382,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,


@@ -411,13 +451,20 @@ 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
                             (
 
     wxUxThemeEngine::Get()->DrawThemeBackground
                             (


@@ -470,6 +517,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
 // ----------------------------------------------------------------------------