Changeset 76 for trunk/src

Timestamp:

May 23, 2008, 6:30:07 PM (17 years ago)

Author:

lpino

Message:

• (Menu.java) Lots of fixes and new code

File:

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

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

@@ -221 +221 @@
 void createHandle () {
         if ((style & SWT.BAR) != 0) {
-            handle = OS.WinCreateWindow (OS.HWND_DESKTOP,       /* parent window */
+            System.out.println("Menu:createHandle:  Menu Bar");
+            handle = OS.WinCreateWindow (parent.frameHandle,    /* parent window */
                                                         PSZ.getAtom (OS.WC_MENU),       /* class name */
-                                                        new PSZ(""),    /* window text */
+                                                        null,   /* window text */
                                                         OS.MS_ACTIONBAR,        /* window style */
                                                         0, 0, 0, 0, /* size and position */
-                                                        OS.HWND_DESKTOP,        /* owner window */
+                                                        parent.frameHandle,     /* owner window */
                                                         OS.HWND_TOP, /* sibling window */
                                                         OS.FID_MENU,    /* ID */
@@ -232 +233 @@
                                                         0               /* presentation parameters */
                                                         );
-        } else {
+//System.out.println (
+//    "Menu.createHandle(): FID_MENU window has been created:\n" +
+//    "    hwnd = " + Integer.toHexString (handle) + "\n" +
+//    "    hwnd.parent = hwnd.owner = " + Integer.toHexString (handle) + "\n" +
+//    "    class = WC_MENU\n" +
+//    "    style = MS_ACTIONBAR"
+//);
+        } else  if ((style & SWT.POP_UP) != 0) {
             short flOptions = OS.PU_MOUSEBUTTON1DOWN | OS.PU_KEYBOARD | OS.PU_MOUSEBUTTON1;
             handle = OS.WinCreateWindow (OS.HWND_DESKTOP,       /* parent window */
                                                         PSZ.getAtom (OS.WC_MENU),       /* class name */
-                                                        new PSZ(""),    /* window text */
+                                                        null,   /* window text */
                                                         0,      /* window style */
                                                         0, 0, 0, 0, /* size and position */
@@ -246 +254 @@
                                                         );
           boolean rc = OS.WinPopupMenu(OS.HWND_DESKTOP, OS.HWND_DESKTOP, handle, 0, 0, 0, flOptions);
+System.out.println (
+    "Menu.createHandle(): FID_MENU window has been created:\n" +
+    "    hwnd = " + Integer.toHexString (handle) + "\n" +
+    "    hwnd.parent = hwnd.owner = " + Integer.toHexString (handle) + "\n" +
+    "    class = WC_MENU\n" +
+    "    style = MS_ACTIONBAR"
+);
               
+        } else if ((style & SWT.DROP_DOWN) != 0) {
+            System.out.println("Menu:createHandle:  Menu DropDown");
+            handle = OS.WinCreateWindow (OS.HWND_DESKTOP,       /* parent window */
+                                                        PSZ.getAtom (OS.WC_MENU),       /* class name */
+                                                        null,   /* window text */
+                                                        0,      /* window style */
+                                                        0, 0, 0, 0, /* size and position */
+                                                        OS.HWND_DESKTOP,        /* owner window */
+                                                        OS.HWND_TOP, /* sibling window */
+                                                        OS.FID_MENU,    /* ID */
+                                                        OS.NULLHANDLE,  /* control data */
+                                                        0               /* presentation parameters */
+                                                        );
+//System.out.println (
+//    "Menu.createHandle(): A menu has been created:\n" +
+//    "    hwnd = " + Integer.toHexString (handle) + "\n" +
+//    "    hwnd.parent = hwnd.owner = " + Integer.toHexString (handle) + "\n" +
+//    "    class = WC_MENU\n" +
+//    "    style = 0"
+//);
         }
         if (handle == 0) error (SWT.ERROR_NO_HANDLES);
@@ -257 +292 @@
         boolean success = false;
 
-        
         MENUITEM info = new MENUITEM();
         info.iPosition = OS.MIT_END;
@@ -263 +297 @@
         info.afAttribute = 0;
         info.id = (short)item.id;
+        System.out.println("Menu:createItem ID = " + info.id);
         info.hwndSubMenu = OS.NULLHANDLE;
         info.hItem = 0;
-        
-        int rc = OS.WinSendMsg (handle, OS.MM_INSERTITEM,  info, new PSZ(""));
+        int rc = OS.WinSendMsg (handle, OS.MM_INSERTITEM,  info, new PSZ(" "));
         if(rc != OS.MIT_MEMERROR && rc != OS.MIT_ERROR)
             success = true;
@@ -273 +307 @@
                 error (SWT.ERROR_ITEM_NOT_ADDED);
         }
-//      redraw ();
+        redraw ();
 }
 
