use const for xpm icons

[wxWidgets.git] / src / mac / carbon / dataobj.cpp

diff --git a/src/mac/carbon/dataobj.cpp b/src/mac/carbon/dataobj.cpp
index fb73241ed9b61dcc8d2c81742c579ac3e49fadcc..b3b42de40a6a06b28e7ec9df98682745215e551c 100644 (file)
--- a/src/mac/carbon/dataobj.cpp
+++ b/src/mac/carbon/dataobj.cpp
@@ -49,11 +49,6 @@ wxDataFormat::wxDataFormat( wxDataFormatId vType )
     SetType( vType );
 }
 
     SetType( vType );
 }
 

-wxDataFormat::wxDataFormat( const wxChar *zId )
-{
-    SetId( zId );
-}
-

 wxDataFormat::wxDataFormat( const wxString& rId )
 {
     SetId( rId );
 wxDataFormat::wxDataFormat( const wxString& rId )
 {
     SetId( rId );


@@ -137,7 +132,7 @@ void wxDataFormat::SetId( NativeFormat format )
     }
 }
 
     }
 }
 

-void wxDataFormat::SetId( const wxChar* zId )
+void wxDataFormat::SetId( const wxString& zId )

 {
     m_type = wxDF_PRIVATE;
     m_id = zId;
 {
     m_type = wxDF_PRIVATE;
     m_id = zId;


@@ -194,7 +189,8 @@ bool wxDataObject::IsSupportedFormat( const wxDataFormat& rFormat, Direction vDi
 // ----------------------------------------------------------------------------
 
 #if wxUSE_UNICODE
 // ----------------------------------------------------------------------------
 
 #if wxUSE_UNICODE

-void wxTextDataObject::GetAllFormats( wxDataFormat *formats, wxDataObjectBase::Direction dir ) const
+void wxTextDataObject::GetAllFormats(wxDataFormat *formats,
+                                     wxDataObjectBase::Direction WXUNUSED(dir)) const

 {
     *formats++ = wxDataFormat( wxDF_TEXT );
     *formats = wxDataFormat( wxDF_UNICODETEXT );
 {
     *formats++ = wxDataFormat( wxDF_TEXT );
     *formats = wxDataFormat( wxDF_UNICODETEXT );


@@ -244,7 +240,7 @@ size_t wxFileDataObject::GetDataSize() const
     return buffLength + 1;
 }
 
     return buffLength + 1;
 }
 

-bool wxFileDataObject::SetData( size_t nSize, const void *pBuf )
+bool wxFileDataObject::SetData( size_t WXUNUSED(nSize), const void *pBuf )

 {
     wxString filenames;
 
 {
     wxString filenames;