From 03f7a1bf2cf4ae0e134e1fcc311847ff1bd9bda8 Mon Sep 17 00:00:00 2001
From: Christophe Geuzaine <cgeuzaine@ulg.ac.be>
Date: Tue, 4 Oct 2011 07:56:01 +0000
Subject: [PATCH] oop
---
Fltk/FlGui.cpp | 4 ++--
Fltk/onelabWindow.cpp | 2 +-
Fltk/onelabWindow.h | 2 +-
3 files changed, 4 insertions(+), 4 deletions(-)
diff --git a/Fltk/FlGui.cpp b/Fltk/FlGui.cpp
index d1769e0697..0e37e4b530 100644
--- a/Fltk/FlGui.cpp
+++ b/Fltk/FlGui.cpp
@@ -272,7 +272,7 @@ FlGui::FlGui(int argc, char **argv)
geoContext = new geometryContextWindow(CTX::instance()->deltaFontSize);
meshContext = new meshContextWindow(CTX::instance()->deltaFontSize);
about = new aboutWindow();
-#if defined(FL_MAJOR_VERSION == 1) && (FL_MINOR_VERSION == 3)
+#if (FL_MAJOR_VERSION == 1) && (FL_MINOR_VERSION == 3)
onelab = new onelabWindow();
#endif
for(int i = 0; i < NB_SOLVER_MAX; i++)
@@ -652,7 +652,7 @@ int FlGui::testGlobalShortcuts(int event)
show = !show;
status = 2;
}
-#if defined(FL_MAJOR_VERSION == 1) && (FL_MINOR_VERSION == 3)
+#if (FL_MAJOR_VERSION == 1) && (FL_MINOR_VERSION == 3)
else if(Fl::test_shortcut('@')) {
onelab_cb(0, (void*)"check");
status = 1;
diff --git a/Fltk/onelabWindow.cpp b/Fltk/onelabWindow.cpp
index 1e09bc6226..3486501aa3 100644
--- a/Fltk/onelabWindow.cpp
+++ b/Fltk/onelabWindow.cpp
@@ -5,7 +5,7 @@
#include "onelab.h"
-#if defined(FL_MAJOR_VERSION == 1) && (FL_MINOR_VERSION == 3)
+#if (FL_MAJOR_VERSION == 1) && (FL_MINOR_VERSION == 3)
#include <FL/Fl_Value_Input.H>
#include <FL/Fl_Box.H>
#include "GmshMessage.h"
diff --git a/Fltk/onelabWindow.h b/Fltk/onelabWindow.h
index 750a139a15..e2d78e7802 100644
--- a/Fltk/onelabWindow.h
+++ b/Fltk/onelabWindow.h
@@ -7,7 +7,7 @@
#define _ONELAB_WINDOW_H_
#include "GmshConfig.h"
-#if defined(FL_MAJOR_VERSION == 1) && (FL_MINOR_VERSION == 3)
+#if (FL_MAJOR_VERSION == 1) && (FL_MINOR_VERSION == 3)
#include <vector>
#include <FL/Fl_Window.H>
#include <FL/Fl_Tree.H>
--
GitLab