From f06fef5968e7931cbb337d949a1d64fe3672a24d Mon Sep 17 00:00:00 2001
From: Viktor Szakats <harbour@syenar.net>
Date: Fri, 13 Jun 2008 18:02:31 +0000
Subject: [PATCH] 2008-06-13 20:00 UTC+0200 Viktor Szakats (harbour.01 syenar
 hu)    * source/rtl/gtwvt/gtwvt.h    * source/rtl/gtwvt/gtwvt.c      ! Sorted
 out SELECTCOPY menu text and Unicode.

---
 harbour/ChangeLog                |  5 +++++
 harbour/source/rtl/gtwvt/gtwvt.c | 23 ++++++++++++++---------
 harbour/source/rtl/gtwvt/gtwvt.h |  2 +-
 3 files changed, 20 insertions(+), 10 deletions(-)

diff --git a/harbour/ChangeLog b/harbour/ChangeLog
index 645fc69d76..96db087535 100644
--- a/harbour/ChangeLog
+++ b/harbour/ChangeLog
@@ -8,6 +8,11 @@
    2008-12-31 13:59 UTC+0100 Foo Bar <foo.bar@foobar.org>
 */
 
+2008-06-13 20:00 UTC+0200 Viktor Szakats (harbour.01 syenar hu)
+   * source/rtl/gtwvt/gtwvt.h
+   * source/rtl/gtwvt/gtwvt.c
+     ! Sorted out SELECTCOPY menu text and Unicode.
+
 2008-06-13 19:19 UTC+0200 Viktor Szakats (harbour.01 syenar hu)
    * source/rtl/gtwvt/gtwvt.h
    * source/rtl/gtwvt/gtwvt.c
diff --git a/harbour/source/rtl/gtwvt/gtwvt.c b/harbour/source/rtl/gtwvt/gtwvt.c
index 821000f8a6..e3f1a58404 100644
--- a/harbour/source/rtl/gtwvt/gtwvt.c
+++ b/harbour/source/rtl/gtwvt/gtwvt.c
@@ -153,8 +153,8 @@ static void hb_gt_wvt_Free( PHB_GTWVT pWVT )
    --s_wvtCount;
    s_wvtWindows[pWVT->iHandle] = NULL;
 
-   if( pWVT->wSelectCopy )
-      HB_TCHAR_FREE( pWVT->wSelectCopy );
+   if( pWVT->pszSelectCopy )
+      hb_xfree( pWVT->pszSelectCopy );
 
    hb_xfree( pWVT );
 }
@@ -229,7 +229,7 @@ static PHB_GTWVT hb_gt_wvt_New( PHB_GT pGT )
    pWVT->bBeingMarked      = FALSE;
    pWVT->bBeginMarked      = FALSE;
 
-   pWVT->wSelectCopy       = HB_TCHAR_CONVTO( "Mark and Copy" );
+   pWVT->pszSelectCopy     = hb_strdup( "Mark and Copy" );
    pWVT->bSelectCopy       = TRUE;
    pWVT->bResizable        = TRUE;
    pWVT->bClosable         = TRUE;
@@ -1642,7 +1642,9 @@ static void hb_gt_wvt_Init( PHB_GT pGT, FHANDLE hFilenoStdin, FHANDLE hFilenoStd
    /* Create "Mark" prompt in SysMenu to allow console type copy operation */
    {
       HMENU hSysMenu = GetSystemMenu( pWVT->hWnd, FALSE );
-      AppendMenu( hSysMenu, MF_STRING, SYS_EV_MARK, pWVT->wSelectCopy );
+      LPTSTR buffer = HB_TCHAR_CONVTO( pWVT->pszSelectCopy );
+      AppendMenu( hSysMenu, MF_STRING, SYS_EV_MARK, buffer );
+      HB_TCHAR_FREE( buffer );
    }
 
    /* SUPER GT initialization */
@@ -2205,19 +2207,22 @@ static BOOL hb_gt_wvt_Info( PHB_GT pGT, int iType, PHB_GT_INFO pInfo )
 
          if( hb_itemType( pInfo->pNewVal ) & HB_IT_STRING )
          {
-            pInfo->pResult = hb_itemPutCPtr2( pInfo->pResult, HB_TCHAR_CONVFROM( pWVT->wSelectCopy ) );
+            pInfo->pResult = hb_itemPutC( pInfo->pResult, pWVT->pszSelectCopy );
 
             if( hb_itemGetCLen( pInfo->pNewVal ) )
             {
                HMENU hSysMenu = GetSystemMenu( pWVT->hWnd, FALSE );
+               LPTSTR buffer;
                
-               if( pWVT->wSelectCopy )
-                  HB_TCHAR_FREE( pWVT->wSelectCopy );
+               if( pWVT->pszSelectCopy )
+                  hb_xfree( pWVT->pszSelectCopy );
                
-               pWVT->wSelectCopy = HB_TCHAR_CONVTO( hb_itemGetCPtr( pInfo->pNewVal ) );
+               pWVT->pszSelectCopy = hb_strdup( hb_itemGetCPtr( pInfo->pNewVal ) );
                pWVT->bSelectCopy = TRUE;
                
-               ModifyMenu( hSysMenu, SYS_EV_MARK, MF_BYCOMMAND | MF_STRING | MF_ENABLED, SYS_EV_MARK, pWVT->wSelectCopy );
+               buffer = HB_TCHAR_CONVTO( pWVT->pszSelectCopy );
+               ModifyMenu( hSysMenu, SYS_EV_MARK, MF_BYCOMMAND | MF_STRING | MF_ENABLED, SYS_EV_MARK, buffer );
+               HB_TCHAR_FREE( buffer );
             }
          }
          else if( pInfo->pNewVal )
diff --git a/harbour/source/rtl/gtwvt/gtwvt.h b/harbour/source/rtl/gtwvt/gtwvt.h
index 729deec1ac..38a838aaaa 100644
--- a/harbour/source/rtl/gtwvt/gtwvt.h
+++ b/harbour/source/rtl/gtwvt/gtwvt.h
@@ -160,7 +160,7 @@ typedef struct
 
    BOOL     bResizable;
    BOOL     bSelectCopy;
-   LPWSTR   wSelectCopy;
+   char *   pszSelectCopy;
    BOOL     bClosable;
 
 } HB_GTWVT, * PHB_GTWVT;