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

102
samples/docview/doc.cpp
View File

@@ -36,10 +36,6 @@
#include "view.h"
IMPLEMENT_DYNAMIC_CLASS(DrawingDocument, wxDocument)
DrawingDocument::DrawingDocument(void)
{
}
DrawingDocument::~DrawingDocument(void)
{
WX_CLEAR_LIST(wxList, doodleSegments);
@@ -49,42 +45,42 @@ DrawingDocument::~DrawingDocument(void)
wxSTD ostream& DrawingDocument::SaveObject(wxSTD ostream& stream)
{
wxDocument::SaveObject(stream);
wxInt32 n = doodleSegments.GetCount();
stream << n << '\n';
wxList::compatibility_iterator node = doodleSegments.GetFirst();
while (node)
{
DoodleSegment *segment = (DoodleSegment *)node->GetData();
segment->SaveObject(stream);
stream << '\n';
node = node->GetNext();
}
return stream;
}
#else
wxOutputStream& DrawingDocument::SaveObject(wxOutputStream& stream)
{
wxDocument::SaveObject(stream);
wxTextOutputStream text_stream( stream );
wxInt32 n = doodleSegments.GetCount();
text_stream << n << '\n';
wxList::compatibility_iterator node = doodleSegments.GetFirst();
while (node)
{
DoodleSegment *segment = (DoodleSegment *)node->GetData();
segment->SaveObject(stream);
text_stream << '\n';
node = node->GetNext();
}
return stream;
}
#endif
@@ -93,44 +89,40 @@ wxOutputStream& DrawingDocument::SaveObject(wxOutputStream& stream)
wxSTD istream& DrawingDocument::LoadObject(wxSTD istream& stream)
{
wxDocument::LoadObject(stream);
wxInt32 n = 0;
stream >> n;
for (int i = 0; i < n; i++)
{
DoodleSegment *segment = new DoodleSegment;
segment->LoadObject(stream);
doodleSegments.Append(segment);
}
return stream;
}
#else
wxInputStream& DrawingDocument::LoadObject(wxInputStream& stream)
{
wxDocument::LoadObject(stream);
wxTextInputStream text_stream( stream );
wxInt32 n = 0;
text_stream >> n;
for (int i = 0; i < n; i++)
{
DoodleSegment *segment = new DoodleSegment;
segment->LoadObject(stream);
doodleSegments.Append(segment);
}
return stream;
}
#endif
DoodleSegment::DoodleSegment(void)
{
}
DoodleSegment::DoodleSegment(DoodleSegment& seg)
{
wxList::compatibility_iterator node = seg.lines.GetFirst();
@@ -142,9 +134,9 @@ DoodleSegment::DoodleSegment(DoodleSegment& seg)
newLine->y1 = line->y1;
newLine->x2 = line->x2;
newLine->y2 = line->y2;
lines.Append(newLine);
node = node->GetNext();
}
}
@@ -159,39 +151,39 @@ wxSTD ostream& DoodleSegment::SaveObject(wxSTD ostream& stream)
{
wxInt32 n = lines.GetCount();
stream << n << '\n';
wxList::compatibility_iterator node = lines.GetFirst();
while (node)
{
DoodleLine *line = (DoodleLine *)node->GetData();
stream << line->x1 << " " <<
line->y1 << " " <<
line->x2 << " " <<
stream << line->x1 << " " <<
line->y1 << " " <<
line->x2 << " " <<
line->y2 << "\n";
node = node->GetNext();
}
return stream;
}
#else
wxOutputStream &DoodleSegment::SaveObject(wxOutputStream& stream)
{
wxTextOutputStream text_stream( 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();
}
return stream;
}
#endif
@@ -201,37 +193,37 @@ wxSTD istream& DoodleSegment::LoadObject(wxSTD istream& stream)
{
wxInt32 n = 0;
stream >> n;
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
wxInputStream &DoodleSegment::LoadObject(wxInputStream& stream)
{
wxTextInputStream text_stream( stream );
wxInt32 n = 0;
text_stream >> n;
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
@@ -277,10 +269,10 @@ bool DrawingCommand::Do(void)
wxList::compatibility_iterator node = doc->GetDoodleSegments().GetLast();
if (segment)
delete segment;
segment = (DoodleSegment *)node->GetData();
doc->GetDoodleSegments().Erase(node);
doc->Modify(true);
doc->UpdateAllViews();
}
@@ -324,7 +316,7 @@ bool DrawingCommand::Undo(void)
DoodleSegment *seg = (DoodleSegment *)node->GetData();
delete seg;
doc->GetDoodleSegments().Erase(node);
doc->Modify(true);
doc->UpdateAllViews();
}
@@ -340,7 +332,7 @@ IMPLEMENT_DYNAMIC_CLASS(TextEditDocument, wxDocument)
bool TextEditDocument::OnSaveDocument(const wxString& filename)
{
TextEditView *view = (TextEditView *)GetFirstView();
if (!view->textsw->SaveFile(filename))
return false;
Modify(false);
@@ -356,7 +348,7 @@ bool TextEditDocument::OnOpenDocument(const wxString& filename)
TextEditView *view = (TextEditView *)GetFirstView();
if (!view->textsw->LoadFile(filename))
return false;
SetFilename(filename, true);
Modify(false);
UpdateAllViews();
@@ -377,9 +369,9 @@ bool TextEditDocument::IsModified(void) const
void TextEditDocument::Modify(bool mod)
{
TextEditView *view = (TextEditView *)GetFirstView();
wxDocument::Modify(mod);
if (!mod && view && view->textsw)
view->textsw->DiscardEdits();
}