X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/d9317fd47263a9521466156d7bf0f7988000bf15..57c26f8210c40317d70d616a05198e042ee9175b:/src/msw/metafile.cpp?ds=sidebyside

diff --git a/src/msw/metafile.cpp b/src/msw/metafile.cpp
index eb13f6384f..ec6f66f44f 100644
--- a/src/msw/metafile.cpp
+++ b/src/msw/metafile.cpp
@@ -5,8 +5,8 @@
 // Modified by: VZ 07.01.00: implemented wxMetaFileDataObject
 // Created:     04/01/98
 // RCS-ID:      $Id$
-// Copyright:   (c) Julian Smart and Markus Holzem
-// Licence:     wxWindows license
+// Copyright:   (c) Julian Smart
+// Licence:     wxWindows licence
 /////////////////////////////////////////////////////////////////////////////
 
 // ============================================================================
@@ -17,7 +17,7 @@
 // headers
 // ----------------------------------------------------------------------------
 
-#ifdef __GNUG__
+#if defined(__GNUG__) && !defined(NO_GCC_PRAGMA)
     #pragma implementation "metafile.h"
 #endif
 
@@ -94,7 +94,7 @@ wxMetafile::wxMetafile(const wxString& file)
 
     M_METAFILEDATA->m_windowsMappingMode = wxMM_ANISOTROPIC;
     M_METAFILEDATA->m_metafile = 0;
-    if (!file.IsNull() && (file.Cmp(wxT("")) == 0))
+    if (!file.empty())
         M_METAFILEDATA->m_metafile = (WXHANDLE) GetMetaFile(file);
 }
 
@@ -104,27 +104,31 @@ wxMetafile::~wxMetafile()
 
 bool wxMetafile::SetClipboard(int width, int height)
 {
+#if !wxUSE_CLIPBOARD
+    return false;
+#else
     if (!m_refData)
-        return FALSE;
+        return false;
 
     bool alreadyOpen = wxClipboardOpen();
     if (!alreadyOpen)
     {
         wxOpenClipboard();
         if (!wxEmptyClipboard())
-            return FALSE;
+            return false;
     }
     bool success = wxSetClipboardData(wxDF_METAFILE, this, width,height);
     if (!alreadyOpen)
         wxCloseClipboard();
 
     return success;
+#endif
 }
 
 bool wxMetafile::Play(wxDC *dc)
 {
     if (!m_refData)
-        return FALSE;
+        return false;
 
     dc->BeginDrawing();
 
@@ -139,7 +143,7 @@ bool wxMetafile::Play(wxDC *dc)
 
     dc->EndDrawing();
 
-    return TRUE;
+    return true;
 }
 
 void wxMetafile::SetHMETAFILE(WXHANDLE mf)
@@ -176,7 +180,7 @@ wxMetafileDC::wxMetafileDC(const wxString& file)
     if (!file.IsNull() && wxFileExists(file))
         wxRemoveFile(file);
 
-    if (!file.IsNull() && (file != wxT("")))
+    if (!file.IsNull() && (file != wxEmptyString))
         m_hDC = (WXHDC) CreateMetaFile(file);
     else
         m_hDC = (WXHDC) CreateMetaFile(NULL);
@@ -197,11 +201,11 @@ wxMetafileDC::wxMetafileDC(const wxString& file, int xext, int yext, int xorg, i
     m_minY = 10000;
     m_maxX = -10000;
     m_maxY = -10000;
-    if ( !!file && wxFileExists(file))
+    if ( !file.IsEmpty() && wxFileExists(file))
         wxRemoveFile(file);
     m_hDC = (WXHDC) CreateMetaFile(file);
 
-    m_ok = TRUE;
+    m_ok = true;
 
     ::SetWindowOrgEx((HDC) m_hDC,xorg,yorg, NULL);
     ::SetWindowExtEx((HDC) m_hDC,xext,yext, NULL);
@@ -218,7 +222,7 @@ wxMetafileDC::~wxMetafileDC()
 }
 
 void wxMetafileDC::GetTextExtent(const wxString& string, long *x, long *y,
-                                 long *descent, long *externalLeading, wxFont *theFont, bool use16bit) const
+                                 long *descent, long *externalLeading, wxFont *theFont, bool WXUNUSED(use16bit)) const
 {
     wxFont *fontToUse = theFont;
     if (!fontToUse)
@@ -304,8 +308,6 @@ void wxMetafileDC::SetMapMode(int mode)
                 break;
             }
     }
