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:
parent
8e49dc6301
commit
0d832cf788
@ -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"))
|
||||
|
@ -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,
|
||||
|
@ -96,7 +96,9 @@ PreviewFrame::PreviewFrame()
|
||||
|
||||
CreateStatusBar();
|
||||
|
||||
SetSize(GetSize()); // refresh: MSW needs it
|
||||
#ifdef __WXMSW__
|
||||
SendSizeEvent(); // force resize for WXMSW
|
||||
#endif
|
||||
}
|
||||
|
||||
|
||||
|
@ -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"
|
||||
|
||||
|
Loading…
Reference in New Issue
Block a user