Changeset 56

Timestamp:

03/28/08 23:17:39 (5 months ago)

Author:

Chris Miller

Message:

Added ToolBar? control (partial).

Files:

• trunk/win32/dfl/all.d (modified) (1 diff)
• trunk/win32/dfl/control.d (modified) (3 diffs)
• trunk/win32/dfl/internal/winapi.d (modified) (2 diffs)
• trunk/win32/dfl/listview.d (modified) (6 diffs)
• trunk/win32/dfl/makelib.bat (modified) (1 diff)
• trunk/win32/dfl/toolbar.d (added)

trunk/win32/dfl/all.d

@@ -64 +64 @@
-    dfl.combobox, dfl.treeview, dfl.picturebox, dfl.tabcontrol,
-    dfl.listview, dfl.statusbar, dfl.progressbar, dfl.resources,
-
+, dfl.toolbar
-

trunk/win32/dfl/control.d

@@ -312 +312 @@
-// ///
-// New dimensions before resizing.
-
+
-{
-    deprecated:
@@ -4025 +4025 @@
-    
-    
+    /+
-    // ///
-    // Allows comparing before and after dimensions, and also allows modifying the new dimensions.
@@ -4030 +4031 @@
-    {
-    }
+    +/
-    
-    

trunk/win32/dfl/internal/winapi.d

@@ -247 +247 @@
-    {
-        NM_FIRST = 0,
+        NM_CLICK = NM_FIRST - 2,
-        NM_CUSTOMDRAW = NM_FIRST - 12,
-    }
+    
+    
+    struct NMMOUSE
+    {
+        NMHDR hdr;
+        DWORD dwItemSpec;
+        DWORD dwItemData;
+        POINT pt;
+        LPARAM dwHitInfo;
+    }
+    alias NMMOUSE* LPNMMOUSE;
-    
-    
@@ -1981 +1993 @@
-    alias LVCOLUMNW* LPLV_COLUMNW;
-    alias LVCOLUMNW* PLV_COLUMNW;
+    
+    
+    struct TBBUTTON
+    {
+        int iBitmap;
+        int idCommand;
+        BYTE fsState;
+        BYTE fsStyle;
+        BYTE[2] bReserved;
+        DWORD dwData;
+        int iString;
+    }
+    alias TBBUTTON* PTBBUTTON, LPTBBUTTON, LPCTBBUTTON;
+    
+    
+    /+enum
+    {
+        TBSTYLE_AUTOSIZE
+    }+/
+    
+    
+    enum: BYTE
+    {
+        TBSTATE_ENABLED = 0x04,
+    }
+    
+    
+    enum: BYTE
+    {
+        //BTNS_AUTOSIZE = TBSTYLE_AUTOSIZE,
+        BTNS_AUTOSIZE = 0x0010,
+    }
+    
+    
+    enum: UINT
+    {
+        TB_ADDBUTTONSA = WM_USER + 20,
+        TB_INSERTBUTTONA = WM_USER + 21,
+        TB_DELETEBUTTON = WM_USER + 22,
+        TB_BUTTONSTRUCTSIZE = WM_USER + 30,
+        TB_SETIMAGELIST = WM_USER + 48,
+        TB_INSERTBUTTONW = WM_USER + 67,
+        TB_ADDBUTTONSW = WM_USER + 68,
+    }
-    
-    

trunk/win32/dfl/listview.d

@@ -205 +205 @@
-        
-        
-ed
+ing
-        {
-            if(val._item)
@@ -215 +215 @@
-        
-        mixin ListWrapArray!(ListViewSubItem, _subs,
-blankListCallback!(ListViewSubItem), _added
+adding, _blankListCallback!(ListViewSubItem)
-            _blankListCallback!(ListViewSubItem), _blankListCallback!(ListViewSubItem),
-            true, false, false);
@@ -814 +814 @@
-        
-        
+        void _adding(size_t idx, ListViewItem val)
+        {
+            verifyNoParent(val);
+        }
+        
+        
-        void _added(size_t idx, ListViewItem val)
-        {
-            verifyNoParent(val);
-            
-            val.lview = lv;
-            
@@ -851 +855 @@
-        
-        mixin ListWrapArray!(ListViewItem, _items,
-blankListCallback!(ListViewItem)
+adding
-            _blankListCallback!(ListViewItem), _removed,
-            true, false, false);
@@ -906 +910 @@
-        
-        
+        void _adding(size_t idx, ColumnHeader val)
+        {
+            verifyNoParent(val);
+        }
+        
+        
-        void _added(size_t idx, ColumnHeader val)
-        {
-            verifyNoParent(val);
-            
-            val.lview = lv;
-            
@@ -939 +947 @@
-        
-        mixin ListWrapArray!(ColumnHeader, _headers,
-blankListCallback!(ColumnHeader)
+adding
-            _blankListCallback!(ColumnHeader), _removed,
-            true, false, false,

trunk/win32/dfl/makelib.bat

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