no real changes, just refactor to remove some code duplication in wxToolBarTool

[wxWidgets.git] / src / common / textentrycmn.cpp

diff --git a/src/common/textentrycmn.cpp b/src/common/textentrycmn.cpp
index 67443dcdad8e91dfa18cd1784f1a2e8c6f3bf2bf..4adca176b049568a93603b7ffe79127742fdf709 100644 (file)
--- a/src/common/textentrycmn.cpp
+++ b/src/common/textentrycmn.cpp
@@ -26,9 +26,12 @@
 #if wxUSE_TEXTCTRL || wxUSE_COMBOBOX
 
 #ifndef WX_PRECOMP
 #if wxUSE_TEXTCTRL || wxUSE_COMBOBOX
 
 #ifndef WX_PRECOMP

+    #include "wx/window.h"
+    #include "wx/dataobj.h"

 #endif //WX_PRECOMP
 
 #include "wx/textentry.h"
 #endif //WX_PRECOMP
 
 #include "wx/textentry.h"

+#include "wx/clipbrd.h"

 
 // ============================================================================
 // wxTextEntryBase implementation
 
 // ============================================================================
 // wxTextEntryBase implementation


@@ -37,9 +40,11 @@
 wxString wxTextEntryBase::GetRange(long from, long to) const
 {
     wxString sel;
 wxString wxTextEntryBase::GetRange(long from, long to) const
 {
     wxString sel;

-    if ( from < to )
+    wxString value = GetValue();
+
+    if ( from < to && (long)value.length() >= to )

     {
     {

-        sel = GetValue().substr(from, to - from);
+        sel = value.substr(from, to - from);

     }
 
     return sel;
     }
 
     return sel;


@@ -77,6 +82,14 @@ bool wxTextEntryBase::HasSelection() const
     return from < to;
 }
 
     return from < to;
 }
 

+void wxTextEntryBase::RemoveSelection()
+{
+    long from, to;
+    GetSelection(& from, & to);
+    if (from != -1 && to != -1)
+        Remove(from, to);
+}
+

 wxString wxTextEntryBase::GetStringSelection() const
 {
     long from, to;
 wxString wxTextEntryBase::GetStringSelection() const
 {
     long from, to;


@@ -97,7 +110,22 @@ bool wxTextEntryBase::CanCut() const
 
 bool wxTextEntryBase::CanPaste() const
 {
 
 bool wxTextEntryBase::CanPaste() const
 {

-    return IsEditable();
+    if ( IsEditable() )
+    {
+#if wxUSE_CLIPBOARD
+        // check if there is any text on the clipboard
+        if ( wxTheClipboard->IsSupported(wxDF_TEXT)
+#if wxUSE_UNICODE
+                || wxTheClipboard->IsSupported(wxDF_UNICODETEXT)
+#endif // wxUSE_UNICODE
+           )
+        {
+            return true;
+        }
+#endif // wxUSE_CLIPBOARD
+    }
+
+    return false;

 }
 
 #endif // wxUSE_TEXTCTRL || wxUSE_COMBOBOX
 }
 
 #endif // wxUSE_TEXTCTRL || wxUSE_COMBOBOX