Don't reset the best size to wxDefaultSize unless we have a bitmap, otherwise

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

diff --git a/src/msw/metafile.cpp b/src/msw/metafile.cpp
index 3ea9711dc01d6036baa306ffe566a5845cb7e1e9..f1eb74391eb256cf516bc304fcf41e5e6eb963c1 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$
 // Copyright:   (c) Julian Smart
-// Licence:     wxWidgets licence
+// Licence:     wxWindows licence
 /////////////////////////////////////////////////////////////////////////////
 
 // ============================================================================
@@ -17,10 +17,6 @@
 // headers
 // ----------------------------------------------------------------------------
 
-#if defined(__GNUG__) && !defined(NO_GCC_PRAGMA)
-    #pragma implementation "metafile.h"
-#endif
-
 // For compilers that support precompilation, includes "wx.h".
 #include "wx/wxprec.h"
 
@@ -28,10 +24,6 @@
     #pragma hdrstop
 #endif
 
-#ifndef WX_PRECOMP
-    #include "wx/setup.h"
-#endif
-
 #ifndef WX_PRECOMP
     #include "wx/utils.h"
     #include "wx/app.h"
@@ -105,17 +97,17 @@ wxMetafile::~wxMetafile()
 bool wxMetafile::SetClipboard(int width, int height)
 {
 #if !wxUSE_CLIPBOARD
-    return FALSE;
+    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)
@@ -128,9 +120,7 @@ bool wxMetafile::SetClipboard(int width, int height)
 bool wxMetafile::Play(wxDC *dc)
 {
     if (!m_refData)
-        return FALSE;
-
-    dc->BeginDrawing();
+        return false;
 
     if (dc->GetHDC() && M_METAFILEDATA->m_metafile)
     {
@@ -141,9 +131,7 @@ bool wxMetafile::Play(wxDC *dc)
         }
     }
 
-    dc->EndDrawing();
-
-    return TRUE;
+    return true;
 }
 
 void wxMetafile::SetHMETAFILE(WXHANDLE mf)
@@ -201,11 +189,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.empty() && wxFileExists(file) )
         wxRemoveFile(file);
-    m_hDC = (WXHDC) CreateMetaFile(file);
+    m_hDC = (WXHDC) CreateMetaFile(file.empty() ? NULL : file.c_str());
 
-    m_ok = TRUE;
+    m_ok = true;
 
     ::SetWindowOrgEx((HDC) m_hDC,xorg,yorg, NULL);
     ::SetWindowExtEx((HDC) m_hDC,xext,yext, NULL);
@@ -232,7 +220,7 @@ void wxMetafileDC::GetTextExtent(const wxString& string, long *x, long *y,
 
     SIZE sizeRect;
     TEXTMETRIC tm;
-    GetTextExtentPoint(dc, WXSTRINGCAST string, wxStrlen(WXSTRINGCAST string), &sizeRect);
+    ::GetTextExtentPoint32(dc, WXSTRINGCAST string, wxStrlen(WXSTRINGCAST string), &sizeRect);
     GetTextMetrics(dc, &tm);
 
     ReleaseDC(NULL, dc);
@@ -247,6 +235,16 @@ void wxMetafileDC::GetTextExtent(const wxString& string, long *x, long *y,
         *externalLeading = tm.tmExternalLeading;
 }
 
+void wxMetafileDC::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 *wxMetafileDC::Close()
 {
     SelectOldObjects(m_hDC);
@@ -351,7 +349,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)
@@ -378,13 +376,13 @@ bool wxMakeMetafilePlaceable(const wxString& filename, int x1, int y1, int x2, i
         pMFHead ->checksum ^= *p;
 
     FILE *fd = wxFopen(filename.fn_str(), _T("rb"));
-    if (!fd) return FALSE;
+    if (!fd) return false;
 
     wxChar tempFileBuf[256];
     wxGetTempFileName(wxT("mf"), tempFileBuf);
     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
@@ -449,7 +447,7 @@ bool wxMakeMetafilePlaceable(const wxString& filename, int x1, int y1, int x2, i
     wxRemoveFile(filename);
     wxCopyFile(tempFileBuf, filename);
     wxRemoveFile(tempFileBuf);
-    return TRUE;
+    return true;
 }
 
 
@@ -469,7 +467,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();
@@ -482,7 +480,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)
@@ -505,14 +503,13 @@ 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
 
 #endif // wxUSE_METAFILE
-