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

GetData() now takes a pointer and not a reference, IsSupported() takes a

Browse Source 
format and not a data object


git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@1630 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
This commit is contained in:
Vadim Zeitlin
1999-02-07 00:14:10 +00:00
parent b8653fbf44
commit 5f699c22f5
4 changed files with 16 additions and 16 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
include/wx/gtk/clipbrd.h
View File

@@ -63,10 +63,10 @@ public:
virtual bool AddData( wxDataObject *data );
// ask if data in correct format is available
virtual bool IsSupported( wxDataObject &data );
virtual bool IsSupported( wxDataFormat format );
// fill data with data on the clipboard (if available)
virtual bool GetData( wxDataObject &data );
virtual bool GetData( wxDataObject *data );
// clears wxTheClipboard and the system's clipboard if possible
virtual void Clear();

4
include/wx/gtk1/clipbrd.h
View File

@@ -63,10 +63,10 @@ public:
virtual bool AddData( wxDataObject *data );
// ask if data in correct format is available
virtual bool IsSupported( wxDataObject &data );
virtual bool IsSupported( wxDataFormat format );
// fill data with data on the clipboard (if available)
virtual bool GetData( wxDataObject &data );
virtual bool GetData( wxDataObject *data );
// clears wxTheClipboard and the system's clipboard if possible
virtual void Clear();

12
src/gtk/clipbrd.cpp
View File

@@ -422,13 +422,13 @@ void wxClipboard::Close()
m_open = FALSE;
}
bool wxClipboard::IsSupported( wxDataObject &data )
bool wxClipboard::IsSupported( wxDataFormat format )
{
wxCHECK_MSG( m_open, FALSE, "clipboard not open" );
/* store requested format to be asked for by callbacks */
m_targetRequested = data.GetFormat().GetAtom();
m_targetRequested = format.GetAtom();
wxCHECK_MSG( m_targetRequested, FALSE, "invalid clipboard format" );
@@ -458,21 +458,21 @@ bool wxClipboard::IsSupported( wxDataObject &data )
return TRUE;
}
bool wxClipboard::GetData( wxDataObject &data )
bool wxClipboard::GetData( wxDataObject *data )
{
wxCHECK_MSG( m_open, FALSE, "clipboard not open" );
/* is data supported by clipboard ? */
if (!IsSupported( data )) return FALSE;
if (!IsSupported( data->GetFormat() )) return FALSE;
/* store pointer to data object to be filled up by callbacks */
m_receivedData = &data;
m_receivedData = data;
/* store requested format to be asked for by callbacks */
m_targetRequested = data.GetFormat().GetAtom();
m_targetRequested = data->GetFormat().GetAtom();
wxCHECK_MSG( m_targetRequested, FALSE, "invalid clipboard format" );

12
src/gtk1/clipbrd.cpp
View File

@@ -422,13 +422,13 @@ void wxClipboard::Close()
m_open = FALSE;
}
bool wxClipboard::IsSupported( wxDataObject &data )
bool wxClipboard::IsSupported( wxDataFormat format )
{
wxCHECK_MSG( m_open, FALSE, "clipboard not open" );
/* store requested format to be asked for by callbacks */
m_targetRequested = data.GetFormat().GetAtom();
m_targetRequested = format.GetAtom();
wxCHECK_MSG( m_targetRequested, FALSE, "invalid clipboard format" );
@@ -458,21 +458,21 @@ bool wxClipboard::IsSupported( wxDataObject &data )
return TRUE;
}
bool wxClipboard::GetData( wxDataObject &data )
bool wxClipboard::GetData( wxDataObject *data )
{
wxCHECK_MSG( m_open, FALSE, "clipboard not open" );
/* is data supported by clipboard ? */
if (!IsSupported( data )) return FALSE;
if (!IsSupported( data->GetFormat() )) return FALSE;
/* store pointer to data object to be filled up by callbacks */
m_receivedData = &data;
m_receivedData = data;
/* store requested format to be asked for by callbacks */
m_targetRequested = data.GetFormat().GetAtom();
m_targetRequested = data->GetFormat().GetAtom();
wxCHECK_MSG( m_targetRequested, FALSE, "invalid clipboard format" );