X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/33ac7e6f01acbac1cff0ad400d8ea7f0bfd0a62f..69120ee48a66faa743b6e7c85a745806f53228ac:/src/msw/enhmeta.cpp

diff --git a/src/msw/enhmeta.cpp b/src/msw/enhmeta.cpp
index ac757f7bd5..621208202c 100644
--- a/src/msw/enhmeta.cpp
+++ b/src/msw/enhmeta.cpp
@@ -6,7 +6,7 @@
 // Created:     13.01.00
 // RCS-ID:      $Id$
 // Copyright:   (c) 2000 Vadim Zeitlin <zeitlin@dptmaths.ens-cachan.fr>
-// Licence:     wxWindows license
+// Licence:     wxWindows licence
 ///////////////////////////////////////////////////////////////////////////////
 
 // ============================================================================
@@ -17,7 +17,7 @@
 // headers
 // ----------------------------------------------------------------------------
 
-#ifdef __GNUG__
+#if defined(__GNUG__) && !defined(NO_GCC_PRAGMA)
     #pragma implementation "enhmeta.h"
 #endif
 
@@ -33,6 +33,7 @@
 #ifndef WX_PRECOMP
     #include "wx/string.h"
     #include "wx/log.h"
+    #include "wx/intl.h"
 #endif //WX_PRECOMP
 
 #include "wx/metafile.h"
@@ -70,6 +71,21 @@ static inline const wxChar *GetMetaFileName(const wxString& fn)
 // wxEnhMetaFile
 // ----------------------------------------------------------------------------
 
+void wxEnhMetaFile::Init()
+{
+    if ( m_filename.empty() )
+    {
+        m_hMF = 0;
+    }
+    else // have valid file name, load metafile from it
+    {
+        m_hMF = GetEnhMetaFile(m_filename);
+        if ( !m_hMF )
+            wxLogSysError(_("Failed to load metafile from file \"%s\"."),
+                          m_filename.c_str());
+    }
+}
+
 void wxEnhMetaFile::Assign(const wxEnhMetaFile& mf)
 {
     if ( &mf == this )
@@ -103,7 +119,7 @@ void wxEnhMetaFile::Free()
 
 bool wxEnhMetaFile::Play(wxDC *dc, wxRect *rectBound)
 {
-    wxCHECK_MSG( Ok(), FALSE, _T("can't play invalid enhanced metafile") );
+    wxCHECK_MSG( Ok(), false, _T("can't play invalid enhanced metafile") );
     wxCHECK_MSG( dc, FALSE, _T("invalid wxDC in wxEnhMetaFile::Play") );
 
     RECT rect;
@@ -128,10 +144,10 @@ bool wxEnhMetaFile::Play(wxDC *dc, wxRect *rectBound)
     {
         wxLogLastError(_T("PlayEnhMetaFile"));
 
-        return FALSE;
+        return false;
     }
 
-    return TRUE;
+    return true;
 }
 
 wxSize wxEnhMetaFile::GetSize() const
@@ -170,7 +186,7 @@ bool wxEnhMetaFile::SetClipboard(int WXUNUSED(width), int WXUNUSED(height))
     return wxTheClipboard->AddData(new wxEnhMetaFileDataObject(*this));
 #else // !wxUSE_DRAG_AND_DROP
     wxFAIL_MSG(_T("not implemented"));
-    return FALSE;
+    return false;
 #endif // wxUSE_DRAG_AND_DROP/!wxUSE_DRAG_AND_DROP
 }
 
