adding explicit log.h include

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

diff --git a/src/msw/enhmeta.cpp b/src/msw/enhmeta.cpp
index 621208202c3f19f1c3207e8adb9d543646e8d650..82d4adf106c93c072ef8a265ed75a63c4e21422e 100644 (file)
--- a/src/msw/enhmeta.cpp
+++ b/src/msw/enhmeta.cpp
@@ -1,5 +1,5 @@
 ///////////////////////////////////////////////////////////////////////////////
 ///////////////////////////////////////////////////////////////////////////////

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

 // Purpose:     implementation of wxEnhMetaFileXXX classes
 // Author:      Vadim Zeitlin
 // Modified by:
 // Purpose:     implementation of wxEnhMetaFileXXX classes
 // Author:      Vadim Zeitlin
 // Modified by:


@@ -17,10 +17,6 @@
 // headers
 // ----------------------------------------------------------------------------
 
 // headers
 // ----------------------------------------------------------------------------
 

-#if defined(__GNUG__) && !defined(NO_GCC_PRAGMA)
-    #pragma implementation "enhmeta.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"
 


@@ -36,6 +32,9 @@
     #include "wx/intl.h"
 #endif //WX_PRECOMP
 
     #include "wx/intl.h"
 #endif //WX_PRECOMP
 

+#include "wx/dc.h"
+#include "wx/msw/dc.h"
+

 #include "wx/metafile.h"
 #include "wx/clipbrd.h"
 
 #include "wx/metafile.h"
 #include "wx/clipbrd.h"
 


@@ -46,7 +45,6 @@
 // ----------------------------------------------------------------------------
 
 IMPLEMENT_DYNAMIC_CLASS(wxEnhMetaFile, wxObject)
 // ----------------------------------------------------------------------------
 
 IMPLEMENT_DYNAMIC_CLASS(wxEnhMetaFile, wxObject)

-IMPLEMENT_ABSTRACT_CLASS(wxEnhMetaFileDC, wxDC)

 
 // ----------------------------------------------------------------------------
 // macros
 
 // ----------------------------------------------------------------------------
 // macros


@@ -61,7 +59,7 @@ IMPLEMENT_ABSTRACT_CLASS(wxEnhMetaFileDC, wxDC)
 
 // we must pass NULL if the string is empty to metafile functions
 static inline const wxChar *GetMetaFileName(const wxString& fn)
 
 // we must pass NULL if the string is empty to metafile functions
 static inline const wxChar *GetMetaFileName(const wxString& fn)

-    { return !fn ? (wxChar *)NULL : fn.c_str(); }
+    { return !fn ? (const wxChar *)NULL : (const wxChar*)fn.wx_str(); }

 
 // ============================================================================
 // implementation
 
 // ============================================================================
 // implementation


@@ -71,6 +69,21 @@ static inline const wxChar *GetMetaFileName(const wxString& fn)
 // wxEnhMetaFile
 // ----------------------------------------------------------------------------
 
 // wxEnhMetaFile
 // ----------------------------------------------------------------------------
 

