// Created: 20.07.2003
// RCS-ID: $Id$
// Copyright: (c) 2003 Vadim Zeitlin <vadim@wxwindows.org>
-// License: wxWindows license
+// License: wxWindows licence
///////////////////////////////////////////////////////////////////////////////
// ============================================================================
#include "wx/dc.h"
#endif //WX_PRECOMP
+#include "wx/splitter.h"
#include "wx/renderer.h"
-
#include "wx/msw/uxtheme.h"
// ----------------------------------------------------------------------------
virtual void DrawSplitterBorder(wxWindow *win,
wxDC& dc,
- const wxRect& rect);
+ const wxRect& rect,
+ int flags = 0);
virtual void DrawSplitterSash(wxWindow *win,
wxDC& dc,
const wxSize& size,
wxCoord position,
- wxOrientation orient);
- virtual wxPoint GetSplitterSashAndBorder(const wxWindow *win);
+ wxOrientation orient,
+ int flags = 0);
+ virtual wxSplitterRenderParams GetSplitterParams(const wxWindow *win);
private:
DECLARE_NO_COPY_CLASS(wxRendererXP)
wxRendererNative& wxRendererNative::GetDefault()
{
wxUxThemeEngine *themeEngine = wxUxThemeEngine::Get();
- return themeEngine && themeEngine->IsThemeActive() ? wxRendererXP::Get()
- : wxRendererMSW::Get();
+ return themeEngine && themeEngine->IsAppThemed() ? wxRendererXP::Get()
+ : wxRendererMSW::Get();
}
/* static */
// the width of the sash: this is the same as used by Explorer...
static const wxCoord SASH_WIDTH = 4;
-wxPoint wxRendererXP::GetSplitterSashAndBorder(const wxWindow * WXUNUSED(win))
+wxSplitterRenderParams
+wxRendererXP::GetSplitterParams(const wxWindow * win)
{
- return wxPoint(SASH_WIDTH, 0);
+ if (win->GetWindowStyle() & wxSP_NO_XP_THEME)
+ return m_rendererNative.GetSplitterParams(win);
+ else
+ return wxSplitterRenderParams(SASH_WIDTH, 0, false);
}
void
-wxRendererXP::DrawSplitterBorder(wxWindow * WXUNUSED(win),
- wxDC& WXUNUSED(dc),
- const wxRect& WXUNUSED(rect))
+wxRendererXP::DrawSplitterBorder(wxWindow * win,
+ wxDC& dc,
+ const wxRect& rect,
+ int flags)
{
+ if (win->GetWindowStyle() & wxSP_NO_XP_THEME)
+ {
+ m_rendererNative.DrawSplitterBorder(win, dc, rect, flags);
+ }
}
void
wxDC& dc,
const wxSize& size,
wxCoord position,
- wxOrientation orient)
+ wxOrientation orient,
+ int flags)
{
+ if (win->GetWindowStyle() & wxSP_NO_XP_THEME)
+ {
+ m_rendererNative.DrawSplitterSash(
+ win, dc, size, position, orient, flags);
+ return;
+ }
+
// I don't know if it is correct to use the rebar background for the
// splitter but it least this works ok in the default theme
wxUxThemeHandle hTheme(win, L"REBAR");
if ( orient == wxVERTICAL )
{
rect.left = position;
- rect.right = position + SASH_WIDTH;
+ rect.right = position + SASH_WIDTH;
rect.top = 0;
rect.bottom = size.y;
}
0 /* no state */ ,
&rect,
NULL
- );
+ );
}
}