diff --git a/harbour/ChangeLog b/harbour/ChangeLog
index 2432ffd31b..f6527c1448 100644
--- a/harbour/ChangeLog
+++ b/harbour/ChangeLog
@@ -16,6 +16,11 @@
    The license applies to all entries newer than 2009-04-28.
 */
 
+2011-05-24 14:13 UTC-0800 Pritpal Bedi (bedipritpal@hotmail.com)
+  * contrib/gtwvg/wvgcore.c
+    ! Fixed: wrongly handelled WM_CLOSE message in modal/modeless
+      dialogs. The fact is reported by  Zoran Sibinovic.
+
 2011-05-24 11:59 UTC+0200 Przemyslaw Czerpak (druzus/at/priv.onet.pl)
   * harbour/src/rtl/arc4.c
     ! changed size parameter passed by reference to sysctl() to size_t
diff --git a/harbour/contrib/gtwvg/wvgcore.c b/harbour/contrib/gtwvg/wvgcore.c
index 03814564f2..4a32932ef7 100644
--- a/harbour/contrib/gtwvg/wvgcore.c
+++ b/harbour/contrib/gtwvg/wvgcore.c
@@ -439,10 +439,6 @@ BOOL CALLBACK hb_wvt_gtDlgProcMLess( HWND hDlg, UINT message, WPARAM wParam, LPA
          }
          break;
 
-      case WM_CLOSE:
-         DestroyWindow( hDlg );
-         lReturn = 0;
-         break;
 #if ! defined( HB_OS_WIN_CE )
       case WM_NCDESTROY:
 #else
@@ -556,11 +552,6 @@ BOOL CALLBACK hb_wvt_gtDlgProcModal( HWND hDlg, UINT message, WPARAM wParam, LPA
          }
          break;
 
-      case WM_CLOSE:
-         EndDialog( hDlg, IDCANCEL );
-         lReturn = 0;
-         break;
-
 #if ! defined( HB_OS_WIN_CE )
       case WM_NCDESTROY:
 #else