new file added

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

diff --git a/src/gtk/dataobj.cpp b/src/gtk/dataobj.cpp
index dbe0952d50690e10c689a37d9ec136bce2315454..c742b77f156bf2ce5fe1c9caaa35809b1aecf1f2 100644 (file)
--- a/src/gtk/dataobj.cpp
+++ b/src/gtk/dataobj.cpp
@@ -33,6 +33,7 @@ GdkAtom  g_textAtom        = 0;
 GdkAtom  g_altTextAtom     = 0;
 GdkAtom  g_pngAtom         = 0;
 GdkAtom  g_fileAtom        = 0;
 GdkAtom  g_altTextAtom     = 0;
 GdkAtom  g_pngAtom         = 0;
 GdkAtom  g_fileAtom        = 0;

+GdkAtom  g_htmlAtom        = 0;

 
 //-------------------------------------------------------------------------
 // wxDataFormat
 
 //-------------------------------------------------------------------------
 // wxDataFormat


@@ -95,6 +96,9 @@ void wxDataFormat::SetType( wxDataFormatId type )
     if (m_type == wxDF_FILENAME)
         m_format = g_fileAtom;
     else
     if (m_type == wxDF_FILENAME)
         m_format = g_fileAtom;
     else

+    if (m_type == wxDF_HTML)
+        m_format = g_htmlAtom;
+    else

     {
        wxFAIL_MSG( wxT("invalid dataformat") );
     }
     {
        wxFAIL_MSG( wxT("invalid dataformat") );
     }


@@ -131,6 +135,9 @@ void wxDataFormat::SetId( NativeFormat format )
     else
     if (m_format == g_fileAtom)
         m_type = wxDF_FILENAME;
     else
     if (m_format == g_fileAtom)
         m_type = wxDF_FILENAME;

+    else
+    if (m_format == g_htmlAtom)
+        m_type = wxDF_HTML;

     else
         m_type = wxDF_PRIVATE;
 }
     else
         m_type = wxDF_PRIVATE;
 }


@@ -164,6 +171,8 @@ void wxDataFormat::PrepareFormats()
         g_pngAtom = gdk_atom_intern( "image/png", FALSE );
     if (!g_fileAtom)
         g_fileAtom = gdk_atom_intern( "text/uri-list", FALSE );
         g_pngAtom = gdk_atom_intern( "image/png", FALSE );
     if (!g_fileAtom)
         g_fileAtom = gdk_atom_intern( "text/uri-list", FALSE );

+    if (!g_htmlAtom)
+        g_htmlAtom = gdk_atom_intern( "text/html", FALSE );

 }
 
 //-------------------------------------------------------------------------
 }
 
 //-------------------------------------------------------------------------


@@ -384,12 +393,12 @@ bool wxBitmapDataObject::SetData(size_t size, const void *buf)
 
     m_bitmap = wxBitmap(image);
 
 
     m_bitmap = wxBitmap(image);
 

-    return m_bitmap.Ok();
+    return m_bitmap.IsOk();

 }
 
 void wxBitmapDataObject::DoConvertToPng()
 {
 }
 
 void wxBitmapDataObject::DoConvertToPng()
 {

-    if ( !m_bitmap.Ok() )
+    if ( !m_bitmap.IsOk() )

         return;
 
     wxCHECK_RET( wxImage::FindHandler(wxBITMAP_TYPE_PNG) != NULL,
         return;
 
     wxCHECK_RET( wxImage::FindHandler(wxBITMAP_TYPE_PNG) != NULL,