diff --git a/src/mac/carbon/statbmp.cpp b/src/mac/carbon/statbmp.cpp
index 742f1f5f84..40793c756a 100644
--- a/src/mac/carbon/statbmp.cpp
+++ b/src/mac/carbon/statbmp.cpp
@@ -63,6 +63,7 @@ void wxStaticBitmap::SetSize(int x, int y, int width, int height, int sizeFlags)
 void wxStaticBitmap::SetBitmap(const wxBitmap& bitmap)
 {
     m_messageBitmap = bitmap;
+    Refresh() ;
     SetSizeOrDefault();
 }
 
diff --git a/src/mac/carbon/window.cpp b/src/mac/carbon/window.cpp
index ec1e62b0d1..3e59235190 100644
--- a/src/mac/carbon/window.cpp
+++ b/src/mac/carbon/window.cpp
@@ -1855,7 +1855,7 @@ void wxWindow::MacRedraw( RgnHandle updatergn , long time)
         		// eventually test for transparent windows
 		        if ( child->GetMacRootWindow() == window && child->IsShown() )
 		        {
-		            if ( !child->IsKindOf( CLASSINFO( wxNotebook ) ) && !child->IsKindOf( CLASSINFO( wxTabCtrl ) ) )
+		            if ( !child->IsKindOf( CLASSINFO( wxControl ) ) && ((wxControl*)child)->GetMacControl() )
 		            {
         		        SetRectRgn( childarea , child->m_x , child->m_y , child->m_x + child->m_width ,  child->m_y + child->m_height ) ;
         		        DiffRgn( ownUpdateRgn , childarea , ownUpdateRgn ) ;
diff --git a/src/mac/statbmp.cpp b/src/mac/statbmp.cpp
index 742f1f5f84..40793c756a 100644
--- a/src/mac/statbmp.cpp
+++ b/src/mac/statbmp.cpp
@@ -63,6 +63,7 @@ void wxStaticBitmap::SetSize(int x, int y, int width, int height, int sizeFlags)
 void wxStaticBitmap::SetBitmap(const wxBitmap& bitmap)
 {
     m_messageBitmap = bitmap;
+    Refresh() ;
     SetSizeOrDefault();
 }
 
diff --git a/src/mac/window.cpp b/src/mac/window.cpp
index ec1e62b0d1..3e59235190 100644
--- a/src/mac/window.cpp
+++ b/src/mac/window.cpp
@@ -1855,7 +1855,7 @@ void wxWindow::MacRedraw( RgnHandle updatergn , long time)
         		// eventually test for transparent windows
 		        if ( child->GetMacRootWindow() == window && child->IsShown() )
 		        {
-		            if ( !child->IsKindOf( CLASSINFO( wxNotebook ) ) && !child->IsKindOf( CLASSINFO( wxTabCtrl ) ) )
+		            if ( !child->IsKindOf( CLASSINFO( wxControl ) ) && ((wxControl*)child)->GetMacControl() )
 		            {
         		        SetRectRgn( childarea , child->m_x , child->m_y , child->m_x + child->m_width ,  child->m_y + child->m_height ) ;
         		        DiffRgn( ownUpdateRgn , childarea , ownUpdateRgn ) ;