native window disposal is moved to deferred delete, size of parent taken into account...

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

diff --git a/src/mac/carbon/window.cpp b/src/mac/carbon/window.cpp
index a821346eefc42a73f8aeebd4fc9e1c7e31a55294..fb00a1c4d1f53946447adf7ed48e924eed1c93bc 100644 (file)
--- a/src/mac/carbon/window.cpp
+++ b/src/mac/carbon/window.cpp
@@ -694,11 +694,17 @@ bool wxWindowMac::Show(bool show)
     if ( !wxWindowBase::Show(show) )
         return FALSE;
 
     if ( !wxWindowBase::Show(show) )
         return FALSE;
 

+/*
+    WindowRef window = (WindowRef) MacGetRootWindow() ;
+    wxWindowMac* win = wxFindWinFromMacWindow( window ) ;
+    if ( win == NULL && win->m_isBeingDeleted )
+        return FALSE ;
+*/       

     MacSuperShown( show ) ;
     MacSuperShown( show ) ;

+    Refresh() ; 
+/*      

     if ( !show )
     {
     if ( !show )
     {

-        WindowRef window = (WindowRef) MacGetRootWindow() ;
-        wxWindowMac* win = wxFindWinFromMacWindow( window ) ;

         if ( win && !win->m_isBeingDeleted )
             Refresh() ; 
     }
         if ( win && !win->m_isBeingDeleted )
             Refresh() ; 
     }


@@ -706,7 +712,7 @@ bool wxWindowMac::Show(bool show)
     {
         Refresh() ; 
     }
     {
         Refresh() ; 
     }

-
+*/

     return TRUE;
 }
 
     return TRUE;
 }
 


@@ -911,7 +917,7 @@ const wxBrush& wxWindowMac::MacGetBackgroundBrush()
                         Rect extent = { 0 , 0 , 0 , 0 } ;
                         int x , y ;
                         x = y = 0 ;
                         Rect extent = { 0 , 0 , 0 , 0 } ;
                         int x , y ;
                         x = y = 0 ;

-                        wxSize size = GetSize() ;
+                        wxSize size = parent->GetSize() ;

                         parent->MacClientToRootWindow( &x , &y ) ;
                         extent.left = x ;
                         extent.top = y ;
                         parent->MacClientToRootWindow( &x , &y ) ;
                         extent.left = x ;
                         extent.top = y ;

diff --git a/src/mac/window.cpp b/src/mac/window.cpp
index a821346eefc42a73f8aeebd4fc9e1c7e31a55294..fb00a1c4d1f53946447adf7ed48e924eed1c93bc 100644 (file)
--- a/src/mac/window.cpp
+++ b/src/mac/window.cpp
@@ -694,11 +694,17 @@ bool wxWindowMac::Show(bool show)
     if ( !wxWindowBase::Show(show) )
         return FALSE;
 
     if ( !wxWindowBase::Show(show) )
         return FALSE;
 

+/*
+    WindowRef window = (WindowRef) MacGetRootWindow() ;
+    wxWindowMac* win = wxFindWinFromMacWindow( window ) ;
+    if ( win == NULL && win->m_isBeingDeleted )
+        return FALSE ;
+*/       

     MacSuperShown( show ) ;
     MacSuperShown( show ) ;

+    Refresh() ; 
+/*      

     if ( !show )
     {
     if ( !show )
     {

-        WindowRef window = (WindowRef) MacGetRootWindow() ;
-        wxWindowMac* win = wxFindWinFromMacWindow( window ) ;

         if ( win && !win->m_isBeingDeleted )
             Refresh() ; 
     }
         if ( win && !win->m_isBeingDeleted )
             Refresh() ; 
     }


@@ -706,7 +712,7 @@ bool wxWindowMac::Show(bool show)
     {
         Refresh() ; 
     }
     {
         Refresh() ; 
     }

-
+*/

     return TRUE;
 }
 
     return TRUE;
 }
 


@@ -911,7 +917,7 @@ const wxBrush& wxWindowMac::MacGetBackgroundBrush()
                         Rect extent = { 0 , 0 , 0 , 0 } ;
                         int x , y ;
                         x = y = 0 ;
                         Rect extent = { 0 , 0 , 0 , 0 } ;
                         int x , y ;
                         x = y = 0 ;

-                        wxSize size = GetSize() ;
+                        wxSize size = parent->GetSize() ;

                         parent->MacClientToRootWindow( &x , &y ) ;
                         extent.left = x ;
                         extent.top = y ;
                         parent->MacClientToRootWindow( &x , &y ) ;
                         extent.left = x ;
                         extent.top = y ;