use built in VC8 time functions instead of our (almost certainly broken) ones for...

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

diff --git a/src/msw/renderer.cpp b/src/msw/renderer.cpp
index eb278ab3c20c88531ee0bd8d2cdc0d4cab97f4c1..e63c25ad8de706f76345fea4974aea83aa9b60ef 100644 (file)
--- a/src/msw/renderer.cpp
+++ b/src/msw/renderer.cpp
@@ -1,5 +1,5 @@
 ///////////////////////////////////////////////////////////////////////////////
 ///////////////////////////////////////////////////////////////////////////////

-// Name:        msw/renderer.cpp
+// Name:        src/msw/renderer.cpp

 // Purpose:     implementation of wxRendererNative for Windows
 // Author:      Vadim Zeitlin
 // Modified by:
 // Purpose:     implementation of wxRendererNative for Windows
 // Author:      Vadim Zeitlin
 // Modified by:


@@ -28,23 +28,56 @@
     #include "wx/string.h"
     #include "wx/window.h"
     #include "wx/dc.h"
     #include "wx/string.h"
     #include "wx/window.h"
     #include "wx/dc.h"

+    #include "wx/settings.h"

 #endif //WX_PRECOMP
 
 #include "wx/splitter.h"
 #include "wx/renderer.h"
 #endif //WX_PRECOMP
 
 #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/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
 
 // 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 CBXS_HOT           2
     #define CBXS_PRESSED       3
     #define CBXS_DISABLED      4
     #define CP_DROPDOWNBUTTON  1
 
     #define CBXS_NORMAL        1
     #define CBXS_HOT           2
     #define CBXS_PRESSED       3
     #define CBXS_DISABLED      4

+
+    #define TVP_GLYPH           2
+
+    #define GLPS_CLOSED         1
+    #define GLPS_OPENED         2
+
+    #define HP_HEADERITEM       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

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


@@ -63,6 +96,11 @@ public:
                                         const wxRect& rect,
                                         int flags = 0);
 
                                         const wxRect& rect,
                                         int flags = 0);
 

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

 private:
     DECLARE_NO_COPY_CLASS(wxRendererMSW)
 };
 private:
     DECLARE_NO_COPY_CLASS(wxRendererMSW)
 };


@@ -80,6 +118,18 @@ public:
 
     static wxRendererNative& Get();
 
 
     static wxRendererNative& Get();
 

+    virtual void 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);
+    
+    virtual void DrawTreeItemButton(wxWindow *win,
+                                    wxDC& dc,
+                                    const wxRect& rect,
+                                    int flags = 0);

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


@@ -90,13 +140,21 @@ public:
                                   wxCoord position,
                                   wxOrientation orient,
                                   int flags = 0);
                                   wxCoord position,
                                   wxOrientation orient,
                                   int flags = 0);

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

     virtual void DrawComboBoxDropButton(wxWindow *win,
                                         wxDC& dc,
                                         const wxRect& rect,
                                         int flags = 0);
     virtual void DrawComboBoxDropButton(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 wxSplitterRenderParams GetSplitterParams(const wxWindow *win);

 private:
     DECLARE_NO_COPY_CLASS(wxRendererXP)
 };
 private:
     DECLARE_NO_COPY_CLASS(wxRendererXP)
 };


@@ -127,10 +185,6 @@ wxRendererNative& wxRendererMSW::Get()
     return s_rendererMSW;
 }
 
     return s_rendererMSW;
 }
 

-#if defined(__WXWINCE__) && !defined(DFCS_FLAT)
-#define DFCS_FLAT 0
-#endif
-

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


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

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


