Add some version checks to help compiling on OSX.

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

diff --git a/src/msw/enhmeta.cpp b/src/msw/enhmeta.cpp
index a59f622acc2cdb4f3fcb5b96434d96b1f407e932..5249f46ff49816be0867961ae6fadbf9a65f2581 100644 (file)
--- a/src/msw/enhmeta.cpp
+++ b/src/msw/enhmeta.cpp
@@ -92,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 = (WXHANDLE)::GetEnhMetaFile(m_filename.fn_str());
+        m_hMF = (WXHANDLE)::GetEnhMetaFile(m_filename.t_str());

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


@@ -134,7 +134,7 @@ void wxEnhMetaFile::Free()
 
 bool wxEnhMetaFile::Play(wxDC *dc, wxRect *rectBound)
 {
 
 bool wxEnhMetaFile::Play(wxDC *dc, wxRect *rectBound)
 {

-    wxCHECK_MSG( Ok(), false, wxT("can't play invalid enhanced metafile") );
+    wxCHECK_MSG( IsOk(), false, wxT("can't play invalid enhanced metafile") );

     wxCHECK_MSG( dc, false, wxT("invalid wxDC in wxEnhMetaFile::Play") );
 
     RECT rect;
     wxCHECK_MSG( dc, false, wxT("invalid wxDC in wxEnhMetaFile::Play") );
 
     RECT rect;


@@ -174,7 +174,7 @@ wxSize wxEnhMetaFile::GetSize() const
 {
     wxSize size = wxDefaultSize;
 
 {
     wxSize size = wxDefaultSize;
 

-    if ( Ok() )
+    if ( IsOk() )

     {
         ENHMETAHEADER hdr;
         if ( !::GetEnhMetaFileHeader(GetEMF(), sizeof(hdr), &hdr) )
     {
         ENHMETAHEADER hdr;
         if ( !::GetEnhMetaFileHeader(GetEMF(), sizeof(hdr), &hdr) )


@@ -408,7 +408,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, wxT("copying invalid enh metafile") );
+    wxCHECK_MSG( m_metafile.IsOk(), false, wxT("copying invalid enh metafile") );

 
     HENHMETAFILE hEMF = (HENHMETAFILE)m_metafile.GetHENHMETAFILE();
 
 
     HENHMETAFILE hEMF = (HENHMETAFILE)m_metafile.GetHENHMETAFILE();
 


@@ -536,7 +536,7 @@ size_t wxEnhMetaFileSimpleDataObject::GetDataSize() const
 
 bool wxEnhMetaFileSimpleDataObject::GetDataHere(void *buf) const
 {
 
 bool wxEnhMetaFileSimpleDataObject::GetDataHere(void *buf) const
 {

-    wxCHECK_MSG( m_metafile.Ok(), false, wxT("copying invalid enh metafile") );
+    wxCHECK_MSG( m_metafile.IsOk(), false, wxT("copying invalid enh metafile") );

 
     HENHMETAFILE hEMF = (HENHMETAFILE)m_metafile.GetHENHMETAFILE();
 
 
     HENHMETAFILE hEMF = (HENHMETAFILE)m_metafile.GetHENHMETAFILE();