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

reformat for readability

Browse Source 
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@36395 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
This commit is contained in:
David Surovell
2005-12-14 23:20:55 +00:00
parent 21e77aa170
commit 9b2eab527d
2 changed files with 441 additions and 187 deletions
Download Patch File Download Diff File Expand all files Collapse all files

598
src/mac/carbon/dc.cpp
View File

File diff suppressed because it is too large Load Diff

30
src/mac/carbon/dcclient.cpp
View File

@@ -47,14 +47,16 @@ IMPLEMENT_DYNAMIC_CLASS(wxPaintDC, wxWindowDC)
static wxBrush MacGetBackgroundBrush( wxWindow* window )
{
wxBrush bkdBrush = window->MacGetBackgroundBrush() ;
#if !TARGET_API_MAC_OSX
// transparency cannot be handled by the OS when not using composited windows
wxWindow* parent = window->GetParent() ;
// if we have some 'pseudo' transparency
if ( ! bkdBrush.Ok() || bkdBrush.GetStyle() == wxTRANSPARENT || window->GetBackgroundColour() == wxSystemSettings::GetColour(wxSYS_COLOUR_3DFACE ) )
{
// walk up until we find something
while( parent != NULL )
while ( parent != NULL )
{
if ( parent->GetBackgroundColour() != wxSystemSettings::GetColour(wxSYS_COLOUR_3DFACE ) )
{
@@ -62,11 +64,13 @@ static wxBrush MacGetBackgroundBrush( wxWindow* window )
bkdBrush.SetColour( parent->GetBackgroundColour() ) ;
break ;
}
if ( parent->IsKindOf( CLASSINFO(wxTopLevelWindow) ) )
{
bkdBrush = parent->MacGetBackgroundBrush() ;
break ;
}
if ( parent->IsKindOf( CLASSINFO( wxNotebook ) ) || parent->IsKindOf( CLASSINFO( wxTabCtrl ) ) )
{
Rect extent = { 0 , 0 , 0 , 0 } ;
@@ -86,16 +90,17 @@ static wxBrush MacGetBackgroundBrush( wxWindow* window )
parent = parent->GetParent() ;
}
}
if ( !bkdBrush.Ok() || bkdBrush.GetStyle() == wxTRANSPARENT )
{
// if we did not find something, use a default
bkdBrush.MacSetTheme( kThemeBrushDialogBackgroundActive ) ;
}
#endif
#endif
return bkdBrush ;
}
wxWindowDC::wxWindowDC()
{
m_window = NULL ;
@@ -107,6 +112,7 @@ wxWindowDC::wxWindowDC(wxWindow *window)
wxTopLevelWindowMac* rootwindow = window->MacGetTopLevelWindow() ;
if (!rootwindow)
return;
WindowRef windowref = (WindowRef) rootwindow->MacGetWindowRef() ;
int x , y ;
x = y = 0 ;
@@ -146,7 +152,8 @@ wxWindowDC::wxWindowDC(wxWindow *window)
CopyRgn( (RgnHandle) m_macBoundaryClipRgn , (RgnHandle) m_macCurrentClipRgn ) ;
SetBackground(MacGetBackgroundBrush(window));
#endif
m_ok = TRUE ;
m_ok = true ;
SetFont( window->GetFont() ) ;
}
@@ -176,6 +183,7 @@ wxClientDC::wxClientDC(wxWindow *window)
wxTopLevelWindowMac* rootwindow = window->MacGetTopLevelWindow() ;
if (!rootwindow)
return;
WindowRef windowref = (WindowRef) rootwindow->MacGetWindowRef() ;
wxPoint origin = window->GetClientAreaOrigin() ;
wxSize size = window->GetClientSize() ;
@@ -193,7 +201,6 @@ wxClientDC::wxClientDC(wxWindow *window)
m_graphicContext = new wxMacCGContext( (CGContextRef) window->MacGetCGContextRef() ) ;
m_graphicContext->SetPen( m_pen ) ;
m_graphicContext->SetBrush( m_brush ) ;
m_ok = TRUE ;
SetClippingRegion( 0 , 0 , size.x , size.y ) ;
SetBackground(MacGetBackgroundBrush(window));
}
@@ -206,7 +213,6 @@ wxClientDC::wxClientDC(wxWindow *window)
m_graphicContext = new wxMacCGContext( (CGrafPtr) m_macPort ) ;
m_graphicContext->SetPen( m_pen ) ;
m_graphicContext->SetBrush( m_brush ) ;
m_ok = TRUE ;
}
#else
m_macLocalOrigin.x = x ;
@@ -216,8 +222,9 @@ wxClientDC::wxClientDC(wxWindow *window)
OffsetRgn( (RgnHandle) m_macBoundaryClipRgn , -origin.x , -origin.y ) ;
OffsetRgn( (RgnHandle) m_macBoundaryClipRgn , m_macLocalOrigin.x , m_macLocalOrigin.y ) ;
CopyRgn( (RgnHandle) m_macBoundaryClipRgn ,(RgnHandle) m_macCurrentClipRgn ) ;
m_ok = TRUE ;
#endif
m_ok = true ;
SetBackground(MacGetBackgroundBrush(window));
SetFont( window->GetFont() ) ;
}
@@ -242,7 +249,6 @@ void wxClientDC::DoGetSize(int *width, int *height) const
m_window->GetClientSize( width, height );
}
/*
* wxPaintDC
*/
@@ -264,6 +270,7 @@ wxPaintDC::wxPaintDC(wxWindow *window)
y = origin.y ;
window->MacWindowToRootWindow( &x , &y ) ;
m_macPort = UMAGetWindowPort( windowref ) ;
#if wxMAC_USE_CORE_GRAPHICS
m_macLocalOriginInPort.x = x ;
m_macLocalOriginInPort.y = y ;
@@ -272,7 +279,6 @@ wxPaintDC::wxPaintDC(wxWindow *window)
m_graphicContext = new wxMacCGContext( (CGContextRef) window->MacGetCGContextRef() ) ;
m_graphicContext->SetPen( m_pen ) ;
m_graphicContext->SetBrush( m_brush ) ;
m_ok = TRUE ;
SetClippingRegion( 0 , 0 , size.x , size.y ) ;
SetBackground(MacGetBackgroundBrush(window));
}
@@ -280,7 +286,6 @@ wxPaintDC::wxPaintDC(wxWindow *window)
{
wxLogDebug(wxT("You cannot create a wxPaintDC outside an OS-draw event") ) ;
m_graphicContext = NULL ;
m_ok = TRUE ;
}
// there is no out-of-order drawing on OSX
#else
@@ -293,8 +298,9 @@ wxPaintDC::wxPaintDC(wxWindow *window)
OffsetRgn( (RgnHandle) m_macBoundaryClipRgn , m_macLocalOrigin.x , m_macLocalOrigin.y ) ;
CopyRgn( (RgnHandle) m_macBoundaryClipRgn , (RgnHandle) m_macCurrentClipRgn ) ;
SetBackground(MacGetBackgroundBrush(window));
m_ok = TRUE ;
#endif
m_ok = true ;
SetFont( window->GetFont() ) ;
}
@@ -308,5 +314,3 @@ void wxPaintDC::DoGetSize(int *width, int *height) const
m_window->GetClientSize( width, height );
}