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

Renamed PATPAINT to PATTERNPAINT (The former is an existing define in wingdi.h); Cosmetic code cleanup.

Browse Source 
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@25362 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
This commit is contained in:
Dimitri Schoolwerth
2004-01-24 21:16:59 +00:00
parent b92ca05a69
commit a265d21aad
1 changed files with 56 additions and 52 deletions
Download Patch File Download Diff File Expand all files Collapse all files

38
src/msw/bmpbuttn.cpp
View File

@@ -100,7 +100,8 @@ bitmap "disabled" ,
#define BUTTON_HEIGHT_FACTOR (EDIT_CONTROL_FACTOR * 1.1) #define BUTTON_HEIGHT_FACTOR (EDIT_CONTROL_FACTOR * 1.1)
bool wxBitmapButton::Create(wxWindow *parent, wxWindowID id, const wxBitmap& bitmap, bool wxBitmapButton::Create(wxWindow *parent, wxWindowID id,
const wxBitmap& bitmap,
const wxPoint& pos, const wxPoint& pos,
const wxSize& size, long style, const wxSize& size, long style,
const wxValidator& wxVALIDATOR_PARAM(validator), const wxValidator& wxVALIDATOR_PARAM(validator),
@@ -157,8 +158,7 @@ bool wxBitmapButton::Create(wxWindow *parent, wxWindowID id, const wxBitmap& bit
msStyle |= BS_BOTTOM; msStyle |= BS_BOTTOM;
#endif #endif
m_hWnd = (WXHWND)CreateWindowEx m_hWnd = (WXHWND) CreateWindowEx(
(
0, 0,
wxT("BUTTON"), wxT("BUTTON"),
wxEmptyString, wxEmptyString,
@@ -177,7 +177,7 @@ bool wxBitmapButton::Create(wxWindow *parent, wxWindowID id, const wxBitmap& bit
SetSize(x, y, width, height); SetSize(x, y, width, height);
return TRUE; return true;
} }
// VZ: should be at the very least less than wxDEFAULT_BUTTON_MARGIN // VZ: should be at the very least less than wxDEFAULT_BUTTON_MARGIN
@@ -191,7 +191,7 @@ bool wxBitmapButton::MSWOnDraw(WXDRAWITEMSTRUCT *item)
{ {
// Let default procedure draw the bitmap, which is defined // Let default procedure draw the bitmap, which is defined
// in the Windows resource. // in the Windows resource.
return FALSE; return false;
} }
#endif #endif
@@ -215,7 +215,7 @@ bool wxBitmapButton::MSWOnDraw(WXDRAWITEMSTRUCT *item)
bitmap = &m_bmpNormal; bitmap = &m_bmpNormal;
if ( !bitmap->Ok() ) if ( !bitmap->Ok() )
return FALSE; return false;
// centre the bitmap in the control area // centre the bitmap in the control area
int x = lpDIS->rcItem.left; int x = lpDIS->rcItem.left;
@@ -258,8 +258,8 @@ bool wxBitmapButton::MSWOnDraw(WXDRAWITEMSTRUCT *item)
// draw the bitmap // draw the bitmap
wxDC dst; wxDC dst;
dst.SetHDC((WXHDC) hDC, FALSE); dst.SetHDC((WXHDC) hDC, false);
dst.DrawBitmap(*bitmap, x1, y1, TRUE); dst.DrawBitmap(*bitmap, x1, y1, true);
// draw focus / disabled state, if auto-drawing // draw focus / disabled state, if auto-drawing
if ( (state & ODS_DISABLED) && autoDraw ) if ( (state & ODS_DISABLED) && autoDraw )
@@ -267,7 +267,7 @@ bool wxBitmapButton::MSWOnDraw(WXDRAWITEMSTRUCT *item)
DrawButtonDisable((WXHDC) hDC, DrawButtonDisable((WXHDC) hDC,
lpDIS->rcItem.left, lpDIS->rcItem.top, lpDIS->rcItem.left, lpDIS->rcItem.top,
lpDIS->rcItem.right, lpDIS->rcItem.bottom, lpDIS->rcItem.right, lpDIS->rcItem.bottom,
TRUE); true);
} }
else if ( (state & ODS_FOCUS) && autoDraw ) else if ( (state & ODS_FOCUS) && autoDraw )
{ {
@@ -279,14 +279,15 @@ bool wxBitmapButton::MSWOnDraw(WXDRAWITEMSTRUCT *item)
isSelected); isSelected);
} }
return TRUE; return true;
} }
// GRG Feb/2000, support for bmp buttons with Win95/98 standard LNF // GRG Feb/2000, support for bmp buttons with Win95/98 standard LNF
#if defined(__WIN95__) #if defined(__WIN95__)
void wxBitmapButton::DrawFace( WXHDC dc, int left, int top, int right, int bottom, bool sel ) void wxBitmapButton::DrawFace( WXHDC dc, int left, int top,
int right, int bottom, bool sel )
{ {
HPEN oldp; HPEN oldp;
HPEN penHiLight; HPEN penHiLight;
@@ -342,7 +343,8 @@ void wxBitmapButton::DrawFace( WXHDC dc, int left, int top, int right, int botto
#else #else
void wxBitmapButton::DrawFace( WXHDC dc, int left, int top, int right, int bottom, bool sel ) void wxBitmapButton::DrawFace( WXHDC dc, int left, int top,
int right, int bottom, bool sel )
{ {
HPEN oldp; HPEN oldp;
HPEN penBorder; HPEN penBorder;
@@ -406,7 +408,8 @@ void wxBitmapButton::DrawFace( WXHDC dc, int left, int top, int right, int botto
#endif // defined(__WIN95__) #endif // defined(__WIN95__)
void wxBitmapButton::DrawButtonFocus( WXHDC dc, int left, int top, int right, int bottom, bool sel ) void wxBitmapButton::DrawButtonFocus( WXHDC dc, int left, int top, int right,
int bottom, bool WXUNUSED(sel) )
{ {
RECT rect; RECT rect;
rect.left = left; rect.left = left;
@@ -420,18 +423,19 @@ void wxBitmapButton::DrawButtonFocus( WXHDC dc, int left, int top, int right, in
if ( sel ) if ( sel )
OffsetRect( &rect, 1, 1 ); OffsetRect( &rect, 1, 1 );
*/ */
(void)sel;
DrawFocusRect( (HDC) dc, &rect ); DrawFocusRect( (HDC) dc, &rect );
} }
extern HBRUSH wxDisableButtonBrush; extern HBRUSH wxDisableButtonBrush;
void wxBitmapButton::DrawButtonDisable( WXHDC dc, int left, int top, int right, int bottom, bool with_marg ) void wxBitmapButton::DrawButtonDisable( WXHDC dc, int left, int top, int right,
int bottom, bool with_marg )
{ {
HBRUSH old = (HBRUSH) SelectObject( (HDC) dc, wxDisableButtonBrush ); HBRUSH old = (HBRUSH) SelectObject( (HDC) dc, wxDisableButtonBrush );
// ROP for "dest |= pattern" operation -- as it doesn't have a standard // ROP for "dest |= pattern" operation -- as it doesn't have a standard
// name, give it our own // name, give it our own
static const DWORD PATPAINT = 0xFA0089UL; static const DWORD PATTERNPAINT = 0xFA0089UL;
if ( with_marg ) if ( with_marg )
{ {
@@ -441,7 +445,7 @@ void wxBitmapButton::DrawButtonDisable( WXHDC dc, int left, int top, int right,
bottom -= 2 * m_marginY; bottom -= 2 * m_marginY;
} }
::PatBlt( (HDC) dc, left, top, right, bottom, PATPAINT); ::PatBlt( (HDC) dc, left, top, right, bottom, PATTERNPAINT);
::SelectObject( (HDC) dc, old ); ::SelectObject( (HDC) dc, old );
} }