Changeset 42

Timestamp:

03/03/08 16:19:57 (7 months ago)

Author:

Chris Miller

Message:

Changed common controls initialization.
Finished image lists.
Added ListView? images.

Files:

• trunk/win32/dfl/all.d (modified) (1 diff)
• trunk/win32/dfl/application.d (modified) (1 diff)
• trunk/win32/dfl/button.d (modified) (9 diffs)
• trunk/win32/dfl/control.d (modified) (5 diffs)
• trunk/win32/dfl/drawing.d (modified) (6 diffs)
• trunk/win32/dfl/imagelist.d (modified) (7 diffs)
• trunk/win32/dfl/internal/winapi.d (modified) (2 diffs)
• trunk/win32/dfl/listview.d (modified) (15 diffs)
• trunk/win32/dfl/makelib.bat (modified) (1 diff)
• trunk/win32/dfl/progressbar.d (modified) (1 diff)
• trunk/win32/dfl/statusbar.d (modified) (1 diff)
• trunk/win32/dfl/tabcontrol.d (modified) (1 diff)
• trunk/win32/dfl/treeview.d (modified) (1 diff)

trunk/win32/dfl/all.d

@@ -63 +63 @@
-    dfl.clipboard, dfl.commondialog, dfl.richtextbox, dfl.tooltip,
-    dfl.combobox, dfl.treeview, dfl.picturebox, dfl.tabcontrol,
-
+
+
-

trunk/win32/dfl/application.d

@@ -238 +238 @@
-                                            activateActCtx(hac, &ul);
-                                            
-
+
+
+
+
+
+
+
+
+
+
+
-                                        }
-                                        else

trunk/win32/dfl/button.d

