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

cleanup - reformatting

Browse Source 
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@37554 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
This commit is contained in:
David Surovell
2006-02-13 09:10:34 +00:00
parent cc224d6e79
commit 7af14d7187
1 changed files with 175 additions and 156 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -1,5 +1,5 @@
/////////////////////////////////////////////////////////////////////////////// ///////////////////////////////////////////////////////////////////////////////
// Name: mac/renderer.cpp // Name: src/mac/carbon/renderer.cpp
// Purpose: implementation of wxRendererNative for Mac // Purpose: implementation of wxRendererNative for Mac
// Author: Vadim Zeitlin // Author: Vadim Zeitlin
// Modified by: // Modified by:
@@ -9,14 +9,6 @@
// License: wxWindows licence // License: wxWindows licence
/////////////////////////////////////////////////////////////////////////////// ///////////////////////////////////////////////////////////////////////////////
// ============================================================================
// declarations
// ============================================================================
// ----------------------------------------------------------------------------
// headers
// ----------------------------------------------------------------------------
// for compilers that support precompilation, includes "wx.h". // for compilers that support precompilation, includes "wx.h".
#include "wx/wxprec.h" #include "wx/wxprec.h"
@@ -29,16 +21,13 @@
#include "wx/dc.h" #include "wx/dc.h"
#include "wx/bitmap.h" #include "wx/bitmap.h"
#include "wx/settings.h" #include "wx/settings.h"
#endif //WX_PRECOMP #endif
#include "wx/renderer.h" #include "wx/renderer.h"
#include "wx/toplevel.h" #include "wx/toplevel.h"
#include "wx/dcclient.h" #include "wx/dcclient.h"
#include "wx/mac/uma.h" #include "wx/mac/uma.h"
// ----------------------------------------------------------------------------
// wxRendererMac: our wxRendererNative implementation
// ----------------------------------------------------------------------------
class WXDLLEXPORT wxRendererMac : public wxDelegateRendererNative class WXDLLEXPORT wxRendererMac : public wxDelegateRendererNative
{ {
@@ -65,8 +54,8 @@ public:
private: private:
// the tree buttons // the tree buttons
wxBitmap m_bmpTreeExpanded, wxBitmap m_bmpTreeExpanded;
m_bmpTreeCollapsed; wxBitmap m_bmpTreeCollapsed;
}; };
// ---------------------------------------------------------------------------- // ----------------------------------------------------------------------------
@@ -74,14 +63,16 @@ private:
// ---------------------------------------------------------------------------- // ----------------------------------------------------------------------------
/* XPM */ /* XPM */
static const char *aqua_arrow_right_xpm[] = { static const char *aqua_arrow_right_xpm[] =
/* columns rows colors chars-per-pixel */ {
// columns rows colors chars-per-pixel
"13 11 4 1", "13 11 4 1",
" c None", " c None",
"b c #C0C0C0", "b c #C0C0C0",
"c c #707070", "c c #707070",
"d c #A0A0A0", "d c #A0A0A0",
/* pixels */
// pixels
" b ", " b ",
" ddb ", " ddb ",
" cccdb ", " cccdb ",
@@ -96,14 +87,16 @@ static const char *aqua_arrow_right_xpm[] = {
}; };
/* XPM */ /* XPM */
static const char *aqua_arrow_down_xpm[] = { static const char *aqua_arrow_down_xpm[] =
/* columns rows colors chars-per-pixel */ {
// columns rows colors chars-per-pixel
"13 11 4 1", "13 11 4 1",
" c None", " c None",
"b c #C0C0C0", "b c #C0C0C0",
"c c #707070", "c c #707070",
"d c #A0A0A0", "d c #A0A0A0",
/* pixels */
// pixels
" ", " ",
" ", " ",
" bdcccccccdb ", " bdcccccccdb ",
@@ -121,7 +114,7 @@ static const char *aqua_arrow_down_xpm[] = {
// implementation // implementation
// ============================================================================ // ============================================================================
/* static */ // static
wxRendererNative& wxRendererNative::GetDefault() wxRendererNative& wxRendererNative::GetDefault()
{ {
static wxRendererMac s_rendererMac; static wxRendererMac s_rendererMac;
@@ -129,30 +122,35 @@ wxRendererNative& wxRendererNative::GetDefault()
return s_rendererMac; return s_rendererMac;
} }
void void wxRendererMac::DrawHeaderButton( wxWindow *win,
wxRendererMac::DrawHeaderButton(wxWindow *win,
wxDC& dc, wxDC& dc,
const wxRect& rect, const wxRect& rect,
int flags ) 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 ); 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 ); dc.SetBrush( *wxTRANSPARENT_BRUSH );
#if defined(__WXMAC_OSX__) && ( MAC_OS_X_VERSION_MAX_ALLOWED >= MAC_OS_X_VERSION_10_3 ) #if defined(__WXMAC_OSX__) && ( MAC_OS_X_VERSION_MAX_ALLOWED >= MAC_OS_X_VERSION_10_3 )
if ( HIThemeDrawButton != 0 ) if ( HIThemeDrawButton != 0 )
{ {
HIRect headerRect = CGRectMake( x, y, w, h ); HIRect headerRect = CGRectMake( x, y, w, h );
if ( dc.IsKindOf( CLASSINFO( wxPaintDC ) ) == false ) if ( !dc.IsKindOf( CLASSINFO( wxPaintDC ) ) )
{ {
Rect r = { (short) headerRect.origin.y , (short) headerRect.origin.x , Rect r =
(short) (headerRect.origin.y + headerRect.size.height) , (short) (headerRect.origin.x + headerRect.size.width) } ; {
(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(); RgnHandle updateRgn = NewRgn();
RectRgn( updateRgn, &r ); RectRgn( updateRgn, &r );
HIViewSetNeedsDisplayInRegion( (HIViewRef) win->GetHandle(), updateRgn, true ); HIViewSetNeedsDisplayInRegion( (HIViewRef) win->GetHandle(), updateRgn, true );
@@ -161,21 +159,27 @@ wxRendererMac::DrawHeaderButton(wxWindow *win,
else else
{ {
CGContextRef cgContext; CGContextRef cgContext;
#if wxMAC_USE_CORE_GRAPHICS #if wxMAC_USE_CORE_GRAPHICS
cgContext = ((wxMacCGContext*)(dc.GetGraphicContext()))->GetNativeContext(); cgContext = ((wxMacCGContext*)(dc.GetGraphicContext()))->GetNativeContext();
#else #else
Rect bounds; Rect bounds;
GetPortBounds( (CGrafPtr) dc.m_macPort, &bounds ); GetPortBounds( (CGrafPtr) dc.m_macPort, &bounds );
QDBeginCGContext( (CGrafPtr) dc.m_macPort, &cgContext ); QDBeginCGContext( (CGrafPtr) dc.m_macPort, &cgContext );
CGContextTranslateCTM( cgContext, 0, bounds.bottom - bounds.top ); CGContextTranslateCTM( cgContext, 0, bounds.bottom - bounds.top );
CGContextScaleCTM( cgContext, 1, -1 ); CGContextScaleCTM( cgContext, 1, -1 );
HIShapeReplacePathInCGContext( HIShapeCreateWithQDRgn( (RgnHandle) dc.m_macCurrentClipRgn ), cgContext ); HIShapeReplacePathInCGContext( HIShapeCreateWithQDRgn( (RgnHandle) dc.m_macCurrentClipRgn ), cgContext );
CGContextClip( cgContext ); CGContextClip( cgContext );
HIViewConvertRect( &headerRect, (HIViewRef) win->GetHandle(), (HIViewRef) win->MacGetTopLevelWindow()->GetHandle() ); HIViewConvertRect( &headerRect, (HIViewRef) win->GetHandle(), (HIViewRef) win->MacGetTopLevelWindow()->GetHandle() );
#endif #endif
{ {
HIThemeButtonDrawInfo drawInfo; HIThemeButtonDrawInfo drawInfo;
HIRect labelRect; HIRect labelRect;
memset( &drawInfo, 0, sizeof(drawInfo) ); memset( &drawInfo, 0, sizeof(drawInfo) );
drawInfo.version = 0; drawInfo.version = 0;
drawInfo.state = (flags & wxCONTROL_DISABLED) ? kThemeStateInactive : kThemeStateActive; drawInfo.state = (flags & wxCONTROL_DISABLED) ? kThemeStateInactive : kThemeStateActive;
@@ -184,6 +188,7 @@ wxRendererMac::DrawHeaderButton(wxWindow *win,
drawInfo.adornment = kThemeAdornmentNone; drawInfo.adornment = kThemeAdornmentNone;
HIThemeDrawButton( &headerRect, &drawInfo, cgContext, kHIThemeOrientationNormal, &labelRect ); HIThemeDrawButton( &headerRect, &drawInfo, cgContext, kHIThemeOrientationNormal, &labelRect );
} }
#if wxMAC_USE_CORE_GRAPHICS #if wxMAC_USE_CORE_GRAPHICS
#else #else
QDEndCGContext( (CGrafPtr) dc.m_macPort, &cgContext ); QDEndCGContext( (CGrafPtr) dc.m_macPort, &cgContext );
@@ -211,8 +216,7 @@ wxRendererMac::DrawHeaderButton(wxWindow *win,
} }
} }
void void wxRendererMac::DrawTreeItemButton( wxWindow *win,
wxRendererMac::DrawTreeItemButton(wxWindow *win,
wxDC& dc, wxDC& dc,
const wxRect& rect, const wxRect& rect,
int flags ) int flags )
@@ -229,6 +233,7 @@ wxRendererMac::DrawTreeItemButton(wxWindow *win,
// VZ: this is the old code from treectlg.cpp which apparently doesn't work // 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 // but I kept it here just in case it is needed -- if not, please
// remove it // remove it
#if 0 // def __WXMAC__ #if 0 // def __WXMAC__
wxMacPortSetter helper(&dc); wxMacPortSetter helper(&dc);
wxMacWindowClipper clipper(this); wxMacWindowClipper clipper(this);
@@ -238,19 +243,24 @@ wxRendererMac::DrawTreeItemButton(wxWindow *win,
int loc_y = y_mid - 6; int loc_y = y_mid - 6;
MacWindowToRootWindow( &loc_x, &loc_y ); MacWindowToRootWindow( &loc_x, &loc_y );
Rect bounds = { loc_y, loc_x, loc_y + 18, loc_x + 12 }; Rect bounds = { loc_y, loc_x, loc_y + 18, loc_x + 12 };
ThemeButtonDrawInfo info = { kThemeStateActive , item->IsExpanded() ? kThemeDisclosureDown : kThemeDisclosureRight , ThemeButtonDrawInfo info =
kThemeAdornmentNone }; {
DrawThemeButton( &bounds, kThemeDisclosureButton , kThemeStateActive,
&info , NULL , NULL , NULL , NULL ) ; item->IsExpanded() ? kThemeDisclosureDown : kThemeDisclosureRight,
kThemeAdornmentNone
};
DrawThemeButton( &bounds, kThemeDisclosureButton, &info, NULL, NULL, NULL, NULL );
#else // 1 #else // 1
dc.DrawBitmap(flags & wxCONTROL_EXPANDED ? m_bmpTreeExpanded dc.DrawBitmap(
flags & wxCONTROL_EXPANDED
? m_bmpTreeExpanded
: m_bmpTreeCollapsed, : m_bmpTreeCollapsed,
rect.x, rect.y, true /* use mask */); rect.x, rect.y, true /* use mask */);
#endif // 0/1 #endif
} }
void void wxRendererMac::DrawSplitterSash( wxWindow *win,
wxRendererMac::DrawSplitterSash(wxWindow *win,
wxDC& dc, wxDC& dc,
const wxSize& size, const wxSize& size,
wxCoord position, wxCoord position,
@@ -268,17 +278,27 @@ wxRendererMac::DrawSplitterSash(wxWindow *win,
splitterRect = CGRectMake( position, 0, height, size.y ); splitterRect = CGRectMake( position, 0, height, size.y );
else else
splitterRect = CGRectMake( 0, position, size.x, height ); splitterRect = CGRectMake( 0, position, size.x, height );
#if !wxMAC_USE_CORE_GRAPHICS #if !wxMAC_USE_CORE_GRAPHICS
HIViewConvertRect( &splitterRect , (HIViewRef) win->GetHandle() , (HIViewRef) win->MacGetTopLevelWindow()->GetHandle() ) ; HIViewConvertRect(
&splitterRect,
(HIViewRef) win->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 ) ) == false ) if ( !dc.IsKindOf( CLASSINFO( wxPaintDC ) ) )
{ {
Rect r = { (short) splitterRect.origin.y , (short) splitterRect.origin.x , Rect r =
(short) (splitterRect.origin.y + splitterRect.size.height) , (short) (splitterRect.origin.x + splitterRect.size.width) } ; {
(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(); RgnHandle updateRgn = NewRgn();
RectRgn( updateRgn, &r ); RectRgn( updateRgn, &r );
HIViewSetNeedsDisplayInRegion( (HIViewRef) win->GetHandle(), updateRgn, true ); HIViewSetNeedsDisplayInRegion( (HIViewRef) win->GetHandle(), updateRgn, true );
@@ -287,6 +307,7 @@ wxRendererMac::DrawSplitterSash(wxWindow *win,
else else
{ {
CGContextRef cgContext; CGContextRef cgContext;
#if wxMAC_USE_CORE_GRAPHICS #if wxMAC_USE_CORE_GRAPHICS
cgContext = ((wxMacCGContext*)(dc.GetGraphicContext()))->GetNativeContext(); cgContext = ((wxMacCGContext*)(dc.GetGraphicContext()))->GetNativeContext();
#else #else
@@ -317,24 +338,22 @@ wxRendererMac::DrawSplitterSash(wxWindow *win,
{ {
0xA0, 0xF6, 0xED, 0xE4, 0xE2, 0xD0, 0xA0 0xA0, 0xF6, 0xED, 0xE4, 0xE2, 0xD0, 0xA0
}; };
int i;
dc.SetBrush( *wxTRANSPARENT_BRUSH ); 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] ), dc.SetPen( wxPen( wxColour( grayValues[i], grayValues[i], grayValues[i] ), 1, wxSOLID ) );
1 , wxSOLID ) );
dc.DrawRectangle( position + i, 0, 1, size.y ); dc.DrawRectangle( position + i, 0, 1, size.y );
} }
} }
else 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] ), dc.SetPen( wxPen( wxColour( grayValues[i], grayValues[i], grayValues[i] ), 1, wxSOLID ) );
1 , wxSOLID ) );
dc.DrawRectangle( 0, position + i, size.x, 1 ); dc.DrawRectangle( 0, position + i, size.x, 1 );
} }
} }