switching to newer API

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

diff --git a/src/msw/renderer.cpp b/src/msw/renderer.cpp
index 25f91fc306f8f8640b455150f0499873a79256ae..b9018a7fd20f83efc2c58601c8ed84bfe9f03a71 100644 (file)
--- a/src/msw/renderer.cpp
+++ b/src/msw/renderer.cpp
@@ -28,11 +28,11 @@
     #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/uxtheme.h"
 #include "wx/msw/private.h"
 


@@ -68,6 +68,12 @@
     #define HIS_NORMAL          1
     #define HIS_HOT             2
     #define HIS_PRESSED         3
     #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)
 #endif
 
 #if defined(__WXWINCE__) && !defined(DFCS_FLAT)


@@ -113,9 +119,13 @@ public:
     static wxRendererNative& Get();
 
     virtual void DrawHeaderButton(wxWindow *win,
     static wxRendererNative& Get();
 
     virtual void 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);
+    

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


@@ -199,22 +209,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);

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


@@ -276,12 +294,14 @@ void
 wxRendererXP::DrawHeaderButton(wxWindow *win,
                                wxDC& dc,
                                const wxRect& rect,
 wxRendererXP::DrawHeaderButton(wxWindow *win,
                                wxDC& dc,
                                const wxRect& rect,

-                               int flags)
+                               int flags,
+                               wxHeaderSortIconType sortArrow,
+                               wxHeaderButtonParams* params)

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

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

         return;
     }
 
         return;
     }
 


@@ -304,8 +324,41 @@ wxRendererXP::DrawHeaderButton(wxWindow *win,
                                 &r,
                                 NULL
                             );
                                 &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,
 void
 wxRendererXP::DrawTreeItemButton(wxWindow *win,
                                  wxDC& dc,