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

fix ownerdrawn button label drawing in ODS_NOACCEL case (#3519)

Browse Source 
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@55725 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
This commit is contained in:
Vadim Zeitlin
2008-09-19 07:50:44 +00:00
parent e2074948cb
commit f915b92e09
1 changed files with 22 additions and 9 deletions
Download Patch File Download Diff File Expand all files Collapse all files

31
src/msw/button.cpp
View File

@@ -72,6 +72,10 @@
#define ODS_NOFOCUSRECT 0x0200 #define ODS_NOFOCUSRECT 0x0200
#endif #endif
#ifndef DT_HIDEPREFIX
#define DT_HIDEPREFIX 0x00100000
#endif
// ---------------------------------------------------------------------------- // ----------------------------------------------------------------------------
// macros // macros
// ---------------------------------------------------------------------------- // ----------------------------------------------------------------------------
@@ -590,11 +594,15 @@ WXLRESULT wxButton::MSWWindowProc(WXUINT nMsg, WXWPARAM wParam, WXLPARAM lParam)
static void DrawButtonText(HDC hdc, static void DrawButtonText(HDC hdc,
RECT *pRect, RECT *pRect,
const wxString& text, const wxString& text,
COLORREF col) COLORREF col,
int flags)
{ {
COLORREF colOld = SetTextColor(hdc, col); COLORREF colOld = SetTextColor(hdc, col);
int modeOld = SetBkMode(hdc, TRANSPARENT); int modeOld = SetBkMode(hdc, TRANSPARENT);
// center text horizontally in any case
flags |= DT_CENTER;
if ( text.find(_T('\n')) != wxString::npos ) if ( text.find(_T('\n')) != wxString::npos )
{ {
// draw multiline label // draw multiline label
@@ -613,13 +621,14 @@ static void DrawButtonText(HDC hdc,
rc.top = (pRect->bottom - pRect->top)/2 - h/2; rc.top = (pRect->bottom - pRect->top)/2 - h/2;
rc.bottom = rc.top+h; rc.bottom = rc.top+h;
::DrawText(hdc, text.wx_str(), text.length(), &rc, DT_CENTER); ::DrawText(hdc, text.wx_str(), text.length(), &rc, flags);
} }
else // single line label else // single line label
{ {
// Note: we must have DT_SINGLELINE for DT_VCENTER to work. // centre text vertically too (notice that we must have DT_SINGLELINE
// for DT_VCENTER to work)
::DrawText(hdc, text.wx_str(), text.length(), pRect, ::DrawText(hdc, text.wx_str(), text.length(), pRect,
DT_SINGLELINE | DT_CENTER | DT_VCENTER); flags | DT_SINGLELINE | DT_VCENTER);
} }
SetBkMode(hdc, modeOld); SetBkMode(hdc, modeOld);
@@ -898,11 +907,15 @@ bool wxButton::MSWOnDraw(WXDRAWITEMSTRUCT *wxdis)
} }
} }
COLORREF colFg = wxColourToRGB(GetForegroundColour()); COLORREF colFg = state & ODS_DISABLED
if ( state & ODS_DISABLED ) colFg = GetSysColor(COLOR_GRAYTEXT) ; ? ::GetSysColor(COLOR_GRAYTEXT)
wxString label = GetLabel(); : wxColourToRGB(GetForegroundColour());
if ( state & ODS_NOACCEL ) label = GetLabelText() ;
DrawButtonText(hdc, &rectBtn, label, colFg); // notice that DT_HIDEPREFIX doesn't work on old (pre-Windows 2000) systems
// but by happy coincidence ODS_NOACCEL is not used under them neither so
// DT_HIDEPREFIX should never be used there
DrawButtonText(hdc, &rectBtn, GetLabel(), colFg,
state & ODS_NOACCEL ? DT_HIDEPREFIX : 0);
return true; return true;
} }