#include <wx/wx.h>
#endif
-#include <wx/wxexpr.h>
+#include <wx/deprecated/wxexpr.h>
#ifdef new
#undef new
#endif
-#if wxUSE_IOSTREAMH
-#include <iostream.h>
-#else
-#include <iostream>
-#endif
-
#include <ctype.h>
#include <math.h>
#include <stdlib.h>
EVT_MOUSE_EVENTS(wxShapeCanvas::OnMouseEvent)
END_EVENT_TABLE()
+const wxChar* wxShapeCanvasNameStr = wxT("shapeCanvas");
+
// Object canvas
-wxShapeCanvas::wxShapeCanvas(wxWindow *parent, wxWindowID id, const wxPoint& pos, const wxSize& size, long style):
- wxScrolledWindow(parent, id, pos, size, style)
+wxShapeCanvas::wxShapeCanvas(wxWindow *parent, wxWindowID id,
+ const wxPoint& pos,
+ const wxSize& size,
+ long style,
+ const wxString& name):
+ wxScrolledWindow(parent, id, pos, size, style, name)
{
m_shapeDiagram = NULL;
m_dragState = NoDragging;
// the other objects
// (b) to find the control points FIRST if they exist
- wxNode *current = GetDiagram()->GetShapeList()->Last();
+ wxNode *current = GetDiagram()->GetShapeList()->GetLast();
while (current)
{
- wxShape *object = (wxShape *)current->Data();
+ wxShape *object = (wxShape *)current->GetData();
double dist;
int temp_attachment;
}
}
if (current)
- current = current->Previous();
+ current = current->GetPrevious();
}
- current = GetDiagram()->GetShapeList()->Last();
+ current = GetDiagram()->GetShapeList()->GetLast();
while (current)
{
- wxShape *object = (wxShape *)current->Data();
+ wxShape *object = (wxShape *)current->GetData();
double dist;
int temp_attachment;
}
}
if (current)
- current = current->Previous();
+ current = current->GetPrevious();
}
*attachment = nearest_attachment;