From 57d22736ec21ac6204768f4cf7e58f62e33ef315 Mon Sep 17 00:00:00 2001
From: Viktor Szakats <harbour@syenar.net>
Date: Sun, 9 Aug 2009 10:54:06 +0000
Subject: [PATCH] 2009-08-09 12:53 UTC+0200 Viktor Szakats (harbour.01
 syenar.hu)   * contrib/hbtpathy/hbtpathy.hbc     ! Added darwin to supported
 platforms.

  * contrib/hbwin/win_tprt.prg
  * contrib/hbwin/oleauto.prg
  * contrib/hbwin/axfunc.prg
    * Formatting.
---
 harbour/ChangeLog                     |  9 +++++++
 harbour/contrib/hbtpathy/hbtpathy.hbc |  2 +-
 harbour/contrib/hbwin/axfunc.prg      |  7 +++---
 harbour/contrib/hbwin/oleauto.prg     | 35 +++++++++++++++------------
 harbour/contrib/hbwin/win_tprt.prg    |  2 +-
 5 files changed, 35 insertions(+), 20 deletions(-)

diff --git a/harbour/ChangeLog b/harbour/ChangeLog
index 16553214ce..b138bb7f8a 100644
--- a/harbour/ChangeLog
+++ b/harbour/ChangeLog
@@ -17,6 +17,15 @@
    past entries belonging to author(s): Viktor Szakats.
 */
 
+2009-08-09 12:53 UTC+0200 Viktor Szakats (harbour.01 syenar.hu)
+  * contrib/hbtpathy/hbtpathy.hbc
+    ! Added darwin to supported platforms.
+
+  * contrib/hbwin/win_tprt.prg
+  * contrib/hbwin/oleauto.prg
+  * contrib/hbwin/axfunc.prg
+    * Formatting.
+
 2009-08-09 11:07 UTC+0200 Viktor Szakats (harbour.01 syenar.hu)
   * source/rtl/rat.c
     ! HB_RAT() fixed to not ignore nEnd parameter if it's out of bound.
diff --git a/harbour/contrib/hbtpathy/hbtpathy.hbc b/harbour/contrib/hbtpathy/hbtpathy.hbc
index d18cda0c22..869ed57802 100644
--- a/harbour/contrib/hbtpathy/hbtpathy.hbc
+++ b/harbour/contrib/hbtpathy/hbtpathy.hbc
@@ -2,7 +2,7 @@
 # $Id$
 #
 
-{!(linux|win|os2)}skip=yes
+{!(linux|darwin|win|os2)}skip=yes
 
 incpaths=.
 
diff --git a/harbour/contrib/hbwin/axfunc.prg b/harbour/contrib/hbwin/axfunc.prg
index 8ec4f7c912..0e53ecc772 100644
--- a/harbour/contrib/hbwin/axfunc.prg
+++ b/harbour/contrib/hbwin/axfunc.prg
@@ -50,11 +50,12 @@
  *
  */
 
+FUNCTION WIN_AxGetControl( hWnd, bHandler )
+   LOCAL oAx := WIN_OleAuto()
 
-FUNC WIN_AxGetControl( hWnd, bHandler )
-LOCAL oAx := WIN_OleAuto()
    oAx:__hObj := __AxGetControl( hWnd )
    IF bHandler != NIL
       oAx:__hSink := __AxRegisterHandler( oAx:__hObj, bHandler )
    ENDIF
-RETURN oAx
+
+   RETURN oAx
diff --git a/harbour/contrib/hbwin/oleauto.prg b/harbour/contrib/hbwin/oleauto.prg
index 53457ee2f2..bf692ae160 100644
--- a/harbour/contrib/hbwin/oleauto.prg
+++ b/harbour/contrib/hbwin/oleauto.prg
@@ -71,9 +71,9 @@ ENDCLASS
 METHOD __enumStart( enum, lDescend ) CLASS WIN_OLEAUTO
    LOCAL hObjEnum
 
-   hObjEnum := __OLEENUMCREATE( ::__hObj, lDescend )
-   IF !EMPTY( hObjEnum )
-      IF !EMPTY( ::__hObjEnum )
+   hObjEnum := __OleEnumCreate( ::__hObj, lDescend )
+   IF ! Empty( hObjEnum )
+      IF ! Empty( ::__hObjEnum )
          /* small hack - clone the object array for nested FOR EACH calls */
          self := __objClone( self )
       ENDIF
@@ -82,43 +82,48 @@ METHOD __enumStart( enum, lDescend ) CLASS WIN_OLEAUTO
       (@enum):__enumBase( self )
       RETURN ::__enumSkip( @enum, lDescend )
    ENDIF
-RETURN .F.
+
+   RETURN .F.
 
 
 METHOD __enumSkip( enum, lDescend ) CLASS WIN_OLEAUTO
    LOCAL lContinue, xValue
 
    HB_SYMBOL_UNUSED( lDescend )
-   xValue := __OLEENUMNEXT( ::__hObjEnum, @lContinue )
+
+   xValue := __OleEnumNext( ::__hObjEnum, @lContinue )
    /* set enumerator value */
    (@enum):__enumValue( xValue )
-RETURN lContinue
+
+   RETURN lContinue
 
 
 METHOD PROCEDURE __enumStop() CLASS WIN_OLEAUTO
    ::__hObjEnum := NIL     /* activate autodestructor */
-RETURN
+   RETURN
 
 
 /* OLE functions */
 
-FUNC WIN_OleGetActiveObject( ... )
+FUNCTION win_OleGetActiveObject( ... )
    LOCAL oOle, hOle
 
    hOle := __OleGetActiveObject( ... )
-   IF ! EMPTY( hOle )
-      oOle := WIN_OleAuto()
+   IF ! Empty( hOle )
+      oOle := win_OleAuto()
       oOle:__hObj := hOle
    ENDIF
-RETURN oOle
+
+   RETURN oOle
 
 
-FUNC WIN_OleCreateObject( ... )
+FUNCTION win_OleCreateObject( ... )
    LOCAL oOle, hOle
 
    hOle := __OleCreateObject( ... )
-   IF ! EMPTY( hOle )
-      oOle := WIN_OleAuto()
+   IF ! Empty( hOle )
+      oOle := win_OleAuto()
       oOle:__hObj := hOle
    ENDIF
-RETURN oOle
+
+   RETURN oOle
diff --git a/harbour/contrib/hbwin/win_tprt.prg b/harbour/contrib/hbwin/win_tprt.prg
index cc970ca13b..25bcf3127b 100644
--- a/harbour/contrib/hbwin/win_tprt.prg
+++ b/harbour/contrib/hbwin/win_tprt.prg
@@ -94,7 +94,7 @@ CREATE CLASS win_Port
    METHOD PurgeRX()                         INLINE win_PortPurge( ::nPort, .T., .F. )
    METHOD PurgeTX()                         INLINE win_PortPurge( ::nPort, .F., .T. )
    METHOD Close( nDrain )                   INLINE win_PortClose( ::nPort, iif( Empty( nDrain ), 0, nDrain ) )
-   METHOD DebugDCB( nDebug )                INLINE win_PortDebugDCB(::nPort, nDebug )
+   METHOD DebugDCB( nDebug )                INLINE win_PortDebugDCB( ::nPort, nDebug )
    METHOD TimeOuts( nReadInterval, nReadMultiplier, nReadConstant, nWriteMultiplier, nWriteConstant ) ;
                                             INLINE win_PortTimeOuts( nReadInterval, nReadMultiplier, nReadConstant, nWriteMultiplier, nWriteConstant )
    METHOD Error()