X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/a9fdf82418221608fca0259a586a7a6c13d133c8..6cab4fcac7fe26d9ae5a1d29066e0893d689bb38:/src/msw/renderer.cpp diff --git a/src/msw/renderer.cpp b/src/msw/renderer.cpp index 637639ccc4..93d06259a0 100644 --- a/src/msw/renderer.cpp +++ b/src/msw/renderer.cpp @@ -31,16 +31,37 @@ #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" +#if wxUSE_GRAPHICS_CONTEXT +// TODO remove this dependency (gdiplus needs the macros) +#ifndef max +#define max(a,b) (((a) > (b)) ? (a) : (b)) +#endif + +#ifndef min +#define min(a,b) (((a) < (b)) ? (a) : (b)) +#endif + +#include "wx/dcgraph.h" +#include "gdiplus.h" +using namespace Gdiplus; +#endif // wxUSE_GRAPHICS_CONTEXT + // tmschema.h is in Win32 Platform SDK and might not be available with earlier // compilers #ifndef CP_DROPDOWNBUTTON #define BP_PUSHBUTTON 1 + #define BP_RADIOBUTTON 2 #define BP_CHECKBOX 3 + #define RBS_UNCHECKEDNORMAL 1 + #define RBS_CHECKEDNORMAL (RBS_UNCHECKEDNORMAL + 4) + #define RBS_MIXEDNORMAL (RBS_CHECKEDNORMAL + 4) #define CBS_UNCHECKEDNORMAL 1 #define CBS_CHECKEDNORMAL (CBS_UNCHECKEDNORMAL + 4) #define CBS_MIXEDNORMAL (CBS_CHECKEDNORMAL + 4) @@ -74,10 +95,71 @@ #define HP_HEADERSORTARROW 4 #define HSAS_SORTEDUP 1 #define HSAS_SORTEDDOWN 2 + + #define EP_EDITTEXT 1 + #define ETS_NORMAL 1 + #define ETS_HOT 2 + #define ETS_SELECTED 3 + #define ETS_DISABLED 4 + #define ETS_FOCUSED 5 + #define ETS_READONLY 6 + #define ETS_ASSIST 7 + #define TMT_FILLCOLOR 3802 + #define TMT_TEXTCOLOR 3803 + #define TMT_BORDERCOLOR 3801 + #define TMT_EDGEFILLCOLOR 3808 +#endif + + +// ---------------------------------------------------------------------------- +// If the DC is a wxGCDC then pull out the HDC from the GraphicsContext when +// it is needed, and handle the Release when done. + +class GraphicsHDC +{ +public: + GraphicsHDC(wxDC* dc) + { +#if wxUSE_GRAPHICS_CONTEXT + m_graphics = NULL; + wxGCDC* gcdc = wxDynamicCast(dc, wxGCDC); + if (gcdc) { + m_graphics = (Graphics*)gcdc->GetGraphicsContext()->GetNativeContext(); + m_hdc = m_graphics->GetHDC(); + } + else +#endif + m_hdc = GetHdcOf(*((wxMSWDCImpl*)dc->GetImpl())); + } + + ~GraphicsHDC() + { +#if wxUSE_GRAPHICS_CONTEXT + if (m_graphics) + m_graphics->ReleaseHDC(m_hdc); +#endif + } + + operator HDC() const { return m_hdc; } + +private: + HDC m_hdc; +#if wxUSE_GRAPHICS_CONTEXT + Graphics* m_graphics; +#endif +}; + +#if defined(__WXWINCE__) + #ifndef DFCS_FLAT + #define DFCS_FLAT 0 + #endif + #ifndef DFCS_MONO + #define DFCS_MONO 0 + #endif #endif -#if defined(__WXWINCE__) && !defined(DFCS_FLAT) - #define DFCS_FLAT 0 +#ifndef DFCS_HOT + #define DFCS_HOT 0x1000 #endif // ---------------------------------------------------------------------------- @@ -96,11 +178,45 @@ 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 void DrawChoice(wxWindow* win, + wxDC& dc, + const wxRect& rect, + int flags=0); + + virtual void DrawComboBox(wxWindow* win, + wxDC& dc, + const wxRect& rect, + int flags=0); + + virtual void DrawTextCtrl(wxWindow* win, + wxDC& dc, + const wxRect& rect, + int flags=0); + + virtual void DrawRadioButton(wxWindow* win, + wxDC& dc, + const wxRect& rect, + int flags=0); + + virtual wxSize GetCheckBoxSize(wxWindow *win); + + virtual int GetHeaderButtonHeight(wxWindow *win); + private: DECLARE_NO_COPY_CLASS(wxRendererMSW) }; @@ -124,8 +240,7 @@ public: 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, @@ -198,10 +313,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 ) @@ -209,7 +321,31 @@ wxRendererMSW::DrawComboBoxDropButton(wxWindow * WXUNUSED(win), if ( flags & wxCONTROL_PRESSED ) style |= DFCS_PUSHED | DFCS_FLAT; - ::DrawFrameControl(GetHdcOf(dc), &r, DFC_SCROLL, style); + ::DrawFrameControl(GraphicsHDC(&dc), &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(GraphicsHDC(&dc), &r, DFC_BUTTON, style); } void @@ -238,7 +374,153 @@ wxRendererMSW::DrawPushButton(wxWindow * WXUNUSED(win), RECT rc; wxCopyRectToRECT(rect, rc); - ::DrawFrameControl(GetHdcOf(dc), &rc, DFC_BUTTON, style); + ::DrawFrameControl(GraphicsHDC(&dc), &rc, DFC_BUTTON, style); +} + +void wxRendererMSW::DrawFocusRect(wxWindow * WXUNUSED(win), + wxDC& dc, + const wxRect& rect, + int WXUNUSED(flags)) +{ + RECT rc; + wxCopyRectToRECT(rect, rc); + + ::DrawFocusRect(GraphicsHDC(&dc), &rc); +} + +wxSize wxRendererMSW::GetCheckBoxSize(wxWindow * WXUNUSED(win)) +{ + return wxSize(::GetSystemMetrics(SM_CXMENUCHECK), + ::GetSystemMetrics(SM_CYMENUCHECK)); +} + +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; +} + +// Uses the theme to draw the border and fill for something like a wxTextCtrl +void wxRendererMSW::DrawTextCtrl(wxWindow* win, wxDC& dc, const wxRect& rect, int flags) +{ + wxColour fill; + wxColour bdr; + COLORREF cref; + +#if wxUSE_UXTHEME + wxUxThemeHandle hTheme(win, L"EDIT"); + if (hTheme) + { + wxUxThemeEngine::Get()->GetThemeColor(hTheme, EP_EDITTEXT, + ETS_NORMAL, TMT_FILLCOLOR, &cref); + fill = wxRGBToColour(cref); + + int etsState; + if ( flags & wxCONTROL_DISABLED ) + etsState = ETS_DISABLED; + else + etsState = ETS_NORMAL; + + wxUxThemeEngine::Get()->GetThemeColor(hTheme, EP_EDITTEXT, + etsState, TMT_BORDERCOLOR, &cref); + bdr = wxRGBToColour(cref); + } + else +#endif + { + fill = wxSystemSettings::GetColour(wxSYS_COLOUR_WINDOW); + bdr = *wxBLACK; + } + + dc.SetPen( bdr ); + dc.SetBrush( fill ); + dc.DrawRectangle(rect); +} + + +// Draw the equivallent of a wxComboBox +void wxRendererMSW::DrawComboBox(wxWindow* win, wxDC& dc, const wxRect& rect, int flags) +{ + // Draw the main part of the control same as TextCtrl + DrawTextCtrl(win, dc, rect, flags); + + // Draw the button inside the border, on the right side + wxRect br(rect); + br.height -= 2; + br.x += br.width - br.height - 1; + br.width = br.height; + br.y += 1; + + DrawComboBoxDropButton(win, dc, br, flags); +} + + +void wxRendererMSW::DrawChoice(wxWindow* win, wxDC& dc, + const wxRect& rect, int flags) +{ + DrawComboBox(win, dc, rect, flags); +} + + +// Draw a themed radio button +void wxRendererMSW::DrawRadioButton(wxWindow* win, wxDC& dc, const wxRect& rect, int flags) +{ +#if wxUSE_UXTHEME + wxUxThemeHandle hTheme(win, L"BUTTON"); + if ( !hTheme ) +#endif + { + // ??? m_rendererNative.DrawRadioButton(win, dc, rect, flags); + return; + } + +#if wxUSE_UXTHEME + RECT r; + wxCopyRectToRECT(rect, r); + + int state; + if ( flags & wxCONTROL_CHECKED ) + state = RBS_CHECKEDNORMAL; + else if ( flags & wxCONTROL_UNDETERMINED ) + state = RBS_MIXEDNORMAL; + else + state = RBS_UNCHECKEDNORMAL; + + // RBS_XXX is followed by RBX_XXXGOT, then RBS_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, + GraphicsHDC(&dc), + BP_RADIOBUTTON, + state, + &r, + NULL + ); +#endif } // ============================================================================ @@ -287,7 +569,7 @@ wxRendererXP::DrawComboBoxDropButton(wxWindow * win, wxUxThemeEngine::Get()->DrawThemeBackground ( hTheme, - GetHdcOf(dc), + GetHdcOf(*((wxMSWDCImpl*)dc.GetImpl())), CP_DROPDOWNBUTTON, state, &r, @@ -323,7 +605,7 @@ wxRendererXP::DrawHeaderButton(wxWindow *win, wxUxThemeEngine::Get()->DrawThemeBackground ( hTheme, - GetHdcOf(dc), + GetHdcOf(*((wxMSWDCImpl*)dc.GetImpl())), HP_HEADERITEM, state, &r, @@ -333,37 +615,12 @@ 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 return 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, @@ -384,7 +641,7 @@ wxRendererXP::DrawTreeItemButton(wxWindow *win, wxUxThemeEngine::Get()->DrawThemeBackground ( hTheme, - GetHdcOf(dc), + GetHdcOf(*((wxMSWDCImpl*)dc.GetImpl())), TVP_GLYPH, state, &r, @@ -392,6 +649,8 @@ wxRendererXP::DrawTreeItemButton(wxWindow *win, ); } + + void wxRendererXP::DrawCheckBox(wxWindow *win, wxDC& dc, @@ -416,18 +675,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, @@ -466,17 +732,16 @@ wxRendererXP::DrawPushButton(wxWindow * win, wxUxThemeEngine::Get()->DrawThemeBackground ( hTheme, - GetHdcOf(dc), + GetHdcOf(*((wxMSWDCImpl*)dc.GetImpl())), BP_PUSHBUTTON, state, &r, NULL ); - } void -wxRendererXP::DrawItemSelectionRect(wxWindow * WXUNUSED(win), +wxRendererXP::DrawItemSelectionRect(wxWindow *win, wxDC& dc, const wxRect& rect, int flags) @@ -490,7 +755,7 @@ wxRendererXP::DrawItemSelectionRect(wxWindow * WXUNUSED(win), } else // !focused { - brush = wxBrush(wxSystemSettings::GetColour(wxSYS_COLOUR_BTNSHADOW)); + brush = wxBrush(wxSystemSettings::GetColour(wxSYS_COLOUR_BTNFACE)); } } else // !selected @@ -499,12 +764,11 @@ wxRendererXP::DrawItemSelectionRect(wxWindow * WXUNUSED(win), } dc.SetBrush(brush); - - // unlike for wxRendererGeneric, on windows we _never_ want to draw - // the outline of the rectangle: dc.SetPen(*wxTRANSPARENT_PEN); - dc.DrawRectangle( rect ); + + if ((flags & wxCONTROL_FOCUSED) && (flags & wxCONTROL_CURRENT)) + DrawFocusRect( win, dc, rect, flags ); }