2009-07-15 03:11 UTC+0200 Viktor Szakats (harbour.01 syenar.hu)

* source/rtl/gtwin/gtwin.c * Minor formatting. * source/rtl/gtapi.c % hb_gtSetCursor(): Deleted parameter evaluation. It's better to do it only on low-level. * config/win/bcc.cf % Line deleted. * utils/hbmk2/hbmk2.prg + -nohblib now supported in scripts. + -nohblib- option added. * examples/pp/pp.hbp * Comment deleted.
2009-07-15 01:12:42 +00:00
parent e81c3d4058
commit 6cd0529480
6 changed files with 45 additions and 34 deletions
--- a/harbour/ChangeLog
+++ b/harbour/ChangeLog
@@ -17,6 +17,24 @@
   past entries belonging to author(s): Viktor Szakats.
 */

+2009-07-15 03:11 UTC+0200 Viktor Szakats (harbour.01 syenar.hu)
+  * source/rtl/gtwin/gtwin.c
+    * Minor formatting.
+
+  * source/rtl/gtapi.c
+    % hb_gtSetCursor(): Deleted parameter evaluation.
+      It's better to do it only on low-level.
+
+  * config/win/bcc.cf
+    % Line deleted.
+
+  * utils/hbmk2/hbmk2.prg
+    + -nohblib now supported in scripts.
+    + -nohblib- option added.
+
+  * examples/pp/pp.hbp
+    * Comment deleted.
+
 2009-07-15 02:35 UTC+0200 Przemyslaw Czerpak (druzus/at/priv.onet.pl)
  * harbour/config/hpux/gcc.cf
  * harbour/config/darwin/gcc.cf
@@ -91,21 +109,21 @@
 2009-07-14 14:05 UTC-0800 Pritpal Bedi (pritpal@vouchcac.com)
 * contrib/hbqt/tests/demoqt.prg
   ! Some tweaks.
-    
+
     /* Lorenzo, you did not noted in ChangeLog after committing .*/

 2009-07-14 13:50 UTC-0800 Pritpal Bedi (pritpal@vouchcac.com)
  * contrib/hbxbp/xbpdialog.prg
  * contrib/hbxbp/xbpgeneric.prg
    ! Changed the way AppEvent() eventloop was being executed.
-      Not it is more near to Xbase++, not 100% but near. 
+      Not it is more near to Xbase++, not 100% but near.
      CPU consumption is reduced to 2-3 percent.

  * contrib/hbxbp/xbprtf.prg
    + Implemented more XbpRTF() features.

  * contrib/hbxbp/tests/demoxbp.prg
-    + Demonstrated more XbpRtf() features. 
+    + Demonstrated more XbpRtf() features.
      Play with Rtf tab.

 2009-07-14 22:42 UTC+0200 Viktor Szakats (harbour.01 syenar.hu)
--- a/harbour/config/win/bcc.cf
+++ b/harbour/config/win/bcc.cf
@@ -5,8 +5,6 @@
 # The Harbour Project
 # GNU MAKE file for Borland/CodeGear C/C++ 32-bit (4.x-)

-include $(TOP)$(ROOT)config/$(HB_ARCHITECTURE)/global.cf
-
 OBJ_EXT = .obj
 EXE_EXT = .exe
 LIB_PREF =
--- a/harbour/examples/pp/pp.hbp
+++ b/harbour/examples/pp/pp.hbp
@@ -6,5 +6,4 @@ pp.c hbppcomp.c hbppcore.c hbpptbl.c hbpragma.c
 -lhbcommon
 -lhbnulrtl
 -static
-# it does not work here
 -nohblib