@@ -408 +408 @@
-    body
-    {
+        /+
-        if(_picbm)
-        {
@@ -413 +414 @@
-            _picbm = null;
-        }
+        +/
-        
-        _img = null; // In case of exception.
@@ -418 +420 @@
-        if(img)
-        {
+            /+
-            if(cast(Bitmap)img)
-            {
@@ -428 +431 @@
-            else
-            {
-version(Tango
+if(cast(Picture)img
-                {
-
-
-
-
-
-
-
-
-
+
+
+
-                }
-                
-.
+
-                not_unsupported: ;
+            }
+            +/
+            switch(img._imgtype(null))
+            {
+                case 1:
+                    imgst = BS_BITMAP;
+                    break;
+                
+                case 2:
+                    imgst = BS_ICON;
+                    break;
+                
+                default:
+                    throw new DflException("Unsupported image format");
+                    not_unsupported: ;
-            }
-        }
@@ -467 +479 @@
-        LPARAM lparam = 0;
-        
+        /+
-        if(bsImageStyle & BS_BITMAP)
-        {
@@ -481 +494 @@
-            return;
-        }
+        +/
+        HGDIOBJ hgo;
+        switch(_img._imgtype(&hgo))
+        {
+            case 1:
+                wparam = BS_BITMAP;
+                break;
+            
+            case 2:
+                wparam = BS_ICON;
+                break;
+            
+            default:
+                return;
+        }
+        lparam = cast(LPARAM)hgo;
-        
-        //assert(lparam);
@@ -500 +529 @@
-        super.onHandleDestroyed(ea);
-        
+        /+
-        if(_picbm)
-        {
@@ -505 +535 @@
-            _picbm = null;
-        }
+        +/
-    }
-    
@@ -511 +542 @@
-    DialogResult dresult = DialogResult.NONE;
-    Image _img = null;
-
+//
-}
-

trunk/win32/dfl/control.d

@@ -3973 +3973 @@
-        
-        UpdateWindow(hwnd);
-    }
-    
-    
-    ///
-    void dispose()
-    {
-        dispose(true);
-    }
-    
@@ -6166 +6159 @@
-            debug
-            {
-kill
+dispos
-            }
-            
-            debug(APP_PRINT)
-            {
-kill
+dispos
-            }
-            
@@ -6358 +6351 @@
-    
-    ///
-
-
-
-
-
-
-
+
+
+
+
+
+
+
+
+
+
-        {
-            killing = true;
@@ -6377 +6373 @@
-            wtext = wtext.init;
-            deleteThisBackgroundBrush();
+            //ccollection.children = null; // Not GC-safe in dtor.
-            //ccollection = null; // ? Causes bad things. Leaving it will do just fine.
-        }
+        
+        if(!isHandleCreated)
+            return;
-        
-        destroyHandle();
@@ -6885 +6885 @@
-    
-    void killing(bool byes) // setter
-
+
+
-    bool killing() // getter
-        { return (cbits & CBits.KILLING) != 0; }

trunk/win32/dfl/drawing.d

@@ -939 +939 @@
-        return size.height;
-    }
+    
+    
+    int _imgtype(HGDIOBJ* ph) // internal
+    {
+        if(ph)
+            *ph = HGDIOBJ.init;
+        return 0; // 1 = bitmap; 2 = icon.
+    }
-}
-
@@ -1086 +1094 @@
-        if(owned)
-            dispose();
+    }
+    
+    
+    override int _imgtype(HGDIOBJ* ph) // internal
+    {
+        if(ph)
+            *ph = cast(HGDIOBJ)hbm;
+        return 1;
-    }
-    
@@ -1281 +1297 @@
-    void dispose()
-    {
+        if(HBITMAP.init != _hbmimgtype)
+        {
+            DeleteObject(_hbmimgtype);
+            _hbmimgtype = HBITMAP.init;
+        }
+        
-        if(ipic)
-        {
@@ -1338 +1360 @@
-    final Bitmap toBitmap()
-    {
-        Graphics g;
-        Bitmap result;
-
+scope Graphics 
-        result = toBitmap(g);
-g.dispose();
+//g.dispose(); // scope'd
-        return result;
-    }
@@ -1350 +1371 @@
-    {
-        return toBitmap(g.handle);
+    }
+    
+    
+    HBITMAP _hbmimgtype;
+    
+    override int _imgtype(HGDIOBJ* ph) // internal
+    {
+        if(ph)
+        {
+            if(HBITMAP.init == _hbmimgtype)
+            {
+                scope Graphics g = Graphics.getScreen();
+                _hbmimgtype = toHBitmap(g.handle);
+                //g.dispose(); // scope'd
+            }
+            
+            *ph = _hbmimgtype;
+        }
+        return 1;
-    }
-    
@@ -2718 +2758 @@
-        if(owned)
-            dispose();
+    }
+    
+    
+    int _imgtype(HGDIOBJ* ph) // internal
+    {
+        if(ph)
+            *ph = cast(HGDIOBJ)hi;
+        return 2;
-    }
-    

trunk/win32/dfl/imagelist.d

@@ -7 +7 @@
-
-import dfl.base, dfl.drawing, dfl.internal.winapi;
+import dfl.collections;
-
-
@@ -12 +13 @@
-class ImageList // docmain
-{
+    ///
-    class ImageCollection
-    {
@@ -19 +21 @@
-        
-        
-
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
-    }
-    
@@ -108 +193 @@
-    }
-    
-    /+
-    /// ditto
-    // stretch
-    final void draw(Graphics g, int x, int y, int width, int height, int index)
-    {
-
-
+
+
+
+
+
+
+
+
+
+
-    
-    
@@ -126 +218 @@
-    
-    
+    ///
-    final HIMAGELIST handle() // getter
-    {
@@ -134 +227 @@
-    
-    
-
+
+
+
+
+
+
+
+
-    {
-        if(isHandleCreated)
-            ImageList_Destroy(_hil);
+        _hil = HIMAGELIST.init;
+        
+        if(disposing)
+        {
+            //_cimages._images = null; // Not GC-safe in dtor.
+            //_cimages = null; // Could cause bad things.
+        }
+    }
+    
+    
+    ~this()
+    {
+        dispose();
-    }
-    
@@ -160 +273 @@
-        
-        UINT flags = 0;
-        /+
-        switch(_depth)
-        {
-            case ColorDepth.DEPTH_4BIT: flags = ILC_COLOR4; break;
-
+ColorDepth.
-            case ColorDepth.DEPTH_16BIT: flags = ILC_COLOR16; break;
-            case ColorDepth.DEPTH_24BIT: flags = ILC_COLOR24; break;
-            case ColorDepth.DEPTH_32BIT: flags = ILC_COLOR32; break;
-        }
-        +/
-        flags |= _depth;
-        flags |= ILC_MASK; // ?
-        
-
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
-    }
-}

trunk/win32/dfl/internal/winapi.d

@@ -1290 +1290 @@
-        LVS_EX_UNDERLINECOLD = 0x00001000,
-        LVS_EX_MULTIWORKAREAS = 0x00002000,
+    }
+    
+    
+    enum
+    {
+        LVSIL_NORMAL = 0,
+        LVSIL_SMALL = 1,
+        LVSIL_STATE = 2,
+    }
+    
+    
+    enum
+    {
+        I_IMAGECALLBACK = -1,
-    }
-    
@@ -2791 +2805 @@
-    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);
+    int ImageList_Add(HIMAGELIST himl, HBITMAP hbmImage, HBITMAP hbmMask);
+    int ImageList_AddIcon(HIMAGELIST himl, HICON hicon);
+    int ImageList_AddMasked(HIMAGELIST himl, HBITMAP hbmImage, COLORREF crMask);
+    BOOL ImageList_Remove(HIMAGELIST himl, int i);
-
-//} // Temporary.

