check for wxDF_UNICODETEXT and not only wxDF_TEXT in CanPaste(), this is necessary under WinCE (patch 1891003) and shouldn't hurt elsewhere
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@52076 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
This commit is contained in:
@@ -104,8 +104,14 @@ bool wxTextEntryBase::CanPaste() const
|
||||
{
|
||||
#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;
|
||||
}
|
||||
#endif // wxUSE_CLIPBOARD
|
||||
}
|
||||
|
||||
|
Reference in New Issue
Block a user