wxStaticBitmapBase::DoGetBestSize

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

diff --git a/include/wx/msw/statbmp.h b/include/wx/msw/statbmp.h
index e778d2e373daef075fb0ba4665c618a4b61acbaf..49734fd44311e4652bd852b12b712b646bc40869 100644 (file)
--- a/include/wx/msw/statbmp.h
+++ b/include/wx/msw/statbmp.h
@@ -78,7 +78,6 @@ public:
 
 protected:
     virtual wxBorder GetDefaultBorder() const;
 
 protected:
     virtual wxBorder GetDefaultBorder() const;

-    virtual wxSize DoGetBestSize() const;

     virtual WXDWORD MSWGetStyle(long style, WXDWORD *exstyle) const;
 
     // ctor/dtor helpers
     virtual WXDWORD MSWGetStyle(long style, WXDWORD *exstyle) const;
 
     // ctor/dtor helpers

diff --git a/include/wx/statbmp.h b/include/wx/statbmp.h
index 02f5c7ef054a92e047132b6f72313e3f1253893a..49bcf7fb93103b96dc910b6ec6abbeed8e7431fe 100644 (file)
--- a/include/wx/statbmp.h
+++ b/include/wx/statbmp.h
@@ -44,7 +44,7 @@ public:
     virtual bool AcceptsFocus() const { return FALSE; }
 
 protected:
     virtual bool AcceptsFocus() const { return FALSE; }
 
 protected:

-    virtual wxSize DoGetBestClientSize() const;
+    virtual wxSize DoGetBestSize() const;

 
     DECLARE_NO_COPY_CLASS(wxStaticBitmapBase)
 };
 
     DECLARE_NO_COPY_CLASS(wxStaticBitmapBase)
 };

diff --git a/src/common/ctrlcmn.cpp b/src/common/ctrlcmn.cpp
index b46c4f8f8da1f3427ebae4f60e1fd0e27679edb6..de49faed1291af92846988a34479e16c8e9fdced 100644 (file)
--- a/src/common/ctrlcmn.cpp
+++ b/src/common/ctrlcmn.cpp
@@ -127,7 +127,7 @@ wxStaticBitmapBase::~wxStaticBitmapBase()
     // this destructor is required for Darwin
 }
 
     // this destructor is required for Darwin
 }
 

-wxSize wxStaticBitmapBase::DoGetBestClientSize() const
+wxSize wxStaticBitmapBase::DoGetBestSize() const

 {
     wxBitmap bmp = GetBitmap();
     if ( bmp.Ok() )
 {
     wxBitmap bmp = GetBitmap();
     if ( bmp.Ok() )

diff --git a/src/msw/statbmp.cpp b/src/msw/statbmp.cpp
index 1d6bfd0c7ccd566f0fba52da4b5f4d3253fa7a82..14adf39e01d5b42382bfc6bd70b297cb1bab1a12 100644 (file)
--- a/src/msw/statbmp.cpp
+++ b/src/msw/statbmp.cpp
@@ -201,13 +201,6 @@ void wxStaticBitmap::Free()
     m_image = NULL;
 }
 
     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 );
 void wxStaticBitmap::SetImage( const wxGDIImage* image )
 {
     wxGDIImage* convertedImage = ConvertImage( *image );