Amebis/wxWidgets
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Corrections for wxUSE_STL=1

Browse Source 
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@35985 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
This commit is contained in:
Julian Smart
2005-10-22 11:40:32 +00:00
parent 4708068cb6
commit 09f1410821
2 changed files with 12 additions and 12 deletions
Download Patch File Download Diff File Expand all files Collapse all files

18
src/richtext/richtextbuffer.cpp
View File

@@ -568,7 +568,7 @@ bool wxRichTextParagraphLayoutBox::Layout(wxDC& dc, const wxRect& rect, int styl
if (firstParagraph)
{
wxRichTextObjectList::compatibility_iterator firstNode = m_children.Find(firstParagraph);
wxRichTextObjectList::compatibility_iterator previousNode = firstNode ? firstNode->GetPrevious() : (wxRichTextObjectList::compatibility_iterator) NULL;
wxRichTextObjectList::compatibility_iterator previousNode = firstNode ? firstNode->GetPrevious() : wxRichTextObjectList::compatibility_iterator();
if (firstNode && previousNode)
{
wxRichTextParagraph* previousParagraph = wxDynamicCast(previousNode->GetData(), wxRichTextParagraph);
@@ -657,8 +657,8 @@ bool wxRichTextParagraphLayoutBox::GetRangeSize(const wxRichTextRange& range, wx
{
wxSize sz;
wxRichTextObjectList::compatibility_iterator startPara = NULL;
wxRichTextObjectList::compatibility_iterator endPara = NULL;
wxRichTextObjectList::compatibility_iterator startPara = wxRichTextObjectList::compatibility_iterator();
wxRichTextObjectList::compatibility_iterator endPara = wxRichTextObjectList::compatibility_iterator();
// First find the first paragraph whose starting position is within the range.
wxRichTextObjectList::compatibility_iterator node = m_children.GetFirst();
@@ -2229,7 +2229,7 @@ void wxRichTextParagraph::ApplyParagraphStyle(const wxRect& rect)
bool wxRichTextParagraph::InsertText(long pos, const wxString& text)
{
wxRichTextObject* childToUse = NULL;
wxRichTextObjectList::compatibility_iterator nodeToUse = NULL;
wxRichTextObjectList::compatibility_iterator nodeToUse = wxRichTextObjectList::compatibility_iterator();
wxRichTextObjectList::compatibility_iterator node = m_children.GetFirst();
while (node)
@@ -2640,7 +2640,7 @@ void wxRichTextParagraph::MoveToList(wxRichTextObject* obj, wxList& list)
/// Add content back from list
void wxRichTextParagraph::MoveFromList(wxList& list)
{
for (wxNode* node = list.GetFirst(); node; node = node->GetNext())
for (wxList::compatibility_iterator node = list.GetFirst(); node; node = node->GetNext())
{
AppendChild((wxRichTextObject*) node->GetData());
}
@@ -3416,7 +3416,7 @@ bool wxRichTextBuffer::EndStyle()
return false;
}
wxNode* node = m_attributeStack.GetLast();
wxList::compatibility_iterator node = m_attributeStack.GetLast();
wxTextAttrEx* attr = (wxTextAttrEx*)node->GetData();
m_attributeStack.Erase(node);
@@ -3437,7 +3437,7 @@ bool wxRichTextBuffer::EndAllStyles()
/// Clear the style stack
void wxRichTextBuffer::ClearStyleStack()
{
for (wxNode* node = m_attributeStack.GetFirst(); node; node = node->GetNext())
for (wxList::compatibility_iterator node = m_attributeStack.GetFirst(); node; node = node->GetNext())
delete (wxTextAttrEx*) node->GetData();
m_attributeStack.Clear();
}
@@ -3964,7 +3964,7 @@ void wxRichTextCommand::AddAction(wxRichTextAction* action)
bool wxRichTextCommand::Do()
{
for (wxNode* node = m_actions.GetFirst(); node; node = node->GetNext())
for (wxList::compatibility_iterator node = m_actions.GetFirst(); node; node = node->GetNext())
{
wxRichTextAction* action = (wxRichTextAction*) node->GetData();
action->Do();
@@ -3975,7 +3975,7 @@ bool wxRichTextCommand::Do()
bool wxRichTextCommand::Undo()
{
for (wxNode* node = m_actions.GetLast(); node; node = node->GetPrevious())
for (wxList::compatibility_iterator node = m_actions.GetLast(); node; node = node->GetPrevious())
{
wxRichTextAction* action = (wxRichTextAction*) node->GetData();
action->Undo();

6
src/richtext/richtextstyles.cpp
View File

@@ -58,11 +58,11 @@ bool wxRichTextStyleSheet::AddStyle(wxList& list, wxRichTextStyleDefinition* def
/// Remove a style
bool wxRichTextStyleSheet::RemoveStyle(wxList& list, wxRichTextStyleDefinition* def, bool deleteStyle)
{
wxNode* node = list.Find(def);
wxList::compatibility_iterator node = list.Find(def);
if (node)
{
wxRichTextStyleDefinition* def = (wxRichTextStyleDefinition*) node->GetData();
delete node;
list.Erase(node);
if (deleteStyle)
delete def;
return true;
@@ -74,7 +74,7 @@ bool wxRichTextStyleSheet::RemoveStyle(wxList& list, wxRichTextStyleDefinition*
/// Find a definition by name
wxRichTextStyleDefinition* wxRichTextStyleSheet::FindStyle(const wxList& list, const wxString& name) const
{
for (wxNode* node = list.GetFirst(); node; node = node->GetNext())
for (wxList::compatibility_iterator node = list.GetFirst(); node; node = node->GetNext())
{
wxRichTextStyleDefinition* def = (wxRichTextStyleDefinition*) node->GetData();
if (def->GetName().Lower() == name.Lower())