diff --git a/Common/Context.h b/Common/Context.h
index cdcab1d975913cfda3897a7f30fccf2358f3a673..fe5a1ca3cebb9b4f58ff094d42d437d97d6cbda5 100644
--- a/Common/Context.h
+++ b/Common/Context.h
@@ -75,7 +75,7 @@ public :
int vis_position[2]; // position of the visibility window on the screen
int stat_position[2]; // position of the statistics window on the screen
int center_windows; // center popup windows on the menu window
- int apple_menu_bar; // Apple-style menubar?
+ int system_menu_bar; // use the system menu bar on MacOS?
int default_plugins; // do we load default plugins on startup?
diff --git a/Common/DefaultOptions.h b/Common/DefaultOptions.h
index 9ab60e14b8f92e755b855619f64c2509e2e2315e..5689f273ccf057c37e4b7d8719c1f99c8fb9701b 100644
--- a/Common/DefaultOptions.h
+++ b/Common/DefaultOptions.h
@@ -346,8 +346,8 @@ StringXString PrintOptions_String[] = {
StringXNumber GeneralOptions_Number[] = {
{ F|O, "AlphaBlending" , opt_general_alpha_blending , 1. ,
"Enable alpha blending (transparency) in post-processing views" },
- { F|S, "AppleMenuBar" , opt_general_apple_menu_bar , 0. ,
- "Use Apple-style menu bar on Mac OS X?" },
+ { F|S, "SystemMenuBar" , opt_general_system_menu_bar , 1. ,
+ "Use the system menu bar on Mac OS X (if possible)?" },
{ F|O, "Axes" , opt_general_axes , 1. ,
"Display the axes linked to the model" },
diff --git a/Common/Options.cpp b/Common/Options.cpp
index ddf9a78b4bb1ea6bf355978335444156b2350d67..f26b5b474a7cfc9335149a98bee4653e81b872b1 100644
--- a/Common/Options.cpp
+++ b/Common/Options.cpp
@@ -1,4 +1,4 @@
-// $Id: Options.cpp,v 1.123 2003-12-01 21:51:19 geuzaine Exp $
+// $Id: Options.cpp,v 1.124 2003-12-02 22:57:41 geuzaine Exp $
//
// Copyright (C) 1997-2003 C. Geuzaine, J.-F. Remacle
//
@@ -1739,11 +1739,11 @@ double opt_general_menu_position1(OPT_ARGS_NUM)
return CTX.position[1];
}
-double opt_general_apple_menu_bar(OPT_ARGS_NUM)
+double opt_general_system_menu_bar(OPT_ARGS_NUM)
{
if(action & GMSH_SET)
- CTX.apple_menu_bar = (int)val;
- return CTX.apple_menu_bar;
+ CTX.system_menu_bar = (int)val;
+ return CTX.system_menu_bar;
}
double opt_general_message_position0(OPT_ARGS_NUM)
diff --git a/Common/Options.h b/Common/Options.h
index df651e365819d61215523a92d88e384a0e809e53..1b9caae0fadcf831650f6eaab53fa6ecda045096 100644
--- a/Common/Options.h
+++ b/Common/Options.h
@@ -195,7 +195,7 @@ double opt_general_viewport2(OPT_ARGS_NUM);
double opt_general_viewport3(OPT_ARGS_NUM);
double opt_general_menu_position0(OPT_ARGS_NUM);
double opt_general_menu_position1(OPT_ARGS_NUM);
-double opt_general_apple_menu_bar(OPT_ARGS_NUM);
+double opt_general_system_menu_bar(OPT_ARGS_NUM);
double opt_general_message_position0(OPT_ARGS_NUM);
double opt_general_message_position1(OPT_ARGS_NUM);
double opt_general_message_size0(OPT_ARGS_NUM);
diff --git a/Fltk/GUI.cpp b/Fltk/GUI.cpp
index 221937b6aa322952acb562c838f49d5b31ea14ba..f17d7fff2df55a515ada487ea8ad89f882441880 100644
--- a/Fltk/GUI.cpp
+++ b/Fltk/GUI.cpp
@@ -1,4 +1,4 @@
-// $Id: GUI.cpp,v 1.258 2003-12-01 22:02:58 geuzaine Exp $
+// $Id: GUI.cpp,v 1.259 2003-12-02 22:57:41 geuzaine Exp $
//
// Copyright (C) 1997-2003 C. Geuzaine, J.-F. Remacle
//
@@ -788,7 +788,7 @@ void GUI::create_menu_window(int argc, char **argv)
// this is the initial height: no dynamic button is shown!
#if defined(__APPLE__) && defined(HAVE_FL_SYS_MENU_BAR)
- if(CTX.apple_menu_bar){
+ if(CTX.system_menu_bar){
MH = BH + 6; // the menu bar is not in the application!
}
else{
@@ -803,7 +803,7 @@ void GUI::create_menu_window(int argc, char **argv)
m_window->callback(file_quit_cb);
#if defined(__APPLE__) && defined(HAVE_FL_SYS_MENU_BAR)
- if(CTX.apple_menu_bar){
+ if(CTX.system_menu_bar){
m_sys_menu_bar = new Fl_Sys_Menu_Bar(0, 0, width, BH);
m_sys_menu_bar->menu(m_menubar_table);
m_sys_menu_bar->global();
diff --git a/configure b/configure
index d163ada7763a203bf53b13cced2f39f8eea909bd..70941b43be524960d6e4a0725e28c783bc2fe51e 100755
--- a/configure
+++ b/configure
@@ -849,7 +849,7 @@ Optional Features:
--enable-FEATURE[=ARG] include FEATURE [ARG=yes]
--enable-gsl use GSL as numerical toolkit (default=yes)
--enable-gui build the graphical user interface (default=yes)
- --enable-macmenu enable Apple-style menu bar on Mac OS X (default=no)
+ --enable-system-menubar use the system menu bar on MacOS X (default=no)
--enable-parallel enable parallel version (default=no)
--enable-triangle compile Triangle if available (default=yes)
--enable-jpeg enable JPEG support (default=yes)
@@ -1339,9 +1339,9 @@ if test "${enable_gui+set}" = set; then
enableval="$enable_gui"
fi;
-# Check whether --enable-macmenu or --disable-macmenu was given.
-if test "${enable_macmenu+set}" = set; then
- enableval="$enable_macmenu"
+# Check whether --enable-system-menubar or --disable-system-menubar was given.
+if test "${enable_system_menubar+set}" = set; then
+ enableval="$enable_system_menubar"
fi;
# Check whether --enable-parallel or --disable-parallel was given.
@@ -3712,7 +3712,7 @@ if test "x$enable_parallel" = "xyes"; then
FLAGS="-DPARALLEL ${FLAGS}"
fi
-if test "x$enable_macmenu" = "xyes"; then
+if test "x$enable_system_menubar" = "xyes"; then
FLAGS="-DHAVE_FL_SYS_MENU_BAR ${FLAGS}"
fi
diff --git a/configure.in b/configure.in
index c7a6d0710229c59c8368335464136d10b4d3c745..1c39be1bd966d17099f3ec76a5ddab891eee9515 100644
--- a/configure.in
+++ b/configure.in
@@ -1,4 +1,4 @@
-dnl $Id: configure.in,v 1.47 2003-11-23 07:41:26 geuzaine Exp $
+dnl $Id: configure.in,v 1.48 2003-12-02 22:57:41 geuzaine Exp $
dnl
dnl Copyright (C) 1997-2003 C. Geuzaine, J.-F. Remacle
dnl
@@ -57,9 +57,9 @@ AC_ARG_ENABLE(gsl,
AC_ARG_ENABLE(gui,
AC_HELP_STRING([--enable-gui],
[build the graphical user interface (default=yes)]))
-AC_ARG_ENABLE(macmenu,
- AC_HELP_STRING([--enable-macmenu],
- [enable Apple-style menu bar on Mac OS X (default=no)]))
+AC_ARG_ENABLE(system-menubar,
+ AC_HELP_STRING([--enable-system-menubar],
+ [use the system menu bar on MacOS X (default=no)]))
AC_ARG_ENABLE(parallel,
AC_HELP_STRING([--enable-parallel],
[enable parallel version (default=no)]))
@@ -291,8 +291,8 @@ if test "x$enable_parallel" = "xyes"; then
FLAGS="-DPARALLEL ${FLAGS}"
fi
-dnl Check if we should enable the Apple-style menu bar
-if test "x$enable_macmenu" = "xyes"; then
+dnl Check if we should enable the system menu bar on MacOS X
+if test "x$enable_system_menubar" = "xyes"; then
FLAGS="-DHAVE_FL_SYS_MENU_BAR ${FLAGS}"
fi
diff --git a/doc/texinfo/opt_general.texi b/doc/texinfo/opt_general.texi
index 31ee7f7f479e17a5cc2449c730f6679a7ab7a06a..1bd41f57414d19f5a26aa2f79d15b055a84baaae 100644
--- a/doc/texinfo/opt_general.texi
+++ b/doc/texinfo/opt_general.texi
@@ -44,9 +44,9 @@ Enable alpha blending (transparency) in post-processing views@*
Default value: @code{1}@*
Saved in: @code{General.OptionsFileName}
-@item General.AppleMenuBar
-Use Apple-style menu bar on Mac OS X?@*
-Default value: @code{0}@*
+@item General.SystemMenuBar
+Use the system menu bar on Mac OS X (if possible)?@*
+Default value: @code{1}@*
Saved in: @code{General.SessionFileName}
@item General.Axes
@@ -599,6 +599,11 @@ Level of information printed during processing (0=no information)@*
Default value: @code{2}@*
Saved in: @code{General.OptionsFileName}
+@item General.VisibilityMode
+Default mode for the visibility browser (0=Geometry+Mesh, 1=Geometry, 2=Mesh)@*
+Default value: @code{0}@*
+Saved in: @code{General.SessionFileName}
+
@item General.VisibilityPositionX
Horizontal position (in pixels) of the upper left corner of the visibility window@*
Default value: @code{650}@*
@@ -609,11 +614,6 @@ Vertical position (in pixels) of the upper left corner of the visibility window@
Default value: @code{150}@*
Saved in: @code{General.SessionFileName}
-@item General.VisibilityMode
-Default mode for the visibility browser (0=Geometry+Mesh, 1=Geometry, 2=Mesh)@*
-Default value: @code{0}@*
-Saved in: @code{General.SessionFileName}
-
@item General.ZoomFactor
`Speed' of the middle mouse button zoom@*
Default value: @code{1.1}@*