From 9f692b010ef27af307ab7e49bc4661c06f2d530e Mon Sep 17 00:00:00 2001 From: Paul Cornett Date: Sun, 2 Dec 2012 02:28:48 +0000 Subject: [PATCH] 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 | 1 - build/bakefiles/files.bkl | 1 - build/msw/wx_core.dsp | 4 ---- build/msw/wx_vc7_core.vcproj | 3 --- build/msw/wx_vc8_core.vcproj | 4 ---- build/msw/wx_vc9_core.vcproj | 4 ---- include/wx/cairo.h | 29 ----------------------------- src/common/cairo.cpp | 12 ++++++------ src/generic/graphicc.cpp | 5 ++++- 9 files changed, 10 insertions(+), 53 deletions(-) delete mode 100644 include/wx/cairo.h diff --git a/Makefile.in b/Makefile.in index 1ecccecc19..74a3cf0f70 100644 --- 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/cairo.h \ wx/checkbox.h \ wx/checklst.h \ wx/choicdlg.h \ diff --git a/build/bakefiles/files.bkl b/build/bakefiles/files.bkl index b81e1903c7..0b1616aba4 100644 --- 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/cairo.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 726eaccf4e..c29d6bb9db 100644 --- 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 # 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 diff --git a/build/msw/wx_vc7_core.vcproj b/build/msw/wx_vc7_core.vcproj index 72822b633d..c5863d994e 100644 --- a/build/msw/wx_vc7_core.vcproj +++ b/build/msw/wx_vc7_core.vcproj @@ -5144,9 +5144,6 @@ - - diff --git a/build/msw/wx_vc8_core.vcproj b/build/msw/wx_vc8_core.vcproj index 8541a49a6c..9b9fb78711 100644 --- a/build/msw/wx_vc8_core.vcproj +++ b/build/msw/wx_vc8_core.vcproj @@ -6879,10 +6879,6 @@ RelativePath="..\..\include\wx\ribbon\buttonbar.h" > - - diff --git a/build/msw/wx_vc9_core.vcproj b/build/msw/wx_vc9_core.vcproj index 3e070ac22e..378d1a9b66 100644 --- a/build/msw/wx_vc9_core.vcproj +++ b/build/msw/wx_vc9_core.vcproj @@ -6875,10 +6875,6 @@ RelativePath="..\..\include\wx\ribbon\buttonbar.h" > - - diff --git a/include/wx/cairo.h b/include/wx/cairo.h deleted file mode 100644 index 42cc0d532c..0000000000 --- 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 - -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 46d649c9f1..9bbb8f25d9 100644 --- a/src/common/cairo.cpp +++ b/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 #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 \ { \ diff --git a/src/generic/graphicc.cpp b/src/generic/graphicc.cpp index ea451918e3..0cb35ac2ed 100644 --- 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 -#include "wx/cairo.h" +#include + +bool wxCairoInit(); +void wxCairoCleanUp(); #ifndef WX_PRECOMP #include "wx/bitmap.h" -- 2.45.2