made all XPM const to avoid warnings from mingw32 4.0 and adopt the code accordingly...

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

diff --git a/src/common/graphcmn.cpp b/src/common/graphcmn.cpp
index 0560f39bf0ae489786696de409e816ad74040968..0cd27eca98b07e30bd6175e06c8969300602b41b 100644 (file)
--- a/src/common/graphcmn.cpp
+++ b/src/common/graphcmn.cpp
@@ -18,7 +18,7 @@
 
 #if wxUSE_GRAPHICS_CONTEXT
 
-#include "wx/graphics.h"
+#include "wx/private/graphics.h"
 
 #ifndef WX_PRECOMP
     #include "wx/icon.h"
@@ -28,10 +28,6 @@
     #include "wx/log.h"
 #endif
 
-#if !defined(wxMAC_USE_CORE_GRAPHICS_BLEND_MODES)
-#define wxMAC_USE_CORE_GRAPHICS_BLEND_MODES 0
-#endif
-
 //-----------------------------------------------------------------------------
 // constants
 //-----------------------------------------------------------------------------
@@ -509,7 +505,7 @@ wxGraphicsContext::~wxGraphicsContext()
 {
 }
 
-bool wxGraphicsContext::StartDoc( const wxString& message ) 
+bool wxGraphicsContext::StartDoc(const wxString& WXUNUSED(message)) 
 {
     return true;
 }
@@ -518,7 +514,8 @@ void wxGraphicsContext::EndDoc()
 {
 }
 
-void wxGraphicsContext::StartPage( wxDouble width, wxDouble height )
+void wxGraphicsContext::StartPage(wxDouble WXUNUSED(width),
+                                  wxDouble WXUNUSED(height))
 {
 }
     
@@ -777,12 +774,11 @@ wxGraphicsContext* wxGraphicsContext::Create( const wxWindowDC& dc)
 {
     return wxGraphicsRenderer::GetDefaultRenderer()->CreateContext(dc);
 }
-#ifdef __WXMSW__
+
 wxGraphicsContext* wxGraphicsContext::Create( const wxMemoryDC& dc) 
 {
     return wxGraphicsRenderer::GetDefaultRenderer()->CreateContext(dc);
 }
-#endif
 
 wxGraphicsContext* wxGraphicsContext::CreateFromNative( void * context )
 {