tiny fixes

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

diff --git a/src/gtk1/dataobj.cpp b/src/gtk1/dataobj.cpp
index 1e87427cd71d24e8a2ae581faca475e00b0c5c77..8b217e7bc476831877a977d178c7b139bc1633c2 100644 (file)
--- a/src/gtk1/dataobj.cpp
+++ b/src/gtk1/dataobj.cpp
@@ -87,7 +87,7 @@ wxDataFormat::wxDataFormat( const GdkAtom atom )
         m_type = wxDF_PRIVATE;
        m_id = gdk_atom_name( m_atom );
 
-       if (m_id == _T("file:ALL"))
+       if (m_id == T("file:ALL"))
        {
            m_type = wxDF_FILENAME;
        }
@@ -100,21 +100,21 @@ void wxDataFormat::SetType( wxDataFormatId type )
 
     if (m_type == wxDF_TEXT)
     {
-        m_id = _T("STRING");
+        m_id = T("STRING");
     }
     else
     if (m_type == wxDF_BITMAP)
     {
-        m_id = _T("image/png");
+        m_id = T("image/png");
     }
     else
     if (m_type == wxDF_FILENAME)
     {
-        m_id = _T("file:ALL");
+        m_id = T("file:ALL");
     }
     else
     {
-       wxFAIL_MSG( _T("invalid dataformat") );
+       wxFAIL_MSG( T("invalid dataformat") );
     }
 
     m_hasAtom = FALSE;
@@ -155,7 +155,7 @@ GdkAtom wxDataFormat::GetAtom()
        else
         if (m_type == wxDF_PRIVATE)
         {
-            m_atom = gdk_atom_intern( MBSTRINGCAST m_id.mbc_str(), FALSE );
+            m_atom = gdk_atom_intern( wxMBSTRINGCAST m_id.mbc_str(), FALSE );
         }
        else
        if (m_type == wxDF_FILENAME)
@@ -433,7 +433,7 @@ size_t wxBitmapDataObject::GetSize() const
     return m_pngSize;
 }
 
-void wxBitmapDataObject::WriteBitmap( const wxBitmap &bitmap, void *dest ) const
+void wxBitmapDataObject::WriteBitmap( const wxBitmap &WXUNUSED(bitmap), void *dest ) const
 {
 //    if (m_bitmap == bitmap)
         memcpy( dest, m_pngData, m_pngSize );
@@ -484,7 +484,7 @@ void wxPrivateDataObject::Free()
 
 wxPrivateDataObject::wxPrivateDataObject()
 {
-    wxString id = _T("application/");
+    wxString id = T("application/");
     id += wxTheApp->GetAppName();
 
     m_format.SetId( id );