Changeset 268

Timestamp:

May 7, 2011, 12:57:53 AM (14 years ago)

Author:

lpino

Message:

• Little changes

Location:

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

Files:

• Control.java (modified) (9 diffs)
• Decorations.java (modified) (2 diffs)
• TabFolder.java (modified) (1 diff)

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

@@ -92 +92 @@
     super (parent, style);
     this.parent = parent;
+//    System.out.println("Control::Control-> check 1");
     createWidget ();
+//    System.out.println("Control::Control-> check 2");
 }
 
@@ -471 +473 @@
 
 //@@TODO (dmik): debug code, remove when no more necessary
-/* System.out.println (
+/*   System.out.println (
     "Control.createHandle(): Window has been created:\n" +
     "    hwnd = " + Integer.toHexString (handle) + "\n" +
@@ -494 +496 @@
     setForegroundPixel (OS.CLR_DEFAULT);
     setBackgroundPixel (OS.CLR_DEFAULT);
+//    System.out.println("Control::createWidget-> check");
 }
 
@@ -1815 +1818 @@
     background = pixel;
     setPresBackground();
+
     /*
      *  OS/2 feature. Invalidate children also, because some of them
@@ -3137 +3141 @@
         return item.wmDrawChild (mp1, mp2);
     }
-//        System.out.println("Control:WM_DRAWITEM - HANDLE ATOM TABLE = " + Integer.toHexString(OS.WinFindAtom(OS.WinQuerySystemAtomTable(), PSZ.getAtom (OS.WC_MENU))));
-      return null;
+    if(buffer.toString().equalsIgnoreCase(PSZ.getAtom (OS.WC_SLIDER).toString())){
+      Control control = WidgetTable.get (mp1);
+//      System.out.println("Control:WM_DRAWITEM - MP1 = " + Integer.toHexString(mp1));
+      if (control == null) return null;
+      return control.wmDrawChild (mp1, mp2);
+    }
+     return null;
 }
 
@@ -3460 +3469 @@
 
 MRESULT WM_MEASUREITEM (int mp1, int mp2) {
-    System.out.println("Control:WM_MEASUREITEM -> sListBox" + mp1);
 //      MEASUREITEMSTRUCT struct = new MEASUREITEMSTRUCT ();
 //      OS.MoveMemory (struct, lParam, MEASUREITEMSTRUCT.sizeof);
@@ -3724 +3732 @@
 
 MRESULT WM_SETFOCUS (int mp1, int mp2) {
-//    System.out.println("Control::WM_SETFOCUS -> handle = " + Integer.toHexString(mp1));
-    // System.out.println("Control::WM_SETFOCUS -> mp2 = " + OS.SHORT1FROMMP (mp2));
     int code = callWindowProc (OS.WM_SETFOCUS, mp1, mp2);
     Shell shell = getShell ();
 
     boolean gotFocus = OS.SHORT1FROMMP (mp2) > 0;
-
     /*
     * It is possible (but unlikely), that application
@@ -3737 +3742 @@
     * the activate/deactivate events.
     */
-    if (gotFocus)
+     if (gotFocus)
         sendEvent (SWT.FocusIn);
     else
         sendEvent (SWT.FocusOut);
-    // widget could be disposed at this point
+// widget could be disposed at this point
 
     /*
@@ -3972 +3977 @@
 }
 
-/* MRESULT WM_FOCUSCHANGE (int mp1, int mp2) {
+MRESULT WM_FOCUSCHANGE (int mp1, int mp2) {
     callWindowProc (OS.WM_FOCUSCHANGE, mp1, mp2);
     return MRESULT.ZERO;
 }
- */
+
 //@@TODO(lpino): Consider the process in Menu controls and ListBoxes
 //MRESULT WM_ADJUSTWINDOWPOS (int mp1, int mp2) {

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

@@ -384 +384 @@
     if (frameHandle == 0) error (SWT.ERROR_NO_HANDLES);
 //@@TODO (dmik): debug code, remove when no more necessary 
-//System.out.println (
-//    "Decorations.createHandle(): WC_FRAME has been created:\n" +
-//    "    hwnd = " + Integer.toHexString (frameHandle) + "\n" +
-//    "    hwnd.parent = " + Integer.toHexString (hwndParent) + "\n" +
-//    "    hwnd.owner = " + Integer.toHexString (hwndOwner) + "\n" +
-//    "    class = " + windowFrameClass() + "\n" +
-//    "    style = " + Integer.toHexString (widgetFrameStyle())
-//);
+/* System.out.println (
+    "Decorations.createHandle(): WC_FRAME has been created:\n" +
+    "    hwnd = " + Integer.toHexString (frameHandle) + "\n" +
+    "    hwnd.parent = " + Integer.toHexString (hwndParent) + "\n" +
+    "    hwnd.owner = " + Integer.toHexString (hwndOwner) + "\n" +
+    "    class = " + windowFrameClass() + "\n" +
+    "    style = " + Integer.toHexString (widgetFrameStyle())
+);
+ */
     FRAMECDATA fcdata = new FRAMECDATA ();
     fcdata.flCreateFlags = widgetFrameFlags ();
@@ -414 +415 @@
     state |= CANVAS;
 //@@TODO (dmik): debug code, remove when no more necessary 
-//System.out.println (
-//    "Decorations.createHandle(): FID_CLIENT window has been created:\n" +
-//    "    hwnd = " + Integer.toHexString (handle) + "\n" +
-//    "    hwnd.parent = hwnd.owner = " + Integer.toHexString (frameHandle) + "\n" +
-//    "    class = " + windowClass() + "\n" +
-//    "    style = " + Integer.toHexString (widgetStyle())
-//);
-//@@TODO(dmik): do something for MDI windows if needed    
+/* System.out.println (
+    "Decorations.createHandle(): FID_CLIENT window has been created:\n" +
+    "    hwnd = " + Integer.toHexString (handle) + "\n" +
+    "    hwnd.parent = hwnd.owner = " + Integer.toHexString (frameHandle) + "\n" +
+    "    class = " + windowClass() + "\n" +
+    "    style = " + Integer.toHexString (widgetStyle())
+);
+ *///@@TODO(dmik): do something for MDI windows if needed    
     if (parent == null) return;
     setParent ();

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

@@ -277 +277 @@
         if (index == count) return;
         int selectionIndex = itemsID[index];
-        if (OS.WinSendMsg (handle, OS.BKM_DELETEPAGE, selectionIndex, (short)OS.BKA_TAB) == 0) {
+        if (!OS.WinSendMsg (handle, OS.BKM_DELETEPAGE, selectionIndex, (short)OS.BKA_TAB)) {
                 error (SWT.ERROR_ITEM_NOT_REMOVED);
         }