diff --git a/harbour/ChangeLog b/harbour/ChangeLog
index d25e800c8c..09a57deb76 100644
--- a/harbour/ChangeLog
+++ b/harbour/ChangeLog
@@ -8,6 +8,13 @@
    2008-12-31 13:59 UTC+0100 Foo Bar <foo.bar@foobar.org>
 */
 
+2008-08-13 05:50 UTC+0200 Przemyslaw Czerpak (druzus/at/priv.onet.pl)
+  * harbour/contrib/gtwvg/gtwvg.h
+    ! added missing defines for DMC builds
+
+  * harbour/contrib/gtwvg/wvgutils.c
+    ! use HB_PTRDIFF for pointer to number casting
+
 2008-08-13 05:30 UTC+0200 Przemyslaw Czerpak (druzus/at/priv.onet.pl)
   * harbour/source/pp/ppcore.c
   * harbour/source/pp/hbpp.c
diff --git a/harbour/contrib/gtwvg/gtwvg.h b/harbour/contrib/gtwvg/gtwvg.h
index d177ee7c2e..82f744960f 100644
--- a/harbour/contrib/gtwvg/gtwvg.h
+++ b/harbour/contrib/gtwvg/gtwvg.h
@@ -177,10 +177,34 @@
          WINCOMMCTRLAPI BOOL WINAPI InitCommonControlsEx(LPINITCOMMONCONTROLSEX);
       #endif
    #endif
+
    typedef struct _GRADIENT_RECT {
        ULONG UpperLeft;
        ULONG LowerRight;
    } GRADIENT_RECT,*PGRADIENT_RECT,*LPGRADIENT_RECT;
+
+   #ifndef TTM_SETTIPBKCOLOR
+      #define TTM_SETTIPBKCOLOR     (WM_USER + 19)
+   #endif
+   #ifndef TTM_SETTIPTEXTCOLOR
+      #define TTM_SETTIPTEXTCOLOR   (WM_USER + 20)
+   #endif
+   #ifndef TTM_GETTIPBKCOLOR
+      #define TTM_GETTIPBKCOLOR     (WM_USER + 22)
+   #endif
+   #ifndef TTM_GETTIPTEXTCOLOR
+      #define TTM_GETTIPTEXTCOLOR   (WM_USER + 23)
+   #endif
+   #ifndef TTM_SETMAXTIPWIDTH
+      #define TTM_SETMAXTIPWIDTH    (WM_USER + 24)
+   #endif
+   #ifndef TTM_GETMAXTIPWIDTH
+      #define TTM_GETMAXTIPWIDTH    (WM_USER + 25)
+   #endif
+   #ifndef TTM_SETMARGIN
+      #define TTM_SETMARGIN         (WM_USER + 26)
+   #endif
+
 #endif
 
 #if defined( __cplusplus ) && ( defined( __BORLANDC__ ) || defined( _MSC_VER ) )
diff --git a/harbour/contrib/gtwvg/wvgutils.c b/harbour/contrib/gtwvg/wvgutils.c
index 68f06baff8..6b2991be8e 100644
--- a/harbour/contrib/gtwvg/wvgutils.c
+++ b/harbour/contrib/gtwvg/wvgutils.c
@@ -758,7 +758,7 @@ HB_FUNC( WVT_APPENDMENU )
     lpszCaption = ( LPCTSTR ) hb_parni( 4 ) ; // It is a SEPARATOR or Submenu
   }
 
-  hb_retl( AppendMenu( ( HMENU ) hb_parnl( 1 ), ( UINT ) hb_parni( 2 ), ( UINT_PTR ) hb_parni( 3 ), ( LPCTSTR ) lpszCaption ) ) ;
+  hb_retl( AppendMenu( ( HMENU ) hb_parnl( 1 ), ( UINT ) hb_parni( 2 ), ( HB_PTRDIFF ) hb_parni( 3 ), ( LPCTSTR ) lpszCaption ) ) ;
 }
 
 //-------------------------------------------------------------------//
@@ -1293,7 +1293,7 @@ HB_FUNC( WVT__MAKEDLGTEMPLATE )
 //
 HB_EXPORT LPWORD lpwAlign( LPWORD lpIn )
 {
-   LONG_PTR ul = ( LONG_PTR ) lpIn;
+   HB_PTRDIFF ul = ( HB_PTRDIFF ) lpIn;
    ul += 3;
    ul >>=2;
    ul <<=2;