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

Warning fixes found under hardest mode of OpenWatcom. Seems clean in Borland, MinGW and DMC.

Browse Source 
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@29683 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
This commit is contained in:
Włodzimierz Skiba
2004-10-06 20:32:05 +00:00
parent 907173e51d
commit 958d3a7e4b
6 changed files with 97 additions and 116 deletions
Download Patch File Download Diff File Expand all files Collapse all files

57
samples/docvwmdi/doc.cpp
View File

@@ -34,10 +34,6 @@
IMPLEMENT_DYNAMIC_CLASS(DrawingDocument, wxDocument)
DrawingDocument::DrawingDocument(void)
{
}
DrawingDocument::~DrawingDocument(void)
{
WX_CLEAR_LIST(wxList, doodleSegments);
@@ -47,20 +43,20 @@ DrawingDocument::~DrawingDocument(void)
wxSTD ostream& DrawingDocument::SaveObject(wxSTD ostream& stream)
{
wxDocument::SaveObject(stream);
wxInt32 n = doodleSegments.GetCount();
stream << n << _T('\n');
wxList::compatibility_iterator node = doodleSegments.GetFirst();
while (node)
{
DoodleSegment *segment = (DoodleSegment *)node->GetData();
segment->SaveObject(stream);
stream << _T('\n');
node = node->GetNext();
}
return stream;
}
#else
@@ -72,17 +68,17 @@ wxOutputStream& DrawingDocument::SaveObject(wxOutputStream& stream)
wxInt32 n = doodleSegments.GetCount();
text_stream << n << _T('\n');
wxList::compatibility_iterator node = doodleSegments.GetFirst();
while (node)
{
DoodleSegment *segment = (DoodleSegment *)node->GetData();
segment->SaveObject(stream);
text_stream << _T('\n');
node = node->GetNext();
}
return stream;
}
#endif
@@ -91,7 +87,7 @@ wxOutputStream& DrawingDocument::SaveObject(wxOutputStream& stream)
wxSTD istream& DrawingDocument::LoadObject(wxSTD istream& stream)
{
wxDocument::LoadObject(stream);
wxInt32 n = 0;
stream >> n;
@@ -124,9 +120,6 @@ wxInputStream& DrawingDocument::LoadObject(wxInputStream& stream)
return stream;
}
#endif
DoodleSegment::DoodleSegment(void)
{
}
DoodleSegment::DoodleSegment(DoodleSegment& seg)
{
@@ -156,14 +149,14 @@ wxSTD ostream& DoodleSegment::SaveObject(wxSTD ostream& stream)
{
wxInt32 n = lines.GetCount();
stream << n << _T('\n');
wxList::compatibility_iterator node = lines.GetFirst();
while (node)
{
DoodleLine *line = (DoodleLine *)node->GetData();
stream << line->x1 << _T(" ") <<
line->y1 << _T(" ") <<
line->x2 << _T(" ") <<
stream << line->x1 << _T(" ") <<
line->y1 << _T(" ") <<
line->x2 << _T(" ") <<
line->y2 << _T("\n");
node = node->GetNext();
}
@@ -177,14 +170,14 @@ wxOutputStream &DoodleSegment::SaveObject(wxOutputStream& stream)
wxInt32 n = lines.GetCount();
text_stream << n << _T('\n');
wxList::compatibility_iterator node = lines.GetFirst();
while (node)
{
DoodleLine *line = (DoodleLine *)node->GetData();
text_stream << line->x1 << _T(" ") <<
line->y1 << _T(" ") <<
line->x2 << _T(" ") <<
text_stream << line->x1 << _T(" ") <<
line->y1 << _T(" ") <<
line->x2 << _T(" ") <<
line->y2 << _T("\n");
node = node->GetNext();
}
@@ -202,13 +195,13 @@ wxSTD istream& DoodleSegment::LoadObject(wxSTD istream& stream)
for (int i = 0; i < n; i++)
{
DoodleLine *line = new DoodleLine;
stream >> line->x1 >>
line->y1 >>
line->x2 >>
stream >> line->x1 >>
line->y1 >>
line->x2 >>
line->y2;
lines.Append(line);
}
return stream;
}
#else
@@ -222,13 +215,13 @@ wxInputStream &DoodleSegment::LoadObject(wxInputStream& stream)
for (int i = 0; i < n; i++)
{
DoodleLine *line = new DoodleLine;
text_stream >> line->x1 >>
line->y1 >>
line->x2 >>
text_stream >> line->x1 >>
line->y1 >>
line->x2 >>
line->y2;
lines.Append(line);
}
return stream;
}
#endif
@@ -273,7 +266,7 @@ bool DrawingCommand::Do(void)
wxList::compatibility_iterator node = doc->GetDoodleSegments().GetLast();
if (segment)
delete segment;
segment = (DoodleSegment *)node->GetData();
doc->GetDoodleSegments().Erase(node);