added a unit test for input/output file streams and fixed the problem it exposed...

[wxWidgets.git] / src / msw / metafile.cpp

diff --git a/src/msw/metafile.cpp b/src/msw/metafile.cpp
index 69bca27a2404e9961a7da7fc47f8f357811ea604..7152568160d0e7be08d668f5f9ddd9b4ce407de1 100644 (file)
--- a/src/msw/metafile.cpp
+++ b/src/msw/metafile.cpp
@@ -1,12 +1,12 @@
 /////////////////////////////////////////////////////////////////////////////
 /////////////////////////////////////////////////////////////////////////////

-// Name:        msw/metafile.cpp
+// Name:        src/msw/metafile.cpp

 // Purpose:     wxMetafileDC etc.
 // Author:      Julian Smart
 // Modified by: VZ 07.01.00: implemented wxMetaFileDataObject
 // Created:     04/01/98
 // RCS-ID:      $Id$
 // Purpose:     wxMetafileDC etc.
 // Author:      Julian Smart
 // 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,10 +17,6 @@
 // headers
 // ----------------------------------------------------------------------------
 
 // headers
 // ----------------------------------------------------------------------------
 

-#ifdef __GNUG__
-    #pragma implementation "metafile.h"
-#endif
-

 // For compilers that support precompilation, includes "wx.h".
 #include "wx/wxprec.h"
 
 // For compilers that support precompilation, includes "wx.h".
 #include "wx/wxprec.h"
 


@@ -28,18 +24,15 @@
     #pragma hdrstop
 #endif
 
     #pragma hdrstop
 #endif
 

-#ifndef WX_PRECOMP
-    #include "wx/setup.h"
-#endif
-
-#if wxUSE_METAFILE
-

 #ifndef WX_PRECOMP
     #include "wx/utils.h"
     #include "wx/app.h"
 #endif
 
 #include "wx/metafile.h"
 #ifndef WX_PRECOMP
     #include "wx/utils.h"
     #include "wx/app.h"
 #endif
 
 #include "wx/metafile.h"

+
+#if wxUSE_METAFILE && !defined(wxMETAFILE_IS_ENH)
+

 #include "wx/clipbrd.h"
 #include "wx/msw/private.h"
 
 #include "wx/clipbrd.h"
 #include "wx/msw/private.h"
 


@@ -93,7 +86,7 @@ wxMetafile::wxMetafile(const wxString& file)
 
     M_METAFILEDATA->m_windowsMappingMode = wxMM_ANISOTROPIC;
     M_METAFILEDATA->m_metafile = 0;
 
     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);
 }
 
         M_METAFILEDATA->m_metafile = (WXHANDLE) GetMetaFile(file);
 }
 


@@ -101,38 +94,54 @@ wxMetafile::~wxMetafile()
 {
 }
 
 {
 }
 

+wxGDIRefData *wxMetafile::CreateGDIRefData() const
+{
+    return new wxMetafileRefData;
+}
+
+wxGDIRefData *wxMetafile::CloneGDIRefData(const wxGDIRefData *data) const
+{
+    return new wxMetafileRefData(*wx_static_cast(const wxMetafileRefData *, data));
+}
+

 bool wxMetafile::SetClipboard(int width, int height)
 {
 bool wxMetafile::SetClipboard(int width, int height)
 {

+#if !wxUSE_CLIPBOARD
+    return false;
+#else

     if (!m_refData)
     if (!m_refData)

-        return FALSE;
+        return false;

 
     bool alreadyOpen = wxClipboardOpen();
     if (!alreadyOpen)
     {
         wxOpenClipboard();
         if (!wxEmptyClipboard())
 
     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;
     }
     bool success = wxSetClipboardData(wxDF_METAFILE, this, width,height);
     if (!alreadyOpen)
         wxCloseClipboard();
 
     return success;

+#endif

 }
 
 bool wxMetafile::Play(wxDC *dc)
 {
     if (!m_refData)
 }
 
 bool wxMetafile::Play(wxDC *dc)
 {
     if (!m_refData)

-        return FALSE;
-
-    dc->BeginDrawing();
+        return false;

 
     if (dc->GetHDC() && M_METAFILEDATA->m_metafile)
 
     if (dc->GetHDC() && M_METAFILEDATA->m_metafile)

-        PlayMetaFile(GetHdcOf(*dc), (HMETAFILE) M_METAFILEDATA->m_metafile);
-
-    dc->EndDrawing();
+    {
+        if ( !::PlayMetaFile(GetHdcOf(*dc), (HMETAFILE)
+                             M_METAFILEDATA->m_metafile) )
+        {
+            wxLogLastError(_T("PlayMetaFile"));
+        }
+    }

 
 

-    return TRUE;
+    return true;

 }
 
 void wxMetafile::SetHMETAFILE(WXHANDLE mf)
 }
 
 void wxMetafile::SetHMETAFILE(WXHANDLE mf)


