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

diff --git a/Makefile.in b/Makefile.in
index 1ecccecc197ef2908a00b0fc869fa1fa7d579104..74a3cf0f70ffc519e7996dfdfc02d6c7f96b6ffa 100644 (file)
--- a/Makefile.in
+++ b/Makefile.in
@@ -4031,7 +4031,6 @@ COND_USE_GUI_1_ALL_GUI_HEADERS =  \
        wx/bmpbuttn.h \
        wx/brush.h \
        wx/button.h \
        wx/bmpbuttn.h \
        wx/brush.h \
        wx/button.h \

-       wx/cairo.h \

        wx/checkbox.h \
        wx/checklst.h \
        wx/choicdlg.h \
        wx/checkbox.h \
        wx/checklst.h \
        wx/choicdlg.h \

diff --git a/build/bakefiles/files.bkl b/build/bakefiles/files.bkl
index b81e1903c7aa59ff8575834fe5729e127b0a3e17..0b1616aba4e305fd97399ad09137b381b05af250 100644 (file)
--- a/build/bakefiles/files.bkl
+++ b/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/bmpbuttn.h
     wx/brush.h
     wx/button.h

-    wx/cairo.h

     wx/checkbox.h
     wx/checklst.h
     wx/choicdlg.h
     wx/checkbox.h
     wx/checklst.h
     wx/choicdlg.h

diff --git a/build/msw/wx_core.dsp b/build/msw/wx_core.dsp
index 726eaccf4ef306f3a572b61d8fb8a40d71b02144..c29d6bb9db1b3a97c7b95d215b4ee91b5f426313 100644 (file)
--- a/build/msw/wx_core.dsp
+++ b/build/msw/wx_core.dsp
@@ -6092,10 +6092,6 @@ SOURCE=..\..\include\wx\ribbon\buttonbar.h
 # End Source File\r
 # Begin Source File\r
 \r
 # End Source File\r
 # Begin Source File\r
 \r

-SOURCE=..\..\include\wx\cairo.h\r
-# End Source File\r
-# Begin Source File\r
-\r

 SOURCE=..\..\include\wx\calctrl.h\r
 # End Source File\r
 # Begin Source File\r
 SOURCE=..\..\include\wx\calctrl.h\r
 # End Source File\r
 # Begin Source File\r

diff --git a/build/msw/wx_vc7_core.vcproj b/build/msw/wx_vc7_core.vcproj
index 72822b633d03b37cb211533fba03eb56d89f6641..c5863d994ec4492baaa2f136a5c7e93eace4383f 100644 (file)
--- a/build/msw/wx_vc7_core.vcproj
+++ b/build/msw/wx_vc7_core.vcproj
@@ -5144,9 +5144,6 @@
                        <File\r
                                RelativePath="..\..\include\wx\ribbon\buttonbar.h">\r
                        </File>\r
                        <File\r
                                RelativePath="..\..\include\wx\ribbon\buttonbar.h">\r
                        </File>\r

-                       <File\r
-                               RelativePath="..\..\include\wx\cairo.h">\r
-                       </File>\r

                        <File\r
                                RelativePath="..\..\include\wx\calctrl.h">\r
                        </File>\r
                        <File\r
                                RelativePath="..\..\include\wx\calctrl.h">\r
                        </File>\r

diff --git a/build/msw/wx_vc8_core.vcproj b/build/msw/wx_vc8_core.vcproj
index 8541a49a6c591d3e67b887d8b07708deb35c8096..9b9fb78711ed964522a336e63e41573ec61636d9 100644 (file)
--- a/build/msw/wx_vc8_core.vcproj
+++ b/build/msw/wx_vc8_core.vcproj
@@ -6879,10 +6879,6 @@
                                RelativePath="..\..\include\wx\ribbon\buttonbar.h"\r
                                >\r
                        </File>\r
                                RelativePath="..\..\include\wx\ribbon\buttonbar.h"\r
                                >\r
                        </File>\r

-                       <File\r
-                               RelativePath="..\..\include\wx\cairo.h"\r
-                               >\r
-                       </File>\r

                        <File\r
                                RelativePath="..\..\include\wx\calctrl.h"\r
                                >\r
                        <File\r
                                RelativePath="..\..\include\wx\calctrl.h"\r
                                >\r

diff --git a/build/msw/wx_vc9_core.vcproj b/build/msw/wx_vc9_core.vcproj
index 3e070ac22e9a8f4d22bb62ef7215dc5b964d7f82..378d1a9b66493ac7b9f6a0397c46fed5a60c3621 100644 (file)
--- a/build/msw/wx_vc9_core.vcproj
+++ b/build/msw/wx_vc9_core.vcproj
@@ -6875,10 +6875,6 @@
                                RelativePath="..\..\include\wx\ribbon\buttonbar.h"\r
                                >\r
                        </File>\r
                                RelativePath="..\..\include\wx\ribbon\buttonbar.h"\r
                                >\r
                        </File>\r

-                       <File\r
-                               RelativePath="..\..\include\wx\cairo.h"\r
-                               >\r
-                       </File>\r

                        <File\r
                                RelativePath="..\..\include\wx\calctrl.h"\r
                                >\r
                        <File\r
                                RelativePath="..\..\include\wx\calctrl.h"\r
                                >\r

diff --git a/include/wx/cairo.h b/include/wx/cairo.h
deleted file mode 100644 (file)
index 42cc0d5..0000000
--- a/include/wx/cairo.h
+++ /dev/null
@@ -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_

diff --git a/src/common/cairo.cpp b/src/common/cairo.cpp
index 46d649c9f189f406d84c0cc6c49777056ec4fa3e..9bbb8f25d9548c4f5b83a11bb5c7fc6ecdad21cf 100644 (file)
--- a/src/common/cairo.cpp
+++ b/src/common/cairo.cpp
@@ -16,15 +16,15 @@
     #pragma hdrstop
 #endif
 
     #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 
 
 // 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"
 
 #include "wx/dynlib.h"
 

-#if wxUSE_CAIRO
-

 #ifdef __WXMSW__
 #include "wx/msw/wrapwin.h"
 #endif
 #ifdef __WXMSW__
 #include "wx/msw/wrapwin.h"
 #endif


@@ -379,9 +379,6 @@ bool wxCairo::IsOk()
 // implementation of the functions themselves
 // ============================================================================
 
 // implementation of the functions themselves
 // ============================================================================
 

-extern "C"
-{
-

 bool wxCairoInit()
 {
     return wxCairo::Initialize();
 bool wxCairoInit()
 {
     return wxCairo::Initialize();


@@ -392,6 +389,9 @@ void wxCairoCleanUp()
     wxCairo::CleanUp();
 }
 
     wxCairo::CleanUp();
 }
 

+extern "C"
+{
+

 #define wxIMPL_CAIRO_FUNC(rettype, name, params, args, defret)                \
     rettype name params                                                               \
     {                                                                         \
 #define wxIMPL_CAIRO_FUNC(rettype, name, params, args, defret)                \
     rettype name params                                                               \
     {                                                                         \

diff --git a/src/generic/graphicc.cpp b/src/generic/graphicc.cpp
index ea451918e39290d92629d6a93ce0c944ee7b8921..0cb35ac2ed175a5e991d255c9acd69933c2a74f7 100644 (file)
--- a/src/generic/graphicc.cpp
+++ b/src/generic/graphicc.cpp
@@ -25,7 +25,10 @@
 // the wx dll in order to load them dynamically.
 #define cairo_public 
 
 // 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"
 
 #ifndef WX_PRECOMP
     #include "wx/bitmap.h"