From 7af14d718783cb81233e7f45f9f61159ad420b79 Mon Sep 17 00:00:00 2001 From: David Surovell Date: Mon, 13 Feb 2006 09:10:34 +0000 Subject: [PATCH] cleanup - reformatting git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@37554 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775 --- src/mac/carbon/renderer.cpp | 333 +++++++++++++++++++----------------- 1 file changed, 176 insertions(+), 157 deletions(-) diff --git a/src/mac/carbon/renderer.cpp b/src/mac/carbon/renderer.cpp index 62ff9846c9..3799d0cce7 100644 --- a/src/mac/carbon/renderer.cpp +++ b/src/mac/carbon/renderer.cpp @@ -1,5 +1,5 @@ /////////////////////////////////////////////////////////////////////////////// -// Name: mac/renderer.cpp +// Name: src/mac/carbon/renderer.cpp // Purpose: implementation of wxRendererNative for Mac // Author: Vadim Zeitlin // Modified by: @@ -9,14 +9,6 @@ // License: wxWindows licence /////////////////////////////////////////////////////////////////////////////// -// ============================================================================ -// declarations -// ============================================================================ - -// ---------------------------------------------------------------------------- -// headers -// ---------------------------------------------------------------------------- - // for compilers that support precompilation, includes "wx.h". #include "wx/wxprec.h" @@ -29,44 +21,41 @@ #include "wx/dc.h" #include "wx/bitmap.h" #include "wx/settings.h" -#endif //WX_PRECOMP +#endif #include "wx/renderer.h" #include "wx/toplevel.h" #include "wx/dcclient.h" #include "wx/mac/uma.h" -// ---------------------------------------------------------------------------- -// wxRendererMac: our wxRendererNative implementation -// ---------------------------------------------------------------------------- class WXDLLEXPORT wxRendererMac : public wxDelegateRendererNative { public: // draw the header control button (used by wxListCtrl) - virtual void DrawHeaderButton(wxWindow *win, - wxDC& dc, - const wxRect& rect, - int flags = 0); + virtual void DrawHeaderButton( wxWindow *win, + wxDC& dc, + const wxRect& rect, + int flags = 0 ); // draw the expanded/collapsed icon for a tree control item - virtual void DrawTreeItemButton(wxWindow *win, - wxDC& dc, - const wxRect& rect, - int flags = 0); + virtual void DrawTreeItemButton( wxWindow *win, + wxDC& dc, + const wxRect& rect, + int flags = 0 ); // draw a (vertical) sash - virtual void DrawSplitterSash(wxWindow *win, - wxDC& dc, - const wxSize& size, - wxCoord position, - wxOrientation orient, - int flags = 0); + virtual void DrawSplitterSash( wxWindow *win, + wxDC& dc, + const wxSize& size, + wxCoord position, + wxOrientation orient, + int flags = 0 ); private: // the tree buttons - wxBitmap m_bmpTreeExpanded, - m_bmpTreeCollapsed; + wxBitmap m_bmpTreeExpanded; + wxBitmap m_bmpTreeCollapsed; }; // ---------------------------------------------------------------------------- @@ -74,14 +63,16 @@ private: // ---------------------------------------------------------------------------- /* XPM */ -static const char *aqua_arrow_right_xpm[] = { -/* columns rows colors chars-per-pixel */ +static const char *aqua_arrow_right_xpm[] = +{ +// columns rows colors chars-per-pixel "13 11 4 1", " c None", "b c #C0C0C0", "c c #707070", "d c #A0A0A0", -/* pixels */ + +// pixels " b ", " ddb ", " cccdb ", @@ -96,14 +87,16 @@ static const char *aqua_arrow_right_xpm[] = { }; /* XPM */ -static const char *aqua_arrow_down_xpm[] = { -/* columns rows colors chars-per-pixel */ +static const char *aqua_arrow_down_xpm[] = +{ +// columns rows colors chars-per-pixel "13 11 4 1", " c None", "b c #C0C0C0", "c c #707070", "d c #A0A0A0", -/* pixels */ + +// pixels " ", " ", " bdcccccccdb ", @@ -121,7 +114,7 @@ static const char *aqua_arrow_down_xpm[] = { // implementation // ============================================================================ -/* static */ +// static wxRendererNative& wxRendererNative::GetDefault() { static wxRendererMac s_rendererMac; @@ -129,93 +122,104 @@ wxRendererNative& wxRendererNative::GetDefault() return s_rendererMac; } -void -wxRendererMac::DrawHeaderButton(wxWindow *win, - wxDC& dc, - const wxRect& rect, - int flags) +void wxRendererMac::DrawHeaderButton( wxWindow *win, + wxDC& dc, + const wxRect& rect, + int flags ) { - const wxCoord x = dc.XLOG2DEV(rect.x-1), - y = dc.YLOG2DEV(rect.y-1), - w = dc.XLOG2DEVREL(rect.width), - h = dc.YLOG2DEVREL(rect.height); + int major, minor; - int major,minor; wxGetOsVersion( &major, &minor ); + const wxCoord x = dc.XLOG2DEV(rect.x - 1); + const wxCoord y = dc.YLOG2DEV(rect.y - 1); + const wxCoord w = dc.XLOG2DEVREL(rect.width); + const wxCoord h = dc.YLOG2DEVREL(rect.height); + 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 ); - if ( dc.IsKindOf( CLASSINFO( wxPaintDC ) ) == false ) + 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 ) ; + 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 ); } else { - CGContextRef cgContext ; + CGContextRef cgContext; + #if wxMAC_USE_CORE_GRAPHICS - cgContext = ((wxMacCGContext*)(dc.GetGraphicContext()))->GetNativeContext() ; + 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() ) ; + 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 ) ; + 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 ) ; + QDEndCGContext( (CGrafPtr) dc.m_macPort, &cgContext ); #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 ) ; + 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, - wxDC& dc, - const wxRect& rect, - int flags) +void wxRendererMac::DrawTreeItemButton( wxWindow *win, + wxDC& dc, + const wxRect& rect, + int flags ) { // init the buttons on demand if ( !m_bmpTreeExpanded.Ok() ) @@ -229,83 +233,100 @@ wxRendererMac::DrawTreeItemButton(wxWindow *win, // VZ: this is the old code from treectlg.cpp which apparently doesn't work // but I kept it here just in case it is needed -- if not, please // remove it + #if 0 // def __WXMAC__ - wxMacPortSetter helper(&dc) ; - wxMacWindowClipper clipper(this) ; - wxDC::MacSetupBackgroundForCurrentPort( MacGetBackgroundBrush() ) ; - - int loc_x = x - 5 ; - int loc_y = y_mid - 6 ; - MacWindowToRootWindow( & loc_x , & loc_y ) ; - Rect bounds = { loc_y , loc_x , loc_y + 18 , loc_x + 12 } ; - ThemeButtonDrawInfo info = { kThemeStateActive , item->IsExpanded() ? kThemeDisclosureDown : kThemeDisclosureRight , - kThemeAdornmentNone }; - DrawThemeButton( &bounds, kThemeDisclosureButton , - &info , NULL , NULL , NULL , NULL ) ; + wxMacPortSetter helper(&dc); + wxMacWindowClipper clipper(this); + wxDC::MacSetupBackgroundForCurrentPort( MacGetBackgroundBrush() ); + + int loc_x = x - 5; + int loc_y = y_mid - 6; + MacWindowToRootWindow( &loc_x, &loc_y ); + Rect bounds = { loc_y, loc_x, loc_y + 18, loc_x + 12 }; + ThemeButtonDrawInfo info = + { + kThemeStateActive, + item->IsExpanded() ? kThemeDisclosureDown : kThemeDisclosureRight, + kThemeAdornmentNone + }; + + DrawThemeButton( &bounds, kThemeDisclosureButton, &info, NULL, NULL, NULL, NULL ); #else // 1 - dc.DrawBitmap(flags & wxCONTROL_EXPANDED ? m_bmpTreeExpanded - : m_bmpTreeCollapsed, - rect.x, rect.y, true /* use mask */); -#endif // 0/1 + dc.DrawBitmap( + flags & wxCONTROL_EXPANDED + ? m_bmpTreeExpanded + : m_bmpTreeCollapsed, + rect.x, rect.y, true /* use mask */); +#endif } -void -wxRendererMac::DrawSplitterSash(wxWindow *win, - wxDC& dc, - const wxSize& size, - wxCoord position, - wxOrientation orient, - int WXUNUSED(flags)) +void wxRendererMac::DrawSplitterSash( wxWindow *win, + wxDC& dc, + const wxSize& size, + wxCoord position, + wxOrientation orient, + 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() ; - SInt32 height ; - GetThemeMetric( kThemeMetricSmallPaneSplitterHeight , &height ) ; - HIRect splitterRect ; - if ( orient == wxVERTICAL ) - splitterRect = CGRectMake( position , 0 , height, size.y); + bool hasMetal = win->MacGetTopLevelWindow()->MacGetMetalAppearance(); + SInt32 height; + GetThemeMetric( kThemeMetricSmallPaneSplitterHeight, &height ); + HIRect splitterRect; + if (orient == wxVERTICAL) + splitterRect = CGRectMake( position, 0, height, size.y ); else - splitterRect = CGRectMake( 0 , position , size.x , height ); + splitterRect = CGRectMake( 0, position, size.x, height ); + #if !wxMAC_USE_CORE_GRAPHICS - HIViewConvertRect( &splitterRect , (HIViewRef) win->GetHandle() , (HIViewRef) win->MacGetTopLevelWindow()->GetHandle() ) ; + HIViewConvertRect( + &splitterRect, + (HIViewRef) win->GetHandle(), + (HIViewRef) win->MacGetTopLevelWindow()->GetHandle() ); #endif // 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 - if ( dc.IsKindOf( CLASSINFO( wxPaintDC ) ) == false ) + 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 ) ; + 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 ); } else { - CGContextRef cgContext ; + CGContextRef cgContext; + #if wxMAC_USE_CORE_GRAPHICS - cgContext = ((wxMacCGContext*)(dc.GetGraphicContext()))->GetNativeContext() ; + 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 ) ; + 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 ) ; + 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 ) ; + QDEndCGContext( (CGrafPtr) dc.m_macPort, &cgContext ); #endif } } @@ -313,29 +334,27 @@ wxRendererMac::DrawSplitterSash(wxWindow *win, #endif { // Do the gradient fill: - static int grayValues[] = + static int grayValues[] = { 0xA0, 0xF6, 0xED, 0xE4, 0xE2, 0xD0, 0xA0 }; + int i; + dc.SetBrush( *wxTRANSPARENT_BRUSH ); - if ( orient == wxVERTICAL ) + if (orient == wxVERTICAL) { - int i; - for (i=0; i < (int)WXSIZEOF(grayValues); i++) + 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 ); + dc.SetPen( wxPen( wxColour( grayValues[i], grayValues[i], grayValues[i] ), 1, wxSOLID ) ); + dc.DrawRectangle( position + i, 0, 1, size.y ); } } else { - int i; - for (i=0; i < (int)WXSIZEOF(grayValues); i++) + 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 ); + dc.SetPen( wxPen( wxColour( grayValues[i], grayValues[i], grayValues[i] ), 1, wxSOLID ) ); + dc.DrawRectangle( 0, position + i, size.x, 1 ); } } } -- 2.45.2