Remove the change label width popup menu (#1964)

It was not working at all and caused crashes. And I think the
label width is not changed so often, so that a (working)
possibility in the configuration menu is enough.

Changed the numbers 3, 10, where nobody knows, why they are there
to readable #defines LABELWIDTH_MIN and LABELWIDTH_MAX

Author: daute

NEWS.md

@@ -1,3 +1,10 @@
+# Current development version
+
+- Remove the change label witdth popup menu (#1964)
+  It was not working at all and caused crashes. And I think the
+  label width is not changed so often, so that a (working)
+  possibility in the configuration menu is enough.
+
 # 24.11.0
 
 - A Spanish translation update by cyphra.

src/Configuration.h

@@ -65,6 +65,9 @@
 static constexpr AFontSize MC_MIN_SIZE{ 6.0f };
 static constexpr AFontSize MC_MAX_SIZE{ 48.0f };
 
+// The minimal and maximal label width
+#define LABELWIDTH_MIN 3
+#define LABELWIDTH_MAX 10
 class Cell;
 
 /*! The configuration storage for the current worksheet.

src/EventIDs.cpp

@@ -24,6 +24,7 @@
   This file defines the class EventIDs that contains unique IDs for many events
   wxMaxima needs.
 */
+#include "Configuration.h"
 #include "EventIDs.h"
 #include <wx/utils.h>
 #include <wx/window.h>
@@ -613,7 +614,7 @@ const wxWindowIDRef EventIDs::popid_labels_useronly(wxWindow::NewControlId());
 const wxWindowIDRef EventIDs::popid_labels_autogenerated(wxWindow::NewControlId());
 const wxWindowIDRef EventIDs::popid_inputlabels_hide(wxWindow::NewControlId());
 const wxWindowIDRef EventIDs::popid_labelwidth(wxWindow::NewControlId());
-const wxWindowIDRef EventIDs::popid_labelwidth1(wxWindow::NewControlId(NumberOfLabelWidths()));
+const wxWindowIDRef EventIDs::popid_labelwidth1(wxWindow::NewControlId(LABELWIDTH_MAX - LABELWIDTH_MIN));
 const wxWindowIDRef EventIDs::popid_digits_20(wxWindow::NewControlId());
 const wxWindowIDRef EventIDs::popid_digits_50(wxWindow::NewControlId());
 const wxWindowIDRef EventIDs::popid_digits_100(wxWindow::NewControlId());

src/EventIDs.h

@@ -55,8 +55,6 @@ class EventIDs
   static constexpr int NumberOfRecentFiles()  {return 30;}
   //! How many IDs we have reserved for suggestions of similar command names?
   static constexpr int NumberOfSuggestions()  {return 10;}
-  //! How many IDs we have reserved for label width choices?
-  static constexpr int NumberOfLabelWidths()  {return 10;}
   //! How many IDs have we reserved for table of contents depths
   static constexpr int NumberOfTocLevels()  {return 6;}
 /*! @{

src/Worksheet.cpp

@@ -1628,8 +1628,12 @@ void Worksheet::OnMouseRightDown(wxMouseEvent &event) {
         popupMenu.Check(EventIDs::popid_labels_disable,
                         m_configuration->GetLabelChoice() ==
                         Configuration::labels_none);
+        /***********************
+           Label width popup menu commented out.
+           (a) does not work at all. Selections here have no influence.
+           (b) Source of the issue: https://github.com/wxMaxima-developers/wxmaxima/issues/1964
         wxMenu *labelWidthMenu = new wxMenu();
-        for(int i = 3; i < EventIDs::NumberOfLabelWidths(); i++)
+        for(int i = LABELWIDTH_MIN; i <= LABELWIDTH_MAX; i++)
           {
             labelWidthMenu->AppendRadioItem(EventIDs::popid_labelwidth1 + i,
                                             wxString::Format(wxS("%li em"),
@@ -1638,6 +1642,7 @@ void Worksheet::OnMouseRightDown(wxMouseEvent &event) {
               labelWidthMenu->Check(EventIDs::popid_labelwidth1 + i, true);
           }
         popupMenu.Append(EventIDs::popid_labelwidth, _("Label width"), labelWidthMenu);
+        ************************/
       }
     }
 

src/dialogs/ConfigDialogue.cpp

@@ -678,7 +678,7 @@ wxWindow *ConfigDialogue::CreateWorksheetPanel() {
                   wxUP | wxDOWN | wxALIGN_CENTER_VERTICAL);
   m_labelWidth = new wxSpinCtrl(
                                 displaySizer->GetStaticBox(), wxID_ANY, wxEmptyString, wxDefaultPosition,
-                                wxSize(150 * GetContentScaleFactor(), -1), wxSP_ARROW_KEYS, 3, 10);
+                                wxSize(150 * GetContentScaleFactor(), -1), wxSP_ARROW_KEYS, LABELWIDTH_MIN, LABELWIDTH_MAX);
   grid_sizer->Add(m_labelWidth, 0, wxUP | wxDOWN, 5 * GetContentScaleFactor());
 
   grid_sizer->Add(

src/wxMaxima.cpp

@@ -1249,7 +1249,7 @@ wxMaxima::wxMaxima(wxWindow *parent, int id,
           NULL, this);
   Connect(EventIDs::menu_zoom_300, wxEVT_MENU, wxCommandEventHandler(wxMaxima::EditMenu),
           NULL, this);
-  Connect(EventIDs::popid_labelwidth1, EventIDs::popid_labelwidth1 + EventIDs::NumberOfLabelWidths() - 1,
+  Connect(EventIDs::popid_labelwidth1, EventIDs::popid_labelwidth1 + LABELWIDTH_MAX - LABELWIDTH_MIN,
           wxEVT_MENU, wxCommandEventHandler(wxMaxima::EditMenu), NULL, this);
   Connect(EventIDs::popid_digits_all, wxEVT_MENU,
           wxCommandEventHandler(wxMaxima::EditMenu), NULL, this);
@@ -6279,7 +6279,7 @@ void wxMaxima::EditMenu(wxCommandEvent &event) {
 
   wxString expr = GetDefaultEntry();
   if(((event.GetId()) >= EventIDs::popid_labelwidth1) &&
-     ((event.GetId()) < EventIDs::popid_labelwidth1 + EventIDs::NumberOfLabelWidths())){
+     ((event.GetId()) < EventIDs::popid_labelwidth1 + LABELWIDTH_MAX - LABELWIDTH_MIN)) {
     m_configuration.LabelWidth(EventIDs::popid_labelwidth1 + 1 - event.GetId());
     GetWorksheet()->Recalculate();
     GetWorksheet()->RequestRedraw();