Changeset 118

Timestamp:

Jun 26, 2008, 6:02:28 PM (17 years ago)

Author:

lpino

Message:

(MenuItem.java) - Partially implemented the WM_DRAWITEM and WM_MEASUREITEM messages

File:

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

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

@@ -630 +630 @@
         int rc = OS.WinSendMsg (hMenu, OS.MM_INSERTITEM,  info, buffer);
 //        boolean success = OS.WinSendMsg (hMenu, OS.MM_SETITEM,  OS.MPFROM2SHORT ((short)0, (short)OS.TRUE), info);
-        System.out.println("RC = " + rc);
         if(rc == OS.MIT_ERROR || rc == OS.MIT_MEMERROR)
             error (SWT.ERROR_CANNOT_SET_MENU);
@@ -679 +678 @@
         if ((style & SWT.SEPARATOR) != 0) return OS.MIS_SEPARATOR;
         if ((style & SWT.CASCADE) != 0) return OS.MIS_SUBMENU;
-        return OS.MIS_TEXT | OS.MIS_OWNERDRAW;
+        return OS.MIS_TEXT;
 }
 
@@ -696 +695 @@
         return null;
 }
-
-//LRESULT wmDrawChild (int wParam, int lParam) {
+//@@TODO(lpino) Finish the implementation of owner draw menu items
+MRESULT wmDrawChild (int mp1, int mp2) {
+        System.out.println("MenuItem:wmDrawChild");
+        OWNERITEM struct = new OWNERITEM();
+        OS.objcpy(struct, mp2);
 //      DRAWITEMSTRUCT struct = new DRAWITEMSTRUCT ();
 //      OS.MoveMemory (struct, lParam, DRAWITEMSTRUCT.sizeof);
@@ -722 +724 @@
 //              }
 //      }
-//      return null;
-//}
-
+        return null;
+}
+//@@TODO(lpino) Finish the implementation of owner draw menu items
 MRESULT wmMeasureChild (int mp1, int mp2) {
     System.out.println("MenuItem:wmMeasureChild");