Applied patch #845402 ("RichEdit sample fixing and cleaning"); In addition made compilation with MSVC (nearly) warning free+some more cleaning up.
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@24613 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
This commit is contained in:
@@ -45,6 +45,7 @@ void wxLayoutImportText(wxLayoutList *list, wxString const &str)
|
||||
// VZ: I still don't like it... the string data may be shared...
|
||||
wxChar * cptr = (wxChar *)str.c_str(); // const_cast
|
||||
const wxChar * begin = cptr;
|
||||
wxUnusedVar(begin);
|
||||
wxChar backup;
|
||||
|
||||
for(;;)
|
||||
@@ -165,7 +166,7 @@ wxLayoutExportStatus::wxLayoutExportStatus(wxLayoutList *list)
|
||||
m_si = list->GetDefaultStyleInfo();
|
||||
m_line = list->GetFirstLine();
|
||||
m_iterator = m_line->GetFirstObject();
|
||||
m_FirstTime = TRUE;
|
||||
m_FirstTime = true;
|
||||
}
|
||||
|
||||
|
||||
@@ -215,6 +216,7 @@ wxLayoutExportObject *wxLayoutExport(wxLayoutExportStatus *status,
|
||||
else
|
||||
type = WXLO_TYPE_TEXT;
|
||||
}
|
||||
wxUnusedVar(type);
|
||||
|
||||
wxString *str = new wxString();
|
||||
// text must be concatenated
|
||||
@@ -250,7 +252,7 @@ wxLayoutExportObject *wxLayoutExport(wxLayoutExportStatus *status,
|
||||
*str += wxLayoutExportCmdAsHTML(
|
||||
*(wxLayoutObjectCmd const *)*status->m_iterator,
|
||||
& status->m_si, status->m_FirstTime);
|
||||
status->m_FirstTime = FALSE;
|
||||
status->m_FirstTime = false;
|
||||
break;
|
||||
default: // ignore icons
|
||||
;
|
||||
|
Reference in New Issue
Block a user