use GetText() instead of GetText(wxString&), made some methods inline

[wxWidgets.git] / src / mac / statbmp.cpp

diff --git a/src/mac/statbmp.cpp b/src/mac/statbmp.cpp
index f85c66b456a8bdacc902160530fc756536a62f75..40793c756a3b734738b0821d494ca516c8e5785b 100644 (file)
--- a/src/mac/statbmp.cpp
+++ b/src/mac/statbmp.cpp
@@ -42,7 +42,6 @@ bool wxStaticBitmap::Create(wxWindow *parent, wxWindowID id,
     m_foregroundColour = parent->GetForegroundColour() ;
 
     m_messageBitmap = bitmap;
     m_foregroundColour = parent->GetForegroundColour() ;
 
     m_messageBitmap = bitmap;

-

     if ( id == -1 )
            m_windowId = (int)NewControlId();
     else
     if ( id == -1 )
            m_windowId = (int)NewControlId();
     else


@@ -64,21 +63,23 @@ void wxStaticBitmap::SetSize(int x, int y, int width, int height, int sizeFlags)
 void wxStaticBitmap::SetBitmap(const wxBitmap& bitmap)
 {
     m_messageBitmap = bitmap;
 void wxStaticBitmap::SetBitmap(const wxBitmap& bitmap)
 {
     m_messageBitmap = bitmap;

+    Refresh() ;

     SetSizeOrDefault();
 }
     SetSizeOrDefault();
 }

+

 void wxStaticBitmap::OnPaint( wxPaintEvent &event ) 
 {
     wxPaintDC dc(this);
     PrepareDC(dc);
 void wxStaticBitmap::OnPaint( wxPaintEvent &event ) 
 {
     wxPaintDC dc(this);
     PrepareDC(dc);

-       dc.SetPalette( *m_messageBitmap.GetPalette() ) ;
-       dc.DrawBitmap( m_messageBitmap , 0 , 0 , TRUE ) ;
+
+    dc.DrawBitmap( m_messageBitmap , 0 , 0 , TRUE ) ;

 }
 
 wxSize wxStaticBitmap::DoGetBestSize() const
 {
 }
 
 wxSize wxStaticBitmap::DoGetBestSize() const
 {

-    if ( m_messageBitmap.Ok() )
-        return wxSize(m_messageBitmap.GetWidth(), m_messageBitmap.GetHeight());
-    else
-        return wxSize(16, 16);  // completely arbitrary
+   if ( m_messageBitmap.Ok() )
+       return wxSize(m_messageBitmap.GetWidth(), m_messageBitmap.GetHeight());
+   else
+       return wxSize(16, 16);  // completely arbitrary

 }
 
 }