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

2012-09-25 01:40 UTC+0200 Viktor Szakats (harbour syenar.net)

Browse Source 
* extras/gtwvw/gtwvw.c
  * extras/gtwvw/gtwvw.hbp
  * extras/gtwvw/hbgtwvw.h
  * extras/gtwvw/wvwedit.c
  * extras/gtwvw/wvwfuncs.c
  * extras/gtwvw/wvwpush.c
  * extras/gtwvw/wvwstbar.c
  * extras/gtwvw/wvwtbar.c
    * updated to build without fatal errors on win x64.
      (code it still mostly 32-bit only though)
This commit is contained in:
Viktor Szakats
2012-09-24 23:43:41 +00:00
parent 45f4f1418c
commit 612514307b
9 changed files with 42 additions and 25 deletions
Download Patch File Download Diff File Expand all files Collapse all files

12
harbour/ChangeLog
View File

@@ -16,6 +16,18 @@
The license applies to all entries newer than 2009-04-28.
*/
2012-09-25 01:40 UTC+0200 Viktor Szakats (harbour syenar.net)
* extras/gtwvw/gtwvw.c
* extras/gtwvw/gtwvw.hbp
* extras/gtwvw/hbgtwvw.h
* extras/gtwvw/wvwedit.c
* extras/gtwvw/wvwfuncs.c
* extras/gtwvw/wvwpush.c
* extras/gtwvw/wvwstbar.c
* extras/gtwvw/wvwtbar.c
* updated to build without fatal errors on win x64.
(code it still mostly 32-bit only though)
2012-09-25 00:20 UTC+0200 Viktor Szakats (harbour syenar.net)
* utils/hbmk2/hbmk2.prg
+ hbstart.hb is now searched also at standard location on *nix

10
harbour/extras/gtwvw/gtwvw.c
View File

@@ -93,12 +93,6 @@
#include "hbgtwvw.h"
#if (defined(__MSC6__) || defined(__DMC__))
#define LONG_PTR LONG
#define SetWindowLongPtr SetWindowLong
#define GetWindowLongPtr GetWindowLong
#endif
#if defined(__WATCOMC__)
#include <conio.h>
#endif
@@ -10949,8 +10943,8 @@ UINT ButtonCreate( UINT usWinNum, USHORT usTop, USHORT usLeft, USHORT usBottom,
AddControlHandle(usWinNum, WVW_CONTROL_PUSHBUTTON, hWndButton, uiPBid, (PHB_ITEM) phbiCodeBlock, rXB, rOffXB, (byte) iStyle);
//OldProc = SetWindowLong (hWndButton,
//GWLP_WNDPROC, (LONG)hb_gt_wvwBtnProc) ;
//OldProc = SetWindowLongPtr (hWndButton,
//GWLP_WNDPROC, (LONG_PTR)hb_gt_wvwBtnProc) ;
OldProc = SubclassWindow( hWndButton, hb_gt_wvwBtnProc) ;
StoreControlProc(usWinNum, WVW_CONTROL_PUSHBUTTON, hWndButton, OldProc);

2
harbour/extras/gtwvw/gtwvw.hbp
View File

@@ -11,7 +11,7 @@
# TODO: Disabled UNICODE until this code gets support for it.
-winuni-
"-stop={!allwin|!x86}Skipped: '${hb_name}' only supported on win x86 platform."
"-stop={!allwin}Skipped: '${hb_name}' only supported on win platform."
gtwvw.c
wvwcheck.c

25
harbour/extras/gtwvw/hbgtwvw.h
View File

@@ -128,13 +128,7 @@
#if ! defined( _MSC_VER )
#if !defined( LONG_PTR )
typedef __int64 LONG_PTR ;
#ifndef SetWindowLongPtr
#define SetWindowLongPtr SetWindowLong
#endif
#ifndef GetWindowLongPtr
#define GetWindowLongPtr GetWindowLong
#endif
typedef __int64 LONG_PTR;
#endif
#endif
#endif
@@ -142,6 +136,23 @@
#include <olectl.h>
#endif
#if ( ( defined( _MSC_VER ) && ( _MSC_VER <= 1200 || defined( HB_OS_WIN_CE ) ) ) || \
defined( __DMC__ ) ) && !defined( HB_ARCH_64BIT )
# ifndef GetWindowLongPtr
# define GetWindowLongPtr GetWindowLong
# endif
# ifndef SetWindowLongPtr
# define SetWindowLongPtr SetWindowLong
# endif
# ifndef SetClassLongPtr
# define SetClassLongPtr SetClassLong
# endif
#endif
#if (defined(__MSC6__) || defined(__DMC__))
#define LONG_PTR LONG
#endif
#include <time.h>
#include <ctype.h>

