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

diff --git a/include/wx/graphics.h b/include/wx/graphics.h
index 6de106cdfcf75a56d77a9ebf4e70e878ebc27f3d..70a0704acb1cff49c56345ebb8f584d581d54817 100755 (executable)
--- 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 6fbcba80675ee0086bc7845b3eaff4c4b681dbd7..ecd92d2ef43b4e6a93a4fdad73a702c957b88124 100644 (file)
--- 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 83e1eda97b370daa9f84630b99f6493bd4d19159..b092965f0de94ce2dadd0db3afa662261e913423 100755 (executable)
--- 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 c9ad6509e16f29e0497b5267e01f6664e71c9375..49b58ca394faca31a8ab5ccbc77e5acb42e02bdd 100755 (executable)
--- 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 e6ac1418919d459a861e56d327db57e141e826e1..550660456946137ca985b92db92ed83612df52da 100644 (file)
--- 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() ,