diff --git a/Fltk/FlGui.cpp b/Fltk/FlGui.cpp index d1769e0697752e85d3f99da35df1d0341a4a936c..0e37e4b530be91917d209d636c640d68e3d84a6f 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 1e09bc62269116ee5b1317b4c162e46cdfc1b7c4..3486501aa3a937d6a2a3664d73af75ff920eaf76 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 750a139a15dc7fb2cbb0d24df6e478359d4eaf87..e2d78e780213601e3a90b17ffc2db7469dad184e 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>