X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/59840ba3b16e4baf3228dd79c6b7ae40b55cf488..f820e98de02ee9c5d34f28372a2324d9b2909f6c:/contrib/src/ogl/mfutils.cpp

diff --git a/contrib/src/ogl/mfutils.cpp b/contrib/src/ogl/mfutils.cpp
index 75fd4cdfd1..0f3e33e2c4 100644
--- a/contrib/src/ogl/mfutils.cpp
+++ b/contrib/src/ogl/mfutils.cpp
@@ -27,7 +27,8 @@
 #include <wx/metafile.h>
 #include <wx/utils.h>
 
-#include <wx/ogl/mfutils.h>
+#include "wx/ogl/ogl.h"
+
 #include <stdio.h>
 
 static char _buf[1024]; // a temp buffer to use inplace of wxBuffer, which is deprecated.
@@ -98,7 +99,7 @@ wxMetaRecord::~wxMetaRecord(void)
   if (stringParam) delete[] stringParam;
 }
 
-wxXMetaFile::wxXMetaFile(char *file)
+wxXMetaFile::wxXMetaFile(const wxChar *file)
 {
   ok = FALSE;
   top = 0.0;
@@ -162,11 +163,11 @@ int AddMetaRecordHandle(wxMetaRecord *record)
   return (HandleTableSize - 1);
 }
 
-bool wxXMetaFile::ReadFile(char *file)
+bool wxXMetaFile::ReadFile(const wxChar *file)
 {
   HandleTableSize = 0;
 
-  FILE *handle = fopen(file, "rb");
+  FILE *handle = wxFopen(file, wxT("rb"));
   if (!handle) return FALSE;
 
   // Read placeable metafile header, if any
@@ -381,8 +382,8 @@ bool wxXMetaFile::ReadFile(char *file)
       {
         wxMetaRecord *rec = new wxMetaRecord(META_TEXTOUT);
         int count = getshort(handle);
-        rec->stringParam = new char[count+1];
-        fread((void *)rec->stringParam, sizeof(char), count, handle);
+        rec->stringParam = new wxChar[count+1];
+        fread((void *)rec->stringParam, sizeof(wxChar), count, handle);
         rec->stringParam[count] = 0;
         rec->param2 = getshort(handle); // Y
         rec->param1 = getshort(handle); // X
@@ -479,7 +480,7 @@ bool wxXMetaFile::ReadFile(char *file)
         metaRecords.Append(rec);
         gdiObjects.Append(rec);
         AddMetaRecordHandle(rec);
-        rec->param2 = (long)(gdiObjects.Number() - 1);
+        rec->param2 = (long)(gdiObjects.GetCount() - 1);
         break;
       }
 //      case META_STRETCHDIB:
@@ -504,7 +505,7 @@ bool wxXMetaFile::ReadFile(char *file)
         metaRecords.Append(rec);
         gdiObjects.Append(rec);
         AddMetaRecordHandle(rec);
-        rec->param2 = (long)(gdiObjects.Number() - 1);
+        rec->param2 = (long)(gdiObjects.GetCount() - 1);
         break;
       }
       case META_CREATEBRUSH:
@@ -514,7 +515,7 @@ bool wxXMetaFile::ReadFile(char *file)
         metaRecords.Append(rec);
         gdiObjects.Append(rec);
         AddMetaRecordHandle(rec);
-        rec->param2 = (long)(gdiObjects.Number() - 1);
+        rec->param2 = (long)(gdiObjects.GetCount() - 1);
         break;
       }
       case META_CREATEPATTERNBRUSH:
@@ -524,7 +525,7 @@ bool wxXMetaFile::ReadFile(char *file)
         metaRecords.Append(rec);
         gdiObjects.Append(rec);
         AddMetaRecordHandle(rec);
-        rec->param2 = (long)(gdiObjects.Number() - 1);
+        rec->param2 = (long)(gdiObjects.GetCount() - 1);
         break;
       }
       case META_CREATEPENINDIRECT:
