X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/7cf3223a80adede7cf8524d29b9b5fab8621eff4..4f450f41a2c02db9c35e3e566b381c85b5714de8:/src/msw/renderer.cpp diff --git a/src/msw/renderer.cpp b/src/msw/renderer.cpp index 0b54ae2c1f..0ec34ab54c 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,6 +28,7 @@ #include "wx/string.h" #include "wx/window.h" #include "wx/dc.h" + #include "wx/settings.h" #endif //WX_PRECOMP #include "wx/splitter.h" @@ -38,12 +39,39 @@ // 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 // ---------------------------------------------------------------------------- @@ -62,6 +90,11 @@ public: 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) }; @@ -79,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, @@ -89,13 +130,21 @@ 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) }; @@ -147,6 +196,27 @@ wxRendererMSW::DrawComboBoxDropButton(wxWindow * WXUNUSED(win), ::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 // ============================================================================ @@ -171,35 +241,180 @@ wxRendererXP::DrawComboBoxDropButton(wxWindow * win, int flags) { wxUxThemeHandle hTheme(win, L"COMBOBOX"); - if ( hTheme ) + 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 ) { - 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, - dc.GetHDC(), - CP_DROPDOWNBUTTON, - state, - &r, - NULL - ); + 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 + ); + } // ---------------------------------------------------------------------------- @@ -212,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); @@ -224,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); } @@ -240,40 +455,21 @@ wxRendererXP::DrawSplitterSash(wxWindow *win, { if ( !win->HasFlag(wxSP_NO_XP_THEME) ) { - wxUxThemeHandle hTheme(win, L"WINDOW"); - if ( hTheme ) + dc.SetPen(*wxTRANSPARENT_PEN); + dc.SetBrush(wxBrush(wxSystemSettings::GetColour(wxSYS_COLOUR_BTNFACE))); + if ( orient == wxVERTICAL ) + { + dc.DrawRectangle(position, 0, SASH_WIDTH, size.y); + } + else // wxHORIZONTAL { - RECT rect; - if ( orient == wxVERTICAL ) - { - rect.left = position; - rect.right = position + SASH_WIDTH; - rect.top = 0; - rect.bottom = size.y; - } - else // wxHORIZONTAL - { - rect.left = 0; - rect.right = size.x; - rect.top = position; - rect.bottom = position + SASH_WIDTH; - } - - wxUxThemeEngine::Get()->DrawThemeBackground - ( - (WXHTHEME)hTheme, - dc.GetHDC(), - 29, // WP_DIALOG: dlg background - 0, // no particular state - &rect, - NULL - ); - return; + dc.DrawRectangle(0, position, size.x, SASH_WIDTH); } + + return; } m_rendererNative.DrawSplitterSash(win, dc, size, position, orient, flags); } #endif // wxUSE_UXTHEME -