Changeset 134

Timestamp:

May 13, 2009, 3:53:56 AM (16 years ago)

Author:

lpino

Message:

Small changes

Location:

trunk/src/plugins/org.eclipse.swt

Files:

• Eclipse SWT PI/pm/org/eclipse/swt/internal/pm/OS.java (modified) (1 diff)
• Eclipse SWT/pm/org/eclipse/swt/widgets/Display.java (modified) (3 diffs)

trunk/src/plugins/org.eclipse.swt/Eclipse SWT PI/pm/org/eclipse/swt/internal/pm/OS.java

@@ -872 +872 @@
 //    public static final int SYSCLR_INACTIVETITLETEXTBGND =  -31;
 //    public static final int SYSCLR_ACTIVETITLETEXTBGND =    -30;
-//    public static final int SYSCLR_INACTIVETITLETEXT =      -29;
-//    public static final int SYSCLR_ACTIVETITLETEXT =        -28;
+    public static final int SYSCLR_INACTIVETITLETEXT =      -29;
+    public static final int SYSCLR_ACTIVETITLETEXT =        -28;
 //    public static final int SYSCLR_OUTPUTTEXT =             -27;
 //    public static final int SYSCLR_WINDOWSTATICTEXT =       -26;
     public static final int SYSCLR_SCROLLBAR =              -25;
 //    public static final int SYSCLR_BACKGROUND =             -24;
-//    public static final int SYSCLR_ACTIVETITLE =            -23;
-//    public static final int SYSCLR_INACTIVETITLE =          -22;
+    public static final int SYSCLR_ACTIVETITLE =            -23;
+    public static final int SYSCLR_INACTIVETITLE =          -22;
     public static final int SYSCLR_MENU =                   -21;
     public static final int SYSCLR_WINDOW =                 -20;

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

@@ -392 +392 @@
 }
 
-//@@TODO (dmik): later
-//void clearModal (Shell shell) {
-//    if (ModalWidgets == null) return;
-//    int index = 0, length = ModalWidgets.length;
-//    while (index < length) {
-//        if (ModalWidgets [index] == shell) break;
-//        if (ModalWidgets [index] == null) return;
-//        index++;
-//    }
-//    if (index == length) return;
-//    System.arraycopy (ModalWidgets, index + 1, ModalWidgets, index, --length - index);
-//    ModalWidgets [length] = null;
-//    if (index == 0 && ModalWidgets [0] == null) ModalWidgets = null;
-//    if (!TrimEnabled) return;
-//    Shell [] shells = getShells ();
-//    for (int i=0; i<shells.length; i++) shells [i].updateModal ();
-//}
+void clearModal (Shell shell) {
+    if (ModalWidgets == null) return;
+    int index = 0, length = ModalWidgets.length;
+    while (index < length) {
+        if (ModalWidgets [index] == shell) break;
+        if (ModalWidgets [index] == null) return;
+        index++;
+    }
+    if (index == length) return;
+    System.arraycopy (ModalWidgets, index + 1, ModalWidgets, index, --length - index);
+    ModalWidgets [length] = null;
+    if (index == 0 && ModalWidgets [0] == null) ModalWidgets = null;
+    if (!TrimEnabled) return;
+    Shell [] shells = getShells ();
+    for (int i=0; i<shells.length; i++) shells [i].updateModal ();
+}
 
 //@@TODO (dmik): later (lpino) using WinUpperChar
@@ -1055 +1054 @@
     int pixel = 0x02000000;
     switch (id) {
-//        case SWT.COLOR_WIDGET_DARK_SHADOW:      pixel = OS.WinQuerySysColor (OS.HWND_DESKTOP, OS.SYSCLR_SHADOW,0);   break;
-//        case SWT.COLOR_WIDGET_NORMAL_SHADOW:    pixel = OS.GetSysColor (OS.COLOR_3DSHADOW);     break;
+        case SWT.COLOR_WIDGET_DARK_SHADOW:      pixel = OS.WinQuerySysColor (OS.HWND_DESKTOP, OS.SYSCLR_SHADOW,0);   break;
+        case SWT.COLOR_WIDGET_NORMAL_SHADOW:    pixel = OS.WinQuerySysColor (OS.HWND_DESKTOP, OS.SYSCLR_SHADOW,0);   break;
 //        case SWT.COLOR_WIDGET_LIGHT_SHADOW:     pixel = OS.GetSysColor (OS.COLOR_3DLIGHT);      break;
 //        case SWT.COLOR_WIDGET_HIGHLIGHT_SHADOW: pixel = OS.GetSysColor (OS.COLOR_3DHIGHLIGHT);  break;
@@ -1068 +1067 @@
 //        case SWT.COLOR_INFO_FOREGROUND:     pixel = OS.GetSysColor (OS.COLOR_INFOTEXT); break;
 //        case SWT.COLOR_INFO_BACKGROUND:     pixel = OS.GetSysColor (OS.COLOR_INFOBK);       break;
-//        case SWT.COLOR_TITLE_FOREGROUND:        pixel = OS.GetSysColor (OS.COLOR_CAPTIONTEXT);  break;
-//        case SWT.COLOR_TITLE_BACKGROUND:        pixel = OS.GetSysColor (OS.COLOR_ACTIVECAPTION);        break;
+        case SWT.COLOR_TITLE_FOREGROUND:        pixel =OS.WinQuerySysColor (OS.HWND_DESKTOP, OS.SYSCLR_ACTIVETITLETEXT,0);   break;
+        case SWT.COLOR_TITLE_BACKGROUND:        pixel = OS.WinQuerySysColor (OS.HWND_DESKTOP, OS.SYSCLR_ACTIVETITLE,0);   break;
 //        case SWT.COLOR_TITLE_BACKGROUND_GRADIENT:
 //            pixel = OS.GetSysColor (OS.COLOR_GRADIENTACTIVECAPTION);
 //            if (pixel == 0) pixel = OS.GetSysColor (OS.COLOR_ACTIVECAPTION);
 //            break;
-//        case SWT.COLOR_TITLE_INACTIVE_FOREGROUND:       pixel = OS.GetSysColor (OS.COLOR_INACTIVECAPTIONTEXT);  break;
-//        case SWT.COLOR_TITLE_INACTIVE_BACKGROUND:           pixel = OS.GetSysColor (OS.COLOR_INACTIVECAPTION);      break;
+        case SWT.COLOR_TITLE_INACTIVE_FOREGROUND:       pixel = OS.WinQuerySysColor (OS.HWND_DESKTOP, OS.SYSCLR_INACTIVETITLETEXT,0);   break;
+        case SWT.COLOR_TITLE_INACTIVE_BACKGROUND:           pixel = OS.WinQuerySysColor (OS.HWND_DESKTOP, OS.SYSCLR_INACTIVETITLE,0);   break;
 //        case SWT.COLOR_TITLE_INACTIVE_BACKGROUND_GRADIENT:
 //            pixel = OS.GetSysColor (OS.COLOR_GRADIENTINACTIVECAPTION);