#include "wx/splitter.h"
#include "wx/renderer.h"
+#include "wx/settings.h"
#include "wx/msw/uxtheme.h"
+#include "wx/msw/private.h"
+
+// tmschema.h is in Win32 Platform SDK and might not be available with earlier
+// compilers
+#ifndef CP_DROPDOWNBUTTON
+ #define CP_DROPDOWNBUTTON 1
+
+ #define CBXS_NORMAL 1
+ #define CBXS_HOT 2
+ #define CBXS_PRESSED 3
+ #define CBXS_DISABLED 4
+
+ #define TVP_GLYPH 2
+
+ #define GLPS_CLOSED 1
+ #define GLPS_OPENED 2
+
+ #define HP_HEADERITEM 1
+
+ #define HIS_NORMAL 1
+ #define HIS_HOT 2
+ #define HIS_PRESSED 3
+#endif
// ----------------------------------------------------------------------------
// wxRendererMSW: wxRendererNative implementation for "old" Win32 systems
// wxRendererXP: wxRendererNative implementation for Windows XP and later
// ----------------------------------------------------------------------------
+#if wxUSE_UXTHEME
+
class WXDLLEXPORT wxRendererXP : public wxDelegateRendererNative
{
public:
virtual wxSplitterRenderParams GetSplitterParams(const wxWindow *win);
+ virtual void DrawComboBoxDropButton(wxWindow *win,
+ wxDC& dc,
+ const wxRect& rect,
+ int flags = 0);
+ virtual void DrawTreeItemButton(wxWindow *win,
+ wxDC& dc,
+ const wxRect& rect,
+ int flags = 0);
+ virtual void DrawHeaderButton(wxWindow *win,
+ wxDC& dc,
+ const wxRect &rect,
+ int flags=0);
private:
DECLARE_NO_COPY_CLASS(wxRendererXP)
};
+#endif // wxUSE_UXTHEME
+
// ============================================================================
// wxRendererNative and wxRendererMSW implementation
// ============================================================================
/* static */
wxRendererNative& wxRendererNative::GetDefault()
{
+#if wxUSE_UXTHEME
wxUxThemeEngine *themeEngine = wxUxThemeEngine::Get();
- return themeEngine && themeEngine->IsAppThemed() ? wxRendererXP::Get()
- : wxRendererMSW::Get();
+ if ( themeEngine && themeEngine->IsAppThemed() )
+ return wxRendererXP::Get();
+#endif // wxUSE_UXTHEME
+
+ return wxRendererMSW::Get();
}
/* static */
return s_rendererMSW;
}
+#if defined(__WXWINCE__) && !defined(DFCS_FLAT)
+#define DFCS_FLAT 0
+#endif
+
void
wxRendererMSW::DrawComboBoxDropButton(wxWindow * WXUNUSED(win),
wxDC& dc,
RECT r;
r.left = rect.GetLeft();
r.top = rect.GetTop();
- r.bottom = rect.GetBottom();
- r.right = rect.GetRight();
+ r.bottom = rect.y + rect.height;
+ r.right = rect.x + rect.width;
int style = DFCS_SCROLLCOMBOBOX;
if ( flags & wxCONTROL_DISABLED )
style |= DFCS_INACTIVE;
if ( flags & wxCONTROL_PRESSED )
- style |= DFCS_PUSHED;
+ style |= DFCS_PUSHED | DFCS_FLAT;
::DrawFrameControl(GetHdcOf(dc), &r, DFC_SCROLL, style);
}
// wxRendererXP implementation
// ============================================================================
+#if wxUSE_UXTHEME
+
/* static */
wxRendererNative& wxRendererXP::Get()
{
return s_rendererXP;
}
+// NOTE: There is no guarantee that the button drawn fills the entire rect (XP
+// default theme, for example), so the caller should have cleared button's
+// background before this call. This is quite likely a wxMSW-specific thing.
+void
+wxRendererXP::DrawComboBoxDropButton(wxWindow * win,
+ wxDC& dc,
+ const wxRect& rect,
+ int flags)
+{
+ wxUxThemeHandle hTheme(win, L"COMBOBOX");
+ if ( hTheme )
+ {
+ RECT r;
+ r.left = rect.x;
+ r.top = rect.y;
+ r.right = rect.x + rect.width;
+ r.bottom = rect.y + rect.height;
+
+ int state;
+ if ( flags & wxCONTROL_PRESSED )
+ state = CBXS_PRESSED;
+ else if ( flags & wxCONTROL_CURRENT )
+ state = CBXS_HOT;
+ else if ( flags & wxCONTROL_DISABLED )
+ state = CBXS_DISABLED;
+ else
+ state = CBXS_NORMAL;
+
+ wxUxThemeEngine::Get()->DrawThemeBackground
+ (
+ hTheme,
+ (HDC) dc.GetHDC(),
+ CP_DROPDOWNBUTTON,
+ state,
+ &r,
+ NULL
+ );
+
+ }
+}
+
// ----------------------------------------------------------------------------
// splitter drawing
// ----------------------------------------------------------------------------
{
if ( !win->HasFlag(wxSP_NO_XP_THEME) )
{
- wxUxThemeHandle hTheme(win, L"WINDOW");
- if ( hTheme )
+ dc.SetPen(*wxTRANSPARENT_PEN);
+ dc.SetBrush(wxBrush(wxSystemSettings::GetColour(wxSYS_COLOUR_BTNFACE)));
+ if ( orient == wxVERTICAL )
+ {
+ dc.DrawRectangle(position, 0, SASH_WIDTH, size.y);
+ }
+ else // wxHORIZONTAL
{
- RECT rect;
- if ( orient == wxVERTICAL )
- {
- rect.left = position;
- rect.right = position + SASH_WIDTH;
- rect.top = 0;
- rect.bottom = size.y;
- }
- else // wxHORIZONTAL
- {
- rect.left = 0;
- rect.right = size.x;
- rect.top = position;
- rect.bottom = position + SASH_WIDTH;
- }
-
- wxUxThemeEngine::Get()->DrawThemeBackground
- (
- (WXHTHEME)hTheme,
- dc.GetHDC(),
- 29, // WP_DIALOG: dlg background
- 0, // no particular state
- &rect,
- NULL
- );
- return;
+ dc.DrawRectangle(0, position, size.x, SASH_WIDTH);
}
+
+ return;
}
m_rendererNative.DrawSplitterSash(win, dc, size, position, orient, flags);
}
+void
+wxRendererXP::DrawTreeItemButton(wxWindow *win,
+ wxDC &dc,
+ const wxRect &rect,
+ int flags)
+{
+ wxUxThemeHandle hTheme(win, L"TREEVIEW");
+ RECT r;
+ r.left = rect.x;
+ r.top = rect.y;
+ r.right = rect.x + rect.width;
+ r.bottom = rect.y + rect.height;
+ int state = (flags & wxCONTROL_EXPANDED) ? GLPS_OPENED : GLPS_CLOSED;
+ wxUxThemeEngine::Get()->DrawThemeBackground
+ (
+ hTheme,
+ (HDC) dc.GetHDC(),
+ TVP_GLYPH,
+ state,
+ &r,
+ NULL
+ );
+}
+
+void
+wxRendererXP::DrawHeaderButton(wxWindow *win,
+ wxDC &dc,
+ const wxRect &rect,
+ int flags)
+{
+ wxUxThemeHandle hTheme(win, L"HEADER");
+ RECT r;
+ r.left = rect.x;
+ r.top = rect.y;
+ r.right = rect.x + rect.width;
+ r.bottom = rect.y + rect.height;
+ int state;
+ if ( flags & wxCONTROL_PRESSED )
+ state = HIS_PRESSED;
+ else if ( flags & wxCONTROL_CURRENT )
+ state = HIS_HOT;
+ else
+ state = HIS_NORMAL;
+ wxUxThemeEngine::Get()->DrawThemeBackground
+ (
+ hTheme,
+ (HDC) dc.GetHDC(),
+ HP_HEADERITEM,
+ state,
+ &r,
+ NULL
+ );
+}
+
+#endif // wxUSE_UXTHEME
+
projects / wxWidgets.git / blobdiff