@@ -157,7 +166,8 @@ void wxMetafile::SetWindowsMappingMode(int mm)
 
 // Original constructor that does not takes origin and extent. If you use this,
 // *DO* give origin/extent arguments to wxMakeMetafilePlaceable.
 
 // Original constructor that does not takes origin and extent. If you use this,
 // *DO* give origin/extent arguments to wxMakeMetafilePlaceable.

-wxMetafileDC::wxMetafileDC(const wxString& file)
+wxMetafileDCImpl::wxMetafileDCImpl(wxDC *owner, const wxString& file)
+    : wxMSWDCImpl(owner)

 {
     m_metaFile = NULL;
     m_minX = 10000;
 {
     m_metaFile = NULL;
     m_minX = 10000;


@@ -169,7 +179,7 @@ wxMetafileDC::wxMetafileDC(const wxString& file)
     if (!file.IsNull() && wxFileExists(file))
         wxRemoveFile(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);
         m_hDC = (WXHDC) CreateMetaFile(file);
     else
         m_hDC = (WXHDC) CreateMetaFile(NULL);


@@ -184,17 +194,19 @@ wxMetafileDC::wxMetafileDC(const wxString& file)
 
 // New constructor that takes origin and extent. If you use this, don't
 // give origin/extent arguments to wxMakeMetafilePlaceable.
 
 // New constructor that takes origin and extent. If you use this, don't
 // give origin/extent arguments to wxMakeMetafilePlaceable.

-wxMetafileDC::wxMetafileDC(const wxString& file, int xext, int yext, int xorg, int yorg)
+wxMetafileDCImpl::wxMetafileDCImpl(wxDC *owner, const wxString& file,
+                                   int xext, int yext, int xorg, int yorg)
+    : wxMSWDCImpl(owner)

 {
     m_minX = 10000;
     m_minY = 10000;
     m_maxX = -10000;
     m_maxY = -10000;
 {
     m_minX = 10000;
     m_minY = 10000;
     m_maxX = -10000;
     m_maxY = -10000;

-    if ( !!file && wxFileExists(file))
+    if ( !file.empty() && wxFileExists(file) )

         wxRemoveFile(file);
         wxRemoveFile(file);

-    m_hDC = (WXHDC) CreateMetaFile(file);
+    m_hDC = (WXHDC) CreateMetaFile(file.empty() ? NULL : file.wx_str());

 
 

-    m_ok = TRUE;
+    m_ok = true;

 
     ::SetWindowOrgEx((HDC) m_hDC,xorg,yorg, NULL);
     ::SetWindowExtEx((HDC) m_hDC,xext,yext, NULL);
 
     ::SetWindowOrgEx((HDC) m_hDC,xorg,yorg, NULL);
     ::SetWindowExtEx((HDC) m_hDC,xext,yext, NULL);


@@ -205,26 +217,27 @@ wxMetafileDC::wxMetafileDC(const wxString& file, int xext, int yext, int xorg, i
     SetMapMode(wxMM_TEXT); // NOTE: does not set HDC mapmode (this is correct)
 }
 
     SetMapMode(wxMM_TEXT); // NOTE: does not set HDC mapmode (this is correct)
 }
 

-wxMetafileDC::~wxMetafileDC()
+wxMetafileDCImpl::~wxMetafileDCImpl()

 {
     m_hDC = 0;
 }
 
 {
     m_hDC = 0;
 }
 

-void wxMetafileDC::GetTextExtent(const wxString& string, long *x, long *y,
-                                 long *descent, long *externalLeading, wxFont *theFont, bool use16bit) const
+void wxMetafileDCImpl::DoGetTextExtent(const wxString& string,
+                                       wxCoord *x, wxCoord *y,
+                                       wxCoord *descent, wxCoord *externalLeading,
+                                       const wxFont *theFont) const

 {
 {

-    wxFont *fontToUse = theFont;
+    const wxFont *fontToUse = theFont;

     if (!fontToUse)
     if (!fontToUse)

-        fontToUse = (wxFont*) &m_font;
+        fontToUse = &m_font;

 
 

-    HDC dc = GetDC(NULL);
+    ScreenHDC dc;
+    SelectInHDC selFont(dc, GetHfontOf(*fontToUse));

 
     SIZE sizeRect;
     TEXTMETRIC tm;
 
     SIZE sizeRect;
     TEXTMETRIC tm;

-    GetTextExtentPoint(dc, WXSTRINGCAST string, wxStrlen(WXSTRINGCAST string), &sizeRect);
-    GetTextMetrics(dc, &tm);
-
-    ReleaseDC(NULL, dc);
+    ::GetTextExtentPoint32(dc, WXSTRINGCAST string, wxStrlen(WXSTRINGCAST string), &sizeRect);
+    ::GetTextMetrics(dc, &tm);

 
     if ( x )
         *x = sizeRect.cx;
 
     if ( x )
         *x = sizeRect.cx;


@@ -236,7 +249,17 @@ void wxMetafileDC::GetTextExtent(const wxString& string, long *x, long *y,
         *externalLeading = tm.tmExternalLeading;
 }
 
         *externalLeading = tm.tmExternalLeading;
 }
 

-wxMetafile *wxMetafileDC::Close()
+void wxMetafileDCImpl::DoGetSize(int *width, int *height) const
+{
+    wxCHECK_RET( m_refData, _T("invalid wxMetafileDC") );
+
+    if ( width )
+        *width = M_METAFILEDATA->m_width;
+    if ( height )
+        *height = M_METAFILEDATA->m_height;
+}
+
+wxMetafile *wxMetafileDCImpl::Close()

 {
     SelectOldObjects(m_hDC);
     HANDLE mf = CloseMetaFile((HDC) m_hDC);
 {
     SelectOldObjects(m_hDC);
     HANDLE mf = CloseMetaFile((HDC) m_hDC);


@@ -251,7 +274,7 @@ wxMetafile *wxMetafileDC::Close()
     return NULL;
 }
 
     return NULL;
 }
 

-void wxMetafileDC::SetMapMode(int mode)
+void wxMetafileDCImpl::SetMapMode(int mode)

 {
     m_mappingMode = mode;
 
 {
     m_mappingMode = mode;
 


@@ -297,8 +320,6 @@ void wxMetafileDC::SetMapMode(int mode)
                 break;
             }
     }
                 break;
             }
     }

-    m_windowExtX = 100;
-    m_windowExtY = 100;

 }
 
 // ----------------------------------------------------------------------------
 }
 
 // ----------------------------------------------------------------------------