+wxGDIRefData *wxEnhMetaFile::CreateGDIRefData() const
+{
+    wxFAIL_MSG( _T("must be implemented if used") );
+
+    return NULL;
+}
+
+wxGDIRefData *
+wxEnhMetaFile::CloneGDIRefData(const wxGDIRefData *WXUNUSED(data)) const
+{
+    wxFAIL_MSG( _T("must be implemented if used") );
+
+    return NULL;
+}
+

 void wxEnhMetaFile::Init()
 {
     if ( m_filename.empty() )
 void wxEnhMetaFile::Init()
 {
     if ( m_filename.empty() )


@@ -79,7 +92,7 @@ void wxEnhMetaFile::Init()
     }
     else // have valid file name, load metafile from it
     {
     }
     else // have valid file name, load metafile from it
     {

-        m_hMF = GetEnhMetaFile(m_filename);
+        m_hMF = (WXHANDLE)::GetEnhMetaFile(m_filename.fn_str());

         if ( !m_hMF )
             wxLogSysError(_("Failed to load metafile from file \"%s\"."),
                           m_filename.c_str());
         if ( !m_hMF )
             wxLogSysError(_("Failed to load metafile from file \"%s\"."),
                           m_filename.c_str());


@@ -120,7 +133,7 @@ void wxEnhMetaFile::Free()
 bool wxEnhMetaFile::Play(wxDC *dc, wxRect *rectBound)
 {
     wxCHECK_MSG( Ok(), false, _T("can't play invalid enhanced metafile") );
 bool wxEnhMetaFile::Play(wxDC *dc, wxRect *rectBound)
 {
     wxCHECK_MSG( Ok(), false, _T("can't play invalid enhanced metafile") );

-    wxCHECK_MSG( dc, FALSE, _T("invalid wxDC in wxEnhMetaFile::Play") );
+    wxCHECK_MSG( dc, false, _T("invalid wxDC in wxEnhMetaFile::Play") );

 
     RECT rect;
     if ( rectBound )
 
     RECT rect;
     if ( rectBound )


@@ -140,7 +153,12 @@ bool wxEnhMetaFile::Play(wxDC *dc, wxRect *rectBound)
         rect.bottom = size.y;
     }
 
         rect.bottom = size.y;
     }
 

-    if ( !::PlayEnhMetaFile(GetHdcOf(*dc), GetEMF(), &rect) )
+    wxDCImpl *impl = dc->GetImpl();
+    wxMSWDCImpl *msw_impl = wxDynamicCast( impl, wxMSWDCImpl );
+    if (!msw_impl)
+        return false;
+
+    if ( !::PlayEnhMetaFile(GetHdcOf(*msw_impl), GetEMF(), &rect) )

     {
         wxLogLastError(_T("PlayEnhMetaFile"));
 
     {
         wxLogLastError(_T("PlayEnhMetaFile"));
 


@@ -180,8 +198,8 @@ 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") );
+#if wxUSE_DRAG_AND_DROP && wxUSE_CLIPBOARD
+    wxCHECK_MSG( m_hMF, false, _T("can't copy invalid metafile to clipboard") );

 
     return wxTheClipboard->AddData(new wxEnhMetaFileDataObject(*this));
 #else // !wxUSE_DRAG_AND_DROP
 
     return wxTheClipboard->AddData(new wxEnhMetaFileDataObject(*this));
 #else // !wxUSE_DRAG_AND_DROP


@@ -191,14 +209,39 @@ bool wxEnhMetaFile::SetClipboard(int WXUNUSED(width), int WXUNUSED(height))
 }
 
 // ----------------------------------------------------------------------------
 }
 
 // ----------------------------------------------------------------------------

-// wxEnhMetaFileDC
+// wxEnhMetaFileDCImpl

 // ----------------------------------------------------------------------------
 
 // ----------------------------------------------------------------------------
 

-wxEnhMetaFileDC::wxEnhMetaFileDC(const wxString& filename,
+class wxEnhMetaFileDCImpl : public wxMSWDCImpl
+{
+public:
+    wxEnhMetaFileDCImpl( wxEnhMetaFileDC *owner,
+                         const wxString& filename, int width, int height,
+                         const wxString& description );
+    virtual ~wxEnhMetaFileDCImpl();
+
+    // obtain a pointer to the new metafile (caller should delete it)
+    wxEnhMetaFile *Close();
+
+protected:
+    virtual void DoGetSize(int *width, int *height) const;
+
+private:
+    // size passed to ctor and returned by DoGetSize()
+    int m_width,
+        m_height;
+};
+
+
+wxEnhMetaFileDCImpl::wxEnhMetaFileDCImpl( wxEnhMetaFileDC* owner,
+                                 const wxString& filename,

                                  int width, int height,
                                  int width, int height,

-                                 const wxString& description)
+                                 const wxString& description )
+                   : wxMSWDCImpl( owner )

 {
 {

-    ScreenHDC hdcRef;
+    m_width = width;
+    m_height = height;
+

     RECT rect;
     RECT *pRect;
     if ( width && height )
     RECT rect;
     RECT *pRect;
     if ( width && height )


@@ -219,17 +262,26 @@ wxEnhMetaFileDC::wxEnhMetaFileDC(const wxString& filename,
         pRect = (LPRECT)NULL;
     }
 
         pRect = (LPRECT)NULL;
     }
 

+    ScreenHDC hdcRef;

     m_hDC = (WXHDC)::CreateEnhMetaFile(hdcRef, GetMetaFileName(filename),
     m_hDC = (WXHDC)::CreateEnhMetaFile(hdcRef, GetMetaFileName(filename),

-                                       pRect, description);
+                                       pRect, description.wx_str());

     if ( !m_hDC )
     {
         wxLogLastError(_T("CreateEnhMetaFile"));
     }
 }
 
     if ( !m_hDC )
     {
         wxLogLastError(_T("CreateEnhMetaFile"));
     }
 }
 

-wxEnhMetaFile *wxEnhMetaFileDC::Close()
+void wxEnhMetaFileDCImpl::DoGetSize(int *width, int *height) const
+{
+    if ( width )
+        *width = m_width;
+    if ( height )
+        *height = m_height;
+}
+
+wxEnhMetaFile *wxEnhMetaFileDCImpl::Close()

 {
 {

-    wxCHECK_MSG( Ok(), NULL, _T("invalid wxEnhMetaFileDC") );
+    wxCHECK_MSG( IsOk(), NULL, _T("invalid wxEnhMetaFileDC") );

 
     HENHMETAFILE hMF = ::CloseEnhMetaFile(GetHdc());
     if ( !hMF )
 
     HENHMETAFILE hMF = ::CloseEnhMetaFile(GetHdc());
     if ( !hMF )


@@ -244,12 +296,37 @@ wxEnhMetaFile *wxEnhMetaFileDC::Close()
     return mf;
 }
 
     return mf;
 }
 

-wxEnhMetaFileDC::~wxEnhMetaFileDC()
+wxEnhMetaFileDCImpl::~wxEnhMetaFileDCImpl()

 {
     // avoid freeing it in the base class dtor
     m_hDC = 0;
 }
 
 {
     // avoid freeing it in the base class dtor
     m_hDC = 0;
 }
 

+// ----------------------------------------------------------------------------
+// wxEnhMetaFileDC
+// ----------------------------------------------------------------------------
+
+IMPLEMENT_ABSTRACT_CLASS(wxEnhMetaFileDC, wxDC)
+
+wxEnhMetaFileDC::wxEnhMetaFileDC(const wxString& filename,
+                                 int width, int height,
+                                 const wxString& description)
+               : wxDC(new wxEnhMetaFileDCImpl(this,
+                                              filename,
+                                              width, height,
+                                              description))
+{
+}
+
+wxEnhMetaFile *wxEnhMetaFileDC::Close()
+{
+    wxEnhMetaFileDCImpl * const
+        impl = static_cast<wxEnhMetaFileDCImpl *>(GetImpl());
+    wxCHECK_MSG( impl, NULL, _T("no wxEnhMetaFileDC implementation") );
+
+    return impl->Close();
+}
+

 #if wxUSE_DRAG_AND_DROP
 
 // ----------------------------------------------------------------------------
 #if wxUSE_DRAG_AND_DROP
 
 // ----------------------------------------------------------------------------


@@ -318,7 +395,7 @@ bool wxEnhMetaFileDataObject::GetDataHere(const wxDataFormat& format, void *buf)
 
         // first get the buffer size and alloc memory
         size_t size = ::GetWinMetaFileBits(hEMF, 0, NULL, MM_ANISOTROPIC, hdc);
 
         // first get the buffer size and alloc memory
         size_t size = ::GetWinMetaFileBits(hEMF, 0, NULL, MM_ANISOTROPIC, hdc);

-        wxCHECK_MSG( size, FALSE, _T("GetWinMetaFileBits() failed") );
+        wxCHECK_MSG( size, false, _T("GetWinMetaFileBits() failed") );

 
         BYTE *bits = (BYTE *)malloc(size);
 
 
         BYTE *bits = (BYTE *)malloc(size);
 


@@ -366,7 +443,7 @@ bool wxEnhMetaFileDataObject::SetData(const wxDataFormat& format,
     {
         hEMF = *(HENHMETAFILE *)buf;
 
     {
         hEMF = *(HENHMETAFILE *)buf;
 

-        wxCHECK_MSG( hEMF, FALSE, _T("pasting invalid enh metafile") );
+        wxCHECK_MSG( hEMF, false, _T("pasting invalid enh metafile") );

     }
     else
     {
     }
     else
     {


@@ -377,7 +454,7 @@ bool wxEnhMetaFileDataObject::SetData(const wxDataFormat& format,
 
         // first get the buffer size
         size_t size = ::GetMetaFileBitsEx(mfpict->hMF, 0, NULL);
 
         // first get the buffer size
         size_t size = ::GetMetaFileBitsEx(mfpict->hMF, 0, NULL);

-        wxCHECK_MSG( size, FALSE, _T("GetMetaFileBitsEx() failed") );
+        wxCHECK_MSG( size, false, _T("GetMetaFileBitsEx() failed") );

 
         // then get metafile bits
         BYTE *bits = (BYTE *)malloc(size);
 
         // then get metafile bits
         BYTE *bits = (BYTE *)malloc(size);


@@ -441,7 +518,7 @@ bool wxEnhMetaFileSimpleDataObject::SetData(size_t WXUNUSED(len),
 {
     HENHMETAFILE hEMF = *(HENHMETAFILE *)buf;
 
 {
     HENHMETAFILE hEMF = *(HENHMETAFILE *)buf;
 

-    wxCHECK_MSG( hEMF, FALSE, _T("pasting invalid enh metafile") );
+    wxCHECK_MSG( hEMF, false, _T("pasting invalid enh metafile") );

     m_metafile.SetHENHMETAFILE((WXHANDLE)hEMF);
 
     return true;
     m_metafile.SetHENHMETAFILE((WXHANDLE)hEMF);
 
     return true;