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

2009-08-19 04:42 UTC+0200 Przemyslaw Czerpak (druzus/at/priv.onet.pl)

Browse Source 
* harbour/include/hbgtinfo.ch
    * formatting

  * harbour/include/Makefile
  - harbour/include/hbgetcmt.ch
    - removed redundant header file

  * harbour/contrib/hbwin/olecore.c
    * added workaround for wrong OLE variant structure definition
      in some C compilers header files
This commit is contained in:
Przemyslaw Czerpak
2009-08-19 02:43:23 +00:00
parent 825db05782
commit 65855b43db
5 changed files with 35 additions and 177 deletions
Download Patch File Download Diff File Expand all files Collapse all files

12
harbour/ChangeLog
View File

@@ -17,6 +17,18 @@
past entries belonging to author(s): Viktor Szakats.
*/
2009-08-19 04:42 UTC+0200 Przemyslaw Czerpak (druzus/at/priv.onet.pl)
* harbour/include/hbgtinfo.ch
* formatting
* harbour/include/Makefile
- harbour/include/hbgetcmt.ch
- removed redundant header file
* harbour/contrib/hbwin/olecore.c
* added workaround for wrong OLE variant structure definition
in some C compilers header files
2009-08-18 18:51 UTC-0800 Pritpal Bedi (pritpal@vouchcac.com)
* contrib/hbxbp/xbpwindow.prg
! Some tweaks.

24
harbour/contrib/hbwin/olecore.c
View File

@@ -54,11 +54,18 @@
#include "hbwinole.h"
/* enable workaround for wrong OLE variant structure definition */
#if ( defined( __POCC__ ) && defined( HB_OS_WIN_CE ) ) || \
defined( __DMC__ )
# define HB_OLE_NO_LL
#endif
#if defined( __MINGW32__ ) || \
defined( __DMC__ ) || \
( defined( __WATCOMC__ ) && ( __WATCOMC__ < 1280 ) )
# define HB_OLE_NO_LLREF
#endif
/* base date value in OLE (1899-12-30) as julian day */
#define HB_OLE_DATE_BASE 0x0024D9AB
@@ -236,16 +243,21 @@ static void hb_oleItemToVariantRef( VARIANT* pVariant, PHB_ITEM pItem,
}
#else
pVariant->n1.n2.vt = VT_I8;
# if defined( HB_OLE_NO_LL )
/* workaround for wrong OLE variant structure definition */
* ( ( LONGLONG * ) &pVariant->n1.n2.n3.lVal ) = hb_itemGetNInt( pItem );
# else
pVariant->n1.n2.n3.llVal = hb_itemGetNInt( pItem );
# endif
if( pVarRef )
{
pVarRef->n1.n2.vt = VT_I8 | VT_BYREF;
# if defined( HB_OLE_NO_LLREF ) || defined( HB_OLE_NO_LL )
/* workaround for wrong OLE variant structure definition */
#if defined( HB_OLE_NO_LLREF )
pVarRef->n1.n2.n3.pdblVal = &pVariant->n1.n2.n3.dblVal;
#else
# else
pVarRef->n1.n2.n3.pllVal = &pVariant->n1.n2.n3.llVal;
#endif
# endif
}
#endif
break;
@@ -486,6 +498,9 @@ void hb_oleVariantToItem( PHB_ITEM pItem, VARIANT* pVariant )
case VT_I8:
#if HB_LONG_MAX == INT32_MAX || defined( HB_LONG_LONG_OFF )
hb_itemPutNInt( pItem, ( HB_LONG ) pVariant->n1.n2.n3.lVal );
#elif defined( HB_OLE_NO_LL )
/* workaround for wrong OLE variant structure definition */
hb_itemPutNInt( pItem, * ( ( LONGLONG * ) &pVariant->n1.n2.n3.lVal ) );
#else
hb_itemPutNInt( pItem, pVariant->n1.n2.n3.llVal );
#endif
@@ -530,6 +545,9 @@ void hb_oleVariantToItem( PHB_ITEM pItem, VARIANT* pVariant )
/* TODO: sign is lost. Convertion to double will lose significant digits. */
#if HB_LONG_MAX == INT32_MAX || defined( HB_LONG_LONG_OFF )
hb_itemPutNInt( pItem, ( HB_LONG ) pVariant->n1.n2.n3.ulVal );
#elif defined( HB_OLE_NO_LL )
/* workaround for wrong OLE variant structure definition */
hb_itemPutNInt( pItem, * ( ( LONGLONG * ) &pVariant->n1.n2.n3.ulVal ) );
#else
hb_itemPutNInt( pItem, ( HB_LONG ) pVariant->n1.n2.n3.ullVal );
#endif

