Changeset 217:8efa9bb96c53

Show
Ignore:
Timestamp:
05/18/08 13:54:28 (3 months ago)
Author:
Frank Benoit <benoit@tionex.de>
branch:
default
Message:

added overrides and reverted OS.CallWindowProc?

Files:

Legend:

Unmodified
Added
Removed
Modified
Copied
Moved

  • dwt/widgets/Composite.d

    r213 r217  
    1212 *******************************************************************************/ 
    1313module dwt.widgets.Composite; 
    14  
    1514 
    1615import dwt.DWT; 
    …… 
    213212} 
    214213 
    215 void checkComposited () { 
     214override void checkComposited () { 
    216215    if ((state & CANVAS) !is 0) { 
    217216        if ((style & DWT.TRANSPARENT) !is 0) { 
    …… 
    753752} 
    754753 
    755 void releaseParent () { 
     754override void releaseParent () { 
    756755    super.releaseParent (); 
    757756    if ((state & CANVAS) !is 0) { 
    …… 
    870869} 
    871870 
    872 void sendResize () { 
     871override void sendResize () { 
    873872    setResizeChildren (false); 
    874873    super.sendResize (); 
    …… 
    907906} 
    908907 
    909 void setBounds (int x, int y, int width, int height, int flags, bool defer) { 
     908override void setBounds (int x, int y, int width, int height, int flags, bool defer) { 
    910909    if (display.resizeCount > Display.RESIZE_LIMIT) { 
    911910        defer = false; 
    …… 
    16451644} 
    16461645 
    1647 LRESULT wmNCPaint (HWND hwnd, int wParam, int lParam) { 
     1646override LRESULT wmNCPaint (HWND hwnd, int wParam, int lParam) { 
    16481647    LRESULT result = super.wmNCPaint (hwnd, wParam, lParam); 
    16491648    if (result !is null) return result; 

  • dwt/widgets/Scrollable.d

    r213 r217  
    2828 
    2929import dwt.dwthelper.utils; 
    30 import tango.util.log.Trace; 
     30//import tango.util.log.Trace; 
    3131void trc( long line ){ 
    3232    //Trace.formatln( "Scrollable {}", line ); 
    …… 
    401401} 
    402402 
    403 LRESULT wmNCPaint (HWND hwnd, int /*long*/ wParam, int /*long*/ lParam) { 
     403override LRESULT wmNCPaint (HWND hwnd, int /*long*/ wParam, int /*long*/ lParam) { 
    404404    LRESULT result = super.wmNCPaint (hwnd, wParam, lParam); 
    405405    if (result !is null) return result; 

  • dwt/widgets/Table.d

    r214 r217  
    364364        PAINTSTRUCT ps; 
    365365        auto hDC = OS.BeginPaint (hwnd, &ps); 
    366         code = TableProc( hwnd, OS.WM_PAINT, cast(int)hDC, lParam); 
     366        code = OS.CallWindowProc (TableProc, hwnd, OS.WM_PAINT, cast(int)hDC, lParam); 
    367367        OS.EndPaint (hwnd, &ps); 
    368368    } else { 
    369         code = TableProc( hwnd, msg, wParam, lParam); 
     369        code = OS.CallWindowProc (TableProc, hwnd, msg, wParam, lParam); 
    370370    } 
    371371    if (fixScroll) { 

  • dwt/widgets/Tracker.d

    r213 r217  
    907907        default: 
    908908    } 
    909     return oldProc( hwnd, msg, wParam, lParam); 
     909    return OS.CallWindowProc( oldProc, hwnd, msg, wParam, lParam); 
    910910} 
    911911