Changeset 224 for trunk/src

Timestamp:

Nov 9, 2009, 3:56:17 PM (16 years ago)

Author:

lpino

Message:

• Fix getText method. Was returning previous selected item

File:

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

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

@@ -430 +430 @@
         if (length != OS.LIT_ERROR) {
                 PSZ buffer = new PSZ(length+1);
-                int result = OS.WinSendMsg (handle, OS.LM_QUERYITEMTEXT, OS.MPFROM2SHORT((short)length,(short)index), buffer);
+                int result = OS.WinSendMsg (handle, OS.LM_QUERYITEMTEXT, OS.MPFROM2SHORT((short)index,(short)length), buffer);
                 if (result != 0) return buffer.toString ();
         }
@@ -579 +579 @@
 public String getText () {
         checkWidget ();
-        int length = OS.WinQueryWindowTextLength (handle);
+        int index = OS.WinSendMsg (handle, OS.LM_QUERYSELECTION, (short)OS.LIT_CURSOR, 0);
+        int length = OS.WinSendMsg (handle, OS.LM_QUERYITEMTEXTLENGTH, (short)index, 0);
         if (length == 0) return "";
         PSZ buffer = new PSZ(length);
-        OS.WinQueryWindowText (handle, length + 1, buffer);
+        OS.WinSendMsg (handle, OS.LM_QUERYITEMTEXT, OS.MPFROM2SHORT((short)index,(short)length), buffer);
         return buffer.toString ();
 }
@@ -709 +710 @@
         }
 
-//      /* Use LM_SEARCHSTRING to search for the item */
+        /* Use LM_SEARCHSTRING to search for the item */
         int count = OS.WinSendMsg (handle, OS.LM_QUERYITEMCOUNT, 0, 0);
         if (!((0 <= start) && (start < count))) return -1;
-        int index = 0;
+        int index = start - 1;
         PSZ buffer = new PSZ(string);
-        index = OS.WinSendMsg (handle, OS.LM_SEARCHSTRING, OS.MPFROM2SHORT((short)OS.LSS_CASESENSITIVE,(short)(start)), buffer);
+        index = OS.WinSendMsg (handle, OS.LM_SEARCHSTRING, OS.MPFROM2SHORT((short)OS.LSS_CASESENSITIVE,(short)(index)), buffer);
         if (index == OS.LIT_ERROR || index < start) return -1;
         return index;
@@ -811 +812 @@
                         if (length == OS.LIT_ERROR) break;
                         buffer = new PSZ (length + 1);
-                        int result = OS.WinSendMsg (handle, OS.LM_QUERYITEMTEXT, OS.MPFROM2SHORT((short)length,(short)start), buffer);
+                        int result = OS.WinSendMsg (handle, OS.LM_QUERYITEMTEXT, OS.MPFROM2SHORT((short)start,(short)length), buffer);
                         if (result <= 0) break;
                 }
@@ -939 +940 @@
         checkWidget ();
         if (index == -1) return;
-        int rc = OS.WinSendMsg (handle, OS.LM_SELECTITEM, (short)index, OS.TRUE);
-        if(rc != OS.FALSE)
-            sendEvent (SWT.Modify);
+        int count = OS.WinSendMsg (handle, OS.LM_QUERYITEMCOUNT, 0, 0);
+        if(0 <= index && index < count){
+                int selection =  OS.WinSendMsg (handle, OS.LM_QUERYSELECTION, (short)OS.LIT_CURSOR, 0);
+                int rc = OS.WinSendMsg (handle, OS.LM_SELECTITEM, (short)index, OS.TRUE);
+                if(rc != OS.FALSE && rc != selection)
+                    sendEvent (SWT.Modify);
+        }
 }