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

2010-07-09 16:22 UTC+0200 Viktor Szakats (harbour.01 syenar.hu)

Browse Source 
* src/rtl/gtsys.c
    ! Added hack to fix setting default GT in bcc C++ builds.
      (please replace this with more elegant solution)

  * src/rtl/gtwin/gtwin.c
    * static var prefixed with 's_'

  * contrib/hbqt/hbqt_common.hbm
  * contrib/hbqt/hbqtcore.hbp
  * contrib/hbqt/qtwebkit/hbqtwebkit.hbp
  * contrib/hbqt/hbqscintilla/hbqscintilla.hbp
  * contrib/hbqt/hbqtnetwork.hbp
  * contrib/hbqt/qtdesigner/hbqtdesigner.hbp
  * contrib/hbqt/hbqt.hbp
  * contrib/hbqt/hbqtgui.hbp
    - -hblib option moved from common part to each .hbp.
      It's cleaner and more generic this way plus it helps
      tools (make.hbs and hbide) to decide about project type.
This commit is contained in:
Viktor Szakats
2010-07-09 14:23:38 +00:00
parent 7e07cde56c
commit ace7fce016
11 changed files with 43 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

20
harbour/ChangeLog
View File

@@ -16,6 +16,26 @@
The license applies to all entries newer than 2009-04-28.
*/
2010-07-09 16:22 UTC+0200 Viktor Szakats (harbour.01 syenar.hu)
* src/rtl/gtsys.c
! Added hack to fix setting default GT in bcc C++ builds.
(please replace this with more elegant solution)
* src/rtl/gtwin/gtwin.c
* static var prefixed with 's_'
* contrib/hbqt/hbqt_common.hbm
* contrib/hbqt/hbqtcore.hbp
* contrib/hbqt/qtwebkit/hbqtwebkit.hbp
* contrib/hbqt/hbqscintilla/hbqscintilla.hbp
* contrib/hbqt/hbqtnetwork.hbp
* contrib/hbqt/qtdesigner/hbqtdesigner.hbp
* contrib/hbqt/hbqt.hbp
* contrib/hbqt/hbqtgui.hbp
- -hblib option moved from common part to each .hbp.
It's cleaner and more generic this way plus it helps
tools (make.hbs and hbide) to decide about project type.
2010-07-09 15:08 UTC+0200 Viktor Szakats (harbour.01 syenar.hu)
* src/compiler/genc.c
* src/compiler/gencc.c

2
harbour/contrib/hbqt/hbqscintilla/hbqscintilla.hbp
View File

@@ -2,6 +2,8 @@
# $Id$
#
-hblib
../hbqt_common.hbm
-o${hb_name}

2
harbour/contrib/hbqt/hbqt.hbp
View File

@@ -2,6 +2,8 @@
# $Id$
#
-hblib
hbqt_common.hbm
-o${hb_name}

1
harbour/contrib/hbqt/hbqt_common.hbm
View File

@@ -2,7 +2,6 @@
# $Id$
#
-hblib
-inc
-w3 -es2

2
harbour/contrib/hbqt/hbqtcore.hbp
View File

@@ -2,6 +2,8 @@
# $Id$
#
-hblib
hbqt_common.hbm
-o${hb_name}

2
harbour/contrib/hbqt/hbqtgui.hbp
View File

@@ -2,6 +2,8 @@
# $Id$
#
-hblib
hbqt_common.hbm
-o${hb_name}

2
harbour/contrib/hbqt/hbqtnetwork.hbp
View File

@@ -2,6 +2,8 @@
# $Id$
#
-hblib
hbqt_common.hbm
-o${hb_name}

2
harbour/contrib/hbqt/qtdesigner/hbqtdesigner.hbp
View File

@@ -2,6 +2,8 @@
# $Id$
#
-hblib
../hbqt_common.hbm
-o${hb_name}

2
harbour/contrib/hbqt/qtwebkit/hbqtwebkit.hbp
View File

@@ -2,6 +2,8 @@
# $Id$
#
-hblib
../hbqt_common.hbm
-o${hb_name}

7
harbour/src/rtl/gtsys.c
View File

@@ -75,4 +75,9 @@
HB_GT_REQUEST( STD )
#endif
HB_FUNC( HB_GTSYS ) {}
HB_FUNC( HB_GTSYS )
{
#if defined( HB_OS_WIN ) && defined( __BORLANDC__ ) && defined( __cplusplus )
hb_gt_ForceLink_HB_GT_WIN();
#endif
}

6
harbour/src/rtl/gtwin/gtwin.c
View File

@@ -207,7 +207,7 @@ typedef struct _CLIPKEYCODE
/* Keypad keys */
static const CLIPKEYCODE stdKeyTab[ CLIP_STDKEY_COUNT ] = {
static const CLIPKEYCODE s_stdKeyTab[ CLIP_STDKEY_COUNT ] = {
{ 32, 0, 0, 0, 0}, /* ' ' */
{ 33, 0, 0, 0, 0}, /* '!' */
{ 34, 0, 0, 0, 0}, /* '"' */
@@ -1564,9 +1564,9 @@ static int hb_gt_win_ReadKey( PHB_GT pGT, int iEventMask )
else if( wChar >= 112 && wChar <= 123 ) /* F1-F12 VK_F1-VK_F12 */
extKey = wChar - 112;
else if( ch >= K_SPACE && ch <= K_CTRL_BS )
clipKey = &stdKeyTab[ ch - K_SPACE ];
clipKey = &s_stdKeyTab[ ch - K_SPACE ];
else if( ch > 0 && ch < K_SPACE && ( dwState & ( LEFT_CTRL_PRESSED | RIGHT_CTRL_PRESSED ) ) )
clipKey = &stdKeyTab[ ch + '@' ];
clipKey = &s_stdKeyTab[ ch + '@' ];
else if( ch < 0 ) /* international keys */
ch += 256;