Changeset 212 for trunk/src

Timestamp:

Oct 23, 2009, 8:50:29 PM (16 years ago)

Author:

lpino

Message:

• Little changes, some cleaning some debug messages... etc

Location:

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

Files:

• Control.java (modified) (7 diffs)
• Decorations.java (modified) (4 diffs)
• Shell.java (modified) (3 diffs)

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

@@ -3479 +3479 @@
 //    return null;
 }
-
-//LRESULT WM_MENUCHAR (int wParam, int lParam) {
-//      Display display = getDisplay ();
-//      display.mnemonicKeyHit = false;
-//      /*
-//      * Feature in Windows.  When the user types Alt+<key>
-//      * and <key> does not match a mnemonic in the System
-//      * menu or the menu bar, Windows beeps.  This beep is
-//      * unexpected and unwanted by applications that look
-//      * for Alt+<key>.  The fix is to detect the case and
-//      * stop Windows from beeping by closing the menu.
-//      */
-//      int type = wParam >> 16;
-//      if (type == 0 || type == OS.MF_SYSMENU) {
-//              return new LRESULT (OS.MNC_CLOSE << 16);
-//      }
-//      return null;
-//}
 
 MRESULT WM_MENUSELECT (int mp1, int mp2) {
@@ -3659 +3641 @@
 
 MRESULT WM_PAINT (int mp1, int mp2) {
+//      System.out.println("Control::WM_PAINT -> HANDLE  =  " + Integer.toHexString(handle));
     /* Exit early - don't draw the background */
     if (!hooks (SWT.Paint)) {
@@ -3745 +3728 @@
 
 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));
     callWindowProc (OS.WM_SETFOCUS, mp1, mp2);
     Shell shell = getShell ();
@@ -3838 +3823 @@
 //      return null;
 //}
-//
+//@@TODO (lpino): Complete including differences with Win32 (WM_SYSCHAR + WM_SYSKEYDOWN)
 MRESULT WM_SYSCOMMAND (int mp1, int mp2) {
 //      /*
@@ -3859 +3844 @@
       switch (cmd) {
               case OS.SC_CLOSE:
+                System.out.println("Control::WM_SYSCOMMAND -> SC_CLOSE"); 
                       int hwndShell = menuShell ().handle;
 //                      int bits =  OS.WinQueryWindowULong (frameHandle, OS.QWL_STYLE);
@@ -3988 +3974 @@
     return new MRESULT (result);
 }
+
 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) {
 //    System.out.println("Control:WM_ADJUSTWINDOWPOS");
@@ -4034 +4023 @@
       return null;
 }
-//
-//LRESULT wmNotifyChild (int wParam, int lParam) {
-//      return null;
-//}
 
 MRESULT wmScrollChild (int mp1, int mp2) {

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

@@ -1206 +1206 @@
         sendEvent (SWT.Show);
         if (isDisposed ()) return;
+//                      OS.DrawMenuBar (handle);
+//                      OS.ShowWindow (handle, swFlags);
     }
 
@@ -1367 +1369 @@
     switch (msg) {
         case OS.WM_ACTIVATE: result = FRAME_WM_ACTIVATE (mp1, mp2); break;
+//      case OS.WM_CLOSE: result = FRAME_WM_CLOSE (mp1, mp2); break;
         case OS.WM_ADJUSTWINDOWPOS: result = FRAME_WM_ADJUSTWINDOWPOS (mp1, mp2); break;
         case OS.WM_REALIZEPALETTE: result = FRAME_WM_REALIZEPALETTE (mp1, mp2); break;
         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_ERASEBACKGROUND: result = FRAME_WM_ERASEBACKGROUND (mp1, mp2); break;
         case OS.WM_INITMENU: result = FRAME_WM_INITMENU (mp1, mp2); break;
    }
@@ -1435 +1438 @@
                 sendEvent (SWT.Activate);
                 if (isDisposed ()) return MRESULT.ZERO;
-                restoreFocus ();
+                if(restoreFocus ()) return MRESULT.ZERO;;
         }
         return null;
@@ -1504 +1507 @@
 }
 
-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;
-}
-
-MRESULT FRAME_WM_INITMENU (int mp1, int mp2) {
-        return MRESULT.FALSE;
+// // MRESULT 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;
+// // }
+// // 
+ MRESULT FRAME_WM_INITMENU (int mp1, int mp2) {
+         return MRESULT.FALSE;
 }
 MRESULT WM_SETFOCUS (int mp1, int mp2) {

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

@@ -461 +461 @@
     * is currently unspecified.
     */
-//    /*
-//    * Note:  It is valid to attempt to dispose a widget
-//    * more than once.  If this happens, fail silently.
-//    */
+    /*
+    * Note:  It is valid to attempt to dispose a widget
+    * more than once.  If this happens, fail silently.
+    */
 //    if (!isValidWidget ()) return;
 //    if (!isValidThread ()) error (SWT.ERROR_THREAD_INVALID_ACCESS);
@@ -473 +473 @@
 }
 
-//@@TODO(dmik)
+//@@TODO(lpino): Use GpiSetPattern
 //int findBrush (int pixel) {
 //      if (pixel == OS.GetSysColor (OS.COLOR_BTNFACE)) {
@@ -546 +546 @@
 
 //@@TODO(dmik): what to do with TrimEnabled?
-//public boolean getEnabled () {
-//    checkWidget ();
-//    if (!display.TrimEnabled) return super.getEnabled ();
-//    return (state & DISABLED) == 0;
-//}
+public boolean getEnabled () {
+    checkWidget ();
+    if (!display.TrimEnabled) return super.getEnabled ();
+    return (state & DISABLED) == 0;
+}
 
 /**