1
harbour/include/Makefile
View File

@@ -82,7 +82,6 @@ PRG_HEADERS := \
hbextcdp.ch \
hbextlng.ch \
hbextern.ch \
hbgetcmt.ch \
hbgfx.ch \
hbgfxdef.ch \
hbgtinfo.ch \

171
harbour/include/hbgetcmt.ch
View File

@@ -1,171 +0,0 @@
/*
* $Id$
*/
/*
* Harbour Project source code:
* Header file for Clipper 5.3 Compatible Get Commands
*
* Copyright 2001 Luiz Rafael Culik <culik@sl.conex.net>
* www - http://www.harbour-project.org
*
* This program is free software; you can redistribute it and/or modify
* it under the terms of the GNU General Public License as published by
* the Free Software Foundation; either version 2, or (at your option)
* any later version.
*
* This program is distributed in the hope that it will be useful,
* but WITHOUT ANY WARRANTY; without even the implied warranty of
* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
* GNU General Public License for more details.
*
* You should have received a copy of the GNU General Public License
* along with this software; see the file COPYING. If not, write to
* the Free Software Foundation, Inc., 59 Temple Place, Suite 330,
* Boston, MA 02111-1307 USA (or visit the web site http://www.gnu.org/).
*
* As a special exception, the Harbour Project gives permission for
* additional uses of the text contained in its release of Harbour.
*
* The exception is that, if you link the Harbour libraries with other
* files to produce an executable, this does not by itself cause the
* resulting executable to be covered by the GNU General Public License.
* Your use of that executable is in no way restricted on account of
* linking the Harbour library code into it.
*
* This exception does not however invalidate any other reasons why
* the executable file might be covered by the GNU General Public License.
*
* This exception applies only to the code released by the Harbour
* Project under the name Harbour. If you copy code from other
* Harbour Project or Free Software Foundation releases into a copy of
* Harbour, as the General Public License permits, the exception does
* not apply to the code that you add in this way. To avoid misleading
* anyone as to the status of such modified files, you must delete
* this exception notice from them.
*
* If you write modifications of your own for Harbour, it is your choice
* whether to permit this exception to apply to your modifications.
* If you do not wish that, delete this exception notice.
*
*/
#ifndef HB_GETCMT_CH_
#define HB_GETCMT_CH_
#ifdef HB_COMPAT_C53
#command @ <row>, <col> GET <var> ;
CHECKBOX ;
[VALID <valid>] ;
[WHEN <when>] ;
[CAPTION <caption>] ;
[MESSAGE <message>] ;
[COLOR <color>] ;
[FOCUS <fblock>] ;
[STATE <sblock>] ;
[STYLE <style>] ;
[SEND <msg>] ;
[GUISEND <guimsg>] ;
;
=> SetPos( <row>, <col> ) ;
; AAdd( GetList, ;
_GET_( <var>, <(var)>, NIL, <{valid}>, <{when}> ) ) ;
; ATail(GetList):Control := _CheckBox_( <var>, <caption>, ;
<message>, <color>, <{fblock}>, <{sblock}>, ;
<style> ) ;
; ATail(GetList):reader := { | a, b, c, d | ;
GuiReader( a, b, c, d ) } ;
[; ATail(GetList):<msg>] ;
[; ATail(GetList):Control:<guimsg>] ;
; ATail(GetList):Control:Display()
#command @ <top>, <left>, <bottom>, <right> GET <var> ;
RADIOGROUP <buttons> ;
[VALID <valid>] ;
[WHEN <when>] ;
[CAPTION <caption>] ;
[MESSAGE <message>] ;
[COLOR <color>] ;
[FOCUS <fblock>] ;
[STYLE <style>] ;
[SEND <msg>] ;
[GUISEND <guimsg>] ;
;
=> SetPos( <top>, <left> ) ;
; AAdd( GetList, ;
_GET_( <var>, <(var)>, NIL, <{valid}>, <{when}> ) ) ;
; ATail(GetList):Control := _RadioGrp_( ATail(Getlist):row, ;
ATail(Getlist):col, ;
<bottom>, <right>, <var>, <buttons>, <caption>, <message>, ;
<color>, <{fblock}>, <style> ) ;
; ATail(GetList):reader := { | a, b, c, d | ;
GuiReader( a, b, c, d ) } ;
[; ATail(GetList):<msg>] ;
[; ATail(GetList):Control:<guimsg>] ;
; ATail(GetList):Control:Display()
#command @ <row>, <col> GET <var> ;
PUSHBUTTON ;
[VALID <valid>] ;
[WHEN <when>] ;
[CAPTION <caption>] ;
[MESSAGE <message>] ;
[COLOR <color>] ;
[FOCUS <fblock>] ;
[STATE <sblock>] ;
[STYLE <style>] ;
[SEND <msg>] ;
[GUISEND <guimsg>] ;
;
=> SetPos( <row>, <col> ) ;
; AAdd( GetList, ;
_GET_( <var>, <(var)>, NIL, <{valid}>, <{when}> ) ) ;
; ATail(GetList):Control := _PushButt_( <caption>, <message>, ;
<color>, <{fblock}>, <{sblock}>, <style>, ;
) ;
; ATail(GetList):reader := { | a, b, c, d | ;
GuiReader( a, b, c, d ) } ;
[; ATail(GetList):<msg>] ;
[; ATail(GetList):Control:<guimsg>] ;
; ATail(GetList):Control:Display()
#command @ <top>, <left>, <bottom>, <right> GET <var> ;
LISTBOX <items> ;
[VALID <valid>] ;
[WHEN <when>] ;
[CAPTION <caption>] ;
[MESSAGE <message>] ;
[COLOR <color>] ;
[FOCUS <fblock>] ;
[STATE <sblock>] ;
[<drop: DROPDOWN>] ;
[<scroll: SCROLLBAR>] ;
[SEND <msg>] ;
[GUISEND <guimsg>] ;
;
=> SetPos( <top>, <left> ) ;
; AAdd( GetList, ;
_GET_( <var>, <(var)>, NIL, <{valid}>, <{when}> ) ) ;
; ATail(GetList):Control := _ListBox_( ATail(Getlist):row, ;
ATail(Getlist):col, ;
<bottom>, <right>, <var>, <items>, <caption>, <message>, ;
<color>, <{fblock}>, <{sblock}>, <.drop.>, ;
<.scroll.> ) ;
; ATail(GetList):reader := { | a, b, c, d | ;
GuiReader( a, b, c, d ) } ;
[; ATail(GetList):<msg>] ;
[; ATail(GetList):Control:<guimsg>] ;
; ATail(GetList):Control:Display()
#command READ [MSG AT <nRow>, <nLeft>, <nRight> ;
[MSG COLOR <cColor>]] ;
=> ReadModal( GetList, ;
NIL, <nRow>, <nLeft>, <nRight>, <cColor> ) ;
; GetList := {}
#endif
#endif /* HB_GETCMT_CH_ */

4
harbour/include/hbgtinfo.ch
View File

@@ -165,13 +165,13 @@
#define HB_GTI_KBD_ACCENT3 16384
#define HB_GTI_KBD_ACCENT4 32768
#define HB_GTI_KBD_LSHIFT 65536
#define HB_GTI_KBD_LSHIFT 65536
#define HB_GTI_KBD_RSHIFT 131072
#define HB_GTI_KBD_LCTRL 262144
#define HB_GTI_KBD_RCTRL 524288
#define HB_GTI_KBD_LALT 1048576
#define HB_GTI_KBD_RALT 2097572
/* Harbour GT callback events - WORK IN PROGRESS */
#define HB_GTE_ACTIVATE 1
#define HB_GTE_SETFOCUS 2