Changeset 38

Timestamp:

02/26/08 08:58:11 (11 months ago)

Author:

Chris Miller

Message:

Minor changes.

Files:

• trunk/win32/dfl/form.d (modified) (6 diffs)

trunk/win32/dfl/form.d

@@ -2520 +2520 @@
-    
-    
+    package BOOL _isNonMdiChild(HWND hw)
+    {
+        assert(isHandleCreated);
+        
+        if(!hw || hw == this.hwnd)
+            return false;
+        
+        if(IsChild(this.hwnd, hw))
+        {
+            version(NO_MDI)
+            {
+            }
+            else
+            {
+                if(mdiClient && mdiClient.isHandleCreated)
+                {
+                    if(IsChild(mdiClient.hwnd, hw))
+                        return false; // !
+                }
+            }
+            return true;
+        }
+        return false;
+    }
+    
+    
-    package HWND _lastSelBtn; // Last selected button (not necessarily focused), excluding accept button!
-    package HWND _lastSel; // Last senected and focused control.
@@ -2532 +2558 @@
-        {
-            wasselbtn = true;
-
+
+
-            {
-                auto lastctrl = Control.fromHandle(_lastSelBtn);
@@ -2590 +2617 @@
-    package final void _selactivate()
-    {
-
+ && _isNonMdiChild(_lastSel)
-        {
-            Control ctrl = Control.fromChildHandle(_lastSel);
@@ -2692 +2719 @@
-                +/
-                //_selonecontrol();
+                
+                version(NO_MDI)
+                {
+                }
+                else
+                {
+                    if(isMdiChild)
+                    {
+                        // ?
+                        //msg.result = DefMDIChildProcA(msg.hWnd, msg.msg, msg.wParam, msg.lParam);
+                        msg.result = dfl.internal.utf.defMDIChildProc(msg.hWnd, msg.msg, msg.wParam, msg.lParam);
+                        return;
+                    }
+                }
+                
-                // Prevent DefDlgProc from getting this message because it'll focus controls it shouldn't.
-                return;
@@ -2722 +2764 @@
-                    case WA_CLICKACTIVE:
-                        _selactivate();
+                        
+                        /+
+                        version(NO_MDI)
+                        {
+                        }
+                        else
+                        {
+                            if(isMdiContainer)
+                            {
+                                auto amc = getActiveMdiChild();
+                                if(amc)
+                                    amc._selactivate();
+                            }
+                        }
+                        +/
-                        break;
-                    
-                    case WA_INACTIVE:
+                        /+
+                        version(NO_MDI)
+                        {
+                        }
+                        else
+                        {
+                            if(isMdiContainer)
+                            {
+                                auto amc = getActiveMdiChild();
+                                if(amc)
+                                    amc._seldeactivate();
+                            }
+                        }
+                        +/
+                        
-                        _seldeactivate();
-                        break;
@@ -2898 +2970 @@
-                {
-                    HWND hwfocus = GetFocus();
-
+
+
-                        form._lastSel = hwfocus; // ?
-                }