Fix warnings for the OSX WebKit backend.

[wxWidgets.git] / src / univ / statbmp.cpp

diff --git a/src/univ/statbmp.cpp b/src/univ/statbmp.cpp
index f305d9ff2d646dbd78221c88b70341aa15f74ad0..5ff0f72ab687099f9516224a7bb8c5b9d1aecc5c 100644 (file)
--- a/src/univ/statbmp.cpp
+++ b/src/univ/statbmp.cpp
@@ -1,5 +1,5 @@
 /////////////////////////////////////////////////////////////////////////////
 /////////////////////////////////////////////////////////////////////////////

-// Name:        univ/statbmp.cpp
+// Name:        src/univ/statbmp.cpp

 // Purpose:     wxStaticBitmap implementation
 // Author:      Vadim Zeitlin
 // Modified by:
 // Purpose:     wxStaticBitmap implementation
 // Author:      Vadim Zeitlin
 // Modified by:


@@ -17,10 +17,6 @@
 // headers
 // ----------------------------------------------------------------------------
 
 // headers
 // ----------------------------------------------------------------------------
 

-#if defined(__GNUG__) && !defined(NO_GCC_PRAGMA)
-    #pragma implementation "univstatbmp.h"
-#endif
-

 #include "wx/wxprec.h"
 
 #ifdef __BORLANDC__
 #include "wx/wxprec.h"
 
 #ifdef __BORLANDC__


@@ -29,10 +25,11 @@
 
 #if wxUSE_STATBMP
 
 
 #if wxUSE_STATBMP
 

+#include "wx/statbmp.h"
+

 #ifndef WX_PRECOMP
     #include "wx/dc.h"
     #include "wx/icon.h"
 #ifndef WX_PRECOMP
     #include "wx/dc.h"
     #include "wx/icon.h"

-    #include "wx/statbmp.h"

     #include "wx/validate.h"
 #endif
 
     #include "wx/validate.h"
 #endif
 


@@ -43,8 +40,6 @@
 // implementation
 // ============================================================================
 
 // implementation
 // ============================================================================
 

-IMPLEMENT_DYNAMIC_CLASS(wxStaticBitmap, wxControl)
-

 // ----------------------------------------------------------------------------
 // wxStaticBitmap
 // ----------------------------------------------------------------------------
 // ----------------------------------------------------------------------------
 // wxStaticBitmap
 // ----------------------------------------------------------------------------


@@ -64,7 +59,7 @@ bool wxStaticBitmap::Create(wxWindow *parent,
     SetBitmap(label);
 
     // and adjust our size to fit it after this
     SetBitmap(label);
 
     // and adjust our size to fit it after this

-    SetBestSize(size);
+    SetInitialSize(size);

 
     return true;
 }
 
     return true;
 }


@@ -109,4 +104,3 @@ void wxStaticBitmap::DoDraw(wxControlRenderer *renderer)
 }
 
 #endif // wxUSE_STATBMP
 }
 
 #endif // wxUSE_STATBMP

-