X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/a9d9e2f262aa837845d9852b4ef79b2d2575e257..9ccffa515ca1a12eff8a8a7c42cd160bc9aa75ba:/src/msw/renderer.cpp diff --git a/src/msw/renderer.cpp b/src/msw/renderer.cpp index 98293ee53d..5ffa82c1c5 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,17 +28,31 @@ #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/dc.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 @@ -46,9 +60,9 @@ #define CBXS_PRESSED 3 #define CBXS_DISABLED 4 - #define TVP_GLYPH 2 - - #define GLPS_CLOSED 1 + #define TVP_GLYPH 2 + + #define GLPS_CLOSED 1 #define GLPS_OPENED 2 #define HP_HEADERITEM 1 @@ -56,6 +70,25 @@ #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__) + #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 // ---------------------------------------------------------------------------- @@ -74,6 +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) }; @@ -91,6 +141,17 @@ public: static wxRendererNative& Get(); + 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, + int flags = 0); virtual void DrawSplitterBorder(wxWindow *win, wxDC& dc, const wxRect& rect, @@ -101,21 +162,27 @@ public: 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 DrawTreeItemButton(wxWindow *win, - wxDC& dc, - const wxRect& rect, - int flags = 0); - virtual void DrawHeaderButton(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: DECLARE_NO_COPY_CLASS(wxRendererXP) }; @@ -146,10 +213,6 @@ wxRendererNative& wxRendererMSW::Get() return s_rendererMSW; } -#if defined(__WXWINCE__) && !defined(DFCS_FLAT) -#define DFCS_FLAT 0 -#endif - void wxRendererMSW::DrawComboBoxDropButton(wxWindow * WXUNUSED(win), wxDC& dc, @@ -157,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 ) @@ -168,7 +228,94 @@ 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 +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(*((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; } // ============================================================================ @@ -195,37 +342,231 @@ wxRendererXP::DrawComboBoxDropButton(wxWindow * win, 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(*((wxMSWDCImpl*)dc.GetImpl())), + CP_DROPDOWNBUTTON, + state, + &r, + NULL + ); + +} +int +wxRendererXP::DrawHeaderButton(wxWindow *win, + wxDC& dc, + const wxRect& rect, + int flags, + wxHeaderSortIconType sortArrow, + wxHeaderButtonParams* params) +{ + wxUxThemeHandle hTheme(win, L"HEADER"); + if ( !hTheme ) + { + return m_rendererNative.DrawHeaderButton(win, dc, rect, flags, sortArrow, params); } + + 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(*((wxMSWDCImpl*)dc.GetImpl())), + 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 + return DrawHeaderButtonContents(win, dc, rect, flags, sortArrow, params); +} + + +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(*((wxMSWDCImpl*)dc.GetImpl())), + 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_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 += CBS_PRESSED_OFFSET; + else if ( flags & wxCONTROL_CURRENT ) + state += CBS_HOT_OFFSET; + + wxUxThemeEngine::Get()->DrawThemeBackground + ( + hTheme, + GetHdcOf(*((wxMSWDCImpl*)dc.GetImpl())), + 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(*((wxMSWDCImpl*)dc.GetImpl())), + 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 // ---------------------------------------------------------------------------- @@ -236,7 +577,7 @@ static const wxCoord SASH_WIDTH = 4; 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); @@ -248,7 +589,7 @@ wxRendererXP::DrawSplitterBorder(wxWindow * win, 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); } @@ -281,59 +622,4 @@ wxRendererXP::DrawSplitterSash(wxWindow *win, m_rendererNative.DrawSplitterSash(win, dc, size, position, orient, flags); } -void -wxRendererXP::DrawTreeItemButton(wxWindow *win, - wxDC &dc, - const wxRect &rect, - int flags) -{ - wxUxThemeHandle hTheme(win, L"TREEVIEW"); - RECT r; - r.left = rect.x; - r.top = rect.y; - r.right = rect.x + rect.width; - r.bottom = rect.y + rect.height; - int state = (flags & wxCONTROL_EXPANDED) ? GLPS_OPENED : GLPS_CLOSED; - wxUxThemeEngine::Get()->DrawThemeBackground - ( - hTheme, - (HDC) dc.GetHDC(), - TVP_GLYPH, - state, - &r, - NULL - ); -} - -void -wxRendererXP::DrawHeaderButton(wxWindow *win, - wxDC &dc, - const wxRect &rect, - int flags) -{ - wxUxThemeHandle hTheme(win, L"HEADER"); - 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 = HIS_PRESSED; - else if ( flags & wxCONTROL_CURRENT ) - state = HIS_HOT; - else - state = HIS_NORMAL; - wxUxThemeEngine::Get()->DrawThemeBackground - ( - hTheme, - (HDC) dc.GetHDC(), - HP_HEADERITEM, - state, - &r, - NULL - ); -} - #endif // wxUSE_UXTHEME -