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

Compilation fixes for wxUSE_STL=1.

Browse Source 
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@22093 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
This commit is contained in:
Mattia Barbon
2003-07-18 19:52:15 +00:00
parent e589896152
commit bd5206ddbc
4 changed files with 26 additions and 26 deletions
Download Patch File Download Diff File Expand all files Collapse all files

24
samples/docview/doc.cpp
View File

@@ -42,7 +42,7 @@ DrawingDocument::DrawingDocument(void)
DrawingDocument::~DrawingDocument(void) DrawingDocument::~DrawingDocument(void)
{ {
doodleSegments.DeleteContents(TRUE); WX_CLEAR_LIST(wxList, doodleSegments);
} }
#if wxUSE_STD_IOSTREAM #if wxUSE_STD_IOSTREAM
@@ -53,7 +53,7 @@ wxSTD ostream& DrawingDocument::SaveObject(wxSTD ostream& stream)
wxInt32 n = doodleSegments.GetCount(); wxInt32 n = doodleSegments.GetCount();
stream << n << '\n'; stream << n << '\n';
wxNode *node = doodleSegments.GetFirst(); wxList::compatibility_iterator node = doodleSegments.GetFirst();
while (node) while (node)
{ {
DoodleSegment *segment = (DoodleSegment *)node->GetData(); DoodleSegment *segment = (DoodleSegment *)node->GetData();
@@ -75,7 +75,7 @@ wxOutputStream& DrawingDocument::SaveObject(wxOutputStream& stream)
wxInt32 n = doodleSegments.GetCount(); wxInt32 n = doodleSegments.GetCount();
text_stream << n << '\n'; text_stream << n << '\n';
wxNode *node = doodleSegments.GetFirst(); wxList::compatibility_iterator node = doodleSegments.GetFirst();
while (node) while (node)
{ {
DoodleSegment *segment = (DoodleSegment *)node->GetData(); DoodleSegment *segment = (DoodleSegment *)node->GetData();
@@ -133,7 +133,7 @@ DoodleSegment::DoodleSegment(void)
DoodleSegment::DoodleSegment(DoodleSegment& seg) DoodleSegment::DoodleSegment(DoodleSegment& seg)
{ {
wxNode *node = seg.lines.GetFirst(); wxList::compatibility_iterator node = seg.lines.GetFirst();
while (node) while (node)
{ {
DoodleLine *line = (DoodleLine *)node->GetData(); DoodleLine *line = (DoodleLine *)node->GetData();
@@ -151,7 +151,7 @@ DoodleSegment::DoodleSegment(DoodleSegment& seg)
DoodleSegment::~DoodleSegment(void) DoodleSegment::~DoodleSegment(void)
{ {
lines.DeleteContents(TRUE); WX_CLEAR_LIST(wxList, lines);
} }
#if wxUSE_STD_IOSTREAM #if wxUSE_STD_IOSTREAM
@@ -160,7 +160,7 @@ wxSTD ostream& DoodleSegment::SaveObject(wxSTD ostream& stream)
wxInt32 n = lines.GetCount(); wxInt32 n = lines.GetCount();
stream << n << '\n'; stream << n << '\n';
wxNode *node = lines.GetFirst(); wxList::compatibility_iterator node = lines.GetFirst();
while (node) while (node)
{ {
DoodleLine *line = (DoodleLine *)node->GetData(); DoodleLine *line = (DoodleLine *)node->GetData();
@@ -181,7 +181,7 @@ wxOutputStream &DoodleSegment::SaveObject(wxOutputStream& stream)
wxInt32 n = lines.GetCount(); wxInt32 n = lines.GetCount();
text_stream << n << _T('\n'); text_stream << n << _T('\n');
wxNode *node = lines.GetFirst(); wxList::compatibility_iterator node = lines.GetFirst();
while (node) while (node)
{ {
DoodleLine *line = (DoodleLine *)node->GetData(); DoodleLine *line = (DoodleLine *)node->GetData();
@@ -238,7 +238,7 @@ wxInputStream &DoodleSegment::LoadObject(wxInputStream& stream)
void DoodleSegment::Draw(wxDC *dc) void DoodleSegment::Draw(wxDC *dc)
{ {
wxNode *node = lines.GetFirst(); wxList::compatibility_iterator node = lines.GetFirst();
while (node) while (node)
{ {
DoodleLine *line = (DoodleLine *)node->GetData(); DoodleLine *line = (DoodleLine *)node->GetData();
@@ -274,12 +274,12 @@ bool DrawingCommand::Do(void)
// Cut the last segment // Cut the last segment
if (doc->GetDoodleSegments().GetCount() > 0) if (doc->GetDoodleSegments().GetCount() > 0)
{ {
wxNode *node = doc->GetDoodleSegments().GetLast(); wxList::compatibility_iterator node = doc->GetDoodleSegments().GetLast();
if (segment) if (segment)
delete segment; delete segment;
segment = (DoodleSegment *)node->GetData(); segment = (DoodleSegment *)node->GetData();
delete node; doc->GetDoodleSegments().Erase(node);
doc->Modify(TRUE); doc->Modify(TRUE);
doc->UpdateAllViews(); doc->UpdateAllViews();
@@ -320,10 +320,10 @@ bool DrawingCommand::Undo(void)
// Cut the last segment // Cut the last segment
if (doc->GetDoodleSegments().GetCount() > 0) if (doc->GetDoodleSegments().GetCount() > 0)
{ {
wxNode *node = doc->GetDoodleSegments().GetLast(); wxList::compatibility_iterator node = doc->GetDoodleSegments().GetLast();
DoodleSegment *seg = (DoodleSegment *)node->GetData(); DoodleSegment *seg = (DoodleSegment *)node->GetData();
delete seg; delete seg;
delete node; doc->GetDoodleSegments().Erase(node);
doc->Modify(TRUE); doc->Modify(TRUE);
doc->UpdateAllViews(); doc->UpdateAllViews();

2
samples/docview/view.cpp
View File

@@ -90,7 +90,7 @@ void DrawingView::OnDraw(wxDC *dc)
dc->SetFont(*wxNORMAL_FONT); dc->SetFont(*wxNORMAL_FONT);
dc->SetPen(*wxBLACK_PEN); dc->SetPen(*wxBLACK_PEN);
wxNode *node = ((DrawingDocument *)GetDocument())->GetDoodleSegments().GetFirst(); wxList::compatibility_iterator node = ((DrawingDocument *)GetDocument())->GetDoodleSegments().GetFirst();
while (node) while (node)
{ {
DoodleSegment *seg = (DoodleSegment *)node->GetData(); DoodleSegment *seg = (DoodleSegment *)node->GetData();

24
samples/docvwmdi/doc.cpp
View File

@@ -40,7 +40,7 @@ DrawingDocument::DrawingDocument(void)
DrawingDocument::~DrawingDocument(void) DrawingDocument::~DrawingDocument(void)
{ {
doodleSegments.DeleteContents(TRUE); WX_CLEAR_LIST(wxList, doodleSegments);
} }
#if wxUSE_STD_IOSTREAM #if wxUSE_STD_IOSTREAM
@@ -51,7 +51,7 @@ wxSTD ostream& DrawingDocument::SaveObject(wxSTD ostream& stream)
wxInt32 n = doodleSegments.GetCount(); wxInt32 n = doodleSegments.GetCount();
stream << n << _T('\n'); stream << n << _T('\n');
wxNode *node = doodleSegments.GetFirst(); wxList::compatibility_iterator node = doodleSegments.GetFirst();
while (node) while (node)
{ {
DoodleSegment *segment = (DoodleSegment *)node->GetData(); DoodleSegment *segment = (DoodleSegment *)node->GetData();
@@ -73,7 +73,7 @@ wxOutputStream& DrawingDocument::SaveObject(wxOutputStream& stream)
wxInt32 n = doodleSegments.GetCount(); wxInt32 n = doodleSegments.GetCount();
text_stream << n << _T('\n'); text_stream << n << _T('\n');
wxNode *node = doodleSegments.GetFirst(); wxList::compatibility_iterator node = doodleSegments.GetFirst();
while (node) while (node)
{ {
DoodleSegment *segment = (DoodleSegment *)node->GetData(); DoodleSegment *segment = (DoodleSegment *)node->GetData();
@@ -130,7 +130,7 @@ DoodleSegment::DoodleSegment(void)
DoodleSegment::DoodleSegment(DoodleSegment& seg) DoodleSegment::DoodleSegment(DoodleSegment& seg)
{ {
wxNode *node = seg.lines.GetFirst(); wxList::compatibility_iterator node = seg.lines.GetFirst();
while (node) while (node)
{ {
DoodleLine *line = (DoodleLine *)node->GetData(); DoodleLine *line = (DoodleLine *)node->GetData();
@@ -148,7 +148,7 @@ DoodleSegment::DoodleSegment(DoodleSegment& seg)
DoodleSegment::~DoodleSegment(void) DoodleSegment::~DoodleSegment(void)
{ {
lines.DeleteContents(TRUE); WX_CLEAR_LIST(wxList, lines);
} }
#if wxUSE_STD_IOSTREAM #if wxUSE_STD_IOSTREAM
@@ -157,7 +157,7 @@ wxSTD ostream& DoodleSegment::SaveObject(wxSTD ostream& stream)
wxInt32 n = lines.GetCount(); wxInt32 n = lines.GetCount();
stream << n << _T('\n'); stream << n << _T('\n');
wxNode *node = lines.GetFirst(); wxList::compatibility_iterator node = lines.GetFirst();
while (node) while (node)
{ {
DoodleLine *line = (DoodleLine *)node->GetData(); DoodleLine *line = (DoodleLine *)node->GetData();
@@ -178,7 +178,7 @@ wxOutputStream &DoodleSegment::SaveObject(wxOutputStream& stream)
wxInt32 n = lines.GetCount(); wxInt32 n = lines.GetCount();
text_stream << n << _T('\n'); text_stream << n << _T('\n');
wxNode *node = lines.GetFirst(); wxList::compatibility_iterator node = lines.GetFirst();
while (node) while (node)
{ {
DoodleLine *line = (DoodleLine *)node->GetData(); DoodleLine *line = (DoodleLine *)node->GetData();
@@ -234,7 +234,7 @@ wxInputStream &DoodleSegment::LoadObject(wxInputStream& stream)
#endif #endif
void DoodleSegment::Draw(wxDC *dc) void DoodleSegment::Draw(wxDC *dc)
{ {
wxNode *node = lines.GetFirst(); wxList::compatibility_iterator node = lines.GetFirst();
while (node) while (node)
{ {
DoodleLine *line = (DoodleLine *)node->GetData(); DoodleLine *line = (DoodleLine *)node->GetData();
@@ -270,12 +270,12 @@ bool DrawingCommand::Do(void)
// Cut the last segment // Cut the last segment
if (doc->GetDoodleSegments().GetCount() > 0) if (doc->GetDoodleSegments().GetCount() > 0)
{ {
wxNode *node = doc->GetDoodleSegments().GetLast(); wxList::compatibility_iterator node = doc->GetDoodleSegments().GetLast();
if (segment) if (segment)
delete segment; delete segment;
segment = (DoodleSegment *)node->GetData(); segment = (DoodleSegment *)node->GetData();
delete node; doc->GetDoodleSegments().Erase(node);
doc->Modify(TRUE); doc->Modify(TRUE);
doc->UpdateAllViews(); doc->UpdateAllViews();
@@ -316,10 +316,10 @@ bool DrawingCommand::Undo(void)
// Cut the last segment // Cut the last segment
if (doc->GetDoodleSegments().GetCount() > 0) if (doc->GetDoodleSegments().GetCount() > 0)
{ {
wxNode *node = doc->GetDoodleSegments().GetLast(); wxList::compatibility_iterator node = doc->GetDoodleSegments().GetLast();
DoodleSegment *seg = (DoodleSegment *)node->GetData(); DoodleSegment *seg = (DoodleSegment *)node->GetData();
delete seg; delete seg;
delete node; doc->GetDoodleSegments().Erase(node);
doc->Modify(TRUE); doc->Modify(TRUE);
doc->UpdateAllViews(); doc->UpdateAllViews();

2
samples/docvwmdi/view.cpp
View File

@@ -69,7 +69,7 @@ void DrawingView::OnDraw(wxDC *dc)
dc->SetFont(*wxNORMAL_FONT); dc->SetFont(*wxNORMAL_FONT);
dc->SetPen(*wxBLACK_PEN); dc->SetPen(*wxBLACK_PEN);
wxNode *node = ((DrawingDocument *)GetDocument())->GetDoodleSegments().GetFirst(); wxList::compatibility_iterator node = ((DrawingDocument *)GetDocument())->GetDoodleSegments().GetFirst();
while (node) while (node)
{ {
DoodleSegment *seg = (DoodleSegment *)node->GetData(); DoodleSegment *seg = (DoodleSegment *)node->GetData();