Changeset 249

Timestamp:

01/25/2010 15:18:36 (6 months ago)

Author:

lpino

Message:

- Initial implementation work

Location:

trunk/src/plugins/org.eclipse.swt/Eclipse SWT/pm/org/eclipse/swt/widgets

Files:

• Tree.java (modified) (6 diffs)
• TreeItem.java (modified) (6 diffs)

trunk/src/plugins/org.eclipse.swt/Eclipse SWT/pm/org/eclipse/swt/widgets/Tree.java

@@ -3 +3 @@
 /*
  * OS/2 version.
- * Copyright (c) 2002, 2009 EclipseOS2 Team.
+ * Copyright (c) 2002, 2010 EclipseOS2 Team.
  */
 
@@ -206 +206 @@
         state &= ~CANVAS;
         
+        /* Set the container's view */
+        CNRINFO cnrInfo = new CNRINFO();
+        cnrInfo.flWindowAttr = OS.CV_TREE | OS.CV_ICON;
+        OS.WinSendMsg(handle, OS.CM_SETCNRINFO, cnrInfo, OS.CMA_FLWINDOWATTR);
         /* Set the checkbox image list */
 //      if ((style & SWT.CHECK) != 0) setCheckboxImageList ();
@@ -225 +229 @@
 }
 
-// void createItem (TreeItem item, int hParent, int hInsertAfter) {
-        // item.foreground = item.background = -1;
-        // int id = 0;
-        // while (id < items.length && items [id] != null) id++;
-        // if (id == items.length) {
-                // TreeItem [] newItems = new TreeItem [items.length + 4];
-                // System.arraycopy (items, 0, newItems, 0, items.length);
-                // items = newItems;
-        // }
+void createItem (TreeItem item, int hParent, int hInsertAfter) {
+        item.foreground = item.background = -1;
+        int id = 0;
+        while (id < items.length && items [id] != null) id++;
+        if (id == items.length) {
+                TreeItem [] newItems = new TreeItem [items.length + 4];
+                System.arraycopy (items, 0, newItems, 0, items.length);
+                items = newItems;
+        }
+        int hItem = OS.WinSendMsg(handle, OS.CM_ALLOCRECORD, 0, 1);
+        item.handle = hItem;
+        RECORDCORE struct = new RECORDCORE();
+        OS.objcpy(struct, hItem);
+        RECORDINSERT recsIn = new RECORDINSERT();
+        recsIn.pRecordParent = hParent;
+        recsIn.pRecordOrder = hInsertAfter;
+        recsIn.zOrder = OS.CMA_TOP;
+        recsIn.fInvalidateRecord = OS.TRUE;
+        recsIn.cRecordsInsert = 1;
+        /* Insert the item */
+        int count  = OS.WinSendMsg(handle, OS.CM_INSERTRECORD, struct, recsIn);
+        if (count == 0) error (SWT.ERROR_ITEM_NOT_ADDED);
+        items [id] = item;
         // TVINSERTSTRUCT tvInsert = new TVINSERTSTRUCT ();
         // tvInsert.hParent = hParent;
@@ -280 +298 @@
                 // OS.InvalidateRect (handle, rect, false);
         // }
-// }
+}
 
 void createWidget () {
@@ -287 +305 @@
 }
 
-/* int defaultBackground () {
-        return OS.GetSysColor (OS.COLOR_WINDOW);
-}
- */
+ int defaultBackground () {
+        return OS.WinQuerySysColor(super.handle, OS.SYSCLR_WINDOW, 0);
+}
+
 /**
  * Deselects all selected items in the receiver.
@@ -1056 +1074 @@
  */
  int widgetStyle () {
-         int bits = super.widgetStyle () | OS.CCS_MINIRECORDCORE;
+         int bits = super.widgetStyle () | OS.CCS_READONLY | OS.CCS_AUTOPOSITION;
 //       bits |= OS.TVS_LINESATROOT | OS.TVS_HASLINES | OS.TVS_HASBUTTONS;
         // /*

trunk/src/plugins/org.eclipse.swt/Eclipse SWT/pm/org/eclipse/swt/widgets/TreeItem.java

@@ -66 +66 @@
         super (parent, style);
         this.parent = parent;
-//      parent.createItem (this, 0, OS.TVI_LAST);
+        parent.createItem (this, 0, OS.CMA_END);
 }
 
