From 3af24b8e150c48c66f6b4ccffa1169645bdc3bc6 Mon Sep 17 00:00:00 2001
From: Viktor Szakats <harbour@syenar.net>
Date: Mon, 12 Nov 2012 01:10:56 +0000
Subject: [PATCH] 2012-11-12 02:03 UTC+0100 Viktor Szakats (harbour syenar.net)
   * extras/rddado/rddado.hbp   * extras/rddado/tests/access1.prg   *
 extras/rddado/tests/access2.prg   * extras/rddado/tests/mysql1.prg   *
 extras/rddado/tests/mysql3.prg     ! added missing link against hbwin lib
 when building as       dynamic lib.       It needs the method described in
 2010-07-31 01:59 UTC+0200     + added #require to tests so now they can be
 run as hbrun scripts     + added CLS to automatically switch to interactive
 GT with hbrun

  * extras/gfspell/spell.prg
  * extras/gfspell/spellc.c
  * extras/gtwvw/tests/ebtest7.prg
    * minor
---
 harbour/ChangeLog                       | 17 +++++
 harbour/extras/gfspell/spell.prg        | 12 +---
 harbour/extras/gfspell/spellc.c         |  2 +-
 harbour/extras/gtwvw/tests/ebtest7.prg  | 88 +++++++++----------------
 harbour/extras/rddado/rddado.hbp        |  2 +
 harbour/extras/rddado/tests/access1.prg |  3 +
 harbour/extras/rddado/tests/access2.prg |  2 +
 harbour/extras/rddado/tests/mysql1.prg  |  2 +
 harbour/extras/rddado/tests/mysql3.prg  |  2 +
 9 files changed, 60 insertions(+), 70 deletions(-)

diff --git a/harbour/ChangeLog b/harbour/ChangeLog
index 100b55b7a8..55e2fe8856 100644
--- a/harbour/ChangeLog
+++ b/harbour/ChangeLog
@@ -16,6 +16,23 @@
    The license applies to all entries newer than 2009-04-28.
 */
 
+2012-11-12 02:03 UTC+0100 Viktor Szakats (harbour syenar.net)
+  * extras/rddado/rddado.hbp
+  * extras/rddado/tests/access1.prg
+  * extras/rddado/tests/access2.prg
+  * extras/rddado/tests/mysql1.prg
+  * extras/rddado/tests/mysql3.prg
+    ! added missing link against hbwin lib when building as
+      dynamic lib.
+      It needs the method described in 2010-07-31 01:59 UTC+0200
+    + added #require to tests so now they can be run as hbrun scripts
+    + added CLS to automatically switch to interactive GT with hbrun
+
+  * extras/gfspell/spell.prg
+  * extras/gfspell/spellc.c
+  * extras/gtwvw/tests/ebtest7.prg
+    * minor
+
 2012-11-12 00:17 UTC+0100 Viktor Szakats (harbour syenar.net)
   * extras/superlib/superlib.dif
     ! fixed RAT_EVENT() to not hog the CPU and also to call
diff --git a/harbour/extras/gfspell/spell.prg b/harbour/extras/gfspell/spell.prg
index 071007c7d1..cf2c053ca5 100644
--- a/harbour/extras/gfspell/spell.prg
+++ b/harbour/extras/gfspell/spell.prg
@@ -1465,17 +1465,7 @@ FUNCTION AWords( cLine )
 
 // Find an occurrence of 'f_str' in 'l_str' starting from position 'f_rom'
 FUNCTION fat( f_str, l_str, f_rom )
-
-   IF PCount() < 3                        // Is f_rom passed?
-      f_rom := 1
-   ENDIF
-
-   RETURN At( f_str, SubStr( l_str, f_rom ) )
+   RETURN At( f_str, SubStr( l_str, iif( PCount() < 3, 1, f_rom ) ) )
 
 STATIC FUNCTION bfat( f_str, l_str, f_rom )
-
-   IF PCount() < 3                        // Is f_rom passed?
-      f_rom := 1
-   ENDIF
-
    RETURN hb_BAt( f_str, hb_BSubStr( l_str, f_rom ) )
diff --git a/harbour/extras/gfspell/spellc.c b/harbour/extras/gfspell/spellc.c
index 9a952c5450..8591d8e5db 100644
--- a/harbour/extras/gfspell/spellc.c
+++ b/harbour/extras/gfspell/spellc.c
@@ -130,7 +130,7 @@ HB_FUNC( XUNFORM )
    hb_retclen( cRet, iRetLen );
 }
 
