Changeset 191 for trunk/src

Timestamp:

Sep 25, 2009, 3:25:38 PM (16 years ago)

Author:

lpino

Message:

• Little changes

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/Composite.java (modified) (11 diffs)
• Eclipse SWT/pm/org/eclipse/swt/widgets/Decorations.java (modified) (7 diffs)
• Eclipse SWT/pm/org/eclipse/swt/widgets/Group.java (modified) (2 diffs)
• Eclipse SWT/pm/org/eclipse/swt/widgets/TabItem.java (modified) (1 diff)

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

@@ -150 +150 @@
     public static final int WS_CLIPCHILDREN =   0x20000000;
     public static final int WS_CLIPSIBLINGS =   0x10000000;
-//    public static final int WS_PARENTCLIP =     0x08000000;
+    public static final int WS_PARENTCLIP =     0x08000000;
 //    public static final int WS_SAVEBITS =       0x04000000;
     public static final int WS_SYNCPAINT =      0x02000000;

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

@@ -308 +308 @@
         int count = getChildrenCount ();
         if (count == 0) return;
-//@@TODO(dmik): remove    
-//      if (count > 1 && hdwp == 0) {
-//              hdwp = OS.BeginDeferWindowPos (count);
-//      }
     if (count > 1 && pswp == 0) {
         beginDeferWindowPos (this, count);
         }
         layout.layout (this, changed);
