updated project file

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

diff --git a/src/msw/enhmeta.cpp b/src/msw/enhmeta.cpp
index 0fd8b2d9af796d83a3bb0ed539da9a6a343fe715..1767d356f291bd2610b3d28033d79fa5863b9850 100644 (file)
--- 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>
 // 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
 // ----------------------------------------------------------------------------
 
 // headers
 // ----------------------------------------------------------------------------
 

-#ifdef __GNUG__
+#if defined(__GNUG__) && !defined(NO_GCC_PRAGMA)

     #pragma implementation "enhmeta.h"
 #endif
 
     #pragma implementation "enhmeta.h"
 #endif
 


@@ -103,7 +103,7 @@ void wxEnhMetaFile::Free()
 
 bool wxEnhMetaFile::Play(wxDC *dc, wxRect *rectBound)
 {
 
 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;
     wxCHECK_MSG( dc, FALSE, _T("invalid wxDC in wxEnhMetaFile::Play") );
 
     RECT rect;


@@ -128,10 +128,10 @@ bool wxEnhMetaFile::Play(wxDC *dc, wxRect *rectBound)
     {
         wxLogLastError(_T("PlayEnhMetaFile"));
 
     {
         wxLogLastError(_T("PlayEnhMetaFile"));
 

-        return FALSE;
+        return false;

     }
 
     }
 

-    return TRUE;
+    return true;

 }
 
 wxSize wxEnhMetaFile::GetSize() const
 }
 
 wxSize wxEnhMetaFile::GetSize() const


@@ -164,9 +164,14 @@ wxSize wxEnhMetaFile::GetSize() const
 
 bool wxEnhMetaFile::SetClipboard(int WXUNUSED(width), int WXUNUSED(height))
 {
 
 bool wxEnhMetaFile::SetClipboard(int WXUNUSED(width), int WXUNUSED(height))
 {

+#if wxUSE_DRAG_AND_DROP

     wxCHECK_MSG( m_hMF, FALSE, _T("can't copy invalid metafile to clipboard") );
 
     return wxTheClipboard->AddData(new wxEnhMetaFileDataObject(*this));
     wxCHECK_MSG( m_hMF, FALSE, _T("can't copy invalid metafile to clipboard") );
 
     return wxTheClipboard->AddData(new wxEnhMetaFileDataObject(*this));

+#else // !wxUSE_DRAG_AND_DROP
+    wxFAIL_MSG(_T("not implemented"));
+    return false;
+#endif // wxUSE_DRAG_AND_DROP/!wxUSE_DRAG_AND_DROP

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


@@ -178,8 +183,8 @@ wxEnhMetaFileDC::wxEnhMetaFileDC(const wxString& filename,
                                  const wxString& description)
 {
     ScreenHDC hdcRef;
                                  const wxString& description)
 {
     ScreenHDC hdcRef;

-
-    RECT rect, *pRect;
+    RECT rect;
+    RECT *pRect;

     if ( width && height )
     {
         rect.top =
     if ( width && height )
     {
         rect.top =


@@ -229,12 +234,12 @@ wxEnhMetaFileDC::~wxEnhMetaFileDC()
     m_hDC = 0;
 }
 
     m_hDC = 0;
 }
 

+#if wxUSE_DRAG_AND_DROP
+

 // ----------------------------------------------------------------------------
 // wxEnhMetaFileDataObject
 // ----------------------------------------------------------------------------
 
 // ----------------------------------------------------------------------------
 // wxEnhMetaFileDataObject
 // ----------------------------------------------------------------------------
 

-#if wxUSE_DRAG_AND_DROP
-

 wxDataFormat
 wxEnhMetaFileDataObject::GetPreferredFormat(Direction WXUNUSED(dir)) const
 {
 wxDataFormat
 wxEnhMetaFileDataObject::GetPreferredFormat(Direction WXUNUSED(dir)) const
 {


@@ -271,7 +276,7 @@ size_t wxEnhMetaFileDataObject::GetDataSize(const wxDataFormat& format) const
 
 bool wxEnhMetaFileDataObject::GetDataHere(const wxDataFormat& format, void *buf) 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();
 
 
     HENHMETAFILE hEMF = (HENHMETAFILE)m_metafile.GetHENHMETAFILE();
 


@@ -282,7 +287,7 @@ bool wxEnhMetaFileDataObject::GetDataHere(const wxDataFormat& format, void *buf)
         {
             wxLogLastError(_T("CopyEnhMetaFile"));
 
         {
             wxLogLastError(_T("CopyEnhMetaFile"));
 

-            return FALSE;
+            return false;

         }
 
         *(HENHMETAFILE *)buf = hEMFCopy;
         }
 
         *(HENHMETAFILE *)buf = hEMFCopy;


@@ -308,7 +313,7 @@ bool wxEnhMetaFileDataObject::GetDataHere(const wxDataFormat& format, void *buf)
 
             free(bits);
 
 
             free(bits);
 

-            return FALSE;
+            return false;

         }
 
         // and finally convert them to the WMF
         }
 
         // and finally convert them to the WMF


@@ -318,7 +323,7 @@ bool wxEnhMetaFileDataObject::GetDataHere(const wxDataFormat& format, void *buf)
         {
             wxLogLastError(_T("SetMetaFileBitsEx"));
 
         {
             wxLogLastError(_T("SetMetaFileBitsEx"));
 

-            return FALSE;
+            return false;

         }
 
         METAFILEPICT *mfpict = (METAFILEPICT *)buf;
         }
 
         METAFILEPICT *mfpict = (METAFILEPICT *)buf;


@@ -332,7 +337,7 @@ bool wxEnhMetaFileDataObject::GetDataHere(const wxDataFormat& format, void *buf)
         PixelToHIMETRIC(&mfpict->xExt, &mfpict->yExt);
     }
 
         PixelToHIMETRIC(&mfpict->xExt, &mfpict->yExt);
     }
 

-    return TRUE;
+    return true;

 }
 
 bool wxEnhMetaFileDataObject::SetData(const wxDataFormat& format,
 }
 
 bool wxEnhMetaFileDataObject::SetData(const wxDataFormat& format,


@@ -366,7 +371,7 @@ bool wxEnhMetaFileDataObject::SetData(const wxDataFormat& format,
 
             free(bits);
 
 
             free(bits);
 

-            return FALSE;
+            return false;

         }
 
         ScreenHDC hdcRef;
         }
 
         ScreenHDC hdcRef;


