don't lose the contents of the combobox if it was set to a value not in a list and...

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

diff --git a/src/gtk1/clipbrd.cpp b/src/gtk1/clipbrd.cpp
index 4a09a5006f6b48d082f63a30fb2f70bea4aca97e..2d1ade92eccd9e7d8693f876022a2754e92ee708 100644 (file)
--- a/src/gtk1/clipbrd.cpp
+++ b/src/gtk1/clipbrd.cpp
@@ -17,10 +17,9 @@
 #ifndef WX_PRECOMP
     #include "wx/log.h"
     #include "wx/utils.h"
 #ifndef WX_PRECOMP
     #include "wx/log.h"
     #include "wx/utils.h"

+    #include "wx/dataobj.h"

 #endif
 
 #endif
 

-#include "wx/dataobj.h"
-

 #include <glib.h>
 #include <gdk/gdk.h>
 #include <gtk/gtk.h>
 #include <glib.h>
 #include <gdk/gdk.h>
 #include <gtk/gtk.h>


@@ -348,8 +347,6 @@ wxClipboard::wxClipboard()
 
     m_formatSupported = false;
     m_targetRequested = 0;
 
     m_formatSupported = false;
     m_targetRequested = 0;

-
-    m_usePrimary = false;

 }
 
 wxClipboard::~wxClipboard()
 }
 
 wxClipboard::~wxClipboard()


@@ -620,8 +617,25 @@ bool wxClipboard::GetData( wxDataObject& data )
 
         while (m_waiting) gtk_main_iteration();
 
 
         while (m_waiting) gtk_main_iteration();
 

-        /* this is a true error as we checked for the presence of such data before */
-        wxCHECK_MSG( m_formatSupported, false, wxT("error retrieving data from clipboard") );
+        /*
+           Normally this is a true error as we checked for the presence of such
+           data before, but there are applications that may return an empty
+           string (e.g. Gnumeric-1.6.1 on Linux if an empty cell is copied)
+           which would produce a false error message here, so we check for the
+           size of the string first. In ansi, GetDataSize returns an extra
+           value (for the closing null?), with unicode, the exact number of
+           tokens is given (that is more than 1 for special characters)
+           (tested with Gnumeric-1.6.1 and OpenOffice.org-2.0.2)
+         */
+#if wxUSE_UNICODE
+        if ( format != wxDF_UNICODETEXT || data.GetDataSize(format) > 0 )
+#else // !UNICODE
+        if ( format != wxDF_TEXT || data.GetDataSize(format) > 1 )
+#endif // UNICODE / !UNICODE
+        {
+            wxCHECK_MSG( m_formatSupported, false,
+                         wxT("error retrieving data from clipboard") );
+        }

 
         /* return success */
         delete[] array;
 
         /* return success */
         delete[] array;