Changeset 65 for trunk/src/plugins/org.eclipse.swt/Eclipse SWT

Timestamp:

Mar 13, 2008, 11:42:06 PM (17 years ago)

Author:

lpino

Message:

• (Decorations.java) Added findMenu and remove methods

File:

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

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

@@ -448 +448 @@
 }
 
-//@@TODO (dmik): later
-//Menu findMenu (int hMenu) {
-//      if (menus == null) return null;
-//      for (int i=0; i<menus.length; i++) {
-//              Menu menu = menus [i];
-//              if ((menu != null) && (hMenu == menu.handle)) return menu;
-//      }
-//      return null;
-//}
+
+Menu findMenu (int hMenu) {
+        if (menus == null) return null;
+        for (int i=0; i<menus.length; i++) {
+                Menu menu = menus [i];
+                if ((menu != null) && (hMenu == menu.handle)) return menu;
+        }
+        return null;
+}
 
 MenuItem findMenuItem (int id) {
@@ -747 +747 @@
 }
 
-void releaseWidget () {
-//@@TODO (dmik): later    
-//      if (menuBar != null) {
-//              menuBar.releaseWidget ();
-//              menuBar.releaseHandle ();
-//      }
-//      menuBar = null;
-//      if (menus != null) {
-//              for (int i=0; i<menus.length; i++) {
-//                      Menu menu = menus [i];
-//                      if (menu != null && !menu.isDisposed ()) {
-//                              menu.dispose ();
-//                      }
-//              }
-//      }
-//      menus = null;
+void releaseWidget () {   
+        if (menuBar != null) {
+                menuBar.releaseWidget ();
+                menuBar.releaseHandle ();
+        }
+        menuBar = null;
+        if (menus != null) {
+                for (int i=0; i<menus.length; i++) {
+                        Menu menu = menus [i];
+                        if (menu != null && !menu.isDisposed ()) {
+                                menu.dispose ();
+                        }
+                }
+        }
+        menus = null;
 
     super.releaseWidget ();
@@ -778 +777 @@
 }
 
-//@@TODO(dmik)
-//void remove (Menu menu) {
-//      if (menus == null) return;
-//      for (int i=0; i<menus.length; i++) {
-//              if (menus [i] == menu) {
-//                      menus [i] = null;
-//                      return;
-//              }
-//      }
-//}
+void remove (Menu menu) {
+        if (menus == null) return;
+        for (int i=0; i<menus.length; i++) {
+                if (menus [i] == menu) {
+                        menus [i] = null;
+                        return;
+                }
+        }
+}
 
 void remove (MenuItem item) {