Amebis/wxWidgets
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

native window disposal is moved to deferred delete, size of parent taken into account for apply background

Browse Source 
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@15498 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
This commit is contained in:
Stefan Csomor
2002-05-11 06:48:50 +00:00
parent 2d9d0118ea
commit baf52e1ccd
2 changed files with 20 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files

14
src/mac/carbon/window.cpp
View File

@@ -694,11 +694,17 @@ bool wxWindowMac::Show(bool show)
if ( !wxWindowBase::Show(show) ) if ( !wxWindowBase::Show(show) )
return FALSE; 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 ) if ( win && !win->m_isBeingDeleted )
Refresh() ; 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 } ; Rect extent = { 0 , 0 , 0 , 0 } ;
int x , y ; int x , y ;
x = y = 0 ; x = y = 0 ;
wxSize size = GetSize() ; wxSize size = parent->GetSize() ;
parent->MacClientToRootWindow( &x , &y ) ; parent->MacClientToRootWindow( &x , &y ) ;
extent.left = x ; extent.left = x ;
extent.top = y ; extent.top = y ;

14
src/mac/window.cpp
View File

@@ -694,11 +694,17 @@ bool wxWindowMac::Show(bool show)
if ( !wxWindowBase::Show(show) ) if ( !wxWindowBase::Show(show) )
return FALSE; 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 ) if ( win && !win->m_isBeingDeleted )
Refresh() ; 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 } ; Rect extent = { 0 , 0 , 0 , 0 } ;
int x , y ; int x , y ;
x = y = 0 ; x = y = 0 ;
wxSize size = GetSize() ; wxSize size = parent->GetSize() ;
parent->MacClientToRootWindow( &x , &y ) ; parent->MacClientToRootWindow( &x , &y ) ;
extent.left = x ; extent.left = x ;
extent.top = y ; extent.top = y ;