Changeset 173 for trunk/src

Timestamp:

Jul 31, 2009, 3:39:08 AM (16 years ago)

Author:

lpino

Message:

• Minor update

File:

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

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

@@ -471 +471 @@
     OS.WinSetWindowUShort (handle, OS.QWS_ID, (short)(handle & 0xFFFF));
 
-//@@TODO (dmik): debug code, remove when no more necessary 
+//@@TODO (dmik): debug code, remove when no more necessary
 //System.out.println (
 //    "Control.createHandle(): Window has been created:\n" +
@@ -519 +519 @@
     releaseHandle ();
     if (hwnd != 0) {
-//@@TODO (dmik): debug code, remove when no more necessary 
+//@@TODO (dmik): debug code, remove when no more necessary
 //System.out.println (
 //    "Control.destroyWidget(): Window is being derstroyed:\n    hwnd = " +
@@ -612 +612 @@
     if (isFocusControl ()) return true;
     shell.bringToTop ();
-//@@TODO (dmik): does it relate to OS/2?    
+//@@TODO (dmik): does it relate to OS/2?
 //    /*
 //    * This code is intentionally commented.
@@ -780 +780 @@
     String fontNameSize = len != 0 ? new PSZ (fontBytes).toString() : null;
     Display display = getDisplay ();
-    FATTRS hFont = display.matchFont (fontNameSize); 
+    FATTRS hFont = display.matchFont (fontNameSize);
     return Font.pm_new (display, hFont);
 }
@@ -1039 +1039 @@
             hwnd, OS.PP_FONTNAMESIZE, 0, null, fontBytes.length, fontBytes, 0);
         String fontNameSize = len >= 0 ? new PSZ (fontBytes).toString() : null;
-        data.hFont = display.matchFont (fontNameSize); 
+        data.hFont = display.matchFont (fontNameSize);
         data.hwnd = hwnd;
     }
@@ -1208 +1208 @@
     int bits = OS.WinQueryWindowULong (handle, OS.QWL_STYLE);
     if ((bits & OS.WS_TABSTOP) != 0) return false;
-    
+
     int code = OS.WinSendMsg (handle, OS.WM_QUERYDLGCODE, 0, 0);
     if ((code & OS.DLGC_STATIC) != 0) return false;
@@ -1479 +1479 @@
 //    }
     toolTipText = null;
-//@@TODO(dmik)
-//    if (menu != null && !menu.isDisposed ()) {
-//            menu.dispose ();
-//    }
-//    menu = null;
+
+    if (menu != null && !menu.isDisposed ()) {
+            menu.dispose ();
+    }
+    menu = null;
     deregister ();
     unsubclass ();