trunk/win32/dfl/listview.d

@@ -10 +10 @@
-private import dfl.base, dfl.control, dfl.internal.winapi, dfl.application;
-private import dfl.event, dfl.drawing, dfl.collections, dfl.internal.utf;
+private import dfl.imagelist;
-
-
@@ -393 +394 @@
-    
-    
+    ///
+    final void imageIndex(int index) // setter
+    {
+        this._imgidx = index;
+        
+        if(lview && lview.created)
+            lview.updateItem(this);
+    }
+    
+    /// ditto
+    final int imageIndex() // getter
+    {
+        return _imgidx;
+    }
+    
+    
-    private:
-    package ListView lview = null;
+    Object _tag = null;
+    package ListViewSubItemCollection isubs = null;
+    int _imgidx = -1;
-    char[] _txt;
-    package CallText calltxt;
-    Object _tag = null;
-    package ListViewSubItemCollection isubs = null;
-}
-
@@ -1176 +1194 @@
-    this()
-    {
-        _initCommonControls(ICC_LISTVIEW_CLASSES);
-        
-        _initListview();
-        
@@ -1186 +1202 @@
-        checkedis = new CheckedIndexCollection(this);
-        
-; // LVS_SHAREIMAGELISTS
+ | LVS_SHAREIMAGELISTS;
-        wexstyle |= WS_EX_CLIENTEDGE;
-        ctrlStyle |= ControlStyles.SELECTABLE;
@@ -1907 +1923 @@
-    
-    
+    ///
+    void largeImageList(ImageList imglist) // setter
+    {
+        if(isHandleCreated)
+        {
+            prevwproc(LVM_SETIMAGELIST, LVSIL_NORMAL,
+                cast(LPARAM)(imglist ? imglist.handle : cast(HIMAGELIST)null));
+        }
+        
+        _lgimglist = imglist;
+    }
+    
+    /// ditto
+    ImageList largeImageList() // getter
+    {
+        return _lgimglist;
+    }
+    
+    
+    ///
+    void smallImageList(ImageList imglist) // setter
+    {
+        if(isHandleCreated)
+        {
+            prevwproc(LVM_SETIMAGELIST, LVSIL_SMALL,
+                cast(LPARAM)(imglist ? imglist.handle : cast(HIMAGELIST)null));
+        }
+        
+        _smimglist = imglist;
+    }
+    
+    /// ditto
+    ImageList smallImageList() // getter
+    {
+        return _smimglist;
+    }
+    
+    
+    ///
+    void stateImageList(ImageList imglist) // setter
+    {
+        if(isHandleCreated)
+        {
+            prevwproc(LVM_SETIMAGELIST, LVSIL_STATE,
+                cast(LPARAM)(imglist ? imglist.handle : cast(HIMAGELIST)null));
+        }
+        
+        _stimglist = imglist;
+    }
+    
+    /// ditto
+    ImageList stateImageList() // getter
+    {
+        return _stimglist;
+    }
+    
+    
-    // TODO:
-    //  itemActivate, itemDrag
@@ -2119 +2192 @@
-        color = foreColor;
-        prevwproc(LVM_SETTEXTCOLOR, 0, cast(LPARAM)color.toRgb());
+        
+        if(_lgimglist)
+            prevwproc(LVM_SETIMAGELIST, LVSIL_NORMAL, cast(LPARAM)_lgimglist.handle);
+        if(_smimglist)
+            prevwproc(LVM_SETIMAGELIST, LVSIL_SMALL, cast(LPARAM)_smimglist.handle);
+        if(_stimglist)
+            prevwproc(LVM_SETIMAGELIST, LVSIL_STATE, cast(LPARAM)_stimglist.handle);
-        
-        cols.doListHeaders();
@@ -2153 +2233 @@
-                                if(!lvdi.item.iSubItem) // Item.
-                                {
-
+
+
+
+
+
-                                }
-                                else // Sub item.
-                                {
-
-
+
+
+
+
+
-                                }
-                            }
@@ -2176 +2263 @@
-                                if(!lvdi.item.iSubItem) // Item.
-                                {
-
+
+
+
+
+
-                                }
-                                else // Sub item.
-                                {
-
-
+
+
+
+
+
-                                }
-                            }
@@ -2353 +2447 @@
-    CheckedIndexCollection checkedis;
-    int delegate(ListViewItem, ListViewItem) _sortproc;
+    ImageList _lgimglist, _smimglist, _stimglist;
-    
-    
@@ -2406 +2501 @@
-    // If -subItemIndex- is 0 it's an item not a sub item.
-    // Returns the insertion index or -1 on failure.
-
+, int imageIndex = -1
-    in
-    {
@@ -2420 +2515 @@
-        LV_ITEMA lvi;
-        lvi.mask = LVIF_TEXT | LVIF_PARAM;
+        //if(-1 != imageIndex)
+        if(!subItemIndex)
+            lvi.mask |= LVIF_IMAGE;
-        lvi.iItem = index;
-        lvi.iSubItem = subItemIndex;
@@ -2425 +2523 @@
-        lvi.pszText = LPSTR_TEXTCALLBACKA;
-        lvi.lParam = lparam;
+        //lvi.iImage = imageIndex;
+        lvi.iImage = I_IMAGECALLBACK;
-        return prevwproc(LVM_INSERTITEMA, 0, cast(LPARAM)&lvi);
-    }
@@ -2431 +2531 @@
-    package final LRESULT _ins(int index, ListViewItem item)
-    {
-
+
+
-    }
-    
@@ -2484 +2585 @@
-    // If -subItemIndex- is 0 it's an item not a sub item.
-    // Returns FALSE on failure.
-Text(int index, char[] newText, int subItemIndex = 0
+(int index
-    in
-    {
@@ -2494 +2595 @@
-    }
-    
-
-
+
-    {
-        int index;
-        index = item.index;
-        assert(-1 != index);
-
+
+
+
+
+
+
+
+
+
+
+
+
-    }
-    

trunk/win32/dfl/makelib.bat

@@ -31 +31 @@
-:dfl_not_tango_files
-
-
+imagelist.d 
-
-
+imagelist.obj 
-
-@rem   Also update link pragmas for build.

trunk/win32/dfl/progressbar.d

@@ -19 +19 @@
-    this()
-    {
-        _initCommonControls(ICC_PROGRESS_CLASS);
-        
-        _initProgressbar();
-        

trunk/win32/dfl/statusbar.d

@@ -401 +401 @@
-    this()
-    {
-        _initCommonControls(ICC_BAR_CLASSES);
-        
-        _initStatusbar();
-        

trunk/win32/dfl/tabcontrol.d

@@ -367 +367 @@
-    this()
-    {
-        _initCommonControls(ICC_TAB_CLASSES);
-        
-        _initTabcontrol();
-        

trunk/win32/dfl/treeview.d

@@ -959 +959 @@
-    this()
-    {
-        _initCommonControls(ICC_TREEVIEW_CLASSES);
-        
-        _initTreeview();
-