X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/11b6a93b1e078fea5bf49ed9e6628a19849c11b3..803c55373484d1e2bfed85b46cbbfff8bfad1276:/src/msw/bmpbuttn.cpp diff --git a/src/msw/bmpbuttn.cpp b/src/msw/bmpbuttn.cpp index 2cee20c982..32d792972a 100644 --- a/src/msw/bmpbuttn.cpp +++ b/src/msw/bmpbuttn.cpp @@ -23,6 +23,7 @@ #ifndef WX_PRECOMP #include "wx/bmpbuttn.h" #include "wx/log.h" + #include "wx/dcmemory.h" #endif #include "wx/msw/private.h" @@ -46,8 +47,8 @@ bool wxBitmapButton::Create(wxWindow *parent, wxWindowID id, const wxBitmap& bit parent->AddChild(this); - m_backgroundColour = parent->GetBackgroundColour() ; - m_foregroundColour = parent->GetForegroundColour() ; + m_backgroundColour = parent->GetBackgroundColour(); + m_foregroundColour = parent->GetForegroundColour(); m_windowStyle = style; m_marginX = 0; m_marginY = 0; @@ -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(), @@ -90,7 +107,7 @@ bool wxBitmapButton::Create(wxWindow *parent, wxWindowID id, const wxBitmap& bit // Subclass again for purposes of dialog editing mode SubclassWin(m_hWnd); - SetFont(parent->GetFont()) ; + SetFont(parent->GetFont()); SetSize(x, y, width, height); @@ -102,6 +119,9 @@ 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) { #if defined(__WIN95__) @@ -115,12 +135,15 @@ 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()) @@ -133,29 +156,37 @@ bool wxBitmapButton::MSWOnDraw(WXDRAWITEMSTRUCT *item) 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,56 +195,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 - - wxColour colBg = GetBackgroundColour(); - HBRUSH hbrBackground = - ::CreateSolidBrush(RGB(colBg.Red(), colBg.Green(), colBg.Blue())); - 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 -#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, @@ -231,78 +218,128 @@ bool wxBitmapButton::MSWOnDraw(WXDRAWITEMSTRUCT *item) isSelected); } - ::SelectObject(memDC, old); - - ::DeleteDC(memDC); - 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 ) { HPEN oldp; - HBRUSH oldb ; - - HPEN penBorder; + HPEN penHiLight; HPEN penLight; HPEN penShadow; + HPEN penDkShadow; HBRUSH brushFace; - COLORREF ms_color; - ms_color = GetSysColor(COLOR_WINDOWFRAME) ; - penBorder = CreatePen(PS_SOLID,0,ms_color) ; + // create needed pens and brush + penHiLight = CreatePen(PS_SOLID, 0, GetSysColor(COLOR_3DHILIGHT)); + 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)); + + // draw the rectangle + RECT rect; + rect.left = left; + rect.right = right; + rect.top = top; + rect.bottom = bottom; + FillRect((HDC) dc, &rect, brushFace); - ms_color = GetSysColor(COLOR_BTNSHADOW) ; - penShadow = CreatePen(PS_SOLID,0,ms_color) ; + // 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); - ms_color = GetSysColor(COLOR_BTNHIGHLIGHT) ; - penLight = CreatePen(PS_SOLID,0,ms_color) ; + 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); - ms_color = GetSysColor(COLOR_BTNFACE) ; - brushFace = CreateSolidBrush(ms_color) ; + 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); - oldp = (HPEN) SelectObject( (HDC) dc, GetStockObject( NULL_PEN ) ) ; - oldb = (HBRUSH) SelectObject( (HDC) dc, brushFace ) ; - Rectangle( (HDC) dc, left, top, right, bottom ) ; - SelectObject( (HDC) dc, penBorder) ; + 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); + + // delete allocated resources + SelectObject((HDC) dc,oldp); + DeleteObject(penHiLight); + DeleteObject(penLight); + DeleteObject(penShadow); + DeleteObject(penDkShadow); + DeleteObject(brushFace); +} + +#else + +void wxBitmapButton::DrawFace( WXHDC dc, int left, int top, int right, int bottom, bool sel ) +{ + HPEN oldp; + HPEN penBorder; + HPEN penLight; + HPEN penShadow; + HBRUSH brushFace; + + // create needed pens and brush + penBorder = CreatePen(PS_SOLID, 0, GetSysColor(COLOR_WINDOWFRAME)); + penShadow = CreatePen(PS_SOLID, 0, GetSysColor(COLOR_BTNSHADOW)); + penLight = CreatePen(PS_SOLID, 0, GetSysColor(COLOR_BTNHIGHLIGHT)); + brushFace = CreateSolidBrush(COLOR_BTNFACE); + + // draw the rectangle + RECT rect; + rect.left = left; + rect.right = right; + rect.top = top; + rect.bottom = bottom; + FillRect((HDC) dc, &rect, brushFace); + + // draw the border + oldp = (HPEN) SelectObject( (HDC) dc, penBorder); MoveToEx((HDC) dc,left+1,top,NULL);LineTo((HDC) dc,right-1,top); MoveToEx((HDC) dc,left,top+1,NULL);LineTo((HDC) dc,left,bottom-1); MoveToEx((HDC) dc,left+1,bottom-1,NULL);LineTo((HDC) dc,right-1,bottom-1); MoveToEx((HDC) dc,right-1,top+1,NULL);LineTo((HDC) dc,right-1,bottom-1); - SelectObject( (HDC) dc, penShadow) ; + SelectObject( (HDC) dc, penShadow); if (sel) { - MoveToEx((HDC) dc,left+1 ,bottom-2 ,NULL) ; - LineTo((HDC) dc, left+1 ,top+1) ; - LineTo((HDC) dc, right-2 ,top+1) ; + MoveToEx((HDC) dc,left+1 ,bottom-2 ,NULL); + LineTo((HDC) dc, left+1 ,top+1); + LineTo((HDC) dc, right-2 ,top+1); } else { - MoveToEx((HDC) dc,left+1 ,bottom-2 ,NULL) ; - LineTo((HDC) dc, right-2 ,bottom-2) ; - LineTo((HDC) dc, right-2 ,top) ; - MoveToEx((HDC) dc,left+2 ,bottom-3 ,NULL) ; - LineTo((HDC) dc, right-3 ,bottom-3) ; - LineTo((HDC) dc, right-3 ,top+1) ; - - SelectObject( (HDC) dc, penLight) ; - - MoveToEx((HDC) dc,left+1 ,bottom-2 ,NULL) ; - LineTo((HDC) dc, left+1 ,top+1) ; - LineTo((HDC) dc, right-2 ,top+1) ; + MoveToEx((HDC) dc,left+1 ,bottom-2 ,NULL); + LineTo((HDC) dc, right-2 ,bottom-2); + LineTo((HDC) dc, right-2 ,top); + + MoveToEx((HDC) dc,left+2 ,bottom-3 ,NULL); + LineTo((HDC) dc, right-3 ,bottom-3); + LineTo((HDC) dc, right-3 ,top+1); + + SelectObject( (HDC) dc, penLight); + + MoveToEx((HDC) dc,left+1 ,bottom-2 ,NULL); + LineTo((HDC) dc, left+1 ,top+1); + LineTo((HDC) dc, right-2 ,top+1); } - SelectObject((HDC) dc,oldp) ; - SelectObject((HDC) dc,oldb) ; + // delete allocated resources + SelectObject((HDC) dc,oldp); DeleteObject(penBorder); DeleteObject(penLight); DeleteObject(penShadow); DeleteObject(brushFace); } -// VZ: should be at the very least less than wxDEFAULT_BUTTON_MARGIN -#define FOCUS_MARGIN 3 +#endif // defined(__WIN95__) + void wxBitmapButton::DrawButtonFocus( WXHDC dc, int left, int top, int right, int bottom, bool sel ) { @@ -311,16 +348,21 @@ void wxBitmapButton::DrawButtonFocus( WXHDC dc, int left, int top, int right, in rect.top = top; rect.right = right; rect.bottom = bottom; - InflateRect( &rect, - FOCUS_MARGIN, - FOCUS_MARGIN ) ; + InflateRect( &rect, - FOCUS_MARGIN, - FOCUS_MARGIN ); + + // GRG: the focus rectangle should not move when the button is pushed! +/* if ( sel ) - OffsetRect( &rect, 1, 1 ) ; - DrawFocusRect( (HDC) dc, &rect ) ; + 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 ) { - HBRUSH old = (HBRUSH) SelectObject( (HDC) dc, wxDisableButtonBrush ) ; + HBRUSH old = (HBRUSH) SelectObject( (HDC) dc, wxDisableButtonBrush ); // VZ: what's this?? there is no such ROP AFAIK #ifdef __SALFORDC__ @@ -339,7 +381,7 @@ void wxBitmapButton::DrawButtonDisable( WXHDC dc, int left, int top, int right, ::PatBlt( (HDC) dc, left, top, right, bottom, dwRop); - ::SelectObject( (HDC) dc, old ) ; + ::SelectObject( (HDC) dc, old ); } void wxBitmapButton::SetDefault()