X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/b9ac87bc5cbe46227195e32c44e25831f8206e3c..3285ee538be44537a0d4e43252db18f5e7362782:/contrib/src/ogl/ogldiag.cpp diff --git a/contrib/src/ogl/ogldiag.cpp b/contrib/src/ogl/ogldiag.cpp index 932bbcdf75..5c5a23a60f 100644 --- a/contrib/src/ogl/ogldiag.cpp +++ b/contrib/src/ogl/ogldiag.cpp @@ -6,7 +6,7 @@ // Created: 12/07/98 // RCS-ID: $Id$ // Copyright: (c) Julian Smart -// Licence: wxWindows licence +// Licence: wxWindows licence ///////////////////////////////////////////////////////////////////////////// #ifdef __GNUG__ @@ -24,7 +24,9 @@ #include #endif -#include +#if wxUSE_PROLOGIO +#include +#endif #ifdef new #undef new @@ -34,13 +36,8 @@ #include #include -#include -#include -#include -#include -#include -#include -#include +#include "wx/ogl/ogl.h" + IMPLEMENT_DYNAMIC_CLASS(wxDiagram, wxObject) @@ -48,8 +45,8 @@ IMPLEMENT_DYNAMIC_CLASS(wxDiagram, wxObject) wxDiagram::wxDiagram() { m_diagramCanvas = NULL; - m_quickEditMode = FALSE; - m_snapToGrid = TRUE; + m_quickEditMode = false; + m_snapToGrid = true; m_gridSpacing = 5.0; m_shapeList = new wxList; m_mouseTolerance = DEFAULT_MOUSE_TOLERANCE; @@ -178,7 +175,7 @@ void wxDiagram::ShowAll(bool show) void wxDiagram::DrawOutline(wxDC& dc, double x1, double y1, double x2, double y2) { - wxPen dottedPen(wxColour(0, 0, 0), 1, wxDOT); + wxPen dottedPen(*wxBLACK, 1, wxDOT); dc.SetPen(dottedPen); dc.SetBrush((* wxTRANSPARENT_BRUSH)); @@ -222,7 +219,7 @@ bool wxDiagram::SaveFile(const wxString& filename) wxExprDatabase *database = new wxExprDatabase; // First write the diagram type - wxExpr *header = new wxExpr("diagram"); + wxExpr *header = new wxExpr(_T("diagram")); OnHeaderSave(*database, *header); database->Append(header); @@ -234,15 +231,15 @@ bool wxDiagram::SaveFile(const wxString& filename) if (!shape->IsKindOf(CLASSINFO(wxControlPoint))) { - wxExpr *expr = NULL; + wxExpr *expr; if (shape->IsKindOf(CLASSINFO(wxLineShape))) - expr = new wxExpr("line"); + expr = new wxExpr(_T("line")); else - expr = new wxExpr("shape"); + expr = new wxExpr(_T("shape")); OnShapeSave(*database, *shape, *expr); } - node = node->Next(); + node = node->GetNext(); } OnDatabaseSave(*database); @@ -253,7 +250,7 @@ bool wxDiagram::SaveFile(const wxString& filename) { wxEndBusyCursor(); delete database; - return FALSE; + return false; } database->Write(file); @@ -288,37 +285,37 @@ bool wxDiagram::SaveFile(const wxString& filename) } wxEndBusyCursor(); - return TRUE; + return true; } bool wxDiagram::LoadFile(const wxString& filename) { wxBeginBusyCursor(); - wxExprDatabase database(wxExprInteger, "id"); + wxExprDatabase database(wxExprInteger, _T("id")); if (!database.Read(filename)) { wxEndBusyCursor(); - return FALSE; + return false; } DeleteAllShapes(); database.BeginFind(); - wxExpr *header = database.FindClauseByFunctor("diagram"); + wxExpr *header = database.FindClauseByFunctor(_T("diagram")); if (header) OnHeaderLoad(database, *header); // Scan through all clauses and register the ids - wxNode *node = database.First(); + wxNode *node = database.GetFirst(); while (node) { wxExpr *clause = (wxExpr *)node->GetData(); long id = -1; - clause->GetAttributeValue("id", id); + clause->GetAttributeValue(_T("id"), id); wxRegisterId(id); - node = node->Next(); + node = node->GetNext(); } ReadNodes(database); @@ -329,14 +326,14 @@ bool wxDiagram::LoadFile(const wxString& filename) wxEndBusyCursor(); - return TRUE; + return true; } void wxDiagram::ReadNodes(wxExprDatabase& database) { // Find and create the node images database.BeginFind(); - wxExpr *clause = database.FindClauseByFunctor("shape"); + wxExpr *clause = database.FindClauseByFunctor(_T("shape")); while (clause) { wxChar *type = NULL; @@ -351,14 +348,14 @@ void wxDiagram::ReadNodes(wxExprDatabase& database) OnShapeLoad(database, *shape, *clause); shape->SetCanvas(GetCanvas()); - shape->Show(TRUE); + shape->Show(true); m_shapeList->Append(shape); // If child of composite, link up if (parentId > -1) { - wxExpr *parentExpr = database.HashFind("shape", parentId); + wxExpr *parentExpr = database.HashFind(_T("shape"), parentId); if (parentExpr && parentExpr->GetClientData()) { wxShape *parent = (wxShape *)parentExpr->GetClientData(); @@ -372,7 +369,7 @@ void wxDiagram::ReadNodes(wxExprDatabase& database) if (type) delete[] type; - clause = database.FindClauseByFunctor("shape"); + clause = database.FindClauseByFunctor(_T("shape")); } return; } @@ -380,34 +377,34 @@ void wxDiagram::ReadNodes(wxExprDatabase& database) void wxDiagram::ReadLines(wxExprDatabase& database) { database.BeginFind(); - wxExpr *clause = database.FindClauseByFunctor("line"); + wxExpr *clause = database.FindClauseByFunctor(_T("line")); while (clause) { wxString type; long parentId = -1; - clause->GetAttributeValue("type", type); - clause->GetAttributeValue("parent", parentId); + clause->GetAttributeValue(_T("type"), type); + clause->GetAttributeValue(_T("parent"), parentId); wxClassInfo *classInfo = wxClassInfo::FindClass(type); if (classInfo) { wxLineShape *shape = (wxLineShape *)classInfo->CreateObject(); - shape->Show(TRUE); + shape->Show(true); OnShapeLoad(database, *shape, *clause); shape->SetCanvas(GetCanvas()); long image_to = -1; long image_from = -1; - clause->GetAttributeValue("to", image_to); - clause->GetAttributeValue("from", image_from); + clause->GetAttributeValue(_T("to"), image_to); + clause->GetAttributeValue(_T("from"), image_from); - wxExpr *image_to_expr = database.HashFind("shape", image_to); + wxExpr *image_to_expr = database.HashFind(_T("shape"), image_to); if (!image_to_expr) { // Error } - wxExpr *image_from_expr = database.HashFind("shape", image_from); + wxExpr *image_from_expr = database.HashFind(_T("shape"), image_from); if (!image_from_expr) { @@ -429,7 +426,7 @@ void wxDiagram::ReadLines(wxExprDatabase& database) m_shapeList->Append(shape); } - clause = database.FindClauseByFunctor("line"); + clause = database.FindClauseByFunctor(_T("line")); } } @@ -439,7 +436,7 @@ void wxDiagram::ReadLines(wxExprDatabase& database) void wxDiagram::ReadContainerGeometry(wxExprDatabase& database) { database.BeginFind(); - wxExpr *clause = database.FindClauseByFunctor("shape"); + wxExpr *clause = database.FindClauseByFunctor(_T("shape")); while (clause) { wxShape *image = (wxShape *)clause->GetClientData(); @@ -449,15 +446,15 @@ void wxDiagram::ReadContainerGeometry(wxExprDatabase& database) wxExpr *divisionExpr = NULL; // Find the list of divisions in the composite - clause->GetAttributeValue("divisions", &divisionExpr); + clause->GetAttributeValue(_T("divisions"), &divisionExpr); if (divisionExpr) { int i = 0; - wxExpr *idExpr = divisionExpr->Item(i); + wxExpr *idExpr = divisionExpr->Nth(i); while (idExpr) { long divisionId = idExpr->IntegerValue(); - wxExpr *childExpr = database.HashFind("shape", divisionId); + wxExpr *childExpr = database.HashFind(_T("shape"), divisionId); if (childExpr && childExpr->GetClientData()) { wxDivisionShape *child = (wxDivisionShape *)childExpr->GetClientData(); @@ -468,13 +465,13 @@ void wxDiagram::ReadContainerGeometry(wxExprDatabase& database) long topSideId = -1; long rightSideId = -1; long bottomSideId = -1; - childExpr->GetAttributeValue("left_side", leftSideId); - childExpr->GetAttributeValue("top_side", topSideId); - childExpr->GetAttributeValue("right_side", rightSideId); - childExpr->GetAttributeValue("bottom_side", bottomSideId); + childExpr->GetAttributeValue(_T("left_side"), leftSideId); + childExpr->GetAttributeValue(_T("top_side"), topSideId); + childExpr->GetAttributeValue(_T("right_side"), rightSideId); + childExpr->GetAttributeValue(_T("bottom_side"), bottomSideId); if (leftSideId > -1) { - wxExpr *leftExpr = database.HashFind("shape", leftSideId); + wxExpr *leftExpr = database.HashFind(_T("shape"), leftSideId); if (leftExpr && leftExpr->GetClientData()) { wxDivisionShape *leftSide = (wxDivisionShape *)leftExpr->GetClientData(); @@ -483,7 +480,7 @@ void wxDiagram::ReadContainerGeometry(wxExprDatabase& database) } if (topSideId > -1) { - wxExpr *topExpr = database.HashFind("shape", topSideId); + wxExpr *topExpr = database.HashFind(_T("shape"), topSideId); if (topExpr && topExpr->GetClientData()) { wxDivisionShape *topSide = (wxDivisionShape *)topExpr->GetClientData(); @@ -492,7 +489,7 @@ void wxDiagram::ReadContainerGeometry(wxExprDatabase& database) } if (rightSideId > -1) { - wxExpr *rightExpr = database.HashFind("shape", rightSideId); + wxExpr *rightExpr = database.HashFind(_T("shape"), rightSideId); if (rightExpr && rightExpr->GetClientData()) { wxDivisionShape *rightSide = (wxDivisionShape *)rightExpr->GetClientData(); @@ -501,7 +498,7 @@ void wxDiagram::ReadContainerGeometry(wxExprDatabase& database) } if (bottomSideId > -1) { - wxExpr *bottomExpr = database.HashFind("shape", bottomSideId); + wxExpr *bottomExpr = database.HashFind(_T("shape"), bottomSideId); if (bottomExpr && bottomExpr->GetClientData()) { wxDivisionShape *bottomSide = (wxDivisionShape *)bottomExpr->GetClientData(); @@ -510,24 +507,24 @@ void wxDiagram::ReadContainerGeometry(wxExprDatabase& database) } } i ++; - idExpr = divisionExpr->Item(i); + idExpr = divisionExpr->Nth(i); } } } - clause = database.FindClauseByFunctor("shape"); + clause = database.FindClauseByFunctor(_T("shape")); } } // Allow for modifying file -bool wxDiagram::OnDatabaseLoad(wxExprDatabase& db) +bool wxDiagram::OnDatabaseLoad(wxExprDatabase& WXUNUSED(db)) { - return TRUE; + return true; } -bool wxDiagram::OnDatabaseSave(wxExprDatabase& db) +bool wxDiagram::OnDatabaseSave(wxExprDatabase& WXUNUSED(db)) { - return TRUE; + return true; } bool wxDiagram::OnShapeSave(wxExprDatabase& db, wxShape& shape, wxExpr& expr) @@ -537,33 +534,33 @@ bool wxDiagram::OnShapeSave(wxExprDatabase& db, wxShape& shape, wxExpr& expr) if (shape.IsKindOf(CLASSINFO(wxCompositeShape))) { - wxNode *node = shape.GetChildren().First(); + wxNode *node = shape.GetChildren().GetFirst(); while (node) { wxShape *childShape = (wxShape *)node->GetData(); - wxExpr *childExpr = new wxExpr("shape"); + wxExpr *childExpr = new wxExpr(_T("shape")); OnShapeSave(db, *childShape, *childExpr); - node = node->Next(); + node = node->GetNext(); } } - return TRUE; + return true; } -bool wxDiagram::OnShapeLoad(wxExprDatabase& db, wxShape& shape, wxExpr& expr) +bool wxDiagram::OnShapeLoad(wxExprDatabase& WXUNUSED(db), wxShape& shape, wxExpr& expr) { shape.ReadAttributes(&expr); - return TRUE; + return true; } -bool wxDiagram::OnHeaderSave(wxExprDatabase& db, wxExpr& expr) +bool wxDiagram::OnHeaderSave(wxExprDatabase& WXUNUSED(db), wxExpr& WXUNUSED(expr)) { - return TRUE; + return true; } -bool wxDiagram::OnHeaderLoad(wxExprDatabase& db, wxExpr& expr) +bool wxDiagram::OnHeaderLoad(wxExprDatabase& WXUNUSED(db), wxExpr& WXUNUSED(expr)) { - return TRUE; + return true; } #endif @@ -611,7 +608,7 @@ void wxLineCrossings::FindCrossings(wxDiagram& diagram) wxLineShape* lineShape1 = (wxLineShape*) shape1; // Iterate through the segments wxList* pts1 = lineShape1->GetLineControlPoints(); - int i; + size_t i; for (i = 0; i < (pts1->GetCount() - 1); i++) { wxRealPoint* pt1_a = (wxRealPoint*) (pts1->Item(i)->GetData()); @@ -631,7 +628,7 @@ void wxLineCrossings::FindCrossings(wxDiagram& diagram) // Iterate through the segments wxList* pts2 = lineShape2->GetLineControlPoints(); int j; - for (j = 0; j < (pts2->GetCount() - 1); j++) + for (j = 0; j < (int) (pts2->GetCount() - 1); j++) { wxRealPoint* pt2_a = (wxRealPoint*) (pts2->Item(j)->GetData()); wxRealPoint* pt2_b = (wxRealPoint*) (pts2->Item(j+1)->GetData()); @@ -670,7 +667,7 @@ void wxLineCrossings::FindCrossings(wxDiagram& diagram) } } -void wxLineCrossings::DrawCrossings(wxDiagram& diagram, wxDC& dc) +void wxLineCrossings::DrawCrossings(wxDiagram& WXUNUSED(diagram), wxDC& dc) { dc.SetBrush(*wxTRANSPARENT_BRUSH);