Changeset 211 for trunk/src

Timestamp:

Oct 23, 2009, 8:48:07 PM (16 years ago)

Author:

lpino

Message:

• Eliminate WM_ERASEBACKGROUND processing from this point
• BeginPaint in Win32 includes a flag that indicates when to erase a background on a particular window. That feature doesn't exist in PM

File:

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

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

@@ -510 +510 @@
 //@@TODO(dmik): think of it, not sure that it is processed in the right way here...
 //  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) {
-        return MRESULT.FALSE;
-//        return super.WM_ERASEBACKGROUND (mp1, mp2);
-    }
-    RECTL rcl = new RECTL();
-    OS.objcpy (rcl, mp2);
-    drawBackground (mp1, rcl);
-    return MRESULT.TRUE;
-}
+ // 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) {
+        // // System.out.println("Composite::WM_ERASEBACKGROUND -> HANDLE = " + Integer.toHexString(handle));
+         // return MRESULT.FALSE;
+ // //        return super.WM_ERASEBACKGROUND (mp1, mp2);
+    // }
+    // System.out.println("Composite::WM_ERASEBACKGROUND -> HANDLE = " + Integer.toHexString(handle));
+    // RECTL rcl = new RECTL();
+    // OS.objcpy (rcl, mp2);
+    // drawBackground (mp1, rcl);
+    // return MRESULT.FALSE;
+// }
 
 MRESULT WM_QUERYDLGCODE (int mp1, int mp2) {
@@ -616 +618 @@
 
 MRESULT WM_PAINT (int mp1, int mp2) {
+//    System.out.println("Composite::WM_PAINT -> HANDLE  =  " + Integer.toHexString(handle));
     if ((state & CANVAS) == 0) {
-                return super.WM_PAINT (mp1, mp2);
+            return super.WM_PAINT (mp1, mp2);
     }
 
@@ -805 +808 @@
 }
 
+MRESULT WM_ADJUSTWINDOWPOS (int mp1, int mp2) {
+        System.out.println("Composite::WM_ADJUSTWINDOWPOS -> HANDLE  =  " + Integer.toHexString(handle));
+        return null;
+}
+
 //LRESULT WM_SYSCOLORCHANGE (int wParam, int lParam) {
 //      Control [] children = _getChildren ();