From 12d1a65aa49a90ca1b9e9710b50326cb129eb33a Mon Sep 17 00:00:00 2001
From: Christophe Geuzaine <cgeuzaine@ulg.ac.be>
Date: Tue, 6 Jan 2009 21:58:50 +0000
Subject: [PATCH] *** empty log message ***
---
Fltk/GUI.cpp | 5 -----
Fltk/GUI.h | 1 -
Fltk/aboutWindow.cpp | 7 ++++++-
Fltk/menuWindow.cpp | 2 +-
4 files changed, 7 insertions(+), 8 deletions(-)
diff --git a/Fltk/GUI.cpp b/Fltk/GUI.cpp
index a9b6b1a1f7..f17612ce74 100644
--- a/Fltk/GUI.cpp
+++ b/Fltk/GUI.cpp
@@ -656,11 +656,6 @@ void GUI::callForSolverPlugin(int dim)
// Callbacks
-void hide_cb(Fl_Widget *w, void *data)
-{
- if(data) ((Fl_Window*)data)->hide();
-}
-
void redraw_cb(Fl_Widget *w, void *data)
{
Draw();
diff --git a/Fltk/GUI.h b/Fltk/GUI.h
index 03c8e7a7cb..0311ca5a2e 100644
--- a/Fltk/GUI.h
+++ b/Fltk/GUI.h
@@ -107,7 +107,6 @@ class GUI{
void callForSolverPlugin(int dim);
};
-void hide_cb(Fl_Widget *w, void *data);
void redraw_cb(Fl_Widget *w, void *data);
void window_cb(Fl_Widget *w, void *data);
diff --git a/Fltk/aboutWindow.cpp b/Fltk/aboutWindow.cpp
index 9853c8426e..b0a768294b 100644
--- a/Fltk/aboutWindow.cpp
+++ b/Fltk/aboutWindow.cpp
@@ -32,6 +32,11 @@ static void help_credits_cb(Fl_Widget *w, void *data)
SystemCall(cmd);
}
+static void help_hide_cb(Fl_Widget *w, void *data)
+{
+ ((Fl_Window*)data)->hide();
+}
+
aboutWindow::aboutWindow()
{
char buffer[1024];
@@ -82,7 +87,7 @@ aboutWindow::aboutWindow()
o->add(" ");
o->add("@c@.Visit http://www.geuz.org/gmsh/ for more information");
o->add(" ");
- o->callback(hide_cb, (void *)win);
+ o->callback(help_hide_cb, (void*)win);
}
{
diff --git a/Fltk/menuWindow.cpp b/Fltk/menuWindow.cpp
index dd611120fb..eeeca7afad 100644
--- a/Fltk/menuWindow.cpp
+++ b/Fltk/menuWindow.cpp
@@ -2401,7 +2401,7 @@ contextItem menu_mesh[] = {
#if defined(HAVE_FOURIER_MODEL)
{"Reparameterize", (Fl_Callback *)mesh_parameterize_cb} ,
#endif
- {"Reclassify", (Fl_Callback *)mesh_classify_cb} ,
+ // {"Reclassify", (Fl_Callback *)mesh_classify_cb} ,
{"Save", (Fl_Callback *)mesh_save_cb} ,
{0}
};
--
GitLab