--- a/harbour/source/rtl/gtapi.c
+++ b/harbour/source/rtl/gtapi.c
@@ -428,18 +428,17 @@ HB_ERRCODE hb_gtGetCursor( int * piCursorStyle )

 HB_ERRCODE hb_gtSetCursor( int iCursorStyle )
 {
+   PHB_GT pGT;
+
   HB_TRACE(HB_TR_DEBUG, ("hb_gtSetCursor(%d)", iCursorStyle));

-   if( iCursorStyle <= SC_SPECIAL2 )
+   pGT = hb_gt_Base();
+   if( pGT )
   {
-      PHB_GT pGT = hb_gt_Base();
-      if( pGT )
-      {
-         HB_GTSELF_SETCURSORSTYLE( pGT, iCursorStyle );
-         HB_GTSELF_FLUSH( pGT );
-         hb_gt_BaseFree( pGT );
-         return HB_SUCCESS;
-      }
+      HB_GTSELF_SETCURSORSTYLE( pGT, iCursorStyle );
+      HB_GTSELF_FLUSH( pGT );
+      hb_gt_BaseFree( pGT );
+      return HB_SUCCESS;
   }
   return HB_FAILURE;
 }
--- a/harbour/source/rtl/gtwin/gtwin.c
+++ b/harbour/source/rtl/gtwin/gtwin.c
@@ -1652,7 +1652,7 @@ static BOOL hb_gt_win_mouse_ButtonState( PHB_GT pGT, int iButton )

   if( iButton == 0 )
      fReturn = ( GetKeyState( VK_LBUTTON ) & 0x8000 ) != 0;
-   else if( iButton== 1 )
+   else if( iButton == 1 )
      fReturn = ( GetKeyState( VK_RBUTTON ) & 0x8000 ) != 0;
   else if( iButton == 2 )
      fReturn = ( GetKeyState( VK_MBUTTON ) & 0x8000 ) != 0;
--- a/harbour/utils/hbmk2/hbmk2.prg
+++ b/harbour/utils/hbmk2/hbmk2.prg
@@ -706,7 +706,6 @@ FUNCTION hbmk( aArgs, /* @ */ lPause, /* @ */ lUTF8 )
      CASE cParamL            == "-xhb"     ; hbmk[ _HBMK_nHBMODE ] := _HBMODE_XHB
      CASE cParamL            == "-hb10"    ; hbmk[ _HBMK_nHBMODE ] := _HBMODE_HB10
      CASE cParamL            == "-hbc"     ; hbmk[ _HBMK_nHBMODE ] := _HBMODE_RAW_C ; lAcceptCFlag := .T.
-      CASE cParamL            == "-nohblib" ; l_lNOHBLIB := .T.
      CASE cParamL == "-help" .OR. ;
           cParamL == "--help"

@@ -855,21 +854,6 @@ FUNCTION hbmk( aArgs, /* @ */ lPause, /* @ */ lUTF8 )
         "dbffptmt" }
   ENDIF

-   IF l_lNOHBLIB
-      aLIB_BASE1 := {}
-      aLIB_BASE2 := {}
-      aLIB_BASE_GT := {}
-      aLIB_BASE_PCRE := {}
-      aLIB_BASE_ZLIB := {}
-      aLIB_BASE_DEBUG := {}
-      aLIB_BASE_CPLR := {}
-      aLIB_BASE_ST := {}
-      aLIB_BASE_MT := {}
-      aLIB_BASE_NULRDD := {}
-      aLIB_BASE_RDD_ST := {}
-      aLIB_BASE_RDD_MT := {}
-   ENDIF
-
   /* Load architecture / compiler settings (compatibility) */

   IF Empty( hbmk[ _HBMK_cARCH ] )
@@ -1415,7 +1399,6 @@ FUNCTION hbmk( aArgs, /* @ */ lPause, /* @ */ lUTF8 )
           cParamL            == "-xhb" .OR. ;
           cParamL            == "-hb10" .OR. ;
           cParamL            == "-hbc" .OR. ;
-           cParamL            == "-nohblib" .OR. ;
           cParamL            == "-clipper" .OR. ;
           cParamL            == "-rtlink" .OR. ;
           cParamL            == "-blinker" .OR. ;
