Changeset 25

Timestamp:

02/19/08 19:33:40 (7 months ago)

Author:

Chris Miller

Message:

Fixes to tabbing through controls; fixes TabControl? issues.

Files:

• trunk/win32/dfl/control.d (modified) (3 diffs)
• trunk/win32/dfl/form.d (modified) (5 diffs)

trunk/win32/dfl/control.d

@@ -969 +969 @@
-    private void _ctrladded(ControlEventArgs cea)
-    {
+        /+
-        if(!(_exStyle() & WS_EX_CONTROLPARENT))
-        {
-            //if(_style() & WS_CHILD)
-            if(!(cbits & CBits.FORM))
-
-
+
+
+
+
+
+
-        
-        onControlAdded(cea);
@@ -3710 +3714 @@
-    
-    
+    private static bool _eachild(HWND hw, bool delegate(HWND hw) callback, inout size_t xiter)
+    {
+        for(; hw; hw = GetWindow(hw, GW_HWNDNEXT))
+        {
+            if(!xiter)
+                return false;
+            xiter--;
+            
+            LONG st = GetWindowLongA(hw, GWL_STYLE);
+            if(!(st & WS_VISIBLE))
+                continue;
+            if(st & WS_DISABLED)
+                continue;
+            
+            if(!callback(hw))
+                return false;
+            
+            //LONG exst = GetWindowLongA(hw, GWL_EXSTYLE);
+            //if(exst & WS_EX_CONTROLPARENT) // It's no longer added.
+            {
+                HWND hwc = GetWindow(hw, GW_CHILD);
+                if(hwc)
+                {
+                    if(!_eachild(hwc, callback, xiter))
+                        return false;
+                }
+            }
+        }
+        return true;
+    }
+    
+    package static void eachGoodChildHandle(HWND hwtoplevel, bool delegate(HWND hw) callback)
+    {
+        HWND hw = GetWindow(hwtoplevel, GW_CHILD);
+        size_t xiter = 2000;
+        _eachild(hw, callback, xiter);
+    }
+    
+    
+    package static void _dlgselnext(HWND hwdlg, HWND hwcursel, bool forward)
+    {
+        if(forward)
+        {
+            bool foundthis = false, tdone = false;
+            HWND hwfirst;
+            eachGoodChildHandle(hwdlg,
+                (HWND hw)
+                {
+                    if(hw == hwcursel)
+                    {
+                        foundthis = true;
+                    }
+                    else
+                    {
+                        LONG st = GetWindowLongA(hw, GWL_STYLE);
+                        if(st & WS_TABSTOP)
+                        {
+                            if(foundthis)
+                            {
+                                DefDlgProcA(hwdlg, WM_NEXTDLGCTL, cast(WPARAM)hw, MAKELPARAM(true, 0));
+                                tdone = true;
+                                return false; // Break.
+                            }
+                            else
+                            {
+                                if(HWND.init == hwfirst)
+                                    hwfirst = hw;
+                            }
+                        }
+                    }
+                    return true; // Continue.
+                });
+            if(!tdone && HWND.init != hwfirst)
+                DefDlgProcA(hwdlg, WM_NEXTDLGCTL, cast(WPARAM)hwfirst, MAKELPARAM(true, 0));
+        }
+        else
+        {
+            HWND hwprev;
+            eachGoodChildHandle(hwdlg,
+                (HWND hw)
+                {
+                    if(hw == hwcursel)
+                    {
+                        if(HWND.init != hwprev) // Otherwise, keep looping and get last one.
+                            return false; // Break.
+                    }
+                    LONG st = GetWindowLongA(hw, GWL_STYLE);
+                    if(st & WS_TABSTOP)
+                        hwprev = hw;
+                    return true; // Continue.
+                });
+            if(HWND.init != hwprev)
+                DefDlgProcA(hwdlg, WM_NEXTDLGCTL, cast(WPARAM)hwprev, MAKELPARAM(true, 0));
+        }
+    }
+    
+    
-    ///
-    final void select()
@@ -3726 +3827 @@
-            return;
-        
-// To-do: check if correct implementation.
-Control ctrl
-ctrl = findForm();
-if(ctrl && ctrl !is this)
-{
+Control ctrltoplevel;
+ctrltoplevel = findForm()
+if(ctrltoplevel && ctrltoplevel !is this)
+{
+   /+ // Old...
-            // Even if directed, ensure THIS one is selected first.
-            if(!directed || hwnd != GetFocus())
-            {
-
+toplevel
-            }
-            
-            if(directed)
-            {
-
+
+
+
+
+
+
+
+
+
+
+
-            }
-        }

trunk/win32/dfl/form.d

@@ -2770 +2770 @@
-                                    if(WM_KEYDOWN == m.msg)
-                                    {
-                                        /+
-                                        Message mm;
-                                        mm.hWnd = form.handle;
-                                        mm.msg = WM_NEXTDLGCTL;
-                                        mm.lParam = MAKEWPARAM(FALSE, 0); // wParam is direction.
-                                        if(GetKeyState(VK_SHIFT) & 0x8000)
-
+
+
+
+
+
-                                        else
-
-
-
-
-
-
-
+
+
+
+
+
-                                    }
-                                    return true; // Prevent.
@@ -2835 +2832 @@
-                            +/
-                            +/
-                            
-                            size_t xiter;
-                            bool _eachild(HWND hw, bool delegate(HWND hw) callback)
-                            {
-                                for(; hw; hw = GetWindow(hw, GW_HWNDNEXT))
-                                {
-                                    if(!xiter)
-                                        return false;
-                                    xiter--;
-                                    
-                                    LONG st = GetWindowLongA(hw, GWL_STYLE);
-                                    if(!(st & WS_VISIBLE))
-                                        continue;
-                                    if(st & WS_DISABLED)
-                                        continue;
-                                    
-                                    if(!callback(hw))
-                                        return false;
-                                    
-                                    LONG exst = GetWindowLongA(hw, GWL_EXSTYLE);
-                                    if(exst & WS_EX_CONTROLPARENT)
-                                    {
-                                        HWND hwc = GetWindow(hw, GW_CHILD);
-                                        if(hwc)
-                                        {
-                                            if(!_eachild(hwc, callback))
-                                                return false;
-                                        }
-                                    }
-                                }
-                                return true;
-                            }
-                            
-                            void eachGoodChild(bool delegate(HWND hw) callback)
-                            {
-                                HWND hw = GetWindow(form.handle, GW_CHILD);
-                                xiter = 2000;
-                                _eachild(hw, callback);
-                            }
-                            
-                            bool pmnemonic(HWND hw)
@@ -2890 +2848 @@
-                            bool foundmhw = false;
-                            bool foundmn = false;
-(
+Handle(form.handle,
-                                (HWND hw)
-                                {
@@ -2914 +2872 @@
-                            {
-                                // Didn't find current control, so go from top-to-bottom.
-(
+Handle(form.handle,
-                                    (HWND hw)
-                                    {
@@ -2928 +2886 @@
-                            {
-                                // Didn't find mnemonic after current control, so go from top-to-this.
-(
+Handle(form.handle,
-                                    (HWND hw)
-                                    {