fivedev/harbour-core
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

2008-06-13 20:00 UTC+0200 Viktor Szakats (harbour.01 syenar hu)

Browse Source 
* source/rtl/gtwvt/gtwvt.h
   * source/rtl/gtwvt/gtwvt.c
     ! Sorted out SELECTCOPY menu text and Unicode.
This commit is contained in:
Viktor Szakats
2008-06-13 18:02:31 +00:00
parent 5c7d551837
commit f06fef5968
3 changed files with 20 additions and 10 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
harbour/ChangeLog
View File

@@ -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

23
harbour/source/rtl/gtwvt/gtwvt.c
View File

@@ -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 )

2
harbour/source/rtl/gtwvt/gtwvt.h
View File

@@ -160,7 +160,7 @@ typedef struct
BOOL bResizable;
BOOL bSelectCopy;
LPWSTR wSelectCopy;
char * pszSelectCopy;
BOOL bClosable;
} HB_GTWVT, * PHB_GTWVT;