X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/b07664068bc48173d08e3146ca05dceac275aa6a..56b9925b116dfa58028fccb2556852f2da2ab9ac:/src/msw/bmpbuttn.cpp diff --git a/src/msw/bmpbuttn.cpp b/src/msw/bmpbuttn.cpp index 32d792972a..9821e4a385 100644 --- a/src/msw/bmpbuttn.cpp +++ b/src/msw/bmpbuttn.cpp @@ -1,15 +1,15 @@ ///////////////////////////////////////////////////////////////////////////// -// Name: bmpbuttn.cpp +// Name: src/msw/bmpbuttn.cpp // Purpose: wxBitmapButton // Author: Julian Smart // Modified by: // Created: 04/01/98 // RCS-ID: $Id$ -// Copyright: (c) Julian Smart and Markus Holzem -// Licence: wxWindows license +// Copyright: (c) Julian Smart +// Licence: wxWindows licence ///////////////////////////////////////////////////////////////////////////// -#ifdef __GNUG__ +#if defined(__GNUG__) && !defined(NO_GCC_PRAGMA) #pragma implementation "bmpbuttn.h" #endif @@ -17,9 +17,11 @@ #include "wx/wxprec.h" #ifdef __BORLANDC__ -#pragma hdrstop + #pragma hdrstop #endif +#if wxUSE_BMPBUTTON + #ifndef WX_PRECOMP #include "wx/bmpbuttn.h" #include "wx/log.h" @@ -28,54 +30,119 @@ #include "wx/msw/private.h" +// ---------------------------------------------------------------------------- +// macros +// ---------------------------------------------------------------------------- + +#if wxUSE_EXTENDED_RTTI + +WX_DEFINE_FLAGS( wxBitmapButtonStyle ) + +wxBEGIN_FLAGS( wxBitmapButtonStyle ) + // new style border flags, we put them first to + // use them for streaming out + wxFLAGS_MEMBER(wxBORDER_SIMPLE) + wxFLAGS_MEMBER(wxBORDER_SUNKEN) + wxFLAGS_MEMBER(wxBORDER_DOUBLE) + wxFLAGS_MEMBER(wxBORDER_RAISED) + wxFLAGS_MEMBER(wxBORDER_STATIC) + wxFLAGS_MEMBER(wxBORDER_NONE) + + // old style border flags + wxFLAGS_MEMBER(wxSIMPLE_BORDER) + wxFLAGS_MEMBER(wxSUNKEN_BORDER) + wxFLAGS_MEMBER(wxDOUBLE_BORDER) + wxFLAGS_MEMBER(wxRAISED_BORDER) + wxFLAGS_MEMBER(wxSTATIC_BORDER) + wxFLAGS_MEMBER(wxBORDER) + + // standard window styles + wxFLAGS_MEMBER(wxTAB_TRAVERSAL) + wxFLAGS_MEMBER(wxCLIP_CHILDREN) + wxFLAGS_MEMBER(wxTRANSPARENT_WINDOW) + wxFLAGS_MEMBER(wxWANTS_CHARS) + wxFLAGS_MEMBER(wxFULL_REPAINT_ON_RESIZE) + wxFLAGS_MEMBER(wxALWAYS_SHOW_SB ) + wxFLAGS_MEMBER(wxVSCROLL) + wxFLAGS_MEMBER(wxHSCROLL) + + wxFLAGS_MEMBER(wxBU_AUTODRAW) + wxFLAGS_MEMBER(wxBU_LEFT) + wxFLAGS_MEMBER(wxBU_RIGHT) + wxFLAGS_MEMBER(wxBU_TOP) + wxFLAGS_MEMBER(wxBU_BOTTOM) +wxEND_FLAGS( wxBitmapButtonStyle ) + +IMPLEMENT_DYNAMIC_CLASS_XTI(wxBitmapButton, wxButton,"wx/bmpbuttn.h") + +wxBEGIN_PROPERTIES_TABLE(wxBitmapButton) + wxPROPERTY_FLAGS( WindowStyle , wxBitmapButtonStyle , long , SetWindowStyleFlag , GetWindowStyleFlag , , 0 /*flags*/ , wxT("Helpstring") , wxT("group")) // style +wxEND_PROPERTIES_TABLE() + +wxBEGIN_HANDLERS_TABLE(wxBitmapButton) +wxEND_HANDLERS_TABLE() + +wxCONSTRUCTOR_5( wxBitmapButton , wxWindow* , Parent , wxWindowID , Id , wxBitmap , Bitmap , wxPoint , Position , wxSize , Size ) + +#else IMPLEMENT_DYNAMIC_CLASS(wxBitmapButton, wxButton) +#endif + +/* +TODO PROPERTIES : + +long "style" , wxBU_AUTODRAW +bool "default" , 0 +bitmap "selected" , +bitmap "focus" , +bitmap "disabled" , +*/ #define BUTTON_HEIGHT_FACTOR (EDIT_CONTROL_FACTOR * 1.1) -bool wxBitmapButton::Create(wxWindow *parent, wxWindowID id, const wxBitmap& bitmap, - const wxPoint& pos, - const wxSize& size, long style, - const wxValidator& validator, - const wxString& name) +bool wxBitmapButton::Create(wxWindow *parent, wxWindowID id, + const wxBitmap& bitmap, + const wxPoint& pos, + const wxSize& size, long style, + const wxValidator& wxVALIDATOR_PARAM(validator), + const wxString& name) { - m_buttonBitmap = bitmap; - SetName(name); + m_bmpNormal = bitmap; + SetName(name); #if wxUSE_VALIDATORS - SetValidator(validator); + SetValidator(validator); #endif // wxUSE_VALIDATORS - parent->AddChild(this); + parent->AddChild(this); - m_backgroundColour = parent->GetBackgroundColour(); - m_foregroundColour = parent->GetForegroundColour(); - m_windowStyle = style; - m_marginX = 0; - m_marginY = 0; + m_backgroundColour = parent->GetBackgroundColour(); + m_foregroundColour = parent->GetForegroundColour(); + m_windowStyle = style; - if ( style & wxBU_AUTODRAW ) - { - m_marginX = wxDEFAULT_BUTTON_MARGIN; - m_marginY = wxDEFAULT_BUTTON_MARGIN; - } + if ( style & wxBU_AUTODRAW ) + { + m_marginX = wxDEFAULT_BUTTON_MARGIN; + m_marginY = wxDEFAULT_BUTTON_MARGIN; + } - int x = pos.x; - int y = pos.y; - int width = size.x; - int height = size.y; + int x = pos.x; + int y = pos.y; + int width = size.x; + int height = size.y; - if (id == -1) - m_windowId = NewControlId(); - else - m_windowId = id; + if (id == -1) + m_windowId = NewControlId(); + else + m_windowId = id; - if ( width == -1 && bitmap.Ok()) - width = bitmap.GetWidth() + 2*m_marginX; + if ( width == -1 && bitmap.Ok()) + width = bitmap.GetWidth() + 2*m_marginX; - if ( height == -1 && bitmap.Ok()) - height = bitmap.GetHeight() + 2*m_marginY; + if ( height == -1 && bitmap.Ok()) + height = bitmap.GetHeight() + 2*m_marginY; - long msStyle = WS_VISIBLE | WS_TABSTOP | WS_CHILD | BS_OWNERDRAW ; + long msStyle = WS_VISIBLE | WS_TABSTOP | WS_CHILD | BS_OWNERDRAW ; if ( m_windowStyle & wxCLIP_SIBLINGS ) msStyle |= WS_CLIPSIBLINGS; @@ -91,11 +158,10 @@ bool wxBitmapButton::Create(wxWindow *parent, wxWindowID id, const wxBitmap& bit msStyle |= BS_BOTTOM; #endif - m_hWnd = (WXHWND)CreateWindowEx - ( + m_hWnd = (WXHWND) CreateWindowEx( 0, wxT("BUTTON"), - wxT(""), + wxEmptyString, msStyle, 0, 0, 0, 0, GetWinHwnd(parent), @@ -104,19 +170,14 @@ bool wxBitmapButton::Create(wxWindow *parent, wxWindowID id, const wxBitmap& bit NULL ); - // Subclass again for purposes of dialog editing mode - SubclassWin(m_hWnd); + // Subclass again for purposes of dialog editing mode + SubclassWin(m_hWnd); - SetFont(parent->GetFont()); + SetFont(parent->GetFont()); - SetSize(x, y, width, height); + SetSize(x, y, width, height); - return TRUE; -} - -void wxBitmapButton::SetBitmapLabel(const wxBitmap& bitmap) -{ - m_buttonBitmap = bitmap; + return true; } // VZ: should be at the very least less than wxDEFAULT_BUTTON_MARGIN @@ -124,13 +185,13 @@ void wxBitmapButton::SetBitmapLabel(const wxBitmap& bitmap) bool wxBitmapButton::MSWOnDraw(WXDRAWITEMSTRUCT *item) { -#if defined(__WIN95__) +#ifndef __WXWINCE__ long style = GetWindowLong((HWND) GetHWND(), GWL_STYLE); if (style & BS_BITMAP) { // Let default procedure draw the bitmap, which is defined // in the Windows resource. - return FALSE; + return false; } #endif @@ -144,17 +205,17 @@ bool wxBitmapButton::MSWOnDraw(WXDRAWITEMSTRUCT *item) // choose the bitmap to use depending on the button state wxBitmap* bitmap; - if ( isSelected && m_buttonBitmapSelected.Ok() ) - bitmap = &m_buttonBitmapSelected; - else if ((state & ODS_FOCUS) && m_buttonBitmapFocus.Ok()) - bitmap = &m_buttonBitmapFocus; - else if ((state & ODS_DISABLED) && m_buttonBitmapDisabled.Ok()) - bitmap = &m_buttonBitmapDisabled; + if ( isSelected && m_bmpSelected.Ok() ) + bitmap = &m_bmpSelected; + else if ((state & ODS_FOCUS) && m_bmpFocus.Ok()) + bitmap = &m_bmpFocus; + else if ((state & ODS_DISABLED) && m_bmpDisabled.Ok()) + bitmap = &m_bmpDisabled; else - bitmap = &m_buttonBitmap; + bitmap = &m_bmpNormal; if ( !bitmap->Ok() ) - return FALSE; + return false; // centre the bitmap in the control area int x = lpDIS->rcItem.left; @@ -164,8 +225,8 @@ bool wxBitmapButton::MSWOnDraw(WXDRAWITEMSTRUCT *item) int wBmp = bitmap->GetWidth(); int hBmp = bitmap->GetHeight(); - int x1,y1; - + int x1,y1; + if(m_windowStyle & wxBU_LEFT) x1 = x + (FOCUS_MARGIN+1); else if(m_windowStyle & wxBU_RIGHT) @@ -197,8 +258,8 @@ bool wxBitmapButton::MSWOnDraw(WXDRAWITEMSTRUCT *item) // draw the bitmap wxDC dst; - dst.SetHDC((WXHDC) hDC, FALSE); - dst.DrawBitmap(*bitmap, x1, y1, TRUE); + dst.SetHDC((WXHDC) hDC, false); + dst.DrawBitmap(*bitmap, x1, y1, true); // draw focus / disabled state, if auto-drawing if ( (state & ODS_DISABLED) && autoDraw ) @@ -206,7 +267,7 @@ bool wxBitmapButton::MSWOnDraw(WXDRAWITEMSTRUCT *item) DrawButtonDisable((WXHDC) hDC, lpDIS->rcItem.left, lpDIS->rcItem.top, lpDIS->rcItem.right, lpDIS->rcItem.bottom, - TRUE); + true); } else if ( (state & ODS_FOCUS) && autoDraw ) { @@ -218,14 +279,15 @@ bool wxBitmapButton::MSWOnDraw(WXDRAWITEMSTRUCT *item) isSelected); } - return TRUE; + return true; } // GRG Feb/2000, support for bmp buttons with Win95/98 standard LNF #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 penHiLight; @@ -239,7 +301,10 @@ void wxBitmapButton::DrawFace( WXHDC dc, int left, int top, int right, int botto penLight = CreatePen(PS_SOLID, 0, GetSysColor(COLOR_3DLIGHT)); penShadow = CreatePen(PS_SOLID, 0, GetSysColor(COLOR_3DSHADOW)); penDkShadow = CreatePen(PS_SOLID, 0, GetSysColor(COLOR_3DDKSHADOW)); - brushFace = CreateSolidBrush(GetSysColor(COLOR_BTNFACE)); + // brushFace = CreateSolidBrush(GetSysColor(COLOR_BTNFACE)); + // Taking the background colour fits in better with + // Windows XP themes. + brushFace = CreateSolidBrush(m_backgroundColour.m_pixel); // draw the rectangle RECT rect; @@ -251,20 +316,21 @@ void wxBitmapButton::DrawFace( WXHDC dc, int left, int top, int right, int botto // draw the border oldp = (HPEN) SelectObject( (HDC) dc, sel? penDkShadow : penHiLight); - MoveToEx((HDC) dc, left, top, NULL); LineTo((HDC) dc, right-1, top); - MoveToEx((HDC) dc, left, top+1, NULL); LineTo((HDC) dc, left, bottom-1); + + wxDrawLine((HDC) dc, left, top, right-1, top); + wxDrawLine((HDC) dc, left, top+1, left, bottom-1); SelectObject( (HDC) dc, sel? penShadow : penLight); - MoveToEx((HDC) dc, left+1, top+1, NULL); LineTo((HDC) dc, right-2, top+1); - MoveToEx((HDC) dc, left+1, top+2, NULL); LineTo((HDC) dc, left+1, bottom-2); + wxDrawLine((HDC) dc, left+1, top+1, right-2, top+1); + wxDrawLine((HDC) dc, left+1, top+2, left+1, bottom-2); SelectObject( (HDC) dc, sel? penLight : penShadow); - MoveToEx((HDC) dc, left+1, bottom-2, NULL); LineTo((HDC) dc, right-1, bottom-2); - MoveToEx((HDC) dc, right-2, bottom-3, NULL); LineTo((HDC) dc, right-2, top); + wxDrawLine((HDC) dc, left+1, bottom-2, right-1, bottom-2); + wxDrawLine((HDC) dc, right-2, bottom-3, right-2, top); SelectObject( (HDC) dc, sel? penHiLight : penDkShadow); - MoveToEx((HDC) dc, left, bottom-1, NULL); LineTo((HDC) dc, right+2, bottom-1); - MoveToEx((HDC) dc, right-1, bottom-2, NULL); LineTo((HDC) dc, right-1, top-1); + wxDrawLine((HDC) dc, left, bottom-1, right+2, bottom-1); + wxDrawLine((HDC) dc, right-1, bottom-2, right-1, top-1); // delete allocated resources SelectObject((HDC) dc,oldp); @@ -277,7 +343,8 @@ void wxBitmapButton::DrawFace( WXHDC dc, int left, int top, int right, int botto #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 penBorder; @@ -341,7 +408,8 @@ void wxBitmapButton::DrawFace( WXHDC dc, int left, int top, int right, int botto #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.left = left; @@ -355,21 +423,19 @@ void wxBitmapButton::DrawButtonFocus( WXHDC dc, int left, int top, int right, in if ( sel ) OffsetRect( &rect, 1, 1 ); */ - (void)sel; + DrawFocusRect( (HDC) dc, &rect ); } 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 ); - // VZ: what's this?? there is no such ROP AFAIK -#ifdef __SALFORDC__ - DWORD dwRop = 0xFA0089L; -#else - DWORD dwRop = 0xFA0089UL; -#endif + // ROP for "dest |= pattern" operation -- as it doesn't have a standard + // name, give it our own + static const DWORD PATTERNPAINT = 0xFA0089UL; if ( with_marg ) { @@ -379,7 +445,7 @@ void wxBitmapButton::DrawButtonDisable( WXHDC dc, int left, int top, int right, bottom -= 2 * m_marginY; } - ::PatBlt( (HDC) dc, left, top, right, bottom, dwRop); + ::PatBlt( (HDC) dc, left, top, right, bottom, PATTERNPAINT); ::SelectObject( (HDC) dc, old ); } @@ -388,3 +454,5 @@ void wxBitmapButton::SetDefault() { wxButton::SetDefault(); } + +#endif // wxUSE_BMPBUTTON