From 6863bc0d4c254216f5236cd3fd3eb5de271404b7 Mon Sep 17 00:00:00 2001
From: Walter Negro <anegro@overnet.com.ar>
Date: Sat, 2 Mar 2002 22:41:07 +0000
Subject: [PATCH]     * METHOD _Delete()      * modification to be more Clip*r
 compliant and behaviour.       * changes in the logic of the function.       
  before, the function only erased the character under the cursor.         now
 it drags the other characters.         dragging is limited by the non
 editable characters.     * METHOD Insert()      * modification to be more
 Clip*r compliant and behaviour.       * changes in the logic of the function.
         now insert a character and displaces to the right the rest of        
 the characters until the first non editable character.

---
 harbour/source/rtl/tget.prg | 76 +++++++++++++++++++------------------
 1 file changed, 39 insertions(+), 37 deletions(-)

diff --git a/harbour/source/rtl/tget.prg b/harbour/source/rtl/tget.prg
index 99dc7d1dd0..7ba9cb4103 100644
--- a/harbour/source/rtl/tget.prg
+++ b/harbour/source/rtl/tget.prg
@@ -575,9 +575,8 @@ return Self
 
 METHOD Insert( cChar ) CLASS Get
 
-   local cOver
-   local cTmp
-   local nPos
+   local n
+   local nMaxLen := ::nMaxLen
 
    if ::type == "N" .and. ! ::lEdit
       ::pos := 1
@@ -611,19 +610,22 @@ METHOD Insert( cChar ) CLASS Get
       ::Rejected := .f.
    endif
 
-   cOver    := Substr( ::buffer, ::Pos, 1 )
-   ::buffer := Substr( ::buffer, 1, ::Pos-1 ) + cChar + Substr( ::buffer, ::Pos+1 )
-   nPos     := ::Pos + 1
-
-   do while nPos <= ::nMaxLen
-      if ::IsEditable( nPos )
-         cTmp     := Substr( ::buffer, nPos, 1 )
-         ::buffer := Substr( ::buffer, 1, nPos - 1 ) + cOver + Substr( ::buffer, nPos + 1 )
-         cOver    := cTmp
-      endif
-      nPos++
-   enddo
+   if ::lPicComplex
+      // Calculating diferent nMaxLen for ::lPicComplex
 
+      for n := ::Pos to nMaxLen
+         if !::IsEditable( n )
+           exit
+         endif
+      next
+      nMaxLen := n
+      ::buffer := Left( Substr( ::buffer, 1, ::Pos-1 ) + cChar +;
+                  Substr( ::buffer, ::Pos, nMaxLen-1-::Pos ) +;
+                  Substr( ::buffer, nMaxLen ), ::nMaxLen )
+   else
+      ::buffer := Left( Substr( ::buffer, 1, ::Pos-1 ) + cChar + Substr( ::buffer, ::Pos ), ::nMaxLen )
+   endif
+    
    ::Changed := !( ::unTransform() == ::Original )
    ::Assign()
    ::Right( .f. )
@@ -989,33 +991,31 @@ return Self
 
 METHOD _Delete( lDisplay ) CLASS Get
 
+   LOCAL nMaxLen := ::nMaxLen, n
+
    DEFAULT lDisplay TO .t.
 
-   do case
-   case ::type == "C"
-      if ! ::lPicComplex
-         ::buffer := PadR( SubStr( ::buffer, 1, ::Pos - 1 ) + ;
-                     SubStr( ::buffer, ::Pos + 1 ), ::nMaxLen )
-      else
-         ::buffer := SubStr( ::buffer, 1, ::Pos - 1 ) + " " + ;
-                     SubStr( ::buffer, ::Pos + 1 )
-      endif
+   ::lEdit := .t.
 
-   case ::type == "N"
-      if SubStr( ::buffer, ::Pos, 1 ) == "-"
-         ::minus := .f.
-      endif
-      ::buffer := SubStr( ::buffer, 1, ::Pos - 1 ) + " " + ;
-                  SubStr( ::buffer, ::Pos + 1 )
+   if ::lPicComplex
+      // Calculating diferent nMaxLen for ::lPicComplex
+      for n := ::Pos to nMaxLen
+         if !::IsEditable( n )
+           exit
+         endif
+      next
+      nMaxLen := n - 1
+   endif
 
-   case ::type == "D"
-      ::buffer := SubStr( ::buffer, 1, ::Pos - 1 ) + " " + ;
-                  SubStr( ::buffer, ::Pos + 1 )
+   ::buffer := PadR( SubStr( ::buffer, 1, ::Pos - 1 ) + ;
+               SubStr( ::buffer, ::Pos + 1, nMaxLen - ::Pos ) + " " +;
+               SubStr( ::buffer, nMaxLen + 1 ), ::nMaxLen )
 
-   case ::type == "L"
-      ::buffer := " "
-
-   endcase
+   if ::type == "D"
+      ::BadDate := !( DToC( CToD( ::buffer ) ) == ::buffer )
+   else
+      ::BadDate := .f.
+   endif
 
    ::Assign()
 
@@ -1031,6 +1031,8 @@ METHOD DeleteAll() CLASS Get
 
    local xValue
 
+   ::lEdit := .t.
+
    do case
    case ::type == "C"
       xValue := Space( ::nMaxlen )