Changeset 12

Timestamp:

11/19/07 10:41:47 (10 months ago)

Author:

Chris Miller

Message:

Small updates.

Files:

• trunk/win32/dfl/base.d (modified) (1 diff)
• trunk/win32/dfl/control.d (modified) (7 diffs)
• trunk/win32/dfl/form.d (modified) (12 diffs)
• trunk/win32/dfl/imagelist.d (modified) (4 diffs)
• trunk/win32/dfl/internal/winapi.d (modified) (2 diffs)
• trunk/win32/dfl/listview.d (modified) (4 diffs)

trunk/win32/dfl/base.d

@@ -689 +689 @@
-enum ColorDepth: ubyte
-{
-1
-
-
-
-
+0x04
+= 0x08
+ = 0x10
+ = 0x18
+ = 0x20
-}
-

trunk/win32/dfl/control.d

@@ -162 +162 @@
-    
-    WANT_TAB_KEY = 0x01000000,
+    WANT_ALL_KEYS = 0x02000000,
-}
-
@@ -4538 +4539 @@
-                    scope MouseEventArgs mea = new MouseEventArgs(MouseButtons.LEFT, 1, cast(short)LOWORD(msg.lParam), cast(short)HIWORD(msg.lParam), 0);
-                    onMouseDown(mea);
+                    
+                    if(ctrlStyle & ControlStyles.SELECTABLE)
+                        SetFocus(hwnd);
-                }
-                break;
@@ -5046 +5050 @@
-                    }
-                    
+                    /+
+                    if(msg.lParam)
+                    {
+                        Message m;
+                        m._winMsg = *cast(MSG*)msg.lParam;
+                        if(processKeyEventArgs(m))
+                            return;
+                    }
+                    +/
+                    
-                    defWndProc(msg);
+                    
+                    if(ctrlStyle & ControlStyles.WANT_ALL_KEYS)
+                        msg.result |= DLGC_WANTALLKEYS;
+                    
-                    // Only want chars if ALT isn't down, because it would break mnemonics.
-                    if(!(GetAsyncKeyState(VK_MENU) & 0x8000))
-                        msg.result |= DLGC_WANTCHARS;
+                    
-                    return;
-                }
-                
-                break;
-            
@@ -5138 +5156 @@
-            debug
-            {
-
-
+
-            }
-            handleCreated(this, ea);
@@ -6394 +6411 @@
-    
-    ///
- // package
+
-    {
-        switch(msg.msg)
@@ -6455 +6472 @@
-        }
-        
+        /+
-        if(Application._compat & DflCompat.CONTROL_KEYEVENT_096)
-            goto def_action;
@@ -6477 +6495 @@
-        
-        return false;
+        +/
+        defWndProc(msg);
+        //return true;
+        return !msg.result;
-    }
-    

trunk/win32/dfl/form.d

