X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/9f93b45e59e93e17850bbc37a8960240072bc1c0..528a5e8f92e938407ee2c33b29e519af064e6608:/src/msw/renderer.cpp diff --git a/src/msw/renderer.cpp b/src/msw/renderer.cpp index 4763dfe7bd..e63c25ad8d 100644 --- 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: @@ -28,22 +28,29 @@ #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" -#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 @@ -61,6 +68,12 @@ #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) @@ -83,6 +96,11 @@ public: 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) }; @@ -101,9 +119,13 @@ public: 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, @@ -122,10 +144,15 @@ 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 wxSplitterRenderParams GetSplitterParams(const wxWindow *win); private: @@ -179,6 +206,35 @@ wxRendererMSW::DrawComboBoxDropButton(wxWindow * WXUNUSED(win), ::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 // ============================================================================ @@ -238,12 +294,14 @@ void 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); + m_rendererNative.DrawHeaderButton(win, dc, rect, flags, sortArrow, params); return; } @@ -266,8 +324,41 @@ 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 + 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, @@ -297,15 +388,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; } @@ -339,6 +430,46 @@ 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 + ); + +} + // ---------------------------------------------------------------------------- // splitter drawing // ---------------------------------------------------------------------------- @@ -395,4 +526,3 @@ wxRendererXP::DrawSplitterSash(wxWindow *win, } #endif // wxUSE_UXTHEME -