#include "wx/settings.h"
#endif //WX_PRECOMP
+#include "wx/scopeguard.h"
#include "wx/splitter.h"
#include "wx/renderer.h"
#include "wx/msw/private.h"
+#include "wx/msw/dc.h"
#include "wx/msw/uxtheme.h"
// tmschema.h is in Win32 Platform SDK and might not be available with earlier
#define HSAS_SORTEDDOWN 2
#endif
-#if defined(__WXWINCE__) && !defined(DFCS_FLAT)
- #define DFCS_FLAT 0
+#if defined(__WXWINCE__)
+ #ifndef DFCS_FLAT
+ #define DFCS_FLAT 0
+ #endif
+ #ifndef DFCS_MONO
+ #define DFCS_MONO 0
+ #endif
+#endif
+
+#ifndef DFCS_HOT
+ #define DFCS_HOT 0x1000
#endif
// ----------------------------------------------------------------------------
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,
int flags = 0);
+ virtual void DrawFocusRect(wxWindow* win,
+ wxDC& dc,
+ const wxRect& rect,
+ int flags = 0);
+
+ virtual wxSize GetCheckBoxSize(wxWindow *win);
+
+ virtual int GetHeaderButtonHeight(wxWindow *win);
+
private:
DECLARE_NO_COPY_CLASS(wxRendererMSW)
};
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,
int flags)
{
RECT r;
- r.left = rect.GetLeft();
- r.top = rect.GetTop();
- r.bottom = rect.y + rect.height;
- r.right = rect.x + rect.width;
+ wxCopyRectToRECT(rect, 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(*((wxMSWDCImpl*)dc.GetImpl())), &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(*((wxMSWDCImpl*)dc.GetImpl())), &r, DFC_BUTTON, style);
}
void
RECT rc;
wxCopyRectToRECT(rect, rc);
- ::DrawFrameControl(GetHdcOf(dc), &rc, DFC_BUTTON, style);
+ ::DrawFrameControl(GetHdcOf(*((wxMSWDCImpl*)dc.GetImpl())), &rc, DFC_BUTTON, style);
+}
+
+void wxRendererMSW::DrawFocusRect(wxWindow * WXUNUSED(win),
+ wxDC& dc,
+ const wxRect& rect,
+ int WXUNUSED(flags))
+{
+ RECT rc;
+ wxCopyRectToRECT(rect, rc);
+
+ ::DrawFocusRect(GetHdcOf(*((wxMSWDCImpl*)dc.GetImpl())), &rc);
+}
+
+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;
+
+ 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;
}
// ============================================================================
wxUxThemeEngine::Get()->DrawThemeBackground
(
hTheme,
- GetHdcOf(dc),
+ GetHdcOf(*((wxMSWDCImpl*)dc.GetImpl())),
CP_DROPDOWNBUTTON,
state,
&r,
wxUxThemeEngine::Get()->DrawThemeBackground
(
hTheme,
- GetHdcOf(dc),
+ GetHdcOf(*((wxMSWDCImpl*)dc.GetImpl())),
HP_HEADERITEM,
state,
&r,
// 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,
wxUxThemeEngine::Get()->DrawThemeBackground
(
hTheme,
- GetHdcOf(dc),
+ GetHdcOf(*((wxMSWDCImpl*)dc.GetImpl())),
TVP_GLYPH,
state,
&r,
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
(
hTheme,
- GetHdcOf(dc),
+ GetHdcOf(*((wxMSWDCImpl*)dc.GetImpl())),
BP_CHECKBOX,
state,
&r,
wxUxThemeEngine::Get()->DrawThemeBackground
(
hTheme,
- GetHdcOf(dc),
+ GetHdcOf(*((wxMSWDCImpl*)dc.GetImpl())),
BP_PUSHBUTTON,
state,
&r,
}
void
-wxRendererXP::DrawItemSelectionRect(wxWindow * WXUNUSED(win),
+wxRendererXP::DrawItemSelectionRect(wxWindow *win,
wxDC& dc,
const wxRect& rect,
int flags)
}
else // !focused
{
- brush = wxBrush(wxSystemSettings::GetColour(wxSYS_COLOUR_BTNSHADOW));
+ brush = wxBrush(wxSystemSettings::GetColour(wxSYS_COLOUR_BTNFACE));
}
}
else // !selected
}
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 );
+
+ if ((flags & wxCONTROL_FOCUSED) && (flags & wxCONTROL_CURRENT))
+ DrawFocusRect( win, dc, rect, flags );
}
projects / wxWidgets.git / blobdiff