Amebis/wxWidgets
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

wxStaticBitmapBase::DoGetBestSize

Browse Source 
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@26657 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
This commit is contained in:
Robin Dunn
2004-04-07 21:47:04 +00:00
parent baf1aa5dfd
commit b3fcfa4d89
4 changed files with 2 additions and 10 deletions
Download Patch File Download Diff File Expand all files Collapse all files

1
include/wx/msw/statbmp.h
View File

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

2
include/wx/statbmp.h
View File

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

2
src/common/ctrlcmn.cpp
View File

@@ -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(); wxBitmap bmp = GetBitmap();
if ( bmp.Ok() ) if ( bmp.Ok() )

7
src/msw/statbmp.cpp
View File

@@ -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 ) void wxStaticBitmap::SetImage( const wxGDIImage* image )
{ {
wxGDIImage* convertedImage = ConvertImage( *image ); wxGDIImage* convertedImage = ConvertImage( *image );