merged 2.2 branch
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@7748 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
This commit is contained in:
@@ -21,53 +21,53 @@
|
||||
// Plots a line from one point to the other
|
||||
class DoodleLine: public wxObject
|
||||
{
|
||||
public:
|
||||
wxInt32 x1;
|
||||
wxInt32 y1;
|
||||
wxInt32 x2;
|
||||
wxInt32 y2;
|
||||
public:
|
||||
wxInt32 x1;
|
||||
wxInt32 y1;
|
||||
wxInt32 x2;
|
||||
wxInt32 y2;
|
||||
};
|
||||
|
||||
// Contains a list of lines: represents a mouse-down doodle
|
||||
class DoodleSegment: public wxObject
|
||||
{
|
||||
public:
|
||||
wxList lines;
|
||||
|
||||
DoodleSegment(void);
|
||||
DoodleSegment(DoodleSegment& seg);
|
||||
~DoodleSegment(void);
|
||||
|
||||
void Draw(wxDC *dc);
|
||||
public:
|
||||
wxList lines;
|
||||
|
||||
DoodleSegment(void);
|
||||
DoodleSegment(DoodleSegment& seg);
|
||||
~DoodleSegment(void);
|
||||
|
||||
void Draw(wxDC *dc);
|
||||
#if wxUSE_STD_IOSTREAM
|
||||
ostream& SaveObject(ostream& text_stream);
|
||||
istream& LoadObject(istream& text_stream);
|
||||
ostream& SaveObject(ostream& text_stream);
|
||||
istream& LoadObject(istream& text_stream);
|
||||
#else
|
||||
wxOutputStream& SaveObject(wxOutputStream& stream);
|
||||
wxInputStream& LoadObject(wxInputStream& stream);
|
||||
wxOutputStream& SaveObject(wxOutputStream& stream);
|
||||
wxInputStream& LoadObject(wxInputStream& stream);
|
||||
#endif
|
||||
|
||||
|
||||
};
|
||||
|
||||
class DrawingDocument: public wxDocument
|
||||
{
|
||||
DECLARE_DYNAMIC_CLASS(DrawingDocument)
|
||||
private:
|
||||
public:
|
||||
wxList doodleSegments;
|
||||
|
||||
DrawingDocument(void);
|
||||
~DrawingDocument(void);
|
||||
|
||||
DECLARE_DYNAMIC_CLASS(DrawingDocument)
|
||||
private:
|
||||
public:
|
||||
wxList doodleSegments;
|
||||
|
||||
DrawingDocument(void);
|
||||
~DrawingDocument(void);
|
||||
|
||||
#if wxUSE_STD_IOSTREAM
|
||||
ostream& SaveObject(ostream& text_stream);
|
||||
istream& LoadObject(istream& text_stream);
|
||||
ostream& SaveObject(ostream& text_stream);
|
||||
istream& LoadObject(istream& text_stream);
|
||||
#else
|
||||
wxOutputStream& SaveObject(wxOutputStream& stream);
|
||||
wxInputStream& LoadObject(wxInputStream& stream);
|
||||
wxOutputStream& SaveObject(wxOutputStream& stream);
|
||||
wxInputStream& LoadObject(wxInputStream& stream);
|
||||
#endif
|
||||
|
||||
inline wxList& GetDoodleSegments(void) const { return (wxList&) doodleSegments; };
|
||||
|
||||
inline wxList& GetDoodleSegments(void) const { return (wxList&) doodleSegments; };
|
||||
};
|
||||
|
||||
#define DOODLE_CUT 1
|
||||
@@ -75,34 +75,34 @@ class DrawingDocument: public wxDocument
|
||||
|
||||
class DrawingCommand: public wxCommand
|
||||
{
|
||||
protected:
|
||||
DoodleSegment *segment;
|
||||
DrawingDocument *doc;
|
||||
int cmd;
|
||||
public:
|
||||
DrawingCommand(const wxString& name, int cmd, DrawingDocument *ddoc, DoodleSegment *seg);
|
||||
~DrawingCommand(void);
|
||||
|
||||
bool Do(void);
|
||||
bool Undo(void);
|
||||
protected:
|
||||
DoodleSegment *segment;
|
||||
DrawingDocument *doc;
|
||||
int cmd;
|
||||
public:
|
||||
DrawingCommand(const wxString& name, int cmd, DrawingDocument *ddoc, DoodleSegment *seg);
|
||||
~DrawingCommand(void);
|
||||
|
||||
bool Do(void);
|
||||
bool Undo(void);
|
||||
};
|
||||
|
||||
class TextEditDocument: public wxDocument
|
||||
{
|
||||
DECLARE_DYNAMIC_CLASS(TextEditDocument)
|
||||
private:
|
||||
public:
|
||||
DECLARE_DYNAMIC_CLASS(TextEditDocument)
|
||||
private:
|
||||
public:
|
||||
/*
|
||||
ostream& SaveObject(ostream& stream);
|
||||
istream& LoadObject(istream& stream);
|
||||
*/
|
||||
virtual bool OnSaveDocument(const wxString& filename);
|
||||
virtual bool OnOpenDocument(const wxString& filename);
|
||||
virtual bool IsModified(void) const;
|
||||
virtual void Modify(bool mod);
|
||||
|
||||
TextEditDocument(void) {}
|
||||
~TextEditDocument(void) {}
|
||||
ostream& SaveObject(ostream& stream);
|
||||
istream& LoadObject(istream& stream);
|
||||
*/
|
||||
virtual bool OnSaveDocument(const wxString& filename);
|
||||
virtual bool OnOpenDocument(const wxString& filename);
|
||||
virtual bool IsModified(void) const;
|
||||
virtual void Modify(bool mod);
|
||||
|
||||
TextEditDocument(void) {}
|
||||
~TextEditDocument(void) {}
|
||||
};
|
||||
|
||||
|
||||
|
Reference in New Issue
Block a user