#include "wx/splitter.h"
#include "wx/renderer.h"
-#include "wx/msw/uxtheme.h"
#include "wx/msw/private.h"
+#include "wx/msw/uxtheme.h"
// tmschema.h is in Win32 Platform SDK and might not be available with earlier
// compilers
static wxRendererNative& Get();
- virtual void DrawHeaderButton(wxWindow *win,
+ virtual int DrawHeaderButton(wxWindow *win,
wxDC& dc,
const wxRect& rect,
int flags = 0,
void
wxRendererMSW::DrawPushButton(wxWindow * WXUNUSED(win),
wxDC& dc,
- const wxRect& rect,
+ const wxRect& rectOrig,
int flags)
{
- RECT r;
- r.left = rect.GetLeft();
- r.top = rect.GetTop();
- r.bottom = rect.y + rect.height;
- r.right = rect.x + rect.width;
+ 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
+ // have to draw the border ourselves
+ wxDCPenChanger pen(dc, *wxBLACK_PEN);
+ wxDCBrushChanger brush(dc, *wxTRANSPARENT_BRUSH);
+ dc.DrawRectangle(rect);
+ rect.Deflate(1);
+ }
+
+ RECT rc;
+ wxCopyRectToRECT(rect, rc);
- ::DrawFrameControl(GetHdcOf(dc), &r, DFC_BUTTON, style);
+ ::DrawFrameControl(GetHdcOf(dc), &rc, DFC_BUTTON, style);
}
// ============================================================================
}
-void
+int
wxRendererXP::DrawHeaderButton(wxWindow *win,
wxDC& dc,
const wxRect& rect,
wxUxThemeHandle hTheme(win, L"HEADER");
if ( !hTheme )
{
- m_rendererNative.DrawHeaderButton(win, dc, rect, flags, sortArrow, params);
- return;
+ return m_rendererNative.DrawHeaderButton(win, dc, rect, flags, sortArrow, params);
}
RECT r;
// and then clear those flags before calling DrawHeaderButtonContents.
// Add any extras that are specified in flags and params
- DrawHeaderButtonContents(win, dc, rect, flags, sortArrow, params);
+ return DrawHeaderButtonContents(win, dc, rect, flags, sortArrow, params);
}