Applied patch [ 919791 ] [widgets sample] Update wxListbox selection handling

[wxWidgets.git] / contrib / utils / wxrcedit / pe_adv.cpp

diff --git a/contrib/utils/wxrcedit/pe_adv.cpp b/contrib/utils/wxrcedit/pe_adv.cpp
index c5776cbb428e587f1c4b1a0c6b4381b2c4b56444..4f7b59f398e0cddce4104b9e2f19fab229291a5e 100644 (file)
--- a/contrib/utils/wxrcedit/pe_adv.cpp
+++ b/contrib/utils/wxrcedit/pe_adv.cpp
@@ -94,7 +94,7 @@ void PropEditCtrlChoice::WriteValue()
 
 
 
-void PropEditCtrlChoice::OnChoice(wxCommandEvent& event)
+void PropEditCtrlChoice::OnChoice(wxCommandEvent& WXUNUSED(event))
 {
     if (CanSave()) 
     {
@@ -113,11 +113,12 @@ void PropEditCtrlColor::OnDetails()
     wxString txt = m_TextCtrl->GetValue();
     long unsigned tmp;
     
-    if (txt.Length() == 7 && txt[0] == _T('#') &&
+    if (txt.Length() == 7 && txt[0u] == _T('#') &&
         wxSscanf(txt.c_str(), _T("#%lX"), &tmp) == 1)
         clr = wxColour((tmp & 0xFF0000) >> 16, 
                        (tmp & 0x00FF00) >> 8, 
                        (tmp & 0x0000FF));
+
     clr = wxGetColourFromUser(NULL, clr);
     if (clr.Ok())
     {
@@ -237,8 +238,8 @@ void PropEditCtrlFile::OnDetails()
     {
         while (axrc[0] == afile[0])
         {
-            afile.Remove(0u);
-            axrc.Remove(0u);
+            afile.RemoveAt(0u);
+            axrc.RemoveAt(0u);
         }
         size_t i;
         txt.Empty();
@@ -255,9 +256,5 @@ void PropEditCtrlFile::OnDetails()
 
 wxString PropEditCtrlImageFile::GetFileTypes()
 {
-    return _("GIF files (*.gif)|*.gif|"
-             "JPEG files (*.jpg)|*.jpg|"
-             "PNG files (*.png)|*.png|"
-             "BMP files (*.bmp)|*.bmp|"
-             "All files (*)|*");
+    return _("GIF files (*.gif)|*.gif|JPEG files (*.jpg)|*.jpg|PNG files (*.png)|*.png|BMP files (*.bmp)|*.bmp|All files (*)|*");
 }