X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/3c2544bb7047ad8d639b83bc0725f68e4a1ddab8..f46ad98f0df1e1b073a484cb34a91e2e1278fdb7:/src/msw/renderer.cpp?ds=sidebyside diff --git a/src/msw/renderer.cpp b/src/msw/renderer.cpp index d4c36549f8..0ec34ab54c 100644 --- a/src/msw/renderer.cpp +++ b/src/msw/renderer.cpp @@ -1,12 +1,12 @@ /////////////////////////////////////////////////////////////////////////////// -// Name: msw/renderer.cpp +// Name: src/msw/renderer.cpp // Purpose: implementation of wxRendererNative for Windows // Author: Vadim Zeitlin // Modified by: // Created: 20.07.2003 // RCS-ID: $Id$ // Copyright: (c) 2003 Vadim Zeitlin -// License: wxWindows license +// License: wxWindows licence /////////////////////////////////////////////////////////////////////////////// // ============================================================================ @@ -28,11 +28,51 @@ #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/msw/uxtheme.h" +#include "wx/msw/private.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 + #define CBXS_HOT 2 + #define CBXS_PRESSED 3 + #define CBXS_DISABLED 4 + + #define TVP_GLYPH 2 + + #define GLPS_CLOSED 1 + #define GLPS_OPENED 2 + + #define HP_HEADERITEM 1 + + #define HIS_NORMAL 1 + #define HIS_HOT 2 + #define HIS_PRESSED 3 +#endif + +#if defined(__WXWINCE__) && !defined(DFCS_FLAT) + #define DFCS_FLAT 0 +#endif // ---------------------------------------------------------------------------- // wxRendererMSW: wxRendererNative implementation for "old" Win32 systems @@ -45,6 +85,16 @@ public: static wxRendererNative& Get(); + virtual void DrawComboBoxDropButton(wxWindow *win, + wxDC& dc, + 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) }; @@ -53,6 +103,8 @@ private: // wxRendererXP: wxRendererNative implementation for Windows XP and later // ---------------------------------------------------------------------------- +#if wxUSE_UXTHEME + class WXDLLEXPORT wxRendererXP : public wxDelegateRendererNative { public: @@ -60,6 +112,14 @@ public: static wxRendererNative& Get(); + virtual void DrawHeaderButton(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 DrawSplitterBorder(wxWindow *win, wxDC& dc, const wxRect& rect, @@ -70,12 +130,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 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: DECLARE_NO_COPY_CLASS(wxRendererXP) }; +#endif // wxUSE_UXTHEME + // ============================================================================ // wxRendererNative and wxRendererMSW implementation // ============================================================================ @@ -83,9 +158,13 @@ private: /* static */ wxRendererNative& wxRendererNative::GetDefault() { +#if wxUSE_UXTHEME wxUxThemeEngine *themeEngine = wxUxThemeEngine::Get(); - return themeEngine && themeEngine->IsAppThemed() ? wxRendererXP::Get() - : wxRendererMSW::Get(); + if ( themeEngine && themeEngine->IsAppThemed() ) + return wxRendererXP::Get(); +#endif // wxUSE_UXTHEME + + return wxRendererMSW::Get(); } /* static */ @@ -96,10 +175,54 @@ wxRendererNative& wxRendererMSW::Get() return s_rendererMSW; } +void +wxRendererMSW::DrawComboBoxDropButton(wxWindow * WXUNUSED(win), + wxDC& dc, + const wxRect& rect, + int flags) +{ + RECT r; + r.left = rect.GetLeft(); + r.top = rect.GetTop(); + r.bottom = rect.y + rect.height; + r.right = rect.x + rect.width; + + int style = DFCS_SCROLLCOMBOBOX; + if ( flags & wxCONTROL_DISABLED ) + style |= DFCS_INACTIVE; + if ( flags & wxCONTROL_PRESSED ) + style |= DFCS_PUSHED | DFCS_FLAT; + + ::DrawFrameControl(GetHdcOf(dc), &r, DFC_SCROLL, style); +} + +void +wxRendererMSW::DrawPushButton(wxWindow * WXUNUSED(win), + wxDC& dc, + const wxRect& rect, + int flags) +{ + RECT r; + r.left = rect.GetLeft(); + r.top = rect.GetTop(); + r.bottom = rect.y + rect.height; + r.right = rect.x + rect.width; + + int style = DFCS_BUTTONPUSH; + if ( flags & wxCONTROL_DISABLED ) + style |= DFCS_INACTIVE; + if ( flags & wxCONTROL_PRESSED ) + style |= DFCS_PUSHED | DFCS_FLAT; + + ::DrawFrameControl(GetHdcOf(dc), &r, DFC_BUTTON, style); +} + // ============================================================================ // wxRendererXP implementation // ============================================================================ +#if wxUSE_UXTHEME + /* static */ wxRendererNative& wxRendererXP::Get() { @@ -108,6 +231,192 @@ wxRendererNative& wxRendererXP::Get() return s_rendererXP; } +// NOTE: There is no guarantee that the button drawn fills the entire rect (XP +// default theme, for example), so the caller should have cleared button's +// background before this call. This is quite likely a wxMSW-specific thing. +void +wxRendererXP::DrawComboBoxDropButton(wxWindow * win, + wxDC& dc, + const wxRect& rect, + int flags) +{ + wxUxThemeHandle hTheme(win, L"COMBOBOX"); + if ( !hTheme ) + { + 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(dc), + CP_DROPDOWNBUTTON, + state, + &r, + NULL + ); + +} + +void +wxRendererXP::DrawHeaderButton(wxWindow *win, + wxDC& dc, + const wxRect& rect, + int flags) +{ + wxUxThemeHandle hTheme(win, L"HEADER"); + if ( !hTheme ) + { + m_rendererNative.DrawHeaderButton(win, dc, rect, flags); + return; + } + + 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(dc), + HP_HEADERITEM, + state, + &r, + NULL + ); +} + +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(dc), + 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_XXXGOT, then CBS_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, + GetHdcOf(dc), + 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(dc), + BP_PUSHBUTTON, + state, + &r, + NULL + ); + +} + // ---------------------------------------------------------------------------- // splitter drawing // ---------------------------------------------------------------------------- @@ -118,7 +427,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); @@ -130,7 +439,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); } @@ -144,43 +453,23 @@ wxRendererXP::DrawSplitterSash(wxWindow *win, wxOrientation orient, int flags) { - if (win->GetWindowStyle() & wxSP_NO_XP_THEME) - { - m_rendererNative.DrawSplitterSash( - win, dc, size, position, orient, flags); - return; - } - - // I don't know if it is correct to use the rebar background for the - // splitter but it least this works ok in the default theme - wxUxThemeHandle hTheme(win, L"REBAR"); - if ( hTheme ) + if ( !win->HasFlag(wxSP_NO_XP_THEME) ) { - RECT rect; + dc.SetPen(*wxTRANSPARENT_PEN); + dc.SetBrush(wxBrush(wxSystemSettings::GetColour(wxSYS_COLOUR_BTNFACE))); if ( orient == wxVERTICAL ) { - rect.left = position; - rect.right = position + SASH_WIDTH; - rect.top = 0; - rect.bottom = size.y; + dc.DrawRectangle(position, 0, SASH_WIDTH, size.y); } else // wxHORIZONTAL { - rect.left = 0; - rect.right = size.x; - rect.top = position; - rect.bottom = position + SASH_WIDTH; + dc.DrawRectangle(0, position, size.x, SASH_WIDTH); } - wxUxThemeEngine::Get()->DrawThemeBackground - ( - (WXHTHEME)hTheme, - dc.GetHDC(), - 3 /* RP_BAND */, - 0 /* no state */ , - &rect, - NULL - ); + return; } + + m_rendererNative.DrawSplitterSash(win, dc, size, position, orient, flags); } +#endif // wxUSE_UXTHEME