check for wxDF_UNICODETEXT and not only wxDF_TEXT in CanPaste(), this is necessary...

git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@52076 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775

diff --git a/src/common/textentrycmn.cpp b/src/common/textentrycmn.cpp
index 7324f6194c8ed8cded8842352b209c8eefb3dfc3..61d80ffbaaae6619940ec73a54a7f42ed1e34fe2 100644 (file)
--- a/src/common/textentrycmn.cpp
+++ b/src/common/textentrycmn.cpp
@@ -104,8 +104,14 @@ bool wxTextEntryBase::CanPaste() const
     {
 #if wxUSE_CLIPBOARD
         // check if there is any text on the clipboard
     {
 #if wxUSE_CLIPBOARD
         // check if there is any text on the clipboard

-        if ( wxTheClipboard->IsSupported(wxDF_TEXT) )
+        if ( wxTheClipboard->IsSupported(wxDF_TEXT)
+#if wxUSE_UNICODE
+                || wxTheClipboard->IsSupported(wxDF_UNICODETEXT)
+#endif // wxUSE_UNICODE
+           )
+        {

             return true;
             return true;

+        }

 #endif // wxUSE_CLIPBOARD
     }
 
 #endif // wxUSE_CLIPBOARD
     }