/////////////////////////////////////////////////////////////////////////////
-// Name: statbmp.cpp
+// Name: src/mac/classic/statbmp.cpp
// Purpose: wxStaticBitmap
// Author: Stefan Csomor
// Modified by:
// Created: 1998-01-01
// RCS-ID: $Id$
// Copyright: (c) Stefan Csomor
-// Licence: wxWindows licence
+// Licence: wxWindows licence
/////////////////////////////////////////////////////////////////////////////
-#ifdef __GNUG__
- #pragma implementation "statbmp.h"
-#endif
+#include "wx/wxprec.h"
-#include "wx/defs.h"
+#ifdef __BORLANDC__
+ #pragma hdrstop
+#endif
#include "wx/statbmp.h"
-#include "wx/dcclient.h"
-#if !USE_SHARED_LIBRARY
-IMPLEMENT_DYNAMIC_CLASS(wxStaticBitmap, wxControl)
+#ifndef WX_PRECOMP
+ #include "wx/dcclient.h"
#endif
+IMPLEMENT_DYNAMIC_CLASS(wxStaticBitmap, wxControl)
+
/*
* wxStaticBitmap
*/
m_foregroundColour = parent->GetForegroundColour() ;
m_bitmap = bitmap;
- if ( id == -1 )
+ if ( id == wxID_ANY )
m_windowId = (int)NewControlId();
else
m_windowId = id;
bool ret = wxControl::Create( parent, id, pos, size, style , wxDefaultValidator , name );
SetBestSize( size ) ;
-
+
return ret;
}
void wxStaticBitmap::SetBitmap(const wxBitmap& bitmap)
{
m_bitmap = bitmap;
+ InvalidateBestSize();
SetSize(wxSize(bitmap.GetWidth(), bitmap.GetHeight()));
Refresh() ;
}
-void wxStaticBitmap::OnPaint( wxPaintEvent& WXUNUSED(event) )
+void wxStaticBitmap::OnPaint( wxPaintEvent& WXUNUSED(event) )
{
wxPaintDC dc(this);
PrepareDC(dc);
- dc.DrawBitmap( m_bitmap , 0 , 0 , TRUE ) ;
+ dc.DrawBitmap( m_bitmap , 0 , 0 , true ) ;
}
wxSize wxStaticBitmap::DoGetBestSize() const
{
return wxWindow::DoGetBestSize() ;
}
-