Enable variadic macros for VC9 and later.

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

diff --git a/src/msw/metafile.cpp b/src/msw/metafile.cpp
index 29c08d30f2aa5b71c3bb98bcb727baa7aac1ee1d..843983b43a5cec51de4e58455596cb2ff1dbd98e 100644 (file)
--- a/src/msw/metafile.cpp
+++ b/src/msw/metafile.cpp
@@ -30,6 +30,7 @@
 #endif
 
 #include "wx/metafile.h"
 #endif
 
 #include "wx/metafile.h"

+#include "wx/filename.h"

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


@@ -63,7 +64,7 @@ IMPLEMENT_ABSTRACT_CLASS(wxMetafileDC, wxDC)
 wxMetafileRefData::wxMetafileRefData()
 {
     m_metafile = 0;
 wxMetafileRefData::wxMetafileRefData()
 {
     m_metafile = 0;

-    m_windowsMappingMode = wxMM_ANISOTROPIC;
+    m_windowsMappingMode = MM_ANISOTROPIC;

     m_width = m_height = 0;
 }
 
     m_width = m_height = 0;
 }
 


@@ -84,7 +85,7 @@ wxMetafile::wxMetafile(const wxString& file)
 {
     m_refData = new wxMetafileRefData;
 
 {
     m_refData = new wxMetafileRefData;
 

-    M_METAFILEDATA->m_windowsMappingMode = wxMM_ANISOTROPIC;
+    M_METAFILEDATA->m_windowsMappingMode = MM_ANISOTROPIC;

     M_METAFILEDATA->m_metafile = 0;
     if (!file.empty())
         M_METAFILEDATA->m_metafile = (WXHANDLE) GetMetaFile(file);
     M_METAFILEDATA->m_metafile = 0;
     if (!file.empty())
         M_METAFILEDATA->m_metafile = (WXHANDLE) GetMetaFile(file);


@@ -94,6 +95,16 @@ wxMetafile::~wxMetafile()
 {
 }
 
 {
 }
 

+wxGDIRefData *wxMetafile::CreateGDIRefData() const
+{
+    return new wxMetafileRefData;
+}
+
+wxGDIRefData *wxMetafile::CloneGDIRefData(const wxGDIRefData *data) const
+{
+    return new wxMetafileRefData(*static_cast<const wxMetafileRefData *>(data));
+}
+

 bool wxMetafile::SetClipboard(int width, int height)
 {
 #if !wxUSE_CLIPBOARD
 bool wxMetafile::SetClipboard(int width, int height)
 {
 #if !wxUSE_CLIPBOARD


@@ -127,7 +138,7 @@ bool wxMetafile::Play(wxDC *dc)
         if ( !::PlayMetaFile(GetHdcOf(*dc), (HMETAFILE)
                              M_METAFILEDATA->m_metafile) )
         {
         if ( !::PlayMetaFile(GetHdcOf(*dc), (HMETAFILE)
                              M_METAFILEDATA->m_metafile) )
         {

-            wxLogLastError(_T("PlayMetaFile"));
+            wxLogLastError(wxT("PlayMetaFile"));

         }
     }
 
         }
     }
 


@@ -156,7 +167,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;


@@ -165,13 +177,13 @@ wxMetafileDC::wxMetafileDC(const wxString& file)
     m_maxY = -10000;
     //  m_title = NULL;
 
     m_maxY = -10000;
     //  m_title = NULL;
 

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

         wxRemoveFile(file);
 
         wxRemoveFile(file);
 

-    if (!file.IsNull() && (file != wxEmptyString))
-        m_hDC = (WXHDC) CreateMetaFile(file);
-    else
+    if ( file.empty() )

         m_hDC = (WXHDC) CreateMetaFile(NULL);
         m_hDC = (WXHDC) CreateMetaFile(NULL);

+    else
+        m_hDC = (WXHDC) CreateMetaFile(file);

 
     m_ok = (m_hDC != (WXHDC) 0) ;
 
 
     m_ok = (m_hDC != (WXHDC) 0) ;
 


@@ -183,7 +195,9 @@ 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_minX = 10000;
     m_minY = 10000;


@@ -199,33 +213,32 @@ wxMetafileDC::wxMetafileDC(const wxString& file, int xext, int yext, int xorg, i
     ::SetWindowExtEx((HDC) m_hDC,xext,yext, NULL);
 
     // Actual Windows mapping mode, for future reference.
     ::SetWindowExtEx((HDC) m_hDC,xext,yext, NULL);
 
     // Actual Windows mapping mode, for future reference.

-    m_windowsMappingMode = wxMM_ANISOTROPIC;
+    m_windowsMappingMode = MM_ANISOTROPIC;

 
     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::DoGetTextExtent(const wxString& string,
-                                   wxCoord *x, wxCoord *y,
-                                   wxCoord *descent, wxCoord *externalLeading,
-                                   const wxFont *theFont) const
+void wxMetafileDCImpl::DoGetTextExtent(const wxString& string,
+                                       wxCoord *x, wxCoord *y,
+                                       wxCoord *descent, wxCoord *externalLeading,
+                                       const wxFont *theFont) const

 {
     const wxFont *fontToUse = theFont;
     if (!fontToUse)
         fontToUse = &m_font;
 
 {
     const wxFont *fontToUse = theFont;
     if (!fontToUse)
         fontToUse = &m_font;
 

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

 
     SIZE sizeRect;
     TEXTMETRIC tm;
     ::GetTextExtentPoint32(dc, WXSTRINGCAST string, wxStrlen(WXSTRINGCAST string), &sizeRect);
 
     SIZE sizeRect;
     TEXTMETRIC tm;
     ::GetTextExtentPoint32(dc, WXSTRINGCAST string, wxStrlen(WXSTRINGCAST string), &sizeRect);

-    GetTextMetrics(dc, &tm);
-
-    ReleaseDC(NULL, dc);
+    ::GetTextMetrics(dc, &tm);

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


@@ -237,9 +250,9 @@ void wxMetafileDC::DoGetTextExtent(const wxString& string,
         *externalLeading = tm.tmExternalLeading;
 }
 
         *externalLeading = tm.tmExternalLeading;
 }
 

-void wxMetafileDC::DoGetSize(int *width, int *height) const
+void wxMetafileDCImpl::DoGetSize(int *width, int *height) const

 {
 {

-    wxCHECK_RET( m_refData, _T("invalid wxMetafileDC") );
+    wxCHECK_RET( m_refData, wxT("invalid wxMetafileDC") );

 
     if ( width )
         *width = M_METAFILEDATA->m_width;
 
     if ( width )
         *width = M_METAFILEDATA->m_width;


@@ -247,7 +260,7 @@ void wxMetafileDC::DoGetSize(int *width, int *height) const
         *height = M_METAFILEDATA->m_height;
 }
 
         *height = M_METAFILEDATA->m_height;
 }
 

-wxMetafile *wxMetafileDC::Close()
+wxMetafile *wxMetafileDCImpl::Close()

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


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

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

 {
     m_mappingMode = mode;
 
 {
     m_mappingMode = mode;
 


@@ -377,12 +390,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 = wxFopen(filename.fn_str(), _T("rb"));
+    FILE *fd = wxFopen(filename.fn_str(), wxT("rb"));

     if (!fd) return false;
 
     if (!fd) return false;
 

-    wxChar tempFileBuf[256];
-    wxGetTempFileName(wxT("mf"), tempFileBuf);
-    FILE *fHandle = wxFopen(wxFNCONV(tempFileBuf), _T("wb"));
+    wxString tempFileBuf = wxFileName::CreateTempFileName(wxT("mf"));
+    if (tempFileBuf.empty())
+        return false;
+
+    FILE *fHandle = wxFopen(tempFileBuf.fn_str(), wxT("wb"));

     if (!fHandle)
         return false;
     fwrite((void *)&header, sizeof(unsigned char), sizeof(mfPLACEABLEHEADER), fHandle);
     if (!fHandle)
         return false;
     fwrite((void *)&header, sizeof(unsigned char), sizeof(mfPLACEABLEHEADER), fHandle);


@@ -469,7 +484,7 @@ bool wxMetafileDataObject::GetDataHere(void *buf) const
     METAFILEPICT *mfpict = (METAFILEPICT *)buf;
     const wxMetafile& mf = GetMetafile();
 
     METAFILEPICT *mfpict = (METAFILEPICT *)buf;
     const wxMetafile& mf = GetMetafile();
 

-    wxCHECK_MSG( mf.GetHMETAFILE(), false, _T("copying invalid metafile") );
+    wxCHECK_MSG( mf.GetHMETAFILE(), false, wxT("copying invalid metafile") );

 
     // doesn't seem to work with any other mapping mode...
     mfpict->mm   = MM_ANISOTROPIC; //mf.GetWindowsMappingMode();
 
     // doesn't seem to work with any other mapping mode...
     mfpict->mm   = MM_ANISOTROPIC; //mf.GetWindowsMappingMode();


@@ -505,7 +520,7 @@ bool wxMetafileDataObject::SetData(size_t WXUNUSED(len), const void *buf)
     mf.SetHeight(h);
     mf.SetHMETAFILE((WXHANDLE)mfpict->hMF);
 
     mf.SetHeight(h);
     mf.SetHMETAFILE((WXHANDLE)mfpict->hMF);
 

-    wxCHECK_MSG( mfpict->hMF, false, _T("pasting invalid metafile") );
+    wxCHECK_MSG( mfpict->hMF, false, wxT("pasting invalid metafile") );

 
     SetMetafile(mf);
 
 
     SetMetafile(mf);