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
This commit is contained in:
Václav Slavík
2001-05-18 18:34:34 +00:00
parent 8e49dc6301
commit 0d832cf788
4 changed files with 6 additions and 4 deletions

View File

@@ -49,7 +49,7 @@ void NodeInfo::Read(const wxString& filename, wxPathList& list)
for (size_t i = 0; i < tf.GetLineCount(); i++) 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(' ')); wxStringTokenizer tkn(tf[i], _T(' '));
wxString s = tkn.GetNextToken(); wxString s = tkn.GetNextToken();
if (s == _T("node")) if (s == _T("node"))

View File

@@ -113,7 +113,7 @@ void PropEditCtrlColor::OnDetails()
wxString txt = m_TextCtrl->GetValue(); wxString txt = m_TextCtrl->GetValue();
long unsigned tmp; 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) wxSscanf(txt.c_str(), _T("#%lX"), &tmp) == 1)
clr = wxColour((tmp & 0xFF0000) >> 16, clr = wxColour((tmp & 0xFF0000) >> 16,
(tmp & 0x00FF00) >> 8, (tmp & 0x00FF00) >> 8,

View File

@@ -96,7 +96,9 @@ PreviewFrame::PreviewFrame()
CreateStatusBar(); CreateStatusBar();
SetSize(GetSize()); // refresh: MSW needs it #ifdef __WXMSW__
SendSizeEvent(); // force resize for WXMSW
#endif
} }

View File

@@ -15,7 +15,7 @@
#define _PROPEDIT_H_ #define _PROPEDIT_H_
#include "wx/panel.h" #include "wx/panel.h"
#include "wx/treectrl.h" #include "wx/generic/treectlg.h"
#include "nodesdb.h" #include "nodesdb.h"
#include "propframe.h" #include "propframe.h"