diff --git a/harbour/ChangeLog.txt b/harbour/ChangeLog.txt
index 7938c3aa85..4186c73dc4 100644
--- a/harbour/ChangeLog.txt
+++ b/harbour/ChangeLog.txt
@@ -10,6 +10,12 @@
      * Change, ! Fix, % Optimization, + Addition, - Removal, ; Comment
  */
 
+2013-03-12 18:06 UTC-0800 Pritpal Bedi (bedipritpal@hotmail.com)
+  * contrib/gtwvg/gtwgud.c
+  * contrib/gtwvg/gtwvgd.c
+    ! Fixed: reverted parts of last wreckless commit without checking 
+       the changes. Sorry, I must be more attentive next time.
+
 2013-03-13 00:09 UTC+0100 Viktor Szakats (harbour syenar.net)
   * utils/hbmk2/hbmk2.prg
     ! do not issue pointless pair warning for -rebuildall,
diff --git a/harbour/contrib/gtwvg/gtwgud.c b/harbour/contrib/gtwvg/gtwgud.c
index 343b959ffa..984caf0410 100644
--- a/harbour/contrib/gtwvg/gtwgud.c
+++ b/harbour/contrib/gtwvg/gtwgud.c
@@ -889,7 +889,6 @@ static LRESULT CALLBACK hb_gt_wvt_WndProc( HWND hWnd, UINT message, WPARAM wPara
             hb_arraySetNInt( pEvParams, 2, ( HB_PTRDIFF ) wParam );
             hb_arraySetNInt( pEvParams, 3, ( HB_PTRDIFF ) lParam );
 
-            hb_gt_wvt_AddCharToInputQueue( pWVT, HB_K_GOTFOCUS );
             hb_gt_wvt_FireEvent( pWVT, HB_GTE_SETFOCUS, pEvParams );
             return 0;
          }
@@ -902,7 +901,6 @@ static LRESULT CALLBACK hb_gt_wvt_WndProc( HWND hWnd, UINT message, WPARAM wPara
             hb_arraySetNInt( pEvParams, 2, ( HB_PTRDIFF ) wParam );
             hb_arraySetNInt( pEvParams, 3, ( HB_PTRDIFF ) lParam );
 
-            hb_gt_wvt_AddCharToInputQueue( pWVT, HB_K_LOSTFOCUS );
             hb_gt_wvt_FireEvent( pWVT, HB_GTE_KILLFOCUS, pEvParams );
             return 0;
          }
@@ -1051,7 +1049,7 @@ static LRESULT CALLBACK hb_gt_wvt_WndProc( HWND hWnd, UINT message, WPARAM wPara
             PHB_ITEM pEvParams = hb_itemNew( NULL );
             if( hb_gt_wvt_FireEvent( pWVT, HB_GTE_CLOSE, pEvParams ) == 0 )
             {
-               hb_gt_wvt_AddCharToInputQueue( pWVT, HB_K_CLOSE );
+               hb_gt_wvt_AddCharToInputQueue( pWVT, 27 );
             }
             return 0;
          }
diff --git a/harbour/contrib/gtwvg/gtwvgd.c b/harbour/contrib/gtwvg/gtwvgd.c
index 051b820d6f..105e6be9f4 100644
--- a/harbour/contrib/gtwvg/gtwvgd.c
+++ b/harbour/contrib/gtwvg/gtwvgd.c
@@ -2073,7 +2073,6 @@ static LRESULT CALLBACK hb_gt_wvt_WndProc( HWND hWnd, UINT message, WPARAM wPara
                hb_arraySetNInt( pEvParams, 2, ( HB_PTRDIFF ) wParam );
                hb_arraySetNInt( pEvParams, 3, ( HB_PTRDIFF ) lParam );
 
-               hb_gt_wvt_AddCharToInputQueue( pWVT, HB_K_GOTFOCUS );
                hb_gt_wvt_FireEvent( pWVT, HB_GTE_SETFOCUS, pEvParams );
             }
             return 0;
@@ -2101,7 +2100,6 @@ static LRESULT CALLBACK hb_gt_wvt_WndProc( HWND hWnd, UINT message, WPARAM wPara
                hb_arraySetNInt( pEvParams, 2, ( HB_PTRDIFF ) wParam );
                hb_arraySetNInt( pEvParams, 3, ( HB_PTRDIFF ) lParam );
 
-               hb_gt_wvt_AddCharToInputQueue( pWVT, HB_K_LOSTFOCUS );
                hb_gt_wvt_FireEvent( pWVT, HB_GTE_KILLFOCUS, pEvParams );
             }
             return 0;
@@ -2140,7 +2138,7 @@ static LRESULT CALLBACK hb_gt_wvt_WndProc( HWND hWnd, UINT message, WPARAM wPara
             PHB_ITEM pEvParams = hb_itemNew( NULL );
             if( hb_gt_wvt_FireEvent( pWVT, HB_GTE_CLOSE, pEvParams ) == 0 )
             {
-               hb_gt_wvt_AddCharToInputQueue( pWVT, HB_K_CLOSE );
+               hb_gt_wvt_AddCharToInputQueue( pWVT, 27 );
 #if 0
                PHB_ITEM pItem = hb_itemPutL( NULL, HB_TRUE );
                hb_setSetItem( HB_SET_CANCEL, pItem );