]> git.saurik.com Git - wxWidgets.git/blobdiff - src/msw/renderer.cpp
added vendor display name (for consistency with app display name &c) (patch 1831303)
[wxWidgets.git] / src / msw / renderer.cpp
index 4763dfe7bdec6d4f1c9319a2e27f750961148302..285dfabbd1bd279532724b7e97f770abb0eb4f6b 100644 (file)
@@ -1,5 +1,5 @@
 ///////////////////////////////////////////////////////////////////////////////
-// Name:        msw/renderer.cpp
+// Name:        src/msw/renderer.cpp
 // Purpose:     implementation of wxRendererNative for Windows
 // Author:      Vadim Zeitlin
 // Modified by:
     #include "wx/string.h"
     #include "wx/window.h"
     #include "wx/dc.h"
+    #include "wx/settings.h"
 #endif //WX_PRECOMP
 
+#include "wx/scopeguard.h"
 #include "wx/splitter.h"
 #include "wx/renderer.h"
-#include "wx/settings.h"
-#include "wx/msw/uxtheme.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
 #ifndef CP_DROPDOWNBUTTON
+    #define BP_PUSHBUTTON      1
     #define BP_CHECKBOX        3
     #define CBS_UNCHECKEDNORMAL 1
     #define CBS_CHECKEDNORMAL   (CBS_UNCHECKEDNORMAL + 4)
     #define CBS_MIXEDNORMAL     (CBS_CHECKEDNORMAL + 4)
 
+    #define PBS_NORMAL          1
+    #define PBS_HOT             2
+    #define PBS_PRESSED         3
+    #define PBS_DISABLED        4
+    #define PBS_DEFAULTED       5
+
     #define CP_DROPDOWNBUTTON  1
 
     #define CBXS_NORMAL        1
     #define HIS_NORMAL          1
     #define HIS_HOT             2
     #define HIS_PRESSED         3
+
+    #define TMT_HEIGHT          2417
+
+    #define HP_HEADERSORTARROW  4
+    #define HSAS_SORTEDUP       1
+    #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
 
 // ----------------------------------------------------------------------------
@@ -83,6 +106,23 @@ public:
                                         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 DrawFocusRect(wxWindow* win,
+                               wxDC& dc,
+                               const wxRect& rect,
+                               int flags = 0);
+
+    virtual int GetHeaderButtonHeight(wxWindow *win);
+
 private:
     DECLARE_NO_COPY_CLASS(wxRendererMSW)
 };
@@ -100,10 +140,13 @@ public:
 
     static wxRendererNative& Get();
 
-    virtual void DrawHeaderButton(wxWindow *win,
-                                    wxDC& dc,
-                                    const wxRect& rect,
-                                    int flags = 0);
+    virtual int DrawHeaderButton(wxWindow *win,
+                                  wxDC& dc,
+                                  const wxRect& rect,
+                                  int flags = 0,
+                                  wxHeaderSortIconType sortArrow = wxHDR_SORT_ICON_NONE,
+                                  wxHeaderButtonParams* params = NULL);
+
     virtual void DrawTreeItemButton(wxWindow *win,
                                     wxDC& dc,
                                     const wxRect& rect,
@@ -122,10 +165,21 @@ public:
                                         wxDC& dc,
                                         const wxRect& rect,
                                         int flags = 0);
-    virtual void DrawCheckButton(wxWindow *win,
-                                 wxDC& dc,
-                                 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 DrawItemSelectionRect(wxWindow *win,
+                                       wxDC& dc,
+                                       const wxRect& rect,
+                                       int flags = 0 );
+
 
     virtual wxSplitterRenderParams GetSplitterParams(const wxWindow *win);
 private:
@@ -165,10 +219,7 @@ wxRendererMSW::DrawComboBoxDropButton(wxWindow * WXUNUSED(win),
                                       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 )
@@ -179,6 +230,93 @@ wxRendererMSW::DrawComboBoxDropButton(wxWindow * WXUNUSED(win),
     ::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,
+                              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
+        // 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(GetHdcOf(dc), &rc, DFC_BUTTON, style);
+}
+
+void wxRendererMSW::DrawFocusRect(wxWindow * WXUNUSED(win),
+                                  wxDC& dc,
+                                  const wxRect& rect,
+                                  int WXUNUSED(flags))
+{
+    RECT rc;
+    wxCopyRectToRECT(rect, rc);
+
+    ::DrawFocusRect(GetHdcOf(dc), &rc);
+}
+
+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;
+}
+
 // ============================================================================
 // wxRendererXP implementation
 // ============================================================================
