X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/6c9aaf7d0cf5d42e2e5d7383c1bf7ce2e51fc6af..9c805dec6caf3c98a3797898cffe795b5b56e606:/src/msw/renderer.cpp?ds=sidebyside diff --git a/src/msw/renderer.cpp b/src/msw/renderer.cpp index dab3795115..9d1e4d79e4 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 /////////////////////////////////////////////////////////////////////////////// // ============================================================================ @@ -35,24 +35,8 @@ #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 @@ -108,46 +92,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(*((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; + #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 @@ -236,18 +187,37 @@ public: DoDrawButton(DFCS_BUTTONRADIO, win, dc, rect, flags); } + 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: + // 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); + int flags) + { + DoDrawFrameControl(DFC_BUTTON, kind, win, dc, rect, flags); + } wxDECLARE_NO_COPY_CLASS(wxRendererMSW); }; @@ -317,9 +287,24 @@ public: 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: + // 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, @@ -345,7 +330,7 @@ void wxRendererMSWBase::DrawFocusRect(wxWindow * WXUNUSED(win), RECT rc; wxCopyRectToRECT(rect, rc); - ::DrawFocusRect(GraphicsHDC(&dc), &rc); + ::DrawFocusRect(GetHdcOf(dc.GetTempHDC()), &rc); } void wxRendererMSWBase::DrawItemSelectionRect(wxWindow *win, @@ -418,15 +403,16 @@ wxRendererMSW::DrawComboBoxDropButton(wxWindow * WXUNUSED(win), if ( flags & wxCONTROL_PRESSED ) style |= DFCS_PUSHED | DFCS_FLAT; - ::DrawFrameControl(GraphicsHDC(&dc), &r, DFC_SCROLL, style); + ::DrawFrameControl(GetHdcOf(dc.GetTempHDC()), &r, DFC_SCROLL, style); } void -wxRendererMSW::DoDrawButton(UINT kind, - 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) { RECT r; wxCopyRectToRECT(rect, r); @@ -443,7 +429,7 @@ wxRendererMSW::DoDrawButton(UINT kind, if ( flags & wxCONTROL_CURRENT ) style |= DFCS_HOT; - ::DrawFrameControl(GraphicsHDC(&dc), &r, DFC_BUTTON, style); + ::DrawFrameControl(GetHdcOf(dc.GetTempHDC()), &r, type, style); } void @@ -466,6 +452,44 @@ wxRendererMSW::DrawPushButton(wxWindow *win, DoDrawButton(DFCS_BUTTONPUSH, win, dc, rect, flags); } +void +wxRendererMSW::DrawTitleBarBitmap(wxWindow *win, + wxDC& dc, + const wxRect& rect, + wxTitleBarButton button, + int flags) +{ + 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; + + 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)) { return wxSize(::GetSystemMetrics(SM_CXMENUCHECK), @@ -495,6 +519,11 @@ 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) { @@ -602,7 +631,7 @@ wxRendererXP::DrawComboBoxDropButton(wxWindow * win, wxUxThemeEngine::Get()->DrawThemeBackground ( hTheme, - GetHdcOf(*((wxMSWDCImpl*)dc.GetImpl())), + GetHdcOf(dc.GetTempHDC()), CP_DROPDOWNBUTTON, state, &r, @@ -638,7 +667,7 @@ wxRendererXP::DrawHeaderButton(wxWindow *win, wxUxThemeEngine::Get()->DrawThemeBackground ( hTheme, - GetHdcOf(*((wxMSWDCImpl*)dc.GetImpl())), + GetHdcOf(dc.GetTempHDC()), HP_HEADERITEM, state, &r, @@ -674,7 +703,7 @@ wxRendererXP::DrawTreeItemButton(wxWindow *win, wxUxThemeEngine::Get()->DrawThemeBackground ( hTheme, - GetHdcOf(*((wxMSWDCImpl*)dc.GetImpl())), + GetHdcOf(dc.GetTempHDC()), TVP_GLYPH, state, &r, @@ -693,29 +722,24 @@ wxRendererXP::DoDrawXPButton(int kind, if ( !hTheme ) return false; - RECT r; - wxCopyRectToRECT(rect, r); - - // determine the base state depending on the button kind - int state; - switch ( kind ) - { - case BP_PUSHBUTTON: - state = PBS_NORMAL; - break; + DoDrawButtonLike(hTheme, kind, dc, rect, flags); - case BP_RADIOBUTTON: - state = RBS_UNCHECKEDNORMAL; - break; + return true; +} - case BP_CHECKBOX: - state = CBS_UNCHECKEDNORMAL; - break; +void +wxRendererXP::DoDrawButtonLike(HTHEME htheme, + int part, + wxDC& dc, + const wxRect& rect, + int flags) +{ + RECT r; + wxCopyRectToRECT(rect, r); - default: - wxFAIL_MSG( "unknown button kind" ); - return false; - } + // the base state is always 1, whether it is PBS_NORMAL, + // {CBS,RBS}_UNCHECKEDNORMAL or CBS_NORMAL + int state = 1; // XBS_XXX is followed by XBX_XXXHOT, then XBS_XXXPRESSED and DISABLED enum @@ -742,20 +766,63 @@ wxRendererXP::DoDrawXPButton(int kind, else if ( flags & wxCONTROL_CURRENT ) state += HOT_OFFSET; // wxCONTROL_ISDEFAULT flag is only valid for push buttons - else if ( kind == BP_PUSHBUTTON && (flags & wxCONTROL_ISDEFAULT) ) + else if ( part == BP_PUSHBUTTON && (flags & wxCONTROL_ISDEFAULT) ) state = PBS_DEFAULTED; wxUxThemeEngine::Get()->DrawThemeBackground ( - hTheme, - GetHdcOf(*((wxMSWDCImpl*)dc.GetImpl())), - kind, + htheme, + GetHdcOf(dc.GetTempHDC()), + part, state, &r, NULL ); +} - return true; +void +wxRendererXP::DrawTitleBarBitmap(wxWindow *win, + wxDC& dc, + const wxRect& rect, + wxTitleBarButton button, + int flags) +{ + wxUxThemeHandle hTheme(win, L"WINDOW"); + if ( !hTheme ) + { + m_rendererNative.DrawTitleBarBitmap(win, dc, rect, button, flags); + return; + } + + int part; + switch ( button ) + { + case wxTITLEBAR_BUTTON_CLOSE: + part = WP_CLOSEBUTTON; + break; + + case wxTITLEBAR_BUTTON_MAXIMIZE: + part = WP_MAXBUTTON; + break; + + 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); } // ----------------------------------------------------------------------------