HIRect headerRect = CGRectMake( x, y, w, h );
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.x + headerRect.size.width)
- };
-
- RgnHandle updateRgn = NewRgn();
- RectRgn( updateRgn, &r );
- HIViewSetNeedsDisplayInRegion( (HIViewRef) win->GetHandle(), updateRgn, true );
- DisposeRgn( updateRgn );
+ win->Refresh( &rect );
}
else
{
CGContextRef cgContext;
-
- cgContext = (CGContextRef) dc.GetGraphicsContext()->GetNativeContext();
+ wxGCDCImpl *impl = (wxGCDCImpl*) dc.GetImpl();
+
+ cgContext = (CGContextRef) impl->GetGraphicsContext()->GetNativeContext();
{
HIThemeButtonDrawInfo drawInfo;
HIRect headerRect = CGRectMake( x, y, w, h );
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.x + headerRect.size.width)
- };
-
- RgnHandle updateRgn = NewRgn();
- RectRgn( updateRgn, &r );
- HIViewSetNeedsDisplayInRegion( (HIViewRef) win->GetHandle(), updateRgn, true );
- DisposeRgn( updateRgn );
+ win->Refresh( &rect );
}
else
{
CGContextRef cgContext;
- cgContext = (CGContextRef) dc.GetGraphicsContext()->GetNativeContext();
+ wxGCDCImpl *impl = (wxGCDCImpl*) dc.GetImpl();
+ cgContext = (CGContextRef) impl->GetGraphicsContext()->GetNativeContext();
HIThemeButtonDrawInfo drawInfo;
HIRect labelRect;
if ( !dc.IsKindOf( CLASSINFO( wxPaintDC ) ) )
{
- Rect r =
- {
- (short) splitterRect.origin.y,
- (short) splitterRect.origin.x,
- (short) (splitterRect.origin.y + splitterRect.size.height),
- (short) (splitterRect.origin.x + splitterRect.size.width)
- };
-
- RgnHandle updateRgn = NewRgn();
- RectRgn( updateRgn, &r );
- HIViewSetNeedsDisplayInRegion( (HIViewRef) win->GetHandle(), updateRgn, true );
- DisposeRgn( updateRgn );
- }
+ wxRect rect( (int) splitterRect.origin.x, (int) splitterRect.origin.y, (int) splitterRect.size.width,
+ (int) splitterRect.size.height );
+ win->Refresh( &rect );
+ }
else
{
CGContextRef cgContext;
-
- cgContext = (CGContextRef) dc.GetGraphicsContext()->GetNativeContext();
+ wxGCDCImpl *impl = (wxGCDCImpl*) dc.GetImpl();
+ cgContext = (CGContextRef) impl->GetGraphicsContext()->GetNativeContext();
HIThemeSplitterDrawInfo drawInfo;
drawInfo.version = 0;
{
if ( !(flags & wxCONTROL_SELECTED) )
return;
-
- if (flags & wxCONTROL_FOCUSED)
- {
- if (!IsControlActive( (ControlRef)win->GetHandle() ))
- flags = wxCONTROL_SELECTED;
- }
-
- RGBColor selColor;
- GetThemeBrushAsColor(flags & wxCONTROL_FOCUSED
- ? kThemeBrushAlternatePrimaryHighlightColor
- : kThemeBrushSecondaryHighlightColor,
- 32, true, &selColor);
-
- wxBrush selBrush(selColor);
-
+
+ wxColour col( wxMacCreateCGColorFromHITheme( (flags & wxCONTROL_FOCUSED) ?
+ kThemeBrushAlternatePrimaryHighlightColor
+ : kThemeBrushSecondaryHighlightColor ) );
+ wxBrush selBrush( col );
+
dc.SetPen( *wxTRANSPARENT_PEN );
dc.SetBrush( selBrush );
dc.DrawRectangle( rect );
HIRect headerRect = CGRectMake( x, y, w, h );
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.x + headerRect.size.width)
- };
-
- RgnHandle updateRgn = NewRgn();
- RectRgn( updateRgn, &r );
- HIViewSetNeedsDisplayInRegion( (HIViewRef) win->GetHandle(), updateRgn, true );
- DisposeRgn( updateRgn );
+ win->Refresh( &rect );
}
else
{
+ wxGCDCImpl *impl = (wxGCDCImpl*) dc.GetImpl();
CGContextRef cgContext;
- cgContext = (CGContextRef) dc.GetGraphicsContext()->GetNativeContext();
+ cgContext = (CGContextRef) impl->GetGraphicsContext()->GetNativeContext();
HIThemeButtonDrawInfo drawInfo;
HIRect labelRect;