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

removing code for pre 10.3 systems

Browse Source 
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@40565 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
This commit is contained in:
Stefan Csomor
2006-08-11 04:31:33 +00:00
parent b86db821bf
commit a62f32af00
1 changed files with 92 additions and 147 deletions
Download Patch File Download Diff File Expand all files Collapse all files

239
src/mac/carbon/renderer.cpp
View File

@@ -138,81 +138,58 @@ void wxRendererMac::DrawHeaderButton( wxWindow *win,
dc.SetBrush( *wxTRANSPARENT_BRUSH ); dc.SetBrush( *wxTRANSPARENT_BRUSH );
#if defined(__WXMAC_OSX__) && ( MAC_OS_X_VERSION_MAX_ALLOWED >= MAC_OS_X_VERSION_10_3 ) HIRect headerRect = CGRectMake( x, y, w, h );
if ( HIThemeDrawButton != 0 ) if ( !dc.IsKindOf( CLASSINFO( wxPaintDC ) ) )
{ {
HIRect headerRect = CGRectMake( x, y, w, h ); Rect r =
if ( !dc.IsKindOf( CLASSINFO( wxPaintDC ) ) )
{ {
Rect r = (short) headerRect.origin.y, (short) headerRect.origin.x,
{ (short) (headerRect.origin.y + headerRect.size.height),
(short) headerRect.origin.y, (short) headerRect.origin.x, (short) (headerRect.origin.x + headerRect.size.width)
(short) (headerRect.origin.y + headerRect.size.height), };
(short) (headerRect.origin.x + headerRect.size.width)
};
RgnHandle updateRgn = NewRgn(); RgnHandle updateRgn = NewRgn();
RectRgn( updateRgn, &r ); RectRgn( updateRgn, &r );
HIViewSetNeedsDisplayInRegion( (HIViewRef) win->GetHandle(), updateRgn, true ); HIViewSetNeedsDisplayInRegion( (HIViewRef) win->GetHandle(), updateRgn, true );
DisposeRgn( updateRgn ); DisposeRgn( updateRgn );
}
else
{
CGContextRef cgContext;
#if wxMAC_USE_CORE_GRAPHICS
cgContext = ((wxMacCGContext*)(dc.GetGraphicContext()))->GetNativeContext();
#else
Rect bounds;
GetPortBounds( (CGrafPtr) dc.m_macPort, &bounds );
QDBeginCGContext( (CGrafPtr) dc.m_macPort, &cgContext );
CGContextTranslateCTM( cgContext, 0, bounds.bottom - bounds.top );
CGContextScaleCTM( cgContext, 1, -1 );
HIShapeReplacePathInCGContext( HIShapeCreateWithQDRgn( (RgnHandle) dc.m_macCurrentClipRgn ), cgContext );
CGContextClip( cgContext );
HIViewConvertRect( &headerRect, (HIViewRef) win->GetHandle(), (HIViewRef) win->MacGetTopLevelWindow()->GetHandle() );
#endif
{
HIThemeButtonDrawInfo drawInfo;
HIRect labelRect;
memset( &drawInfo, 0, sizeof(drawInfo) );
drawInfo.version = 0;
drawInfo.state = (flags & wxCONTROL_DISABLED) ? kThemeStateInactive : kThemeStateActive;
drawInfo.kind = kThemeListHeaderButton;
drawInfo.value = 0;
drawInfo.adornment = kThemeAdornmentNone;
HIThemeDrawButton( &headerRect, &drawInfo, cgContext, kHIThemeOrientationNormal, &labelRect );
}
#if wxMAC_USE_CORE_GRAPHICS
#else
QDEndCGContext( (CGrafPtr) dc.m_macPort, &cgContext );
#endif
}
} }
else else
#endif
{ {
wxMacWindowClipper clipper(win); CGContextRef cgContext;
Rect rect = { y, x, y + h, x + w };
wxPoint origin = win->GetClientAreaOrigin();
int dx, dy;
dx = origin.x;
dy = origin.y;
win->MacWindowToRootWindow( &dx, &dy );
OffsetRect( &rect, dx, dy );
ThemeButtonDrawInfo drawInfo; #if wxMAC_USE_CORE_GRAPHICS
memset( &drawInfo, 0, sizeof(drawInfo) ); cgContext = ((wxMacCGContext*)(dc.GetGraphicContext()))->GetNativeContext();
drawInfo.state = (flags & wxCONTROL_DISABLED) ? kThemeStateInactive : kThemeStateActive; #else
drawInfo.value = 0; Rect bounds;
drawInfo.adornment = kThemeAdornmentNone;
DrawThemeButton( &rect, kThemeListHeaderButton, &drawInfo, NULL, NULL, NULL, 0 ); GetPortBounds( (CGrafPtr) dc.m_macPort, &bounds );
QDBeginCGContext( (CGrafPtr) dc.m_macPort, &cgContext );
CGContextTranslateCTM( cgContext, 0, bounds.bottom - bounds.top );
CGContextScaleCTM( cgContext, 1, -1 );
HIShapeReplacePathInCGContext( HIShapeCreateWithQDRgn( (RgnHandle) dc.m_macCurrentClipRgn ), cgContext );
CGContextClip( cgContext );
HIViewConvertRect( &headerRect, (HIViewRef) win->GetHandle(), (HIViewRef) win->MacGetTopLevelWindow()->GetHandle() );
#endif
{
HIThemeButtonDrawInfo drawInfo;
HIRect labelRect;
memset( &drawInfo, 0, sizeof(drawInfo) );
drawInfo.version = 0;
drawInfo.state = (flags & wxCONTROL_DISABLED) ? kThemeStateInactive : kThemeStateActive;
drawInfo.kind = kThemeListHeaderButton;
drawInfo.value = 0;
drawInfo.adornment = kThemeAdornmentNone;
HIThemeDrawButton( &headerRect, &drawInfo, cgContext, kHIThemeOrientationNormal, &labelRect );
}
#if wxMAC_USE_CORE_GRAPHICS
#else
QDEndCGContext( (CGrafPtr) dc.m_macPort, &cgContext );
#endif
} }
} }
@@ -267,95 +244,63 @@ void wxRendererMac::DrawSplitterSash( wxWindow *win,
wxOrientation orient, wxOrientation orient,
int WXUNUSED(flags) ) int WXUNUSED(flags) )
{ {
#if defined(__WXMAC_OSX__) && ( MAC_OS_X_VERSION_MAX_ALLOWED >= MAC_OS_X_VERSION_10_3 ) bool hasMetal = win->MacGetTopLevelWindow()->MacGetMetalAppearance();
if ( HIThemeDrawPaneSplitter != 0 ) SInt32 height;
{ GetThemeMetric( kThemeMetricSmallPaneSplitterHeight, &height );
bool hasMetal = win->MacGetTopLevelWindow()->MacGetMetalAppearance(); HIRect splitterRect;
SInt32 height; if (orient == wxVERTICAL)
GetThemeMetric( kThemeMetricSmallPaneSplitterHeight, &height ); splitterRect = CGRectMake( position, 0, height, size.y );
HIRect splitterRect; else
if (orient == wxVERTICAL) splitterRect = CGRectMake( 0, position, size.x, height );
splitterRect = CGRectMake( position, 0, height, size.y );
else
splitterRect = CGRectMake( 0, position, size.x, height );
#if !wxMAC_USE_CORE_GRAPHICS #if !wxMAC_USE_CORE_GRAPHICS
HIViewConvertRect( HIViewConvertRect(
&splitterRect, &splitterRect,
(HIViewRef) win->GetHandle(), (HIViewRef) win->GetHandle(),
(HIViewRef) win->MacGetTopLevelWindow()->GetHandle() ); (HIViewRef) win->MacGetTopLevelWindow()->GetHandle() );
#endif #endif
// under compositing we should only draw when called by the OS, otherwise just issue a redraw command // under compositing we should only draw when called by the OS, otherwise just issue a redraw command
// strange redraw errors occur if we don't do this // strange redraw errors occur if we don't do this
if ( !dc.IsKindOf( CLASSINFO( wxPaintDC ) ) ) if ( !dc.IsKindOf( CLASSINFO( wxPaintDC ) ) )
{
Rect r =
{ {
Rect r = (short) splitterRect.origin.y,
{ (short) splitterRect.origin.x,
(short) splitterRect.origin.y, (short) (splitterRect.origin.y + splitterRect.size.height),
(short) splitterRect.origin.x, (short) (splitterRect.origin.x + splitterRect.size.width)
(short) (splitterRect.origin.y + splitterRect.size.height), };
(short) (splitterRect.origin.x + splitterRect.size.width)
};
RgnHandle updateRgn = NewRgn(); RgnHandle updateRgn = NewRgn();
RectRgn( updateRgn, &r ); RectRgn( updateRgn, &r );
HIViewSetNeedsDisplayInRegion( (HIViewRef) win->GetHandle(), updateRgn, true ); HIViewSetNeedsDisplayInRegion( (HIViewRef) win->GetHandle(), updateRgn, true );
DisposeRgn( updateRgn ); DisposeRgn( updateRgn );
}
else
{
CGContextRef cgContext;
#if wxMAC_USE_CORE_GRAPHICS
cgContext = ((wxMacCGContext*)(dc.GetGraphicContext()))->GetNativeContext();
#else
Rect bounds;
GetPortBounds( (CGrafPtr) dc.m_macPort, &bounds );
QDBeginCGContext( (CGrafPtr) dc.m_macPort, &cgContext );
CGContextTranslateCTM( cgContext, 0, bounds.bottom - bounds.top );
CGContextScaleCTM( cgContext, 1, -1 );
#endif
HIThemeSplitterDrawInfo drawInfo;
drawInfo.version = 0;
drawInfo.state = kThemeStateActive;
drawInfo.adornment = hasMetal ? kHIThemeSplitterAdornmentMetal : kHIThemeSplitterAdornmentNone;
HIThemeDrawPaneSplitter( &splitterRect, &drawInfo, cgContext, kHIThemeOrientationNormal );
#if wxMAC_USE_CORE_GRAPHICS
#else
QDEndCGContext( (CGrafPtr) dc.m_macPort, &cgContext );
#endif
}
} }
else else
#endif
{ {
// Do the gradient fill: CGContextRef cgContext;
static int grayValues[] =
{
0xA0, 0xF6, 0xED, 0xE4, 0xE2, 0xD0, 0xA0
};
int i;
dc.SetBrush( *wxTRANSPARENT_BRUSH ); #if wxMAC_USE_CORE_GRAPHICS
if (orient == wxVERTICAL) cgContext = ((wxMacCGContext*)(dc.GetGraphicContext()))->GetNativeContext();
{ #else
for (i=0; i < (int)WXSIZEOF(grayValues); i++) Rect bounds;
{ GetPortBounds( (CGrafPtr) dc.m_macPort, &bounds );
dc.SetPen( wxPen( wxColour( grayValues[i], grayValues[i], grayValues[i] ), 1, wxSOLID ) ); QDBeginCGContext( (CGrafPtr) dc.m_macPort, &cgContext );
dc.DrawRectangle( position + i, 0, 1, size.y ); CGContextTranslateCTM( cgContext, 0, bounds.bottom - bounds.top );
} CGContextScaleCTM( cgContext, 1, -1 );
} #endif
else
{ HIThemeSplitterDrawInfo drawInfo;
for (i=0; i < (int)WXSIZEOF(grayValues); i++) drawInfo.version = 0;
{ drawInfo.state = kThemeStateActive;
dc.SetPen( wxPen( wxColour( grayValues[i], grayValues[i], grayValues[i] ), 1, wxSOLID ) ); drawInfo.adornment = hasMetal ? kHIThemeSplitterAdornmentMetal : kHIThemeSplitterAdornmentNone;
dc.DrawRectangle( 0, position + i, size.x, 1 ); HIThemeDrawPaneSplitter( &splitterRect, &drawInfo, cgContext, kHIThemeOrientationNormal );
}
} #if wxMAC_USE_CORE_GRAPHICS
#else
QDEndCGContext( (CGrafPtr) dc.m_macPort, &cgContext );
#endif
} }
} }