Defaults in wxWinCE documented.

[wxWidgets.git] / contrib / src / ogl / ogldiag.cpp

diff --git a/contrib/src/ogl/ogldiag.cpp b/contrib/src/ogl/ogldiag.cpp
index 1f7be29092110bac6d33f170dddc523a8677dd9e..5c5a23a60f952bfcdc486295a935785a1eea9049 100644 (file)
--- 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
 // Created:     12/07/98
 // RCS-ID:      $Id$
 // Copyright:   (c) Julian Smart

-// Licence:    wxWindows licence
+// Licence:     wxWindows licence

 /////////////////////////////////////////////////////////////////////////////
 
 #ifdef __GNUG__
 /////////////////////////////////////////////////////////////////////////////
 
 #ifdef __GNUG__


@@ -45,8 +45,8 @@ IMPLEMENT_DYNAMIC_CLASS(wxDiagram, wxObject)
 wxDiagram::wxDiagram()
 {
   m_diagramCanvas = NULL;
 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;
   m_gridSpacing = 5.0;
   m_shapeList = new wxList;
   m_mouseTolerance = DEFAULT_MOUSE_TOLERANCE;


@@ -175,7 +175,7 @@ void wxDiagram::ShowAll(bool show)
 
 void wxDiagram::DrawOutline(wxDC& dc, double x1, double y1, double x2, double y2)
 {
 
 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));
 
   dc.SetPen(dottedPen);
   dc.SetBrush((* wxTRANSPARENT_BRUSH));
 


@@ -231,7 +231,7 @@ bool wxDiagram::SaveFile(const wxString& filename)
 
     if (!shape->IsKindOf(CLASSINFO(wxControlPoint)))
     {
 
     if (!shape->IsKindOf(CLASSINFO(wxControlPoint)))
     {

-      wxExpr *expr = NULL;
+      wxExpr *expr;

       if (shape->IsKindOf(CLASSINFO(wxLineShape)))
         expr = new wxExpr(_T("line"));
        else
       if (shape->IsKindOf(CLASSINFO(wxLineShape)))
         expr = new wxExpr(_T("line"));
        else


@@ -239,7 +239,7 @@ bool wxDiagram::SaveFile(const wxString& filename)
 
       OnShapeSave(*database, *shape, *expr);
     }
 
       OnShapeSave(*database, *shape, *expr);
     }

-    node = node->Next();
+    node = node->GetNext();

   }
   OnDatabaseSave(*database);
 
   }
   OnDatabaseSave(*database);
 


@@ -250,7 +250,7 @@ bool wxDiagram::SaveFile(const wxString& filename)
   {
     wxEndBusyCursor();
     delete database;
   {
     wxEndBusyCursor();
     delete database;

-    return FALSE;
+    return false;

   }
 
   database->Write(file);
   }
 
   database->Write(file);


@@ -285,7 +285,7 @@ bool wxDiagram::SaveFile(const wxString& filename)
   }
 
   wxEndBusyCursor();
   }
 
   wxEndBusyCursor();

-  return TRUE;
+  return true;

 }
 
 bool wxDiagram::LoadFile(const wxString& filename)
 }
 
 bool wxDiagram::LoadFile(const wxString& filename)


@@ -296,7 +296,7 @@ bool wxDiagram::LoadFile(const wxString& filename)
   if (!database.Read(filename))
   {
     wxEndBusyCursor();
   if (!database.Read(filename))
   {
     wxEndBusyCursor();

-    return FALSE;
+    return false;

   }
 
   DeleteAllShapes();
   }
 
   DeleteAllShapes();


@@ -308,14 +308,14 @@ bool wxDiagram::LoadFile(const wxString& filename)
     OnHeaderLoad(database, *header);
 
   // Scan through all clauses and register the ids
     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(_T("id"), id);
     wxRegisterId(id);
   while (node)
   {
     wxExpr *clause = (wxExpr *)node->GetData();
     long id = -1;
     clause->GetAttributeValue(_T("id"), id);
     wxRegisterId(id);

-    node = node->Next();
+    node = node->GetNext();

   }
 
   ReadNodes(database);
   }
 
   ReadNodes(database);


@@ -326,7 +326,7 @@ bool wxDiagram::LoadFile(const wxString& filename)
 
   wxEndBusyCursor();
 
 
   wxEndBusyCursor();
 

