#endif
// For compilers that support precompilation, includes "wx.h".
-#include <wx/wxprec.h>
+#include "wx/wxprec.h"
#ifdef __BORLANDC__
#pragma hdrstop
// What to do when a view is created. Creates actual
// windows for displaying the view.
-bool csDiagramView::OnCreate(wxDocument *doc, long flags)
+bool csDiagramView::OnCreate(wxDocument *doc, long WXUNUSED(flags))
{
wxMenu* editMenu;
frame = wxGetApp().CreateChildFrame(doc, this, &editMenu);
// Sneakily gets used for default print/preview
// as well as drawing on the screen.
-void csDiagramView::OnDraw(wxDC *dc)
+void csDiagramView::OnDraw(wxDC *WXUNUSED(dc))
{
}
-void csDiagramView::OnUpdate(wxView *sender, wxObject *hint)
+void csDiagramView::OnUpdate(wxView *WXUNUSED(sender), wxObject *WXUNUSED(hint))
{
if (canvas)
canvas->Refresh();
csDiagramDocument *diagramDoc = (csDiagramDocument *)GetDocument();
diagramDoc->GetDiagram()->SetCanvas(NULL);
- canvas->Clear();
+ canvas->ClearBackground();
canvas->SetDiagram(NULL);
canvas->SetView(NULL);
canvas = NULL;
{
frame->Destroy();
}
-
+
return TRUE;
}
m_selections.DeleteObject(shape);
}
-void csDiagramView::OnSelectAll(wxCommandEvent& event)
+void csDiagramView::OnSelectAll(wxCommandEvent& WXUNUSED(event))
{
SelectAll(TRUE);
}
{
csDiagramDocument *doc = (csDiagramDocument *)GetDocument();
wxShape *theShape = NULL;
- wxNode *node = doc->GetDiagram()->GetShapeList()->First();
+ wxNode *node = doc->GetDiagram()->GetShapeList()->GetFirst();
while (node)
{
- wxShape *eachShape = (wxShape *)node->Data();
+ wxShape *eachShape = (wxShape *)node->GetData();
if ((eachShape->GetParent() == NULL) && !eachShape->IsKindOf(CLASSINFO(wxLabelShape)) && eachShape->Selected())
{
theShape = eachShape;
node = NULL;
}
- else node = node->Next();
+ else node = node->GetNext();
}
return theShape;
}
void csDiagramView::FindSelectedShapes(wxList& selections, wxClassInfo* toFind)
{
csDiagramDocument *doc = (csDiagramDocument *)GetDocument();
- wxNode *node = doc->GetDiagram()->GetShapeList()->First();
+ wxNode *node = doc->GetDiagram()->GetShapeList()->GetFirst();
while (node)
{
- wxShape *eachShape = (wxShape *)node->Data();
+ wxShape *eachShape = (wxShape *)node->GetData();
if ((eachShape->GetParent() == NULL) && !eachShape->IsKindOf(CLASSINFO(wxLabelShape)) && eachShape->Selected() && ((toFind == NULL) || (eachShape->IsKindOf(toFind))))
{
selections.Append(eachShape);
}
- node = node->Next();
+ node = node->GetNext();
}
}
event.Enable(doc->GetCommandProcessor()->CanRedo());
}
-void csDiagramView::OnCut(wxCommandEvent& event)
+void csDiagramView::OnCut(wxCommandEvent& WXUNUSED(event))
{
csDiagramDocument *doc = (csDiagramDocument *)GetDocument();
DoCut(selections);
}
-void csDiagramView::OnClear(wxCommandEvent& event)
+void csDiagramView::OnClear(wxCommandEvent& WXUNUSED(event))
{
wxList selections;
FindSelectedShapes(selections);
DoCut(selections);
}
-void csDiagramView::OnCopy(wxCommandEvent& event)
+void csDiagramView::OnCopy(wxCommandEvent& WXUNUSED(event))
{
csDiagramDocument *doc = (csDiagramDocument *)GetDocument();
}
}
-void csDiagramView::OnPaste(wxCommandEvent& event)
+void csDiagramView::OnPaste(wxCommandEvent& WXUNUSED(event))
{
csDiagramDocument *doc = (csDiagramDocument *)GetDocument();
wxGetApp().GetDiagramClipboard().Paste(doc->GetDiagram());
}
-void csDiagramView::OnDuplicate(wxCommandEvent& event)
+void csDiagramView::OnDuplicate(wxCommandEvent& WXUNUSED(event))
{
csDiagramDocument *doc = (csDiagramDocument *)GetDocument();
void csDiagramView::OnCutUpdate(wxUpdateUIEvent& event)
{
- event.Enable( (m_selections.Number() > 0) );
+ event.Enable( (m_selections.GetCount() > 0) );
}
void csDiagramView::OnClearUpdate(wxUpdateUIEvent& event)
{
- event.Enable( (m_selections.Number() > 0) );
+ event.Enable( (m_selections.GetCount() > 0) );
}
void csDiagramView::OnCopyUpdate(wxUpdateUIEvent& event)
{
- event.Enable( (m_selections.Number() > 0) );
+ event.Enable( (m_selections.GetCount() > 0) );
}
void csDiagramView::OnPasteUpdate(wxUpdateUIEvent& event)
{
- csDiagramDocument *doc = (csDiagramDocument *)GetDocument();
+ /* csDiagramDocument *doc = */ (csDiagramDocument *)GetDocument();
int n = wxGetApp().GetDiagramClipboard().GetCount();
void csDiagramView::OnDuplicateUpdate(wxUpdateUIEvent& event)
{
- event.Enable( (m_selections.Number() > 0) );
+ event.Enable( (m_selections.GetCount() > 0) );
}
void csDiagramView::DoCut(wxList& shapes)
{
csDiagramDocument *doc = (csDiagramDocument *)GetDocument();
- if (shapes.Number() > 0)
+ if (shapes.GetCount() > 0)
{
- csDiagramCommand* cmd = new csDiagramCommand("Cut", doc);
+ csDiagramCommand* cmd = new csDiagramCommand(_T("Cut"), doc);
- wxNode* node = shapes.First();
+ wxNode* node = shapes.GetFirst();
while (node)
{
- wxShape *theShape = (wxShape*) node->Data();
+ wxShape *theShape = (wxShape*) node->GetData();
csCommandState* state = new csCommandState(ID_CS_CUT, NULL, theShape);
// Insert lines at the front, so they are cut first.
else
cmd->AddState(state);
- node = node->Next();
+ node = node->GetNext();
}
cmd->RemoveLines(); // Schedule any connected lines, not already mentioned,
// to be removed first
{
csDiagramDocument *doc = (csDiagramDocument *)GetDocument();
- if (shapes.Number() > 0)
+ if (shapes.GetCount() > 0)
{
csDiagramCommand* command = new csDiagramCommand(op, doc);
- wxNode* node = shapes.First();
- wxNode* node1 = oldShapes.First();
+ wxNode* node = shapes.GetFirst();
+ wxNode* node1 = oldShapes.GetFirst();
while (node && node1)
{
- wxShape *theShape = (wxShape*) node->Data();
- wxShape *oldShape = (wxShape*) node1->Data();
+ wxShape *theShape = (wxShape*) node->GetData();
+ wxShape *oldShape = (wxShape*) node1->GetData();
csCommandState* state = new csCommandState(cmd, theShape, oldShape);
command->AddState(state);
- node = node->Next();
- node1 = node1->Next();
+ node = node->GetNext();
+ node1 = node1->GetNext();
}
doc->GetCommandProcessor()->Submit(command);
}
}
-void csDiagramView::OnChangeBackgroundColour(wxCommandEvent& event)
+void csDiagramView::OnChangeBackgroundColour(wxCommandEvent& WXUNUSED(event))
{
csDiagramDocument *doc = (csDiagramDocument *)GetDocument();
wxList selections;
FindSelectedShapes(selections);
- if (selections.Number() > 0)
+ if (selections.GetCount() > 0)
{
wxColourData data;
data.SetChooseFull(TRUE);
- if (selections.Number() == 1)
+ if (selections.GetCount() == 1)
{
- wxShape* firstShape = (wxShape*) selections.First()->Data();
+ wxShape* firstShape = (wxShape*) selections.GetFirst()->GetData();
data.SetColour(firstShape->GetBrush()->GetColour());
}
if (!theBrush)
return;
- csDiagramCommand* cmd = new csDiagramCommand("Change colour", doc);
+ csDiagramCommand* cmd = new csDiagramCommand(_T("Change colour"), doc);
- wxNode* node = selections.First();
+ wxNode* node = selections.GetFirst();
while (node)
{
- wxShape *theShape = (wxShape*) node->Data();
+ wxShape *theShape = (wxShape*) node->GetData();
wxShape* newShape = theShape->CreateNewCopy();
newShape->SetBrush(theBrush);
csCommandState* state = new csCommandState(ID_CS_CHANGE_BACKGROUND_COLOUR, newShape, theShape);
cmd->AddState(state);
- node = node->Next();
+ node = node->GetNext();
}
doc->GetCommandProcessor()->Submit(cmd);
}
}
-void csDiagramView::OnEditProperties(wxCommandEvent& event)
+void csDiagramView::OnEditProperties(wxCommandEvent& WXUNUSED(event))
{
wxShape *theShape = FindFirstSelectedShape();
if (theShape)
{
wxList selections;
FindSelectedShapes(selections);
- event.Enable( (selections.Number() > 0) );
+ event.Enable( (selections.GetCount() > 0) );
}
void csDiagramView::OnPointSizeComboSel(wxCommandEvent& event)
wxASSERT( combo != NULL );
wxString str(combo->GetValue());
- int newPointSize = atoi((const char*) str);
+ long newPointSize;
+ str.ToLong( &newPointSize );
if (newPointSize < 2)
return;
wxList selections;
FindSelectedShapes(selections);
- if (selections.Number() > 0)
+ if (selections.GetCount() > 0)
{
- csDiagramCommand* cmd = new csDiagramCommand("Point size", doc);
+ csDiagramCommand* cmd = new csDiagramCommand(_T("Point size"), doc);
- wxNode* node = selections.First();
+ wxNode* node = selections.GetFirst();
while (node)
{
- wxShape *theShape = (wxShape*) node->Data();
+ wxShape *theShape = (wxShape*) node->GetData();
wxShape *newShape = theShape->CreateNewCopy();
wxFont* newFont = wxTheFontList->FindOrCreateFont(pointSize,
cmd->AddState(state);
- node = node->Next();
+ node = node->GetNext();
}
doc->GetCommandProcessor()->Submit(cmd);
}
wxList selections;
FindSelectedShapes(selections);
- wxNode* node = selections.First();
+ wxNode* node = selections.GetFirst();
while (node)
{
- wxShape *theShape = (wxShape*) node->Data();
+ wxShape *theShape = (wxShape*) node->GetData();
theShape->Select(FALSE, &dc);
SelectShape(theShape, FALSE);
- node = node->Next();
+ node = node->GetNext();
}
}
else
{
csDiagramDocument *doc = (csDiagramDocument *)GetDocument();
- wxNode *node = doc->GetDiagram()->GetShapeList()->First();
+ wxNode *node = doc->GetDiagram()->GetShapeList()->GetFirst();
while (node)
{
- wxShape *eachShape = (wxShape *)node->Data();
+ wxShape *eachShape = (wxShape *)node->GetData();
if (eachShape->GetParent() == NULL &&
!eachShape->IsKindOf(CLASSINFO(wxControlPoint)) &&
!eachShape->IsKindOf(CLASSINFO(wxLabelShape)))
eachShape->Select(TRUE, &dc);
SelectShape(eachShape, TRUE);
}
- node = node->Next();
+ node = node->GetNext();
}
}
}
-void csDiagramView::OnToggleArrowTool(wxCommandEvent& event)
+void csDiagramView::OnToggleArrowTool(wxCommandEvent& WXUNUSED(event))
{
csDiagramDocument *doc = (csDiagramDocument *)GetDocument();
bool state = wxGetApp().GetDiagramToolBar()->GetToolState(DIAGRAM_TOOLBAR_LINE_ARROW);
wxString stateName;
if (state)
- stateName = "Arrow on";
+ stateName = _T("Arrow on");
else
- stateName = "Arrow off";
+ stateName = _T("Arrow off");
wxList selections;
FindSelectedShapes(selections, CLASSINFO(wxLineShape));
- if (selections.Number() > 0)
+ if (selections.GetCount() > 0)
{
csDiagramCommand* cmd = new csDiagramCommand(stateName, doc);
- wxNode* node = selections.First();
+ wxNode* node = selections.GetFirst();
while (node)
{
- wxLineShape *theShape = (wxLineShape*) node->Data();
+ wxLineShape *theShape = (wxLineShape*) node->GetData();
wxLineShape *newShape = NULL;
if (state)
{
// Add arrow
- if (theShape->GetArrows().Number() == 0)
+ if (theShape->GetArrows().GetCount() == 0)
{
newShape = (wxLineShape*) theShape->CreateNewCopy();
- newShape->AddArrow(ARROW_ARROW, ARROW_POSITION_MIDDLE, 10.0, 0.0, "Normal arrowhead");
+ newShape->AddArrow(ARROW_ARROW, ARROW_POSITION_MIDDLE, 10.0, 0.0, _T("Normal arrowhead"));
}
}
else
{
- if (theShape->GetArrows().Number() > 0)
+ if (theShape->GetArrows().GetCount() > 0)
{
newShape = (wxLineShape*) theShape->CreateNewCopy();
newShape->ClearArrowsAtPosition();
cmd->AddState(state);
}
- node = node->Next();
+ node = node->GetNext();
}
doc->GetCommandProcessor()->Submit(cmd);
}
{
wxList selections;
FindSelectedShapes(selections, CLASSINFO(wxLineShape));
- event.Enable( (selections.Number() > 0) );
+ event.Enable( (selections.GetCount() > 0) );
}
// Make the point size combobox reflect this
void csDiagramView::ReflectArrowState(wxLineShape* lineShape)
{
bool haveArrow = FALSE;
- wxNode *node = lineShape->GetArrows().First();
+ wxNode *node = lineShape->GetArrows().GetFirst();
while (node)
{
- wxArrowHead *arrow = (wxArrowHead *)node->Data();
+ wxArrowHead *arrow = (wxArrowHead *)node->GetData();
if (ARROW_POSITION_MIDDLE == arrow->GetArrowEnd())
haveArrow = TRUE;
- node = node->Next();
+ node = node->GetNext();
}
wxGetApp().GetDiagramToolBar()->ToggleTool(DIAGRAM_TOOLBAR_LINE_ARROW, haveArrow);
// Make a copy of the selections, keeping only those shapes
// that are top-level non-line shapes.
wxList selections;
- wxNode* node = GetSelectionList().First();
+ wxNode* node = GetSelectionList().GetFirst();
while (node)
{
- wxShape* shape = (wxShape*) node->Data();
+ wxShape* shape = (wxShape*) node->GetData();
if ((shape->GetParent() == NULL) && (!shape->IsKindOf(CLASSINFO(wxLineShape))))
{
selections.Append(shape);
}
- node = node->Next();
+ node = node->GetNext();
}
- if (selections.Number() == 0)
+ if (selections.GetCount() == 0)
return;
csDiagramDocument *doc = (csDiagramDocument *)GetDocument();
- csDiagramCommand* cmd = new csDiagramCommand("Align", doc);
+ csDiagramCommand* cmd = new csDiagramCommand(_T("Align"), doc);
- node = selections.First();
- wxShape* firstShape = (wxShape*) node->Data();
+ node = selections.GetFirst();
+ wxShape* firstShape = (wxShape*) node->GetData();
double x = firstShape->GetX();
double y = firstShape->GetY();
double width, height;
firstShape->GetBoundingBoxMax(&width, &height);
- node = selections.First();
+ node = selections.GetFirst();
while (node)
{
- wxShape* shape = (wxShape*) node->Data();
+ wxShape* shape = (wxShape*) node->GetData();
if (shape != firstShape)
{
- double x1 = shape->GetX();
- double y1 = shape->GetY();
+ /* double x1 = */ shape->GetX();
+ /* double y1 = */ shape->GetY();
double width1, height1;
shape->GetBoundingBoxMax(& width1, & height1);
csCommandState* state = new csCommandState(ID_CS_ALIGN, newShape, shape);
cmd->AddState(state);
}
- node = node->Next();
+ node = node->GetNext();
}
doc->GetCommandProcessor()->Submit(cmd);
}
{
// This is an approximation, since there may be lines
// amongst the selections.
- event.Enable( (m_selections.Number() > 1) ) ;
+ event.Enable( (m_selections.GetCount() > 1) ) ;
}
-void csDiagramView::OnNewLinePoint(wxCommandEvent& event)
+void csDiagramView::OnNewLinePoint(wxCommandEvent& WXUNUSED(event))
{
csDiagramDocument *doc = (csDiagramDocument *)GetDocument();
- csDiagramCommand* cmd = new csDiagramCommand("New line point", doc);
+ csDiagramCommand* cmd = new csDiagramCommand(_T("New line point"), doc);
- wxNode* node = m_selections.First();
+ wxNode* node = m_selections.GetFirst();
while (node)
{
- wxShape* shape = (wxShape*) node->Data();
+ wxShape* shape = (wxShape*) node->GetData();
if (shape->IsKindOf(CLASSINFO(wxLineShape)))
{
wxShape* newShape = shape->CreateNewCopy();
csCommandState* state = new csCommandState(ID_CS_NEW_POINT, newShape, shape);
cmd->AddState(state);
}
- node = node->Next();
+ node = node->GetNext();
}
doc->GetCommandProcessor()->Submit(cmd);
}
-void csDiagramView::OnCutLinePoint(wxCommandEvent& event)
+void csDiagramView::OnCutLinePoint(wxCommandEvent& WXUNUSED(event))
{
csDiagramDocument *doc = (csDiagramDocument *)GetDocument();
- csDiagramCommand* cmd = new csDiagramCommand("Cut line point", doc);
+ csDiagramCommand* cmd = new csDiagramCommand(_T("Cut line point"), doc);
- wxNode* node = m_selections.First();
+ wxNode* node = m_selections.GetFirst();
while (node)
{
- wxShape* shape = (wxShape*) node->Data();
+ wxShape* shape = (wxShape*) node->GetData();
if (shape->IsKindOf(CLASSINFO(wxLineShape)))
{
wxShape* newShape = shape->CreateNewCopy();
csCommandState* state = new csCommandState(ID_CS_CUT_POINT, newShape, shape);
cmd->AddState(state);
}
- node = node->Next();
+ node = node->GetNext();
}
doc->GetCommandProcessor()->Submit(cmd);
}
-void csDiagramView::OnStraightenLines(wxCommandEvent& event)
+void csDiagramView::OnStraightenLines(wxCommandEvent& WXUNUSED(event))
{
csDiagramDocument *doc = (csDiagramDocument *)GetDocument();
- csDiagramCommand* cmd = new csDiagramCommand("Straighten lines", doc);
+ csDiagramCommand* cmd = new csDiagramCommand(_T("Straighten lines"), doc);
- wxNode* node = m_selections.First();
+ wxNode* node = m_selections.GetFirst();
while (node)
{
- wxShape* shape = (wxShape*) node->Data();
+ wxShape* shape = (wxShape*) node->GetData();
if (shape->IsKindOf(CLASSINFO(wxLineShape)))
{
wxShape* newShape = shape->CreateNewCopy();
csCommandState* state = new csCommandState(ID_CS_STRAIGHTEN, newShape, shape);
cmd->AddState(state);
}
- node = node->Next();
+ node = node->GetNext();
}
doc->GetCommandProcessor()->Submit(cmd);
}
{
wxList selections;
FindSelectedShapes(selections, CLASSINFO(wxLineShape));
- event.Enable( (selections.Number() > 0) );
+ event.Enable( (selections.GetCount() > 0) );
}
void csDiagramView::OnCutLinePointUpdate(wxUpdateUIEvent& event)
{
wxList selections;
FindSelectedShapes(selections, CLASSINFO(wxLineShape));
- event.Enable( (selections.Number() > 0) );
+ event.Enable( (selections.GetCount() > 0) );
}
void csDiagramView::OnStraightenLinesUpdate(wxUpdateUIEvent& event)
{
wxList selections;
FindSelectedShapes(selections, CLASSINFO(wxLineShape));
- event.Enable( (selections.Number() > 0) );
+ event.Enable( (selections.GetCount() > 0) );
}
/*
dc.DrawRectangle((long) x1, (long) y1, (long) (x2 - x1), (long) (y2 - y1));
}
-void csCanvas::OnLeftClick(double x, double y, int keys)
+void csCanvas::OnLeftClick(double x, double y, int WXUNUSED(keys))
{
csEditorToolPalette *palette = wxGetApp().GetDiagramPalette();
// Ask for a label and create a new free-floating text region
csLabelEditingDialog* dialog = new csLabelEditingDialog(GetParent());
- dialog->SetShapeLabel("");
- dialog->SetTitle("New text box");
+ dialog->SetShapeLabel( wxEmptyString );
+ dialog->SetTitle(_T("New text box"));
if (dialog->ShowModal() == wxID_CANCEL)
{
dialog->Destroy();
wxComboBox* comboBox = wxGetApp().GetPointSizeComboBox();
wxString str(comboBox->GetValue());
- int pointSize = atoi((const char*) str);
+ long pointSize;
+ str.ToLong( &pointSize );
wxFont* newFont = wxTheFontList->FindOrCreateFont(pointSize,
shape->GetFont()->GetFamily(),
shape->SetX(x);
shape->SetY(y);
- csDiagramCommand* cmd = new csDiagramCommand("Text box",
+ csDiagramCommand* cmd = new csDiagramCommand(_T("Text box"),
(csDiagramDocument *)GetView()->GetDocument(),
new csCommandState(ID_CS_ADD_SHAPE, shape, NULL));
GetView()->GetDocument()->GetCommandProcessor()->Submit(cmd);
wxComboBox* comboBox = wxGetApp().GetPointSizeComboBox();
wxString str(comboBox->GetValue());
- int pointSize = atoi((const char*) str);
+ long pointSize;
+ str.ToLong( &pointSize );
wxFont* newFont = wxTheFontList->FindOrCreateFont(pointSize,
symbol->GetShape()->GetFont()->GetFamily(),
}
}
-void csCanvas::OnRightClick(double x, double y, int keys)
+void csCanvas::OnRightClick(double WXUNUSED(x), double WXUNUSED(y), int WXUNUSED(keys))
{
}
// Initial point
static double sg_initialX, sg_initialY;
-void csCanvas::OnDragLeft(bool draw, double x, double y, int keys)
+void csCanvas::OnDragLeft(bool WXUNUSED(draw), double x, double y, int WXUNUSED(keys))
{
wxClientDC dc(this);
PrepareDC(dc);
DrawOutline(dc, sg_initialX, sg_initialY, x, y);
}
-void csCanvas::OnBeginDragLeft(double x, double y, int keys)
+void csCanvas::OnBeginDragLeft(double x, double y, int WXUNUSED(keys))
{
sg_initialX = x;
sg_initialY = y;
CaptureMouse();
}
-void csCanvas::OnEndDragLeft(double x, double y, int keys)
+void csCanvas::OnEndDragLeft(double x, double y, int WXUNUSED(keys))
{
ReleaseMouse();
min_y = wxMin(y, sg_initialY);
max_y = wxMax(y, sg_initialY);
- wxNode *node = GetDiagram()->GetShapeList()->First();
+ wxNode *node = GetDiagram()->GetShapeList()->GetFirst();
while (node)
{
- wxShape *shape = (wxShape *)node->Data();
+ wxShape *shape = (wxShape *)node->GetData();
if (shape->GetParent() == NULL && !shape->IsKindOf(CLASSINFO(wxControlPoint)))
{
float image_x = shape->GetX();
GetView()->SelectShape(shape, TRUE);
}
}
- node = node->Next();
+ node = node->GetNext();
}
}
-void csCanvas::OnDragRight(bool draw, double x, double y, int keys)
+void csCanvas::OnDragRight(bool WXUNUSED(draw), double WXUNUSED(x), double WXUNUSED(y), int WXUNUSED(keys))
{
}
-void csCanvas::OnBeginDragRight(double x, double y, int keys)
+void csCanvas::OnBeginDragRight(double WXUNUSED(x), double WXUNUSED(y), int WXUNUSED(keys))
{
}
-void csCanvas::OnEndDragRight(double x, double y, int keys)
+void csCanvas::OnEndDragRight(double WXUNUSED(x), double WXUNUSED(y), int WXUNUSED(keys))
{
}
projects / wxWidgets.git / blobdiff