/////////////////////////////////////////////////////////////////////////////
// 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__
-#pragma implementation "statbmp.h"
+ #pragma implementation "statbmp.h"
#endif
+#include "wx/defs.h"
+
#include "wx/statbmp.h"
#include "wx/dcclient.h"
* wxStaticBitmap
*/
-BEGIN_EVENT_TABLE(wxStaticBitmap, wxControl)
+BEGIN_EVENT_TABLE(wxStaticBitmap, wxStaticBitmapBase)
EVT_PAINT(wxStaticBitmap::OnPaint)
END_EVENT_TABLE()
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 ;
m_backgroundColour = parent->GetBackgroundColour() ;
m_foregroundColour = parent->GetForegroundColour() ;
- m_messageBitmap = bitmap;
+ 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 );
- SetSizeOrDefault( size ) ;
+ SetBestSize( size ) ;
return ret;
}
-void wxStaticBitmap::SetSize(int x, int y, int width, int height, int sizeFlags)
-{
- wxControl::SetSize( x , y , width , height , sizeFlags ) ;
-}
-
void wxStaticBitmap::SetBitmap(const wxBitmap& bitmap)
{
- m_messageBitmap = bitmap;
+ m_bitmap = bitmap;
+ SetSize(GetBestSize());
Refresh() ;
- SetSizeOrDefault();
}
-void wxStaticBitmap::OnPaint( wxPaintEvent &event )
+void wxStaticBitmap::OnPaint( wxPaintEvent& WXUNUSED(event) )
{
wxPaintDC dc(this);
PrepareDC(dc);
- dc.DrawBitmap( m_messageBitmap , 0 , 0 , TRUE ) ;
+ dc.DrawBitmap( m_bitmap , 0 , 0 , TRUE ) ;
}
wxSize wxStaticBitmap::DoGetBestSize() const
{
- if ( m_messageBitmap.Ok() )
- return wxSize(m_messageBitmap.GetWidth(), m_messageBitmap.GetHeight());
- else
- return wxSize(16, 16); // completely arbitrary
+ return DoGetSizeFromClientSize( wxSize( m_bitmap.GetWidth() , m_bitmap.GetHeight() ) ) ;
}