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

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

@@ -138,9 +138,6 @@ 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 )
if ( HIThemeDrawButton != 0 )
{
HIRect headerRect = CGRectMake( x, y, w, h ); HIRect headerRect = CGRectMake( x, y, w, h );
if ( !dc.IsKindOf( CLASSINFO( wxPaintDC ) ) ) if ( !dc.IsKindOf( CLASSINFO( wxPaintDC ) ) )
{ {
@@ -194,26 +191,6 @@ void wxRendererMac::DrawHeaderButton( wxWindow *win,
QDEndCGContext( (CGrafPtr) dc.m_macPort, &cgContext ); QDEndCGContext( (CGrafPtr) dc.m_macPort, &cgContext );
#endif #endif
} }
}
else
#endif
{
wxMacWindowClipper clipper(win);
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;
memset( &drawInfo, 0, sizeof(drawInfo) );
drawInfo.state = (flags & wxCONTROL_DISABLED) ? kThemeStateInactive : kThemeStateActive;
drawInfo.value = 0;
drawInfo.adornment = kThemeAdornmentNone;
DrawThemeButton( &rect, kThemeListHeaderButton, &drawInfo, NULL, NULL, NULL, 0 );
}
} }
void wxRendererMac::DrawTreeItemButton( wxWindow *win, void wxRendererMac::DrawTreeItemButton( wxWindow *win,
@@ -267,9 +244,6 @@ 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 )
if ( HIThemeDrawPaneSplitter != 0 )
{
bool hasMetal = win->MacGetTopLevelWindow()->MacGetMetalAppearance(); bool hasMetal = win->MacGetTopLevelWindow()->MacGetMetalAppearance();
SInt32 height; SInt32 height;
GetThemeMetric( kThemeMetricSmallPaneSplitterHeight, &height ); GetThemeMetric( kThemeMetricSmallPaneSplitterHeight, &height );
@@ -329,33 +303,4 @@ void wxRendererMac::DrawSplitterSash( wxWindow *win,
QDEndCGContext( (CGrafPtr) dc.m_macPort, &cgContext ); QDEndCGContext( (CGrafPtr) dc.m_macPort, &cgContext );
#endif #endif
} }
}
else
#endif
{
// Do the gradient fill:
static int grayValues[] =
{
0xA0, 0xF6, 0xED, 0xE4, 0xE2, 0xD0, 0xA0
};
int i;
dc.SetBrush( *wxTRANSPARENT_BRUSH );
if (orient == wxVERTICAL)
{
for (i=0; i < (int)WXSIZEOF(grayValues); i++)
{
dc.SetPen( wxPen( wxColour( grayValues[i], grayValues[i], grayValues[i] ), 1, wxSOLID ) );
dc.DrawRectangle( position + i, 0, 1, size.y );
}
}
else
{
for (i=0; i < (int)WXSIZEOF(grayValues); i++)
{
dc.SetPen( wxPen( wxColour( grayValues[i], grayValues[i], grayValues[i] ), 1, wxSOLID ) );
dc.DrawRectangle( 0, position + i, size.x, 1 );
}
}
}
} }