Small compilation fixes for fltk 2.0

Fltk/GUI.h

@@ -48,7 +48,6 @@
 
 #if !((FL_MAJOR_VERSION == 1) && (FL_MINOR_VERSION == 0))
 #include <FL/Fl_Tooltip.H>
-#include <FL/Fl_Sys_Menu_Bar.H>
 #endif
 
 #include "Opengl_Window.h"
@@ -60,6 +59,10 @@
 // define this to get a true Mac menu (not inside gmsh as in Window/Unix)
 #undef APPLE_USE_SYS_MENU
 
+#ifdef APPLE_USE_SYS_MENU
+#include <FL/Fl_Sys_Menu_Bar.H>
+#endif
+
 // The dynamic contexts
 
 typedef struct{

Graphics/Graph2D.cpp

-// $Id: Graph2D.cpp,v 1.21 2002-10-19 18:56:12 geuzaine Exp $
+// $Id: Graph2D.cpp,v 1.22 2002-11-17 02:27:26 geuzaine Exp $
 //
 // Copyright (C) 1997 - 2002 C. Geuzaine, J.-F. Remacle
 //
@@ -91,7 +91,7 @@ static void Draw_Graph2D(Post_View *v,
 			 double xx, double yy, double width, double height,
 			 double tic, double bb[4]){
   char label[1024] ;
-  int font_h, font_a ;
+  float font_h, font_a ;
   int i, i_inc, i_max, j, j_inc, j_max, k, nb;
   double dx, dy, dv;
   double xtop = xx;