diff --git a/harbour/ChangeLog b/harbour/ChangeLog
index 02071ae6d8..127b38f553 100644
--- a/harbour/ChangeLog
+++ b/harbour/ChangeLog
@@ -16,6 +16,11 @@
    The license applies to all entries newer than 2009-04-28.
 */
 
+2012-09-12 11:47 UTC-0800 Pritpal Bedi (bedipritpal@hotmail.com)
+  * contrib/gtwvg/gtwvg.c
+  * contrib/gtwvg/gtwvg.h
+    ! Pacified warnings correctly.
+
 2012-09-12 07:33 UTC-0800 Pritpal Bedi (bedipritpal@hotmail.com)
   * contrib/gtwvg/crt.prg
     % Cleanup.
diff --git a/harbour/contrib/gtwvg/gtwvg.c b/harbour/contrib/gtwvg/gtwvg.c
index 206b86f35c..1f62a36e64 100644
--- a/harbour/contrib/gtwvg/gtwvg.c
+++ b/harbour/contrib/gtwvg/gtwvg.c
@@ -2821,7 +2821,7 @@ static void hb_gt_wvt_Exit( PHB_GT pGT )
       PHB_ITEM pEvParams = hb_itemNew( NULL );
       hb_arrayNew( pEvParams, 2 );
       hb_arraySetNInt( pEvParams, 1, ( HB_MAXINT ) ( HB_PTRDIFF ) pWVT->hWnd );
-      hb_arraySetNI( pEvParams, 2, ( int ) pWVT->threadNO );
+      hb_arraySetNInt( pEvParams, 2, pWVT->threadNO );
       hb_gt_wvt_FireEvent( pWVT, HB_GTE_CLOSED, pEvParams );
    }
 
@@ -4214,7 +4214,7 @@ static void hb_gt_wvt_Refresh( PHB_GT pGT )
             PHB_ITEM pEvParams = hb_itemNew( NULL );
             hb_arrayNew( pEvParams, 2 );
             hb_arraySetNInt( pEvParams, 1, ( HB_MAXINT ) ( HB_PTRDIFF ) pWVT->hWnd );
-            hb_arraySetNI( pEvParams, 2, ( int ) pWVT->threadNO );
+            hb_arraySetNInt( pEvParams, 2, pWVT->threadNO );
             hb_gt_wvt_FireEvent( pWVT, HB_GTE_CREATED, pEvParams );
          }
       }
diff --git a/harbour/contrib/gtwvg/gtwvg.h b/harbour/contrib/gtwvg/gtwvg.h
index cdde32a71b..f5fbf3fd7e 100644
--- a/harbour/contrib/gtwvg/gtwvg.h
+++ b/harbour/contrib/gtwvg/gtwvg.h
@@ -468,7 +468,7 @@ typedef struct
 
    PHB_ITEM  pNotifierGUI;                  /* Notifier to Wvg*Parts if embedded into a GT Window        */
 
-   HB_THREAD_NO threadNO;                   /* Will hold the current THREAD No                           */
+   HB_MAXINT threadNO;                      /* Will hold the current THREAD No                           */
 
 } HB_GTWVT, * PHB_GTWVT;