cleanup - added some error checking, reformatting

git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@38184 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775

src/mac/carbon/clipbrd.cpp

@@ -144,7 +144,7 @@ void * wxGetClipboardData( wxDataFormat dataFormat, long *len )
         return NULL;
     }
 
-    if ( dataFormat.GetType() == wxDF_TEXT )
+    if (dataFormat.GetType() == wxDF_TEXT)
         wxMacConvertNewlines10To13( (char*)data );
 
     return data;
@@ -160,19 +160,19 @@ wxClipboard::wxClipboard()
 
 wxClipboard::~wxClipboard()
 {
-    if (m_data)
+    if (m_data != NULL)
     {
         delete m_data;
-        m_data = (wxDataObject*)NULL;
+        m_data = NULL;
     }
 }
 
 void wxClipboard::Clear()
 {
-    if (m_data)
+    if (m_data != NULL)
     {
         delete m_data;
-        m_data = (wxDataObject*)NULL;
+        m_data = NULL;
     }
 
 #if TARGET_CARBON
@@ -242,11 +242,11 @@ bool wxClipboard::AddData( wxDataObject *data )
 
         size_t sz = data->GetDataSize( array[ i ] );
         void* buf = malloc( sz + 1 );
-        if ( buf )
+        if ( buf != NULL )
         {
             // empty the buffer because in some case GetDataHere does not fill buf
-            memset(buf, 0, sz + 1);
+            memset( buf, 0, sz + 1 );
-            data->GetDataHere( array[ i ] , buf );
+            data->GetDataHere( array[ i ], buf );
             OSType mactype = 0;
             switch ( array[i].GetType() )
             {
@@ -275,7 +275,7 @@ bool wxClipboard::AddData( wxDataObject *data )
                 break;
 
             default:
-                mactype = (OSType)(array[i].GetFormatId());
+                mactype = (OSType)(array[ i ].GetFormatId());
                 break;
             }
 
@@ -310,6 +310,8 @@ bool wxClipboard::IsSupported( const wxDataFormat &dataFormat )
     if ( m_data )
         return m_data->IsSupported( dataFormat );
 
+    bool hasData = false;
+
 #if TARGET_CARBON
     OSStatus err = noErr;
     ScrapRef scrapRef;
@@ -325,23 +327,22 @@ bool wxClipboard::IsSupported( const wxDataFormat &dataFormat )
         {
             err = GetScrapFlavorSize( scrapRef, dataFormat.GetFormatId(), &byteCount );
             if (err == noErr)
-                return true;
+                hasData = true;
         }
     }
 
-    return false;
-
 #else
-    long offset;
+
+    long offset = 0;
     Handle datahandle = NewHandle( 0 );
     HLock( datahandle );
     GetScrap( datahandle, dataFormat.GetFormatId(), &offset );
     HUnlock( datahandle );
-    bool hasData = GetHandleSize( datahandle ) > 0;
+    hasData = GetHandleSize( datahandle ) > 0;
     DisposeHandle( datahandle );
+#endif
 
     return hasData;
-#endif
 }
 
 bool wxClipboard::GetData( wxDataObject& data )
@@ -372,7 +373,7 @@ bool wxClipboard::GetData( wxDataObject& data )
                 else
                 {
                     char *d = new char[ dataSize ];
-                    m_data->GetDataHere( format, (void*) d );
+                    m_data->GetDataHere( format, (void*)d );
                     data.SetData( format, dataSize, d );
                     delete [] d;
                 }
@@ -413,6 +414,7 @@ bool wxClipboard::GetData( wxDataObject& data )
     }
 
     delete [] array;
+
     return transferred;
 }
 

src/mac/carbon/dataobj.cpp

