diff --git a/Fltk/GUI.cpp b/Fltk/GUI.cpp index a9b6b1a1f77dfa9603197de5b4bdd4b3724c07cd..f17612ce740f115143e9742e0924ab919290eb44 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 03c8e7a7cbdb2a85359c3eab57040ca18dd8f69d..0311ca5a2e96b9ad83096b03e82a6a9789a93a90 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 9853c8426e53d3ea2703a85280447f6ec10fa5a8..b0a768294b32d4096d3f18bbbfad9891b02c3034 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 dd611120fb6302ce232c03f1a0c3dc70125c13e8..eeeca7afad35aa74eb288234f3437ecfcbb25287 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} };