compilation fix for gcc (closes bug 996701)

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

diff --git a/contrib/src/ogl/mfutils.cpp b/contrib/src/ogl/mfutils.cpp
index 1fc7848fcb93d0c5e35228686f9adbbc76afcddb..6c268e842589ec44e6ee8b678dfa834774ba0d0b 100644 (file)
--- a/contrib/src/ogl/mfutils.cpp
+++ b/contrib/src/ogl/mfutils.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__


@@ -67,20 +67,20 @@ static long getint(FILE *fp)
   c = getc(fp);  c1 = getc(fp);  c2 = getc(fp);  c3 = getc(fp);
   long res = (long)((long) c) +
          (((long) c1) << 8) +
   c = getc(fp);  c1 = getc(fp);  c2 = getc(fp);  c3 = getc(fp);
   long res = (long)((long) c) +
          (((long) c1) << 8) +

-        (((long) c2) << 16) +
-        (((long) c3) << 24);
+         (((long) c2) << 16) +
+         (((long) c3) << 24);

   return res;
 }
 
 
 /* Placeable metafile header
 struct mfPLACEABLEHEADER {
   return res;
 }
 
 
 /* Placeable metafile header
 struct mfPLACEABLEHEADER {

-       DWORD   key;         // 32-bit
-       HANDLE  hmf;         // 16-bit
-       RECT    bbox;        // 4x16 bit
-       WORD    inch;        // 16-bit
-       DWORD   reserved;    // 32-bit
-       WORD    checksum;    // 16-bit
+    DWORD  key;         // 32-bit
+    HANDLE hmf;         // 16-bit
+    RECT   bbox;        // 4x16 bit
+    WORD   inch;        // 16-bit
+    DWORD  reserved;    // 32-bit
+    WORD   checksum;    // 16-bit

 };
 */
 
 };
 */
 


@@ -92,7 +92,7 @@ wxMetaRecord::~wxMetaRecord(void)
 
 wxXMetaFile::wxXMetaFile(const wxChar *file)
 {
 
 wxXMetaFile::wxXMetaFile(const wxChar *file)
 {

-  ok = FALSE;
+  ok = false;

   top = 0.0;
   bottom = 0.0;
   left = 0.0;
   top = 0.0;
   bottom = 0.0;
   left = 0.0;


@@ -159,7 +159,7 @@ bool wxXMetaFile::ReadFile(const wxChar *file)
   HandleTableSize = 0;
 
   FILE *handle = wxFopen(file, wxT("rb"));
   HandleTableSize = 0;
 
   FILE *handle = wxFopen(file, wxT("rb"));

-  if (!handle) return FALSE;
+  if (!handle) return false;

 
   // Read placeable metafile header, if any
   long key = getint(handle);
 
   // Read placeable metafile header, if any
   long key = getint(handle);


@@ -196,7 +196,7 @@ bool wxXMetaFile::ReadFile(const wxChar *file)
   if (mtType != 1 && mtType != 2)
   {
     fclose(handle);
   if (mtType != 1 && mtType != 2)
   {
     fclose(handle);

-    return FALSE;
+    return false;

   }
 
   /* int mtHeaderSize = */ getshort(handle);
   }
 
   /* int mtHeaderSize = */ getshort(handle);


@@ -205,7 +205,7 @@ bool wxXMetaFile::ReadFile(const wxChar *file)
   if (mtVersion != 0x0300 && mtVersion != 0x0100)
   {
     fclose(handle);
   if (mtVersion != 0x0300 && mtVersion != 0x0100)
   {
     fclose(handle);

-    return FALSE;
+    return false;

   }
 
   /* long mtSize = */ getint(handle);
   }
 
   /* long mtSize = */ getint(handle);


@@ -653,18 +653,26 @@ bool wxXMetaFile::ReadFile(const wxChar *file)
             }
             break;
           }
             }
             break;
           }

+#if PS_DOT != BS_HATCHED
+          /* ABX 30.12.2003                                   */
+          /* in microsoft/include/wingdi.h  both are the same */
+          /* in fact I'm not sure  why pen related PS_XXX and */
+          /* BS_XXX constants are all mixed into single style */
+          case PS_DOT:
+            style = wxDOT;
+            break;
+#endif
+          case PS_DASH:
+            style = wxSHORT_DASH;
+            break;
+          case PS_NULL:
+            style = wxTRANSPARENT;
+            break;

           case BS_SOLID:
           default:
             style = wxSOLID;
             break;
         }
           case BS_SOLID:
           default:
             style = wxSOLID;
             break;
         }

-        if (msStyle == PS_DOT)
-          style = wxDOT;
-        else if (msStyle == PS_DASH)
-          style = wxSHORT_DASH;
-        else if (msStyle == PS_NULL)
-          style = wxTRANSPARENT;
-        else style = wxSOLID;

 
         wxColour colour(GetRValue(colorref), GetGValue(colorref), GetBValue(colorref));
         rec->param1 = (long)wxTheBrushList->FindOrCreateBrush(colour, style);
 
         wxColour colour(GetRValue(colorref), GetGValue(colorref), GetBValue(colorref));
         rec->param1 = (long)wxTheBrushList->FindOrCreateBrush(colour, style);


@@ -715,7 +723,7 @@ bool wxXMetaFile::ReadFile(const wxChar *file)
     }
   }
   fclose(handle);
     }
   }
   fclose(handle);

-  return TRUE;
+  return true;

 }
 
 wxXMetaFile::~wxXMetaFile(void)
 }
 
 wxXMetaFile::~wxXMetaFile(void)


@@ -733,7 +741,7 @@ wxXMetaFile::~wxXMetaFile(void)
 
 bool wxXMetaFile::SetClipboard(int WXUNUSED(width), int WXUNUSED(height))
 {
 
 bool wxXMetaFile::SetClipboard(int WXUNUSED(width), int WXUNUSED(height))
 {

-  return FALSE;
+  return false;

 }
 
 bool wxXMetaFile::Play(wxDC *dc)
 }
 
 bool wxXMetaFile::Play(wxDC *dc)


@@ -1074,6 +1082,6 @@ bool wxXMetaFile::Play(wxDC *dc)
     }
     node = node->GetNext();
   }
     }
     node = node->GetNext();
   }

-  return TRUE;
+  return true;

 }
 
 }