oop

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;

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"

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>