-    m_windowExtX = 100;
-    m_windowExtY = 100;
 }
 
 // ----------------------------------------------------------------------------
@@ -349,7 +351,7 @@ struct mfPLACEABLEHEADER {
 
 bool wxMakeMetafilePlaceable(const wxString& filename, float scale)
 {
-  return wxMakeMetafilePlaceable(filename, 0, 0, 0, 0, scale, FALSE);
+    return wxMakeMetafilePlaceable(filename, 0, 0, 0, 0, scale, false);
 }
 
 bool wxMakeMetafilePlaceable(const wxString& filename, int x1, int y1, int x2, int y2, float scale, bool useOriginAndExtent)
@@ -375,14 +377,14 @@ bool wxMakeMetafilePlaceable(const wxString& filename, int x1, int y1, int x2, i
             p < (WORD *)&pMFHead ->checksum; ++p)
         pMFHead ->checksum ^= *p;
 
-    FILE *fd = fopen(filename.fn_str(), "rb");
-    if (!fd) return FALSE;
+    FILE *fd = wxFopen(filename.fn_str(), _T("rb"));
+    if (!fd) return false;
 
     wxChar tempFileBuf[256];
     wxGetTempFileName(wxT("mf"), tempFileBuf);
-    FILE *fHandle = fopen(wxConvFile.cWX2MB(tempFileBuf), "wb");
+    FILE *fHandle = wxFopen(wxFNCONV(tempFileBuf), _T("wb"));
     if (!fHandle)
-        return FALSE;
+        return false;
     fwrite((void *)&header, sizeof(unsigned char), sizeof(mfPLACEABLEHEADER), fHandle);
 
     // Calculate origin and extent
@@ -447,7 +449,7 @@ bool wxMakeMetafilePlaceable(const wxString& filename, int x1, int y1, int x2, i
     wxRemoveFile(filename);
     wxCopyFile(tempFileBuf, filename);
     wxRemoveFile(tempFileBuf);
-    return TRUE;
+    return true;
 }
 
 
@@ -467,7 +469,7 @@ bool wxMetafileDataObject::GetDataHere(void *buf) const
     METAFILEPICT *mfpict = (METAFILEPICT *)buf;
     const wxMetafile& mf = GetMetafile();
 
-    wxCHECK_MSG( mf.GetHMETAFILE(), FALSE, _T("copying invalid metafile") );
+    wxCHECK_MSG( mf.GetHMETAFILE(), false, _T("copying invalid metafile") );
 
     // doesn't seem to work with any other mapping mode...
     mfpict->mm   = MM_ANISOTROPIC; //mf.GetWindowsMappingMode();
@@ -480,7 +482,7 @@ bool wxMetafileDataObject::GetDataHere(void *buf) const
 
     mfpict->hMF  = CopyMetaFile((HMETAFILE)mf.GetHMETAFILE(), NULL);
 
-    return TRUE;
+    return true;
 }
 
 bool wxMetafileDataObject::SetData(size_t WXUNUSED(len), const void *buf)
@@ -490,8 +492,8 @@ bool wxMetafileDataObject::SetData(size_t WXUNUSED(len), const void *buf)
     wxMetafile mf;
     mf.SetWindowsMappingMode(mfpict->mm);
 
-    int w = mfpict->xExt,
-        h = mfpict->yExt;
+    LONG w = mfpict->xExt,
+         h = mfpict->yExt;
     if ( mfpict->mm == MM_ANISOTROPIC )
     {
         // in this case xExt and yExt contain suggested size in HIMETRIC units
@@ -503,11 +505,11 @@ bool wxMetafileDataObject::SetData(size_t WXUNUSED(len), const void *buf)
     mf.SetHeight(h);
     mf.SetHMETAFILE((WXHANDLE)mfpict->hMF);
 
-    wxCHECK_MSG( mfpict->hMF, FALSE, _T("pasting invalid metafile") );
+    wxCHECK_MSG( mfpict->hMF, false, _T("pasting invalid metafile") );
 
     SetMetafile(mf);
 
-    return TRUE;
+    return true;
 }
 
 #endif // wxUSE_DRAG_AND_DROP