///////////////////////////////////////////////////////////////////////////////
-// Name: os2/dataobj.cpp
+// Name: src/os2/dataobj.cpp
// Purpose: implementation of wx[I]DataObject class
// Author: David Webster
// Modified by:
// Created: 10/21/99
// RCS-ID: $Id$
// Copyright: (c) 1999 David Webster
-// Licence: wxWindows license
+// Licence: wxWindows licence
///////////////////////////////////////////////////////////////////////////////
// ============================================================================
// headers
// ----------------------------------------------------------------------------
-#ifdef __GNUG__
- #pragma implementation "dataobj.h"
-#endif
-
// For compilers that support precompilation, includes "wx.h".
#include "wx/wxprec.h"
+#if wxUSE_DATAOBJ
+
+#include "wx/dataobj.h"
+
#ifndef WX_PRECOMP
-#include "wx/intl.h"
+ #include "wx/intl.h"
+ #include "wx/log.h"
+ #include "wx/image.h"
#endif
-#include "wx/defs.h"
-#include "wx/log.h"
-#include "wx/dataobj.h"
#include "wx/mstream.h"
-#include "wx/image.h"
-#define INCL_DOS
-#include <os2.h>
+#include "wx/os2/private.h"
// ----------------------------------------------------------------------------
// functions
// ----------------------------------------------------------------------------
-#ifdef __WXDEBUG__
- static const wxChar *GetTymedName(DWORD tymed);
-#endif // Debug
-
// ----------------------------------------------------------------------------
// wxDataFormat
// ----------------------------------------------------------------------------
wxString wxDataFormat::GetId() const
{
- char zBuf[256];
+ wxChar zBuf[256];
wxString sRet;
::WinQueryAtomName( ::WinQuerySystemAtomTable()
,m_uFormat
- ,zBuf
+ ,(PSZ)zBuf
,256
);
sRet = zBuf;
} // end of wxDataFormat::GetId()
void wxDataFormat::SetId (
- const wxChar* zId
+ const wxString& zId
)
{
m_uFormat = ::WinAddAtom( ::WinQuerySystemAtomTable()
- ,zId
+ ,zId.char_str()
);
} // end of wxDataFormat::SetId
DRAGITEM m_vDragItem;
}; // end of CLASS CIDataObject
-bool CIDataObject::GetData (
- const wxDataFormat& rFormat
-, char* pzBuffer
-, ULONG ulLen
-)
+bool CIDataObject::GetData ( const wxDataFormat& rFormat,
+ char* pzBuffer,
+ ULONG ulLen )
{
QueryGetData(rFormat);
if (rFormat.GetType() == wxDF_INVALID)
- return FALSE;
+ return false;
ULONG ulSize = m_pDataObject->GetDataSize(rFormat);
//
// It probably means that the method is just not implemented
//
- return FALSE;
+ return false;
}
if (rFormat.GetType() == wxDF_PRIVATE)
{
}
if (ulSize > ulLen) // not enough room to copy
- return FALSE;
+ return false;
//
// Copy the data
,pzBuffer
,ulSize
);
- return TRUE;
+ return true;
} // end of CIDataObject::GetData
void CIDataObject::GetDataHere(
, char* pzBuffer
)
{
- ULONG ulSize;
+ ULONG ulSize = 0;
switch (rFormat.GetType())
{
ulSize = strlen((const char *)pzBuffer);
break;
+#if wxUSE_UNICODE
case wxDF_UNICODETEXT:
ulSize = ::wcslen((const wchar_t *)pzBuffer);
break;
+#endif
case wxDF_BITMAP:
case wxDF_METAFILE:
// wxFileDataObject
// ----------------------------------------------------------------------------
-bool wxFileDataObject::GetDataHere(
- void* pBuf
-) const
+bool wxFileDataObject::GetDataHere( void* pBuf ) const
{
wxString sFilenames;
sFilenames += (wxChar)0;
}
- memcpy(pBuf, sFilenames.mbc_str(), sFilenames.Len() + 1);
- return TRUE;
+ memcpy(pBuf, sFilenames.mbc_str(), sFilenames.length() + 1);
+ return true;
}
size_t wxFileDataObject::GetDataSize() const
for (size_t i = 0; i < m_filenames.GetCount(); i++)
{
- nRes += m_filenames[i].Len();
+ nRes += m_filenames[i].length();
nRes += 1;
}
return nRes + 1;
}
-bool wxFileDataObject::SetData(
- size_t WXUNUSED(nSize)
-, const void* pBuf
-)
+bool wxFileDataObject::SetData( size_t WXUNUSED(nSize),
+ const void* pBuf )
{
/* TODO */
- wxString sFile( (const char *)pBuf); /* char, not wxChar */
+ wxString sFile((const wxChar *)pBuf); /* char, not wxChar */
AddFile(sFile);
- return TRUE;
+ return true;
}
void wxFileDataObject::AddFile(
Clear();
}
-void wxBitmapDataObject::SetBitmap(
- const wxBitmap& rBitmap
-)
+void wxBitmapDataObject::SetBitmap( const wxBitmap& rBitmap )
{
ClearAll();
wxBitmapDataObjectBase::SetBitmap(rBitmap);
DoConvertToPng();
}
-bool wxBitmapDataObject::GetDataHere(
- void* pBuf
-) const
+bool wxBitmapDataObject::GetDataHere( void* pBuf ) const
{
if (!m_pngSize)
{
wxFAIL_MSG(wxT("attempt to copy empty bitmap failed"));
- return FALSE;
+ return false;
}
memcpy(pBuf, m_pngData, m_pngSize);
- return TRUE;
+ return true;
}
-bool wxBitmapDataObject::SetData(
- size_t nSize
-, const void* pBuf
-)
+bool wxBitmapDataObject::SetData( size_t nSize, const void* pBuf)
{
Clear();
m_pngSize = nSize;
if (!vHandler.LoadFile(&vImage, vMstream))
{
- return FALSE;
+ return false;
}
m_bitmap = wxBitmap(vImage);
#endif
}
+#endif // wxUSE_DATAOBJ