@@ -176,35 +259,215 @@ wxRendererXP::DrawComboBoxDropButton(wxWindow * win,
                                       int flags)
 {
     wxUxThemeHandle hTheme(win, L"COMBOBOX");
                                       int flags)
 {
     wxUxThemeHandle hTheme(win, L"COMBOBOX");

-    if ( hTheme )
+    if ( !hTheme )

     {
     {

-        RECT r;
-        r.left = rect.x;
-        r.top = rect.y;
-        r.right = rect.x + rect.width;
-        r.bottom = rect.y + rect.height;
-
-        int state;
-        if ( flags & wxCONTROL_PRESSED )
-            state = CBXS_PRESSED;
-        else if ( flags & wxCONTROL_CURRENT )
-            state = CBXS_HOT;
-        else if ( flags & wxCONTROL_DISABLED )
-            state = CBXS_DISABLED;
-        else
-            state = CBXS_NORMAL;
-
-        wxUxThemeEngine::Get()->DrawThemeBackground
-                                (
-                                    hTheme,
-                                    (HDC) dc.GetHDC(),
-                                    CP_DROPDOWNBUTTON,
-                                    state,
-                                    &r,
-                                    NULL
-                                );
+        m_rendererNative.DrawComboBoxDropButton(win, dc, rect, flags);
+        return;
+    }
+
+    RECT r;
+    wxCopyRectToRECT(rect, r);
+
+    int state;
+    if ( flags & wxCONTROL_PRESSED )
+        state = CBXS_PRESSED;
+    else if ( flags & wxCONTROL_CURRENT )
+        state = CBXS_HOT;
+    else if ( flags & wxCONTROL_DISABLED )
+        state = CBXS_DISABLED;
+    else
+        state = CBXS_NORMAL;
+
+    wxUxThemeEngine::Get()->DrawThemeBackground
+                            (
+                                hTheme,
+                                GetHdcOf(dc),
+                                CP_DROPDOWNBUTTON,
+                                state,
+                                &r,
+                                NULL
+                            );

 
 

+}
+
+void
+wxRendererXP::DrawHeaderButton(wxWindow *win,
+                               wxDC& dc,
+                               const wxRect& rect,
+                               int flags,
+                               wxHeaderSortIconType sortArrow,
+                               wxHeaderButtonParams* params)
+{
+    wxUxThemeHandle hTheme(win, L"HEADER");
+    if ( !hTheme )
+    {
+        m_rendererNative.DrawHeaderButton(win, dc, rect, flags, sortArrow, params);
+        return;
+    }
+
+    RECT r;
+    wxCopyRectToRECT(rect, r);
+
+    int state;
+    if ( flags & wxCONTROL_PRESSED )
+        state = HIS_PRESSED;
+    else if ( flags & wxCONTROL_CURRENT )
+        state = HIS_HOT;
+    else
+        state = HIS_NORMAL;
+    wxUxThemeEngine::Get()->DrawThemeBackground
+                            (
+                                hTheme,
+                                GetHdcOf(dc),
+                                HP_HEADERITEM,
+                                state,
+                                &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
+    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;
+}
+
+
+void
+wxRendererXP::DrawTreeItemButton(wxWindow *win,
+                                 wxDC& dc,
+                                 const wxRect& rect,
+                                 int flags)
+{
+    wxUxThemeHandle hTheme(win, L"TREEVIEW");
+    if ( !hTheme )
+    {
+        m_rendererNative.DrawTreeItemButton(win, dc, rect, flags);
+        return;

     }
     }

+
+    RECT r;
+    wxCopyRectToRECT(rect, r);
+
+    int state = flags & wxCONTROL_EXPANDED ? GLPS_OPENED : GLPS_CLOSED;
+    wxUxThemeEngine::Get()->DrawThemeBackground
+                            (
+                                hTheme,
+                                GetHdcOf(dc),
+                                TVP_GLYPH,
+                                state,
+                                &r,
+                                NULL
+                            );
+}
+
+void
+wxRendererXP::DrawCheckBox(wxWindow *win,
+                           wxDC& dc,
+                           const wxRect& rect,
+                           int flags)
+{
+    wxUxThemeHandle hTheme(win, L"BUTTON");
+    if ( !hTheme )
+    {
+        m_rendererNative.DrawCheckBox(win, dc, rect, flags);
+        return;
+    }
+
+    RECT r;
+    wxCopyRectToRECT(rect, r);
+
+    int state;
+    if ( flags & wxCONTROL_CHECKED )
+        state = CBS_CHECKEDNORMAL;
+    else if ( flags & wxCONTROL_UNDETERMINED )
+        state = CBS_MIXEDNORMAL;
+    else
+        state = CBS_UNCHECKEDNORMAL;
+
+    // CBS_XXX is followed by CBX_XXXGOT, then CBS_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,
+                                GetHdcOf(dc),
+                                BP_CHECKBOX,
+                                state,
+                                &r,
+                                NULL
+                            );
+}
+
+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
+                            );
+

 }
 
 // ----------------------------------------------------------------------------
 }
 
 // ----------------------------------------------------------------------------


@@ -217,7 +480,7 @@ static const wxCoord SASH_WIDTH = 4;
 wxSplitterRenderParams
 wxRendererXP::GetSplitterParams(const wxWindow * win)
 {
 wxSplitterRenderParams
 wxRendererXP::GetSplitterParams(const wxWindow * win)
 {

-    if (win->GetWindowStyle() & wxSP_NO_XP_THEME)
+    if ( win->HasFlag(wxSP_NO_XP_THEME) )

         return m_rendererNative.GetSplitterParams(win);
     else
         return wxSplitterRenderParams(SASH_WIDTH, 0, false);
         return m_rendererNative.GetSplitterParams(win);
     else
         return wxSplitterRenderParams(SASH_WIDTH, 0, false);


@@ -229,7 +492,7 @@ wxRendererXP::DrawSplitterBorder(wxWindow * win,
                                  const wxRect& rect,
                                  int flags)
 {
                                  const wxRect& rect,
                                  int flags)
 {

-    if (win->GetWindowStyle() & wxSP_NO_XP_THEME)
+    if ( win->HasFlag(wxSP_NO_XP_THEME) )

     {
         m_rendererNative.DrawSplitterBorder(win, dc, rect, flags);
     }
     {
         m_rendererNative.DrawSplitterBorder(win, dc, rect, flags);
     }


@@ -263,4 +526,3 @@ wxRendererXP::DrawSplitterSash(wxWindow *win,
 }
 
 #endif // wxUSE_UXTHEME
 }
 
 #endif // wxUSE_UXTHEME

-