@@ -342,7 +363,7 @@ struct mfPLACEABLEHEADER {
 
 bool wxMakeMetafilePlaceable(const wxString& filename, float scale)
 {
 
 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)
 }
 
 bool wxMakeMetafilePlaceable(const wxString& filename, int x1, int y1, int x2, int y2, float scale, bool useOriginAndExtent)


@@ -368,14 +389,14 @@ bool wxMakeMetafilePlaceable(const wxString& filename, int x1, int y1, int x2, i
             p < (WORD *)&pMFHead ->checksum; ++p)
         pMFHead ->checksum ^= *p;
 
             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);
 
     wxChar tempFileBuf[256];
     wxGetTempFileName(wxT("mf"), tempFileBuf);

-    FILE *fHandle = fopen(wxConvFile.cWX2MB(tempFileBuf), "wb");
+    FILE *fHandle = wxFopen(wxFNCONV(tempFileBuf), _T("wb"));

     if (!fHandle)
     if (!fHandle)

-        return FALSE;
+        return false;

     fwrite((void *)&header, sizeof(unsigned char), sizeof(mfPLACEABLEHEADER), fHandle);
 
     // Calculate origin and extent
     fwrite((void *)&header, sizeof(unsigned char), sizeof(mfPLACEABLEHEADER), fHandle);
 
     // Calculate origin and extent


