Changeset 194 for trunk/src

Timestamp:

Oct 10, 2009, 6:58:06 PM (16 years ago)

Author:

lpino

Message:

• Small changes

File:

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

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

@@ -316 +316 @@
                 }
                 pacctAccelTable.cAccel = (short)nAccel;
-                //@@TEMP(lpino): in the future we should get this value from somewhere
+                //@@TEMP(lpino): in the future we should get this value from somewhere(WinQueryCp)
                 pacctAccelTable.codepage = (short)437;
                 pacctAccelTable.aaccel = new ACCEL[nAccel];
@@ -322 +322 @@
                     pacctAccelTable.aaccel[i] = accelList[i];
         }
-        hAccel = OS.WinCreateAccelTable(getDisplay().hab, pacctAccelTable);
-        System.out.println("Decorations:createAcceleratorTable - Handle of accelerator table = " + hAccel);
+        System.out.println("Decorations:createAcceleratorTable ");
+       if (nAccel != 0) hAccel = OS.WinCreateAccelTable(getDisplay().hab, pacctAccelTable);
+       System.out.println("Decorations:createAcceleratorTable - Handle of accelerator table = " + hAccel);
         if(!OS.WinSetAccelTable(getDisplay().hab, hAccel, frameHandle)){
             System.out.println("Decorations:createAcceleratorTable - Thread did not attach accelerator table to the frame");
@@ -547 +548 @@
 // * </ul>
 // */
-//public Image getImage () {
-//      checkWidget ();
-//      return image;
-//}
+public Image getImage () {
+        checkWidget ();
+        return image;
+}
 
 /**
@@ -1370 +1371 @@
         case OS.WM_WINDOWPOSCHANGED: result = FRAME_WM_WINDOWPOSCHANGED (mp1, mp2); break;
         case OS.WM_CHAR: result = FRAME_WM_CHAR (mp1, mp2); break;
-    }
+        case OS.WM_ERASEBACKGROUND: result = FRAME_WM_ERASEBACKGROUND (mp1, mp2); break;
+        case OS.WM_INITMENU: result = FRAME_WM_INITMENU (mp1, mp2); break;
+   }
     
     if (result != null) return result.value;
@@ -1501 +1504 @@
 }
 
-//MRESULT WM_ERASEBACKGROUND (int mp1, int mp2) {
+MRESULT FRAME_WM_ERASEBACKGROUND (int mp1, int mp2) {
+//@@TODO (lpino): Remove debug
 //    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;
-//}
-
+    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 FRAME_WM_INITMENU (int mp1, int mp2) {
+        return MRESULT.FALSE;
+}
 MRESULT WM_SETFOCUS (int mp1, int mp2) {
     MRESULT result  = super.WM_SETFOCUS (mp1, mp2);