proper UTF32 / 16 conversions added

[wxWidgets.git] / src / mac / carbon / window.cpp

diff --git a/src/mac/carbon/window.cpp b/src/mac/carbon/window.cpp
index 5e485ecf641c4e3db229a47ace13cfa7052f9478..8fad9699bc916d1c04c295ac515513beba896c3a 100644 (file)
--- a/src/mac/carbon/window.cpp
+++ b/src/mac/carbon/window.cpp
@@ -846,7 +846,7 @@ void wxWindowMac::MacSuperEnabled( bool enabled )
 
 bool wxWindowMac::MacIsReallyShown() const
 {
-    if ( m_isShown && (m_parent != NULL) ) {
+    if ( m_isShown && (m_parent != NULL && !IsTopLevel() ) ) {
         return m_parent->MacIsReallyShown();
     }
     return m_isShown;
@@ -1278,7 +1278,16 @@ void wxWindowMac::ScrollWindow(int dx, int dy, const wxRect *rect)
         child->GetPosition( &x, &y );
         int w,h;
         child->GetSize( &w, &h );
-        child->SetSize( x+dx, y+dy, w, h );
+        if (rect)
+        {
+            wxRect rc(x,y,w,h);
+            if (rect->Intersects(rc))
+                child->SetSize( x+dx, y+dy, w, h );
+        }
+        else
+        {
+            child->SetSize( x+dx, y+dy, w, h );                
+        }        
     }
     
     Update() ;