Changeset 150

Timestamp:

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

Author:

lpino

Message:

• Fix the MPFROM2SHORT macro..... again

Location:

trunk/src/plugins/org.eclipse.swt

Files:

• Eclipse SWT PI/pm/org/eclipse/swt/internal/pm/OS.java (modified) (1 diff)
• Eclipse SWT/pm/org/eclipse/swt/widgets/Scale.java (modified) (2 diffs)

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);

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

@@ -100 +100 @@
     OS.WinSetWindowUShort (handle, OS.QWS_ID, (short)(handle & 0xFFFF));
 
-    OS.WinSendMsg(handle, OS.SLM_SETTICKSIZE, OS.MPFROM2SHORT((short)OS.SMA_SETALLTICKS, (short)2), 0);
+    OS.WinSendMsg(handle, OS.SLM_SETTICKSIZE, OS.MPFROM2SHORT((short)OS.SMA_SETALLTICKS, (short)6), 0);
+    System.out.println ("Scale:createHandle " + Integer.toHexString (OS.MPFROM2SHORT((short)OS.SMA_SETALLTICKS, (short)6)));
     super.register ();
     super.subclass ();
@@ -168 +169 @@
     System.out.println ("Scale:createHandle");
         super.createHandle ();
-        OS.WinSendMsg(handle, OS.SLM_SETTICKSIZE, OS.MPFROM2SHORT((short)OS.SMA_SETALLTICKS, (short)10), 0);       
+//        OS.WinSendMsg(handle, OS.SLM_SETTICKSIZE, OS.MPFROM2SHORT((short)OS.SMA_SETALLTICKS, (short)10), 0);       
 //      OS.SendMessage (handle, OS.TBM_SETRANGEMAX, 0, 100);
 //      OS.SendMessage (handle, OS.TBM_SETPAGESIZE, 0, 10);