@@ -378,14 +383,55 @@ bool wxEnhMetaFileDataObject::SetData(const wxDataFormat& format,
         {
             wxLogLastError(_T("SetWinMetaFileBits"));
 
         {
             wxLogLastError(_T("SetWinMetaFileBits"));
 

-            return FALSE;
+            return false;

         }
     }
 
     m_metafile.SetHENHMETAFILE((WXHANDLE)hEMF);
 
         }
     }
 
     m_metafile.SetHENHMETAFILE((WXHANDLE)hEMF);
 

-    return TRUE;
+    return true;
+}
+
+// ----------------------------------------------------------------------------
+// wxEnhMetaFileSimpleDataObject
+// ----------------------------------------------------------------------------
+
+size_t wxEnhMetaFileSimpleDataObject::GetDataSize() const
+{
+    // we pass data by handle and not HGLOBAL
+    return 0u;

 }
 }

+
+bool wxEnhMetaFileSimpleDataObject::GetDataHere(void *buf) const
+{
+    wxCHECK_MSG( m_metafile.Ok(), false, _T("copying invalid enh metafile") );
+
+    HENHMETAFILE hEMF = (HENHMETAFILE)m_metafile.GetHENHMETAFILE();
+
+    HENHMETAFILE hEMFCopy = ::CopyEnhMetaFile(hEMF, NULL);
+    if ( !hEMFCopy )
+    {
+        wxLogLastError(_T("CopyEnhMetaFile"));
+
+        return false;
+    }
+
+    *(HENHMETAFILE *)buf = hEMFCopy;
+    return true;
+}
+
+bool wxEnhMetaFileSimpleDataObject::SetData(size_t WXUNUSED(len),
+                                            const void *buf)
+{
+    HENHMETAFILE hEMF = *(HENHMETAFILE *)buf;
+
+    wxCHECK_MSG( hEMF, FALSE, _T("pasting invalid enh metafile") );
+    m_metafile.SetHENHMETAFILE((WXHANDLE)hEMF);
+
+    return true;
+}
+
+

 #endif // wxUSE_DRAG_AND_DROP
 
 #endif // wxUSE_ENH_METAFILE
 #endif // wxUSE_DRAG_AND_DROP
 
 #endif // wxUSE_ENH_METAFILE