-/***************************
+/*
  *   Function: Sp_Rate()
  *     Syntax: cRating := Sp_Rate( cFound, cWord )
  *    Purpose: Returns a letter code indicating how similar the two
diff --git a/harbour/extras/gtwvw/tests/ebtest7.prg b/harbour/extras/gtwvw/tests/ebtest7.prg
index 97919b5f37..0ee1a1aa93 100644
--- a/harbour/extras/gtwvw/tests/ebtest7.prg
+++ b/harbour/extras/gtwvw/tests/ebtest7.prg
@@ -29,6 +29,36 @@
 #include "set.ch"
 #include "setcurs.ch"
 
+#define EN_SETFOCUS         0x0100
+#define EN_KILLFOCUS        0x0200
+#define EN_CHANGE           0x0300
+#define EN_UPDATE           0x0400
+#define EN_ERRSPACE         0x0500
+#define EN_MAXTEXT          0x0501
+#define EN_HSCROLL          0x0601
+#define EN_VSCROLL          0x0602
+
+#define WM_KEYFIRST                     0x0100
+#define WM_KEYDOWN                      0x0100
+#define WM_KEYUP                        0x0101
+#define WM_CHAR                         0x0102
+#define WM_DEADCHAR                     0x0103
+#define WM_SYSKEYDOWN                   0x0104
+#define WM_SYSKEYUP                     0x0105
+#define WM_SYSCHAR                      0x0106
+#define WM_SYSDEADCHAR                  0x0107
+#define WM_KEYLAST                      0x0108
+#define WM_INITDIALOG                   0x0110
+#define WM_COMMAND                      0x0111
+#define WM_SYSCOMMAND                   0x0112
+#define WM_TIMER                        0x0113
+#define WM_HSCROLL                      0x0114
+#define WM_VSCROLL                      0x0115
+#define WM_INITMENU                     0x0116
+#define WM_INITMENUPOPUP                0x0117
+#define WM_MENUSELECT                   0x011F
+#define WM_MENUCHAR                     0x0120
+#define WM_ENTERIDLE                    0x0121
 
 #command @ <row>, <col> EBGET <var>                                       ;
       [LABEL <label>]                                   ;
@@ -489,64 +519,6 @@ STATIC FUNCTION nFocused( aEBGets )
 
    RETURN AScan( aEBGets, {| x | x[ __GET_LFOCUSED ] } )
 
-#define EN_SETFOCUS         0x0100
-
-#define EN_KILLFOCUS        0x0200
-
-#define EN_CHANGE           0x0300
-
-#define EN_UPDATE           0x0400
-
-#define EN_ERRSPACE         0x0500
-
-#define EN_MAXTEXT          0x0501
-
-#define EN_HSCROLL          0x0601
-
-#define EN_VSCROLL          0x0602
-
-#define WM_KEYFIRST                     0x0100
-
-#define WM_KEYDOWN                      0x0100
-
-#define WM_KEYUP                        0x0101
-
-#define WM_CHAR                         0x0102
-
-#define WM_DEADCHAR                     0x0103
-
-#define WM_SYSKEYDOWN                   0x0104
-
-#define WM_SYSKEYUP                     0x0105
-
-#define WM_SYSCHAR                      0x0106
-
-#define WM_SYSDEADCHAR                  0x0107
-
-#define WM_KEYLAST                      0x0108
-
-#define WM_INITDIALOG                   0x0110
-
-#define WM_COMMAND                      0x0111
-
-#define WM_SYSCOMMAND                   0x0112
-
-#define WM_TIMER                        0x0113
-
-#define WM_HSCROLL                      0x0114
-
-#define WM_VSCROLL                      0x0115
-
-#define WM_INITMENU                     0x0116
-
-#define WM_INITMENUPOPUP                0x0117
-
-#define WM_MENUSELECT                   0x011F
-
-#define WM_MENUCHAR                     0x0120
-
-#define WM_ENTERIDLE                    0x0121
-
 // callback function called by GTWVW during some events on editbox
 STATIC FUNCTION MaskEditBox( nWinNum, nId, nEvent, aEBGets )
 
diff --git a/harbour/extras/rddado/rddado.hbp b/harbour/extras/rddado/rddado.hbp
index 865e15f5f7..1d2682ba4c 100644
--- a/harbour/extras/rddado/rddado.hbp
+++ b/harbour/extras/rddado/rddado.hbp
@@ -15,5 +15,7 @@ adordd.prg
 
 -hbx=${hb_name}.hbx
 ${hb_name}.hbx
+{hbdyn}-env:_HB_DYNSUFF=_dll
+{hbdyn}hbwin.hbc
 $hb_pkg_dynlib.hbm
 $hb_pkg_install.hbm
diff --git a/harbour/extras/rddado/tests/access1.prg b/harbour/extras/rddado/tests/access1.prg
index c825c12aad..2977542bb3 100644
--- a/harbour/extras/rddado/tests/access1.prg
+++ b/harbour/extras/rddado/tests/access1.prg
@@ -2,6 +2,8 @@
  * $Id$
  */
 
+#require "rddado"
+
 #include "adordd.ch"
 
 REQUEST ADORDD
@@ -13,6 +15,7 @@ PROCEDURE Main()
 
    USE ( hb_DirBase() + "test.mdb" ) VIA "ADORDD" TABLE "Table1"
 
+   CLS
    Browse()
 
    USE
diff --git a/harbour/extras/rddado/tests/access2.prg b/harbour/extras/rddado/tests/access2.prg
index 0762bfb6bb..be4421eb10 100644
--- a/harbour/extras/rddado/tests/access2.prg
+++ b/harbour/extras/rddado/tests/access2.prg
@@ -4,6 +4,8 @@
 
 /* Testing dbCreate() with Access database engine */
 
+#require "rddado"
+
 #include "adordd.ch"
 
 REQUEST ADORDD
diff --git a/harbour/extras/rddado/tests/mysql1.prg b/harbour/extras/rddado/tests/mysql1.prg
index 96c5bc2d04..feccec9ce1 100644
--- a/harbour/extras/rddado/tests/mysql1.prg
+++ b/harbour/extras/rddado/tests/mysql1.prg
@@ -2,6 +2,8 @@
  * $Id$
  */
 
+#require "rddado"
+
 #include "adordd.ch"
 
 REQUEST ADORDD
diff --git a/harbour/extras/rddado/tests/mysql3.prg b/harbour/extras/rddado/tests/mysql3.prg
index 6571d8fc38..351a799618 100644
--- a/harbour/extras/rddado/tests/mysql3.prg
+++ b/harbour/extras/rddado/tests/mysql3.prg
@@ -2,6 +2,8 @@
  * $Id$
  */
 
+#require "rddado"
+
 // Testing LOCATE and CONTINUE
 
 #include "adordd.ch"