put fltk popup bug fix in a single header file

Fltk/Makefile

-# $Id: Makefile,v 1.104 2006-08-26 13:34:46 geuzaine Exp $
+# $Id: Makefile,v 1.105 2006-08-29 02:27:26 geuzaine Exp $
 #
 # Copyright (C) 1997-2006 C. Geuzaine, J.-F. Remacle
 #
@@ -34,7 +34,6 @@ SRC = Main.cpp \
       Opengl.cpp\
       Opengl_Window.cpp\
       Colorbar_Window.cpp\
-      Popup_Button.cpp\
       Solvers.cpp
 
 
@@ -232,11 +231,6 @@ Colorbar_Window.o: Colorbar_Window.cpp ../Common/Gmsh.h \
   ../Common/ColorTable.h Popup_Button.h SpherePosition_Widget.h \
   ../Common/Context.h
 # 1 "/Users/geuzaine/.gmsh/Fltk//"
-Popup_Button.o: Popup_Button.cpp ../Common/Gmsh.h ../Common/Message.h \
-  ../DataStr/Malloc.h ../DataStr/List.h ../DataStr/Tree.h \
-  ../DataStr/avl.h ../DataStr/Tools.h ../DataStr/List.h ../DataStr/Tree.h \
-  ../Common/GmshUI.h Popup_Button.h
-# 1 "/Users/geuzaine/.gmsh/Fltk//"
 Solvers.o: Solvers.cpp ../Common/Gmsh.h ../Common/Message.h \
   ../DataStr/Malloc.h ../DataStr/List.h ../DataStr/Tree.h \
   ../DataStr/avl.h ../DataStr/Tools.h ../DataStr/List.h ../DataStr/Tree.h \

Fltk/Popup_Button.cpp

-// $Id: Popup_Button.cpp,v 1.4 2006-04-01 23:02:22 geuzaine Exp $
-//
-// Copyright (C) 1997-2006 C. Geuzaine, J.-F. Remacle
-//
-// This program is free software; you can redistribute it and/or modify
-// it under the terms of the GNU General Public License as published by
-// the Free Software Foundation; either version 2 of the License, or
-// (at your option) any later version.
-//
-// This program is distributed in the hope that it will be useful,
-// but WITHOUT ANY WARRANTY; without even the implied warranty of
-// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-// GNU General Public License for more details.
-//
-// You should have received a copy of the GNU General Public License
-// along with this program; if not, write to the Free Software
-// Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307
-// USA.
-// 
-// Please report all bugs and problems to <gmsh@geuz.org>.
-
-#include "Gmsh.h"
-#include "GmshUI.h"
-#include "Popup_Button.h"
-
-const Fl_Menu_Item* Popup_Button::popup() {
-  const Fl_Menu_Item* m;
-  redraw();
-  m = menu()->popup(Fl::event_x(), Fl::event_y(), label(), mvalue(), this);
-  picked(m);
-  return m;
-}
-
-int Popup_Button::handle(int e) {
-  if (!menu() || !menu()->text) return 0;
-  switch (e) {
-  case FL_ENTER:
-  case FL_LEAVE:
-    return (box() && !type()) ? 1 : 0;
-  case FL_PUSH:
-    if (!box()) {
-      if (Fl::event_button() != 3) return 0;
-    } else if (type()) {
-      if (!(type() & (1 << (Fl::event_button()-1)))) return 0;
-    }
-    if (Fl::visible_focus()) Fl::focus(this);
-    popup();
-    return 1;
-  case FL_KEYBOARD:
-    if (!box()) return 0;
-    if (Fl::event_key() == ' ' &&
-        !(Fl::event_state() & (FL_SHIFT | FL_CTRL | FL_ALT | FL_META))) {
-      popup();
-      return 1;
-    } else return 0;
-  case FL_SHORTCUT:
-    if (Fl_Widget::test_shortcut()) {popup(); return 1;}
-    return test_shortcut() != 0;
-  case FL_FOCUS:
-  case FL_UNFOCUS:
-    if (box() && Fl::visible_focus()) {
-      redraw();
-      return 1;
-    }
-  default:
-    return 0;
-  }
-}

Fltk/Popup_Button.h

@@ -34,8 +34,50 @@ class Popup_Button : public Fl_Menu_Button {
   Popup_Button(int x, int y, int w, int h, char *label=0) 
     : Fl_Menu_Button(x, y, w, h, label) {}
   void draw(){ Fl_Menu_Button::draw(); }
-  int handle(int e);
-  const Fl_Menu_Item* popup();
+  int handle(int e)
+  {
+    if (!menu() || !menu()->text) return 0;
+    switch (e) {
+    case FL_ENTER:
+    case FL_LEAVE:
+      return (box() && !type()) ? 1 : 0;
+    case FL_PUSH:
+      if (!box()) {
+	if (Fl::event_button() != 3) return 0;
+      } else if (type()) {
+	if (!(type() & (1 << (Fl::event_button()-1)))) return 0;
+      }
+      if (Fl::visible_focus()) Fl::focus(this);
+      popup();
+      return 1;
+    case FL_KEYBOARD:
+      if (!box()) return 0;
+      if (Fl::event_key() == ' ' &&
+	  !(Fl::event_state() & (FL_SHIFT | FL_CTRL | FL_ALT | FL_META))) {
+	popup();
+	return 1;
+      } else return 0;
+    case FL_SHORTCUT:
+      if (Fl_Widget::test_shortcut()) {popup(); return 1;}
+      return test_shortcut() != 0;
+    case FL_FOCUS:
+    case FL_UNFOCUS:
+      if (box() && Fl::visible_focus()) {
+	redraw();
+	return 1;
+      }
+    default:
+      return 0;
+    }
+  }
+  const Fl_Menu_Item* popup()
+  {
+    const Fl_Menu_Item* m;
+    redraw();
+    m = menu()->popup(Fl::event_x(), Fl::event_y(), label(), mvalue(), this);
+    picked(m);
+    return m;
+  }
 };
 
 #endif