From a09c75e9bc8da17fe82fdba047e9bde2771093c1 Mon Sep 17 00:00:00 2001 From: Matthias Melcher Date: Thu, 28 Dec 2023 15:43:21 +0100 Subject: Adds Fl_Input RMB menu translation to test/preferences This also updates the RMB menu labels before every popup so that changing the labels after creating the widgets still reflects that change correctly. --- src/Fl_Text_Display.cxx | 11 ++++++----- 1 file changed, 6 insertions(+), 5 deletions(-) (limited to 'src/Fl_Text_Display.cxx') 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 { -- cgit v1.2.3