@@ -295 +329 @@
 }
 
-//void destroyAcceleratorTable () {
-//      parent.destroyAcceleratorTable ();
-//}
+void destroyAcceleratorTable () {
+        parent.destroyAcceleratorTable ();
+}
 
 void destroyItem (MenuItem item) {
     int count = GetMenuItemCount (handle);
+    System.out.println("ITEMS antes de destroy = " + count);
     int rc = OS.WinSendMsg (handle, OS.MM_DELETEITEM,  OS.MPFROM2SHORT ((short)item.id, (short)OS.TRUE), 0);
                 if (rc == count) {
                         error (SWT.ERROR_ITEM_NOT_REMOVED);
                 }
-//      redraw ();
+        redraw ();
 }
 
@@ -333 +368 @@
             return parent.findMenuItem (info.id);
         
-//      info.cbSize = MENUITEMINFO.sizeof;
-//      info.fMask = OS.MIIM_ID;
-//      if (OS.GetMenuItemInfo (handle, id, false, info)) {
-//              return parent.findMenuItem (info.wID);
-//      }
         return null;
 }
@@ -384 +414 @@
 public MenuItem getItem (int index) {
         checkWidget ();
-//      MENUITEMINFO info = new MENUITEMINFO ();
-//      info.cbSize = MENUITEMINFO.sizeof;
-//      info.fMask = OS.MIIM_DATA;
         MENUITEM info = new MENUITEM();
         int id = OS.WinSendMsg (handle, OS.MM_ITEMIDFROMPOSITION,  (short)index, 0); 
@@ -433 +460 @@
         MenuItem [] items = new MenuItem [length];
         MENUITEM info = new MENUITEM();
-//      info.cbSize = MENUITEMINFO.sizeof;
-//      info.fMask = OS.MIIM_DATA;
         int idItem = 0;
 //      Revisa si esto es redundante o  no
@@ -588 +613 @@
         MENUITEM info = new MENUITEM();
         int idItem = 0;
-//      MENUITEMINFO info = new MENUITEMINFO ();
-//      info.cbSize = MENUITEMINFO.sizeof;
-//      info.fMask = OS.MIIM_DATA;
         while ((idItem=OS.WinSendMsg (handle, OS.MM_ITEMIDFROMPOSITION,  index, 0)) != OS.MIT_ERROR) {
             //@@TODO(lpino) Check if the next call is necesary or we could use the idItem directly
@@ -641 +663 @@
 }
 
-//void redraw () {
-//      if (OS.IsPPC) return;
-//      if (OS.IsHPC) {
-//              /*
-//              * Each time a menu has been modified, we need
-//              * to redraw the command bar.
-//              */
-//              OS.CommandBar_DrawMenuBar (parent.hwndCB, 0);
-//              return;
-//      }
-//      if ((style & SWT.BAR) != 0) {
+void redraw () {
+        if ((style & SWT.BAR) != 0) {
+//            OS.WinSendMsg (frameHandle, OS.WM_UPDATEFRAME, OS.FCF_MENU, 0);
 //              OS.DrawMenuBar (parent.handle);
-//              return;
-//      }
-//      if ((OS.WIN32_MAJOR << 16 | OS.WIN32_MINOR) < (4 << 16 | 10)) {
-//              return;
-//      }
-//      boolean hasCheck = false, hasImage = false;
+                return;
+        }
+
+//        boolean hasCheck = false, hasImage = false;
 //      MenuItem [] items = getItems ();
 //      for (int i=0; i<items.length; i++) {
@@ -679 +691 @@
 //      }
 //      OS.SetMenuInfo (handle, lpcmi);
-//}
-
-//void releaseChild () {
-//      super.releaseChild ();
-//      if (cascade != null) cascade.setMenu (null);
-//      if ((style & SWT.BAR) != 0 && this == parent.menuBar) {
-//              parent.setMenuBar (null);
-//      }
-//}
+}
+
+void releaseChild () {
+        super.releaseChild ();
+        if (cascade != null) cascade.setMenu (null);
+        if ((style & SWT.BAR) != 0 && this == parent.menuBar) {
+                parent.setMenuBar (null);
+        }
+}
 
 void releaseHandle () {
@@ -776 +788 @@
         }
         OS.WinSendMsg (handle, OS.MM_SETDEFAULTITEMID,  command, 0);
-//      redraw ();
+        redraw ();
 }
 
