From: Robin Dunn <robin@alldunn.com>
Date: Sat, 21 Oct 2006 01:15:33 +0000 (+0000)
Subject: use consistent names (Graphic vs. Graphics)
X-Git-Url: https://git.saurik.com/wxWidgets.git/commitdiff_plain/be01a40397e2cadfa1f2bc047e5f52c7123825f5

use consistent names (Graphic vs. Graphics)


git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@42182 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
---

diff --git a/include/wx/graphics.h b/include/wx/graphics.h
index 8250ec03ab..5b36fb1e01 100755
--- a/include/wx/graphics.h
+++ b/include/wx/graphics.h
@@ -325,8 +325,8 @@ public:
 
     virtual void ComputeScaleAndOrigin();
 
-    wxGraphicsContext* GetGraphicContext() { return m_graphicContext; }
-	virtual void SetGraphicsContext( wxGraphicsContext* ctx )
+    wxGraphicsContext* GetGraphicsContext() { return m_graphicContext; }
+    virtual void SetGraphicsContext( wxGraphicsContext* ctx )
 		{ delete m_graphicContext; m_graphicContext = ctx; }
 protected:
     // the true implementations
diff --git a/src/aui/dockart.cpp b/src/aui/dockart.cpp
index 08b07969b9..ac6b8826d3 100644
--- a/src/aui/dockart.cpp
+++ b/src/aui/dockart.cpp
@@ -312,7 +312,7 @@ void wxDefaultDockArt::DrawSash(wxDC& dc, wxWindow *window, int orientation, con
     HIRect splitterRect = CGRectMake( rect.x , rect.y , rect.width , rect.height );
     CGContextRef cgContext ;
 #if wxMAC_USE_CORE_GRAPHICS
-    cgContext = (CGContextRef) dc.GetGraphicContext()->GetNativeContext() ;
+    cgContext = (CGContextRef) dc.GetGraphicsContext()->GetNativeContext() ;
 #else
     Rect bounds ;
     GetPortBounds( (CGrafPtr) dc.m_macPort , &bounds ) ;
diff --git a/src/mac/carbon/metafile.cpp b/src/mac/carbon/metafile.cpp
index 1ed5081a6b..1e8a5e6dd1 100644
--- a/src/mac/carbon/metafile.cpp
+++ b/src/mac/carbon/metafile.cpp
@@ -166,7 +166,7 @@ bool wxMetaFile::Play(wxDC *dc)
 #if wxMAC_USE_CORE_GRAPHICS
 #ifndef __LP64__
         QDPictRef cgPictRef = M_METAFILEDATA->m_qdPictRef;
-        CGContextRef cg = (CGContextRef) dc->GetGraphicContext()->GetNativeContext();
+        CGContextRef cg = (CGContextRef) dc->GetGraphicsContext()->GetNativeContext();
         CGRect bounds = QDPictGetBounds( cgPictRef );
 
         CGContextSaveGState( cg );
diff --git a/src/mac/carbon/renderer.cpp b/src/mac/carbon/renderer.cpp
index 63e7b22333..b44cd2cd78 100644
--- a/src/mac/carbon/renderer.cpp
+++ b/src/mac/carbon/renderer.cpp
@@ -160,7 +160,7 @@ void wxRendererMac::DrawHeaderButton( wxWindow *win,
         CGContextRef cgContext;
 
 #if wxMAC_USE_CORE_GRAPHICS
-        cgContext = (CGContextRef) dc.GetGraphicContext()->GetNativeContext();
+        cgContext = (CGContextRef) dc.GetGraphicsContext()->GetNativeContext();
 #else
         Rect bounds;
 
@@ -329,7 +329,7 @@ void wxRendererMac::DrawSplitterSash( wxWindow *win,
         CGContextRef cgContext;
 
 #if wxMAC_USE_CORE_GRAPHICS
-        cgContext = (CGContextRef) dc.GetGraphicContext()->GetNativeContext();
+        cgContext = (CGContextRef) dc.GetGraphicsContext()->GetNativeContext();
 #else
         Rect bounds;
         GetPortBounds( (CGrafPtr) dc.m_macPort, &bounds );