Remove nearly empty wx/cairo.h header

It does so little now it's not worth having. And it should not have been a public header.


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

Makefile.in

@@ -4031,7 +4031,6 @@ COND_USE_GUI_1_ALL_GUI_HEADERS =  \
 	wx/bmpbuttn.h \
 	wx/brush.h \
 	wx/button.h \
-	wx/cairo.h \
 	wx/checkbox.h \
 	wx/checklst.h \
 	wx/choicdlg.h \

build/bakefiles/files.bkl

@@ -793,7 +793,6 @@ IMPORTANT: please read docs/tech/tn0016.txt before modifying this file!
     wx/bmpbuttn.h
     wx/brush.h
     wx/button.h
-    wx/cairo.h
     wx/checkbox.h
     wx/checklst.h
     wx/choicdlg.h

build/msw/wx_core.dsp

@@ -6092,10 +6092,6 @@ SOURCE=..\..\include\wx\ribbon\buttonbar.h
 # End Source File
 # Begin Source File
 
-SOURCE=..\..\include\wx\cairo.h
-# End Source File
-# Begin Source File
-
 SOURCE=..\..\include\wx\calctrl.h
 # End Source File
 # Begin Source File

build/msw/wx_vc7_core.vcproj

@@ -5144,9 +5144,6 @@
 			<File
 				RelativePath="..\..\include\wx\ribbon\buttonbar.h">
 			</File>
-			<File
-				RelativePath="..\..\include\wx\cairo.h">
-			</File>
 			<File
 				RelativePath="..\..\include\wx\calctrl.h">
 			</File>

build/msw/wx_vc8_core.vcproj

@@ -6879,10 +6879,6 @@
 				RelativePath="..\..\include\wx\ribbon\buttonbar.h"
 				>
 			</File>
-			<File
-				RelativePath="..\..\include\wx\cairo.h"
-				>
-			</File>
 			<File
 				RelativePath="..\..\include\wx\calctrl.h"
 				>

build/msw/wx_vc9_core.vcproj

@@ -6875,10 +6875,6 @@
 				RelativePath="..\..\include\wx\ribbon\buttonbar.h"
 				>
 			</File>
-			<File
-				RelativePath="..\..\include\wx\cairo.h"
-				>
-			</File>
 			<File
 				RelativePath="..\..\include\wx\calctrl.h"
 				>

include/wx/cairo.h

@@ -1,29 +0,0 @@
-/////////////////////////////////////////////////////////////////////////////
-// Name:        wx/cairo.h
-// Purpose:     Cairo library
-// Author:      Anthony Bretaudeau
-// Created:     2007-08-25
-// RCS-ID:      $Id$
-// Copyright:   (c) Anthony Bretaudeau
-// Licence:     wxWindows licence
-/////////////////////////////////////////////////////////////////////////////
-
-#ifndef _WX_CAIRO_H_BASE_
-#define _WX_CAIRO_H_BASE_
-
-#if wxUSE_CAIRO
-
-#include "wx/dynlib.h"
-#include <cairo.h>
-
-extern "C"
-{
-    
-bool wxCairoInit();
-void wxCairoCleanUp();
-
-}
-
-#endif // wxUSE_CAIRO
-
-#endif // _WX_CAIRO_H_BASE_

src/common/cairo.cpp

@@ -16,15 +16,15 @@
     #pragma hdrstop
 #endif
 
+#if wxUSE_CAIRO
+
 // keep cairo.h from defining dllimport as we're defining the symbols inside
 // the wx dll in order to load them dynamically.
 #define cairo_public 
 
-#include "wx/cairo.h"
+#include <cairo.h>
 #include "wx/dynlib.h"
 
-#if wxUSE_CAIRO
-
 #ifdef __WXMSW__
 #include "wx/msw/wrapwin.h"
 #endif
@@ -379,9 +379,6 @@ bool wxCairo::IsOk()
 // implementation of the functions themselves
 // ============================================================================
 
-extern "C"
-{
-
 bool wxCairoInit()
 {
     return wxCairo::Initialize();
@@ -392,6 +389,9 @@ void wxCairoCleanUp()
     wxCairo::CleanUp();
 }
 
+extern "C"
+{
+
 #define wxIMPL_CAIRO_FUNC(rettype, name, params, args, defret)                \
     rettype name params                                                               \
     {                                                                         \

src/generic/graphicc.cpp

@@ -25,7 +25,10 @@
 // the wx dll in order to load them dynamically.
 #define cairo_public 
 
-#include "wx/cairo.h"
+#include <cairo.h>
+
+bool wxCairoInit();
+void wxCairoCleanUp();
 
 #ifndef WX_PRECOMP
     #include "wx/bitmap.h"