check for strtok_r() using C++ compiler

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

diff --git a/utils/ogl/src/ogldiag.cpp b/utils/ogl/src/ogldiag.cpp
index 86a20252900f75da65ef2460e9f824ea8103c7eb..edf3923ef52f1d25c15da334bd6ae89ac49cde91 100644 (file)
--- a/utils/ogl/src/ogldiag.cpp
+++ b/utils/ogl/src/ogldiag.cpp
@@ -93,7 +93,7 @@ void wxDiagram::Redraw(wxDC& dc)
   if (m_shapeList)
   {
     if (GetCanvas())
   if (m_shapeList)
   {
     if (GetCanvas())

-      GetCanvas()->SetCursor(wxHOURGLASS_CURSOR);
+      GetCanvas()->SetCursor(* wxHOURGLASS_CURSOR);

     wxNode *current = m_shapeList->First();
 
     while (current)
     wxNode *current = m_shapeList->First();
 
     while (current)


@@ -105,7 +105,7 @@ void wxDiagram::Redraw(wxDC& dc)
       current = current->Next();
     }
     if (GetCanvas())
       current = current->Next();
     }
     if (GetCanvas())

-      GetCanvas()->SetCursor(wxSTANDARD_CURSOR);
+      GetCanvas()->SetCursor(* wxSTANDARD_CURSOR);

   }
 }
 
   }
 }
 


@@ -225,20 +225,20 @@ void wxDiagram::RecentreAll(wxDC& dc)
 bool wxDiagram::SaveFile(const wxString& filename)
 {
   wxBeginBusyCursor();
 bool wxDiagram::SaveFile(const wxString& filename)
 {
   wxBeginBusyCursor();

-  
+

   wxExprDatabase *database = new wxExprDatabase;
 
   // First write the diagram type
   wxExpr *header = new wxExpr("diagram");
   OnHeaderSave(*database, *header);
   wxExprDatabase *database = new wxExprDatabase;
 
   // First write the diagram type
   wxExpr *header = new wxExpr("diagram");
   OnHeaderSave(*database, *header);

-  
+

   database->Append(header);
   database->Append(header);

-  
+

   wxNode *node = m_shapeList->First();
   while (node)
   {
     wxShape *shape = (wxShape *)node->Data();
   wxNode *node = m_shapeList->First();
   while (node)
   {
     wxShape *shape = (wxShape *)node->Data();

-    
+

     if (!shape->IsKindOf(CLASSINFO(wxControlPoint)))
     {
       wxExpr *expr = NULL;
     if (!shape->IsKindOf(CLASSINFO(wxControlPoint)))
     {
       wxExpr *expr = NULL;


@@ -252,19 +252,19 @@ bool wxDiagram::SaveFile(const wxString& filename)
     node = node->Next();
   }
   OnDatabaseSave(*database);
     node = node->Next();
   }
   OnDatabaseSave(*database);

-  
+

   char tempFile[400];
   wxGetTempFileName("diag", tempFile);
   char tempFile[400];
   wxGetTempFileName("diag", tempFile);

-  ofstream stream(tempFile);
-  if (stream.bad())
+  FILE* file = fopen(tempFile, "w");
+  if (! file)

   {
     wxEndBusyCursor();
     delete database;
     return FALSE;
   }
   {
     wxEndBusyCursor();
     delete database;
     return FALSE;
   }

-  
-  database->Write(stream);
-  stream.close();
+
+  database->Write(file);
+  fclose(file);

   delete database;
 
 /*
   delete database;
 
 /*


@@ -301,14 +301,14 @@ bool wxDiagram::SaveFile(const wxString& filename)
 bool wxDiagram::LoadFile(const wxString& filename)
 {
   wxBeginBusyCursor();
 bool wxDiagram::LoadFile(const wxString& filename)
 {
   wxBeginBusyCursor();

-  
+

   wxExprDatabase database(wxExprInteger, "id");
   if (!database.Read(filename))
   {
     wxEndBusyCursor();
     return FALSE;
   }
   wxExprDatabase database(wxExprInteger, "id");
   if (!database.Read(filename))
   {
     wxEndBusyCursor();
     return FALSE;
   }

-  
+

   DeleteAllShapes();
 
   database.BeginFind();
   DeleteAllShapes();
 
   database.BeginFind();


@@ -324,14 +324,14 @@ bool wxDiagram::LoadFile(const wxString& filename)
     wxExpr *clause = (wxExpr *)node->Data();
     long id = -1;
     clause->GetAttributeValue("id", id);
     wxExpr *clause = (wxExpr *)node->Data();
     long id = -1;
     clause->GetAttributeValue("id", id);

-    RegisterId(id);
+    wxRegisterId(id);

     node = node->Next();
   }
 
   ReadNodes(database);
   ReadContainerGeometry(database);
   ReadLines(database);
     node = node->Next();
   }
 
   ReadNodes(database);
   ReadContainerGeometry(database);
   ReadLines(database);

-  
+

   OnDatabaseLoad(database);
 
   wxEndBusyCursor();
   OnDatabaseLoad(database);
 
   wxEndBusyCursor();


@@ -356,7 +356,7 @@ void wxDiagram::ReadNodes(wxExprDatabase& database)
     {
       wxShape *shape = (wxShape *)classInfo->CreateObject();
       OnShapeLoad(database, *shape, *clause);
     {
       wxShape *shape = (wxShape *)classInfo->CreateObject();
       OnShapeLoad(database, *shape, *clause);

-      
+

       shape->SetCanvas(GetCanvas());
       shape->Show(TRUE);
 
       shape->SetCanvas(GetCanvas());
       shape->Show(TRUE);
 


@@ -378,7 +378,7 @@ void wxDiagram::ReadNodes(wxExprDatabase& database)
     }
     if (type)
       delete[] type;
     }
     if (type)
       delete[] type;

-      
+

     clause = database.FindClauseByFunctor("shape");
   }
   return;
     clause = database.FindClauseByFunctor("shape");
   }
   return;