Committing in .

[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 9c570d096bb137a8364b8686cf6f35212b207f70..e4e45dfc810aa88f9e4cae3f2d51486a252cdf25 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"
 #endif
 
 #include "wx/wx.h"

-#include "wx/xml/xml.h"
+#include "wx/xrc/xml.h"

 #include "wx/tokenzr.h"
 #include "wx/wx.h"
 #include "wx/dialog.h"
 #include "wx/tokenzr.h"
 #include "wx/wx.h"
 #include "wx/dialog.h"


@@ -113,11 +113,12 @@ void PropEditCtrlColor::OnDetails()
     wxString txt = m_TextCtrl->GetValue();
     long unsigned tmp;
     
     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));
         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())
     {
     clr = wxGetColourFromUser(NULL, clr);
     if (clr.Ok())
     {


@@ -165,6 +166,7 @@ void PropEditCtrlFlags::OnDetails()
 
     dlg.SetSizer(sz);
     dlg.SetAutoLayout(TRUE);
 
     dlg.SetSizer(sz);
     dlg.SetAutoLayout(TRUE);

+    dlg.Layout();

     
     for (i = 0; i < arr.GetCount(); i++)
         lbox->Append(arr[i]);
     
     for (i = 0; i < arr.GetCount(); i++)
         lbox->Append(arr[i]);


@@ -236,8 +238,8 @@ void PropEditCtrlFile::OnDetails()
     {
         while (axrc[0] == afile[0])
         {
     {
         while (axrc[0] == afile[0])
         {

-            afile.Remove(0u);
-            axrc.Remove(0u);
+            afile.RemoveAt(0u);
+            axrc.RemoveAt(0u);

         }
         size_t i;
         txt.Empty();
         }
         size_t i;
         txt.Empty();