X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/1e6feb95a79834836e88143b15d9f424ebe79621..1b488c0eeb9348540f2c9733ff9d7513e06c3cb9:/src/univ/button.cpp diff --git a/src/univ/button.cpp b/src/univ/button.cpp index ee1ac0321c..a6438e0d51 100644 --- a/src/univ/button.cpp +++ b/src/univ/button.cpp @@ -5,7 +5,7 @@ // Modified by: // Created: 14.08.00 // RCS-ID: $Id$ -// Copyright: (c) 2000 Vadim Zeitlin +// Copyright: (c) 2000 SciTech Software, Inc. (www.scitechsoft.com) // Licence: wxWindows licence ///////////////////////////////////////////////////////////////////////////// @@ -136,9 +136,12 @@ wxSize wxButton::DoGetBestClientSize() const // for compatibility with other ports, the buttons default size is never // less than the standard one - wxSize szDef = GetDefaultSize(); - if ( width < szDef.x ) - width = szDef.x; + if ( !(GetWindowStyle() & wxBU_EXACTFIT) ) + { + wxSize szDef = GetDefaultSize(); + if ( width < szDef.x ) + width = szDef.x; + } return wxSize(width, height); }