makefiles update

[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 7d9c16777d27ed11698378bb9aa6f66b1a85722b..4f7b59f398e0cddce4104b9e2f19fab229291a5e 100644 (file)
--- a/contrib/utils/wxrcedit/pe_adv.cpp
+++ b/contrib/utils/wxrcedit/pe_adv.cpp
@@ -18,7 +18,7 @@
 #endif
 
 #include "wx/wx.h"
-#include "wx/xrc/xml.h"
+#include "wx/xml/xml.h"
 #include "wx/tokenzr.h"
 #include "wx/wx.h"
 #include "wx/dialog.h"
@@ -94,7 +94,7 @@ void PropEditCtrlChoice::WriteValue()
 
 
 
-void PropEditCtrlChoice::OnChoice(wxCommandEvent& event)
+void PropEditCtrlChoice::OnChoice(wxCommandEvent& WXUNUSED(event))
 {
     if (CanSave()) 
     {
@@ -118,6 +118,7 @@ void PropEditCtrlColor::OnDetails()
         clr = wxColour((tmp & 0xFF0000) >> 16, 
                        (tmp & 0x00FF00) >> 8, 
                        (tmp & 0x0000FF));
+
     clr = wxGetColourFromUser(NULL, clr);
     if (clr.Ok())
     {
@@ -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 (*)|*");
 }