diff options
| author | Fabien Costantini <fabien@onepost.net> | 2008-10-19 01:42:35 +0000 |
|---|---|---|
| committer | Fabien Costantini <fabien@onepost.net> | 2008-10-19 01:42:35 +0000 |
| commit | 268ffc6ef2477f83a0d48af2d64baf3c00e6cddc (patch) | |
| tree | 4a500fa6716a5334f705d7d2d761771d6e28fba7 /FL | |
| parent | 7a5e64a4f3c8e1126dba6909ba7379c2100b055c (diff) | |
Cairo increment 2: Finer cairo granularity, less deps, new fltk_cairo lib
+ added new USE_CAIRO config preprocessor def.
to differentiate from HAVE_CAIRO so that we can use the cairo lib
without forcing the full fltk lib to be linked against it.
In that case, cairo autolink context functionality which needs fltk lib
instrumentation is disabled.
+ added new --enable-cairoext, which correspond to previous --enable-cairo.
now, --enable-cairo only adds HAVE_CAIRO def. and keeps fltk lib
from referencing cairo.
In both cases (--enable-cairo & --enable-cairoext), a new fltk_cairo lib is
created. This lib, similarly to local versions of png,jpeg and zlib,
is not generated if cairo is not enabled.
+ added cairo to fltk-config : now new --use-cairo flag is available
+ modified all unix like makefiles to now generate minimum cairo deps and also
new libfltk_cairo lib.
+ added new cairo subdir to permit conditional fltk_cairo lib generation.
+ vc2005 project minimum update to compile without be broken, but still needs
to create a similar fltk_cairo independent lib. For now, it works as before
with a dedicated cairo env. similar to --enable-cairoext context in unix.
+ regression tested ok with cairo disabled on win32, mac osx, mingw.
git-svn-id: file:///fltk/svn/fltk/branches/branch-1.3@6462 ea41ed52-d2ee-0310-a9c1-e6b18d33e121
Diffstat (limited to 'FL')
| -rw-r--r-- | FL/Fl_Cairo.H | 5 |
1 files changed, 3 insertions, 2 deletions
diff --git a/FL/Fl_Cairo.H b/FL/Fl_Cairo.H index c827216b3..e21373c03 100644 --- a/FL/Fl_Cairo.H +++ b/FL/Fl_Cairo.H @@ -44,6 +44,7 @@ # include <cairo-win32.h> # elif defined(__APPLE_QUARTZ__) # include <cairo-quartz.h> +# else # error Cairo is not supported on that platform. # endif @@ -65,7 +66,7 @@ public: // access attributes cairo_t* cc() const {return cc_;} ///< Gets the current cairo context - bool autolink() const {return autolink_;} ///< Sets the autolink option. See Fl::cairo_autolink_context(bool) + bool autolink() const {return autolink_;} ///< Gets the autolink option. See Fl::cairo_autolink_context(bool) /** Sets the current cairo context, \a own indicates cc deletion is handle externally by user */ void cc(cairo_t* c, bool own=true) { if (cc_ && own_cc_) cairo_destroy(cc_); @@ -73,7 +74,7 @@ public: if (!cc_) window_=0; own_cc_=own; } - void autolink(bool b) {autolink_ = b;} ///< Gets the autolink option + void autolink(bool b); ///< Sets the autolink option, only available with --enable-cairoext void window(void* w) {window_=w;} ///< Sets the window \a w to keep track on void* window() const {return window_;} ///< Gets the last window attached to a cc void gc(void* c) {gc_=c;} ///< Sets the gc \a c to keep track on |