X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/442b35b53bf95f5c6c003ea9ddbefd17adbc2a00..69659fd770f615210efac4b4fa741b3ad6223616:/src/univ/statbmp.cpp?ds=sidebyside diff --git a/src/univ/statbmp.cpp b/src/univ/statbmp.cpp index 39282b88d0..6059a8ab2e 100644 --- a/src/univ/statbmp.cpp +++ b/src/univ/statbmp.cpp @@ -1,12 +1,12 @@ ///////////////////////////////////////////////////////////////////////////// -// Name: univ/statbmp.cpp +// Name: src/univ/statbmp.cpp // Purpose: wxStaticBitmap implementation // Author: Vadim Zeitlin // Modified by: // Created: 25.08.00 // RCS-ID: $Id$ // Copyright: (c) 2000 SciTech Software, Inc. (www.scitechsoft.com) -// Licence: wxWindows license +// Licence: wxWindows licence ///////////////////////////////////////////////////////////////////////////// // ============================================================================ @@ -17,10 +17,6 @@ // headers // ---------------------------------------------------------------------------- -#ifdef __GNUG__ - #pragma implementation "univstatbmp.h" -#endif - #include "wx/wxprec.h" #ifdef __BORLANDC__ @@ -29,10 +25,11 @@ #if wxUSE_STATBMP +#include "wx/statbmp.h" + #ifndef WX_PRECOMP #include "wx/dc.h" #include "wx/icon.h" - #include "wx/statbmp.h" #include "wx/validate.h" #endif @@ -58,15 +55,15 @@ bool wxStaticBitmap::Create(wxWindow *parent, const wxString &name) { if ( !wxControl::Create(parent, id, pos, size, style, wxDefaultValidator, name) ) - return FALSE; + return false; // set bitmap first SetBitmap(label); // and adjust our size to fit it after this - SetBestSize(size); + SetInitialSize(size); - return TRUE; + return true; } // ---------------------------------------------------------------------------- @@ -109,4 +106,3 @@ void wxStaticBitmap::DoDraw(wxControlRenderer *renderer) } #endif // wxUSE_STATBMP -