Changeset 115 for trunk/src

Timestamp:

Jun 25, 2008, 10:32:44 PM (17 years ago)

Author:

lpino

Message:

(Control.java) - Added WM_DRAWITEM and WM_MEASUREITEM methods (only debug). This is the first step toward implementing images (icons) on the menu items

File:

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

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

@@ -2963 +2963 @@
 //        case OS.WM_CUT: result = WM_CUT (wParam, lParam); break;
 //        case OS.WM_DESTROY: result = WM_DESTROY (wParam, lParam); break;
-//        case OS.WM_DRAWITEM: result = WM_DRAWITEM (wParam, lParam); break;
+        case OS.WM_DRAWITEM: result = WM_DRAWITEM (mp1, mp2); break;
 //        case OS.WM_ENDSESSION: result = WM_ENDSESSION (wParam, lParam); break;
         case OS.WM_ERASEBACKGROUND: result = WM_ERASEBACKGROUND (mp1, mp2); break;
@@ -3149 +3149 @@
 //      return control.wmDrawChild (wParam, lParam);
 //}
-//
-//LRESULT WM_ENDSESSION (int wParam, int lParam) {
-//      return null;
-//}
+
+MRESULT WM_DRAWITEM (int mp1, int mp2) {
+    System.out.println("Control:WM_DRAWITEM");
+    OWNERITEM struct = new OWNERITEM();
+//CHAR achClass[256]
+//
+//WinQueryClassName(hwnd,sizeof(achClass),achClass);
+//if(WinFindAtom(WinQuerySystemAtomTable(),achClass)
+//   == LOUSHORT(WC_SCROLLBAR))
+//   /* this is a scroll bar */;
+//else
+//   /* this is not a scroll bar */;    if(type == OS.WC_MENU)
+//        System.out.println("IS MENU");
+    OS.objcpy(struct, mp2);
+      return null;
+}
 
 MRESULT WM_ERASEBACKGROUND (int mp1, int mp2) {
@@ -3158 +3170 @@
 }
 
-MRESULT WM_MEASUREITEM (int mp1, int mp2) {
-    return null;
-}
+//MRESULT WM_MEASUREITEM (int mp1, int mp2) {
+//    return null;
+//}
 
 MRESULT WM_QUERYDLGCODE (int mp1, int mp2) {
@@ -3427 +3439 @@
 //      return new LRESULT (result);
 //}
-//
-//LRESULT WM_MEASUREITEM (int wParam, int lParam) {
+
+MRESULT WM_MEASUREITEM (int mp1, int mp2) {
+    System.out.println("Control:WM_MEASUREITEM");
 //      MEASUREITEMSTRUCT struct = new MEASUREITEMSTRUCT ();
 //      OS.MoveMemory (struct, lParam, MEASUREITEMSTRUCT.sizeof);
@@ -3435 +3448 @@
 //              MenuItem item = shell.findMenuItem (struct.itemID);
 //              if (item == null) return null;
-//              return item.wmMeasureChild (wParam, lParam);
+//              return item.wmMeasureChild (mp1, mp2);
 //      }
 //      int hwnd = OS.GetDlgItem (handle, struct.CtlID);
@@ -3441 +3454 @@
 //      if (control == null) return null;
 //      return control.wmMeasureChild (wParam, lParam);
-//}
+    return null;
+}
 //
 //LRESULT WM_MENUCHAR (int wParam, int lParam) {