From 4438ab1cd196989635f23ee651f17d2f0d9bfc05 Mon Sep 17 00:00:00 2001
From: Christophe Geuzaine <cgeuzaine@ulg.ac.be>
Date: Tue, 4 Oct 2011 08:02:25 +0000
Subject: [PATCH] oops 2
---
Fltk/FlGui.h | 2 ++
Fltk/onelabWindow.cpp | 4 ++--
Fltk/onelabWindow.h | 2 +-
3 files changed, 5 insertions(+), 3 deletions(-)
diff --git a/Fltk/FlGui.h b/Fltk/FlGui.h
index 6bdc204365..2386eee950 100644
--- a/Fltk/FlGui.h
+++ b/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);
diff --git a/Fltk/onelabWindow.cpp b/Fltk/onelabWindow.cpp
index 3486501aa3..a610052754 100644
--- a/Fltk/onelabWindow.cpp
+++ b/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
diff --git a/Fltk/onelabWindow.h b/Fltk/onelabWindow.h
index e2d78e7802..bebc14ada3 100644
--- a/Fltk/onelabWindow.h
+++ b/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>
--
GitLab