diff options
Diffstat (limited to 'src')
| -rw-r--r-- | src/Fl_Input.cxx | 10 | ||||
| -rw-r--r-- | src/Fl_Text_Display.cxx | 11 |
2 files changed, 12 insertions, 9 deletions
diff --git a/src/Fl_Input.cxx b/src/Fl_Input.cxx index 3fa2c707b..5a225a64e 100644 --- a/src/Fl_Input.cxx +++ b/src/Fl_Input.cxx @@ -524,7 +524,12 @@ int Fl_Input::handle_rmb() { insert_position(word_start(newpos), word_end(newpos)); } } - if (readonly()) { // give only the menu options that make sense + // keep the menu labels current + rmb_menu[0].label(Fl_Input::cut_menu_text); + rmb_menu[1].label(Fl_Input::copy_menu_text); + rmb_menu[2].label(Fl_Input::paste_menu_text); + // give only the menu options that make sense + if (readonly()) { rmb_menu[0].deactivate(); // cut rmb_menu[2].deactivate(); // paste } else { @@ -763,9 +768,6 @@ int Fl_Input::handle(int event) { */ Fl_Input::Fl_Input(int X, int Y, int W, int H, const char *l) : Fl_Input_(X, Y, W, H, l) { - if (!rmb_menu[0].label()) rmb_menu[0].label(Fl_Input::cut_menu_text); - if (!rmb_menu[1].label()) rmb_menu[1].label(Fl_Input::copy_menu_text); - if (!rmb_menu[2].label()) rmb_menu[2].label(Fl_Input::paste_menu_text); } diff --git a/src/Fl_Text_Display.cxx b/src/Fl_Text_Display.cxx index 66a514f68..a7c96d689 100644 --- a/src/Fl_Text_Display.cxx +++ b/src/Fl_Text_Display.cxx @@ -196,10 +196,6 @@ Fl_Text_Display::Fl_Text_Display(int X, int Y, int W, int H, const char* l) set_flag(SHORTCUT_LABEL); clear_flag(NEEDS_KEYBOARD); - if (!rmb_menu[0].label()) rmb_menu[0].label(Fl_Input::cut_menu_text); - if (!rmb_menu[1].label()) rmb_menu[1].label(Fl_Input::copy_menu_text); - if (!rmb_menu[2].label()) rmb_menu[2].label(Fl_Input::paste_menu_text); - end(); } @@ -4104,7 +4100,12 @@ int Fl_Text_Display::handle_rmb(int readonly) { txtbuf->select(txtbuf->word_start(newpos), txtbuf->word_end(newpos)); } } - if (readonly) { // give only the menu options that make sense + // keep the menu labels current + rmb_menu[0].label(Fl_Input::cut_menu_text); + rmb_menu[1].label(Fl_Input::copy_menu_text); + rmb_menu[2].label(Fl_Input::paste_menu_text); + // give only the menu options that make sense + if (readonly) { rmb_menu[0].deactivate(); // cut rmb_menu[2].deactivate(); // paste } else { |