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

SetTextColor --> SetTextColour, to be consistent with the rest of the lib

Browse Source 
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@42417 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
This commit is contained in:
Robin Dunn
2006-10-26 01:19:00 +00:00
parent ccd67a6af8
commit bb8204ef82
5 changed files with 9 additions and 9 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
include/wx/graphics.h
View File

@@ -206,7 +206,7 @@ public:
virtual void SetFont( const wxFont &font ) = 0; virtual void SetFont( const wxFont &font ) = 0;
// sets the text color // 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 // strokes along a path with the current pen
virtual void StrokePath( const wxGraphicsPath *path ) = 0; virtual void StrokePath( const wxGraphicsPath *path ) = 0;

4
src/common/graphcmn.cpp
View File

@@ -295,7 +295,7 @@ wxGCDC::wxGCDC(const wxWindowDC& dc)
m_graphicContext->SetPen(dc.GetPen()); m_graphicContext->SetPen(dc.GetPen());
if ( dc.GetBrush().Ok()) if ( dc.GetBrush().Ok())
m_graphicContext->SetBrush(dc.GetBrush()); m_graphicContext->SetBrush(dc.GetBrush());
m_graphicContext->SetTextColor(dc.GetTextForeground()); m_graphicContext->SetTextColour(dc.GetTextForeground());
} }
void wxGCDC::Init() void wxGCDC::Init()
@@ -450,7 +450,7 @@ void wxGCDC::SetTextForeground( const wxColour &col )
if ( col != m_textForegroundColour ) if ( col != m_textForegroundColour )
{ {
m_textForegroundColour = col; m_textForegroundColour = col;
m_graphicContext->SetTextColor( col ); m_graphicContext->SetTextColour( col );
} }
} }

4
src/generic/graphicc.cpp
View File

@@ -277,7 +277,7 @@ public:
virtual void PopState(); virtual void PopState();
virtual void SetFont( const wxFont &font ); 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 DrawText( const wxString &str, wxDouble x, wxDouble y);
virtual void GetTextExtent( const wxString &str, wxDouble *width, wxDouble *height, virtual void GetTextExtent( const wxString &str, wxDouble *width, wxDouble *height,
wxDouble *descent, wxDouble *externalLeading ) const; wxDouble *descent, wxDouble *externalLeading ) const;
@@ -601,7 +601,7 @@ void wxCairoContext::PopState()
cairo_restore(m_context); cairo_restore(m_context);
} }
void wxCairoContext::SetTextColor( const wxColour &col ) void wxCairoContext::SetTextColour( const wxColour &col )
{ {
m_textColour = col; m_textColour = col;
} }

4
src/mac/carbon/graphics.cpp
View File

@@ -256,7 +256,7 @@ public:
virtual void SetFont( const wxFont &font ); virtual void SetFont( const wxFont &font );
// sets the text color // sets the text color
virtual void SetTextColor( const wxColour &col ); virtual void SetTextColour( const wxColour &col );
// strokes along a path with the current pen // strokes along a path with the current pen
virtual void StrokePath( const wxGraphicsPath *path ); virtual void StrokePath( const wxGraphicsPath *path );
@@ -594,7 +594,7 @@ void wxMacCoreGraphicsContext::PopState()
CGContextRestoreGState( m_cgContext ); CGContextRestoreGState( m_cgContext );
} }
void wxMacCoreGraphicsContext::SetTextColor( const wxColour &col ) void wxMacCoreGraphicsContext::SetTextColour( const wxColour &col )
{ {
m_textForegroundColor = col; m_textForegroundColor = col;
// to recreate the native font after color change // to recreate the native font after color change

4
src/msw/graphics.cpp
View File

@@ -231,7 +231,7 @@ public:
virtual void PopState(); virtual void PopState();
virtual void SetFont( const wxFont &font ); 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 DrawText( const wxString &str, wxDouble x, wxDouble y);
virtual void GetTextExtent( const wxString &str, wxDouble *width, wxDouble *height, virtual void GetTextExtent( const wxString &str, wxDouble *width, wxDouble *height,
wxDouble *descent, wxDouble *externalLeading ) const; wxDouble *descent, wxDouble *externalLeading ) const;
@@ -500,7 +500,7 @@ void wxGDIPlusContext::PopState()
m_context->Restore(state); m_context->Restore(state);
} }
void wxGDIPlusContext::SetTextColor( const wxColour &col ) void wxGDIPlusContext::SetTextColour( const wxColour &col )
{ {
delete m_textBrush; delete m_textBrush;
m_textBrush = new SolidBrush( Color( col.Alpha() , col.Red() , m_textBrush = new SolidBrush( Color( col.Alpha() , col.Red() ,