@@ -1720 +1720 @@
 boolean sendKeyEvent (int type, int msg, int mp1, int mp2) {
     Event event = new Event ();
-    
+
     switch (msg) {
         case OS.WM_CHAR: {
@@ -1726 +1726 @@
             short usch = OS.SHORT1FROMMP (mp2);
             short usvk = OS.SHORT2FROMMP (mp2);
-            
+
             /* Ignore repeating modifier keys by testing key prev. down state */
             if (
@@ -1736 +1736 @@
                 if ((fsflags & OS.KC_PREVDOWN) != 0) return true;
             }
-//@@TODO (dmik): getting a character for DBCS charsets below will not work...            
-            /* Use the character encoding for the default locale */                
+//@@TODO (dmik): getting a character for DBCS charsets below will not work...
+            /* Use the character encoding for the default locale */
             event.character = new String (new byte[] {(byte) usch}).charAt (0);
-            
+
             if ((fsflags & OS.KC_VIRTUALKEY) != 0) {
                 if (usvk == OS.VK_DELETE) {
-                    /* 
+                    /*
                      * A special case: map VK_DELETE to an ASCII char (127)
                      * instead of treating it as a virtual key.
@@ -1749 +1749 @@
                 } else {
                     event.keyCode = Display.translateKey (usvk);
-                    /* 
+                    /*
                      * Feature in OS/2. The character for cursor move, edit
                      * and some other virtual keys actually equals to
@@ -1766 +1766 @@
 
     if (!setInputState (event, type)) return true;
-    
+
     return sendKeyEvent (type, msg, mp1, mp2, event);
 }
@@ -2084 +2084 @@
     String fontName = display.composeFontNameSize (display.systemFont());
     byte[] fontBytes = new PSZ (fontName).getBytes();
-    OS.WinSetPresParam (handle, OS.PP_FONTNAMESIZE, fontBytes.length, fontBytes); 
+    OS.WinSetPresParam (handle, OS.PP_FONTNAMESIZE, fontBytes.length, fontBytes);
 }
 
@@ -2164 +2164 @@
     String fontName = display.composeFontNameSize (hFont);
     byte[] fontBytes = new PSZ (fontName).getBytes();
-    OS.WinSetPresParam (handle, OS.PP_FONTNAMESIZE, fontBytes.length, fontBytes); 
+    OS.WinSetPresParam (handle, OS.PP_FONTNAMESIZE, fontBytes.length, fontBytes);
 }
 
@@ -2353 +2353 @@
     //  this won't be necessary when we will draw these types of buttons
     //  ourselves.
-    if (index == OS.PP_BACKGROUNDCOLORINDEX) 
+    if (index == OS.PP_BACKGROUNDCOLORINDEX)
         OS.WinSetPresParam (handle, OS.PP_BACKGROUNDCOLOR, 4,
             new int[] {OS.WinQuerySysColor (OS.HWND_DESKTOP, value [0], 0)});
-    
+
     index = index == OS.PP_BACKGROUNDCOLORINDEX ?
         OS.PP_DISABLEDBACKGROUNDCOLORINDEX : OS.PP_DISABLEDBACKGROUNDCOLOR;
@@ -2586 +2586 @@
 //    POINT pt = new POINT ();
 //    pt.x = point.x;  pt.y = point.y;
+//    WinMapWindowPoints
 //    OS.ScreenToClient (handle, pt);
 //    return new Point (pt.x, pt.y);
@@ -2643 +2644 @@
     if (shell.isVisible () && shell.isEnabled ()) {
         short usch = OS.SHORT1FROMMP (qmsg.mp2);
-        /* Use the character encoding for the default locale */                
+        /* Use the character encoding for the default locale */
         char ch = new String (new byte[] {(byte) usch}).charAt (0);
         return ch != 0 && shell.translateMnemonic (ch);
@@ -2656 +2657 @@
     int detail = SWT.TRAVERSE_NONE;
     boolean doit = true, all = false;
-    int keyCode = 0; 
+    int keyCode = 0;
     char character = 0;
     int code = OS.WinSendMsg (hwnd, OS.WM_QUERYDLGCODE, 0, 0);
@@ -2684 +2685 @@
             */
             character = '\t';
-            boolean next = (usvk == OS.VK_TAB) && ((fsflags & OS.KC_SHIFT) == 0); 
+            boolean next = (usvk == OS.VK_TAB) && ((fsflags & OS.KC_SHIFT) == 0);
             if ((code & OS.DLGC_MLE) != 0) {
                   if (next && (fsflags & OS.KC_CTRL) == 0)
@@ -2946 +2947 @@
         case OS.WM_CALCVALIDRECTS: result = WM_CALCVALIDRECTS (mp1, mp2); break;
         case OS.WM_CHAR: result = WM_CHAR (mp1, mp2); break;
-//@@TODO (dmik): later        
+//@@TODO (dmik): later
 //        case OS.WM_CLEAR: result = WM_CLEAR (wParam, lParam); break;
         case OS.WM_CLOSE: result = WM_CLOSE (mp1, mp2); break;
@@ -2953 +2954 @@
         case OS.WM_CONTEXTMENU: result = WM_CONTEXTMENU (mp1, mp2); break;
         case OS.WM_CONTROL: result = WM_CONTROL (mp1, mp2); break;
-//@@TODO (dmik): later        
+//@@TODO (dmik): later
 //        case OS.WM_CTLCOLORBTN:
 //        case OS.WM_CTLCOLORDLG:
@@ -3006 +3007 @@
 //        case OS.WM_SETCURSOR: result = WM_SETCURSOR (wParam, lParam); break;
         case OS.WM_SETFOCUS: result = WM_SETFOCUS (mp1, mp2); break;
-//@@TODO (dmik): later        
+//@@TODO (dmik): later
 //        case OS.WM_SETFONT: result = WM_SETFONT (wParam, lParam); break;
 //        case OS.WM_SETTINGCHANGE: result = WM_SETTINGCHANGE (wParam, lParam); break;
@@ -3012 +3013 @@
 //        case OS.WM_SHOWWINDOW: result = WM_SHOWWINDOW (wParam, lParam); break;
         case OS.WM_SIZE: result = WM_SIZE (mp1, mp2); break;
-//@@TODO (dmik): later        
+//@@TODO (dmik): later
 //        case OS.WM_SYSCHAR: result = WM_SYSCHAR (wParam, lParam); break;
 //        case OS.WM_SYSCOLORCHANGE: result = WM_SYSCOLORCHANGE (wParam, lParam); break;
@@ -3040 +3041 @@
 MRESULT WM_CHAR (int mp1, int mp2) {
     boolean keyUp = (OS.SHORT1FROMMP (mp1) & OS.KC_KEYUP) != 0;
-//@@TODO (dmik): debug, remove    
+//@@TODO (dmik): debug, remove
 //System.out.println("WM_CHAR ("+this+"): vk="+OS.SHORT2FROMMP (mp2)+" keyup="+keyUp);
     sendKeyEvent (keyUp ? SWT.KeyUp : SWT.KeyDown, OS.WM_CHAR, mp1, mp2);
@@ -3101 +3102 @@
       * have been destroyed but not removed from the control.
       */
-    //@@TODO(lpino) First check if this validation applies to OS/2 implementation and then validate using the coordinates of the mouse 
+    //@@TODO(lpino) First check if this validation applies to OS/2 implementation and then validate using the coordinates of the mouse
 //      if (mp2 != handle) return null;
       short flOptions = OS.PU_HCONSTRAIN | OS.PU_VCONSTRAIN | OS.PU_KEYBOARD | OS.PU_MOUSEBUTTON1;
@@ -3161 +3162 @@
         if (item == null) return null;
         return item.wmDrawChild (mp1, mp2);
-    }    
+    }
 //        System.out.println("Control:WM_DRAWITEM - HANDLE ATOM TABLE = " + Integer.toHexString(OS.WinFindAtom(OS.WinQuerySystemAtomTable(), PSZ.getAtom (OS.WC_MENU))));
       return null;
@@ -3672 +3673 @@
     int hrgn = OS.GpiCreateRegion (hps, 0, null);
     OS.WinQueryUpdateRegion (handle, hrgn);
-    
+
     callWindowProc (OS.WM_PAINT, mp1, mp2);
 
@@ -3690 +3691 @@
     data.hps = hps;
     GC gc = GC.pm_new (this, data);
-    
+
     /* Send the paint event */
     Event event = new Event ();
@@ -3783 +3784 @@
     callWindowProc (OS.WM_SETFOCUS, mp1, mp2);
     Shell shell = getShell ();
-    
+
     boolean gotFocus = OS.SHORT1FROMMP (mp2) > 0;
-    
+
     /*
     * It is possible (but unlikely), that application
@@ -3797 +3798 @@
         sendEvent (SWT.FocusOut);
     // widget could be disposed at this point
-    
+
     /*
     * It is possible that the shell may be
@@ -3815 +3816 @@
         }
     }
-    
+
     return MRESULT.ZERO;
 }
@@ -4069 +4070 @@
 }
 
-//@@TODO (dmik): 
+//@@TODO (dmik):
 //LRESULT wmMeasureChild (int wParam, int lParam) {
 //      return null;