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:
Bryan Petty
@@ -40,88 +40,88 @@ DrawingDocument::DrawingDocument(void)
|
||||
|
||||
DrawingDocument::~DrawingDocument(void)
|
||||
{
|
||||
doodleSegments.DeleteContents(TRUE);
|
||||
doodleSegments.DeleteContents(TRUE);
|
||||
}
|
||||
|
||||
#if wxUSE_STD_IOSTREAM
|
||||
ostream& DrawingDocument::SaveObject(ostream& stream)
|
||||
{
|
||||
wxDocument::SaveObject(stream);
|
||||
|
||||
wxInt32 n = doodleSegments.Number();
|
||||
stream << n << '\n';
|
||||
|
||||
wxNode *node = doodleSegments.First();
|
||||
while (node)
|
||||
{
|
||||
DoodleSegment *segment = (DoodleSegment *)node->Data();
|
||||
segment->SaveObject(stream);
|
||||
stream << '\n';
|
||||
wxDocument::SaveObject(stream);
|
||||
|
||||
node = node->Next();
|
||||
}
|
||||
|
||||
return stream;
|
||||
wxInt32 n = doodleSegments.Number();
|
||||
stream << n << '\n';
|
||||
|
||||
wxNode *node = doodleSegments.First();
|
||||
while (node)
|
||||
{
|
||||
DoodleSegment *segment = (DoodleSegment *)node->Data();
|
||||
segment->SaveObject(stream);
|
||||
stream << '\n';
|
||||
|
||||
node = node->Next();
|
||||
}
|
||||
|
||||
return stream;
|
||||
}
|
||||
#else
|
||||
wxOutputStream& DrawingDocument::SaveObject(wxOutputStream& stream)
|
||||
{
|
||||
wxDocument::SaveObject(stream);
|
||||
|
||||
wxTextOutputStream text_stream( stream );
|
||||
|
||||
wxInt32 n = doodleSegments.Number();
|
||||
text_stream << n << '\n';
|
||||
|
||||
wxNode *node = doodleSegments.First();
|
||||
while (node)
|
||||
{
|
||||
DoodleSegment *segment = (DoodleSegment *)node->Data();
|
||||
segment->SaveObject(stream);
|
||||
text_stream << '\n';
|
||||
wxDocument::SaveObject(stream);
|
||||
|
||||
node = node->Next();
|
||||
}
|
||||
|
||||
return stream;
|
||||
wxTextOutputStream text_stream( stream );
|
||||
|
||||
wxInt32 n = doodleSegments.Number();
|
||||
text_stream << n << '\n';
|
||||
|
||||
wxNode *node = doodleSegments.First();
|
||||
while (node)
|
||||
{
|
||||
DoodleSegment *segment = (DoodleSegment *)node->Data();
|
||||
segment->SaveObject(stream);
|
||||
text_stream << '\n';
|
||||
|
||||
node = node->Next();
|
||||
}
|
||||
|
||||
return stream;
|
||||
}
|
||||
#endif
|
||||
|
||||
#if wxUSE_STD_IOSTREAM
|
||||
istream& DrawingDocument::LoadObject(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;
|
||||
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;
|
||||
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
|
||||
|
||||
@@ -131,204 +131,204 @@ DoodleSegment::DoodleSegment(void)
|
||||
|
||||
DoodleSegment::DoodleSegment(DoodleSegment& seg)
|
||||
{
|
||||
wxNode *node = seg.lines.First();
|
||||
while (node)
|
||||
{
|
||||
DoodleLine *line = (DoodleLine *)node->Data();
|
||||
DoodleLine *newLine = new DoodleLine;
|
||||
newLine->x1 = line->x1;
|
||||
newLine->y1 = line->y1;
|
||||
newLine->x2 = line->x2;
|
||||
newLine->y2 = line->y2;
|
||||
|
||||
lines.Append(newLine);
|
||||
|
||||
node = node->Next();
|
||||
}
|
||||
wxNode *node = seg.lines.First();
|
||||
while (node)
|
||||
{
|
||||
DoodleLine *line = (DoodleLine *)node->Data();
|
||||
DoodleLine *newLine = new DoodleLine;
|
||||
newLine->x1 = line->x1;
|
||||
newLine->y1 = line->y1;
|
||||
newLine->x2 = line->x2;
|
||||
newLine->y2 = line->y2;
|
||||
|
||||
lines.Append(newLine);
|
||||
|
||||
node = node->Next();
|
||||
}
|
||||
}
|
||||
|
||||
DoodleSegment::~DoodleSegment(void)
|
||||
{
|
||||
lines.DeleteContents(TRUE);
|
||||
lines.DeleteContents(TRUE);
|
||||
}
|
||||
|
||||
#if wxUSE_STD_IOSTREAM
|
||||
ostream& DoodleSegment::SaveObject(ostream& stream)
|
||||
{
|
||||
wxInt32 n = lines.Number();
|
||||
stream << n << '\n';
|
||||
|
||||
wxNode *node = lines.First();
|
||||
while (node)
|
||||
{
|
||||
DoodleLine *line = (DoodleLine *)node->Data();
|
||||
stream << line->x1 << " " <<
|
||||
line->y1 << " " <<
|
||||
line->x2 << " " <<
|
||||
line->y2 << "\n";
|
||||
node = node->Next();
|
||||
}
|
||||
|
||||
return stream;
|
||||
wxInt32 n = lines.Number();
|
||||
stream << n << '\n';
|
||||
|
||||
wxNode *node = lines.First();
|
||||
while (node)
|
||||
{
|
||||
DoodleLine *line = (DoodleLine *)node->Data();
|
||||
stream << line->x1 << " " <<
|
||||
line->y1 << " " <<
|
||||
line->x2 << " " <<
|
||||
line->y2 << "\n";
|
||||
node = node->Next();
|
||||
}
|
||||
|
||||
return stream;
|
||||
}
|
||||
#else
|
||||
wxOutputStream &DoodleSegment::SaveObject(wxOutputStream& stream)
|
||||
{
|
||||
wxTextOutputStream text_stream( stream );
|
||||
|
||||
wxInt32 n = lines.Number();
|
||||
text_stream << n << '\n';
|
||||
|
||||
wxNode *node = lines.First();
|
||||
while (node)
|
||||
{
|
||||
DoodleLine *line = (DoodleLine *)node->Data();
|
||||
text_stream << line->x1 << " " <<
|
||||
line->y1 << " " <<
|
||||
line->x2 << " " <<
|
||||
line->y2 << "\n";
|
||||
node = node->Next();
|
||||
}
|
||||
|
||||
return stream;
|
||||
wxTextOutputStream text_stream( stream );
|
||||
|
||||
wxInt32 n = lines.Number();
|
||||
text_stream << n << '\n';
|
||||
|
||||
wxNode *node = lines.First();
|
||||
while (node)
|
||||
{
|
||||
DoodleLine *line = (DoodleLine *)node->Data();
|
||||
text_stream << line->x1 << " " <<
|
||||
line->y1 << " " <<
|
||||
line->x2 << " " <<
|
||||
line->y2 << "\n";
|
||||
node = node->Next();
|
||||
}
|
||||
|
||||
return stream;
|
||||
}
|
||||
#endif
|
||||
|
||||
#if wxUSE_STD_IOSTREAM
|
||||
istream& DoodleSegment::LoadObject(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 >>
|
||||
line->y2;
|
||||
lines.Append(line);
|
||||
}
|
||||
|
||||
return stream;
|
||||
wxInt32 n = 0;
|
||||
stream >> n;
|
||||
|
||||
for (int i = 0; i < n; i++)
|
||||
{
|
||||
DoodleLine *line = new DoodleLine;
|
||||
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 >>
|
||||
line->y2;
|
||||
lines.Append(line);
|
||||
}
|
||||
|
||||
return 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 >>
|
||||
line->y2;
|
||||
lines.Append(line);
|
||||
}
|
||||
|
||||
return stream;
|
||||
}
|
||||
#endif
|
||||
|
||||
void DoodleSegment::Draw(wxDC *dc)
|
||||
{
|
||||
wxNode *node = lines.First();
|
||||
while (node)
|
||||
{
|
||||
DoodleLine *line = (DoodleLine *)node->Data();
|
||||
dc->DrawLine(line->x1, line->y1, line->x2, line->y2);
|
||||
node = node->Next();
|
||||
}
|
||||
wxNode *node = lines.First();
|
||||
while (node)
|
||||
{
|
||||
DoodleLine *line = (DoodleLine *)node->Data();
|
||||
dc->DrawLine(line->x1, line->y1, line->x2, line->y2);
|
||||
node = node->Next();
|
||||
}
|
||||
}
|
||||
|
||||
/*
|
||||
* Implementation of drawing command
|
||||
*/
|
||||
* Implementation of drawing command
|
||||
*/
|
||||
|
||||
DrawingCommand::DrawingCommand(const wxString& name, int command, DrawingDocument *ddoc, DoodleSegment *seg):
|
||||
wxCommand(TRUE, name)
|
||||
wxCommand(TRUE, name)
|
||||
{
|
||||
doc = ddoc;
|
||||
segment = seg;
|
||||
cmd = command;
|
||||
doc = ddoc;
|
||||
segment = seg;
|
||||
cmd = command;
|
||||
}
|
||||
|
||||
DrawingCommand::~DrawingCommand(void)
|
||||
{
|
||||
if (segment)
|
||||
delete segment;
|
||||
if (segment)
|
||||
delete segment;
|
||||
}
|
||||
|
||||
bool DrawingCommand::Do(void)
|
||||
{
|
||||
switch (cmd)
|
||||
{
|
||||
switch (cmd)
|
||||
{
|
||||
case DOODLE_CUT:
|
||||
{
|
||||
// Cut the last segment
|
||||
if (doc->GetDoodleSegments().Number() > 0)
|
||||
{
|
||||
wxNode *node = doc->GetDoodleSegments().Last();
|
||||
if (segment)
|
||||
delete segment;
|
||||
|
||||
segment = (DoodleSegment *)node->Data();
|
||||
delete node;
|
||||
|
||||
doc->Modify(TRUE);
|
||||
doc->UpdateAllViews();
|
||||
}
|
||||
break;
|
||||
}
|
||||
{
|
||||
// Cut the last segment
|
||||
if (doc->GetDoodleSegments().Number() > 0)
|
||||
{
|
||||
wxNode *node = doc->GetDoodleSegments().Last();
|
||||
if (segment)
|
||||
delete segment;
|
||||
|
||||
segment = (DoodleSegment *)node->Data();
|
||||
delete node;
|
||||
|
||||
doc->Modify(TRUE);
|
||||
doc->UpdateAllViews();
|
||||
}
|
||||
break;
|
||||
}
|
||||
case DOODLE_ADD:
|
||||
{
|
||||
doc->GetDoodleSegments().Append(new DoodleSegment(*segment));
|
||||
doc->Modify(TRUE);
|
||||
doc->UpdateAllViews();
|
||||
break;
|
||||
{
|
||||
doc->GetDoodleSegments().Append(new DoodleSegment(*segment));
|
||||
doc->Modify(TRUE);
|
||||
doc->UpdateAllViews();
|
||||
break;
|
||||
}
|
||||
}
|
||||
}
|
||||
return TRUE;
|
||||
return TRUE;
|
||||
}
|
||||
|
||||
bool DrawingCommand::Undo(void)
|
||||
{
|
||||
switch (cmd)
|
||||
{
|
||||
switch (cmd)
|
||||
{
|
||||
case DOODLE_CUT:
|
||||
{
|
||||
// Paste the segment
|
||||
if (segment)
|
||||
{
|
||||
doc->GetDoodleSegments().Append(segment);
|
||||
doc->Modify(TRUE);
|
||||
doc->UpdateAllViews();
|
||||
segment = (DoodleSegment *) NULL;
|
||||
}
|
||||
doc->Modify(TRUE);
|
||||
doc->UpdateAllViews();
|
||||
break;
|
||||
}
|
||||
{
|
||||
// Paste the segment
|
||||
if (segment)
|
||||
{
|
||||
doc->GetDoodleSegments().Append(segment);
|
||||
doc->Modify(TRUE);
|
||||
doc->UpdateAllViews();
|
||||
segment = (DoodleSegment *) NULL;
|
||||
}
|
||||
doc->Modify(TRUE);
|
||||
doc->UpdateAllViews();
|
||||
break;
|
||||
}
|
||||
case DOODLE_ADD:
|
||||
{
|
||||
// Cut the last segment
|
||||
if (doc->GetDoodleSegments().Number() > 0)
|
||||
{
|
||||
wxNode *node = doc->GetDoodleSegments().Last();
|
||||
DoodleSegment *seg = (DoodleSegment *)node->Data();
|
||||
delete seg;
|
||||
delete node;
|
||||
|
||||
doc->Modify(TRUE);
|
||||
doc->UpdateAllViews();
|
||||
}
|
||||
{
|
||||
// Cut the last segment
|
||||
if (doc->GetDoodleSegments().Number() > 0)
|
||||
{
|
||||
wxNode *node = doc->GetDoodleSegments().Last();
|
||||
DoodleSegment *seg = (DoodleSegment *)node->Data();
|
||||
delete seg;
|
||||
delete node;
|
||||
|
||||
doc->Modify(TRUE);
|
||||
doc->UpdateAllViews();
|
||||
}
|
||||
}
|
||||
}
|
||||
}
|
||||
return TRUE;
|
||||
return TRUE;
|
||||
}
|
||||
|
||||
IMPLEMENT_DYNAMIC_CLASS(TextEditDocument, wxDocument)
|
||||
@@ -338,7 +338,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);
|
||||
@@ -350,7 +350,7 @@ bool TextEditDocument::OnOpenDocument(const wxString& filename)
|
||||
TextEditView *view = (TextEditView *)GetFirstView();
|
||||
if (!view->textsw->LoadFile(filename))
|
||||
return FALSE;
|
||||
|
||||
|
||||
SetFilename(filename, TRUE);
|
||||
Modify(FALSE);
|
||||
UpdateAllViews();
|
||||
@@ -359,21 +359,21 @@ bool TextEditDocument::OnOpenDocument(const wxString& filename)
|
||||
|
||||
bool TextEditDocument::IsModified(void) const
|
||||
{
|
||||
TextEditView *view = (TextEditView *)GetFirstView();
|
||||
if (view)
|
||||
{
|
||||
return (wxDocument::IsModified() || view->textsw->IsModified());
|
||||
}
|
||||
else
|
||||
return wxDocument::IsModified();
|
||||
TextEditView *view = (TextEditView *)GetFirstView();
|
||||
if (view)
|
||||
{
|
||||
return (wxDocument::IsModified() || view->textsw->IsModified());
|
||||
}
|
||||
else
|
||||
return wxDocument::IsModified();
|
||||
}
|
||||
|
||||
void TextEditDocument::Modify(bool mod)
|
||||
{
|
||||
TextEditView *view = (TextEditView *)GetFirstView();
|
||||
|
||||
wxDocument::Modify(mod);
|
||||
|
||||
if (!mod && view && view->textsw)
|
||||
view->textsw->DiscardEdits();
|
||||
TextEditView *view = (TextEditView *)GetFirstView();
|
||||
|
||||
wxDocument::Modify(mod);
|
||||
|
||||
if (!mod && view && view->textsw)
|
||||
view->textsw->DiscardEdits();
|
||||
}
|
||||
|
||||
Reference in New Issue
Block a user