@@ -184,7 +200,7 @@ wxEnhMetaFileDC::wxEnhMetaFileDC(const wxString& filename,
 {
     ScreenHDC hdcRef;
     RECT rect;
-	RECT *pRect;
+    RECT *pRect;
     if ( width && height )
     {
         rect.top =
@@ -276,7 +292,7 @@ size_t wxEnhMetaFileDataObject::GetDataSize(const wxDataFormat& format) const
 
 bool wxEnhMetaFileDataObject::GetDataHere(const wxDataFormat& format, void *buf) const
 {
-    wxCHECK_MSG( m_metafile.Ok(), FALSE, _T("copying invalid enh metafile") );
+    wxCHECK_MSG( m_metafile.Ok(), false, _T("copying invalid enh metafile") );
 
     HENHMETAFILE hEMF = (HENHMETAFILE)m_metafile.GetHENHMETAFILE();
 
@@ -287,7 +303,7 @@ bool wxEnhMetaFileDataObject::GetDataHere(const wxDataFormat& format, void *buf)
         {
             wxLogLastError(_T("CopyEnhMetaFile"));
 
-            return FALSE;
+            return false;
         }
 
         *(HENHMETAFILE *)buf = hEMFCopy;
@@ -313,7 +329,7 @@ bool wxEnhMetaFileDataObject::GetDataHere(const wxDataFormat& format, void *buf)
 
             free(bits);
 
-            return FALSE;
+            return false;
         }
 
         // and finally convert them to the WMF
@@ -323,7 +339,7 @@ bool wxEnhMetaFileDataObject::GetDataHere(const wxDataFormat& format, void *buf)
         {
             wxLogLastError(_T("SetMetaFileBitsEx"));
 
-            return FALSE;
+            return false;
         }
 
         METAFILEPICT *mfpict = (METAFILEPICT *)buf;
@@ -337,7 +353,7 @@ bool wxEnhMetaFileDataObject::GetDataHere(const wxDataFormat& format, void *buf)
         PixelToHIMETRIC(&mfpict->xExt, &mfpict->yExt);
     }
 
-    return TRUE;
+    return true;
 }
 
 bool wxEnhMetaFileDataObject::SetData(const wxDataFormat& format,
@@ -371,7 +387,7 @@ bool wxEnhMetaFileDataObject::SetData(const wxDataFormat& format,
 
             free(bits);
 
-            return FALSE;
+            return false;
         }
 
         ScreenHDC hdcRef;
@@ -383,13 +399,13 @@ bool wxEnhMetaFileDataObject::SetData(const wxDataFormat& format,
         {
             wxLogLastError(_T("SetWinMetaFileBits"));
 
-            return FALSE;
+            return false;
         }
     }
 
     m_metafile.SetHENHMETAFILE((WXHANDLE)hEMF);
 
-    return TRUE;
+    return true;
 }
 
 // ----------------------------------------------------------------------------
@@ -404,7 +420,7 @@ size_t wxEnhMetaFileSimpleDataObject::GetDataSize() const
 
 bool wxEnhMetaFileSimpleDataObject::GetDataHere(void *buf) const
 {
-    wxCHECK_MSG( m_metafile.Ok(), FALSE, _T("copying invalid enh metafile") );
+    wxCHECK_MSG( m_metafile.Ok(), false, _T("copying invalid enh metafile") );
 
     HENHMETAFILE hEMF = (HENHMETAFILE)m_metafile.GetHENHMETAFILE();
 
@@ -413,11 +429,11 @@ bool wxEnhMetaFileSimpleDataObject::GetDataHere(void *buf) const
     {
         wxLogLastError(_T("CopyEnhMetaFile"));
 
-        return FALSE;
+        return false;
     }
 
     *(HENHMETAFILE *)buf = hEMFCopy;
-    return TRUE;
+    return true;
 }
 
 bool wxEnhMetaFileSimpleDataObject::SetData(size_t WXUNUSED(len),
@@ -428,9 +444,10 @@ bool wxEnhMetaFileSimpleDataObject::SetData(size_t WXUNUSED(len),
     wxCHECK_MSG( hEMF, FALSE, _T("pasting invalid enh metafile") );
     m_metafile.SetHENHMETAFILE((WXHANDLE)hEMF);
 
-    return TRUE;
+    return true;
 }
 
+
 #endif // wxUSE_DRAG_AND_DROP
 
 #endif // wxUSE_ENH_METAFILE