From 170c31cada99660d123aa81993da0b995778be83 Mon Sep 17 00:00:00 2001 From: Bill Spitzak Date: Wed, 10 Mar 1999 08:00:45 +0000 Subject: [PATCH] Named callback function in a menu item inside a class prepended the classname:: to the callback function name. This was not consistent with how it declares the callback or with normal widget's use of callback names. Fixed. git-svn-id: file:///fltk/svn/fltk/trunk@398 ea41ed52-d2ee-0310-a9c1-e6b18d33e121 --- fluid/Fl_Menu_Type.cxx | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/fluid/Fl_Menu_Type.cxx b/fluid/Fl_Menu_Type.cxx index 87e286a9b..be5363e47 100644 --- a/fluid/Fl_Menu_Type.cxx +++ b/fluid/Fl_Menu_Type.cxx @@ -1,5 +1,5 @@ // -// "$Id: Fl_Menu_Type.cxx,v 1.15 1999/02/22 21:20:30 mike Exp $" +// "$Id: Fl_Menu_Type.cxx,v 1.16 1999/03/10 08:00:45 bill Exp $" // // Menu item code for the Fast Light Tool Kit (FLTK). // @@ -251,7 +251,7 @@ void Fl_Menu_Item_Type::write_item() { else write_c(", 0, "); if (callback()) { - const char* k = class_name(); + const char* k = is_name(callback()) ? 0 : class_name(); if (k) { write_c(" (Fl_Callback*)%s::%s,", k, callback_name()); } else { @@ -529,5 +529,5 @@ void shortcut_in_cb(Shortcut_Button* i, void* v) { } // -// End of "$Id: Fl_Menu_Type.cxx,v 1.15 1999/02/22 21:20:30 mike Exp $". +// End of "$Id: Fl_Menu_Type.cxx,v 1.16 1999/03/10 08:00:45 bill Exp $". //