From fd37bdb934bb602fc7168da4a00968430c730330 Mon Sep 17 00:00:00 2001
From: Viktor Szakats <harbour@syenar.net>
Date: Mon, 8 Oct 2012 17:15:28 +0000
Subject: [PATCH] 2012-10-08 19:14 UTC+0200 Viktor Szakats (harbour syenar.net)
   * contrib/xhb/hjwindow.prg   * contrib/xhb/htmutil.prg   *
 contrib/xhb/thtm.prg     * avoid multiline DEFAULT TO cmds     * avoid
 DEFAULT TO with complex expressions     ! fixed one commented DEFAULT := cmd

---
 harbour/ChangeLog                |  8 ++++++
 harbour/contrib/xhb/hjwindow.prg |  8 +++---
 harbour/contrib/xhb/htmutil.prg  | 48 +++++++++++++++++++-------------
 harbour/contrib/xhb/thtm.prg     |  2 +-
 4 files changed, 41 insertions(+), 25 deletions(-)

diff --git a/harbour/ChangeLog b/harbour/ChangeLog
index 7374bdfcbf..c64bde158d 100644
--- a/harbour/ChangeLog
+++ b/harbour/ChangeLog
@@ -16,6 +16,14 @@
    The license applies to all entries newer than 2009-04-28.
 */
 
+2012-10-08 19:14 UTC+0200 Viktor Szakats (harbour syenar.net)
+  * contrib/xhb/hjwindow.prg
+  * contrib/xhb/htmutil.prg
+  * contrib/xhb/thtm.prg
+    * avoid multiline DEFAULT TO cmds
+    * avoid DEFAULT TO with complex expressions
+    ! fixed one commented DEFAULT := cmd
+
 2012-10-08 19:00 UTC+0200 Viktor Szakats (harbour syenar.net)
   * contrib/hbmisc/numtxtru.prg
     ! don't use # op.
diff --git a/harbour/contrib/xhb/hjwindow.prg b/harbour/contrib/xhb/hjwindow.prg
index 80cd235bc4..6a18cfcfe0 100644
--- a/harbour/contrib/xhb/hjwindow.prg
+++ b/harbour/contrib/xhb/hjwindow.prg
@@ -259,10 +259,10 @@ METHOD SetSize( x, y, h, w ) CLASS TJsWindow
 
    LOCAL cStr := ""
 
-   DEFAULT x TO ::ScreenX, ;
-      y TO ::ScreenY, ;
-      h TO ::height, ;
-      w TO ::width
+   DEFAULT x TO ::ScreenX
+   DEFAULT y TO ::ScreenY
+   DEFAULT h TO ::height
+   DEFAULT w TO ::width
 
    ::ScreenX := x
    ::ScreenY := y
diff --git a/harbour/contrib/xhb/htmutil.prg b/harbour/contrib/xhb/htmutil.prg
index c922bba5f3..94bb528dd8 100644
--- a/harbour/contrib/xhb/htmutil.prg
+++ b/harbour/contrib/xhb/htmutil.prg
@@ -59,7 +59,10 @@ STATIC s_aGreek := {}
 PROCEDURE BackButton( cImage, oHtm )
 
    DEFAULT cImage TO "back.gif"
-   DEFAULT oHtm TO HtmlPageObject()
+
+   IF oHtm == NIL
+      oHtm := HtmlPageObject()
+   ENDIF
 
    IMAGE( cImage ) ;
       URL "" ;
@@ -78,7 +81,9 @@ PROCEDURE BackFormButton( cImage, oForm )
 
    LOCAL oBut
 
-   DEFAULT oForm TO HtmlFormObject()
+   IF oForm == NIL
+      oForm := HtmlFormObject()
+   ENDIF
 
    IF cImage == NIL
       DEFINE BUTTON oBut ;
@@ -107,7 +112,10 @@ FUNCTION PutCounter( oHtm, nNumber, cDir, nDigits, nWidth, bgColor, nBorder )
    LOCAL i
    LOCAL cStr    := ""
 
-   DEFAULT oHtm TO HtmlPageObject()
+   IF oHtm == NIL
+      oHtm := HtmlPageObject()
+   ENDIF
+
    DEFAULT nNumber TO 0
    DEFAULT cDir TO "/images/counters/"
    DEFAULT nWidth TO 50
@@ -417,19 +425,19 @@ METHOD SetFeatures( alwaysRaised, alwaysLowered, ;
 
    LOCAL cStr := ""
 
-   DEFAULT alwaysRaised to ::alwaysRaised
-   DEFAULT alwaysLowered to ::alwaysLowered
-   DEFAULT Resizable to ::Resizable
-   DEFAULT Menubar to ::Menubar
-   DEFAULT personalBar to ::personalBar
-   DEFAULT dependent to ::dependent
-   DEFAULT location to ::location
-   DEFAULT directories to ::directories
-   DEFAULT Scrollbars to ::Scrollbars
-   DEFAULT Status to ::Status
-   DEFAULT TitleBar to ::TitleBar
-   DEFAULT Toolbar to ::Toolbar
-   DEFAULT copyHistory to ::copyHistory
+   DEFAULT alwaysRaised TO ::alwaysRaised
+   DEFAULT alwaysLowered TO ::alwaysLowered
+   DEFAULT Resizable TO ::Resizable
+   DEFAULT Menubar TO ::Menubar
+   DEFAULT personalBar TO ::personalBar
+   DEFAULT dependent TO ::dependent
+   DEFAULT location TO ::location
+   DEFAULT directories TO ::directories
+   DEFAULT Scrollbars TO ::Scrollbars
+   DEFAULT Status TO ::Status
+   DEFAULT TitleBar TO ::TitleBar
+   DEFAULT Toolbar TO ::Toolbar
+   DEFAULT copyHistory TO ::copyHistory
 
    IF alwaysRaised
       cStr += "alwaysraised=yes,"
@@ -513,10 +521,10 @@ METHOD SetSize( x, y, h, w ) CLASS JWindow
 
    LOCAL cStr := ""
 
-   DEFAULT x to ::ScreenX, ;
-      y to ::ScreenY, ;
-      h to ::height, ;
-      w to ::width
+   DEFAULT x TO ::ScreenX
+   DEFAULT y TO ::ScreenY
+   DEFAULT h TO ::height
+   DEFAULT w TO ::width
 
    ::ScreenX := x
    ::ScreenY := y
diff --git a/harbour/contrib/xhb/thtm.prg b/harbour/contrib/xhb/thtm.prg
index d28470e343..07df1708b3 100644
--- a/harbour/contrib/xhb/thtm.prg
+++ b/harbour/contrib/xhb/thtm.prg
@@ -1940,7 +1940,7 @@ METHOD iFrame( name, src, border, marginwidth, marginheight, ;
 
    DEFAULT BORDER TO .T.
    DEFAULT name TO "Frame01"
-//DEFAULT align  := "vertical"
+// DEFAULT align TO "vertical"
 
    IF name != NIL
       cStr += Space( 5 ) + '        NAME="' + name + '"' + CRLF()