Changeset 30

Timestamp:

02/20/08 19:36:12 (8 months ago)

Author:

Chris Miller

Message:

Form.onLoad/load now called at different time

Files:

• trunk/win32/dfl/application.d (modified) (1 diff)
• trunk/win32/dfl/control.d (modified) (2 diffs)
• trunk/win32/dfl/form.d (modified) (6 diffs)

trunk/win32/dfl/application.d

@@ -140 +140 @@
-    // When a Form is in showDialog, changing the dialogResult from NONE doesn't close the form.
-    FORM_DIALOGRESULT_096 = 0x8,
+    
+    // Call onLoad/load and focus a control at old time.
+    FORM_LOAD_096 = 0x10,
-}
-

trunk/win32/dfl/control.d

@@ -5633 +5633 @@
-            case WM_DESTROY:
-                cbits &= ~CBits.CREATED;
+                if(!recreatingHandle)
+                    cbits &= ~CBits.FORMLOADED;
-                _destroying();
-                //if(!killing)
@@ -6829 +6831 @@
-        HAS_LAYOUT = 0x200000,
-        VSTYLE = 0x400000, // If not forced off.
+        FORMLOADED = 0x800000, // If not forced off.
-    }
-    

trunk/win32/dfl/form.d

@@ -488 +488 @@
-            }
-            
-
-
-
+
+
+
+
+
+
-        }
-        
@@ -1801 +1804 @@
-        }
-        
+        if(!(Application._compat & DflCompat.FORM_LOAD_096))
+        {
+            if(visible)
+            {
+                if(!(cbits & CBits.FORMLOADED))
+                {
+                    cbits |= CBits.FORMLOADED;
+                    onLoad(EventArgs.empty);
+                }
+            }
+        }
+        
-        super.onVisibleChanged(ea);
-    }
@@ -2138 +2153 @@
-    {
-        load(this, ea);
+        
+        if(!(Application._compat & DflCompat.FORM_LOAD_096))
+        {
+            _selonecontrol();
+        }
-    }
-    
@@ -2491 +2511 @@
-    
-    
+    private void _selonecontrol()
+    {
+        HWND hwfocus = GetFocus();
+        if(!hwfocus || hwfocus == hwnd)
+        {
+            _selectNextControl(this, null, true, true, true, false);
+            if(!GetFocus())
+                select();
+        }
+    }
+    
+    
-    package alias dfl.internal.utf.defDlgProc _defFormProc;
-    
@@ -2531 +2563 @@
-                }
-                +/
-
-
-
+
-                // Prevent DefDlgProc from getting this message because it'll focus controls it shouldn't.
-                return;
@@ -2542 +2572 @@
-                    if(GetActiveWindow() == msg.hWnd)
-                    {
-
-
+
-                    }
-                }