X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/5ab1fa8e6432cd95f93aad791d898f6a8243c530..c7de4135b619a045593a42dcbb1d1e8a7858cdcc:/src/msw/bmpbuttn.cpp diff --git a/src/msw/bmpbuttn.cpp b/src/msw/bmpbuttn.cpp index 266adcd3d0..cb9c724e6e 100644 --- a/src/msw/bmpbuttn.cpp +++ b/src/msw/bmpbuttn.cpp @@ -1,5 +1,5 @@ ///////////////////////////////////////////////////////////////////////////// -// Name: bmpbuttn.cpp +// Name: src/msw/bmpbuttn.cpp // Purpose: wxBitmapButton // Author: Julian Smart // Modified by: @@ -17,12 +17,15 @@ #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" + #include "wx/dcmemory.h" #endif #include "wx/msw/private.h" @@ -37,7 +40,7 @@ bool wxBitmapButton::Create(wxWindow *parent, wxWindowID id, const wxBitmap& bit const wxValidator& validator, const wxString& name) { - m_buttonBitmap = bitmap; + m_bmpNormal = bitmap; SetName(name); #if wxUSE_VALIDATORS @@ -49,8 +52,6 @@ bool wxBitmapButton::Create(wxWindow *parent, wxWindowID id, const wxBitmap& bit m_backgroundColour = parent->GetBackgroundColour(); m_foregroundColour = parent->GetForegroundColour(); m_windowStyle = style; - m_marginX = 0; - m_marginY = 0; if ( style & wxBU_AUTODRAW ) { @@ -74,13 +75,29 @@ bool wxBitmapButton::Create(wxWindow *parent, wxWindowID id, const wxBitmap& bit if ( height == -1 && bitmap.Ok()) height = bitmap.GetHeight() + 2*m_marginY; + long msStyle = WS_VISIBLE | WS_TABSTOP | WS_CHILD | BS_OWNERDRAW ; + + if ( m_windowStyle & wxCLIP_SIBLINGS ) + msStyle |= WS_CLIPSIBLINGS; + +#ifdef __WIN32__ + if(m_windowStyle & wxBU_LEFT) + msStyle |= BS_LEFT; + if(m_windowStyle & wxBU_RIGHT) + msStyle |= BS_RIGHT; + if(m_windowStyle & wxBU_TOP) + msStyle |= BS_TOP; + if(m_windowStyle & wxBU_BOTTOM) + msStyle |= BS_BOTTOM; +#endif + m_hWnd = (WXHWND)CreateWindowEx ( 0, wxT("BUTTON"), wxT(""), - WS_VISIBLE | WS_TABSTOP | WS_CHILD | BS_OWNERDRAW , - 0, 0, 0, 0, + msStyle, + 0, 0, 0, 0, GetWinHwnd(parent), (HMENU)m_windowId, wxGetInstance(), @@ -97,10 +114,8 @@ bool wxBitmapButton::Create(wxWindow *parent, wxWindowID id, const wxBitmap& bit return TRUE; } -void wxBitmapButton::SetBitmapLabel(const wxBitmap& bitmap) -{ - m_buttonBitmap = bitmap; -} +// VZ: should be at the very least less than wxDEFAULT_BUTTON_MARGIN +#define FOCUS_MARGIN 3 bool wxBitmapButton::MSWOnDraw(WXDRAWITEMSTRUCT *item) { @@ -115,47 +130,58 @@ bool wxBitmapButton::MSWOnDraw(WXDRAWITEMSTRUCT *item) #endif LPDRAWITEMSTRUCT lpDIS = (LPDRAWITEMSTRUCT) item; + HDC hDC = lpDIS->hDC; + UINT state = lpDIS->itemState; + bool isSelected = (state & ODS_SELECTED) != 0; + bool autoDraw = (GetWindowStyleFlag() & wxBU_AUTODRAW) != 0; + - // choose the bitmap to use depending on the buttons state + // choose the bitmap to use depending on the button state wxBitmap* bitmap; - UINT state = lpDIS->itemState; - bool isSelected = (state & ODS_SELECTED) != 0; - 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; - // draw it on the memory DC - HDC hDC = lpDIS->hDC; - HDC memDC = ::CreateCompatibleDC(hDC); + // centre the bitmap in the control area + int x = lpDIS->rcItem.left; + int y = lpDIS->rcItem.top; + int width = lpDIS->rcItem.right - x; + int height = lpDIS->rcItem.bottom - y; + int wBmp = bitmap->GetWidth(); + int hBmp = bitmap->GetHeight(); + + int x1,y1; + + if(m_windowStyle & wxBU_LEFT) + x1 = x + (FOCUS_MARGIN+1); + else if(m_windowStyle & wxBU_RIGHT) + x1 = x + (width - wBmp) - (FOCUS_MARGIN+1); + else + x1 = x + (width - wBmp) / 2; - HBITMAP old = (HBITMAP) ::SelectObject(memDC, (HBITMAP) bitmap->GetHBITMAP()); + if(m_windowStyle & wxBU_TOP) + y1 = y + (FOCUS_MARGIN+1); + else if(m_windowStyle & wxBU_BOTTOM) + y1 = y + (height - hBmp) - (FOCUS_MARGIN+1); + else + y1 = y + (height - hBmp) / 2; - if (!old) + if ( isSelected && autoDraw ) { - wxLogLastError(_T("SelectObject")); - - return FALSE; + x1++; + y1++; } - int x = lpDIS->rcItem.left; - int y = lpDIS->rcItem.top; - int width = lpDIS->rcItem.right - x; - int height = lpDIS->rcItem.bottom - y; - - int wBmp = bitmap->GetWidth(), - hBmp = bitmap->GetHeight(); - - // Draw the face, if auto-drawing - bool autoDraw = (GetWindowStyleFlag() & wxBU_AUTODRAW) != 0; + // draw the face, if auto-drawing if ( autoDraw ) { DrawFace((WXHDC) hDC, @@ -164,62 +190,12 @@ bool wxBitmapButton::MSWOnDraw(WXDRAWITEMSTRUCT *item) isSelected); } - // Centre the bitmap in the control area - int x1 = x + (width - wBmp) / 2; - int y1 = y + (height - hBmp) / 2; - - if ( isSelected && autoDraw ) - { - x1++; - y1++; - } - - BOOL ok; - - // no MaskBlt() under Win16 -#ifdef __WIN32__ - wxMask *mask = bitmap->GetMask(); - if ( mask ) - { - // the fg ROP is applied for the pixels of the mask bitmap which are 1 - // (for a wxMask this means that this is a non transparent pixel), the - // bg ROP is applied for all the others - - HBRUSH hbrBackground = - ::CreateSolidBrush(wxColourToRGB(GetBackgroundColour())); - HBRUSH hbrOld = (HBRUSH)::SelectObject(hDC, hbrBackground); - - ok = ::MaskBlt( - hDC, x1, y1, wBmp, hBmp, // dst - memDC, 0, 0, // src - (HBITMAP)mask->GetMaskBitmap(), 0, 0, // mask - MAKEROP4(SRCCOPY, // fg ROP - PATCOPY) // bg ROP - ); - - ::SelectObject(hDC, hbrOld); - ::DeleteObject(hbrBackground); - } - else - { - // this will make the check below fail and BitBlt() will be used if - // MaskBlt() is not supported (for example, under Win95) - ok = FALSE; - } - - if ( !ok ) -#endif // Win32 - { - ok = ::BitBlt(hDC, x1, y1, wBmp, hBmp, // dst - memDC, 0, 0, // src - SRCCOPY); // ROP - } - - if ( !ok ) - { - wxLogLastError(_T("Mask/BitBlt()")); - } + // draw the bitmap + wxDC dst; + dst.SetHDC((WXHDC) hDC, FALSE); + dst.DrawBitmap(*bitmap, x1, y1, TRUE); + // draw focus / disabled state, if auto-drawing if ( (state & ODS_DISABLED) && autoDraw ) { DrawButtonDisable((WXHDC) hDC, @@ -237,10 +213,6 @@ bool wxBitmapButton::MSWOnDraw(WXDRAWITEMSTRUCT *item) isSelected); } - ::SelectObject(memDC, old); - - ::DeleteDC(memDC); - return TRUE; } @@ -364,9 +336,6 @@ void wxBitmapButton::DrawFace( WXHDC dc, int left, int top, int right, int botto #endif // defined(__WIN95__) -// VZ: should be at the very least less than wxDEFAULT_BUTTON_MARGIN -#define FOCUS_MARGIN 3 - void wxBitmapButton::DrawButtonFocus( WXHDC dc, int left, int top, int right, int bottom, bool sel ) { RECT rect; @@ -381,6 +350,7 @@ void wxBitmapButton::DrawButtonFocus( WXHDC dc, int left, int top, int right, in if ( sel ) OffsetRect( &rect, 1, 1 ); */ + (void)sel; DrawFocusRect( (HDC) dc, &rect ); } @@ -413,3 +383,5 @@ void wxBitmapButton::SetDefault() { wxButton::SetDefault(); } + +#endif // wxUSE_BMPBUTTON