X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/77ffb5937e89927b621128789401db8921fe580f..e7445ff8ee26e39fab1e35455e1bef954bdf636f:/src/msw/bmpbuttn.cpp?ds=sidebyside diff --git a/src/msw/bmpbuttn.cpp b/src/msw/bmpbuttn.cpp index 1465f35008..3b67925eaa 100644 --- a/src/msw/bmpbuttn.cpp +++ b/src/msw/bmpbuttn.cpp @@ -6,13 +6,9 @@ // Created: 04/01/98 // RCS-ID: $Id$ // Copyright: (c) Julian Smart -// Licence: wxWidgets licence +// Licence: wxWindows licence ///////////////////////////////////////////////////////////////////////////// -#if defined(__GNUG__) && !defined(NO_GCC_PRAGMA) -#pragma implementation "bmpbuttn.h" -#endif - // For compilers that support precompilation, includes "wx.h". #include "wx/wxprec.h" @@ -29,6 +25,8 @@ #endif #include "wx/msw/private.h" +#include "wx/image.h" +#include "wx/msw/uxtheme.h" // ---------------------------------------------------------------------------- // macros @@ -47,7 +45,7 @@ wxBEGIN_FLAGS( wxBitmapButtonStyle ) wxFLAGS_MEMBER(wxBORDER_RAISED) wxFLAGS_MEMBER(wxBORDER_STATIC) wxFLAGS_MEMBER(wxBORDER_NONE) - + // old style border flags wxFLAGS_MEMBER(wxSIMPLE_BORDER) wxFLAGS_MEMBER(wxSUNKEN_BORDER) @@ -88,6 +86,12 @@ wxCONSTRUCTOR_5( wxBitmapButton , wxWindow* , Parent , wxWindowID , Id , wxBitma IMPLEMENT_DYNAMIC_CLASS(wxBitmapButton, wxButton) #endif +BEGIN_EVENT_TABLE(wxBitmapButton, wxBitmapButtonBase) + EVT_SYS_COLOUR_CHANGED(wxBitmapButton::OnSysColourChanged) + EVT_ENTER_WINDOW(wxBitmapButton::OnMouseEnterOrLeave) + EVT_LEAVE_WINDOW(wxBitmapButton::OnMouseEnterOrLeave) +END_EVENT_TABLE() + /* TODO PROPERTIES : @@ -98,8 +102,6 @@ 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, @@ -122,29 +124,15 @@ bool wxBitmapButton::Create(wxWindow *parent, wxWindowID id, if ( style & wxBU_AUTODRAW ) { - m_marginX = wxDEFAULT_BUTTON_MARGIN; - m_marginY = wxDEFAULT_BUTTON_MARGIN; + m_marginX = + m_marginY = 4; } - int x = pos.x; - int y = pos.y; - int width = size.x; - int height = size.y; - - if (id == -1) + if (id == wxID_ANY) m_windowId = NewControlId(); else m_windowId = id; - 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 ; if ( m_windowStyle & wxCLIP_SIBLINGS ) @@ -176,13 +164,67 @@ bool wxBitmapButton::Create(wxWindow *parent, wxWindowID id, // Subclass again for purposes of dialog editing mode SubclassWin(m_hWnd); - SetFont(parent->GetFont()); + SetPosition(pos); + SetBestSize(size); - SetSize(x, y, width, height); + return true; +} + +bool wxBitmapButton::SetBackgroundColour(const wxColour& colour) +{ + if ( !wxBitmapButtonBase::SetBackgroundColour(colour) ) + { + // didn't change + return false; + } + + // invalidate the brush, it will be recreated the next time it's needed + m_brushDisabled = wxNullBrush; return true; } +void wxBitmapButton::OnSysColourChanged(wxSysColourChangedEvent& event) +{ + m_brushDisabled = wxNullBrush; + + if ( !IsEnabled() ) + { + // this change affects our current state + Refresh(); + } + + event.Skip(); +} + +void wxBitmapButton::OnMouseEnterOrLeave(wxMouseEvent& event) +{ + if ( IsEnabled() && m_bmpHover.Ok() ) + Refresh(); + + event.Skip(); +} + +void wxBitmapButton::OnSetBitmap() +{ + // if the focus bitmap is specified but hover one isn't, use the focus + // bitmap for hovering as well if this is consistent with the current + // Windows version look and feel + // + // rationale: this is compatible with the old wxGTK behaviour and also + // makes it much easier to do "the right thing" for all platforms (some of + // them, such as Windows XP, have "hot" buttons while others don't) + if ( !m_bmpHover.Ok() && + m_bmpFocus.Ok() && + wxUxThemeEngine::GetIfActive() ) + { + m_bmpHover = m_bmpFocus; + } + + // this will redraw us + wxBitmapButtonBase::OnSetBitmap(); +} + // VZ: should be at the very least less than wxDEFAULT_BUTTON_MARGIN #define FOCUS_MARGIN 3 @@ -206,10 +248,12 @@ bool wxBitmapButton::MSWOnDraw(WXDRAWITEMSTRUCT *item) // choose the bitmap to use depending on the button state - wxBitmap* bitmap; + wxBitmap *bitmap; if ( isSelected && m_bmpSelected.Ok() ) bitmap = &m_bmpSelected; + else if ( m_bmpHover.Ok() && IsMouseInWindow() ) + bitmap = &m_bmpHover; else if ((state & ODS_FOCUS) && m_bmpFocus.Ok()) bitmap = &m_bmpFocus; else if ((state & ODS_DISABLED) && m_bmpDisabled.Ok()) @@ -260,8 +304,7 @@ bool wxBitmapButton::MSWOnDraw(WXDRAWITEMSTRUCT *item) } // draw the bitmap - wxDC dst; - dst.SetHDC((WXHDC) hDC, false); + wxDCTemp dst((WXHDC)hDC); dst.DrawBitmap(*bitmap, x1, y1, true); // draw focus / disabled state, if auto-drawing @@ -287,8 +330,6 @@ bool wxBitmapButton::MSWOnDraw(WXDRAWITEMSTRUCT *item) // 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 ) { @@ -344,73 +385,6 @@ void wxBitmapButton::DrawFace( WXHDC dc, int left, int top, 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); - if (sel) - { - 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); - } - - // delete allocated resources - SelectObject((HDC) dc,oldp); - DeleteObject(penBorder); - DeleteObject(penLight); - DeleteObject(penShadow); - DeleteObject(brushFace); -} - -#endif // defined(__WIN95__) - - void wxBitmapButton::DrawButtonFocus( WXHDC dc, int left, int top, int right, int bottom, bool WXUNUSED(sel) ) { @@ -430,11 +404,28 @@ void wxBitmapButton::DrawButtonFocus( WXHDC dc, int left, int top, int right, 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 ); + if ( !m_brushDisabled.Ok() ) + { + // draw a bitmap with two black and two background colour pixels + wxBitmap bmp(2, 2); + wxMemoryDC dc; + dc.SelectObject(bmp); + dc.SetPen(*wxBLACK_PEN); + dc.DrawPoint(0, 0); + dc.DrawPoint(1, 1); + dc.SetPen(GetBackgroundColour()); + dc.DrawPoint(0, 1); + dc.DrawPoint(1, 0); + + m_brushDisabled = wxBrush(bmp); + } + + SelectInHDC selectBrush((HDC)dc, GetHbrushOf(m_brushDisabled)); // ROP for "dest |= pattern" operation -- as it doesn't have a standard // name, give it our own @@ -449,8 +440,6 @@ void wxBitmapButton::DrawButtonDisable( WXHDC dc, int left, int top, int right, } ::PatBlt( (HDC) dc, left, top, right, bottom, PATTERNPAINT); - - ::SelectObject( (HDC) dc, old ); } void wxBitmapButton::SetDefault() @@ -460,27 +449,16 @@ void wxBitmapButton::SetDefault() wxSize wxBitmapButton::DoGetBestSize() const { - wxSize best; - if (m_bmpNormal.Ok()) + if ( m_bmpNormal.Ok() ) { - best.x = m_bmpNormal.GetWidth() + 2*m_marginX; - best.y = m_bmpNormal.GetHeight() + 2*m_marginY; + wxSize best(m_bmpNormal.GetWidth() + 2*m_marginX, + m_bmpNormal.GetHeight() + 2*m_marginY); + CacheBestSize(best); + return best; } - // 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; + // no idea what our best size should be, defer to the base class + return wxBitmapButtonBase::DoGetBestSize(); } #endif // wxUSE_BMPBUTTON -