X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/62f864c32c53356b7228591c85b14abc491c46f0..daebb84bff054d3833baca58a5dc506de56c64a1:/src/mac/classic/metafile.cpp?ds=inline diff --git a/src/mac/classic/metafile.cpp b/src/mac/classic/metafile.cpp index 7a2e5d1815..1866c8dc0d 100644 --- a/src/mac/classic/metafile.cpp +++ b/src/mac/classic/metafile.cpp @@ -1,5 +1,5 @@ ///////////////////////////////////////////////////////////////////////////// -// Name: metafile.cpp +// Name: src/mac/classic/metafile.cpp // Purpose: wxMetaFile, wxMetaFileDC etc. These classes are optional. // Author: Stefan Csomor // Modified by: @@ -9,10 +9,6 @@ // Licence: wxWindows licence ///////////////////////////////////////////////////////////////////////////// -#ifdef __GNUG__ -#pragma implementation "metafile.h" -#endif - // For compilers that support precompilation, includes "wx.h". #include "wx/wxprec.h" @@ -20,10 +16,6 @@ #pragma hdrstop #endif -#ifndef WX_PRECOMP -#include "wx/setup.h" -#endif - #if wxUSE_METAFILE #ifndef WX_PRECOMP @@ -72,7 +64,7 @@ wxMetaFile::wxMetaFile(const wxString& file) M_METAFILEDATA->m_metafile = 0; wxASSERT_MSG( file.IsEmpty() , wxT("no file based metafile support yet") ) ; /* - if (!file.IsNull() && (file.Cmp("") == 0)) + if (!file.empty()) M_METAFILEDATA->m_metafile = (WXHANDLE) GetMetaFile(file); */ } @@ -86,8 +78,8 @@ bool wxMetaFile::SetClipboard(int width, int height) #if wxUSE_DRAG_AND_DROP //TODO finishi this port , we need the data obj first if (!m_refData) - return FALSE; - + return false; + bool alreadyOpen=wxTheClipboard->IsOpened() ; if (!alreadyOpen) { @@ -97,11 +89,11 @@ bool wxMetaFile::SetClipboard(int width, int height) wxDataObject *data = new wxMetafileDataObject( *this) ; bool success = wxTheClipboard->SetData(data); - if (!alreadyOpen) + if (!alreadyOpen) wxTheClipboard->Close(); return (bool) success; #endif - return TRUE ; + return true ; } void wxMetafile::SetHMETAFILE(WXHMETAFILE mf) @@ -117,17 +109,17 @@ void wxMetafile::SetHMETAFILE(WXHMETAFILE mf) bool wxMetaFile::Play(wxDC *dc) { if (!m_refData) - return FALSE; - + return false; + if (!dc->Ok() ) - return FALSE; - + return false; + { wxMacPortSetter helper( dc ) ; PicHandle pict = (PicHandle) GetHMETAFILE() ; DrawPicture( pict , &(**pict).picFrame ) ; } - return TRUE; + return true; } wxSize wxMetaFile::GetSize() const @@ -153,23 +145,23 @@ wxSize wxMetaFile::GetSize() const // give origin/extent arguments to wxMakeMetaFilePlaceable. wxMetaFileDC::wxMetaFileDC(const wxString& filename , - int width , int height , - const wxString& WXUNUSED(description) ) + int width , int height , + const wxString& WXUNUSED(description) ) { wxASSERT_MSG( width == 0 || height == 0 , _T("no arbitration of metafilesize supported") ) ; - wxASSERT_MSG( filename.IsEmpty() , _T("no file based metafile support yet")) ; - + wxASSERT_MSG( filename.empty() , _T("no file based metafile support yet")) ; + m_metaFile = new wxMetaFile(filename) ; Rect r={0,0,height,width} ; - + RectRgn( (RgnHandle) m_macBoundaryClipRgn , &r ) ; CopyRgn( (RgnHandle) m_macBoundaryClipRgn , (RgnHandle) m_macCurrentClipRgn ) ; m_metaFile->SetHMETAFILE( OpenPicture( &r ) ) ; - ::GetPort( (GrafPtr*) &m_macPort ) ; - m_ok = TRUE ; - - SetMapMode(wxMM_TEXT); + ::GetPort( (GrafPtr*) &m_macPort ) ; + m_ok = true ; + + SetMapMode(wxMM_TEXT); } wxMetaFileDC::~wxMetaFileDC()