-  return TRUE;
+  return true;

 }
 
 void wxDiagram::ReadNodes(wxExprDatabase& database)
 }
 
 void wxDiagram::ReadNodes(wxExprDatabase& database)


@@ -348,7 +348,7 @@ void wxDiagram::ReadNodes(wxExprDatabase& database)
       OnShapeLoad(database, *shape, *clause);
 
       shape->SetCanvas(GetCanvas());
       OnShapeLoad(database, *shape, *clause);
 
       shape->SetCanvas(GetCanvas());

-      shape->Show(TRUE);
+      shape->Show(true);

 
       m_shapeList->Append(shape);
 
 
       m_shapeList->Append(shape);
 


@@ -389,7 +389,7 @@ void wxDiagram::ReadLines(wxExprDatabase& database)
     if (classInfo)
     {
       wxLineShape *shape = (wxLineShape *)classInfo->CreateObject();
     if (classInfo)
     {
       wxLineShape *shape = (wxLineShape *)classInfo->CreateObject();

-      shape->Show(TRUE);
+      shape->Show(true);

 
       OnShapeLoad(database, *shape, *clause);
       shape->SetCanvas(GetCanvas());
 
       OnShapeLoad(database, *shape, *clause);
       shape->SetCanvas(GetCanvas());


@@ -519,12 +519,12 @@ void wxDiagram::ReadContainerGeometry(wxExprDatabase& database)
 // Allow for modifying file
 bool wxDiagram::OnDatabaseLoad(wxExprDatabase& WXUNUSED(db))
 {
 // Allow for modifying file
 bool wxDiagram::OnDatabaseLoad(wxExprDatabase& WXUNUSED(db))
 {

-  return TRUE;
+  return true;

 }
 
 bool wxDiagram::OnDatabaseSave(wxExprDatabase& WXUNUSED(db))
 {
 }
 
 bool wxDiagram::OnDatabaseSave(wxExprDatabase& WXUNUSED(db))
 {

-  return TRUE;
+  return true;

 }
 
 bool wxDiagram::OnShapeSave(wxExprDatabase& db, wxShape& shape, wxExpr& expr)
 }
 
 bool wxDiagram::OnShapeSave(wxExprDatabase& db, wxShape& shape, wxExpr& expr)


@@ -534,33 +534,33 @@ bool wxDiagram::OnShapeSave(wxExprDatabase& db, wxShape& shape, wxExpr& expr)
 
   if (shape.IsKindOf(CLASSINFO(wxCompositeShape)))
   {
 
   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(_T("shape"));
       OnShapeSave(db, *childShape, *childExpr);
     while (node)
     {
       wxShape *childShape = (wxShape *)node->GetData();
       wxExpr *childExpr = new wxExpr(_T("shape"));
       OnShapeSave(db, *childShape, *childExpr);

-      node = node->Next();
+      node = node->GetNext();

     }
   }
 
     }
   }
 

-  return TRUE;
+  return true;

 }
 
 bool wxDiagram::OnShapeLoad(wxExprDatabase& WXUNUSED(db), wxShape& shape, wxExpr& expr)
 {
   shape.ReadAttributes(&expr);
 }
 
 bool wxDiagram::OnShapeLoad(wxExprDatabase& WXUNUSED(db), wxShape& shape, wxExpr& expr)
 {
   shape.ReadAttributes(&expr);

-  return TRUE;
+  return true;

 }
 
 bool wxDiagram::OnHeaderSave(wxExprDatabase& WXUNUSED(db), wxExpr& WXUNUSED(expr))
 {
 }
 
 bool wxDiagram::OnHeaderSave(wxExprDatabase& WXUNUSED(db), wxExpr& WXUNUSED(expr))
 {

-  return TRUE;
+  return true;

 }
 
 bool wxDiagram::OnHeaderLoad(wxExprDatabase& WXUNUSED(db), wxExpr& WXUNUSED(expr))
 {
 }
 
 bool wxDiagram::OnHeaderLoad(wxExprDatabase& WXUNUSED(db), wxExpr& WXUNUSED(expr))
 {

-  return TRUE;
+  return true;

 }
 
 #endif
 }
 
 #endif