wxRegion fixes (off by one)

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

diff --git a/src/motif/dataobj.cpp b/src/motif/dataobj.cpp
index 5564b4c24c8e289e975dc824afa1a679068018c8..90e41f267ac3faa19e34465a8dc35fa04040874a 100644 (file)
--- a/src/motif/dataobj.cpp
+++ b/src/motif/dataobj.cpp
@@ -18,14 +18,22 @@
 #include "wx/dataobj.h"
 #include "wx/app.h"
 
+#ifdef __VMS__
+#pragma message disable nosimpint
+#endif
 #include <Xm/Xm.h>
+#ifdef __VMS__
+#pragma message enable nosimpint
+#endif
 #include "wx/utils.h"
 
 //-------------------------------------------------------------------------
 // global data
 //-------------------------------------------------------------------------
 
-Atom  g_textAtom = 0;
+Atom  g_textAtom        = 0;
+Atom  g_pngAtom         = 0;
+Atom  g_fileAtom        = 0;
 
 //-------------------------------------------------------------------------
 // wxDataFormat
@@ -33,135 +41,108 @@ Atom  g_textAtom = 0;
 
 wxDataFormat::wxDataFormat()
 {
-    if (!g_textAtom) g_textAtom = XInternAtom( (Display*) wxGetDisplay(), "STRING", FALSE );
+    // do *not* call PrepareFormats() from here for 2 reasons:
+    //
+    // 1. we will have time to do it later because some other Set function
+    //    must be called before we really need them
+    //
+    // 2. doing so prevents us from declaring global wxDataFormats because
+    //    calling PrepareFormats (and thus gdk_atom_intern) before GDK is
+    //    initialised will result in a crash
     m_type = wxDF_INVALID;
-    m_hasAtom = FALSE;
-    m_atom = (Atom) 0;
+    m_format = (Atom) 0;
 }
 
 wxDataFormat::wxDataFormat( wxDataFormatId type )
 {
-    if (!g_textAtom) g_textAtom = XInternAtom( (Display*) wxGetDisplay(), "STRING", FALSE );
+    PrepareFormats();
     SetType( type );
 }
 
 wxDataFormat::wxDataFormat( const wxChar *id )
 {
-    if (!g_textAtom) g_textAtom = XInternAtom( (Display*) wxGetDisplay(), "STRING", FALSE );
+    PrepareFormats();
     SetId( id );
 }
 
 wxDataFormat::wxDataFormat( const wxString &id )
 {
-    if (!g_textAtom) g_textAtom = XInternAtom( (Display*) wxGetDisplay(), "STRING", FALSE );
+    PrepareFormats();
     SetId( id );
 }
 
-wxDataFormat::wxDataFormat( const wxDataFormat &format )
-{
-    if (!g_textAtom) g_textAtom = XInternAtom( (Display*) wxGetDisplay(), "STRING", FALSE );
-    m_type = format.GetType();
-    m_id = format.GetId();
-    m_hasAtom = TRUE;
-    m_atom = ((wxDataFormat &)format).GetAtom();    // const_cast
-}
-
-wxDataFormat::wxDataFormat( const Atom atom )
+wxDataFormat::wxDataFormat( NativeFormat format )
 {
-    if (!g_textAtom) g_textAtom = XInternAtom( (Display*) wxGetDisplay(), "STRING", FALSE );
-    m_hasAtom = TRUE;
-
-    m_atom = atom;
-
-    if (m_atom == g_textAtom)
-    {
-        m_type = wxDF_TEXT;
-    } else
-/*
-    if (m_atom == GDK_TARGET_BITMAP)
-    {
-        m_type = wxDF_BITMAP;
-    } else
-*/
-    {
-        m_type = wxDF_PRIVATE;
-       m_id = XGetAtomName( (Display*) wxGetDisplay(),  m_atom );
-
-       if (m_id == wxT("file:ALL"))
-       {
-           m_type = wxDF_FILENAME;
-       }
-    }
+    PrepareFormats();
+    SetId( format );
 }
 
 void wxDataFormat::SetType( wxDataFormatId type )
 {
+    PrepareFormats();
     m_type = type;
 
     if (m_type == wxDF_TEXT)
-    {
-        m_id = wxT("STRING");
-    }
+        m_format = g_textAtom;
     else
     if (m_type == wxDF_BITMAP)
-    {
-        m_id = wxT("BITMAP");
-    }
+        m_format = g_pngAtom;
     else
     if (m_type == wxDF_FILENAME)
-    {
-        m_id = wxT("file:ALL");
-    }
+        m_format = g_fileAtom;
     else
     {
        wxFAIL_MSG( wxT("invalid dataformat") );
     }
+}
+
+wxDataFormatId wxDataFormat::GetType() const
+{
+    return m_type;
+}
 
-    m_hasAtom = FALSE;
+wxString wxDataFormat::GetId() const
+{
+    char *t = XGetAtomName ((Display*) wxGetDisplay(), m_format);
+    wxString ret( t );  // this will convert from ascii to Unicode
+    if (t) 
+        XFree( t );
+    return ret;
+}
+
+void wxDataFormat::SetId( NativeFormat format )
+{
+    PrepareFormats();
+    m_format = format;
+
+    if (m_format == g_textAtom)
+        m_type = wxDF_TEXT;
+    else
+    if (m_format == g_pngAtom)
+        m_type = wxDF_BITMAP;
+    else
+    if (m_format == g_fileAtom)
+        m_type = wxDF_FILENAME;
+    else
+        m_type = wxDF_PRIVATE;
 }
 
 void wxDataFormat::SetId( const wxChar *id )
 {
+    PrepareFormats();
     m_type = wxDF_PRIVATE;
-    m_id = id;
-    m_hasAtom = FALSE;
+    wxString tmp( id );
+    m_format = XInternAtom( (Display*) wxGetDisplay(), wxMBSTRINGCAST tmp.mbc_str(), FALSE );  // what is the string cast for?
 }
 
-Atom wxDataFormat::GetAtom()
+void wxDataFormat::PrepareFormats()
 {
-    if (!m_hasAtom)
-    {
-        m_hasAtom = TRUE;
-
-       if (m_type == wxDF_TEXT)
-       {
-            m_atom = g_textAtom;
-        }
-       else
-/*
-        if (m_type == wxDF_BITMAP)
-        {
-            m_atom = GDK_TARGET_BITMAP;
-        }
-       else
-*/
-        if (m_type == wxDF_PRIVATE)
-        {
-            m_atom = XInternAtom( (Display*) wxGetDisplay(), wxMBSTRINGCAST m_id.mbc_str(), FALSE );
-        }
-       else
-       if (m_type == wxDF_FILENAME)
-       {
-           m_atom = XInternAtom( (Display*) wxGetDisplay(), "file:ALL", FALSE );
-       }
-       else
-       {
-           m_hasAtom = FALSE;
-           m_atom = (Atom) 0;
-       }
-    }
-
-    return m_atom;
+    if (!g_textAtom)
+        g_textAtom = XInternAtom( (Display*) wxGetDisplay(), "STRING", FALSE );
+    if (!g_pngAtom)
+        g_pngAtom = XInternAtom( (Display*) wxGetDisplay(), "image/png", FALSE );
+    if (!g_fileAtom)
+        g_fileAtom = XInternAtom( (Display*) wxGetDisplay(), "file:ALL", FALSE );
 }
 
 #if 0