X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/1169a91932273bc84c23ed9dbd0a2da064d59d66..c66b63e565d340f3a73441a4f780ab57842c7851:/src/msw/bmpbuttn.cpp diff --git a/src/msw/bmpbuttn.cpp b/src/msw/bmpbuttn.cpp index 080081a63a..535ac94e9c 100644 --- a/src/msw/bmpbuttn.cpp +++ b/src/msw/bmpbuttn.cpp @@ -100,58 +100,52 @@ bitmap "disabled" , #define BUTTON_HEIGHT_FACTOR (EDIT_CONTROL_FACTOR * 1.1) -wxBitmapButtonBase::wxBitmapButtonBase() - : m_bmpNormal(), - m_bmpSelected(), - m_bmpFocus(), - m_bmpDisabled(), - m_marginX(0), - m_marginY(0) +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) { -} - -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_bmpNormal = 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_backgroundColour = parent->GetBackgroundColour(); + m_foregroundColour = parent->GetForegroundColour(); + m_windowStyle = style; - 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; + if ( style & wxBU_AUTODRAW ) + { + m_marginX = wxDEFAULT_BUTTON_MARGIN; + m_marginY = wxDEFAULT_BUTTON_MARGIN; + } - if (id == -1) - m_windowId = NewControlId(); - else - m_windowId = id; + int x = pos.x; + int y = pos.y; + int width = size.x; + int height = size.y; - if ( width == -1 && bitmap.Ok()) - width = bitmap.GetWidth() + 2*m_marginX; + if (id == -1) + m_windowId = NewControlId(); + else + m_windowId = id; - if ( height == -1 && bitmap.Ok()) - height = bitmap.GetHeight() + 2*m_marginY; + if ( bitmap.Ok() ) + { + wxSize newSize = DoGetBestSize(); + if ( width == -1 ) + width = newSize.x; + if ( height == -1 ) + height = newSize.y; + } - 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; @@ -167,8 +161,7 @@ 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"), wxEmptyString, @@ -180,14 +173,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; + return true; } // VZ: should be at the very least less than wxDEFAULT_BUTTON_MARGIN @@ -201,7 +194,7 @@ bool wxBitmapButton::MSWOnDraw(WXDRAWITEMSTRUCT *item) { // Let default procedure draw the bitmap, which is defined // in the Windows resource. - return FALSE; + return false; } #endif @@ -225,7 +218,7 @@ bool wxBitmapButton::MSWOnDraw(WXDRAWITEMSTRUCT *item) bitmap = &m_bmpNormal; if ( !bitmap->Ok() ) - return FALSE; + return false; // centre the bitmap in the control area int x = lpDIS->rcItem.left; @@ -235,8 +228,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) @@ -268,8 +261,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 ) @@ -277,7 +270,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 ) { @@ -289,14 +282,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; @@ -352,7 +346,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; @@ -416,7 +411,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; @@ -430,21 +426,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 ) { @@ -454,7 +448,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 ); } @@ -464,4 +458,29 @@ void wxBitmapButton::SetDefault() wxButton::SetDefault(); } +wxSize wxBitmapButton::DoGetBestSize() const +{ + wxSize best; + if (m_bmpNormal.Ok()) + { + best.x = m_bmpNormal.GetWidth() + 2*m_marginX; + best.y = m_bmpNormal.GetHeight() + 2*m_marginY; + } + + // all buttons have at least the standard size unless the user explicitly + // wants them to be of smaller size and used wxBU_EXACTFIT style when + // creating the button + if ( !HasFlag(wxBU_EXACTFIT) ) + { + wxSize sz = GetDefaultSize(); + if (best.x > sz.x) + sz.x = best.x; + if (best.y > sz.y) + sz.y = best.y; + } + + return best; +} + #endif // wxUSE_BMPBUTTON +