corrected version number extraction

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

diff --git a/contrib/src/ogl/mfutils.cpp b/contrib/src/ogl/mfutils.cpp
index 6c268e842589ec44e6ee8b678dfa834774ba0d0b..ae084590fed052cfeb9fde66739c1e72a2c49c90 100644 (file)
--- a/contrib/src/ogl/mfutils.cpp
+++ b/contrib/src/ogl/mfutils.cpp
@@ -111,7 +111,7 @@ wxXMetaFile::wxXMetaFile(const wxChar *file)
   [3]             | -> wxPen
 
  The handle table works as follows.
   [3]             | -> wxPen
 
  The handle table works as follows.

- When a GDI object is created whilst reading in the
+ When a GDI object is created while reading in the

  metafile, the (e.g.) createpen record is added to the
  first free entry in the handle table. The createpen
  record's param1 is a pointer to the actual wxPen, and
  metafile, the (e.g.) createpen record is added to the
  first free entry in the handle table. The createpen
  record's param1 is a pointer to the actual wxPen, and


@@ -560,14 +560,14 @@ bool wxXMetaFile::ReadFile(const wxChar *file)
         /* int lfEsc = */ getshort(handle);       // 2 bytes
         /* int lfOrient = */ getshort(handle);    // 2 bytes
         int lfWeight = getshort(handle);    // 2 bytes
         /* int lfEsc = */ getshort(handle);       // 2 bytes
         /* int lfOrient = */ getshort(handle);    // 2 bytes
         int lfWeight = getshort(handle);    // 2 bytes

-        char lfItalic = getc(handle);       // 1 byte
-        char lfUnderline = getc(handle);    // 1 byte
+        char lfItalic = (char)getc(handle);       // 1 byte
+        char lfUnderline = (char)getc(handle);    // 1 byte

         /* char lfStrikeout = */ getc(handle);    // 1 byte
         /* char lfCharSet = */ getc(handle);      // 1 byte
         /* char lfOutPrecision = */ getc(handle); // 1 byte
         /* char lfClipPrecision = */ getc(handle); // 1 byte
         /* char lfQuality = */ getc(handle);      // 1 byte
         /* char lfStrikeout = */ getc(handle);    // 1 byte
         /* char lfCharSet = */ getc(handle);      // 1 byte
         /* char lfOutPrecision = */ getc(handle); // 1 byte
         /* char lfClipPrecision = */ getc(handle); // 1 byte
         /* char lfQuality = */ getc(handle);      // 1 byte

-        char lfPitchAndFamily = getc(handle);   // 1 byte (18th)
+        char lfPitchAndFamily = (char)getc(handle);   // 1 byte (18th)

         char lfFacename[32];
         // Read the rest of the record, which is total record size
         // minus the number of bytes already read (18 record, 6 metarecord
         char lfFacename[32];
         // Read the rest of the record, which is total record size
         // minus the number of bytes already read (18 record, 6 metarecord


@@ -728,13 +728,13 @@ bool wxXMetaFile::ReadFile(const wxChar *file)
 
 wxXMetaFile::~wxXMetaFile(void)
 {
 
 wxXMetaFile::~wxXMetaFile(void)
 {

-  wxNode *node = metaRecords.GetFirst();
+  wxObjectList::compatibility_iterator node = metaRecords.GetFirst();

   while (node)
   {
     wxMetaRecord *rec = (wxMetaRecord *)node->GetData();
     delete rec;
   while (node)
   {
     wxMetaRecord *rec = (wxMetaRecord *)node->GetData();
     delete rec;

-    wxNode *next = node->GetNext();
-    delete node;
+    wxObjectList::compatibility_iterator next = node->GetNext();
+    metaRecords.Erase(node);

     node = next;
   }
 }
     node = next;
   }
 }


@@ -746,7 +746,7 @@ bool wxXMetaFile::SetClipboard(int WXUNUSED(width), int WXUNUSED(height))
 
 bool wxXMetaFile::Play(wxDC *dc)
 {
 
 bool wxXMetaFile::Play(wxDC *dc)
 {

-  wxNode *node = metaRecords.GetFirst();
+  wxObjectList::compatibility_iterator node = metaRecords.GetFirst();

   while (node)
   {
     wxMetaRecord *rec = (wxMetaRecord *)node->GetData();
   while (node)
   {
     wxMetaRecord *rec = (wxMetaRecord *)node->GetData();