Added wxMenu::Delete() and fixed some menu deleted memory

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

diff --git a/src/gtk1/dataobj.cpp b/src/gtk1/dataobj.cpp
index 3af8442a63c67f1d0e1ea69cd7ff20fd6b9ea465..d1668eb212137f57b74919e59e366fd0db5aa687 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 == wxT("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 = wxT("STRING");
     }
     else
     if (m_type == wxDF_BITMAP)
     {
-        m_id = _T("image/png");
+        m_id = wxT("image/png");
     }
     else
     if (m_type == wxDF_FILENAME)
     {
-        m_id = _T("file:ALL");
+        m_id = wxT("file:ALL");
     }
     else
     {
-       wxFAIL_MSG( _T("invalid dataformat") );
+       wxFAIL_MSG( wxT("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)
@@ -484,7 +484,7 @@ void wxPrivateDataObject::Free()
 
 wxPrivateDataObject::wxPrivateDataObject()
 {
-    wxString id = _T("application/");
+    wxString id = wxT("application/");
     id += wxTheApp->GetAppName();
 
     m_format.SetId( id );