diff --git a/harbour/ChangeLog b/harbour/ChangeLog
index b981c56fa4..b9957cd12d 100644
--- a/harbour/ChangeLog
+++ b/harbour/ChangeLog
@@ -16,6 +16,12 @@
    The license applies to all entries newer than 2009-04-28.
 */
 
+2011-12-12 14:01 UTC-0800 Pritpal Bedi (bedipritpal@hotmail.com)
+  * contrib/gtwvg/wvgwing.c
+    * Replaced: hbwin specific argument casting to local implementation.
+      Maybe this fixes compilation error with BCC55, though I feel that 
+      could be a result of some local modifications, reported by Jacek.
+
 2011-12-12 21:39 UTC+0100 Viktor Szakats (harbour.01 syenar.hu)
   * contrib/hbnetio/utils/hbnetio/netiocon.prg
     ! fixed to display generic commands in console help
diff --git a/harbour/contrib/gtwvg/wvgwing.c b/harbour/contrib/gtwvg/wvgwing.c
index a4fafdbd69..ee470d5ccf 100644
--- a/harbour/contrib/gtwvg/wvgwing.c
+++ b/harbour/contrib/gtwvg/wvgwing.c
@@ -118,12 +118,13 @@
 
 /*----------------------------------------------------------------------*/
 
-#define wvg_parwparam( n )    ( ( WPARAM ) ( HB_PTRDIFF ) hb_parnint( n ) )
-#define wvg_parlparam( n )    ( ( LPARAM ) ( HB_PTRDIFF ) hb_parnint( n ) )
-#define wvg_parhandle( n )    ( ( HANDLE ) ( HB_PTRDIFF ) hb_parnint( n ) )
-#define wvg_parhwnd( n )      ( ( HWND ) ( HB_PTRDIFF ) hb_parnint( n ) )
-#define wvg_parwndproc( n )   ( ( WNDPROC ) ( HB_PTRDIFF ) hb_parnint( n ) )
-#define wvg_parhdc( n )       ( ( HDC ) ( HB_PTRDIFF ) hb_parnint( n ) )
+#define wvg_parwparam( n )    ( ( WPARAM )   ( HB_PTRDIFF ) hb_parnint( n ) )
+#define wvg_parlparam( n )    ( ( LPARAM )   ( HB_PTRDIFF ) hb_parnint( n ) )
+#define wvg_parhandle( n )    ( ( HANDLE )   ( HB_PTRDIFF ) hb_parnint( n ) )
+#define wvg_parhwnd( n )      ( ( HWND )     ( HB_PTRDIFF ) hb_parnint( n ) )
+#define wvg_parwndproc( n )   ( ( WNDPROC )  ( HB_PTRDIFF ) hb_parnint( n ) )
+#define wvg_parhbrush( n )    ( ( HBRUSH )   ( HB_PTRDIFF ) hb_parnint( n ) )
+#define wvg_parhdc( n )       ( ( HDC )      ( HB_PTRDIFF ) hb_parnint( n ) )
 #define wvg_parcolor( n )     ( ( COLORREF ) ( HB_PTRDIFF ) hb_parnint( n ) )
 
 #define wvg_rethandle( n )    ( hb_retnint( ( HB_PTRDIFF ) n ) )
@@ -1181,7 +1182,7 @@ HB_FUNC( WVG_FILLRECT )
    rc.right   = hb_parvni( 2, 3 );
    rc.bottom  = hb_parvni( 2, 4 );
 
-   FillRect( hbwapi_par_raw_HDC( 1 ), &rc, hbwapi_par_raw_HBRUSH( 3 ) );
+   FillRect( wvg_parhdc( 1 ), &rc, wvg_parhbrush( 3 ) );
 }
 
 /*----------------------------------------------------------------------*/