Changeset 166 for trunk/src

Timestamp:

Jul 10, 2009, 11:37:28 PM (16 years ago)

Author:

lpino

Message:

• Fix a lot of bugs

File:

• trunk/src/plugins/org.eclipse.swt/Eclipse SWT/pm/org/eclipse/swt/widgets/TabItem.java (modified) (1 diff)

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

@@ -239 +239 @@
 //}
 
-//public void setText (String string) {
-//      checkWidget();
-//      if (string == null) error (SWT.ERROR_NULL_ARGUMENT);
-//      int index = parent.indexOf (this);
-//      if (index == -1) return;
-//      super.setText (string);
-//      /*
-//      * Bug in Windows.  In version 6.00 of COMCTL32.DLL, tab
-//      * items with an image and a label that includes '&' cause
-//      * the tab to draw incorrectly (even when doubled '&&').
-//      * The image  overlaps the label.  The fix is to remove
-//      * all '&' characters from the string. 
-//      */
-//      if (COMCTL32_MAJOR >= 6 && image != null) {
-//              if (text.indexOf ('&') != -1) {
-//                      int length = string.length ();
-//                      char[] text = new char [length];
-//                      string.getChars ( 0, length, text, 0);
-//                      int i = 0, j = 0;
-//                      for (i=0; i<length; i++) {
-//                              if (text[i] != '&') text [j++] = text [i];
-//                      }
-//                      if (j < i) string = new String (text, 0, j);
-//              }
-//      }
-//      int hwnd = parent.handle;
-//      int hHeap = OS.GetProcessHeap ();
-//      TCHAR buffer = new TCHAR (parent.getCodePage (), string, true);
-//      int byteCount = buffer.length () * TCHAR.sizeof;
-//      int pszText = OS.HeapAlloc (hHeap, OS.HEAP_ZERO_MEMORY, byteCount);
-//      OS.MoveMemory (pszText, buffer, byteCount); 
-//      TCITEM tcItem = new TCITEM ();
-//      tcItem.mask = OS.TCIF_TEXT;
-//      tcItem.pszText = pszText;
-//      int result = OS.SendMessage (hwnd, OS.TCM_SETITEM, index, tcItem);
-//      OS.HeapFree (hHeap, 0, pszText);
-//}
+public void setText (String string) {
+        checkWidget();
+        if (string == null) error (SWT.ERROR_NULL_ARGUMENT);
+        int index = parent.indexOf (this);
+        if (index == -1) return;
+        super.setText (string);
+        int hwnd = parent.handle;
+         PSZ tabText = new PSZ(string);
+         OS.WinSendMsg (hwnd, OS.BKM_SETTABTEXT, this.parent.itemsID[index], tabText);
+         parent.setTabDimensions(tabText);
+}
 
 /**