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

Timestamp:

Jun 13, 2009, 5:47:42 PM (16 years ago)

Author:

lpino

Message:

• Fix the MPFROM2SHORT macro..... again

File:

• trunk/src/plugins/org.eclipse.swt/Eclipse SWT PI/pm/org/eclipse/swt/internal/pm/OS.java (modified) (1 diff)

trunk/src/plugins/org.eclipse.swt/Eclipse SWT PI/pm/org/eclipse/swt/internal/pm/OS.java

@@ -2181 +2181 @@
 public static final short SHORT1FROMMP (int mp) { return (short)mp; }    
 public static final short SHORT2FROMMP (int mp) { return (short)(mp >> 16); }
-public static final int MPFROM2SHORT(short s1, short s2){ return (((int)(s1)) | ((int)(s2)) << 16);}
-//public static final int MPFROM2SHORT(short s1, short s2){ return ((s1 << 16) + s2);}
+//public static final int MPFROM2SHORT(short s1, short s2){ return (((int)((short)s1)) | ((int)((short)s2)) << 16);}
+public static final int MPFROM2SHORT(short s1, short s2){ return ((s2 << 16) + s1);}
 //public static final int MAKELONG (short l, short h) {
 //    return ((int)l) | (((int)h) << 16);