// Created: 20.07.2003
// RCS-ID: $Id$
// Copyright: (c) 2003 Vadim Zeitlin <vadim@wxwindows.org>
-// License: wxWindows licence
+// Licence: wxWindows licence
///////////////////////////////////////////////////////////////////////////////
// ============================================================================
#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"
// 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)
#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
+
+ #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
+ #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
+// ----------------------------------------------------------------------------
+// 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() { }
const wxRect& rect,
int flags = 0);
+ virtual void DrawCheckBox(wxWindow *win,
+ wxDC& dc,
+ const wxRect& rect,
+ 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 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 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);
};
// ----------------------------------------------------------------------------
#if wxUSE_UXTHEME
-class WXDLLEXPORT wxRendererXP : public wxDelegateRendererNative
+class wxRendererXP : public wxRendererMSWBase
{
public:
- wxRendererXP() : wxDelegateRendererNative(wxRendererMSW::Get()) { }
+ wxRendererXP() : wxRendererMSWBase(wxRendererMSW::Get()) { }
static wxRendererNative& Get();
int flags = 0,
wxHeaderSortIconType sortArrow = wxHDR_SORT_ICON_NONE,
wxHeaderButtonParams* params = NULL);
- virtual int GetHeaderButtonHeight(wxWindow *win);
virtual void DrawTreeItemButton(wxWindow *win,
wxDC& dc,
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
// ============================================================================
const wxRect& rect,
int flags)
{
+ wxCHECK_RET( dc.GetImpl(), wxT("Invalid wxDC") );
+
+ wxRect adjustedRect = dc.GetImpl()->MSWApplyGDIPlusTransform(rect);
+
RECT r;
- r.left = rect.GetLeft();
- r.top = rect.GetTop();
- r.bottom = rect.y + rect.height;
- r.right = rect.x + rect.width;
+ wxCopyRectToRECT(adjustedRect, r);
int style = DFCS_SCROLLCOMBOBOX;
if ( flags & wxCONTROL_DISABLED )
if ( flags & wxCONTROL_PRESSED )
style |= DFCS_PUSHED | DFCS_FLAT;
- ::DrawFrameControl(GetHdcOf(dc), &r, DFC_SCROLL, style);
+ ::DrawFrameControl(GetHdcOf(dc.GetTempHDC()), &r, DFC_SCROLL, style);
}
void
-wxRendererMSW::DrawPushButton(wxWindow * WXUNUSED(win),
- wxDC& dc,
- const wxRect& rectOrig,
- int flags)
+wxRendererMSW::DoDrawFrameControl(UINT type,
+ UINT kind,
+ wxWindow * WXUNUSED(win),
+ wxDC& dc,
+ const wxRect& rect,
+ int flags)
{
- wxRect rect(rectOrig);
+ wxCHECK_RET( dc.GetImpl(), wxT("Invalid wxDC") );
- int style = DFCS_BUTTONPUSH;
+ wxRect adjustedRect = dc.GetImpl()->MSWApplyGDIPlusTransform(rect);
+
+ RECT r;
+ wxCopyRectToRECT(adjustedRect, r);
+
+ int style = kind;
+ 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 | DFCS_FLAT;
+ 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(GetHdcOf(dc.GetTempHDC()), &r, type, style);
+}
+
+void
+wxRendererMSW::DrawPushButton(wxWindow *win,
+ wxDC& dc,
+ const wxRect& rectOrig,
+ int flags)
+{
+ wxRect rect(rectOrig);
if ( flags & wxCONTROL_ISDEFAULT )
{
// DrawFrameControl() doesn't seem to support default buttons so we
rect.Deflate(1);
}
- RECT rc;
- wxCopyRectToRECT(rect, rc);
+ 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),
+ ::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;
- ::DrawFrameControl(GetHdcOf(dc), &rc, DFC_BUTTON, style);
+ 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;
}
+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* WXUNUSED(win),
+ wxDC& dc,
+ const wxRect& rect,
+ int WXUNUSED(flags))
+{
+ wxColour fill;
+ wxColour bdr;
+ {
+ fill = wxSystemSettings::GetColour(wxSYS_COLOUR_WINDOW);
+ bdr = *wxBLACK;
+ }
+
+ dc.SetPen(bdr);
+ dc.SetBrush(fill);
+ dc.DrawRectangle(rect);
+}
+
+
// ============================================================================
// wxRendererXP implementation
// ============================================================================
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 )
wxUxThemeEngine::Get()->DrawThemeBackground
(
hTheme,
- GetHdcOf(dc),
+ GetHdcOf(dc.GetTempHDC()),
CP_DROPDOWNBUTTON,
state,
&r,
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 )
wxUxThemeEngine::Get()->DrawThemeBackground
(
hTheme,
- GetHdcOf(dc),
+ GetHdcOf(dc.GetTempHDC()),
HP_HEADERITEM,
state,
&r,
}
-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,
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(dc),
+ GetHdcOf(dc.GetTempHDC()),
TVP_GLYPH,
state,
&r,
);
}
-void
-wxRendererXP::DrawCheckBox(wxWindow *win,
- wxDC& dc,
- const wxRect& rect,
- int flags)
+bool
+wxRendererXP::DoDrawXPButton(int kind,
+ wxWindow *win,
+ wxDC& dc,
+ const wxRect& rect,
+ int flags)
{
wxUxThemeHandle hTheme(win, L"BUTTON");
if ( !hTheme )
- {
- m_rendererNative.DrawCheckBox(win, dc, rect, flags);
- return;
- }
+ return false;
+
+ DoDrawButtonLike(hTheme, kind, dc, rect, flags);
+
+ return true;
+}
+
+void
+wxRendererXP::DoDrawButtonLike(HTHEME htheme,
+ int part,
+ 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 state;
+ // 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
+ {
+ 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 = CBS_CHECKEDNORMAL;
+ state += STATES_COUNT;
else if ( flags & wxCONTROL_UNDETERMINED )
- state = CBS_MIXEDNORMAL;
- else
- state = CBS_UNCHECKEDNORMAL;
+ state += 2*STATES_COUNT;
- // CBS_XXX is followed by CBX_XXXGOT, then CBS_XXXPRESSED and DISABLED
- if ( flags & wxCONTROL_CURRENT )
- state += 1;
+ if ( flags & wxCONTROL_DISABLED )
+ state += DISABLED_OFFSET;
else if ( flags & wxCONTROL_PRESSED )
- state += 2;
- else if ( flags & wxCONTROL_DISABLED )
- state += 3;
+ state += PRESSED_OFFSET;
+ else if ( flags & wxCONTROL_CURRENT )
+ 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(dc),
- BP_CHECKBOX,
+ htheme,
+ GetHdcOf(dc.GetTempHDC()),
+ part,
state,
&r,
NULL
}
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(dc),
- 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 * WXUNUSED(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_BTNSHADOW));
- }
- }
- else // !selected
+ wxUxThemeHandle hTheme(win, L"EDIT");
+ if ( !hTheme )
{
- brush = *wxTRANSPARENT_BRUSH;
+ m_rendererNative.DrawTextCtrl(win,dc,rect,flags);
+ return;
}
- dc.SetBrush(brush);
+ wxColour fill;
+ wxColour bdr;
+ COLORREF cref;
- // unlike for wxRendererGeneric, on windows we _never_ want to draw
- // the outline of the rectangle:
- dc.SetPen(*wxTRANSPARENT_PEN);
+ wxUxThemeEngine::Get()->GetThemeColor(hTheme, EP_EDITTEXT,
+ ETS_NORMAL, TMT_FILLCOLOR, &cref);
+ fill = wxRGBToColour(cref);
- dc.DrawRectangle( rect );
-}
+ 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
projects / wxWidgets.git / blobdiff