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

use consistent names (Graphic vs. Graphics)

Browse Source 
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@42182 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
This commit is contained in:
Robin Dunn
2006-10-21 01:15:33 +00:00
parent 54eb75b5fb
commit be01a40397
4 changed files with 6 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
include/wx/graphics.h
View File

@@ -325,8 +325,8 @@ public:
virtual void ComputeScaleAndOrigin(); virtual void ComputeScaleAndOrigin();
wxGraphicsContext* GetGraphicContext() { return m_graphicContext; } wxGraphicsContext* GetGraphicsContext() { return m_graphicContext; }
virtual void SetGraphicsContext( wxGraphicsContext* ctx ) virtual void SetGraphicsContext( wxGraphicsContext* ctx )
{ delete m_graphicContext; m_graphicContext = ctx; } { delete m_graphicContext; m_graphicContext = ctx; }
protected: protected:
// the true implementations // the true implementations

2
src/aui/dockart.cpp
View 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 ); HIRect splitterRect = CGRectMake( rect.x , rect.y , rect.width , rect.height );
CGContextRef cgContext ; CGContextRef cgContext ;
#if wxMAC_USE_CORE_GRAPHICS #if wxMAC_USE_CORE_GRAPHICS
cgContext = (CGContextRef) dc.GetGraphicContext()->GetNativeContext() ; cgContext = (CGContextRef) dc.GetGraphicsContext()->GetNativeContext() ;
#else #else
Rect bounds ; Rect bounds ;
GetPortBounds( (CGrafPtr) dc.m_macPort , &bounds ) ; GetPortBounds( (CGrafPtr) dc.m_macPort , &bounds ) ;

2
src/mac/carbon/metafile.cpp
View File

@@ -166,7 +166,7 @@ bool wxMetaFile::Play(wxDC *dc)
#if wxMAC_USE_CORE_GRAPHICS #if wxMAC_USE_CORE_GRAPHICS
#ifndef __LP64__ #ifndef __LP64__
QDPictRef cgPictRef = M_METAFILEDATA->m_qdPictRef; QDPictRef cgPictRef = M_METAFILEDATA->m_qdPictRef;
CGContextRef cg = (CGContextRef) dc->GetGraphicContext()->GetNativeContext(); CGContextRef cg = (CGContextRef) dc->GetGraphicsContext()->GetNativeContext();
CGRect bounds = QDPictGetBounds( cgPictRef ); CGRect bounds = QDPictGetBounds( cgPictRef );
CGContextSaveGState( cg ); CGContextSaveGState( cg );

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

@@ -160,7 +160,7 @@ void wxRendererMac::DrawHeaderButton( wxWindow *win,
CGContextRef cgContext; CGContextRef cgContext;
#if wxMAC_USE_CORE_GRAPHICS #if wxMAC_USE_CORE_GRAPHICS
cgContext = (CGContextRef) dc.GetGraphicContext()->GetNativeContext(); cgContext = (CGContextRef) dc.GetGraphicsContext()->GetNativeContext();
#else #else
Rect bounds; Rect bounds;
@@ -329,7 +329,7 @@ void wxRendererMac::DrawSplitterSash( wxWindow *win,
CGContextRef cgContext; CGContextRef cgContext;
#if wxMAC_USE_CORE_GRAPHICS #if wxMAC_USE_CORE_GRAPHICS
cgContext = (CGContextRef) dc.GetGraphicContext()->GetNativeContext(); cgContext = (CGContextRef) dc.GetGraphicsContext()->GetNativeContext();
#else #else
Rect bounds; Rect bounds;
GetPortBounds( (CGrafPtr) dc.m_macPort, &bounds ); GetPortBounds( (CGrafPtr) dc.m_macPort, &bounds );