Changeset 202

Timestamp:

Oct 10, 2009, 7:09:17 PM (16 years ago)

Author:

lpino

Message:

• Small changes

Location:

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

Files:

• Menu.java (modified) (3 diffs)
• Shell.java (modified) (1 diff)

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

@@ -221 +221 @@
 void createHandle () {
         if ((style & SWT.BAR) != 0) {
-            System.out.println("Menu:createHandle:  Menu Bar");
+//@@TODO (lpino): debug code, remove when no more necessary
+//            System.out.println("Menu:createHandle:  Menu Bar");
             handle = OS.WinCreateWindow (parent.frameHandle,    /* parent window */
                                                         PSZ.getAtom (OS.WC_MENU),       /* class name */
@@ -263 +264 @@
               
         } else if ((style & SWT.DROP_DOWN) != 0) {
-            System.out.println("Menu:createHandle:  Menu DropDown");
+ //@@TODO (lpino): debug code, remove when no more necessary
+//           System.out.println("Menu:createHandle:  Menu DropDown");
             handle = OS.WinCreateWindow (OS.HWND_DESKTOP,       /* parent window */
                                                         PSZ.getAtom (OS.WC_MENU),       /* class name */
@@ -366 +368 @@
         if(OS.WinSendMsg (handle, OS.MM_QUERYITEM,  OS.MPFROM2SHORT ((short)id, (short)OS.TRUE), info))
             return parent.findMenuItem (info.id);
-        
         return null;
 }

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

@@ -1070 +1070 @@
 }
 
-//@@TODO(dmik): remove
-//LRESULT WM_ACTIVATE (int wParam, int lParam) {
-//      if (OS.IsPPC) {
-//              /*
-//              * Note: this does not work when we get WM_ACTIVATE prior
-//              * to adding a listener.
-//              */
-//              if (hooks (SWT.HardKeyDown) || hooks (SWT.HardKeyUp)) {
-//                      int fActive = wParam & 0xFFFF;
-//                      int hwnd = fActive != 0 ? handle : 0;
-//                      for (int bVk=OS.VK_APP1; bVk<=OS.VK_APP6; bVk++) {
-//                              OS.SHSetAppKeyWndAssoc ((byte) bVk, hwnd);
-//                      }
-//              }
-//      }
-//      /*
-//      * Bug in Windows XP.  When a Shell is deactivated, the
-//      * IME composition window does not go away. This causes
-//      * repaint issues.  The fix is to close the IME ourselves
-//      * when the Shell is deactivated.
-//      * 
-//      * Note.  When the Shell is reactivated, the text in the
-//      * composition window has been lost.
-//      */
-//      if ((OS.WIN32_MAJOR << 16 | OS.WIN32_MINOR) >= (5 << 16 | 1)) {
-//              if ((wParam & 0xFFFF) == 0 && OS.IsDBLocale && hIMC != 0) {
-//                      OS.ImmSetOpenStatus (hIMC, false);
-//              }
-//      }
-//      
-//      LRESULT result = super.WM_ACTIVATE (wParam, lParam);
-//      if (parent != null) return LRESULT.ZERO;
-//      return result;
-//}
-
 //@@TODO (dmik): need?
 //LRESULT WM_CLOSE (int wParam, int lParam) {