@@ -440,7 +461,7 @@ bool wxMakeMetafilePlaceable(const wxString& filename, int x1, int y1, int x2, i
     wxRemoveFile(filename);
     wxCopyFile(tempFileBuf, filename);
     wxRemoveFile(tempFileBuf);
     wxRemoveFile(filename);
     wxCopyFile(tempFileBuf, filename);
     wxRemoveFile(tempFileBuf);

-    return TRUE;
+    return true;

 }
 
 
 }
 
 


@@ -458,15 +479,22 @@ size_t wxMetafileDataObject::GetDataSize() const
 bool wxMetafileDataObject::GetDataHere(void *buf) const
 {
     METAFILEPICT *mfpict = (METAFILEPICT *)buf;
 bool wxMetafileDataObject::GetDataHere(void *buf) const
 {
     METAFILEPICT *mfpict = (METAFILEPICT *)buf;

-    const wxMetafile mf = GetMetafile();
-    mfpict->mm   = mf.GetWindowsMappingMode();
+    const wxMetafile& mf = GetMetafile();
+
+    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();

     mfpict->xExt = mf.GetWidth();
     mfpict->yExt = mf.GetHeight();
     mfpict->xExt = mf.GetWidth();
     mfpict->yExt = mf.GetHeight();

-    mfpict->hMF  = (HMETAFILE)mf.GetHMETAFILE();

 
 

-    wxCHECK_MSG( mfpict->hMF, FALSE, _T("copying invalid metafile") );
+    // transform the picture size to HIMETRIC units (0.01mm) - as we don't know
+    // what DC the picture will be rendered to, use the default display one
+    PixelToHIMETRIC(&mfpict->xExt, &mfpict->yExt);

 
 

-    return TRUE;
+    mfpict->hMF  = CopyMetaFile((HMETAFILE)mf.GetHMETAFILE(), NULL);
+
+    return true;

 }
 
 bool wxMetafileDataObject::SetData(size_t WXUNUSED(len), const void *buf)
 }
 
 bool wxMetafileDataObject::SetData(size_t WXUNUSED(len), const void *buf)


@@ -475,18 +503,27 @@ bool wxMetafileDataObject::SetData(size_t WXUNUSED(len), const void *buf)
 
     wxMetafile mf;
     mf.SetWindowsMappingMode(mfpict->mm);
 
     wxMetafile mf;
     mf.SetWindowsMappingMode(mfpict->mm);

-    mf.SetWidth(mfpict->xExt);
-    mf.SetHeight(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
+        // (0.01 mm) - transform this to something more reasonable (pixels)
+        HIMETRICToPixel(&w, &h);
+    }
+
+    mf.SetWidth(w);
+    mf.SetHeight(h);

     mf.SetHMETAFILE((WXHANDLE)mfpict->hMF);
 
     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);
 
 
     SetMetafile(mf);
 

-    return TRUE;
+    return true;

 }
 
 #endif // wxUSE_DRAG_AND_DROP
 
 #endif // wxUSE_METAFILE
 }
 
 #endif // wxUSE_DRAG_AND_DROP
 
 #endif // wxUSE_METAFILE

-