Show pixel filter name not number on cycle

Save the wxChoice* for the pixel filter name selection list in the XRC
and use it to display the filter name in the status message on pixel
filter cycle instead of the filter number.

Signed-off-by: Rafael Kitover <rkitover@gmail.com>

src/wx/cmdevents.cpp

@@ -2766,7 +2766,7 @@ EVT_HANDLER_MASK(ChangeFilter, "Change Pixel Filter", CMDEN_NREC_ANY)
     }
 
     wxString msg;
-    msg.Printf(_("Using pixel filter #%d"), gopts.filter);
+    msg.Printf(_("Using pixel filter %s"), pixel_filters->GetString(gopts.filter));
     systemScreenMessage(msg);
 }
 

src/wx/guiinit.cpp

@@ -3701,6 +3701,10 @@ bool MainFrame::BindControls()
             rb->Hide();
 #endif
             ch = GetValidatedChild<wxChoice, wxGenericValidator>(d, "Filter", wxGenericValidator(&gopts.filter));
+
+            // Save the Filters choice control to extract the names from the XRC.
+            pixel_filters = ch;
+
             // these two are filled and/or hidden at dialog load time
             wxControl* pll;
             wxChoice* pl;

src/wx/wxvbam.h

@@ -382,6 +382,8 @@ private:
     // Load a named wxDialog from the XRC file
     wxDialog* LoadXRCropertySheetDialog(const char* name);
 
+    wxChoice* pixel_filters = nullptr;
+
 #include "cmdhandlers.h"
 };