@@ -96,7 +96,7 @@ void wxDataFormat::SetType( wxDataFormatId dataType )
 
 wxString wxDataFormat::GetId() const
 {
-    wxCHECK_MSG( !IsStandard(), wxEmptyString ,
+    wxCHECK_MSG( !IsStandard(), wxEmptyString,
                  wxT("name of predefined format cannot be retrieved") );
 
     return m_id;
@@ -342,8 +342,8 @@ bool wxBitmapDataObject::SetData( size_t nSize, const void *pBuf )
 
     // ownership is transferred to the bitmap
     m_pictCreated = false;
-    Rect frame ;
+    Rect frame;
-    wxMacGetPictureBounds( picHandle , &frame ) ;
+    wxMacGetPictureBounds( picHandle, &frame );
 
     wxMetafile mf;
     mf.SetHMETAFILE( (WXHMETAFILE)m_pictHandle );

src/mac/carbon/metafile.cpp

@@ -1,5 +1,5 @@
 /////////////////////////////////////////////////////////////////////////////
-// Name:        metafile.cpp
+// Name:        src/mac/carbon/metafile.cpp
 // Purpose:     wxMetaFile, wxMetaFileDC etc. These classes are optional.
 // Author:      Stefan Csomor
 // Modified by:
@@ -8,13 +8,13 @@
 // Copyright:   (c) Stefan Csomor
 // Licence:       wxWindows licence
 /////////////////////////////////////////////////////////////////////////////
+//
+// Currently, the only purpose for making a metafile
+// is to put it on the clipboard.
+
 
 #include "wx/wxprec.h"
 
-#ifdef __BORLANDC__
-#pragma hdrstop
-#endif
-
 #if wxUSE_METAFILE
 
 #ifndef WX_PRECOMP
@@ -48,16 +48,13 @@ private:
 #endif
 };
 
+
 extern bool wxClipboardIsOpen;
 
 
-// Metafiles:
-// Currently, the only purpose for making a metafile
-// is to put it on the clipboard.
-
 wxMetafileRefData::wxMetafileRefData()
 {
-    m_metafile = 0;
+    m_metafile = NULL;
 
 #if wxMAC_USE_CORE_GRAPHICS
     m_qdPictRef = NULL;
@@ -82,8 +79,8 @@ wxMetaFile::wxMetaFile(const wxString& file)
 {
     m_refData = new wxMetafileRefData;
 
-    M_METAFILEDATA->m_metafile = 0;
+    M_METAFILEDATA->m_metafile = NULL;
-    wxASSERT_MSG( file.empty(), wxT("no file based metafile support yet") );
+    wxASSERT_MSG( file.empty(), wxT("no file-based metafile support yet") );
 
 #if 0
     if (!file.IsNull() && (file.Cmp("") == 0))
@@ -97,7 +94,7 @@ wxMetaFile::~wxMetaFile()
 
 bool wxMetaFile::Ok() const
 {
-    return (M_METAFILEDATA && (M_METAFILEDATA->m_metafile != 0));
+    return (M_METAFILEDATA && (M_METAFILEDATA->m_metafile != NULL));
 }
 
 WXHMETAFILE wxMetaFile::GetHMETAFILE() const
@@ -110,8 +107,8 @@ bool wxMetaFile::SetClipboard(int width, int height)
     bool success = true;
 
 #if wxUSE_DRAG_AND_DROP
-    // TODO: to finish this port, we need the data obj first
+    // TODO: to finish this port, we need the data object first
-    if (!m_refData)
+    if (m_refData == NULL)
         return false;
 
     bool alreadyOpen = wxTheClipboard->IsOpened();
@@ -136,19 +133,20 @@ void wxMetafile::SetHMETAFILE(WXHMETAFILE mf)
 
     m_refData = new wxMetafileRefData;
 
-    M_METAFILEDATA->m_metafile = (PicHandle) mf;
+    M_METAFILEDATA->m_metafile = (PicHandle)mf;
 
 #if wxMAC_USE_CORE_GRAPHICS
     size_t sz = GetHandleSize( (Handle) M_METAFILEDATA->m_metafile );
     wxMemoryBuffer* membuf = new wxMemoryBuffer( sz );
     void *data = membuf->GetWriteBuf( sz );
+
     memcpy( data, *M_METAFILEDATA->m_metafile, sz );
     membuf->UngetWriteBuf( sz );
     CGDataProviderRef provider = CGDataProviderCreateWithData(
         membuf, data, sz, wxMacMemoryBufferReleaseProc );
     M_METAFILEDATA->m_qdPictRef = NULL;
 
-    if ( provider != NULL )
+    if (provider != NULL)
     {
         M_METAFILEDATA->m_qdPictRef = QDPictCreateWithProvider( provider );
         CGDataProviderRelease( provider );
@@ -161,7 +159,7 @@ bool wxMetaFile::Play(wxDC *dc)
     if (!m_refData)
         return false;
 
-    if (!dc->Ok() )
+    if (!dc->Ok())
         return false;
 
     {
@@ -171,15 +169,15 @@ bool wxMetaFile::Play(wxDC *dc)
         CGRect bounds = QDPictGetBounds( cgPictRef );
 
         CGContextSaveGState( cg );
-        CGContextTranslateCTM( cg, 0 , bounds.size.width );
+        CGContextTranslateCTM( cg, 0, bounds.size.width );
         CGContextScaleCTM( cg, 1, -1 );
-        QDPictDrawToCGContext( cg , bounds, cgPictRef );
+        QDPictDrawToCGContext( cg, bounds, cgPictRef );
         CGContextRestoreGState( cg );
 #else
-        PicHandle pict = (PicHandle) GetHMETAFILE();
+        PicHandle pict = (PicHandle)GetHMETAFILE();
         wxMacPortSetter helper( dc );
-        Rect picFrame ;
+        Rect picFrame;
-        DrawPicture( pict , wxMacGetPictureBounds( pict , &picFrame ) );
+        DrawPicture( pict, wxMacGetPictureBounds( pict, &picFrame ) );
 #endif
     }
 
@@ -188,18 +186,18 @@ bool wxMetaFile::Play(wxDC *dc)
 
 wxSize wxMetaFile::GetSize() const
 {
-    wxSize size = wxDefaultSize ;
+    wxSize dataSize = wxDefaultSize;
 
-    if ( Ok() )
+    if (Ok())
     {
-        PicHandle pict = (PicHandle) GetHMETAFILE() ;
+        PicHandle pict = (PicHandle)GetHMETAFILE();
-        Rect r ;
+        Rect r;
-        wxMacGetPictureBounds( pict , &r ) ;
+        wxMacGetPictureBounds( pict, &r );
-        size.x = r.right - r.left ;
+        dataSize.x = r.right - r.left;
-        size.y = r.bottom - r.top ;
+        dataSize.y = r.bottom - r.top;
     }
 
-    return size;
+    return dataSize;
 }
 
 // Metafile device context
@@ -207,12 +205,13 @@ wxSize wxMetaFile::GetSize() const
 // New constructor that takes origin and extent. If you use this, don't
 // give origin/extent arguments to wxMakeMetaFilePlaceable.
 
-wxMetaFileDC::wxMetaFileDC(const wxString& filename ,
+wxMetaFileDC::wxMetaFileDC(
-                    int width , int height ,
+    const wxString& filename,
-                    const wxString& WXUNUSED(description) )
+    int width, int height,
+    const wxString& WXUNUSED(description) )
 {
-    wxASSERT_MSG( width == 0 || height == 0 , wxT("no arbitration of metafilesize supported") );
+    wxASSERT_MSG( width <= 0 || height <= 0, wxT("no arbitration of metafile size supported") );
-    wxASSERT_MSG( filename.empty() , wxT("no file based metafile support yet"));
+    wxASSERT_MSG( filename.empty(), wxT("no file based metafile support yet"));
 
     m_metaFile = new wxMetaFile( filename );
 
@@ -220,13 +219,13 @@ wxMetaFileDC::wxMetaFileDC(const wxString& filename ,
 #else
     Rect r = { 0, 0, height, width };
 
-    RectRgn( (RgnHandle) m_macBoundaryClipRgn , &r );
+    RectRgn( (RgnHandle)m_macBoundaryClipRgn, &r );
-    CopyRgn( (RgnHandle) m_macBoundaryClipRgn , (RgnHandle) m_macCurrentClipRgn );
+    CopyRgn( (RgnHandle)m_macBoundaryClipRgn, (RgnHandle)m_macCurrentClipRgn );
 
-    m_metaFile->SetHMETAFILE( (WXHMETAFILE) OpenPicture( &r ) );
+    m_metaFile->SetHMETAFILE( (WXHMETAFILE)OpenPicture( &r ) );
-    ::GetPort( (GrafPtr*) &m_macPort );
+    ::GetPort( (GrafPtr*)&m_macPort );
 
-    m_ok = true ;
+    m_ok = true;
 #endif
 
     SetMapMode( wxMM_TEXT );
@@ -238,9 +237,9 @@ wxMetaFileDC::~wxMetaFileDC()
 
 void wxMetaFileDC::DoGetSize(int *width, int *height) const
 {
-    wxCHECK_RET( m_metaFile , wxT("GetSize() doesn't work without a metafile") );
+    wxCHECK_RET( m_metaFile, wxT("GetSize() doesn't work without a metafile") );
 
-    wxSize sz = m_metaFile->GetSize() ;
+    wxSize sz = m_metaFile->GetSize();
     if (width)
         (*width) = sz.x;
     if (height)
@@ -249,7 +248,7 @@ void wxMetaFileDC::DoGetSize(int *width, int *height) const
 
 wxMetaFile *wxMetaFileDC::Close()
 {
-    ClosePicture() ;
+    ClosePicture();
 
     return m_metaFile;
 }
@@ -262,10 +261,13 @@ size_t wxMetafileDataObject::GetDataSize() const
 
 bool wxMetafileDataObject::GetDataHere(void *buf) const
 {
-    memcpy( buf , (*(PicHandle)(*((wxMetafile*)&m_metafile)).GetHMETAFILE()) ,
+    Handle pictH = (Handle)(*((wxMetafile*)&m_metafile)).GetHMETAFILE();
-        GetHandleSize( (Handle) (*((wxMetafile*)&m_metafile)).GetHMETAFILE() ) );
+    bool result = (pictH != NULL);
 
-    return true;
+    if (result)
+        memcpy( buf, *pictH, GetHandleSize( pictH ) );
+
+    return result;
 }
 
 bool wxMetafileDataObject::SetData(size_t len, const void *buf)
@@ -275,7 +277,7 @@ bool wxMetafileDataObject::SetData(size_t len, const void *buf)
     memcpy( *handle, buf, len );
     m_metafile.SetHMETAFILE( (WXHMETAFILE) handle );
 
-    return true ;
+    return true;
 }
 #endif