diff --git a/Fltk/GUI.cpp b/Fltk/GUI.cpp index f288f425bb5dc762cd0d290a29e8bf3dba647a21..431aad99a890343a601f74be984d11787593ab48 100644 --- a/Fltk/GUI.cpp +++ b/Fltk/GUI.cpp @@ -1,4 +1,4 @@ -// $Id: GUI.cpp,v 1.490 2006-02-24 03:28:18 geuzaine Exp $ +// $Id: GUI.cpp,v 1.491 2006-03-08 15:43:15 geuzaine Exp $ // // Copyright (C) 1997-2006 C. Geuzaine, J.-F. Remacle // @@ -134,6 +134,13 @@ Fl_Menu_Item m_menubar_table[] = { // menu window; removed File->Quit) #if defined(__APPLE__) && defined(HAVE_FLTK_1_1_5_OR_ABOVE) + +// random changes in fltk are driving me nuts sometimes +#if (FL_MAJOR_VERSION == 1) && (FL_MINOR_VERSION == 1) && (FL_PATCH_VERSION <= 6) +#undef FL_META +#define FL_META FL_CTRL +#endif + Fl_Menu_Item m_sys_menubar_table[] = { {"File", 0, 0, 0, FL_SUBMENU}, {"New...", FL_META+'n', (Fl_Callback *)file_new_cb, 0}, @@ -143,7 +150,7 @@ Fl_Menu_Item m_sys_menubar_table[] = { {"Save As...", FL_META+'s', (Fl_Callback *)file_save_as_cb, 0}, {"Save Mesh", FL_META+FL_SHIFT+'s', (Fl_Callback *)mesh_save_cb, 0}, {0}, - {"Tools",0,0,0,FL_SUBMENU}, + {"Tools", 0, 0, 0, FL_SUBMENU}, {"Options...", FL_META+FL_SHIFT+'n', (Fl_Callback *)options_cb, 0}, {"Visibility", FL_META+FL_SHIFT+'v', (Fl_Callback *)visibility_cb, 0}, {"Clipping Planes", FL_META+FL_SHIFT+'c', (Fl_Callback *)clip_cb, 0}, @@ -151,12 +158,12 @@ Fl_Menu_Item m_sys_menubar_table[] = { {"Statistics", FL_META+'i', (Fl_Callback *)statistics_cb, 0}, {"Message Console", FL_META+'l', (Fl_Callback *)message_cb, 0}, {0}, - {"Window",0,0,0,FL_SUBMENU}, + {"Window", 0, 0, 0, FL_SUBMENU}, {"Minimize", FL_META+'m', (Fl_Callback *)window_cb, (void*)"minimize"}, {"Zoom", 0, (Fl_Callback *)window_cb, (void*)"zoom", FL_MENU_DIVIDER}, {"Bring All to Front", 0, (Fl_Callback *)window_cb, (void*)"front"}, {0}, - {"Help",0,0,0,FL_SUBMENU}, + {"Help", 0, 0, 0, FL_SUBMENU}, {"Online Documentation", 0, (Fl_Callback *)help_online_cb, 0, FL_MENU_DIVIDER}, {"Mouse Actions", 0, (Fl_Callback *)help_mouse_cb, 0}, {"Keyboard Shortcuts", 0, (Fl_Callback *)help_short_cb, 0}, diff --git a/README b/README index c5e56aa5c2198eaa9f2e75eba5b25b1d5f1097a8..2ecfa448d293af5b32ebfa6ee9b4940faafed7d3 100644 --- a/README +++ b/README @@ -15,6 +15,13 @@ support; freely available from http://www.fltk.org). You can use the the FLTK_PREFIX and GSL_PREFIX environment variables) if the libraries are not installed in their default locations. +[ WARNING: Do not use FLTK 1.1.7. FLTK 1.1.7 has a few serious bugs +that can lead to seemingly random crashes in Gmsh. FLTK 1.1.6 is OK, +as are most SVN revisions anterior to {"2005-10-10"}. Unfortunately, +these versions come with a buggy JPEG header: if you enable the local +JPEG library when you configure FLTK, you will have to remove the +"#include <config.h>" line in the file "jconfig.h". ] + To install a non-graphical version of Gmsh (that does not require FLTK nor OpenGL), type