@@ -234,17 +372,18 @@ wxRendererXP::DrawComboBoxDropButton(wxWindow * win,
 
 }
 
-void
+int
 wxRendererXP::DrawHeaderButton(wxWindow *win,
                                wxDC& dc,
                                const wxRect& rect,
-                               int flags)
+                               int flags,
+                               wxHeaderSortIconType sortArrow,
+                               wxHeaderButtonParams* params)
 {
     wxUxThemeHandle hTheme(win, L"HEADER");
     if ( !hTheme )
     {
-        m_rendererNative.DrawHeaderButton(win, dc, rect, flags);
-        return;
+        return m_rendererNative.DrawHeaderButton(win, dc, rect, flags, sortArrow, params);
     }
 
     RECT r;
@@ -266,8 +405,16 @@ wxRendererXP::DrawHeaderButton(wxWindow *win,
                                 &r,
                                 NULL
                             );
+
+    // 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
+    return DrawHeaderButtonContents(win, dc, rect, flags, sortArrow, params);
 }
 
+
 void
 wxRendererXP::DrawTreeItemButton(wxWindow *win,
                                  wxDC& dc,
@@ -297,15 +444,15 @@ wxRendererXP::DrawTreeItemButton(wxWindow *win,
 }
 
 void
-wxRendererXP::DrawCheckButton(wxWindow *win,
-                              wxDC& dc,
-                              const wxRect& rect,
-                              int flags)
+wxRendererXP::DrawCheckBox(wxWindow *win,
+                           wxDC& dc,
+                           const wxRect& rect,
+                           int flags)
 {
     wxUxThemeHandle hTheme(win, L"BUTTON");
     if ( !hTheme )
     {
-        m_rendererNative.DrawCheckButton(win, dc, rect, flags);
+        m_rendererNative.DrawCheckBox(win, dc, rect, flags);
         return;
     }
 
@@ -320,13 +467,20 @@ wxRendererXP::DrawCheckButton(wxWindow *win,
     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 )
-        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
                             (
@@ -339,6 +493,79 @@ wxRendererXP::DrawCheckButton(wxWindow *win,
                             );
 }
 
+void
+wxRendererXP::DrawPushButton(wxWindow * win,
+                             wxDC& dc,
+                             const wxRect& rect,
+                             int flags)
+{
+    wxUxThemeHandle hTheme(win, L"BUTTON");
+    if ( !hTheme )
+    {
+        m_rendererNative.DrawPushButton(win, dc, rect, flags);
+        return;
+    }
+
+    RECT r;
+    wxCopyRectToRECT(rect, r);
+
+    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;
+
+    wxUxThemeEngine::Get()->DrawThemeBackground
+                            (
+                                hTheme,
+                                GetHdcOf(dc),
+                                BP_PUSHBUTTON,
+                                state,
+                                &r,
+                                NULL
+                            );
+
+}
+
+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 );
+    
+    if ((flags & wxCONTROL_FOCUSED) && (flags & wxCONTROL_CURRENT))
+        DrawFocusRect( win, dc, rect, flags );
+}
+
+
+
 // ----------------------------------------------------------------------------
 // splitter drawing
 // ----------------------------------------------------------------------------
@@ -395,4 +622,3 @@ wxRendererXP::DrawSplitterSash(wxWindow *win,
 }
 
 #endif // wxUSE_UXTHEME
-