X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/dd107c50be43e8d4dbdba20df162faf119a3781c..c8333fe80045f7eae7f23e5d0cb12ca75f7b7779:/samples/docview/doc.h?ds=sidebyside diff --git a/samples/docview/doc.h b/samples/docview/doc.h index eed0e8dec5..af9b272fbe 100644 --- a/samples/docview/doc.h +++ b/samples/docview/doc.h @@ -5,18 +5,15 @@ // Modified by: // Created: 04/01/98 // RCS-ID: $Id$ -// Copyright: (c) Julian Smart and Markus Holzem -// Licence: wxWindows license +// Copyright: (c) Julian Smart +// Licence: wxWindows license ///////////////////////////////////////////////////////////////////////////// -#ifdef __GNUG__ -// #pragma interface -#endif - #ifndef __DOCSAMPLEH__ #define __DOCSAMPLEH__ #include "wx/docview.h" +#include "wx/cmdproc.h" // Plots a line from one point to the other class DoodleLine: public wxObject @@ -33,11 +30,11 @@ class DoodleSegment: public wxObject { public: wxList lines; - - DoodleSegment(void); - DoodleSegment(DoodleSegment& seg); + + DoodleSegment(void){}; + DoodleSegment(const DoodleSegment& seg); ~DoodleSegment(void); - + void Draw(wxDC *dc); #if wxUSE_STD_IOSTREAM wxSTD ostream& SaveObject(wxSTD ostream& text_stream); @@ -46,7 +43,7 @@ public: wxOutputStream& SaveObject(wxOutputStream& stream); wxInputStream& LoadObject(wxInputStream& stream); #endif - + }; class DrawingDocument: public wxDocument @@ -55,10 +52,10 @@ class DrawingDocument: public wxDocument private: public: wxList doodleSegments; - - DrawingDocument(void); + + DrawingDocument(void){}; ~DrawingDocument(void); - + #if wxUSE_STD_IOSTREAM wxSTD ostream& SaveObject(wxSTD ostream& text_stream); wxSTD istream& LoadObject(wxSTD istream& text_stream); @@ -66,7 +63,7 @@ public: wxOutputStream& SaveObject(wxOutputStream& stream); wxInputStream& LoadObject(wxInputStream& stream); #endif - + inline wxList& GetDoodleSegments(void) const { return (wxList&) doodleSegments; }; }; @@ -82,7 +79,7 @@ protected: public: DrawingCommand(const wxString& name, int cmd, DrawingDocument *ddoc, DoodleSegment *seg); ~DrawingCommand(void); - + bool Do(void); bool Undo(void); }; @@ -100,7 +97,7 @@ wxSTD istream& LoadObject(wxSTD istream& stream); virtual bool OnOpenDocument(const wxString& filename); virtual bool IsModified(void) const; virtual void Modify(bool mod); - + TextEditDocument(void) {} ~TextEditDocument(void) {} };