scrollbar fixes and workaround for redraw problems w/o erase , setbitmap triggers...

git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@10287 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775

diff --git a/src/mac/carbon/statbmp.cpp b/src/mac/carbon/statbmp.cpp
index 742f1f5f841b4cb58701f04727b44de87bbee6dd..40793c756a3b734738b0821d494ca516c8e5785b 100644 (file)
--- 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 ec1e62b0d177810a6341d9a47dcd6c9149644596..3e59235190693235617a3eaee87f4dd8c9c40fc6 100644 (file)
--- 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 742f1f5f841b4cb58701f04727b44de87bbee6dd..40793c756a3b734738b0821d494ca516c8e5785b 100644 (file)
--- 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 ec1e62b0d177810a6341d9a47dcd6c9149644596..3e59235190693235617a3eaee87f4dd8c9c40fc6 100644 (file)
--- 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 ) ;