Changeset 238 for trunk/src

Timestamp:

Dec 9, 2009, 1:22:19 PM (16 years ago)

Author:

lpino

Message:

• Misc changes

Location:

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

Files:

• Control.java (modified) (6 diffs)
• Shell.java (modified) (3 diffs)

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

@@ -471 +471 @@
 
 //@@TODO (dmik): debug code, remove when no more necessary
-//System.out.println (
-//    "Control.createHandle(): Window has been created:\n" +
-//    "    hwnd = " + Integer.toHexString (handle) + "\n" +
-//    "    hwnd.parent = hwnd.owner = " + Integer.toHexString (parent.handle) + "\n" +
-//    "    class = " + windowClass() + "\n" +
-//    "    style = " + Integer.toHexString (widgetStyle())
-//);
-
+/* System.out.println (
+    "Control.createHandle(): Window has been created:\n" +
+    "    hwnd = " + Integer.toHexString (handle) + "\n" +
+    "    hwnd.parent = hwnd.owner = " + Integer.toHexString (parent.handle) + "\n" +
+    "    class = " + windowClass() + "\n" +
+    "    style = " + Integer.toHexString (widgetStyle())
+);
+ */
 //@@TODO(dmik): DBCS handling?
 //    if (OS.IsDBLocale && parent != null) {
@@ -2949 +2949 @@
 //        case OS.WM_CTLCOLORSTATIC: result = WM_CTLCOLOR (wParam, lParam); break;
 //        case OS.WM_CUT: result = WM_CUT (wParam, lParam); break;
-//        case OS.WM_DESTROY: result = WM_DESTROY (wParam, lParam); break;
+        case OS.WM_DESTROY: result = WM_DESTROY (mp1, mp2); 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;
-        case OS.WM_FOCUSCHANGE: result = WM_FOCUSCHANGE (mp1, mp2); break;
+//        case OS.WM_FOCUSCHANGE: result = WM_FOCUSCHANGE (mp1, mp2); break;
         case OS.WM_QUERYDLGCODE: result = WM_QUERYDLGCODE (mp1, mp2); break;
 //        case OS.WM_HELP: result = WM_HELP (wParam, lParam); break;
@@ -3106 +3106 @@
 //      return control.wmColorChild (wParam, lParam);
 //}
-//
-//LRESULT WM_CUT (int wParam, int lParam) {
-//      return null;
-//}
-//
-//LRESULT WM_DESTROY (int wParam, int lParam) {
-//      return null;
-//}
-//
+
+MRESULT WM_DESTROY (int mp1, int mp2) {
+      return null;
+}
+
 //LRESULT WM_DRAWITEM (int wParam, int lParam) {
 //      DRAWITEMSTRUCT struct = new DRAWITEMSTRUCT ();
@@ -3728 +3724 @@
 
 MRESULT WM_SETFOCUS (int mp1, int mp2) {
-    // System.out.println("Control::WM_SETFOCUS -> handle = " + Integer.toHexString(mp1));
+//    System.out.println("Control::WM_SETFOCUS -> handle = " + Integer.toHexString(mp1));
     // System.out.println("Control::WM_SETFOCUS -> mp2 = " + OS.SHORT1FROMMP (mp2));
-    callWindowProc (OS.WM_SETFOCUS, mp1, mp2);
+    int code = callWindowProc (OS.WM_SETFOCUS, mp1, mp2);
     Shell shell = getShell ();
 
@@ -3764 +3760 @@
         }
     }
-
+    if(isDisposed()) return MRESULT.ZERO;
+    if(code == 0) return MRESULT.ZERO;
     return MRESULT.ZERO;
 }
@@ -3975 +3972 @@
 }
 
-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/Shell.java

@@ -1070 +1070 @@
 }
 
-//@@TODO (dmik): need?
-//LRESULT WM_CLOSE (int wParam, int lParam) {
-//      if ((display.TrimEnabled && !isEnabled ()) || !isActive ()) {
-//              return LRESULT.ZERO;
-//      }
-//      return super.WM_CLOSE (wParam, lParam);
-//}
+MRESULT WM_CLOSE (int mp1, int mp2) {
+        if ((display.TrimEnabled && !isEnabled ()) || !isActive ()) {
+                return MRESULT.ZERO;
+        }
+        return super.WM_CLOSE (mp1, mp2);
+}
 
 MRESULT WM_COMMAND (int mp1, int mp2) {
@@ -1082 +1081 @@
 }
 
-//LRESULT WM_DESTROY (int wParam, int lParam) {
-//      LRESULT result = super.WM_DESTROY (wParam, lParam);
-//      /*
-//      * When the shell is a WS_CHILD window of a non-SWT
-//      * window, the destroy code does not get called because
-//      * the non-SWT window does not call dispose ().  Instead,
-//      * the destroy code is called here in WM_DESTROY.
-//      */
+MRESULT WM_DESTROY (int mp1, int mp2) {
+        MRESULT result = super.WM_DESTROY (mp1, mp2);
+        /*
+        * When the shell is a WS_CHILD window of a non-SWT
+        * window, the destroy code does not get called because
+        * the non-SWT window does not call dispose ().  Instead,
+        * the destroy code is called here in WM_DESTROY.
+        */
 //      int bits = OS.GetWindowLong (handle, OS.GWL_STYLE);
 //      if ((bits & OS.WS_CHILD) != 0) {
@@ -1095 +1094 @@
 //              releaseWidget ();
 //      }
-//      return result;
-//}
-//
+        return result;
+}
+
 //LRESULT WM_MOUSEACTIVATE (int wParam, int lParam) {
 //      LRESULT result = super.WM_MOUSEACTIVATE (wParam, lParam);