Changeset 36

Timestamp:

02/26/08 05:33:56 (6 months ago)

Author:

Chris Miller

Message:

Fixed context-help issue (helpRequested).
Fixed focus issue when restoring form (from minimize).

Files:

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

trunk/win32/dfl/button.d

@@ -348 +348 @@
-                {
-                    // Fixing the thick border of a default button when enabling and disabling it.
+                    
+                    // To-do: check if correct implementation.
-                    
-                    DWORD bst;

trunk/win32/dfl/control.d

@@ -979 +979 @@
-        }
-        +/
+        assert(getStyle(ControlStyles.CONTAINER_CONTROL), "Control added to non-container parent");
-        
-        onControlAdded(cea);
@@ -6208 +6209 @@
-            wstyle = style;
-            
-(ctrlStyle & ControlStyles.CONTAINER_CONTROL) && (style & WS_CHILD))
-style & WS_CHILD
+style & WS_CHILD) // Breaks context-help.
+(ctrlStyle & ControlStyles.CONTAINER_CONTROL) && (style & WS_CHILD)
-            {
-                exStyle |= WS_EX_CONTROLPARENT;

trunk/win32/dfl/form.d

@@ -2520 +2520 @@
-    
-    
-
+
+
-    package HWND _hadfocus; // Before being deactivated.
-    
@@ -2528 +2529 @@
-    {
-        bool wasselbtn = false;
-
+Btn
-        {
-            wasselbtn = true;
-
-
-
+Btn
+
+Btn
-                if(lastctrl)
-                {
@@ -2545 +2546 @@
-    }
-    
+    package final void _selafter(Control ctrl, bool wasselbtn)
+    {
+        _lastSelBtn = _lastSelBtn.init;
+        auto ibc = cast(IButtonControl)ctrl;
+        if(ibc)
+        {
+            if(acceptButton)
+            {
+                if(ibc !is acceptButton)
+                {
+                    acceptButton.notifyDefault(false);
+                    _lastSelBtn = ctrl.hwnd;
+                }
+                //else don't set _lastSelBtn to accept button.
+            }
+            else
+            {
+                _lastSelBtn = ctrl.hwnd;
+            }
+            
+            ibc.notifyDefault(true);
+        }
+        else
+        {
+            if(wasselbtn) // Only do it if there was a different button; don't keep doing this.
+            {
+                if(acceptButton)
+                    acceptButton.notifyDefault(true);
+            }
+        }
+    }
+    
-    package final void _seldeactivate()
-    {
@@ -2552 +2585 @@
-                acceptButton.notifyDefault(false);
-        }
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
+
-    }
-    
@@ -2625 +2626 @@
-            
-            _selafter(ctrl, wasselbtn);
+            
+            _lastSel = ctrl.hwnd;
-        }
-    }