From 8630bdbed221afa4a20a6a4fe8d354ccab877fcf Mon Sep 17 00:00:00 2001 From: Albrecht Schlosser Date: Sat, 13 Feb 2016 18:02:17 +0000 Subject: [Cairo] Remove part of the dependency of FL/Fl.H on config.h. To use Fl_Cairo_Window one did not only need to configure with --enable-cairo, but also needed to #include before #include . This commit removes the smaller part of the dependency of the public header file FL/Fl.H on config.h. This needs a better solution in FLTK 1.4.0. The user still needs to define FLTK_HAVE_CAIRO _before_ #include . Note: This is not compatible with fluid, since fluid _always_ includes FL/Fl.H as the first statement in generated header files. See also the discussion in fltk.general: https://groups.google.com/d/msg/fltkgeneral/_C1OJhMLQl0/pHUFtz9SCwAJ Note: also fixed a typo in src/drivers/X11/Fl_X11_Screen_Driver.cxx git-svn-id: file:///fltk/svn/fltk/branches/branch-1.3-porting@11168 ea41ed52-d2ee-0310-a9c1-e6b18d33e121 --- FL/Fl.H | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) (limited to 'FL/Fl.H') diff --git a/FL/Fl.H b/FL/Fl.H index e1a2b97fa..5df4b4410 100644 --- a/FL/Fl.H +++ b/FL/Fl.H @@ -1295,19 +1295,19 @@ int main() { static int use_high_res_GL() { return use_high_res_GL_; } #ifdef FLTK_HAVE_CAIRO - /** \defgroup group_cairo Cairo support functions and classes + /** \defgroup group_cairo Cairo Support Functions and Classes @{ */ public: // Cairo support API static cairo_t * cairo_make_current(Fl_Window* w); - /** when FLTK_HAVE_CAIRO is defined and cairo_autolink_context() is true, - any current window dc is linked to a current context. + /** when FLTK_HAVE_CAIRO is defined and cairo_autolink_context() is true, + any current window dc is linked to a current cairo context. This is not the default, because it may not be necessary to add cairo support to all fltk supported windows. When you wish to associate a cairo context in this mode, you need to call explicitly in your draw() overridden method, - FL::cairo_make_current(Fl_Window*). This will create a cairo context + Fl::cairo_make_current(Fl_Window*). This will create a cairo context but only for this Window. Still in custom cairo application it is possible to handle completely this process automatically by setting \p alink to true. -- cgit v1.2.3