diff --git a/harbour/include/hbclass.ch b/harbour/include/hbclass.ch
index 1ad7d96adc..36084c1071 100644
--- a/harbour/include/hbclass.ch
+++ b/harbour/include/hbclass.ch
@@ -83,6 +83,10 @@
    oClass:AddMethod( <(MethodName)>, CLSMETH _CLASS_NAME_ <MethodName>() ) ;;
    oClass:AddMethod( "_" + <(MethodName)>, CLSMETH _CLASS_NAME_ <MethodName>() )
 
+#xcommand METHOD <MethodName>( [<param>] ) OPERATOR <op> => ;
+   oClass:AddMethod( <(MethodName)>, CLSMETH _CLASS_NAME_ <MethodName>() ) ;;
+   oClass:AddInline( <(op)>, {|Self [,<param>] | ::<MethodName>( [<param>] ) } )
+
 #xcommand MESSAGE <MessageName> METHOD <MethodName>( [<params,...>] ) => ;
    oClass:AddMethod( <(MessageName)>, CLSMETH _CLASS_NAME_ <MethodName>() )
 
diff --git a/harbour/source/rtl/dates.c b/harbour/source/rtl/dates.c
index 93d06f9cd4..c29e76a9c0 100644
--- a/harbour/source/rtl/dates.c
+++ b/harbour/source/rtl/dates.c
@@ -65,6 +65,10 @@
  *
  */
 
+#ifdef HARBOUR_USE_WIN_GTAPI
+   #include <windows.h>
+#endif
+
 #include "extend.h"
 #include "errorapi.h"
 #include "itemapi.h"
@@ -599,13 +603,21 @@ HARBOUR HB_TIME( void )
 {
    if( hb_pcount() == 0 )
    {
-      time_t t;
-      struct tm * oTime;
       char szResult[ 9 ];
 
-      time( &t );
-      oTime = localtime( &t );
-      sprintf( szResult, "%02d:%02d:%02d", oTime->tm_hour, oTime->tm_min, oTime->tm_sec );
+      #ifdef HARBOUR_USE_WIN_GTAPI
+         SYSTEMTIME st;
+         GetLocalTime( &st );
+         sprintf( szResult, "%02d:%02d:%02d", st.wHour, st.wMinute, st.wSecond );
+      #else
+         time_t t;
+         struct tm * oTime;
+
+         time( &t );
+         oTime = localtime( &t );
+         sprintf( szResult, "%02d:%02d:%02d", oTime->tm_hour, oTime->tm_min, oTime->tm_sec );
+      #endif
+
       hb_retclen( szResult, 8 );
    }
    else
@@ -616,13 +628,20 @@ HARBOUR HB_DATE( void )
 {
    if( hb_pcount() == 0 )
    {
-      time_t t;
-      struct tm * oTime;
       char szResult[ 9 ];
 
-      time( &t );
-      oTime = localtime( &t );
-      sprintf( szResult, "%04d%02d%02d", oTime->tm_year + 1900, oTime->tm_mon + 1, oTime->tm_mday );
+      #ifdef HARBOUR_USE_WIN_GTAPI
+         SYSTEMTIME st;
+         GetLocalTime( &st );
+         sprintf( szResult, "%04d%02d%02d", st.wYear, st.wMonth, st.wDay );
+      #else
+         time_t t;
+         struct tm * oTime;
+
+         time( &t );
+         oTime = localtime( &t );
+         sprintf( szResult, "%04d%02d%02d", oTime->tm_year + 1900, oTime->tm_mon + 1, oTime->tm_mday );
+      #endif
       hb_retds( szResult );
    }
    else