@@ -100 +100 @@
  * @see Widget#getStyle
  */
-/* public TreeItem (Tree parent, int style, int index) {
+ public TreeItem (Tree parent, int style, int index) {
         super (parent, style);
         if (index < 0) error (SWT.ERROR_INVALID_RANGE);
         this.parent = parent;
-        int hItem = OS.TVI_FIRST;
+        int hItem = OS.CMA_FIRST;
         if (index != 0) {
                 int count = 1, hwnd = parent.handle;
-                hItem = OS.SendMessage (hwnd, OS.TVM_GETNEXTITEM, OS.TVGN_ROOT, 0);
+                RECORDCORE item = new RECORDCORE();
+//              hItem = OS.SendMessage (hwnd, OS.TVM_GETNEXTITEM, OS.TVGN_ROOT, 0);
+                hItem = OS.WinSendMsg (hwnd, OS.CM_QUERYRECORD, item, OS.MPFROM2SHORT((short)OS.CMA_FIRST, (short)OS.CMA_ITEMORDER));
                 while (hItem != 0 && count < index) {
-                        hItem = OS.SendMessage (hwnd, OS.TVM_GETNEXTITEM, OS.TVGN_NEXT, hItem);
+//                      hItem = OS.SendMessage (hwnd, OS.TVM_GETNEXTITEM, OS.TVGN_NEXT, hItem);
+                        hItem = OS.WinSendMsg (hwnd, OS.CM_QUERYRECORD, item, OS.MPFROM2SHORT((short)OS.CMA_NEXT, (short)OS.CMA_ITEMORDER));
                         count++;
                 }
@@ -116 +119 @@
         parent.createItem (this, 0, hItem);
 }
- */
+
 /**
  * Constructs a new instance of this class given its parent
@@ -151 +154 @@
         parent = parentItem.parent;
         int hItem = parentItem.handle;
-//      parent.createItem (this, hItem, OS.TVI_LAST);
+        parent.createItem (this, hItem, OS.CMA_END);
 }
 
@@ -185 +188 @@
  * @see Widget#getStyle
  */
-/* public TreeItem (TreeItem parentItem, int style, int index) {
+ public TreeItem (TreeItem parentItem, int style, int index) {
         super (checkNull (parentItem).parent, style);
         if (index < 0) error (SWT.ERROR_INVALID_RANGE);
         parent = parentItem.parent;
-        int hItem = OS.TVI_FIRST;
+        int hItem = OS.CMA_FIRST;
         int hParent = parentItem.handle;
+        RECORDCORE item = new RECORDCORE();
+        OS.objcpy (item, parentItem.handle);
         if (index != 0) {
                 int count = 1, hwnd = parent.handle;
-                hItem = OS.SendMessage (hwnd, OS.TVM_GETNEXTITEM, OS.TVGN_CHILD, hParent);
+//              hItem = OS.SendMessage (hwnd, OS.TVM_GETNEXTITEM, OS.TVGN_CHILD, hParent);
+                hItem = OS.WinSendMsg (hwnd, OS.CM_QUERYRECORD, item, OS.MPFROM2SHORT((short)OS.CMA_FIRSTCHILD, (short)OS.CMA_ITEMORDER));
                 while (hItem != 0 && count < index) {
-                        hItem = OS.SendMessage (hwnd, OS.TVM_GETNEXTITEM, OS.TVGN_NEXT, hItem);
+//                      hItem = OS.SendMessage (hwnd, OS.TVM_GETNEXTITEM, OS.TVGN_NEXT, hItem);
                         count++;
                 }
@@ -202 +208 @@
         parent.createItem (this, hParent, hItem);
 }
- */
+
 static TreeItem checkNull (TreeItem item) {
         if (item == null) SWT.error (SWT.ERROR_NULL_ARGUMENT);