From bb8204ef8236a9d1f39516832947ea4081f22146 Mon Sep 17 00:00:00 2001 From: Robin Dunn Date: Thu, 26 Oct 2006 01:19:00 +0000 Subject: [PATCH] SetTextColor --> SetTextColour, to be consistent with the rest of the lib git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@42417 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775 --- include/wx/graphics.h | 2 +- src/common/graphcmn.cpp | 4 ++-- src/generic/graphicc.cpp | 4 ++-- src/mac/carbon/graphics.cpp | 4 ++-- src/msw/graphics.cpp | 4 ++-- 5 files changed, 9 insertions(+), 9 deletions(-) diff --git a/include/wx/graphics.h b/include/wx/graphics.h index 6de106cdfc..70a0704acb 100755 --- a/include/wx/graphics.h +++ b/include/wx/graphics.h @@ -206,7 +206,7 @@ public: virtual void SetFont( const wxFont &font ) = 0; // sets the text color - virtual void SetTextColor( const wxColour &col ) = 0; + virtual void SetTextColour( const wxColour &col ) = 0; // strokes along a path with the current pen virtual void StrokePath( const wxGraphicsPath *path ) = 0; diff --git a/src/common/graphcmn.cpp b/src/common/graphcmn.cpp index 6fbcba8067..ecd92d2ef4 100644 --- a/src/common/graphcmn.cpp +++ b/src/common/graphcmn.cpp @@ -295,7 +295,7 @@ wxGCDC::wxGCDC(const wxWindowDC& dc) m_graphicContext->SetPen(dc.GetPen()); if ( dc.GetBrush().Ok()) m_graphicContext->SetBrush(dc.GetBrush()); - m_graphicContext->SetTextColor(dc.GetTextForeground()); + m_graphicContext->SetTextColour(dc.GetTextForeground()); } void wxGCDC::Init() @@ -450,7 +450,7 @@ void wxGCDC::SetTextForeground( const wxColour &col ) if ( col != m_textForegroundColour ) { m_textForegroundColour = col; - m_graphicContext->SetTextColor( col ); + m_graphicContext->SetTextColour( col ); } } diff --git a/src/generic/graphicc.cpp b/src/generic/graphicc.cpp index 83e1eda97b..b092965f0d 100755 --- a/src/generic/graphicc.cpp +++ b/src/generic/graphicc.cpp @@ -277,7 +277,7 @@ public: virtual void PopState(); virtual void SetFont( const wxFont &font ); - virtual void SetTextColor( const wxColour &col ); + virtual void SetTextColour( const wxColour &col ); virtual void DrawText( const wxString &str, wxDouble x, wxDouble y); virtual void GetTextExtent( const wxString &str, wxDouble *width, wxDouble *height, wxDouble *descent, wxDouble *externalLeading ) const; @@ -601,7 +601,7 @@ void wxCairoContext::PopState() cairo_restore(m_context); } -void wxCairoContext::SetTextColor( const wxColour &col ) +void wxCairoContext::SetTextColour( const wxColour &col ) { m_textColour = col; } diff --git a/src/mac/carbon/graphics.cpp b/src/mac/carbon/graphics.cpp index c9ad6509e1..49b58ca394 100755 --- a/src/mac/carbon/graphics.cpp +++ b/src/mac/carbon/graphics.cpp @@ -256,7 +256,7 @@ public: virtual void SetFont( const wxFont &font ); // sets the text color - virtual void SetTextColor( const wxColour &col ); + virtual void SetTextColour( const wxColour &col ); // strokes along a path with the current pen virtual void StrokePath( const wxGraphicsPath *path ); @@ -594,7 +594,7 @@ void wxMacCoreGraphicsContext::PopState() CGContextRestoreGState( m_cgContext ); } -void wxMacCoreGraphicsContext::SetTextColor( const wxColour &col ) +void wxMacCoreGraphicsContext::SetTextColour( const wxColour &col ) { m_textForegroundColor = col; // to recreate the native font after color change diff --git a/src/msw/graphics.cpp b/src/msw/graphics.cpp index e6ac141891..5506604569 100644 --- a/src/msw/graphics.cpp +++ b/src/msw/graphics.cpp @@ -231,7 +231,7 @@ public: virtual void PopState(); virtual void SetFont( const wxFont &font ); - virtual void SetTextColor( const wxColour &col ); + virtual void SetTextColour( const wxColour &col ); virtual void DrawText( const wxString &str, wxDouble x, wxDouble y); virtual void GetTextExtent( const wxString &str, wxDouble *width, wxDouble *height, wxDouble *descent, wxDouble *externalLeading ) const; @@ -500,7 +500,7 @@ void wxGDIPlusContext::PopState() m_context->Restore(state); } -void wxGDIPlusContext::SetTextColor( const wxColour &col ) +void wxGDIPlusContext::SetTextColour( const wxColour &col ) { delete m_textBrush; m_textBrush = new SolidBrush( Color( col.Alpha() , col.Red() , -- 2.47.2