X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/4614c8e52801a1565198f352fdfc26ef9d3e5e5c..9ccffa515ca1a12eff8a8a7c42cd160bc9aa75ba:/src/msw/renderer.cpp?ds=sidebyside diff --git a/src/msw/renderer.cpp b/src/msw/renderer.cpp index e63c25ad8d..5ffa82c1c5 100644 --- a/src/msw/renderer.cpp +++ b/src/msw/renderer.cpp @@ -31,9 +31,11 @@ #include "wx/settings.h" #endif //WX_PRECOMP +#include "wx/scopeguard.h" #include "wx/splitter.h" #include "wx/renderer.h" #include "wx/msw/private.h" +#include "wx/msw/dc.h" #include "wx/msw/uxtheme.h" // tmschema.h is in Win32 Platform SDK and might not be available with earlier @@ -76,8 +78,17 @@ #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 // ---------------------------------------------------------------------------- @@ -96,11 +107,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) }; @@ -118,14 +141,13 @@ public: 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); - + virtual void DrawTreeItemButton(wxWindow *win, wxDC& dc, const wxRect& rect, @@ -154,6 +176,12 @@ public: 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) @@ -192,10 +220,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 ) @@ -203,7 +228,31 @@ wxRendererMSW::DrawComboBoxDropButton(wxWindow * WXUNUSED(win), if ( flags & wxCONTROL_PRESSED ) style |= DFCS_PUSHED | DFCS_FLAT; - ::DrawFrameControl(GetHdcOf(dc), &r, DFC_SCROLL, style); + ::DrawFrameControl(GetHdcOf(*((wxMSWDCImpl*)dc.GetImpl())), &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(*((wxMSWDCImpl*)dc.GetImpl())), &r, DFC_BUTTON, style); } void @@ -232,7 +281,41 @@ wxRendererMSW::DrawPushButton(wxWindow * WXUNUSED(win), RECT rc; wxCopyRectToRECT(rect, rc); - ::DrawFrameControl(GetHdcOf(dc), &rc, DFC_BUTTON, style); + ::DrawFrameControl(GetHdcOf(*((wxMSWDCImpl*)dc.GetImpl())), &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(*((wxMSWDCImpl*)dc.GetImpl())), &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; } // ============================================================================ @@ -281,7 +364,7 @@ wxRendererXP::DrawComboBoxDropButton(wxWindow * win, wxUxThemeEngine::Get()->DrawThemeBackground ( hTheme, - GetHdcOf(dc), + GetHdcOf(*((wxMSWDCImpl*)dc.GetImpl())), CP_DROPDOWNBUTTON, state, &r, @@ -290,7 +373,7 @@ wxRendererXP::DrawComboBoxDropButton(wxWindow * win, } -void +int wxRendererXP::DrawHeaderButton(wxWindow *win, wxDC& dc, const wxRect& rect, @@ -301,8 +384,7 @@ wxRendererXP::DrawHeaderButton(wxWindow *win, 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; @@ -318,7 +400,7 @@ wxRendererXP::DrawHeaderButton(wxWindow *win, wxUxThemeEngine::Get()->DrawThemeBackground ( hTheme, - GetHdcOf(dc), + GetHdcOf(*((wxMSWDCImpl*)dc.GetImpl())), HP_HEADERITEM, state, &r, @@ -328,34 +410,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. - - // 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; + // Add any extras that are specified in flags and params + return DrawHeaderButtonContents(win, dc, rect, flags, sortArrow, params); } @@ -379,7 +436,7 @@ wxRendererXP::DrawTreeItemButton(wxWindow *win, wxUxThemeEngine::Get()->DrawThemeBackground ( hTheme, - GetHdcOf(dc), + GetHdcOf(*((wxMSWDCImpl*)dc.GetImpl())), TVP_GLYPH, state, &r, @@ -411,18 +468,25 @@ wxRendererXP::DrawCheckBox(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 ( hTheme, - GetHdcOf(dc), + GetHdcOf(*((wxMSWDCImpl*)dc.GetImpl())), BP_CHECKBOX, state, &r, @@ -461,7 +525,7 @@ wxRendererXP::DrawPushButton(wxWindow * win, wxUxThemeEngine::Get()->DrawThemeBackground ( hTheme, - GetHdcOf(dc), + GetHdcOf(*((wxMSWDCImpl*)dc.GetImpl())), BP_PUSHBUTTON, state, &r, @@ -470,6 +534,39 @@ wxRendererXP::DrawPushButton(wxWindow * win, } +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 // ----------------------------------------------------------------------------