Source cleaning. wxMotif/OS2 adjustements.

[wxWidgets.git] / src / os2 / dataobj.cpp

diff --git a/src/os2/dataobj.cpp b/src/os2/dataobj.cpp
index e1ec79357b4a91dce517032937e4ce5ec65af13c..6633b8b12866e74cd43eff5684d4d6e5780c77da 100644 (file)
--- a/src/os2/dataobj.cpp
+++ b/src/os2/dataobj.cpp
@@ -6,7 +6,7 @@
 // Created:     10/21/99
 // RCS-ID:      $Id$
 // Copyright:   (c) 1999 David Webster
 // Created:     10/21/99
 // RCS-ID:      $Id$
 // Copyright:   (c) 1999 David Webster

-// Licence:     wxWidgets licence
+// Licence:     wxWindows licence

 ///////////////////////////////////////////////////////////////////////////////
 
 // ============================================================================
 ///////////////////////////////////////////////////////////////////////////////
 
 // ============================================================================


@@ -17,19 +17,17 @@
 // headers
 // ----------------------------------------------------------------------------
 
 // headers
 // ----------------------------------------------------------------------------
 

-#ifdef __GNUG__
-  #pragma implementation "dataobj.h"
-#endif
-

 // For compilers that support precompilation, includes "wx.h".
 #include "wx/wxprec.h"
 
 #ifndef WX_PRECOMP
 // For compilers that support precompilation, includes "wx.h".
 #include "wx/wxprec.h"
 
 #ifndef WX_PRECOMP

-#include "wx/intl.h"
+    #include "wx/defs.h"
+    #include "wx/intl.h"
+    #include "wx/log.h"

 #endif
 #endif

-#include "wx/defs.h"

 
 

-#include "wx/log.h"
+#if wxUSE_DATAOBJ
+

 #include "wx/dataobj.h"
 #include "wx/mstream.h"
 #include "wx/image.h"
 #include "wx/dataobj.h"
 #include "wx/mstream.h"
 #include "wx/image.h"


@@ -47,12 +45,12 @@
 
 wxString wxDataFormat::GetId() const
 {
 
 wxString wxDataFormat::GetId() const
 {

-    char                            zBuf[256];
+    wxChar                          zBuf[256];

     wxString                        sRet;
 
     ::WinQueryAtomName( ::WinQuerySystemAtomTable()
                        ,m_uFormat
     wxString                        sRet;
 
     ::WinQueryAtomName( ::WinQuerySystemAtomTable()
                        ,m_uFormat

-                       ,zBuf
+                       ,(PSZ)zBuf

                        ,256
                       );
     sRet = zBuf;
                        ,256
                       );
     sRet = zBuf;


@@ -64,7 +62,7 @@ void wxDataFormat::SetId (
 )
 {
     m_uFormat = ::WinAddAtom( ::WinQuerySystemAtomTable()
 )
 {
     m_uFormat = ::WinAddAtom( ::WinQuerySystemAtomTable()

-                             ,zId
+                             ,(PSZ)zId

                             );
 } // end of wxDataFormat::SetId
 
                             );
 } // end of wxDataFormat::SetId
 


@@ -94,11 +92,9 @@ 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)


@@ -132,7 +128,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(


@@ -158,7 +154,7 @@ void CIDataObject::SetData (
 , char*                             pzBuffer
 )
 {
 , char*                             pzBuffer
 )
 {

-    ULONG                           ulSize;
+    ULONG                           ulSize = 0;

 
     switch (rFormat.GetType())
     {
 
     switch (rFormat.GetType())
     {


@@ -225,9 +221,7 @@ wxDataObject::~wxDataObject ()
 // wxFileDataObject
 // ----------------------------------------------------------------------------
 
 // wxFileDataObject
 // ----------------------------------------------------------------------------
 

-bool wxFileDataObject::GetDataHere(
-  void*                             pBuf
-) const
+bool wxFileDataObject::GetDataHere( void* pBuf ) const

 {
     wxString                        sFilenames;
 
 {
     wxString                        sFilenames;
 


@@ -238,7 +232,7 @@ bool wxFileDataObject::GetDataHere(
     }
 
     memcpy(pBuf, sFilenames.mbc_str(), sFilenames.Len() + 1);
     }
 
     memcpy(pBuf, sFilenames.mbc_str(), sFilenames.Len() + 1);

-    return TRUE;
+    return true;

 }
 
 size_t wxFileDataObject::GetDataSize() const
 }
 
 size_t wxFileDataObject::GetDataSize() const


@@ -254,18 +248,16 @@ size_t wxFileDataObject::GetDataSize() const
     return 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 char *)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,18 +291,14 @@ 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)
     {
 {
     if (!m_pngSize)
     {


@@ -318,7 +306,7 @@ bool wxBitmapDataObject::GetDataHere(
         return FALSE;
     }
     memcpy(pBuf, m_pngData, m_pngSize);
         return FALSE;
     }
     memcpy(pBuf, m_pngData, m_pngSize);

-    return TRUE;
+    return true;

 }
 
 bool wxBitmapDataObject::SetData(
 }
 
 bool wxBitmapDataObject::SetData(


@@ -369,3 +357,4 @@ void wxBitmapDataObject::DoConvertToPng()
 #endif
 }
 
 #endif
 }
 

+#endif // wxUSE_DATAOBJ