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

small adaptions

Browse Source 
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@4882 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
This commit is contained in:
Stefan Csomor
1999-12-09 10:30:35 +00:00
parent 0207122d52
commit 7c551d9594
17 changed files with 766 additions and 182 deletions
Download Patch File Download Diff File Expand all files Collapse all files

26
src/mac/statbmp.cpp
View File

@@ -34,9 +34,12 @@ bool wxStaticBitmap::Create(wxWindow *parent, wxWindowID id,
long style,
const wxString& name)
{
m_messageBitmap = bitmap;
SetName(name);
if (parent) parent->AddChild(this);
m_backgroundColour = parent->GetBackgroundColour() ;
m_foregroundColour = parent->GetForegroundColour() ;
m_messageBitmap = bitmap;
if ( id == -1 )
m_windowId = (int)NewControlId();
@@ -46,7 +49,9 @@ bool wxStaticBitmap::Create(wxWindow *parent, wxWindowID id,
m_windowStyle = style;
bool ret = wxControl::Create( parent, id, pos, size, style , name );
SetSizeOrDefault() ;
return ret;
}
@@ -58,14 +63,21 @@ void wxStaticBitmap::SetSize(int x, int y, int width, int height, int sizeFlags)
void wxStaticBitmap::SetBitmap(const wxBitmap& bitmap)
{
m_messageBitmap = bitmap;
Refresh() ;
SetSizeOrDefault();
}
void wxStaticBitmap::OnPaint( wxPaintEvent &event )
{
wxPaintDC dc(this);
PrepareDC(dc);
dc.SetPalette( *m_messageBitmap.GetPalette() ) ;
dc.DrawBitmap( m_messageBitmap , 0 , 0 ) ;
dc.SetPalette( *m_messageBitmap.GetPalette() ) ;
dc.DrawBitmap( m_messageBitmap , 0 , 0 ) ;
}
wxSize wxStaticBitmap::DoGetBestSize() const
{
if ( m_messageBitmap.Ok() )
return wxSize(m_messageBitmap.GetWidth(), m_messageBitmap.GetHeight());
else
return wxSize(16, 16); // completely arbitrary
}