@@ -1439,6 +1422,8 @@ FUNCTION hbmk( aArgs, /* @ */ lPause, /* @ */ lUTF8 )
      CASE cParamL == "-fixshared"       ; hbmk[ _HBMK_lSHARED ]    := .T. ; hbmk[ _HBMK_lSTATICFULL ] := .F. ; hbmk[ _HBMK_lSHAREDDIST ] := .F.
      CASE cParamL == "-static"          ; hbmk[ _HBMK_lSHARED ]    := .F. ; hbmk[ _HBMK_lSTATICFULL ] := .F. ; hbmk[ _HBMK_lSHAREDDIST ] := NIL
      CASE cParamL == "-fullstatic"      ; hbmk[ _HBMK_lSHARED ]    := .F. ; hbmk[ _HBMK_lSTATICFULL ] := .T. ; hbmk[ _HBMK_lSHAREDDIST ] := NIL
+      CASE cParamL == "-nohblib"         ; l_lNOHBLIB := .T.
+      CASE cParamL == "-nohblib-"        ; l_lNOHBLIB := .F.
      CASE cParamL == "-bldf"            ; l_lBLDFLGP   := l_lBLDFLGC := l_lBLDFLGL := .T.
      CASE cParamL == "-bldf-"           ; l_lBLDFLGP   := l_lBLDFLGC := l_lBLDFLGL := .F.
      CASE Left( cParamL, 6 ) == "-bldf="
@@ -2038,6 +2023,18 @@ FUNCTION hbmk( aArgs, /* @ */ lPause, /* @ */ lUTF8 )
      /* Assemble library list */

      IF l_lNOHBLIB
+         aLIB_BASE1 := {}
+         aLIB_BASE2 := {}
+         aLIB_BASE_PCRE := {}
+         aLIB_BASE_ZLIB := {}
+         aLIB_BASE_DEBUG := {}
+         aLIB_BASE_CPLR := {}
+         aLIB_BASE_ST := {}
+         aLIB_BASE_MT := {}
+         aLIB_BASE_NULRDD := {}
+         aLIB_BASE_RDD_ST := {}
+         aLIB_BASE_RDD_MT := {}
+
         hbmk[ _HBMK_aLIBCOREGT ] := {}
      ENDIF

@@ -6774,6 +6771,7 @@ STATIC PROCEDURE ShowHelp( hbmk, lLong )
      { "-[no]trace"        , I_( "show commands executed" ) },;
      { "-[no]beep"         , I_( "enable (or disable) single beep on successful exit, double beep on failure" ) },;
      { "-[no]ignore"       , I_( "ignore errors when running compiler tools (default: off)" ) },;
+      { "-nohblib[-]"       , I_( "do not use static core Harbour libraries when linking" ) },;
      { "-traceonly"        , I_( "show commands to be executed, but don't execute them" ) },;
      { "-[no]compr[=lev]"  , I_( "compress executable/dynamic lib (needs UPX)\n<lev> can be: min, max, def" ) },;
      { "-[no]run"          , I_( "run/don't run output executable" ) },;
@@ -6820,7 +6818,6 @@ STATIC PROCEDURE ShowHelp( hbmk, lLong )
      { "-hb10"             , I_( "enable Harbour 1.0.x compatibility mode (experimental)" ) },;
      { "-xhb"              , I_( "enable xhb mode (experimental)" ) },;
      { "-hbc"              , I_( "enable pure C mode (experimental)" ) },;
-      { "-nohblib"          , I_( "do not use static core Harbour libraries when linking" ) },;
      { "-rtlink"           , "" },;
      { "-blinker"          , "" },;
      { "-exospace"         , I_( "emulate Clipper compatible linker behavior\ncreate link/copy hbmk to rtlink/blinker/exospace for the same effect" ) },;