Amebis/wxWidgets
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

implement DrawCheckBox() in class Win32 renderer (modified patch 1691478)

Browse Source 
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@45491 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
This commit is contained in:
Vadim Zeitlin
2007-04-16 00:51:31 +00:00
parent 15b239c0eb
commit 59ee63e934
1 changed files with 44 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

50
src/msw/renderer.cpp
View File

@@ -80,6 +80,10 @@
#define DFCS_FLAT 0 #define DFCS_FLAT 0
#endif #endif
#ifndef DFCS_HOT
#define DFCS_HOT 0x1000
#endif
// ---------------------------------------------------------------------------- // ----------------------------------------------------------------------------
// wxRendererMSW: wxRendererNative implementation for "old" Win32 systems // wxRendererMSW: wxRendererNative implementation for "old" Win32 systems
// ---------------------------------------------------------------------------- // ----------------------------------------------------------------------------
@@ -96,6 +100,11 @@ public:
const wxRect& rect, const wxRect& rect,
int flags = 0); int flags = 0);
virtual void DrawCheckBox(wxWindow *win,
wxDC& dc,
const wxRect& rect,
int flags = 0);
virtual void DrawPushButton(wxWindow *win, virtual void DrawPushButton(wxWindow *win,
wxDC& dc, wxDC& dc,
const wxRect& rect, const wxRect& rect,
@@ -212,6 +221,28 @@ wxRendererMSW::DrawComboBoxDropButton(wxWindow * WXUNUSED(win),
::DrawFrameControl(GetHdcOf(dc), &r, DFC_SCROLL, style); ::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_PRESSED )
style |= DFCS_PUSHED;
if ( flags & wxCONTROL_CURRENT )
style |= DFCS_HOT;
::DrawFrameControl(GetHdcOf(dc), &r, DFC_BUTTON, style);
}
void void
wxRendererMSW::DrawPushButton(wxWindow * WXUNUSED(win), wxRendererMSW::DrawPushButton(wxWindow * WXUNUSED(win),
wxDC& dc, wxDC& dc,
@@ -416,13 +447,20 @@ wxRendererXP::DrawCheckBox(wxWindow *win,
else else
state = CBS_UNCHECKEDNORMAL; state = CBS_UNCHECKEDNORMAL;
// CBS_XXX is followed by CBX_XXXGOT, then CBS_XXXPRESSED and DISABLED // CBS_XXX is followed by CBX_XXXHOT, then CBS_XXXPRESSED and DISABLED
if ( flags & wxCONTROL_CURRENT ) enum
state += 1; {
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 ) else if ( flags & wxCONTROL_PRESSED )
state += 2; state += CBS_PRESSED_OFFSET;
else if ( flags & wxCONTROL_DISABLED ) else if ( flags & wxCONTROL_CURRENT )
state += 3; state += CBS_HOT_OFFSET;
wxUxThemeEngine::Get()->DrawThemeBackground wxUxThemeEngine::Get()->DrawThemeBackground
( (