applied modified patch #424894 (wxrcedit & bcc compilation fixes)

git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@10214 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775

diff --git a/contrib/utils/wxrcedit/nodesdb.cpp b/contrib/utils/wxrcedit/nodesdb.cpp
index f36e6ed4c5895530e7aad78a871f391835ae45ce..53a9a9595cd1e62e68121f5ad35e43d5a65faac2 100644 (file)
--- a/contrib/utils/wxrcedit/nodesdb.cpp
+++ b/contrib/utils/wxrcedit/nodesdb.cpp
@@ -49,7 +49,7 @@ void NodeInfo::Read(const wxString& filename, wxPathList& list)
 
     for (size_t i = 0; i < tf.GetLineCount(); i++)
     {
-        if (tf[i].IsEmpty() || tf[i][0] == _T('#')) continue;
+        if (tf[i].IsEmpty() || tf[i][0u] == _T('#')) continue;
         wxStringTokenizer tkn(tf[i], _T(' '));
         wxString s = tkn.GetNextToken();
         if (s == _T("node"))

diff --git a/contrib/utils/wxrcedit/pe_adv.cpp b/contrib/utils/wxrcedit/pe_adv.cpp
index c5776cbb428e587f1c4b1a0c6b4381b2c4b56444..34443a2caee27a44efa947d7c0d0d2d78a4efa95 100644 (file)
--- a/contrib/utils/wxrcedit/pe_adv.cpp
+++ b/contrib/utils/wxrcedit/pe_adv.cpp
@@ -113,7 +113,7 @@ 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, 

diff --git a/contrib/utils/wxrcedit/preview.cpp b/contrib/utils/wxrcedit/preview.cpp
index 89dcaa30aebeb4f6d004c28615c3233bcb669e52..b3d23b6a64742fcda431aa6a8635cd331b37264a 100644 (file)
--- a/contrib/utils/wxrcedit/preview.cpp
+++ b/contrib/utils/wxrcedit/preview.cpp
@@ -96,7 +96,9 @@ PreviewFrame::PreviewFrame()
 
     CreateStatusBar();
 
-    SetSize(GetSize()); // refresh: MSW needs it
+#ifdef __WXMSW__
+    SendSizeEvent(); // force resize for WXMSW
+#endif
 }
 
 

diff --git a/contrib/utils/wxrcedit/propedit.h b/contrib/utils/wxrcedit/propedit.h
index 712035943cb46d1164d3bfcf93912e619b53d5f6..04ff9c577d7650ef5a90032676ebfe70078a84ed 100644 (file)
--- a/contrib/utils/wxrcedit/propedit.h
+++ b/contrib/utils/wxrcedit/propedit.h
@@ -15,7 +15,7 @@
 #define _PROPEDIT_H_
 
 #include "wx/panel.h"
-#include "wx/treectrl.h"
+#include "wx/generic/treectlg.h"
 #include "nodesdb.h"
 #include "propframe.h"