Changeset 63:adfa8c39be39

Timestamp:

02/04/08 08:45:37 (1 year ago)

Author:

Frank Benoit <benoit@tionex.de>

branch:

default

Message:

Scale, ScrollBar?

Files:

• dwt/internal/win32/OS.d (modified) (1 diff)
• dwt/widgets/Scale.d (modified) (5 diffs)
• dwt/widgets/ScrollBar.d (modified) (28 diffs)

dwt/internal/win32/OS.d

@@ -1709 +1709 @@
-    public static const int TPM_RIGHTBUTTON = 0x2;
-    public static const int TPM_RIGHTALIGN = 0x8;
-char
+TCHAR
-    public static const int TRANSPARENT = 0x1;
-    public static const int TREIS_DISABLED = 4;

dwt/widgets/Scale.d

@@ -15 +15 @@
-import dwt.events.SelectionListener;
-import dwt.graphics.Point;
-import dwt.internal.win32.LRESULT;
-import dwt.internal.win32.OS;
-import dwt.internal.win32.RECT;
-import dwt.internal.win32.TCHAR;
-import dwt.internal.win32.WNDCLASS;
-
-import dwt.widgets.Control;
-import dwt.widgets.Composite;
+import dwt.widgets.TypedListener;
+import dwt.widgets.Event;
-
-import dwt.dwthelper.utils;
@@ -80 +78 @@
-        lpWndClass.style &= ~OS.CS_GLOBALCLASS;
-        lpWndClass.style |= OS.CS_DBLCLKS;
-TrackBarClass.length (
+(TrackBarClass.length+1
-        auto lpszClassName = cast(TCHAR*) OS.HeapAlloc (hHeap, OS.HEAP_ZERO_MEMORY, byteCount);
-
+.ptr
-        lpWndClass.lpszClassName = lpszClassName;
-
+&
-        OS.HeapFree (hHeap, 0, lpszClassName);
-    }
@@ -297 +295 @@
-}
-
-int
+HBITMAP
-    super.setBackgroundImage (hImage);
-    /*
@@ -432 +430 @@
-}
-
-TCHAR
-rackBarClass
+char[]
+CHARsToStr(TrackBarClass)
-}
-
-override int windowProc () {
-
+cast(int) 
-}
-
@@ -473 +471 @@
-
-override LRESULT WM_SIZE (int wParam, int lParam) {
-null
+LRESULT.NULL
-    return super.WM_SIZE (wParam, lParam);
-}

dwt/widgets/ScrollBar.d

@@ -11 +11 @@
-module dwt.widgets.ScrollBar;
-
-import dwt.widgets.Widget;
-class ScrollBar : Widget {
-    this( Widget, int );
-public void setMaximum (int value) ;
-public void setThumb (int value) ;
-public int getThumb () ;
-public bool getEnabled () ;
-public int getSelection () ;
-public int getIncrement () ;
-public int getPageIncrement () ;
-LRESULT wmScrollChild (int wParam, int lParam) ;
-public bool getVisible () ;
-}
-/++
-import dwt.DWT;
-import dwt.DWTException;
@@ -31 +17 @@
-import dwt.graphics.Point;
-import dwt.graphics.Rectangle;
-import dwt.internal.win32.LRESULT;
-import dwt.internal.win32.OS;
-
-
+
+
+
+
+
+
+
-
-/**
@@ -100 +90 @@
- */
-
-extends
+:
-    Scrollable parent;
-    int increment, pageIncrement;
@@ -133 +123 @@
- * @see Widget#getStyle
- */
-ScrollBar
+this
-    super (parent, checkStyle (style));
-    this.parent = parent;
@@ -199 +189 @@
-
-override void destroyWidget () {
-
-
-
+
+
+
+
-        info.cbSize = SCROLLINFO.sizeof;
-        info.fMask = OS.SIF_RANGE | OS.SIF_PAGE;
@@ -207 +198 @@
-        info.nMax = 100;
-        info.nMin = 0;
-
+&
-    } else {
-        OS.ShowScrollBar (hwnd, type, false);
@@ -217 +208 @@
-//  checkWidget ();
-    parent.forceResize ();
- = new RECT ()
-
+
+&
-    int x = 0, y = 0, width, height;
-    if ((style & DWT.HORIZONTAL) !is 0) {
@@ -281 +272 @@
-public int getMaximum () {
-    checkWidget();
- = new SCROLLINFO ()
+
-    info.cbSize = SCROLLINFO.sizeof;
-    info.fMask = OS.SIF_RANGE;
-int
-int
-
+auto
+auto
+&
-    return info.nMax;
-}
@@ -302 +293 @@
-public int getMinimum () {
-    checkWidget();
- = new SCROLLINFO ()
+
-    info.cbSize = SCROLLINFO.sizeof;
-    info.fMask = OS.SIF_RANGE;
-int
-int
-
+auto
+auto
+&
-    return info.nMin;
-}
@@ -355 +346 @@
-public int getSelection () {
-    checkWidget();
- = new SCROLLINFO ()
+
-    info.cbSize = SCROLLINFO.sizeof;
-    info.fMask = OS.SIF_POS;
-int
-int
-
+auto
+auto
+&
-    return info.nPos;
-}
@@ -380 +371 @@
-    checkWidget();
-    parent.forceResize ();
- = new RECT ()
-
+
+&
-    int width, height;
-    if ((style & DWT.HORIZONTAL) !is 0) {
@@ -408 +399 @@
-public int getThumb () {
-    checkWidget();
- = new SCROLLINFO ()
+
-    info.cbSize = SCROLLINFO.sizeof;
-    info.fMask = OS.SIF_PAGE;
-int
-int
-
+auto
+auto
+&
-    if (info.nPage !is 0) --info.nPage;
-    return info.nPage;
@@ -440 +431 @@
-}
-
-int
+HWND
-    return parent.scrolledHandle ();
-}
@@ -543 +534 @@
-    */
-//  if (OS.IsWinCE) error (DWT.ERROR_NOT_IMPLEMENTED);
-
-
+
+
+
-        int flags = enabled ? OS.ESB_ENABLE_BOTH : OS.ESB_DISABLE_BOTH;
-        OS.EnableScrollBar (hwnd, type, flags);
@@ -590 +582 @@
-    checkWidget();
-    if (value < 0) return;
- = new SCROLLINFO ()
+
-    info.cbSize = SCROLLINFO.sizeof;
-
+
+
-    info.fMask = OS.SIF_RANGE | OS.SIF_DISABLENOSCROLL;
-
+&
-    if (value - info.nMin - info.nPage < 1) return;
-    info.nMax = value;
-
+&
-}
-
@@ -616 +609 @@
-    checkWidget();
-    if (value < 0) return;
- = new SCROLLINFO ()
+
-    info.cbSize = SCROLLINFO.sizeof;
-
+
+
-    info.fMask = OS.SIF_RANGE | OS.SIF_DISABLENOSCROLL;
-
+&
-    if (info.nMax - value - info.nPage < 1) return;
-    info.nMin = value;
-
+&
-}
-
@@ -645 +639 @@
-}
-
-int hwnd, int flags, SCROLLINFO
+HWND hwnd, int flags, SCROLLINFO*
-    /*
-    * Bug in Windows.  For some reason, when SetScrollInfo()
@@ -655 +649 @@
-    */
-    if ((state & (DISABLED | HIDDEN)) !is 0) fRedraw = false;
-
+cast(bool) 
-
-    /*
@@ -722 +716 @@
-public void setSelection (int selection) {
-    checkWidget();
- = new SCROLLINFO ()
+
-    info.cbSize = SCROLLINFO.sizeof;
-
+
+
-    info.fMask = OS.SIF_POS;
-    info.nPos = selection;
-
+&
-}
-
@@ -747 +742 @@
-    checkWidget();
-    if (value < 1) return;
- = new SCROLLINFO ()
+
-    info.cbSize = SCROLLINFO.sizeof;
-
+
+
-    info.fMask = OS.SIF_PAGE | OS.SIF_RANGE | OS.SIF_DISABLENOSCROLL;
-
+&
-    info.nPage = value;
-    if (info.nPage !is 0) info.nPage++;
-
+&
-}
-
@@ -787 +783 @@
-    this.increment = increment;
-    this.pageIncrement = pageIncrement;
- = new SCROLLINFO ()
+
-    info.cbSize = SCROLLINFO.sizeof;
-    info.fMask = OS.SIF_POS | OS.SIF_PAGE | OS.SIF_RANGE | OS.SIF_DISABLENOSCROLL;
@@ -795 +791 @@
-    info.nPage = thumb;
-    if (info.nPage !is 0) info.nPage++;
-
-
+
+
+
-}
-
@@ -826 +823 @@
-    */
-    if (OS.IsWinCE) {
- = new SCROLLINFO ()
+
-        info.cbSize = SCROLLINFO.sizeof;
-
+
+
-        info.fMask = OS.SIF_RANGE | OS.SIF_PAGE;
-        if (visible) info.fMask |= OS.SIF_DISABLENOSCROLL;
-
+&
-        if (info.nPage is info.nMax - info.nMin + 1) {
-            /*
@@ -842 +840 @@
-            int max = info.nMax;
-            info.nMax++;
-
+&
-            info.nMax = max;
-
+&
-        } else {
-            /*
@@ -864 +862 @@
-    */
-    state = visible ? state & ~HIDDEN : state | HIDDEN;
-
+
+
-    if (OS.ShowScrollBar (hwnd, type, visible)) {
-        /*
@@ -880 +879 @@
-        */
-        if ((state & DISABLED) is 0) {
- = new SCROLLINFO ()
+
-            info.cbSize = SCROLLINFO.sizeof;
-            info.fMask = OS.SIF_RANGE | OS.SIF_PAGE;
-
+&
-            if (info.nMax - info.nMin - info.nPage >= 0) {
-                OS.EnableScrollBar (hwnd, type, OS.ESB_ENABLE_BOTH);
@@ -897 +896 @@
-    /* Do nothing when scrolling is ending */
-    int code = wParam & 0xFFFF;
-null
+LRESULT.NULL
-
-    /*
@@ -918 +917 @@
-    sendEvent (DWT.Selection, event);
-    // the widget could be destroyed at this point
-null
-
-
-
-
+LRESULT.NULL
+
+
+
+