Amebis/wxWidgets
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

clean - reformatting

Browse Source 
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@37539 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
This commit is contained in:
David Surovell
2006-02-12 23:17:35 +00:00
parent b1a1a83c92
commit 3e822cd8d0
1 changed files with 164 additions and 156 deletions
Download Patch File Download Diff File Expand all files Collapse all files

94
src/mac/carbon/clipbrd.cpp
View File

@@ -1,7 +1,8 @@
///////////////////////////////////////////////////////////////////////////// /////////////////////////////////////////////////////////////////////////////
// Name: clipbrd.cpp // Name: src/mac/carbon/clipbrd.cpp
// Purpose: Clipboard functionality // Purpose: Clipboard functionality
// Author: Stefan Csomor // Author: Stefan Csomor;
// Generalized clipboard implementation by Matthew Flatt
// Modified by: // Modified by:
// Created: 1998-01-01 // Created: 1998-01-01
// RCS-ID: $Id$ // RCS-ID: $Id$
@@ -25,24 +26,23 @@
#ifndef __DARWIN__ #ifndef __DARWIN__
#include <Scrap.h> #include <Scrap.h>
#endif #endif
#include "wx/mac/uma.h" #include "wx/mac/uma.h"
#define wxUSE_DATAOBJ 1 #define wxUSE_DATAOBJ 1
#include <string.h> #include <string.h>
// the trace mask we use with wxLogTrace() - call // the trace mask we use with wxLogTrace() - call
// wxLog::AddTraceMask(TRACE_CLIPBOARD) to enable the trace messages from here // wxLog::AddTraceMask(TRACE_CLIPBOARD) to enable the trace messages from here
// (there will be a *lot* of them!) // (there will be a *lot* of them!)
static const wxChar *TRACE_CLIPBOARD = _T("clipboard"); static const wxChar *TRACE_CLIPBOARD = wxT("clipboard");
void * wxGetClipboardData( wxDataFormat dataFormat, long *len ) void * wxGetClipboardData( wxDataFormat dataFormat, long *len )
{ {
#if !TARGET_CARBON
OSErr err = noErr ;
#else
OSStatus err = noErr; OSStatus err = noErr;
#endif
void * data = NULL; void * data = NULL;
Size byteCount; Size byteCount;
@@ -50,15 +50,16 @@ void *wxGetClipboardData(wxDataFormat dataFormat, long *len)
{ {
case wxDF_OEMTEXT: case wxDF_OEMTEXT:
dataFormat = wxDF_TEXT; dataFormat = wxDF_TEXT;
// fall through break;
case wxDF_TEXT: case wxDF_TEXT:
break;
case wxDF_UNICODETEXT: case wxDF_UNICODETEXT:
break; break;
case wxDF_BITMAP: case wxDF_BITMAP:
case wxDF_METAFILE: case wxDF_METAFILE:
break; break;
default: default:
// custom datatype // custom datatype
break; break;
@@ -72,9 +73,11 @@ void *wxGetClipboardData(wxDataFormat dataFormat, long *len)
{ {
ScrapFlavorFlags flavorFlags; ScrapFlavorFlags flavorFlags;
if (( err = GetScrapFlavorFlags( scrapRef, dataFormat.GetFormatId(), &flavorFlags )) == noErr) err = GetScrapFlavorFlags( scrapRef, dataFormat.GetFormatId(), &flavorFlags );
if (err == noErr)
{ {
if (( err = GetScrapFlavorSize( scrapRef, dataFormat.GetFormatId(), &byteCount )) == noErr) err = GetScrapFlavorSize( scrapRef, dataFormat.GetFormatId(), &byteCount );
if (err == noErr)
{ {
Size allocSize = byteCount; Size allocSize = byteCount;
if ( dataFormat.GetType() == wxDF_TEXT ) if ( dataFormat.GetType() == wxDF_TEXT )
@@ -93,13 +96,13 @@ void *wxGetClipboardData(wxDataFormat dataFormat, long *len)
{ {
// "data" format is UTF16, so 2 bytes = one character // "data" format is UTF16, so 2 bytes = one character
// wxChar size depends on platform, so just clear last 2 bytes // wxChar size depends on platform, so just clear last 2 bytes
((char*)data)[byteCount] = 0; ((char*)data)[ byteCount + 0 ] =
((char*)data)[ byteCount + 1 ] = 0; ((char*)data)[ byteCount + 1 ] = 0;
} }
} }
else else
{ {
delete[] ((char *)data) ; delete [] (char*)data;
data = NULL; data = NULL;
} }
} }
@@ -110,7 +113,7 @@ void *wxGetClipboardData(wxDataFormat dataFormat, long *len)
long offset; long offset;
Handle datahandle = NewHandle( 0 ); Handle datahandle = NewHandle( 0 );
HLock( datahandle ); HLock( datahandle );
GetScrap( datahandle , dataFormat.GetFormatId() , &offset ) ; err = (OSStatus)GetScrap( datahandle, dataFormat.GetFormatId(), &offset );
HUnlock( datahandle ); HUnlock( datahandle );
if ( GetHandleSize( datahandle ) > 0 ) if ( GetHandleSize( datahandle ) > 0 )
{ {
@@ -126,32 +129,27 @@ void *wxGetClipboardData(wxDataFormat dataFormat, long *len)
memcpy( (char*) data, (char*) *datahandle, byteCount ); memcpy( (char*) data, (char*) *datahandle, byteCount );
if ( dataFormat.GetType() == wxDF_TEXT ) if ( dataFormat.GetType() == wxDF_TEXT )
((char*)data)[ byteCount ] = 0; ((char*)data)[ byteCount ] = 0;
if ( dataFormat.GetType() == wxDF_UNICODETEXT ) else if ( dataFormat.GetType() == wxDF_UNICODETEXT )
((wxChar*)data)[ byteCount / 2 ] = 0; ((wxChar*)data)[ byteCount / 2 ] = 0;
*len = byteCount; *len = byteCount;
} }
DisposeHandle( datahandle ); DisposeHandle( datahandle );
#endif #endif
if ( err )
if (err != noErr)
{ {
wxLogSysError(_("Failed to get clipboard data.")); wxLogSysError(wxT("Failed to get clipboard data."));
return NULL; return NULL;
} }
if ( dataFormat.GetType() == wxDF_TEXT ) if ( dataFormat.GetType() == wxDF_TEXT )
{
wxMacConvertNewlines10To13( (char*)data ); wxMacConvertNewlines10To13( (char*)data );
}
return data; return data;
} }
/*
* Generalized clipboard implementation by Matthew Flatt
*/
IMPLEMENT_DYNAMIC_CLASS(wxClipboard, wxObject) IMPLEMENT_DYNAMIC_CLASS(wxClipboard, wxObject)
wxClipboard::wxClipboard() wxClipboard::wxClipboard()
@@ -176,6 +174,7 @@ void wxClipboard::Clear()
delete m_data; delete m_data;
m_data = (wxDataObject*)NULL; m_data = (wxDataObject*)NULL;
} }
#if TARGET_CARBON #if TARGET_CARBON
OSStatus err; OSStatus err;
err = ClearCurrentScrap(); err = ClearCurrentScrap();
@@ -183,9 +182,10 @@ void wxClipboard::Clear()
OSErr err; OSErr err;
err = ZeroScrap(); err = ZeroScrap();
#endif #endif
if ( err )
if (err != noErr)
{ {
wxLogSysError(_("Failed to empty the clipboard.")); wxLogSysError( wxT("Failed to empty the clipboard.") );
} }
} }
@@ -197,7 +197,9 @@ bool wxClipboard::Flush()
bool wxClipboard::Open() bool wxClipboard::Open()
{ {
wxCHECK_MSG( !m_open, false, wxT("clipboard already open") ); wxCHECK_MSG( !m_open, false, wxT("clipboard already open") );
m_open = true; m_open = true;
return true; return true;
} }
@@ -209,19 +211,18 @@ bool wxClipboard::IsOpened() const
bool wxClipboard::SetData( wxDataObject *data ) bool wxClipboard::SetData( wxDataObject *data )
{ {
wxCHECK_MSG( m_open, false, wxT("clipboard not open") ); wxCHECK_MSG( m_open, false, wxT("clipboard not open") );
wxCHECK_MSG( data, false, wxT("data is invalid") ); wxCHECK_MSG( data, false, wxT("data is invalid") );
Clear(); Clear();
// as we can only store one wxDataObject, this is the same in this
// implementation // as we can only store one wxDataObject,
// this is the same in this implementation
return AddData( data ); return AddData( data );
} }
bool wxClipboard::AddData( wxDataObject *data ) bool wxClipboard::AddData( wxDataObject *data )
{ {
wxCHECK_MSG( m_open, false, wxT("clipboard not open") ); wxCHECK_MSG( m_open, false, wxT("clipboard not open") );
wxCHECK_MSG( data, false, wxT("data is invalid") ); wxCHECK_MSG( data, false, wxT("data is invalid") );
// we can only store one wxDataObject // we can only store one wxDataObject
@@ -254,25 +255,30 @@ bool wxClipboard::AddData( wxDataObject *data )
mactype = kScrapFlavorTypeText; mactype = kScrapFlavorTypeText;
sz -= 1; sz -= 1;
break; break;
#if wxUSE_UNICODE #if wxUSE_UNICODE
case wxDF_UNICODETEXT: case wxDF_UNICODETEXT:
mactype = kScrapFlavorTypeUnicode; mactype = kScrapFlavorTypeUnicode;
sz -= 2; sz -= 2;
break; break;
#endif #endif
#if wxUSE_DRAG_AND_DROP #if wxUSE_DRAG_AND_DROP
case wxDF_METAFILE: case wxDF_METAFILE:
mactype = kScrapFlavorTypePicture; mactype = kScrapFlavorTypePicture;
break; break;
#endif #endif
case wxDF_BITMAP: case wxDF_BITMAP:
case wxDF_DIB: case wxDF_DIB:
mactype = kScrapFlavorTypePicture; mactype = kScrapFlavorTypePicture;
break; break;
default: default:
mactype = (OSType)(array[i].GetFormatId()); mactype = (OSType)(array[i].GetFormatId());
break; break;
} }
UMAPutScrap( sz , mactype , buf ); UMAPutScrap( sz , mactype , buf );
free( buf ); free( buf );
} }
@@ -289,8 +295,9 @@ void wxClipboard::Close()
m_open = false; m_open = false;
// Get rid of cached object. If this is not done copying from another application will // Get rid of cached object.
// only work once // If this is not done, copying data from
// another application will only work once
if (m_data) if (m_data)
{ {
delete m_data; delete m_data;
@@ -301,9 +308,8 @@ void wxClipboard::Close()
bool wxClipboard::IsSupported( const wxDataFormat &dataFormat ) bool wxClipboard::IsSupported( const wxDataFormat &dataFormat )
{ {
if ( m_data ) if ( m_data )
{
return m_data->IsSupported( dataFormat ); return m_data->IsSupported( dataFormat );
}
#if TARGET_CARBON #if TARGET_CARBON
OSStatus err = noErr; OSStatus err = noErr;
ScrapRef scrapRef; ScrapRef scrapRef;
@@ -314,14 +320,15 @@ bool wxClipboard::IsSupported( const wxDataFormat &dataFormat )
ScrapFlavorFlags flavorFlags; ScrapFlavorFlags flavorFlags;
Size byteCount; Size byteCount;
if (( err = GetScrapFlavorFlags( scrapRef, dataFormat.GetFormatId(), &flavorFlags )) == noErr) err = GetScrapFlavorFlags( scrapRef, dataFormat.GetFormatId(), &flavorFlags );
{ if (err == noErr)
if (( err = GetScrapFlavorSize( scrapRef, dataFormat.GetFormatId(), &byteCount )) == noErr)
{ {
err = GetScrapFlavorSize( scrapRef, dataFormat.GetFormatId(), &byteCount );
if (err == noErr)
return true; return true;
} }
} }
}
return false; return false;
#else #else
@@ -332,6 +339,7 @@ bool wxClipboard::IsSupported( const wxDataFormat &dataFormat )
HUnlock( datahandle ); HUnlock( datahandle );
bool hasData = GetHandleSize( datahandle ) > 0; bool hasData = GetHandleSize( datahandle ) > 0;
DisposeHandle( datahandle ); DisposeHandle( datahandle );
return hasData; return hasData;
#endif #endif
} }
@@ -354,18 +362,18 @@ bool wxClipboard::GetData( wxDataObject& data )
wxDataFormat format = array[ i ]; wxDataFormat format = array[ i ];
if ( m_data->IsSupported( format ) ) if ( m_data->IsSupported( format ) )
{ {
int size = m_data->GetDataSize( format ); int dataSize = m_data->GetDataSize( format );
transferred = true; transferred = true;
if (size == 0) if (dataSize == 0)
{ {
data.SetData( format, 0, 0 ); data.SetData( format, 0, 0 );
} }
else else
{ {
char *d = new char[size]; char *d = new char[ dataSize ];
m_data->GetDataHere( format, (void*) d ); m_data->GetDataHere( format, (void*) d );
data.SetData( format , size , d ) ; data.SetData( format, dataSize, d );
delete [] d; delete [] d;
} }
} }
@@ -391,7 +399,7 @@ bool wxClipboard::GetData( wxDataObject& data )
{ {
long len; long len;
char* s = (char*)wxGetClipboardData( format, &len ); char* s = (char*)wxGetClipboardData( format, &len );
if ( s ) if (s != NULL)
{ {
data.SetData( format, len, s ); data.SetData( format, len, s );
delete [] s; delete [] s;