X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/bd5206ddbc5510ee880fe82fb4780fd4f53bd6e7..76f1eb7e1f6be1d53c81fd3fa6ebb6f9c9b689b7:/samples/docview/doc.cpp?ds=sidebyside diff --git a/samples/docview/doc.cpp b/samples/docview/doc.cpp index 7bee849656..87a24dad4e 100644 --- a/samples/docview/doc.cpp +++ b/samples/docview/doc.cpp @@ -9,10 +9,6 @@ // Licence: wxWindows license ///////////////////////////////////////////////////////////////////////////// -#ifdef __GNUG__ -// #pragma implementation -#endif - // For compilers that support precompilation, includes "wx/wx.h". #include "wx/wxprec.h" @@ -23,11 +19,16 @@ #ifndef WX_PRECOMP #include "wx/wx.h" #endif -#include "wx/txtstrm.h" #ifdef __WXMAC__ #include "wx/filename.h" #endif +#if wxUSE_STD_IOSTREAM + #include "wx/ioswrap.h" +#else + #include "wx/txtstrm.h" +#endif + #if !wxUSE_DOC_VIEW_ARCHITECTURE #error You must set wxUSE_DOC_VIEW_ARCHITECTURE to 1 in setup.h! #endif @@ -36,10 +37,6 @@ #include "view.h" IMPLEMENT_DYNAMIC_CLASS(DrawingDocument, wxDocument) -DrawingDocument::DrawingDocument(void) -{ -} - DrawingDocument::~DrawingDocument(void) { WX_CLEAR_LIST(wxList, doodleSegments); @@ -49,42 +46,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,45 +90,41 @@ 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) +DoodleSegment::DoodleSegment(const DoodleSegment& seg):wxObject() { wxList::compatibility_iterator node = seg.lines.GetFirst(); while (node) @@ -142,9 +135,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 +152,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'); - + 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 +194,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 @@ -252,7 +245,7 @@ void DoodleSegment::Draw(wxDC *dc) */ DrawingCommand::DrawingCommand(const wxString& name, int command, DrawingDocument *ddoc, DoodleSegment *seg): -wxCommand(TRUE, name) +wxCommand(true, name) { doc = ddoc; segment = seg; @@ -277,11 +270,11 @@ 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->Modify(true); doc->UpdateAllViews(); } break; @@ -289,12 +282,12 @@ bool DrawingCommand::Do(void) case DOODLE_ADD: { doc->GetDoodleSegments().Append(new DoodleSegment(*segment)); - doc->Modify(TRUE); + doc->Modify(true); doc->UpdateAllViews(); break; } } - return TRUE; + return true; } bool DrawingCommand::Undo(void) @@ -307,11 +300,11 @@ bool DrawingCommand::Undo(void) if (segment) { doc->GetDoodleSegments().Append(segment); - doc->Modify(TRUE); + doc->Modify(true); doc->UpdateAllViews(); segment = (DoodleSegment *) NULL; } - doc->Modify(TRUE); + doc->Modify(true); doc->UpdateAllViews(); break; } @@ -324,13 +317,13 @@ bool DrawingCommand::Undo(void) DoodleSegment *seg = (DoodleSegment *)node->GetData(); delete seg; doc->GetDoodleSegments().Erase(node); - - doc->Modify(TRUE); + + doc->Modify(true); doc->UpdateAllViews(); } } } - return TRUE; + return true; } IMPLEMENT_DYNAMIC_CLASS(TextEditDocument, wxDocument) @@ -340,27 +333,27 @@ IMPLEMENT_DYNAMIC_CLASS(TextEditDocument, wxDocument) bool TextEditDocument::OnSaveDocument(const wxString& filename) { TextEditView *view = (TextEditView *)GetFirstView(); - + if (!view->textsw->SaveFile(filename)) - return FALSE; - Modify(FALSE); + return false; + Modify(false); #ifdef __WXMAC__ wxFileName fn(filename) ; fn.MacSetDefaultTypeAndCreator() ; #endif - return TRUE; + return true; } bool TextEditDocument::OnOpenDocument(const wxString& filename) { TextEditView *view = (TextEditView *)GetFirstView(); if (!view->textsw->LoadFile(filename)) - return FALSE; - - SetFilename(filename, TRUE); - Modify(FALSE); + return false; + + SetFilename(filename, true); + Modify(false); UpdateAllViews(); - return TRUE; + return true; } bool TextEditDocument::IsModified(void) const @@ -377,9 +370,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(); }