Changeset 58

Timestamp:

03/30/08 20:23:06 (5 months ago)

Author:

Chris Miller

Message:

More ToolBar? features.

Files:

• trunk/win32/dfl/internal/winapi.d (modified) (3 diffs)
• trunk/win32/dfl/toolbar.d (modified) (6 diffs)

trunk/win32/dfl/internal/winapi.d

@@ -2060 +2060 @@
-    enum: BYTE
-    {
+        TBSTATE_CHECKED = 0x01,
+        TBSTATE_PRESSED = 0x02,
-        TBSTATE_ENABLED = 0x04,
+        TBSTATE_HIDDEN = 0x08,
+        TBSTATE_INDETERMINATE = 0x10,
+        TBSTATE_WRAP = 0x20,
+        TBSTATE_ELLIPSES = 0x40,
+        TBSTATE_MARKED = 0x80,
-    }
-    
@@ -2074 +2081 @@
-    enum: UINT
-    {
+        TB_SETSTATE = WM_USER + 17,
-        TB_ADDBUTTONSA = WM_USER + 20,
-        TB_INSERTBUTTONA = WM_USER + 21,
@@ -2079 +2087 @@
-        TB_GETITEMRECT = WM_USER + 29,
-        TB_BUTTONSTRUCTSIZE = WM_USER + 30,
+        TB_SETBUTTONSIZE = WM_USER + 31,
-        TB_SETIMAGELIST = WM_USER + 48,
-        TB_INSERTBUTTONW = WM_USER + 67,

trunk/win32/dfl/toolbar.d

@@ -93 +93 @@
-    final void style(ToolBarButtonStyle st) // setter
-    {
-
+yle
-        
-        //if(tbar && tbar.created)
@@ -102 +102 @@
-    final ToolBarButtonStyle style() // getter
-    {
-
+yle
-    }
-    
@@ -190 +190 @@
-    
-    ///
+    final void visible(bool byes) // setter
+    {
+        if(byes)
+            _state &= ~TBSTATE_HIDDEN;
+        else
+            _state |= TBSTATE_HIDDEN;
+        
+        if(tbar && tbar.created)
+            tbar.prevwproc(TB_SETSTATE, _id, MAKELPARAM(_state, 0));
+    }
+    
+    /// ditto
-    final bool visible() // getter
-    {
@@ -195 +207 @@
-            return false;
-        return true; // To-do: get actual hidden state.
+    }
+    
+    
+    ///
+    final void enabled(bool byes) // setter
+    {
+        if(byes)
+            _state |= TBSTATE_ENABLED;
+        else
+            _state &= ~TBSTATE_ENABLED;
+        
+        if(tbar && tbar.created)
+            tbar.prevwproc(TB_SETSTATE, _id, MAKELPARAM(_state, 0));
+    }
+    
+    /// ditto
+    final bool enabled() // getter
+    {
+        if(_state & TBSTATE_ENABLED)
+            return true;
+        return false;
+    }
+    
+    
+    ///
+    final void pushed(bool byes) // setter
+    {
+        if(byes)
+            _state = (_state & ~TBSTATE_INDETERMINATE) | TBSTATE_CHECKED;
+        else
+            _state &= ~TBSTATE_CHECKED;
+        
+        if(tbar && tbar.created)
+            tbar.prevwproc(TB_SETSTATE, _id, MAKELPARAM(_state, 0));
+    }
+    
+    /// ditto
+    final bool pushed() // getter
+    {
+        if(TBSTATE_CHECKED == (_state & TBSTATE_CHECKED))
+            return true;
+        return false;
+    }
+    
+    
+    ///
+    final void partialPush(bool byes) // setter
+    {
+        if(byes)
+            _state = (_state & ~TBSTATE_CHECKED) | TBSTATE_INDETERMINATE;
+        else
+            _state &= ~TBSTATE_INDETERMINATE;
+        
+        if(tbar && tbar.created)
+            tbar.prevwproc(TB_SETSTATE, _id, MAKELPARAM(_state, 0));
+    }
+    
+    /// ditto
+    final bool partialPush() // getter
+    {
+        if(TBSTATE_INDETERMINATE == (_state & TBSTATE_INDETERMINATE))
+            return true;
+        return false;
-    }
-    
@@ -203 +278 @@
-    Dstring _text;
-    Object _tag;
-
+
+
-    version(DFL_TOOLBAR_NO_MENU)
-    {
@@ -537 +613 @@
-        xtb.idCommand = tbb._id;
-        xtb.dwData = cast(DWORD)cast(void*)tbb;
-TBSTATE_ENABLED
-
+tbb._state
+yle
-        LRESULT lresult;
-        // MSDN says iString can be either an int offset or pointer to a string buffer.