Changeset 29

Timestamp:

02/20/08 18:12:15 (7 months ago)

Author:

Chris Miller

Message:

Internal changes; changes to dialog events.

Files:

• trunk/win32/dfl/control.d (modified) (9 diffs)
• trunk/win32/dfl/form.d (modified) (3 diffs)
• trunk/win32/dfl/tabcontrol.d (modified) (1 diff)

trunk/win32/dfl/control.d

@@ -3716 +3716 @@
-    
-    
-
+, bool nested
-    {
-        for(; hw; hw = GetWindow(hw, GW_HWNDNEXT))
@@ -3733 +3733 @@
-                return false;
-            
-
-
-
-
-
-
-
-
+
+
+
+
+
+
+
+
+
+
+
+
-                }
-            }
@@ -3747 +3751 @@
-    }
-    
-toplevel, bool delegate(HWND hw) callback
-
-toplevel
+parent, bool delegate(HWND hw) callback, bool nested = true
+
+parent
-        size_t xiter = 2000;
-
+, nested
-    }
-    
@@ -3763 +3767 @@
-    
-    package static void _dlgselnext(HWND hwdlg, HWND hwcursel, bool forward,
-
-
+
+
+
+
+
+
-        if(forward)
-        {
-            bool foundthis = false, tdone = false;
-            HWND hwfirst;
-dlg
+childrenof
-                (HWND hw)
-                {
@@ -3798 +3806 @@
-                    }
-                    return true; // Continue.
-
+, nested
-            if(!tdone && HWND.init != hwfirst)
-
+
+
+
+
+
+
+
-        }
-        else
-        {
-            HWND hwprev;
-dlg
+childrenof
-                (HWND hw)
-                {
@@ -3812 +3826 @@
-                        if(HWND.init != hwprev) // Otherwise, keep looping and get last one.
-                            return false; // Break.
+                        if(!wrap) // No wrapping, so don't get last one.
+                        {
+                            assert(HWND.init == hwprev);
+                            return false; // Break.
+                        }
-                    }
-                    if(!tabStopOnly || (GetWindowLongA(hw, GWL_STYLE) & WS_TABSTOP))
@@ -3821 +3840 @@
-                    }
-                    return true; // Continue.
-
+
+
-            if(HWND.init != hwprev)
-                DefDlgProcA(hwdlg, WM_NEXTDLGCTL, cast(WPARAM)hwprev, MAKELPARAM(true, 0));
-        }
+    }
+    
+    
+    package final void _selectNextControl(Control ctrltoplevel,
+        Control ctrl, bool forward, bool tabStopOnly, bool nested, bool wrap)
+    {
+        if(!created)
+            return;
+        
+        assert(ctrltoplevel !is null);
+        assert(ctrltoplevel.isHandleCreated);
+        
+        _dlgselnext(ctrltoplevel.handle,
+            (ctrl && ctrl.isHandleCreated) ? ctrl.handle : null,
+            forward, tabStopOnly, !tabStopOnly, nested, wrap,
+            this.handle);
+    }
+    
+    
+    final void selectNextControl(Control ctrl, bool forward, bool tabStopOnly, bool nested, bool wrap)
+    {
+        if(!created)
+            return;
+        
+        Control ctrltoplevel;
+        ctrltoplevel = findForm();
+        if(ctrltoplevel)
+            return _selectNextControl(ctrltoplevel, ctrl, forward, tabStopOnly, nested, wrap);
-    }
-    
@@ -6130 +6178 @@
-            wstyle = style;
-            
-+
+/if((ctrlStyle & ControlStyles.CONTAINER_CONTROL) && (style & WS_CHILD))
-            if(style & WS_CHILD)
-            {
-
-
-
-
-
+
+
-            
-            Application.creatingControl(this);
@@ -7929 +7974 @@
-    private void _init()
-    {
-
+//
-        ctrlStyle |= ControlStyles.CONTAINER_CONTROL;
-    }

trunk/win32/dfl/form.d

@@ -2511 +2511 @@
-            
-            case WM_SETFOCUS:
-{
-   // Prevent DefDlgProc from getting this message because it'll focus controls it shouldn't.
+/+
+{
-                    bool didf = false;
-                    enumChildWindows(msg.hWnd,
@@ -2530 +2530 @@
-                        SetFocus(msg.hWnd);
-                }
+                +/
+                _selectNextControl(this, null, true, true, true, false);
+                if(!GetFocus())
+                    focus();
+                // Prevent DefDlgProc from getting this message because it'll focus controls it shouldn't.
-                return;
-            
@@ -2826 +2831 @@
-                        break;
-                    
-                    default: ;
-                }
-                
-                /+
-                switch(m.msg)
-                {
-                    case WM_CHAR:
-                        // isDialogMessage seems to be eating WM_CHAR in some cases, so see for myself if it should get it.
-                        // ? ...
-                        return false; // Continue.
-                    
-                    /+
-                    case WM_SYSKEYDOWN:
-                    case WM_SYSKEYUP:
-                    case WM_SYSCHAR:
-                        // isDialogMessage returning true seems to be breaking menu mnemonics.
-                        return false; // Continue.
-                    +/
-                    
-                    default: ;
-                }
-                
-                //if(!form.isMdiChild && !form.isMdiContainer)
-                {
-                    //if(IsDialogMessageA(form.handle, &m._winMsg))
-                    if(dfl.internal.utf.isDialogMessage(form.handle, &m._winMsg))
-                        return true; // Prevent.
-                }
-                +/
-                switch(m.msg)
-                {
-                    case WM_SYSCHAR:
-                        {

trunk/win32/dfl/tabcontrol.d

@@ -38 +38 @@
-    {
-        Application.ppin(cast(void*)this);
+        
+        ctrlStyle |= ControlStyles.CONTAINER_CONTROL;
-        
-        wstyle &= ~WS_VISIBLE;