remove unused macro definitions
and limit others to the configurations which use them git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@76280 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
This commit is contained in:
@@ -224,15 +224,6 @@
|
||||
(cairo_surface_t *surface), (surface), -1) \
|
||||
wxCAIRO_PLATFORM_METHODS(m)
|
||||
|
||||
|
||||
#if wxUSE_PANGO
|
||||
#define wxFOR_ALL_PANGO_CAIRO_VOIDMETHODS(m) \
|
||||
m( pango_cairo_update_layout, \
|
||||
(cairo_t *cr, PangoLayout *layout), (cr, layout) ) \
|
||||
m( pango_cairo_show_layout, \
|
||||
(cairo_t *cr, PangoLayout *layout), (cr, layout) )
|
||||
#endif
|
||||
|
||||
#define wxCAIRO_DECLARE_TYPE(rettype, name, args, argnames, defret) \
|
||||
typedef rettype (*wxCAIRO_METHOD_TYPE(name)) args ; \
|
||||
wxCAIRO_METHOD_TYPE(name) wxDL_METHOD_NAME(name);
|
||||
@@ -383,6 +374,7 @@ bool wxCairoInit()
|
||||
return wxCairo::Initialize();
|
||||
}
|
||||
|
||||
#ifndef __WXGTK__
|
||||
extern "C"
|
||||
{
|
||||
|
||||
@@ -399,12 +391,12 @@ extern "C"
|
||||
// we currently link directly to Cairo on GTK since it is usually available there,
|
||||
// so don't use our cairo_xyz wrapper functions until the decision is made to
|
||||
// always load Cairo dynamically there.
|
||||
#ifndef __WXGTK__
|
||||
|
||||
wxFOR_ALL_CAIRO_VOIDMETHODS(wxIMPL_CAIRO_VOIDFUNC)
|
||||
wxFOR_ALL_CAIRO_METHODS(wxIMPL_CAIRO_FUNC)
|
||||
#endif
|
||||
|
||||
} // extern "C"
|
||||
#endif // !__WXGTK__
|
||||
|
||||
//----------------------------------------------------------------------------
|
||||
// wxCairoModule
|
||||
|
||||
Reference in New Issue
Block a user