From ab0a6f05b35ea6beedb42df0c1050b2af3dee24d Mon Sep 17 00:00:00 2001
From: Viktor Szakats <harbour@syenar.net>
Date: Mon, 31 May 2010 08:14:05 +0000
Subject: [PATCH] 2010-05-31 10:13 UTC+0200 Viktor Szakats (harbour.01
 syenar.hu)   * contrib/xhb/hbcompat.ch   * contrib/xhb/xhb.ch     + Added
 xhb.ch translations for following functions:       AINS(), ADEL(), NETNAME(),
 MEMOWRIT(), SAVESCREEN(),       RESTSCREEN(), RTRIM(), TRIM(), ALLTRIM()

---
 harbour/ChangeLog               |  7 +++++++
 harbour/contrib/xhb/hbcompat.ch | 14 +++++++++++---
 harbour/contrib/xhb/xhb.ch      | 18 ++++++++++++++++++
 3 files changed, 36 insertions(+), 3 deletions(-)

diff --git a/harbour/ChangeLog b/harbour/ChangeLog
index ce733d4591..15ac9ac85d 100644
--- a/harbour/ChangeLog
+++ b/harbour/ChangeLog
@@ -17,6 +17,13 @@
    past entries belonging to author(s): Viktor Szakats.
 */
 
+2010-05-31 10:13 UTC+0200 Viktor Szakats (harbour.01 syenar.hu)
+  * contrib/xhb/hbcompat.ch
+  * contrib/xhb/xhb.ch
+    + Added xhb.ch translations for following functions:
+      AINS(), ADEL(), NETNAME(), MEMOWRIT(), SAVESCREEN(),
+      RESTSCREEN(), RTRIM(), TRIM(), ALLTRIM()
+
 2010-05-30 19:59 UTC+0200 Viktor Szakats (harbour.01 syenar.hu)
   * contrib/xhb/hbcompat.ch
   * contrib/xhb/xhbfs.c
diff --git a/harbour/contrib/xhb/hbcompat.ch b/harbour/contrib/xhb/hbcompat.ch
index 1b3e4803e1..a281844aaf 100644
--- a/harbour/contrib/xhb/hbcompat.ch
+++ b/harbour/contrib/xhb/hbcompat.ch
@@ -263,20 +263,28 @@
    #define GTI_CLIENT         2  /* Maximum possible client size of a window */
    #define GTI_MAX            3  /* Maximum possible window size (in Windows) */
 
-   #xtranslate NetName(<n>)                    => iif( hb_isNumeric( <n> ) .AND. <n> == 1, hb_UserName(), NetName() )
    #xtranslate MaxRow(.T.)                     => hb_gtInfo( HB_GTI_VIEWPORTHEIGHT )
    #xtranslate MaxCol(.T.)                     => hb_gtInfo( HB_GTI_VIEWPORTWIDTH )
 
    #xtranslate Str(<x>,[<y>],[<y>],<z>)        => iif(<z>, hb_NToS(<x>), Str(<x>))
 
-   #xtranslate AScan(<a>,<b>,[<c>],[<d>],<e>)  => hb_AScan(<a>,<b>,<c>,<d>,<e>)
+   #xuntranslate NetName(                      =>
+   #xuntranslate MemoWrit(                     =>
+
+   #xtranslate NetName(<n>)                    => iif( hb_isNumeric( <n> ) .AND. <n> == 1, hb_UserName(), NetName() )
+   #xtranslate MemoWrit(<x>,<y>,<z>)           => iif( hb_isLogical(<z>) .AND. ! <z>, hb_MemoWrit(<x>,<y>), MemoWrit(<x>,<y>) )
+
+   #xuntranslate AIns(                         =>
+   #xuntranslate ADel(                         =>
+
    #xtranslate AIns(<a>,<n>,[<x,...>])         => hb_AIns(<a>,<n>,<x>)
    #xtranslate ADel(<a>,<n>,<l>)               => hb_ADel(<a>,<n>,<l>)
+
+   #xtranslate AScan(<a>,<b>,[<c>],[<d>],<e>)  => hb_AScan(<a>,<b>,<c>,<d>,<e>)
    #xtranslate At(<a>,<b>,[<x,...>])           => hb_At(<a>,<b>,<x>)
 
    #xtranslate GetEnv([<x,...>])               => hb_GetEnv(<x>)
    #xtranslate SetKey([<x,...>])               => hb_SetKey(<x>)
-   #xtranslate MemoWrit(<x>,<y>,<z>)           => iif( hb_isLogical(<z>) .AND. ! <z>, hb_MemoWrit(<x>,<y>), MemoWrit(<x>,<y>) )
 
    /* TEXT INTO <varname> */
    #xcommand TEXT INTO <v> => #pragma __text|<v>+=%s+HB_OSNEWLINE();<v>:=""
diff --git a/harbour/contrib/xhb/xhb.ch b/harbour/contrib/xhb/xhb.ch
index 4aceb762c0..0a4d1d5f13 100644
--- a/harbour/contrib/xhb/xhb.ch
+++ b/harbour/contrib/xhb/xhb.ch
@@ -64,6 +64,24 @@
    #xtranslate __Keyboard([<x,...>])           => xhb__Keyboard(<x>)
    #xtranslate __CopyFile([<x,...>])           => xhb_CopyFile(<x>)
 
+   #xuntranslate AIns(                         =>
+   #xuntranslate ADel(                         =>
+
+   #xtranslate AIns(<a>,<n>,[<x,...>])         => xhb_AIns(<a>,<n>,<x>)
+   #xtranslate ADel(<a>,<n>,<l>)               => xhb_ADel(<a>,<n>,<l>)
+
+   #xuntranslate NetName(                      =>
+   #xuntranslate MemoWrit(                     =>
+
+   #xtranslate NetName([<x,...>])              => xhb_NetName(<x>)
+   #xtranslate MemoWrit([<x,...>])             => xhb_MemoWrit(<x>)
+
+   #xtranslate SaveScreen([<x,...>])           => xhb_SaveScreen(<x>)
+   #xtranslate RestScreen([<x,...>])           => xhb_RestScreen(<x>)
+   #xtranslate RTrim([<x,...>])                => xhb_RTrim(<x>)
+   #xtranslate Trim([<x,...>])                 => xhb_Trim(<x>)
+   #xtranslate AllTrim([<x,...>])              => xhb_AllTrim(<x>)
+
    /* _SET_TRACE* / TraceLog() */
    #xtranslate Set(_SET_TRACE [,<x,...>])      => xhb_setTrace( <x> )
    #xtranslate Set(_SET_TRACEFILE [,<x,...>])  => xhb_setTraceFile( <x> )