@@ -838 +850 @@
  * </ul>
  */
-//public void setVisible (boolean visible) {
-//      checkWidget ();
-//      if ((style & (SWT.BAR | SWT.DROP_DOWN)) != 0) return;
-//      int hwndParent = parent.handle;
+public void setVisible (boolean visible) {
+        checkWidget ();
+        if ((style & (SWT.BAR | SWT.DROP_DOWN)) != 0) return;
+        int hwndParent = parent.handle;
 //      if (!visible) {
 //              OS.SendMessage (hwndParent, OS.WM_CANCELMODE, 0, 0);
@@ -853 +865 @@
 //              nY = (short) (pos >> 16);
 //      }
-//      /*
-//      * Feature in Windows.  It is legal use TrackPopupMenu ()
-//      * to display an empty menu as long as menu items are added
-//      * inside of WM_INITPOPUPMENU.  If no items are added, then
-//      * TrackPopupMenu () fails and does not send an indication
-//      * that the menu has been closed.  This is not strictly a
-//      * bug but leads to unwanted behavior when application code
-//      * assumes that every WM_INITPOPUPMENU will eventually result
-//      * in a WM_MENUSELECT, wParam=0xFFFF0000, lParam=0 to indicate
-//      * that the menu has been closed.  The fix is to detect the
-//      * case when TrackPopupMenu fails and the number of items in
-//      * the menu is zero and issue a fake WM_MENUSELECT.
-//      */
+        /*
+        * Feature in Windows.  It is legal use TrackPopupMenu ()
+        * to display an empty menu as long as menu items are added
+        * inside of WM_INITPOPUPMENU.  If no items are added, then
+        * TrackPopupMenu () fails and does not send an indication
+        * that the menu has been closed.  This is not strictly a
+        * bug but leads to unwanted behavior when application code
+        * assumes that every WM_INITPOPUPMENU will eventually result
+        * in a WM_MENUSELECT, wParam=0xFFFF0000, lParam=0 to indicate
+        * that the menu has been closed.  The fix is to detect the
+        * case when TrackPopupMenu fails and the number of items in
+        * the menu is zero and issue a fake WM_MENUSELECT.
+        */
 //      boolean success = OS.TrackPopupMenu (handle, flags, nX, nY, 0, hwndParent, null);
 //      if (!success && GetMenuItemCount (handle) == 0) {
 //              OS.SendMessage (hwndParent, OS.WM_MENUSELECT, 0xFFFF0000, 0);
 //      }
-//}
-
-}
+}
+
+}