diff --git a/Fltk/graphicWindow.cpp b/Fltk/graphicWindow.cpp
index 0d30485acae1b1866fc8d278615346c320966915..73a17a7d8fcee31f4f3bc10d606ace6bfc59c126 100644
--- a/Fltk/graphicWindow.cpp
+++ b/Fltk/graphicWindow.cpp
@@ -203,7 +203,8 @@ void status_xyz1p_cb(Fl_Widget *w, void *data)
     }
     else if(!strcmp(str, "reset")){
       if (CTX::instance()->camera) {
-	ctx->camera.init();}
+	ctx->camera.init();
+      }
       else{
 	// reset everything
 	ctx->t[0] = ctx->t[1] = ctx->t[2] = 0.;
diff --git a/Fltk/menuWindow.cpp b/Fltk/menuWindow.cpp
index 89de1a2a6b69cae0f842146f4b800b8612f3522c..cb63cb5f245ad39fea3d5efbe678a4214afcd0f5 100644
--- a/Fltk/menuWindow.cpp
+++ b/Fltk/menuWindow.cpp
@@ -82,29 +82,16 @@ static void file_new_cb(Fl_Widget *w, void *data)
 #if defined(HAVE_NATIVE_FILE_CHOOSER)
 #  define TT "\t"
 #  define NN "\n"
-#  if defined(__APPLE__)
-#    define SEPARATOR_IN    " " TT "*" NN
-#    define SEPARATOR_OUT  {" " TT "*.*", _save_auto},
-#  else
-#    define SEPARATOR_IN
-#    define SEPARATOR_OUT
-#  endif
 #else
 #  define TT " ("
 #  define NN ")\t"
-#  define SEPARATOR_IN
-#  define SEPARATOR_OUT
 #endif
 
 static const char *input_formats =
   "All Files" TT "*" NN
-  SEPARATOR_IN
   "Gmsh Geometry" TT "*.geo" NN
   "Gmsh Mesh" TT "*.msh" NN
   "Gmsh Post-processing View" TT "*.pos" NN
-#if defined(HAVE_ACIS) || defined(HAVE_OCC)
-  SEPARATOR_IN
-#endif
 #if defined(HAVE_ACIS)
   "ACIS Model" TT "*.sat" NN
 #endif
@@ -113,7 +100,6 @@ static const char *input_formats =
   "IGES Model" TT "*.{igs,iges}" NN
   "STEP Model" TT "*.{stp,step}" NN
 #endif
-  SEPARATOR_IN
   "Diffpack 3D Mesh" TT "*.diff" NN
   "I-deas Universal Mesh" TT "*.unv" NN
 #if defined(HAVE_MED)
@@ -126,7 +112,6 @@ static const char *input_formats =
   "VTK Mesh" TT "*.vtk" NN
   "VRML Surface Mesh" TT "*.{wrl,vrml}" NN
   "PLY2 Surface Mesh" TT "*.{ply2}" NN
-  SEPARATOR_IN
   "BMP" TT "*.bmp" NN
 #if defined(HAVE_LIBJPEG)
   "JPEG" TT "*.{jpg,jpeg}" NN
@@ -341,12 +326,10 @@ static void file_save_as_cb(Fl_Widget *w, void *data)
 {
   static patXfunc formats[] = {
     {"Guess From Extension" TT "*.*", _save_auto},
-    SEPARATOR_OUT
     {"Gmsh Mesh" TT "*.msh", _save_msh},
     {"Gmsh Mesh Statistics" TT "*.pos", _save_pos},
     {"Gmsh Options" TT "*.opt", _save_options},
     {"Gmsh Unrolled Geometry" TT "*.geo", _save_geo},
-    SEPARATOR_OUT
     {"Abaqus INP Mesh" TT "*.inp", _save_inp},
 #if defined(HAVE_LIBCGNS)
     {"CGNS (Experimental)" TT "*.cgns", _save_cgns},
@@ -365,7 +348,6 @@ static void file_save_as_cb(Fl_Widget *w, void *data)
     {"VRML Surface Mesh" TT "*.wrl", _save_vrml},
     {"VTK Mesh" TT "*.vtk", _save_vtk},
     {"PLY2 Mesh" TT "*.ply2", _save_ply2},
-    SEPARATOR_OUT
     {"Encapsulated PostScript" TT "*.eps", _save_eps},
     {"GIF" TT "*.gif", _save_gif},
 #if defined(HAVE_LIBJPEG)
@@ -416,8 +398,6 @@ static void file_save_as_cb(Fl_Widget *w, void *data)
 
 #undef TT
 #undef NN
-#undef SEPARATOR_IN
-#undef SEPARATOR_OUT
 
 static void file_options_save_cb(Fl_Widget *w, void *data)
 {