4
harbour/extras/gtwvw/wvwedit.c
View File

@@ -265,8 +265,8 @@ HB_FUNC( WVW_EBCREATE)
AddControlHandle(usWinNum, WVW_CONTROL_EDITBOX, hWndEB, uiEBid, (PHB_ITEM) hb_param( 7, HB_IT_BLOCK ), rXB, rOffXB, (byte) bEBType);
OldProc = (WNDPROC) SetWindowLong (hWndEB,
GWL_WNDPROC, (LONG) hb_gt_wvwEBProc) ;
OldProc = (WNDPROC) SetWindowLongPtr (hWndEB,
GWLP_WNDPROC, (LONG_PTR) hb_gt_wvwEBProc) ;
StoreControlProc(usWinNum, WVW_CONTROL_EDITBOX, hWndEB, OldProc);

2
harbour/extras/gtwvw/wvwfuncs.c
View File

@@ -1602,7 +1602,7 @@ HB_FUNC( WVW_SETPOINTER )
break;
}
SetClassLong( pWindowData->hWnd, GCL_HCURSOR, ( DWORD ) hCursor );
SetClassLongPtr( pWindowData->hWnd, GCLP_HCURSOR, ( LONG_PTR ) hCursor );
}
/*-------------------------------------------------------------------*/

4
harbour/extras/gtwvw/wvwpush.c
View File

@@ -635,8 +635,8 @@ HB_FUNC( WVW_CBCREATE)
AddControlHandle(usWinNum, WVW_CONTROL_COMBOBOX, hWndCB, uiCBid, (PHB_ITEM) hb_param( 6, HB_IT_BLOCK ), rXB, rOffXB, (byte) bKbdType);
OldProc = (WNDPROC) SetWindowLong (hWndCB,
GWL_WNDPROC, (LONG) hb_gt_wvwCBProc) ;
OldProc = (WNDPROC) SetWindowLongPtr (hWndCB,
GWLP_WNDPROC, (LONG_PTR) hb_gt_wvwCBProc) ;
StoreControlProc(usWinNum, WVW_CONTROL_COMBOBOX, hWndCB, OldProc);

4
harbour/extras/gtwvw/wvwstbar.c
View File

@@ -577,8 +577,8 @@ HB_FUNC( WVW_XBCREATE)
AddControlHandle(usWinNum, WVW_CONTROL_SCROLLBAR, hWndXB, uiXBid, (PHB_ITEM) hb_param( 6, HB_IT_BLOCK ), rXB, rOffXB, (byte) iStyle);
OldProc = (WNDPROC) SetWindowLong (hWndXB,
GWL_WNDPROC, (LONG) hb_gt_wvwXBProc) ;
OldProc = (WNDPROC) SetWindowLongPtr (hWndXB,
GWLP_WNDPROC, (LONG_PTR) hb_gt_wvwXBProc) ;
StoreControlProc(usWinNum, WVW_CONTROL_SCROLLBAR, hWndXB, OldProc);

4
harbour/extras/gtwvw/wvwtbar.c
View File

@@ -160,8 +160,8 @@ HB_FUNC( WVW_TBCREATE)
hb_retnl(0);
}
pWindowData->tbOldProc = (WNDPROC) SetWindowLong (hWndTB,
GWL_WNDPROC, (LONG) hb_gt_wvwTBProc) ;
pWindowData->tbOldProc = (WNDPROC) SetWindowLongPtr (hWndTB,
GWLP_WNDPROC, (LONG_PTR) hb_gt_wvwTBProc) ;
if (iSystemBitmap > 0)
{