# HG changeset patch
# User Frank Benoit <benoit@tionex.de>
# Date 1211133268 -7200
# Node ID 8efa9bb96c53550d63382ff2e6531b048bcc6bc3
# Parent  48de87adead10b798dcf69d7cd2f9e89af7a480e
added overrides and reverted OS.CallWindowProc

diff -r 48de87adead1 -r 8efa9bb96c53 dwt/widgets/Composite.d
--- a/dwt/widgets/Composite.d	Sat May 17 23:23:22 2008 +0200
+++ b/dwt/widgets/Composite.d	Sun May 18 19:54:28 2008 +0200
@@ -12,7 +12,6 @@
  *******************************************************************************/
 module dwt.widgets.Composite;
 
-
 import dwt.DWT;
 import dwt.DWTException;
 import dwt.graphics.Font;
@@ -212,7 +211,7 @@
     }
 }
 
-void checkComposited () {
+override void checkComposited () {
     if ((state & CANVAS) !is 0) {
         if ((style & DWT.TRANSPARENT) !is 0) {
             auto hwndParent = parent.handle;
@@ -752,7 +751,7 @@
     return true;
 }
 
-void releaseParent () {
+override void releaseParent () {
     super.releaseParent ();
     if ((state & CANVAS) !is 0) {
         if ((style & DWT.TRANSPARENT) !is 0) {
@@ -869,7 +868,7 @@
     }
 }
 
-void sendResize () {
+override void sendResize () {
     setResizeChildren (false);
     super.sendResize ();
     if (isDisposed ()) return;
@@ -906,7 +905,7 @@
     }
 }
 
-void setBounds (int x, int y, int width, int height, int flags, bool defer) {
+override void setBounds (int x, int y, int width, int height, int flags, bool defer) {
     if (display.resizeCount > Display.RESIZE_LIMIT) {
         defer = false;
     }
@@ -1644,7 +1643,7 @@
     return result;
 }
 
-LRESULT wmNCPaint (HWND hwnd, int wParam, int lParam) {
+override LRESULT wmNCPaint (HWND hwnd, int wParam, int lParam) {
     LRESULT result = super.wmNCPaint (hwnd, wParam, lParam);
     if (result !is null) return result;
     auto borderHandle = borderHandle ();
diff -r 48de87adead1 -r 8efa9bb96c53 dwt/widgets/Scrollable.d
--- a/dwt/widgets/Scrollable.d	Sat May 17 23:23:22 2008 +0200
+++ b/dwt/widgets/Scrollable.d	Sun May 18 19:54:28 2008 +0200
@@ -27,7 +27,7 @@
 import dwt.widgets.Widget;
 
 import dwt.dwthelper.utils;
-import tango.util.log.Trace;
+//import tango.util.log.Trace;
 void trc( long line ){
     //Trace.formatln( "Scrollable {}", line );
 }
@@ -400,7 +400,7 @@
     return result;
 }
 
-LRESULT wmNCPaint (HWND hwnd, int /*long*/ wParam, int /*long*/ lParam) {
+override LRESULT wmNCPaint (HWND hwnd, int /*long*/ wParam, int /*long*/ lParam) {
     LRESULT result = super.wmNCPaint (hwnd, wParam, lParam);
     if (result !is null) return result;
     /*
diff -r 48de87adead1 -r 8efa9bb96c53 dwt/widgets/Table.d
--- a/dwt/widgets/Table.d	Sat May 17 23:23:22 2008 +0200
+++ b/dwt/widgets/Table.d	Sun May 18 19:54:28 2008 +0200
@@ -363,10 +363,10 @@
     if (fixPaint) {
         PAINTSTRUCT ps;
         auto hDC = OS.BeginPaint (hwnd, &ps);
-        code = TableProc( hwnd, OS.WM_PAINT, cast(int)hDC, lParam);
+        code = OS.CallWindowProc (TableProc, hwnd, OS.WM_PAINT, cast(int)hDC, lParam);
         OS.EndPaint (hwnd, &ps);
     } else {
-        code = TableProc( hwnd, msg, wParam, lParam);
+        code = OS.CallWindowProc (TableProc, hwnd, msg, wParam, lParam);
     }
     if (fixScroll) {
         int flags = OS.RDW_FRAME | OS.RDW_INVALIDATE;
diff -r 48de87adead1 -r 8efa9bb96c53 dwt/widgets/Tracker.d
--- a/dwt/widgets/Tracker.d	Sat May 17 23:23:22 2008 +0200
+++ b/dwt/widgets/Tracker.d	Sun May 18 19:54:28 2008 +0200
@@ -906,7 +906,7 @@
             }
         default:
     }
-    return oldProc( hwnd, msg, wParam, lParam);
+    return OS.CallWindowProc( oldProc, hwnd, msg, wParam, lParam);
 }
 
 void update () {