Changeset 172 for trunk/src

Timestamp:

Jul 31, 2009, 1:44:01 AM (16 years ago)

Author:

lpino

Message:

• Fix initial display of the notebook

File:

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

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

@@ -12 +12 @@
  * http://www.eclipse.org/legal/cpl-v10.html
  */
- 
+
 import org.eclipse.swt.internal.*;
 import org.eclipse.swt.internal.pm.*;
@@ -50 +50 @@
         static final PSZ TabFolderClass = PSZ.getAtom (OS.WC_NOTEBOOK);
         static {
-                
+
                 /*
                 * Feature in Windows.  The tab control window class
@@ -87 +87 @@
  * The style value is either one of the style constants defined in
  * class <code>SWT</code> which is applicable to instances of this
- * class, or must be built by <em>bitwise OR</em>'ing together 
+ * class, or must be built by <em>bitwise OR</em>'ing together
  * (that is, using the <code>int</code> "|" operator) two or more
  * of those <code>SWT</code> style constants. The class description
@@ -244 +244 @@
         itemsID[index] = pageID;
         items [index] = item;
-        
+
         /*
         * Send a selection event when the item that is added becomes
@@ -314 +314 @@
             beginDeferWindowPos (parent, count);
         }
-        
+
         RECTL rect = new RECTL ();
-        
+
         SWP swp = new SWP ();
         OS.WinQueryWindowPos (handle, swp);
-                
+
         rect.yBottom = rect.xLeft = 0;
         rect.xRight = swp.cx;
@@ -325 +325 @@
 
         OS.WinSendMsg(handle, OS.BKM_CALCPAGERECT, rect, true);
-        
+
         int width = rect.xRight - rect.xLeft;
         int height = rect.yTop - rect.yBottom;
         int y = swp.cy-height;
-        
+
 //        System.out.println("XLEFT = " + rect.xLeft);
 //        System.out.println("YTOP = " + rect.yTop);
@@ -380 +380 @@
 /**
  * Returns an array of <code>TabItem</code>s which are the items
- * in the receiver. 
+ * in the receiver.
  * <p>
  * Note: This is not the actual structure used by the receiver
  * to maintain its list of items, so modifying the array will
- * not affect the receiver. 
+ * not affect the receiver.
  * </p>
  *
@@ -409 +409 @@
  * Note: This is not the actual structure used by the receiver
  * to maintain its selection, so modifying the array will
- * not affect the receiver. 
+ * not affect the receiver.
  * </p>
  * @return an array representing the selection
@@ -461 +461 @@
 /**
  * Searches the receiver's list starting at the first item
- * (index 0) until an item is found that is equal to the 
+ * (index 0) until an item is found that is equal to the
  * argument, and returns the index of that item. If no item
  * is found, returns -1.
@@ -491 +491 @@
                 if (item != null) {
                         char ch = findMnemonic (item.getText ());
-                        if (Character.toUpperCase (key) == Character.toUpperCase (ch)) {                
+                        if (Character.toUpperCase (key) == Character.toUpperCase (ch)) {
                                 if (setFocus ()) {
                                         setSelection (i, true);
@@ -507 +507 @@
                 if (item != null) {
                         char ch = findMnemonic (item.getText ());
-                        if (Character.toUpperCase (key) == Character.toUpperCase (ch)) {                
+                        if (Character.toUpperCase (key) == Character.toUpperCase (ch)) {
                                 return true;
                         }
@@ -554 +554 @@
         if (eventTable == null) return;
         eventTable.unhook (SWT.Selection, listener);
-        eventTable.unhook (SWT.DefaultSelection,listener);      
+        eventTable.unhook (SWT.DefaultSelection,listener);
 }
 
@@ -583 +583 @@
 
 /**
- * Selects the item at the given zero-relative index in the receiver. 
+ * Selects the item at the given zero-relative index in the receiver.
  * If the item at the index was already selected, it remains selected.
  * The current selected is first cleared, then the new items are
@@ -675 +675 @@
 
 int widgetStyle () {
-        int bits = super.widgetStyle () | OS.WS_VISIBLE | OS.WS_CLIPCHILDREN | OS.BKS_TABBEDDIALOG | OS.BKS_MAJORTABTOP | OS.WS_CLIPSIBLINGS;   
+        int bits = super.widgetStyle () | OS.WS_VISIBLE | OS.WS_CLIPCHILDREN | OS.BKS_TABBEDDIALOG | OS.BKS_MAJORTABTOP | OS.WS_CLIPSIBLINGS;
         return bits;
 }
@@ -744 +744 @@
 //      * to display the tool tip.  The fix is to call the
 //      * default window proc that returns HTCLIENT when
-//      * the mouse is in the client area.      
+//      * the mouse is in the client area.
 //      */
 //      int hittest = OS.DefWindowProc (handle, OS.WM_NCHITTEST, wParam, lParam);
@@ -758 +758 @@
 //      * Windows message by returning the result of the
 //      * WM_SIZE message.
-//      */
-//      if (isDisposed ()) return result;
-//      int index = OS.SendMessage (handle, OS.TCM_GETCURSEL, 0, 0);
-//      if (index != -1) {
-//              TabItem item = items [index];
-//              Control control = item.control;
-//              if (control != null && !control.isDisposed ()) {
-//                      control.setBounds (getClientArea ());
-//              }
-//      }
+        //      */
+        if (isDisposed ()) return result;
+        int pageID = OS.WinSendMsg (handle, OS.BKM_QUERYPAGEID, 0, OS.MPFROM2SHORT((short)OS.BKA_TOP,(short)OS.BKA_MAJOR));
+        int index = getTabIndex(pageID);
+        if (index != -1) {
+                TabItem item = items [index];
+                Control control = item.control;
+                if (control != null && !control.isDisposed ()) {
+                        control.setBounds (getClientArea ());
+                }
+        }
         return result;
 }
@@ -818 +819 @@
         int code = mp1 >> 16;
         switch (code) {
-                case OS.BKN_PAGESELECTED:                    
+                case OS.BKN_PAGESELECTED:
                 case OS.BKN_PAGESELECTEDPENDING:
                         TabItem item = null;
@@ -842 +843 @@
 //                System.out.println("resize");
 //                break;
-         //     if (isDisposed ()) return result;
-        //      int index = OS.SendMessage (handle, OS.TCM_GETCURSEL, 0, 0);
-        //      if (index != -1) {
-        //              TabItem item = items [index];
-        //              Control control = item.control;
-        //              if (control != null && !control.isDisposed ()) {
-        //                      control.setBounds (getClientArea ());
-        //              }
-        //      }
 
         }