@@ -550,7 +551,7 @@ bool wxXMetaFile::ReadFile(char *file)
         gdiObjects.Append(rec);
 
         AddMetaRecordHandle(rec);
-        rec->param2 = (long)(gdiObjects.Number() - 1);
+        rec->param2 = (long)(gdiObjects.GetCount() - 1);
 
         // For some reason, the size of this record is sometimes 9 words!!!
         // instead of the usual 8. So read 2 characters extra.
@@ -622,7 +623,7 @@ bool wxXMetaFile::ReadFile(char *file)
         metaRecords.Append(rec);
         gdiObjects.Append(rec);
         AddMetaRecordHandle(rec);
-        rec->param2 = (long)(gdiObjects.Number() - 1);
+        rec->param2 = (long)(gdiObjects.GetCount() - 1);
         break;
       }
       case META_CREATEBRUSHINDIRECT:
@@ -679,7 +680,7 @@ bool wxXMetaFile::ReadFile(char *file)
         metaRecords.Append(rec);
         gdiObjects.Append(rec);
         AddMetaRecordHandle(rec);
-        rec->param2 = (long)(gdiObjects.Number() - 1);
+        rec->param2 = (long)(gdiObjects.GetCount() - 1);
         break;
       }
       case META_CREATEBITMAPINDIRECT:
@@ -690,7 +691,7 @@ bool wxXMetaFile::ReadFile(char *file)
         metaRecords.Append(rec);
         gdiObjects.Append(rec);
         AddMetaRecordHandle(rec);
-        rec->param2 = (long)(gdiObjects.Number() - 1);
+        rec->param2 = (long)(gdiObjects.GetCount() - 1);
         break;
       }
       case META_CREATEBITMAP:
@@ -701,7 +702,7 @@ bool wxXMetaFile::ReadFile(char *file)
         metaRecords.Append(rec);
         gdiObjects.Append(rec);
         AddMetaRecordHandle(rec);
-        rec->param2 = (long)(gdiObjects.Number() - 1);
+        rec->param2 = (long)(gdiObjects.GetCount() - 1);
         break;
       }
       case META_CREATEREGION:
@@ -712,7 +713,7 @@ bool wxXMetaFile::ReadFile(char *file)
         metaRecords.Append(rec);
         gdiObjects.Append(rec);
         AddMetaRecordHandle(rec);
-        rec->param2 = (long)(gdiObjects.Number() - 1);
+        rec->param2 = (long)(gdiObjects.GetCount() - 1);
         break;
       }
       default:
@@ -728,12 +729,12 @@ bool wxXMetaFile::ReadFile(char *file)
 
 wxXMetaFile::~wxXMetaFile(void)
 {
-  wxNode *node = metaRecords.First();
+  wxNode *node = metaRecords.GetFirst();
   while (node)
   {
-    wxMetaRecord *rec = (wxMetaRecord *)node->Data();
+    wxMetaRecord *rec = (wxMetaRecord *)node->GetData();
     delete rec;
-    wxNode *next = node->Next();
+    wxNode *next = node->GetNext();
     delete node;
     node = next;
   }
@@ -746,10 +747,10 @@ bool wxXMetaFile::SetClipboard(int width, int height)
 
 bool wxXMetaFile::Play(wxDC *dc)
 {
-  wxNode *node = metaRecords.First();
+  wxNode *node = metaRecords.GetFirst();
   while (node)
   {
-    wxMetaRecord *rec = (wxMetaRecord *)node->Data();
+    wxMetaRecord *rec = (wxMetaRecord *)node->GetData();
     int rdFunction = rec->metaFunction;
 
     switch (rdFunction)
@@ -1080,7 +1081,7 @@ bool wxXMetaFile::Play(wxDC *dc)
         break;
       }
     }
-    node = node->Next();
+    node = node->GetNext();
   }
   return TRUE;
 }