From d1104965205f0ac8cdcf8d477d112cb5de066b07 Mon Sep 17 00:00:00 2001 From: edgeeffect Date: Mon, 17 Feb 2003 20:04:23 +0000 Subject: [PATCH] Fixed error - cancel on module rename causes corruption of name --- GUI/Widgets/Fl_DeviceGUI.C | 1 - GUI/Widgets/PawfalInput.C | 7 +++---- 2 files changed, 3 insertions(+), 5 deletions(-) diff --git a/GUI/Widgets/Fl_DeviceGUI.C b/GUI/Widgets/Fl_DeviceGUI.C index 00192b8..3234452 100644 --- a/GUI/Widgets/Fl_DeviceGUI.C +++ b/GUI/Widgets/Fl_DeviceGUI.C @@ -343,7 +343,6 @@ inline void Fl_DeviceGUI::cb_Rename_i(Fl_Menu_Button* o, void* v) m_DragBar->label(m_Name.c_str()); ((Fl_Canvas*)(parent()))->Rename(this); } - } void Fl_DeviceGUI::cb_Rename(Fl_Menu_Button* o, void* v) {((Fl_DeviceGUI*)(o->parent()))->cb_Rename_i(o,v);} diff --git a/GUI/Widgets/PawfalInput.C b/GUI/Widgets/PawfalInput.C index 239a90d..1e44330 100644 --- a/GUI/Widgets/PawfalInput.C +++ b/GUI/Widgets/PawfalInput.C @@ -21,13 +21,12 @@ bool Pawfal_Input(const char *a, const char *b, char *out) { PawfalInput pi(300, 100,a,b); - if (pi.go()) + if (pi.go()) { - strcpy(out,pi.getText()); + strcpy(out,pi.getText()); return true; } - - return true; + return false; } PawfalInput::PawfalInput(int x, int y, int w, int h, const char *label, const char *dflt):