From 0d832cf788ed66b3b4286c2eaddad8ee1bf964b0 Mon Sep 17 00:00:00 2001
From: =?utf8?q?V=C3=A1clav=20Slav=C3=ADk?= <vslavik@fastmail.fm>
Date: Fri, 18 May 2001 18:34:34 +0000
Subject: [PATCH] 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
---
 contrib/utils/wxrcedit/nodesdb.cpp | 2 +-
 contrib/utils/wxrcedit/pe_adv.cpp  | 2 +-
 contrib/utils/wxrcedit/preview.cpp | 4 +++-
 contrib/utils/wxrcedit/propedit.h  | 2 +-
 4 files changed, 6 insertions(+), 4 deletions(-)

diff --git a/contrib/utils/wxrcedit/nodesdb.cpp b/contrib/utils/wxrcedit/nodesdb.cpp
index f36e6ed4c5..53a9a9595c 100644
--- 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 c5776cbb42..34443a2cae 100644
--- 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 89dcaa30ae..b3d23b6a64 100644
--- 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 712035943c..04ff9c577d 100644
--- 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"
 
-- 
2.45.2