fixed outdated filenames

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

diff --git a/contrib/src/ogl/ogldiag.cpp b/contrib/src/ogl/ogldiag.cpp
index 6698e5b143727083f75a9a5443291775afbd6fb6..f5b880414b99eaf1842ef33e894d8694320f229a 100644 (file)
--- a/contrib/src/ogl/ogldiag.cpp
+++ b/contrib/src/ogl/ogldiag.cpp
@@ -14,7 +14,7 @@
 #endif
 
 // For compilers that support precompilation, includes "wx.h".
 #endif
 
 // For compilers that support precompilation, includes "wx.h".

-#include <wx/wxprec.h>
+#include "wx/wxprec.h"

 
 #ifdef __BORLANDC__
 #pragma hdrstop
 
 #ifdef __BORLANDC__
 #pragma hdrstop


@@ -26,6 +26,10 @@
 
 #include <wx/wxexpr.h>
 
 
 #include <wx/wxexpr.h>
 

+#ifdef new
+#undef new
+#endif
+

 #if wxUSE_IOSTREAMH
 #include <iostream.h>
 #include <fstream.h>
 #if wxUSE_IOSTREAMH
 #include <iostream.h>
 #include <fstream.h>


@@ -33,7 +37,7 @@
 #include <iostream>
 #include <fstream>
 #ifdef _MSC_VER
 #include <iostream>
 #include <fstream>
 #ifdef _MSC_VER

-using namespace std;
+//using namespace std;

 #endif
 #endif
 
 #endif
 #endif
 


@@ -253,9 +257,9 @@ bool wxDiagram::SaveFile(const wxString& filename)
   }
   OnDatabaseSave(*database);
 
   }
   OnDatabaseSave(*database);
 

-  char tempFile[400];
-  wxGetTempFileName("diag", tempFile);
-  FILE* file = fopen(tempFile, "w");
+  wxString tempFile;
+  wxGetTempFileName(wxT("diag"), tempFile);
+  FILE* file = fopen(tempFile.mb_str(wxConvFile), "w");

   if (! file)
   {
     wxEndBusyCursor();
   if (! file)
   {
     wxEndBusyCursor();


@@ -346,11 +350,11 @@ void wxDiagram::ReadNodes(wxExprDatabase& database)
   wxExpr *clause = database.FindClauseByFunctor("shape");
   while (clause)
   {
   wxExpr *clause = database.FindClauseByFunctor("shape");
   while (clause)
   {

-    char *type = NULL;
+    wxChar *type = NULL;

     long parentId = -1;
 
     long parentId = -1;
 

-    clause->AssignAttributeValue("type", &type);
-    clause->AssignAttributeValue("parent", &parentId);
+    clause->AssignAttributeValue(wxT("type"), &type);
+    clause->AssignAttributeValue(wxT("parent"), &parentId);

     wxClassInfo *classInfo = wxClassInfo::FindClass(type);
     if (classInfo)
     {
     wxClassInfo *classInfo = wxClassInfo::FindClass(type);
     if (classInfo)
     {


@@ -390,12 +394,12 @@ void wxDiagram::ReadLines(wxExprDatabase& database)
   wxExpr *clause = database.FindClauseByFunctor("line");
   while (clause)
   {
   wxExpr *clause = database.FindClauseByFunctor("line");
   while (clause)
   {

-    wxString type("");
+    wxString type;

     long parentId = -1;
 
     clause->GetAttributeValue("type", type);
     clause->GetAttributeValue("parent", parentId);
     long parentId = -1;
 
     clause->GetAttributeValue("type", type);
     clause->GetAttributeValue("parent", parentId);

-    wxClassInfo *classInfo = wxClassInfo::FindClass((char*) (const char*) type);
+    wxClassInfo *classInfo = wxClassInfo::FindClass(type);

     if (classInfo)
     {
       wxLineShape *shape = (wxLineShape *)classInfo->CreateObject();
     if (classInfo)
     {
       wxLineShape *shape = (wxLineShape *)classInfo->CreateObject();