diff --git a/harbour/ChangeLog b/harbour/ChangeLog
index 965b766d87..0187a274f7 100644
--- a/harbour/ChangeLog
+++ b/harbour/ChangeLog
@@ -17,6 +17,11 @@
    past entries belonging to author(s): Viktor Szakats.
 */
 
+2009-07-01 09:32 UTC+0200 Viktor Szakats (harbour.01 syenar.hu)
+  * source/rtl/gtwvt/gtwvt.c
+    % Optimized _WVT_WS_* macros. Thanks Petr Chornyj for the hint.
+      Please review me and test.
+
 2009-07-01 08:35 UTC+0200 Viktor Szakats (harbour.01 syenar.hu)
   * source/rtl/gtwvt/gtwvt.c
     ! Fixed maximize button state when HB_GTI_RESIZABLE is set to .T.
diff --git a/harbour/source/rtl/gtwvt/gtwvt.c b/harbour/source/rtl/gtwvt/gtwvt.c
index 476f66ceec..b9733ce396 100644
--- a/harbour/source/rtl/gtwvt/gtwvt.c
+++ b/harbour/source/rtl/gtwvt/gtwvt.c
@@ -104,9 +104,9 @@ static HB_CRITICAL_NEW( s_wvtMtx );
 #define HB_WVT_LOCK     hb_threadEnterCriticalSection( &s_wvtMtx );
 #define HB_WVT_UNLOCK   hb_threadLeaveCriticalSection( &s_wvtMtx );
 
-#define _WVT_WS_DEF      ( WS_OVERLAPPED | WS_CAPTION | WS_SYSMENU | WS_MINIMIZEBOX | WS_MAXIMIZEBOX | WS_THICKFRAME )
-#define _WVT_WS_NORESIZE ( WS_OVERLAPPED | WS_CAPTION | WS_SYSMENU | WS_MINIMIZEBOX | WS_MAXIMIZEBOX | WS_BORDER )
-#define _WVT_WS_MAXED    ( WS_OVERLAPPED | WS_CAPTION | WS_SYSMENU | WS_MINIMIZEBOX | WS_THICKFRAME )
+#define _WVT_WS_DEF       ( WS_OVERLAPPEDWINDOW )
+#define _WVT_WS_NORESIZE  ( WS_OVERLAPPEDWINDOW & ~( WS_THICKFRAME ) )
+#define _WVT_WS_MAXED     ( WS_OVERLAPPEDWINDOW & ~( WS_MAXIMIZEBOX ) )
 
 static PHB_GTWVT  s_wvtWindows[ WVT_MAX_WINDOWS ];
 static int        s_wvtCount = 0;