oops 2

Fltk/FlGui.h

@@ -63,7 +63,9 @@ class FlGui{
   geometryContextWindow *geoContext;
   meshContextWindow *meshContext;
   aboutWindow *about;
+#if (FL_MAJOR_VERSION == 1) && (FL_MINOR_VERSION == 3)
   onelabWindow *onelab;
+#endif
   std::vector<solverWindow*> solver;
  public:
   FlGui(int argc, char **argv);

Fltk/onelabWindow.cpp

@@ -3,8 +3,7 @@
 // See the LICENSE.txt file for license information. Please report all
 // bugs and problems to <gmsh@geuz.org>.
 
-#include "onelab.h"
-
+#include <FL/Fl.H>
 #if (FL_MAJOR_VERSION == 1) && (FL_MINOR_VERSION == 3)
 #include <FL/Fl_Value_Input.H>
 #include <FL/Fl_Box.H>
@@ -20,6 +19,7 @@
 #include "paletteWindow.h"
 #include "menuWindow.h"
 #include "fileDialogs.h"
+#include "onelab.h"
 #include "onelabWindow.h"
 
 // This file contains the Gmsh/FLTK specific parts of the ONELAB

Fltk/onelabWindow.h

@@ -6,7 +6,7 @@
 #ifndef _ONELAB_WINDOW_H_
 #define _ONELAB_WINDOW_H_
 
-#include "GmshConfig.h"
+#include <FL/Fl.H>
 #if (FL_MAJOR_VERSION == 1) && (FL_MINOR_VERSION == 3)
 #include <vector>
 #include <FL/Fl_Window.H>