*** empty log message ***

Fltk/fieldWindow.cpp

@@ -11,6 +11,8 @@
 #include <FL/Fl_Input.H>
 #include <FL/Fl_Tabs.H>
 #include <FL/Fl_Return_Button.H>
+#include <FL/Fl_Check_Button.H>
+#include <FL/Fl_Round_Button.H>
 #include <FL/Fl_Value_Input.H>
 #include <FL/fl_draw.H>
 #include "GUI.h"
@@ -154,8 +156,10 @@ fieldWindow::fieldWindow(int deltaFontSize) : _deltaFontSize(deltaFontSize)
     (x + w - BB, y + h - BH - WB, BB, BH, "Apply");
   apply_btn->callback(field_apply_cb, this);
   
-  background_btn = new Fl_Check_Button
+  background_btn = new Fl_Round_Button
     (x, y + h - BH - WB, w - BB - WB, BH, "Set as background field");
+  background_btn->tooltip("Only a single field can be set as background field.\n"
+                          "To combine multiple fields use the Min or Max fields.");
   options_tab->end();
 
   Fl_Group *help_tab = new Fl_Group(x, y, w, h, "Help");

Fltk/fieldWindow.h

@@ -12,7 +12,6 @@
 #include <FL/Fl_Hold_Browser.H>
 #include <FL/Fl_Widget.H>
 #include <FL/Fl_Button.H>
-#include <FL/Fl_Check_Button.H>
 #include <FL/Fl_Group.H>
 #include <FL/Fl_Scroll.H>
 #include <FL/Fl_Box.H>
@@ -30,7 +29,7 @@ class fieldWindow{
   Fl_Scroll *options_scroll;
   Fl_Group *editor_group;
   Fl_Box *title, *empty_message;
-  Fl_Check_Button *background_btn;
+  Fl_Button *background_btn;
   Fl_Menu_Button *put_on_view_btn;
   Fl_Browser *help_display;
   Fl_Button *delete_btn;

doc/TODO.txt

-$Id: TODO.txt,v 1.25 2009-04-04 21:08:02 geuzaine Exp $
+$Id: TODO.txt,v 1.26 2009-04-24 15:06:24 geuzaine Exp $
+
+********************************************************************
+
+Saving string options with " will not work :-(
 
 ********************************************************************
 

doc/texinfo/gmsh.texi

@@ -4260,7 +4260,7 @@ interface (@file{Fltk}, @file{Parser}) libraries on the other.
 The geometry and mesh modules are based on an object-oriented model
 class (@file{Geo/GModel.h}), built upon abstract geometrical entity
 classes (@file{Geo/GVertex.h}, @file{Geo/GEdge.h}, @file{Geo/GFace.h}
-and @file{Geo/GRegion.h}). Concrete implementation of the geometrical
+and @file{Geo/GRegion.h}). Concrete implementations of the geometrical
 entity classes are provided for each supported CAD kernel
 (e.g. @file{Geo/gmshVertex.h} for geometry points in Gmsh's native CAD
 format, or @file{Geo/OCCVertex.h} for geometry points from

utils/misc/variables.msvc

@@ -81,8 +81,8 @@ endif
 LINKER=cl /F16777216
 
 # All compiler flags except optimization flags
-FLAGS=/DWIN32 /D_USE_MATH_DEFINES /D_CRT_SECURE_NO_DEPRECATE /DHAVE_NO_DLL
-FLAGS+=/DHAVE_ANN /DHAVE_MATH_EVAL
+FLAGS=/DWIN32 /D_USE_MATH_DEFINES /DNOMINMAX /D_CRT_SECURE_NO_DEPRECATE
+FLAGS+=/DHAVE_NO_DLL /DHAVE_ANN /DHAVE_MATH_EVAL
 
 # Additional system includes ($INCLUDE is automatically defined by MSVC when
 # you launch the MSVC command prompt)