projects
/
wxWidgets.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
allow specifying the mask colour in wxImage::ConvertAlphaToMask() (closes #10143)
[wxWidgets.git]
/
src
/
os2
/
dataobj.cpp
diff --git
a/src/os2/dataobj.cpp
b/src/os2/dataobj.cpp
index e0941f626816903b2a1bc69470d28aa81084dd46..81939cf4295c9588cd961e24333e0d2408c258b2 100644
(file)
--- a/
src/os2/dataobj.cpp
+++ b/
src/os2/dataobj.cpp
@@
-1,5
+1,5
@@
///////////////////////////////////////////////////////////////////////////////
///////////////////////////////////////////////////////////////////////////////
-// Name: os2/dataobj.cpp
+// Name:
src/
os2/dataobj.cpp
// Purpose: implementation of wx[I]DataObject class
// Author: David Webster
// Modified by:
// Purpose: implementation of wx[I]DataObject class
// Author: David Webster
// Modified by:
@@
-17,25
+17,22
@@
// headers
// ----------------------------------------------------------------------------
// headers
// ----------------------------------------------------------------------------
-#ifdef __GNUG__
- #pragma implementation "dataobj.h"
-#endif
-
// For compilers that support precompilation, includes "wx.h".
#include "wx/wxprec.h"
// For compilers that support precompilation, includes "wx.h".
#include "wx/wxprec.h"
+#if wxUSE_DATAOBJ
+
+#include "wx/dataobj.h"
+
#ifndef WX_PRECOMP
#ifndef WX_PRECOMP
-#include "wx/intl.h"
+ #include "wx/intl.h"
+ #include "wx/log.h"
+ #include "wx/image.h"
#endif
#endif
-#include "wx/defs.h"
-#include "wx/log.h"
-#include "wx/dataobj.h"
#include "wx/mstream.h"
#include "wx/mstream.h"
-#include "wx/image.h"
-#define INCL_DOS
-#include <os2.h>
+#include "wx/os2/private.h"
// ----------------------------------------------------------------------------
// functions
// ----------------------------------------------------------------------------
// functions
@@
-60,11
+57,11
@@
wxString wxDataFormat::GetId() const
} // end of wxDataFormat::GetId()
void wxDataFormat::SetId (
} // end of wxDataFormat::GetId()
void wxDataFormat::SetId (
- const wx
Char*
zId
+ const wx
String&
zId
)
{
m_uFormat = ::WinAddAtom( ::WinQuerySystemAtomTable()
)
{
m_uFormat = ::WinAddAtom( ::WinQuerySystemAtomTable()
- ,
(PSZ)zId
+ ,
zId.char_str()
);
} // end of wxDataFormat::SetId
);
} // end of wxDataFormat::SetId
@@
-94,15
+91,13
@@
private:
DRAGITEM m_vDragItem;
}; // end of CLASS CIDataObject
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)
{
QueryGetData(rFormat);
if (rFormat.GetType() == wxDF_INVALID)
- return
FALSE
;
+ return
false
;
ULONG ulSize = m_pDataObject->GetDataSize(rFormat);
ULONG ulSize = m_pDataObject->GetDataSize(rFormat);
@@
-111,7
+106,7
@@
bool CIDataObject::GetData (
//
// It probably means that the method is just not implemented
//
//
// It probably means that the method is just not implemented
//
- return
FALSE
;
+ return
false
;
}
if (rFormat.GetType() == wxDF_PRIVATE)
{
}
if (rFormat.GetType() == wxDF_PRIVATE)
{
@@
-123,7
+118,7
@@
bool CIDataObject::GetData (
}
if (ulSize > ulLen) // not enough room to copy
}
if (ulSize > ulLen) // not enough room to copy
- return
FALSE
;
+ return
false
;
//
// Copy the data
//
// Copy the data
@@
-132,7
+127,7
@@
bool CIDataObject::GetData (
,pzBuffer
,ulSize
);
,pzBuffer
,ulSize
);
- return
TRUE
;
+ return
true
;
} // end of CIDataObject::GetData
void CIDataObject::GetDataHere(
} // end of CIDataObject::GetData
void CIDataObject::GetDataHere(
@@
-225,9
+220,7
@@
wxDataObject::~wxDataObject ()
// wxFileDataObject
// ----------------------------------------------------------------------------
// wxFileDataObject
// ----------------------------------------------------------------------------
-bool wxFileDataObject::GetDataHere(
- void* pBuf
-) const
+bool wxFileDataObject::GetDataHere( void* pBuf ) const
{
wxString sFilenames;
{
wxString sFilenames;
@@
-237,8
+230,8
@@
bool wxFileDataObject::GetDataHere(
sFilenames += (wxChar)0;
}
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
}
size_t wxFileDataObject::GetDataSize() const
@@
-247,25
+240,23
@@
size_t wxFileDataObject::GetDataSize() const
for (size_t i = 0; i < m_filenames.GetCount(); i++)
{
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;
}
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 */
{
/* TODO */
- wxString
sFile((const wxChar *)pBuf); /* char, not wxChar */
+ wxString sFile((const wxChar *)pBuf); /* char, not wxChar */
AddFile(sFile);
AddFile(sFile);
- return
TRUE
;
+ return
true
;
}
void wxFileDataObject::AddFile(
}
void wxFileDataObject::AddFile(
@@
-299,32
+290,25
@@
wxBitmapDataObject::~wxBitmapDataObject()
Clear();
}
Clear();
}
-void wxBitmapDataObject::SetBitmap(
- const wxBitmap& rBitmap
-)
+void wxBitmapDataObject::SetBitmap( const wxBitmap& rBitmap )
{
ClearAll();
wxBitmapDataObjectBase::SetBitmap(rBitmap);
DoConvertToPng();
}
{
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"));
{
if (!m_pngSize)
{
wxFAIL_MSG(wxT("attempt to copy empty bitmap failed"));
- return
FALSE
;
+ return
false
;
}
memcpy(pBuf, m_pngData, m_pngSize);
}
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;
{
Clear();
m_pngSize = nSize;
@@
-339,7
+323,7
@@
bool wxBitmapDataObject::SetData(
if (!vHandler.LoadFile(&vImage, vMstream))
{
if (!vHandler.LoadFile(&vImage, vMstream))
{
- return
FALSE
;
+ return
false
;
}
m_bitmap = wxBitmap(vImage);
}
m_bitmap = wxBitmap(vImage);
@@
-369,3
+353,4
@@
void wxBitmapDataObject::DoConvertToPng()
#endif
}
#endif
}
+#endif // wxUSE_DATAOBJ