-//@@TODO(dmik): remove
-//      int oldHdwp = hdwp;
-//      hdwp = 0;
-//      if (oldHdwp != 0) OS.EndDeferWindowPos (oldHdwp);
     if (pswp != 0) {
         endDeferWindowPos (this);
@@ -348 +340 @@
 
 void releaseWidget () {
-//@@TODO (dmik): remove    
-//      int oldHdwp = hdwp;
-//      hdwp = 0;
-//      if (oldHdwp != 0) OS.EndDeferWindowPos (oldHdwp);
     if (pswp != 0) {
         endDeferWindowPos (this);
@@ -505 +493 @@
 int widgetStyle () {
         /* Temporary code to force SWT.CLIP_SIBLINGS */
-        return super.widgetStyle (); // | OS.WS_CLIPCHILDREN;
+        return super.widgetStyle ();// | OS.WS_CLIPCHILDREN | OS.WS_CLIPSIBLINGS;
 }
 
@@ -513 +501 @@
                 if ((style & SWT.NO_REDRAW_RESIZE) == 0) {
                         if (hooks (SWT.Paint)) {
-                OS.WinInvalidateRect (handle, null, false);
+                            OS.WinInvalidateRect (handle, null, false);
                         }
                 }
@@ -523 +511 @@
 //  And may be better to move this code to Decorations class...
 MRESULT WM_ERASEBACKGROUND (int mp1, int mp2) {
+//@@TODO (lpino): Remove log
 //    System.out.println("Composite::WM_ERASEBACKGROUND -> HANDLE = " + Integer.toHexString(handle));
     if ((state & CANVAS) != 0) {
-        //@@TODO(lpino): This invalidation forces a whole window repaint to prevent clipping errors when window is partially obscure
-        //it has a negative impact on performance. As my understanding improves maybe this problem can be solved 
-        OS.WinInvalidateRect(handle, null, true);
-//        OS.WinUpdateWindow(handle);
-        return super.WM_ERASEBACKGROUND (mp1, mp2);
+        return MRESULT.FALSE;
+//        return super.WM_ERASEBACKGROUND (mp1, mp2);
     }
     RECTL rcl = new RECTL();
@@ -633 +619 @@
                 return super.WM_PAINT (mp1, mp2);
     }
+
     /*
         * This code is intentionally commented.  Don't exit
@@ -643 +630 @@
 //      if (!hooks (SWT.Paint)) return null;
     /* lazily obtain a long-term cached micro presentation space */
-//    System.out.println("Composite::WM_PAINT -> HANDLE  =  " + Integer.toHexString(handle));
+    
     GCData data = new GCData ();
     if (hps == 0) {
@@ -650 +637 @@
         data.doInit = true;
     }
+
 //      /* Get the damage */
         int [] rgnRects = null;
@@ -671 +659 @@
         }
 
-//      /* Set the clipping bits */
+        /* Set the clipping bits */
+//@@TODO (lpino): Remove log
+//    System.out.println("Composite::WM_PAINT -> HANDLE  =  " + Integer.toHexString(handle));
     int oldBits = 0;
     oldBits = OS.WinQueryWindowULong (handle, OS.QWL_STYLE);
@@ -677 +667 @@
     OS.WinSetWindowULong (handle, OS.QWL_STYLE, newBits);
 
-//      /* Create the paint GC */
+        /* Create the paint GC */
     data.rcl = new RECTL ();
     data.hps = hps;
@@ -711 +701 @@
                 rcl.xRight = rgnRects [(i << 2) + 2];
                 rcl.yTop = rgnRects [(i << 2) + 3];
-//     System.out.println("Control::drawBackground -> xLeft = " + rcl.xLeft);
-//     System.out.println("Control::drawBackground -> xRight = " + rcl.xRight);
-//     System.out.println("Control::drawBackground -> yBottom = " + rcl.yBottom);
-//     System.out.println("Control::drawBackground -> yTop = " + rcl.yTop);
                drawBackground (0, rcl);
                 event.x = rcl.xLeft;

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

@@ -94 +94 @@
 public class Decorations extends Canvas {
 //@@TODO(dmik)    
-//      Image image;
+        Image image;
         Menu menuBar;
         Menu [] menus;
@@ -262 +262 @@
         checkWidget ();
         RECTL rcl = new RECTL ();
-    rcl.xLeft = x; rcl.yBottom = y;
-     rcl.xRight = x + width; rcl.yTop = y + height;
+        rcl.xLeft = x; rcl.yBottom = y;
+        rcl.xRight = x + width; rcl.yTop = y + height;
      
      /* Get the size of the scroll bars */
-    if (horizontalBar != null) rcl.xRight += OS.WinQuerySysValue (OS.HWND_DESKTOP, OS.SV_CXVSCROLL);
-    if (verticalBar != null) rcl.yTop += OS.WinQuerySysValue (OS.HWND_DESKTOP, OS.SV_CYHSCROLL);
+    if (horizontalBar != null) rcl.yTop += OS.WinQuerySysValue (OS.HWND_DESKTOP, OS.SV_CYHSCROLL);
+    if (verticalBar != null) rcl.xRight += OS.WinQuerySysValue (OS.HWND_DESKTOP, OS.SV_CXVSCROLL);
     /* Get the height of the menu bar */
     //@@TEMP(lpino): I'm not sure if we need to calculate the height of the menu using SV_CYMENU'
 //      if (hasMenu) {
-//              RECT testRect = new RECT ();
-//              OS.SetRect (testRect, 0, 0, rect.right - rect.left, rect.bottom - rect.top);
+//              RECTL testRect = new RECTL ();
+//              OS.WinSetRect (testRect, 0, 0, rcl.xRight - rcl.xLeft, rcl.yTop - rcl.yBottom);
 //              OS.SendMessage (handle, OS.WM_NCCALCSIZE, 0, testRect);
 //              while ((testRect.bottom - testRect.top) < height) {
-//                      rect.top -= OS.GetSystemMetrics (OS.SM_CYMENU) - OS.GetSystemMetrics (OS.SM_CYBORDER);
+//                      rect.top -= OS.WinQuerySysValue (handleFrame, OS.SV_CYMENU) - OS.WinQuerySysValue (handleFrame, OS.SV_CYBORDER);
 //                      OS.SetRect(testRect, 0, 0, rect.right - rect.left, rect.bottom - rect.top);
 //                      OS.SendMessage (handle, OS.WM_NCCALCSIZE, 0, testRect);
@@ -396 +396 @@
     OS.WinSendMsg (frameHandle, OS.WM_UPDATEFRAME, fcdata.flCreateFlags, 0);
     /*
-     *  Create a cliend window.
+     *  Create a client window.
      */
     handle = OS.WinCreateWindow (
@@ -423 +423 @@
     if (parent == null) return;
     setParent ();
-//    setSystemMenu ();
+    setSystemMenu ();
 }
 
@@ -1026 +1026 @@
 }
 
-//@@TODO (dmik): later
 ///**
 // * Sets the receiver's menu bar to the argument, which
@@ -1281 +1280 @@
 
 int windowProc (int msg, int mp1, int mp2) {
-//@@TODO (dmik): remove
     switch (msg) {
-//@@TODO(dmik)
         case OS.WM_USER:
         case OS.WM_USER+1:
@@ -1504 +1501 @@
 }
 
+//MRESULT WM_ERASEBACKGROUND (int mp1, int mp2) {
+//    System.out.println("Decorations::WM_ERASEBACKGROUND -> HANDLE = " + Integer.toHexString(handle));
+//    if ((state & CANVAS) != 0) {
+//        return super.WM_ERASEBACKGROUND (mp1, mp2);
+//    }
+//    RECTL rcl = new RECTL();
+//    OS.objcpy (rcl, mp2);
+//    drawBackground (mp1, rcl);
+//    return MRESULT.FALSE;
+//}
+
 MRESULT WM_SETFOCUS (int mp1, int mp2) {
     MRESULT result  = super.WM_SETFOCUS (mp1, mp2);

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

@@ -294 +294 @@
 }
 
-//LRESULT WM_PRINTCLIENT (int wParam, int lParam) {
-//      LRESULT result = super.WM_PRINTCLIENT (wParam, lParam);
-//      if (result != null) return result;
-//      /*
-//      * Feature in Windows.  In version 6.00 of COMCTL32.DLL,
-//      * when WM_PRINTCLIENT is sent from a child BS_GROUP
-//      * control to a parent BS_GROUP, the parent BS_GROUP
-//      * clears the font from the HDC.  Normally, group boxes
-//      * in Windows do not have children so this behavior is
-//      * undefined.  When the parent of a BS_GROUP is not a
-//      * BS_GROUP, there is no problem.  The fix is to save
-//      * and restore the current font.
-//      */
-//      if (COMCTL32_MAJOR >= 6) {
-//              int hFont = OS.GetCurrentObject (wParam, OS.OBJ_FONT);
-//              int code = callWindowProc (OS.WM_PRINTCLIENT, wParam, lParam);
-//              OS.SelectObject (wParam, hFont);
-//              return new LRESULT (code);
-//      }
-//      return result;
+//MRESULT WM_ERASEBACKGROUND (int mp1, int mp2) {
+//    System.out.println("Group::WM_ERASEBACKGROUND -> HANDLE = " + Integer.toHexString(handle));
+////    if ((state & CANVAS) != 0) {
+////        //@@TODO(lpino): This invalidation forces a whole window repaint to prevent clipping errors when window is partially obscure
+////        //it has a negative impact on performance. As my understanding improves maybe this problem can be solved 
+//////        OS.WinInvalidateRect(handle, null, true);
+//////        OS.WinUpdateWindow(handle);
+//////        OS.WinFillRect(mp1, mp2, getBackgroundPixel ());
+////        return MRESULT.TRUE;
+//////        return super.WM_ERASEBACKGROUND (mp1, mp2);
+////    }
+////    RECTL rcl = new RECTL();
+////    OS.objcpy (rcl, mp2);
+////    drawBackground (mp1, rcl);
+//    return MRESULT.TRUE;
 //}
 
@@ -332 +327 @@
         return new MRESULT (code);
 }
-
-}
+//MRESULT WM_PAINT (int mp1, int mp2) {
+//    System.out.println("Group::WM_PAINT -> HANDLE  =  " + Integer.toHexString(handle));
+//    GCData data = new GCData ();
+//    if (hps == 0) {
+//        hps = internal_new_GC (data);
+//        if (hps == 0) SWT.error(SWT.ERROR_NO_HANDLES);
+//        data.doInit = true;
+//    }
+//    
+//    /* Create the paint GC */
+//    data.rcl = new RECTL ();
+//    data.hps = hps;
+// 
+//    drawBackground(hps);
+//    /* Dispose the paint GC */
+//    System.out.println("Group::WM_PAINT -> HPS = " + Integer.toHexString(hps));
+//    callWindowProc(OS.WM_PAINT, mp1, mp2);
+//    return MRESULT.ZERO;
+//}
+}

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

@@ -206 +206 @@
         this.control = control;
         int index = parent.indexOf (this);
-        OS.WinSendMsg (parent.handle, OS.BKM_SETPAGEWINDOWHWND, this.parent.itemsID[index], control.handle);        
+        OS.WinSendMsg (parent.handle, OS.BKM_SETPAGEWINDOWHWND, this.parent.itemsID[index], control.handle);
         if (index != parent.getSelectionIndex ()) {
                 if (newControl != null) newControl.setVisible (false);