wxStaticBitmapBase::DoGetBestSize

git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@26657 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775

include/wx/msw/statbmp.h

@@ -78,7 +78,6 @@ public:
 
 protected:
     virtual wxBorder GetDefaultBorder() const;
-    virtual wxSize DoGetBestSize() const;
     virtual WXDWORD MSWGetStyle(long style, WXDWORD *exstyle) const;
 
     // ctor/dtor helpers

include/wx/statbmp.h

@@ -44,7 +44,7 @@ public:
     virtual bool AcceptsFocus() const { return FALSE; }
 
 protected:
-    virtual wxSize DoGetBestClientSize() const;
+    virtual wxSize DoGetBestSize() const;
 
     DECLARE_NO_COPY_CLASS(wxStaticBitmapBase)
 };

src/common/ctrlcmn.cpp

@@ -127,7 +127,7 @@ wxStaticBitmapBase::~wxStaticBitmapBase()
     // this destructor is required for Darwin
 }
 
-wxSize wxStaticBitmapBase::DoGetBestClientSize() const
+wxSize wxStaticBitmapBase::DoGetBestSize() const
 {
     wxBitmap bmp = GetBitmap();
     if ( bmp.Ok() )

src/msw/statbmp.cpp

@@ -201,13 +201,6 @@ void wxStaticBitmap::Free()
     m_image = NULL;
 }
 
-wxSize wxStaticBitmap::DoGetBestSize() const
-{
-    // reuse the current size (as wxWindow does) instead of using some
-    // arbitrary default size (as wxControl, our immediate base class, does)
-    return wxWindow::DoGetBestSize();
-}
-
 void wxStaticBitmap::SetImage( const wxGDIImage* image )
 {
     wxGDIImage* convertedImage = ConvertImage( *image );