X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/e413198572959f013fc2537a3c8cc184c9ac820d..07aaf32633ecf18ec3edfbb41793a112914792d0:/src/msw/renderer.cpp?ds=sidebyside diff --git a/src/msw/renderer.cpp b/src/msw/renderer.cpp index ea483718a8..6b46d788fc 100644 --- a/src/msw/renderer.cpp +++ b/src/msw/renderer.cpp @@ -6,7 +6,7 @@ // Created: 20.07.2003 // RCS-ID: $Id$ // Copyright: (c) 2003 Vadim Zeitlin -// License: wxWindows licence +// Licence: wxWindows licence /////////////////////////////////////////////////////////////////////////////// // ============================================================================ @@ -31,27 +31,13 @@ #include "wx/settings.h" #endif //WX_PRECOMP +#include "wx/dcgraph.h" #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 "gdiplus.h" -using namespace Gdiplus; -#endif - // tmschema.h is in Win32 Platform SDK and might not be available with earlier // compilers #ifndef CP_DROPDOWNBUTTON @@ -107,46 +93,13 @@ using namespace Gdiplus; #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(*dc); - } - - ~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; + #define WP_MINBUTTON 15 + #define WP_MAXBUTTON 17 + #define WP_CLOSEBUTTON 18 + #define WP_RESTOREBUTTON 21 + #define WP_HELPBUTTON 23 #endif -}; #if defined(__WXWINCE__) #ifndef DFCS_FLAT @@ -161,11 +114,53 @@ private: #define DFCS_HOT 0x1000 #endif +// ---------------------------------------------------------------------------- +// methods common to wxRendererMSW and wxRendererXP +// ---------------------------------------------------------------------------- + +class wxRendererMSWBase : public wxDelegateRendererNative +{ +public: + wxRendererMSWBase() { } + wxRendererMSWBase(wxRendererNative& rendererNative) + : wxDelegateRendererNative(rendererNative) { } + + void DrawFocusRect(wxWindow * win, + wxDC& dc, + const wxRect& rect, + int flags = 0); + + void DrawItemSelectionRect(wxWindow *win, + wxDC& dc, + const wxRect& rect, + int flags = 0); + + void DrawChoice(wxWindow* win, + wxDC& dc, + const wxRect& rect, + int flags = 0); + + void DrawComboBox(wxWindow* win, + wxDC& dc, + const wxRect& rect, + int flags = 0); + + virtual void DrawComboBoxDropButton(wxWindow *win, + wxDC& dc, + const wxRect& rect, + int flags = 0) = 0; + + virtual void DrawTextCtrl(wxWindow* win, + wxDC& dc, + const wxRect& rect, + int flags = 0) = 0; +}; + // ---------------------------------------------------------------------------- // wxRendererMSW: wxRendererNative implementation for "old" Win32 systems // ---------------------------------------------------------------------------- -class WXDLLEXPORT wxRendererMSW : public wxDelegateRendererNative +class wxRendererMSW : public wxRendererMSWBase { public: wxRendererMSW() { } @@ -180,44 +175,62 @@ public: virtual void DrawCheckBox(wxWindow *win, wxDC& dc, const wxRect& rect, - int flags = 0); + int flags = 0) + { + DoDrawButton(DFCS_BUTTONCHECK, win, dc, rect, flags); + } 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 DrawTextCtrl(wxWindow* win, - wxDC& dc, - const wxRect& rect, - int flags=0); + virtual void DrawRadioBitmap(wxWindow* win, + wxDC& dc, + const wxRect& rect, + int flags = 0) + { + DoDrawButton(DFCS_BUTTONRADIO, win, dc, rect, flags); + } - virtual void DrawRadioButton(wxWindow* win, - wxDC& dc, - const wxRect& rect, - int flags=0); + virtual void DrawTitleBarBitmap(wxWindow *win, + wxDC& dc, + const wxRect& rect, + wxTitleBarButton button, + int flags = 0); virtual wxSize GetCheckBoxSize(wxWindow *win); virtual int GetHeaderButtonHeight(wxWindow *win); + virtual int GetHeaderButtonMargin(wxWindow *win); + private: - DECLARE_NO_COPY_CLASS(wxRendererMSW) + // wrapper of DrawFrameControl() + void DoDrawFrameControl(UINT type, + UINT kind, + wxWindow *win, + wxDC& dc, + const wxRect& rect, + int flags); + + // common part of Draw{PushButton,CheckBox,RadioBitmap}(): wraps + // DrawFrameControl(DFC_BUTTON) + void DoDrawButton(UINT kind, + wxWindow *win, + wxDC& dc, + const wxRect& rect, + int flags) + { + DoDrawFrameControl(DFC_BUTTON, kind, win, dc, rect, flags); + } + + wxDECLARE_NO_COPY_CLASS(wxRendererMSW); }; // ---------------------------------------------------------------------------- @@ -226,10 +239,10 @@ private: #if wxUSE_UXTHEME -class WXDLLEXPORT wxRendererXP : public wxDelegateRendererNative +class wxRendererXP : public wxRendererMSWBase { public: - wxRendererXP() : wxDelegateRendererNative(wxRendererMSW::Get()) { } + wxRendererXP() : wxRendererMSWBase(wxRendererMSW::Get()) { } static wxRendererNative& Get(); @@ -261,26 +274,137 @@ public: virtual void DrawCheckBox(wxWindow *win, wxDC& dc, const wxRect& rect, - int flags = 0); + int flags = 0) + { + if ( !DoDrawXPButton(BP_CHECKBOX, win, dc, rect, flags) ) + m_rendererNative.DrawCheckBox(win, dc, rect, flags); + } virtual void DrawPushButton(wxWindow *win, wxDC& dc, const wxRect& rect, - int flags = 0); + int flags = 0) + { + if ( !DoDrawXPButton(BP_PUSHBUTTON, win, dc, rect, flags) ) + m_rendererNative.DrawPushButton(win, dc, rect, flags); + } + + virtual void DrawTextCtrl(wxWindow* win, + wxDC& dc, + const wxRect& rect, + int flags = 0); - virtual void DrawItemSelectionRect(wxWindow *win, - wxDC& dc, - const wxRect& rect, - int flags = 0 ); + virtual void DrawRadioBitmap(wxWindow *win, + wxDC& dc, + const wxRect& rect, + int flags = 0) + { + if ( !DoDrawXPButton(BP_RADIOBUTTON, win, dc, rect, flags) ) + m_rendererNative.DrawRadioBitmap(win, dc, rect, flags); + } + virtual void DrawTitleBarBitmap(wxWindow *win, + wxDC& dc, + const wxRect& rect, + wxTitleBarButton button, + int flags = 0); virtual wxSplitterRenderParams GetSplitterParams(const wxWindow *win); + private: - DECLARE_NO_COPY_CLASS(wxRendererXP) + // wrapper around DrawThemeBackground() translating flags to NORMAL/HOT/ + // PUSHED/DISABLED states (and so suitable for drawing anything + // button-like) + void DoDrawButtonLike(HTHEME htheme, + int part, + wxDC& dc, + const wxRect& rect, + int flags); + + // common part of DrawCheckBox(), DrawPushButton() and DrawRadioBitmap() + bool DoDrawXPButton(int kind, + wxWindow *win, + wxDC& dc, + const wxRect& rect, + int flags); + + wxDECLARE_NO_COPY_CLASS(wxRendererXP); }; #endif // wxUSE_UXTHEME + +// ============================================================================ +// wxRendererMSWBase implementation +// ============================================================================ + +void wxRendererMSWBase::DrawFocusRect(wxWindow * WXUNUSED(win), + wxDC& dc, + const wxRect& rect, + int WXUNUSED(flags)) +{ + RECT rc; + wxCopyRectToRECT(rect, rc); + + ::DrawFocusRect(GetHdcOf(dc.GetTempHDC()), &rc); +} + +void wxRendererMSWBase::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 ); +} + +void wxRendererMSWBase::DrawChoice(wxWindow* win, + wxDC& dc, + const wxRect& rect, + int flags) +{ + DrawComboBox(win, dc, rect, flags); +} + +void wxRendererMSWBase::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); +} + // ============================================================================ // wxRendererNative and wxRendererMSW implementation // ============================================================================ @@ -311,8 +435,12 @@ wxRendererMSW::DrawComboBoxDropButton(wxWindow * WXUNUSED(win), const wxRect& rect, int flags) { + wxCHECK_RET( dc.GetImpl(), wxT("Invalid wxDC") ); + + wxRect adjustedRect = dc.GetImpl()->MSWApplyGDIPlusTransform(rect); + RECT r; - wxCopyRectToRECT(rect, r); + wxCopyRectToRECT(adjustedRect, r); int style = DFCS_SCROLLCOMBOBOX; if ( flags & wxCONTROL_DISABLED ) @@ -320,19 +448,25 @@ wxRendererMSW::DrawComboBoxDropButton(wxWindow * WXUNUSED(win), if ( flags & wxCONTROL_PRESSED ) style |= DFCS_PUSHED | DFCS_FLAT; - ::DrawFrameControl(GraphicsHDC(((wxMSWDCImpl*)dc.GetImpl())), &r, DFC_SCROLL, style); + ::DrawFrameControl(GetHdcOf(dc.GetTempHDC()), &r, DFC_SCROLL, style); } void -wxRendererMSW::DrawCheckBox(wxWindow * WXUNUSED(win), - wxDC& dc, - const wxRect& rect, - int flags) +wxRendererMSW::DoDrawFrameControl(UINT type, + UINT kind, + wxWindow * WXUNUSED(win), + wxDC& dc, + const wxRect& rect, + int flags) { + wxCHECK_RET( dc.GetImpl(), wxT("Invalid wxDC") ); + + wxRect adjustedRect = dc.GetImpl()->MSWApplyGDIPlusTransform(rect); + RECT r; - wxCopyRectToRECT(rect, r); + wxCopyRectToRECT(adjustedRect, r); - int style = DFCS_BUTTONCHECK; + int style = kind; if ( flags & wxCONTROL_CHECKED ) style |= DFCS_CHECKED; if ( flags & wxCONTROL_DISABLED ) @@ -343,23 +477,22 @@ wxRendererMSW::DrawCheckBox(wxWindow * WXUNUSED(win), style |= DFCS_PUSHED; if ( flags & wxCONTROL_CURRENT ) style |= DFCS_HOT; + if ( flags & wxCONTROL_UNDETERMINED ) + // Using DFCS_BUTTON3STATE here doesn't work (as might be expected), + // use the following two styles to get the same look of a check box + // in the undetermined state. + style |= DFCS_INACTIVE | DFCS_CHECKED; - ::DrawFrameControl(GraphicsHDC((wxMSWDCImpl*)dc.GetImpl())), &r, DFC_BUTTON, style); + ::DrawFrameControl(GetHdcOf(dc.GetTempHDC()), &r, type, style); } void -wxRendererMSW::DrawPushButton(wxWindow * WXUNUSED(win), +wxRendererMSW::DrawPushButton(wxWindow *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 @@ -370,21 +503,45 @@ wxRendererMSW::DrawPushButton(wxWindow * WXUNUSED(win), rect.Deflate(1); } - RECT rc; - wxCopyRectToRECT(rect, rc); - - ::DrawFrameControl(GraphicsHDC((wxMSWDCImpl*)dc.GetImpl())), &rc, DFC_BUTTON, style); + DoDrawButton(DFCS_BUTTONPUSH, win, dc, rect, flags); } -void wxRendererMSW::DrawFocusRect(wxWindow * WXUNUSED(win), +void +wxRendererMSW::DrawTitleBarBitmap(wxWindow *win, wxDC& dc, const wxRect& rect, - int WXUNUSED(flags)) + wxTitleBarButton button, + int flags) { - RECT rc; - wxCopyRectToRECT(rect, rc); + UINT kind; + switch ( button ) + { + case wxTITLEBAR_BUTTON_CLOSE: + kind = DFCS_CAPTIONCLOSE; + break; + + case wxTITLEBAR_BUTTON_MAXIMIZE: + kind = DFCS_CAPTIONMAX; + break; + + case wxTITLEBAR_BUTTON_ICONIZE: + kind = DFCS_CAPTIONMIN; + break; - ::DrawFocusRect(GraphicsHDC((wxMSWDCImpl*)dc.GetImpl())), &rc); + case wxTITLEBAR_BUTTON_RESTORE: + kind = DFCS_CAPTIONRESTORE; + break; + + case wxTITLEBAR_BUTTON_HELP: + kind = DFCS_CAPTIONHELP; + break; + + default: + wxFAIL_MSG( "unsupported title bar button" ); + return; + } + + DoDrawFrameControl(DFC_CAPTION, kind, win, dc, rect, flags); } wxSize wxRendererMSW::GetCheckBoxSize(wxWindow * WXUNUSED(win)) @@ -416,112 +573,30 @@ int wxRendererMSW::GetHeaderButtonHeight(wxWindow * WXUNUSED(win)) return Header_Layout(hwndHeader, &hdl) ? wp.cy : DEFAULT_HEIGHT; } +int wxRendererMSW::GetHeaderButtonMargin(wxWindow *WXUNUSED(win)) +{ + return 10; +} + // 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) +void wxRendererMSW::DrawTextCtrl(wxWindow* WXUNUSED(win), + wxDC& dc, + const wxRect& rect, + int WXUNUSED(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); + dc.SetPen(bdr); + dc.SetBrush(fill); + dc.DrawRectangle(rect); } -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 -} - // ============================================================================ // wxRendererXP implementation // ============================================================================ @@ -552,8 +627,12 @@ wxRendererXP::DrawComboBoxDropButton(wxWindow * win, return; } + wxCHECK_RET( dc.GetImpl(), wxT("Invalid wxDC") ); + + wxRect adjustedRect = dc.GetImpl()->MSWApplyGDIPlusTransform(rect); + RECT r; - wxCopyRectToRECT(rect, r); + wxCopyRectToRECT(adjustedRect, r); int state; if ( flags & wxCONTROL_PRESSED ) @@ -568,7 +647,7 @@ wxRendererXP::DrawComboBoxDropButton(wxWindow * win, wxUxThemeEngine::Get()->DrawThemeBackground ( hTheme, - GetHdcOf(*((wxMSWDCImpl*)dc.GetImpl())), + GetHdcOf(dc.GetTempHDC()), CP_DROPDOWNBUTTON, state, &r, @@ -591,8 +670,12 @@ wxRendererXP::DrawHeaderButton(wxWindow *win, return m_rendererNative.DrawHeaderButton(win, dc, rect, flags, sortArrow, params); } + wxCHECK_MSG( dc.GetImpl(), -1, wxT("Invalid wxDC") ); + + wxRect adjustedRect = dc.GetImpl()->MSWApplyGDIPlusTransform(rect); + RECT r; - wxCopyRectToRECT(rect, r); + wxCopyRectToRECT(adjustedRect, r); int state; if ( flags & wxCONTROL_PRESSED ) @@ -604,7 +687,7 @@ wxRendererXP::DrawHeaderButton(wxWindow *win, wxUxThemeEngine::Get()->DrawThemeBackground ( hTheme, - GetHdcOf(*((wxMSWDCImpl*)dc.GetImpl())), + GetHdcOf(dc.GetTempHDC()), HP_HEADERITEM, state, &r, @@ -633,14 +716,18 @@ wxRendererXP::DrawTreeItemButton(wxWindow *win, return; } + wxCHECK_RET( dc.GetImpl(), wxT("Invalid wxDC") ); + + wxRect adjustedRect = dc.GetImpl()->MSWApplyGDIPlusTransform(rect); + RECT r; - wxCopyRectToRECT(rect, r); + wxCopyRectToRECT(adjustedRect, r); int state = flags & wxCONTROL_EXPANDED ? GLPS_OPENED : GLPS_CLOSED; wxUxThemeEngine::Get()->DrawThemeBackground ( hTheme, - GetHdcOf(*((wxMSWDCImpl*)dc.GetImpl())), + GetHdcOf(dc.GetTempHDC()), TVP_GLYPH, state, &r, @@ -648,52 +735,73 @@ wxRendererXP::DrawTreeItemButton(wxWindow *win, ); } +bool +wxRendererXP::DoDrawXPButton(int kind, + wxWindow *win, + wxDC& dc, + const wxRect& rect, + int flags) +{ + wxUxThemeHandle hTheme(win, L"BUTTON"); + if ( !hTheme ) + return false; + + DoDrawButtonLike(hTheme, kind, dc, rect, flags); + return true; +} void -wxRendererXP::DrawCheckBox(wxWindow *win, - wxDC& dc, - const wxRect& rect, - int flags) +wxRendererXP::DoDrawButtonLike(HTHEME htheme, + int part, + wxDC& dc, + const wxRect& rect, + int flags) { - wxUxThemeHandle hTheme(win, L"BUTTON"); - if ( !hTheme ) - { - m_rendererNative.DrawCheckBox(win, dc, rect, flags); - return; - } + wxCHECK_RET( dc.GetImpl(), wxT("Invalid wxDC") ); + + wxRect adjustedRect = dc.GetImpl()->MSWApplyGDIPlusTransform(rect); RECT r; - wxCopyRectToRECT(rect, r); + wxCopyRectToRECT(adjustedRect, r); - int state; - if ( flags & wxCONTROL_CHECKED ) - state = CBS_CHECKEDNORMAL; - else if ( flags & wxCONTROL_UNDETERMINED ) - state = CBS_MIXEDNORMAL; - else - state = CBS_UNCHECKEDNORMAL; + // the base state is always 1, whether it is PBS_NORMAL, + // {CBS,RBS}_UNCHECKEDNORMAL or CBS_NORMAL + int state = 1; - // CBS_XXX is followed by CBX_XXXHOT, then CBS_XXXPRESSED and DISABLED + // XBS_XXX is followed by XBX_XXXHOT, then XBS_XXXPRESSED and DISABLED enum { - CBS_HOT_OFFSET = 1, - CBS_PRESSED_OFFSET = 2, - CBS_DISABLED_OFFSET = 3 + NORMAL_OFFSET, + HOT_OFFSET, + PRESSED_OFFSET, + DISABLED_OFFSET, + STATES_COUNT }; + // in both RBS_ and CBS_ enums CHECKED elements are offset by 4 from base + // (UNCHECKED) ones and MIXED are offset by 4 again as there are all states + // from the above enum in between them + if ( flags & wxCONTROL_CHECKED ) + state += STATES_COUNT; + else if ( flags & wxCONTROL_UNDETERMINED ) + state += 2*STATES_COUNT; + if ( flags & wxCONTROL_DISABLED ) - state += CBS_DISABLED_OFFSET; + state += DISABLED_OFFSET; else if ( flags & wxCONTROL_PRESSED ) - state += CBS_PRESSED_OFFSET; + state += PRESSED_OFFSET; else if ( flags & wxCONTROL_CURRENT ) - state += CBS_HOT_OFFSET; + state += HOT_OFFSET; + // wxCONTROL_ISDEFAULT flag is only valid for push buttons + else if ( part == BP_PUSHBUTTON && (flags & wxCONTROL_ISDEFAULT) ) + state = PBS_DEFAULTED; wxUxThemeEngine::Get()->DrawThemeBackground ( - hTheme, - GetHdcOf(*((wxMSWDCImpl*)dc.GetImpl())), - BP_CHECKBOX, + htheme, + GetHdcOf(dc.GetTempHDC()), + part, state, &r, NULL @@ -701,76 +809,85 @@ wxRendererXP::DrawCheckBox(wxWindow *win, } void -wxRendererXP::DrawPushButton(wxWindow * win, - wxDC& dc, - const wxRect& rect, - int flags) +wxRendererXP::DrawTitleBarBitmap(wxWindow *win, + wxDC& dc, + const wxRect& rect, + wxTitleBarButton button, + int flags) { - wxUxThemeHandle hTheme(win, L"BUTTON"); + wxUxThemeHandle hTheme(win, L"WINDOW"); if ( !hTheme ) { - m_rendererNative.DrawPushButton(win, dc, rect, flags); + m_rendererNative.DrawTitleBarBitmap(win, dc, rect, button, flags); return; } - RECT r; - wxCopyRectToRECT(rect, r); + int part; + switch ( button ) + { + case wxTITLEBAR_BUTTON_CLOSE: + part = WP_CLOSEBUTTON; + break; - 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; + case wxTITLEBAR_BUTTON_MAXIMIZE: + part = WP_MAXBUTTON; + break; - wxUxThemeEngine::Get()->DrawThemeBackground - ( - hTheme, - GetHdcOf(*((wxMSWDCImpl*)dc.GetImpl())), - BP_PUSHBUTTON, - state, - &r, - NULL - ); + case wxTITLEBAR_BUTTON_ICONIZE: + part = WP_MINBUTTON; + break; + + case wxTITLEBAR_BUTTON_RESTORE: + part = WP_RESTOREBUTTON; + break; + + case wxTITLEBAR_BUTTON_HELP: + part = WP_HELPBUTTON; + break; + + default: + wxFAIL_MSG( "unsupported title bar button" ); + return; + } + + DoDrawButtonLike(hTheme, part, dc, rect, flags); } -void -wxRendererXP::DrawItemSelectionRect(wxWindow *win, - wxDC& dc, - const wxRect& rect, - int flags) +// Uses the theme to draw the border and fill for something like a wxTextCtrl +void wxRendererXP::DrawTextCtrl(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 + wxUxThemeHandle hTheme(win, L"EDIT"); + if ( !hTheme ) { - brush = *wxTRANSPARENT_BRUSH; + m_rendererNative.DrawTextCtrl(win,dc,rect,flags); + return; } - dc.SetBrush(brush); - dc.SetPen(*wxTRANSPARENT_PEN); - dc.DrawRectangle( rect ); + wxColour fill; + wxColour bdr; + COLORREF cref; - if ((flags & wxCONTROL_FOCUSED) && (flags & wxCONTROL_CURRENT)) - DrawFocusRect( win, dc, rect, flags ); -} + 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); + dc.SetPen( bdr ); + dc.SetBrush( fill ); + dc.DrawRectangle(rect); +} // ---------------------------------------------------------------------------- // splitter drawing