#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/settings.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
#define HIS_NORMAL 1
#define HIS_HOT 2
#define HIS_PRESSED 3
+
+ #define TMT_HEIGHT 2417
+
+ #define HP_HEADERSORTARROW 4
+ #define HSAS_SORTEDUP 1
+ #define HSAS_SORTEDDOWN 2
#endif
#if defined(__WXWINCE__) && !defined(DFCS_FLAT)
#define DFCS_FLAT 0
#endif
+#ifndef DFCS_HOT
+ #define DFCS_HOT 0x1000
+#endif
+
// ----------------------------------------------------------------------------
// wxRendererMSW: wxRendererNative implementation for "old" Win32 systems
// ----------------------------------------------------------------------------
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,
static wxRendererNative& Get();
- virtual void DrawHeaderButton(wxWindow *win,
- wxDC& dc,
- const wxRect& rect,
- int flags = 0);
+ virtual int DrawHeaderButton(wxWindow *win,
+ wxDC& dc,
+ const wxRect& rect,
+ int flags = 0,
+ wxHeaderSortIconType sortArrow = wxHDR_SORT_ICON_NONE,
+ wxHeaderButtonParams* params = NULL);
+ virtual int GetHeaderButtonHeight(wxWindow *win);
+
virtual void DrawTreeItemButton(wxWindow *win,
wxDC& dc,
const wxRect& rect,
const wxRect& rect,
int flags = 0);
+ virtual void DrawItemSelectionRect(wxWindow *win,
+ wxDC& dc,
+ const wxRect& rect,
+ int flags = 0 );
+
+
virtual wxSplitterRenderParams GetSplitterParams(const wxWindow *win);
private:
DECLARE_NO_COPY_CLASS(wxRendererXP)
::DrawFrameControl(GetHdcOf(dc), &r, DFC_SCROLL, style);
}
+void
+wxRendererMSW::DrawCheckBox(wxWindow * WXUNUSED(win),
+ wxDC& dc,
+ const wxRect& rect,
+ int flags)
+{
+ RECT r;
+ wxCopyRectToRECT(rect, r);
+
+ int style = DFCS_BUTTONCHECK;
+ 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;
+ if ( flags & wxCONTROL_CURRENT )
+ style |= DFCS_HOT;
+
+ ::DrawFrameControl(GetHdcOf(dc), &r, DFC_BUTTON, style);
+}
+
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);
+ }
- ::DrawFrameControl(GetHdcOf(dc), &r, DFC_BUTTON, style);
+ RECT rc;
+ wxCopyRectToRECT(rect, rc);
+
+ ::DrawFrameControl(GetHdcOf(dc), &rc, DFC_BUTTON, style);
}
// ============================================================================
}
-void
+int
wxRendererXP::DrawHeaderButton(wxWindow *win,
wxDC& dc,
const wxRect& rect,
- int flags)
+ int flags,
+ wxHeaderSortIconType sortArrow,
+ wxHeaderButtonParams* params)
{
wxUxThemeHandle hTheme(win, L"HEADER");
if ( !hTheme )
{
- m_rendererNative.DrawHeaderButton(win, dc, rect, flags);
- return;
+ return m_rendererNative.DrawHeaderButton(win, dc, rect, flags, sortArrow, params);
}
RECT r;
&r,
NULL
);
+
+ // NOTE: Using the theme to draw HP_HEADERSORTARROW doesn't do anything.
+ // Why? If this can be fixed then draw the sort arrows using the theme
+ // and then clear those flags before calling DrawHeaderButtonContents.
+
+ // Add any extras that are specified in flags and params
+ return DrawHeaderButtonContents(win, dc, rect, flags, sortArrow, params);
}
+
+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,
else
state = CBS_UNCHECKEDNORMAL;
- // CBS_XXX is followed by CBX_XXXGOT, then CBS_XXXPRESSED and DISABLED
- if ( flags & wxCONTROL_CURRENT )
- state += 1;
+ // CBS_XXX is followed by CBX_XXXHOT, then CBS_XXXPRESSED and DISABLED
+ enum
+ {
+ CBS_HOT_OFFSET = 1,
+ CBS_PRESSED_OFFSET = 2,
+ CBS_DISABLED_OFFSET = 3
+ };
+
+ if ( flags & wxCONTROL_DISABLED )
+ state += CBS_DISABLED_OFFSET;
else if ( flags & wxCONTROL_PRESSED )
- state += 2;
- else if ( flags & wxCONTROL_DISABLED )
- state += 3;
+ state += CBS_PRESSED_OFFSET;
+ else if ( flags & wxCONTROL_CURRENT )
+ state += CBS_HOT_OFFSET;
wxUxThemeEngine::Get()->DrawThemeBackground
(
}
+void
+wxRendererXP::DrawItemSelectionRect(wxWindow * WXUNUSED(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
+ {
+ brush = *wxTRANSPARENT_BRUSH;
+ }
+
+ dc.SetBrush(brush);
+
+ // unlike for wxRendererGeneric, on windows we _never_ want to draw
+ // the outline of the rectangle:
+ dc.SetPen(*wxTRANSPARENT_PEN);
+
+ dc.DrawRectangle( rect );
+}
+
+
+
// ----------------------------------------------------------------------------
// splitter drawing
// ----------------------------------------------------------------------------
projects / wxWidgets.git / blobdiff