no real changes, just refactor to remove some code duplication in wxToolBarTool

[wxWidgets.git] / src / common / dcgraph.cpp

diff --git a/src/common/dcgraph.cpp b/src/common/dcgraph.cpp
index ee36df03b54d245cc4efee9ac236a0df300cd9b2..42742a48b9f8bd1786b709a30d13dd438b0c8c21 100644 (file)
--- a/src/common/dcgraph.cpp
+++ b/src/common/dcgraph.cpp
@@ -31,7 +31,11 @@
 #include "wx/dcclient.h"
 
 #ifdef __WXOSX__
 #include "wx/dcclient.h"
 
 #ifdef __WXOSX__

-    #include "ApplicationServices/ApplicationServices.h"
+#ifdef __WXOSX_IPHONE__
+    #include <CoreGraphics/CoreGraphics.h>
+#else
+    #include <ApplicationServices/ApplicationServices.h>
+#endif

 #endif
 
 //-----------------------------------------------------------------------------
 #endif
 
 //-----------------------------------------------------------------------------


@@ -65,10 +69,12 @@ wxGCDC::wxGCDC( const wxMemoryDC& dc) :
 {
 }
 
 {
 }
 

+#if wxUSE_PRINTING_ARCHITECTURE

 wxGCDC::wxGCDC( const wxPrinterDC& dc) :
   wxDC( new wxGCDCImpl( this, dc ) )
 {
 }
 wxGCDC::wxGCDC( const wxPrinterDC& dc) :
   wxDC( new wxGCDCImpl( this, dc ) )
 {
 }

+#endif

 
 wxGCDC::wxGCDC() :
   wxDC( new wxGCDCImpl( this ) )
 
 wxGCDC::wxGCDC() :
   wxDC( new wxGCDCImpl( this ) )


@@ -132,12 +138,14 @@ wxGCDCImpl::wxGCDCImpl( wxDC *owner, const wxMemoryDC& dc ) :
     SetGraphicsContext( wxGraphicsContext::Create(dc) );
 }
 
     SetGraphicsContext( wxGraphicsContext::Create(dc) );
 }
 

+#if wxUSE_PRINTING_ARCHITECTURE

 wxGCDCImpl::wxGCDCImpl( wxDC *owner, const wxPrinterDC& dc ) :
    wxDCImpl( owner )
 {
     Init();
     SetGraphicsContext( wxGraphicsContext::Create(dc) );
 }
 wxGCDCImpl::wxGCDCImpl( wxDC *owner, const wxPrinterDC& dc ) :
    wxDCImpl( owner )
 {
     Init();
     SetGraphicsContext( wxGraphicsContext::Create(dc) );
 }

+#endif

 
 void wxGCDCImpl::Init()
 {
 
 void wxGCDCImpl::Init()
 {