#include "wx/wx.h"
#endif
#include "wx/txtstrm.h"
+#ifdef __WXMAC__
+#include "wx/filename.h"
+#endif
#if !wxUSE_DOC_VIEW_ARCHITECTURE
#error You must set wxUSE_DOC_VIEW_ARCHITECTURE to 1 in setup.h!
#include "doc.h"
#include "view.h"
-
IMPLEMENT_DYNAMIC_CLASS(DrawingDocument, wxDocument)
DrawingDocument::DrawingDocument(void)
{
wxDocument::SaveObject(stream);
- wxInt32 n = doodleSegments.Number();
+ wxInt32 n = doodleSegments.GetCount();
stream << n << '\n';
- wxNode *node = doodleSegments.First();
+ wxNode *node = doodleSegments.GetFirst();
while (node)
{
- DoodleSegment *segment = (DoodleSegment *)node->Data();
+ DoodleSegment *segment = (DoodleSegment *)node->GetData();
segment->SaveObject(stream);
stream << '\n';
- node = node->Next();
+ node = node->GetNext();
}
return stream;
wxTextOutputStream text_stream( stream );
- wxInt32 n = doodleSegments.Number();
+ wxInt32 n = doodleSegments.GetCount();
text_stream << n << '\n';
- wxNode *node = doodleSegments.First();
+ wxNode *node = doodleSegments.GetFirst();
while (node)
{
- DoodleSegment *segment = (DoodleSegment *)node->Data();
+ DoodleSegment *segment = (DoodleSegment *)node->GetData();
segment->SaveObject(stream);
text_stream << '\n';
- node = node->Next();
+ node = node->GetNext();
}
return stream;
DoodleSegment::DoodleSegment(DoodleSegment& seg)
{
- wxNode *node = seg.lines.First();
+ wxNode *node = seg.lines.GetFirst();
while (node)
{
- DoodleLine *line = (DoodleLine *)node->Data();
+ DoodleLine *line = (DoodleLine *)node->GetData();
DoodleLine *newLine = new DoodleLine;
newLine->x1 = line->x1;
newLine->y1 = line->y1;
lines.Append(newLine);
- node = node->Next();
+ node = node->GetNext();
}
}
#if wxUSE_STD_IOSTREAM
wxSTD ostream& DoodleSegment::SaveObject(wxSTD ostream& stream)
{
- wxInt32 n = lines.Number();
+ wxInt32 n = lines.GetCount();
stream << n << '\n';
- wxNode *node = lines.First();
+ wxNode *node = lines.GetFirst();
while (node)
{
- DoodleLine *line = (DoodleLine *)node->Data();
+ DoodleLine *line = (DoodleLine *)node->GetData();
stream << line->x1 << " " <<
line->y1 << " " <<
line->x2 << " " <<
line->y2 << "\n";
- node = node->Next();
+ node = node->GetNext();
}
return stream;
{
wxTextOutputStream text_stream( stream );
- wxInt32 n = lines.Number();
- text_stream << n << '\n';
+ wxInt32 n = lines.GetCount();
+ text_stream << n << _T('\n');
- wxNode *node = lines.First();
+ wxNode *node = lines.GetFirst();
while (node)
{
- DoodleLine *line = (DoodleLine *)node->Data();
- text_stream << line->x1 << " " <<
- line->y1 << " " <<
- line->x2 << " " <<
- line->y2 << "\n";
- node = node->Next();
+ DoodleLine *line = (DoodleLine *)node->GetData();
+ text_stream << line->x1 << _T(" ") <<
+ line->y1 << _T(" ") <<
+ line->x2 << _T(" ") <<
+ line->y2 << _T("\n");
+ node = node->GetNext();
}
return stream;
void DoodleSegment::Draw(wxDC *dc)
{
- wxNode *node = lines.First();
+ wxNode *node = lines.GetFirst();
while (node)
{
- DoodleLine *line = (DoodleLine *)node->Data();
+ DoodleLine *line = (DoodleLine *)node->GetData();
dc->DrawLine(line->x1, line->y1, line->x2, line->y2);
- node = node->Next();
+ node = node->GetNext();
}
}
case DOODLE_CUT:
{
// Cut the last segment
- if (doc->GetDoodleSegments().Number() > 0)
+ if (doc->GetDoodleSegments().GetCount() > 0)
{
- wxNode *node = doc->GetDoodleSegments().Last();
+ wxNode *node = doc->GetDoodleSegments().GetLast();
if (segment)
delete segment;
- segment = (DoodleSegment *)node->Data();
+ segment = (DoodleSegment *)node->GetData();
delete node;
doc->Modify(TRUE);
case DOODLE_ADD:
{
// Cut the last segment
- if (doc->GetDoodleSegments().Number() > 0)
+ if (doc->GetDoodleSegments().GetCount() > 0)
{
- wxNode *node = doc->GetDoodleSegments().Last();
- DoodleSegment *seg = (DoodleSegment *)node->Data();
+ wxNode *node = doc->GetDoodleSegments().GetLast();
+ DoodleSegment *seg = (DoodleSegment *)node->GetData();
delete seg;
delete node;
if (!view->textsw->SaveFile(filename))
return FALSE;
Modify(FALSE);
+#ifdef __WXMAC__
+ wxFileName fn(filename) ;
+ fn.MacSetDefaultTypeAndCreator() ;
+#endif
return TRUE;
}