Changeset 49 for trunk/src/plugins/org.eclipse.swt

Timestamp:

Dec 26, 2007, 4:47:05 PM (18 years ago)

Author:

lpino

Message:

(Decorations.java) - Uncommented some menu code

File:

• trunk/src/plugins/org.eclipse.swt/Eclipse SWT/pm/org/eclipse/swt/widgets/Decorations.java (modified) (5 diffs)

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

@@ -95 +95 @@
 //@@TODO(dmik)    
 //      Image image;
-//      Menu menuBar;
-//      Menu [] menus;
-//      MenuItem [] items;
+        Menu menuBar;
+        Menu [] menus;
+        MenuItem [] items;
         Control savedFocus;
         Button defaultButton, saveDefault;
@@ -108 +108 @@
 //      * Windows reserves the values 0..100.
 //      */
-//      static final int ID_START = 100;
+//@@TODO (lpino): For now we keep this in place
+        static final int ID_START = 100;
 
     int frameHandle;
@@ -176 +177 @@
 }
 
-//@@TODO(dmik)
-//void add (Menu menu) {
-//      if (menus == null) menus = new Menu [4];
-//      for (int i=0; i<menus.length; i++) {
-//              if (menus [i] == null) {
-//                      menus [i] = menu;
-//                      return;
-//              }
-//      }
-//      Menu [] newMenus = new Menu [menus.length + 4];
-//      newMenus [menus.length] = menu;
-//      System.arraycopy (menus, 0, newMenus, 0, menus.length);
-//      menus = newMenus;
-//}
-//
-//void add (MenuItem item) {
-//      if (items == null) items = new MenuItem [12];
-//      for (int i=0; i<items.length; i++) {
-//              if (items [i] == null) {
-//                      item.id = i + ID_START;
-//                      items [i] = item;
-//                      return;
-//              }
-//      }
-//      item.id = items.length + ID_START;
-//      MenuItem [] newItems = new MenuItem [items.length + 12];
-//      newItems [items.length] = item;
-//      System.arraycopy (items, 0, newItems, 0, items.length);
-//      items = newItems;
-//}
+
+void add (Menu menu) {
+        if (menus == null) menus = new Menu [4];
+        for (int i=0; i<menus.length; i++) {
+                if (menus [i] == null) {
+                        menus [i] = menu;
+                        return;
+                }
+        }
+        Menu [] newMenus = new Menu [menus.length + 4];
+        newMenus [menus.length] = menu;
+        System.arraycopy (menus, 0, newMenus, 0, menus.length);
+        menus = newMenus;
+}
+
+void add (MenuItem item) {
+        if (items == null) items = new MenuItem [12];
+        for (int i=0; i<items.length; i++) {
+                if (items [i] == null) {
+                        item.id = i + ID_START;
+                        items [i] = item;
+                        return;
+                }
+        }
+        item.id = items.length + ID_START;
+        MenuItem [] newItems = new MenuItem [items.length + 12];
+        newItems [items.length] = item;
+        System.arraycopy (items, 0, newItems, 0, items.length);
+        items = newItems;
+}
 
 void bringToTop () {
@@ -323 +324 @@
 //                      }
 //              }
-//      }
-//      if (OS.IsPPC) {
-//              /* 
-//              * Note on WinCE PPC.  Close the shell when user taps CTRL-Q.
-//              * IDOK represents the "Done Button" which also closes the shell.
-//              */
-//              accel.fVirt = OS.FVIRTKEY | OS.FCONTROL;
-//              accel.key = 'Q';
-//              accel.cmd = OS.IDOK;
-//              OS.MoveMemory (buffer1, accel, size);
-//              System.arraycopy (buffer1, 0, buffer2, nAccel * size, size);
-//              nAccel++;                       
 //      }
 //      if (nAccel != 0) hAccel = OS.CreateAcceleratorTable (buffer2, nAccel);
@@ -799 +788 @@
 //      }
 //}
-//
-//void remove (MenuItem item) {
-//      if (items == null) return;
-//      items [item.id - ID_START] = null;
-//      item.id = -1;
-//}
+
+void remove (MenuItem item) {
+        if (items == null) return;
+        items [item.id - ID_START] = null;
+        item.id = -1;
+}
 
 boolean restoreFocus () {