@@ -170 +170 @@
-        
-        _shortcuts[shortcut] = pressed;
+    }
+    
+    /// ditto
+    // Delegate parameter contravariance.
+    final void addShortcut(Keys shortcut, void delegate(Object sender, EventArgs ea) pressed)
+    {
+        return addShortcut(shortcut, cast(void delegate(Object sender, FormShortcutEventArgs ea))pressed);
-    }
-    
@@ -884 +891 @@
-    
-    
+    ///
+    protected MdiClient createMdiClient()
+    {
+        version(NO_MDI)
+        {
+            assert(0, "MDI disabled");
+            return null;
+        }
+        else
+        {
+            return new MdiClient();
+        }
+    }
+    
+    
-    version(NO_MDI) {} else
-    {
@@ -895 +917 @@
-                    // Remove MDI client.
-                    mdiClient.dispose();
-
+
+
-                }
-            }
@@ -903 +926 @@
-                {
-                    // Create MDI client.
-
+
+
+
+
-                    mdiClient.parent = this;
-                }
@@ -912 +938 @@
-        final bool isMdiContainer() // getter
-        {
-
+
+
+
+
+
+
+
+
-        }
-        
@@ -919 +952 @@
-        final Form[] mdiChildren() // getter
-        {
-/+
-if(!mdiClient)
+version(NO_MDI)
+{
-                return null;
-
-
-
+
+
+
+
+
+
+
+
+
+
-        }
-        
@@ -931 +971 @@
-        
-        
-///
-final void mdiParent(Form frm) // setter
-in
-{
-f(frm)
-
-assert(frm.isMdiContainer);
-assert(!(frm.mdiClient is null));
-}
-}
-/+out
-{
-if(frm)
-
-bool found = false;
-foreach(Form elem; frm._mdiChildren)
-{
-if(elem is this
+version(NO_MDI) {} else
+{
+   ///
+   final void mdiParent(Form frm) // setter
+n
+
+if(frm)
+{
+       assert(frm.isMdiContainer);
+           assert(!(frm.mdiClient is null));
+       }
+   }
+/+out
+
+if(frm)
+{
+   bool found = false;
+foreach(Form elem; frm._mdiChildren
-                    {
-
-
+
+
+
+
+
-                    }
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
+
+
+
+
+
+
+
-                
-
-
-
-
+
+
+
-                
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
-            }
-        }
@@ -1003 +1046 @@
-        final Form mdiParent() // getter
-        {
-
-
+
+
+
+
+
+
+
+
-            return null;
-        }
@@ -2593 +2642 @@
-    
-    
+    version(NO_MDI) {} else
+    {
+        protected final MdiClient mdiClient() // getter
+        { return _mdiClient; }
+    }
+    
+    
-    private:
-    IButtonControl acceptBtn, cancelBtn;
@@ -2619 +2675 @@
-    version(NO_MDI) {} else
-    {
-
+_
-    }
-    
@@ -2827 +2883 @@
-version(NO_MDI) {} else
-{
- //
+
-    class MdiClient: ControlSuperClass
-    {
@@ -2839 +2895 @@
-            
-            dock = DockStyle.FILL;
+        }
+        
+        
+        ///
+        void borderStyle(BorderStyle bs) // setter
+        {
+            switch(bs)
+            {
+                case BorderStyle.FIXED_3D:
+                    _style(_style() & ~WS_BORDER);
+                    _exStyle(_exStyle() | WS_EX_CLIENTEDGE);
+                    break;
+                    
+                case BorderStyle.FIXED_SINGLE:
+                    _exStyle(_exStyle() & ~WS_EX_CLIENTEDGE);
+                    _style(_style() | WS_BORDER);
+                    break;
+                    
+                case BorderStyle.NONE:
+                    _style(_style() & ~WS_BORDER);
+                    _exStyle(_exStyle() & ~WS_EX_CLIENTEDGE);
+                    break;
+            }
+
+            if(isHandleCreated)
+            {
+                redrawEntire();
+            }
+        }
+
+        /// ditto
+        BorderStyle borderStyle() // getter
+        {
+            if(_exStyle() & WS_EX_CLIENTEDGE)
+                return BorderStyle.FIXED_3D;
+            else if(_style() & WS_BORDER)
+                return BorderStyle.FIXED_SINGLE;
+            return BorderStyle.NONE;
+        }
+        
+        
+        ///
+        final void hScroll(bool byes) // setter
+        {
+            LONG wl = _style();
+            if(byes)
+                wl |= WS_HSCROLL;
+            else
+                wl &= ~WS_HSCROLL;
+            _style(wl);
+            
+            if(isHandleCreated)
+                redrawEntire();
+        }
+
+
+        /// ditto
+        final bool hScroll() // getter
+        {
+            return (_style() & WS_HSCROLL) != 0;
+        }
+
+
+        ///
+        final void vScroll(bool byes) // setter
+        {
+            LONG wl = _style();
+            if(byes)
+                wl |= WS_VSCROLL;
+            else
+                wl &= ~WS_VSCROLL;
+            _style(wl);
+            
+            if(isHandleCreated)
+                redrawEntire();
-        }
-        

trunk/win32/dfl/imagelist.d

@@ -61 +61 @@
-    
-    ///
+    final void imageSize(Size sz) // setter
+    {
+        assert(!isHandleCreated);
+        
+        _w = sz.width;
+        _h = sz.height;
+    }
+    
+    /// ditto
+    final Size imageSize() // getter
+    {
+        return Size(_w, _h);
+    }
+    
+    
+    ///
-    final ImageCollection images() // getter
-    {
@@ -81 +97 @@
-    
-    ///
+    final void draw(Graphics g, Point pt, int index)
+    {
+        return draw(g, pt.x, pt.y, index);
+    }
+    
+    /// ditto
+    final void draw(Graphics g, int x, int y, int index)
+    {
+        ImageList_Draw(handle, index, g.handle, x, y, ILD_NORMAL);
+    }
+    
+    /+
+    /// ditto
+    // stretch
+    final void draw(Graphics g, int x, int y, int width, int height, int index)
+    {
+    }
+    +/
+    
+    
+    ///
-    final bool isHandleCreated() // getter
-    {
@@ -86 +123 @@
-    }
-    
-
+alias 
-    
-    
-    final HIMAGELIST handle() // getter
-    {
-
+!
-            _createimagelist();
-        return _hil;
@@ -123 +160 @@
-        
-        UINT flags = 0;
+        /+
-        switch(_depth)
-        {
-
+ColorDepth.
-            default: case DEPTH_8BIT: flags = ILC_COLOR8; break;
-
-
-
+ColorDepth.
+ColorDepth.
+ColorDepth.
-        }
+        +/
+        flags |= _depth;
-        flags |= ILC_MASK; // ?
-        
-);
+, 65535); // ?
-    }
-}

trunk/win32/dfl/internal/winapi.d

@@ -1629 +1629 @@
-    
-    
+    typedef HANDLE HIMAGELIST;
+    
+    
+    enum: UINT
+    {
+        ILD_NORMAL = 0,
+    }
+    
+    
+    enum: UINT
+    {
+        //ILC_COLOR = ,
+        ILC_COLOR4 = 0x0004,
+        ILC_COLOR8 = 0x0008,
+        ILC_COLOR16 = 0x0010,
+        ILC_COLOR24 = 0x0018,
+        ILC_COLOR32 = 0x0020,
+        
+        ILC_MASK = 0x0001,
+    }
+    
+    
-    // Rich edit.
-typedef
+alias
-    
-    
@@ -2751 +2773 @@
-    DWORD GetThemeAppProperties();
-    BOOL IsAppThemed();
+    HIMAGELIST ImageList_Create(int cx, int cy, UINT flags, int cInitial, int cGrow);
+    BOOL ImageList_Destroy(HIMAGELIST himl);    
+    BOOL ImageList_Draw(HIMAGELIST himl, int i, HDC hdcDst, int x, int y, UINT fStyle);
+    BOOL ImageList_DrawEx(HIMAGELIST himl, int i, HDC hdcDst, int x, int y, int dx, int dy, COLORREF rgbBk, COLORREF rgbFg, UINT fStyle);
-
-//} // Temporary.

trunk/win32/dfl/listview.d

@@ -1634 +1634 @@
-        }
-        
-        /+
-        if(created)
-
-
+
-    }
-    
@@ -2004 +2002 @@
-        switch(m.msg)
-        {
+            /+
-            case WM_PAINT:
-                // This seems to be the only way to display columns correctly.
-                prevWndProc(m);
-                return;
+            +/
-            
-            case LVM_ARRANGE:
@@ -2095 +2095 @@
-        //SendMessageA(hwnd, LVM_SETEXTENDEDLISTVIEWSTYLE, wlvexstyle, wlvexstyle);
-        prevwproc(LVM_SETEXTENDEDLISTVIEWSTYLE, 0, wlvexstyle); // wparam=0 sets all.
-        //redrawEntire(); // Need to recalc the frame ?
-        
-        Color color;
@@ -2114 +2113 @@
-        cols.doListHeaders();
-        litems.doListItems();
+        
+        recalcEntire(); // Fix frame.
-    }
-