+ Cairo branch merged after successful testing on Mac OS X 10.5.4, Linux Ubuntu 8.04,Windows XPSP2.

  This integration is minimum as discussed, in particular it does not feature any fltk cairo drawing substitution
  as in fltk2.
  Still it provides all the fundations to go further even in next 1.4 ... 
  By default *no* cairo features are implemented nor linked, it can only be activated by --enable-cairo
  whose default is false.
  Please visit the README.cairo for complete description.

+ fixed UTF8 compilation pb on linux ubuntu

+ minor comments fixes on the fly



git-svn-id: file:///fltk/svn/fltk/branches/branch-1.3@6350 ea41ed52-d2ee-0310-a9c1-e6b18d33e121

1 files changed, 5 insertions, 1 deletions

diff --git a/src/Fl_Window.cxx b/src/Fl_Window.cxx
index 21eec3caa..32459d367 100644
--- a/src/Fl_Window.cxx
+++ b/src/Fl_Window.cxx
@@ -29,7 +29,7 @@
 // This is the system-independent portions.  The huge amount of 
 // crap you need to do to communicate with X is in Fl_x.cxx, the
 // equivalent (but totally different) crap for MSWindows is in Fl_win32.cxx
-
+#include "config.h"
 #include <FL/Fl.H>
 #include <FL/Fl_Window.H>
 #include <stdlib.h>
@@ -132,6 +132,10 @@ void Fl_Window::draw() {
   set_flag(saveflags);
   y(savey);
   x(savex);
+
+# if defined(HAVE_CAIRO)
+  Fl::cairo_make_current(this); // checkout if an update is necessary
+# endif
 }
 
 void Fl_Window::label(const char *name) {