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

best size calculations based on bitmap size

Browse Source 
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@26462 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
This commit is contained in:
Stefan Csomor
2004-03-29 16:06:54 +00:00
parent ed5f4c7849
commit 982a831bbf
1 changed files with 3 additions and 11 deletions
Download Patch File Download Diff File Expand all files Collapse all files

14
src/mac/carbon/statbmp.cpp
View File

@@ -33,19 +33,11 @@ END_EVENT_TABLE()
bool wxStaticBitmap::Create(wxWindow *parent, wxWindowID id, bool wxStaticBitmap::Create(wxWindow *parent, wxWindowID id,
const wxBitmap& bitmap, const wxBitmap& bitmap,
const wxPoint& pos, const wxPoint& pos,
const wxSize& s, const wxSize& size,
long style, long style,
const wxString& name) const wxString& name)
{ {
SetName(name); SetName(name);
wxSize size = s ;
if ( bitmap.Ok() )
{
if ( size.x == -1 )
size.x = bitmap.GetWidth() ;
if ( size.y == -1 )
size.y = bitmap.GetHeight() ;
}
m_backgroundColour = parent->GetBackgroundColour() ; m_backgroundColour = parent->GetBackgroundColour() ;
m_foregroundColour = parent->GetForegroundColour() ; m_foregroundColour = parent->GetForegroundColour() ;
@@ -67,7 +59,7 @@ bool wxStaticBitmap::Create(wxWindow *parent, wxWindowID id,
void wxStaticBitmap::SetBitmap(const wxBitmap& bitmap) void wxStaticBitmap::SetBitmap(const wxBitmap& bitmap)
{ {
m_bitmap = bitmap; m_bitmap = bitmap;
SetSize(wxSize(bitmap.GetWidth(), bitmap.GetHeight())); SetSize(GetBestSize());
Refresh() ; Refresh() ;
} }
@@ -81,6 +73,6 @@ void wxStaticBitmap::OnPaint( wxPaintEvent& WXUNUSED(event) )
wxSize wxStaticBitmap::DoGetBestSize() const wxSize wxStaticBitmap::DoGetBestSize() const
{ {
return wxWindow::DoGetBestSize() ; return DoGetSizeFromClientSize( wxSize( m_bitmap.GetWidth() , m_bitmap.GetHeight() ) ) ;
} }