/////////////////////////////////////////////////////////////////////////////
// Name: statbmp.cpp
// Purpose: wxStaticBitmap
-// Author: AUTHOR
+// Author: Stefan Csomor
// Modified by:
-// Created: ??/??/98
+// Created: 1998-01-01
// RCS-ID: $Id$
-// Copyright: (c) AUTHOR
-// Licence: wxWindows licence
+// Copyright: (c) Stefan Csomor
+// Licence: wxWindows licence
/////////////////////////////////////////////////////////////////////////////
#ifdef __GNUG__
bool wxStaticBitmap::Create(wxWindow *parent, wxWindowID id,
const wxBitmap& bitmap,
const wxPoint& pos,
- const wxSize& s,
+ const wxSize& size,
long style,
const wxString& 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_foregroundColour = parent->GetForegroundColour() ;
m_bitmap = bitmap;
if ( id == -1 )
- m_windowId = (int)NewControlId();
+ m_windowId = (int)NewControlId();
else
- m_windowId = id;
+ m_windowId = id;
m_windowStyle = style;
bool ret = wxControl::Create( parent, id, pos, size, style , wxDefaultValidator , name );
- SetBestSize( size ) ;
+ SetBestSize( size ) ;
return ret;
}
void wxStaticBitmap::SetBitmap(const wxBitmap& bitmap)
{
m_bitmap = bitmap;
- SetSize(wxSize(bitmap.GetWidth(), bitmap.GetHeight()));
+ InvalidateBestSize();
+ SetSize(GetBestSize());
Refresh() ;
}
-void wxStaticBitmap::OnPaint( wxPaintEvent &event )
+void wxStaticBitmap::OnPaint( wxPaintEvent& WXUNUSED(event) )
{
wxPaintDC dc(this);
PrepareDC(dc);
wxSize wxStaticBitmap::DoGetBestSize() const
{
- return wxWindow::DoGetBestSize() ;
+ return DoGetSizeFromClientSize( wxSize( m_bitmap.GetWidth() , m_bitmap.GetHeight() ) ) ;
}