From e8153940f9977736df0ad0049b0d68028f21675c Mon Sep 17 00:00:00 2001 From: Julian Smart Date: Tue, 23 Mar 2004 20:39:57 +0000 Subject: [PATCH] Added wxBU_EXACTFIT support to wxBitmapButton on wxMSW git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@26308 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775 --- src/msw/bmpbuttn.cpp | 14 ++++++++++++++ 1 file changed, 14 insertions(+) diff --git a/src/msw/bmpbuttn.cpp b/src/msw/bmpbuttn.cpp index ee417d6608..535ac94e9c 100644 --- a/src/msw/bmpbuttn.cpp +++ b/src/msw/bmpbuttn.cpp @@ -466,7 +466,21 @@ wxSize wxBitmapButton::DoGetBestSize() const 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 + -- 2.45.2