]> git.saurik.com Git - wxWidgets.git/commitdiff
use consistent names (Graphic vs. Graphics)
authorRobin Dunn <robin@alldunn.com>
Sat, 21 Oct 2006 01:15:33 +0000 (01:15 +0000)
committerRobin Dunn <robin@alldunn.com>
Sat, 21 Oct 2006 01:15:33 +0000 (01:15 +0000)
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@42182 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775

include/wx/graphics.h
src/aui/dockart.cpp
src/mac/carbon/metafile.cpp
src/mac/carbon/renderer.cpp

index 8250ec03abb6f9ad35e519bf4609af40eafaaefd..5b36fb1e0180bf88eedac83e8da80aa43beacc23 100755 (executable)
@@ -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
index 08b07969b9e937dccfc77b0c172947b0b14d43c1..ac6b8826d33dd0e13dbfadd072b2e27a34e961f2 100644 (file)
@@ -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 ) ;
index 1ed5081a6b1eeb162f1468df2e2317e1a82ea95d..1e8a5e6dd18faf60a938bccb75123c33f9de411f 100644 (file)
@@ -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 );
index 63e7b2233317b1036d00c98d5a3338268f9efeab..b44cd2cd788ab9f31a848c76fad6982711d73dea 100644 (file)
@@ -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 );