[kaffe] CVS kaffe (robilad): Resynced with GNU Classpath: various swing fixes

[Kaffe CVS]

PatchSet 5721 
Date: 2004/12/23 21:58:10
Author: robilad
Branch: HEAD
Tag: (none) 
Log:
Resynced with GNU Classpath: various swing fixes

Members: 
	ChangeLog:1.3266->1.3267 
	libraries/javalib/javax/swing/plaf/basic/BasicButtonListener.java:1.4->1.5 
	libraries/javalib/javax/swing/plaf/basic/BasicButtonUI.java:1.4->1.5 
	libraries/javalib/javax/swing/plaf/metal/MetalTheme.java:1.1->1.2 

Index: kaffe/ChangeLog
diff -u kaffe/ChangeLog:1.3266 kaffe/ChangeLog:1.3267
--- kaffe/ChangeLog:1.3266	Thu Dec 23 20:09:23 2004
+++ kaffe/ChangeLog	Thu Dec 23 21:58:10 2004
@@ -1,5 +1,16 @@
 2004-12-23  Dalibor Topic  <robilad at kaffe.org>
 
+	* libraries/javalib/javax/swing/plaf/metal/MetalTheme.java:
+	Resynced with GNU Classpath.
+	
+	2004-12-23  Michael Koch  <konqueror at gmx.de>
+
+	* javax/swing/plaf/metal/MetalTheme.java
+	(getControlTextColor): Return getControlInfo().
+	(getHighlightedTextColor): Return getControlTextColor().
+	
+2004-12-23  Dalibor Topic  <robilad at kaffe.org>
+
 	* libraries/javalib/javax/swing/plaf/basic/BasicButtonListener.java,
 	libraries/javalib/javax/swing/plaf/basic/BasicButtonUI.java:
 	Resynced with GNU Classpath.
Index: kaffe/libraries/javalib/javax/swing/plaf/basic/BasicButtonListener.java
diff -u kaffe/libraries/javalib/javax/swing/plaf/basic/BasicButtonListener.java:1.4 kaffe/libraries/javalib/javax/swing/plaf/basic/BasicButtonListener.java:1.5
--- kaffe/libraries/javalib/javax/swing/plaf/basic/BasicButtonListener.java:1.4	Mon Sep 27 17:41:12 2004
+++ kaffe/libraries/javalib/javax/swing/plaf/basic/BasicButtonListener.java	Thu Dec 23 21:58:12 2004
@@ -1,4 +1,4 @@
-/* BasicButtonListener.java
+/* BasicButtonListener.java --
    Copyright (C) 2004 Free Software Foundation, Inc.
 
 This file is part of GNU Classpath.
@@ -35,6 +35,7 @@
 obligated to do so.  If you do not wish to do so, delete this
 exception statement from your version. */
 
+
 package javax.swing.plaf.basic;
 
 import java.awt.event.ActionEvent;
@@ -58,12 +59,19 @@
   implements MouseListener, MouseMotionListener, FocusListener, 
              ChangeListener, PropertyChangeListener
 {
+  public BasicButtonListener(AbstractButton b)
+  {
+    // Do nothing here.
+  }
+  
   public void propertyChange(PropertyChangeEvent e)
   {
   }
+  
   protected void checkOpacity(AbstractButton b) 
   {    
   }
+  
   public void focusGained(FocusEvent e) 
   {    
     if (e.getSource() instanceof AbstractButton)
@@ -86,6 +94,7 @@
           button.repaint();   
       }
   }
+  
   public void installKeyboardActions(JComponent c)
   {
     c.getActionMap().put("pressed", 
@@ -114,20 +123,25 @@
                            }
                        });    
   }
+  
   public void uninstallKeyboardActions(JComponent c)
   {
     c.getActionMap().put("pressed", null);
     c.getActionMap().put("released", null);
   }
+  
   public void stateChanged(ChangeEvent e)
   {
   }
+  
   public void mouseMoved(MouseEvent e)
   {
   }
+  
   public void mouseDragged(MouseEvent e)
   {
   }
+  
   public void mouseClicked(MouseEvent e)
   {
   }
@@ -152,7 +166,6 @@
       }
   }
 
-
   /**
    * Accept a mouse release event and set the button's 
    * "pressed" property to <code>true</code>, if the model
@@ -174,7 +187,6 @@
           }
       }
   }
-
 
   /**
    * Accept a mouse enter event and set the button's "rollover" property to
Index: kaffe/libraries/javalib/javax/swing/plaf/basic/BasicButtonUI.java
diff -u kaffe/libraries/javalib/javax/swing/plaf/basic/BasicButtonUI.java:1.4 kaffe/libraries/javalib/javax/swing/plaf/basic/BasicButtonUI.java:1.5
--- kaffe/libraries/javalib/javax/swing/plaf/basic/BasicButtonUI.java:1.4	Sun Oct 24 13:39:19 2004
+++ kaffe/libraries/javalib/javax/swing/plaf/basic/BasicButtonUI.java	Thu Dec 23 21:58:12 2004
@@ -133,7 +133,7 @@
 
   protected BasicButtonListener createButtonListener(AbstractButton b)
   {
-    return new BasicButtonListener();
+    return new BasicButtonListener(b);
   }
 
   public void installListeners(AbstractButton b)
Index: kaffe/libraries/javalib/javax/swing/plaf/metal/MetalTheme.java
diff -u kaffe/libraries/javalib/javax/swing/plaf/metal/MetalTheme.java:1.1 kaffe/libraries/javalib/javax/swing/plaf/metal/MetalTheme.java:1.2
--- kaffe/libraries/javalib/javax/swing/plaf/metal/MetalTheme.java:1.1	Thu Dec 23 02:43:14 2004
+++ kaffe/libraries/javalib/javax/swing/plaf/metal/MetalTheme.java	Thu Dec 23 21:58:13 2004
@@ -102,7 +102,7 @@
 
   public ColorUIResource getControlTextColor()
   {
-    return getBlack();
+    return getControlInfo();
   }
 
   public ColorUIResource getDesktopColor()
@@ -117,7 +117,7 @@
 
   public ColorUIResource getHighlightedTextColor()
   {
-    return getBlack();
+    return getControlTextColor();
   }
 
   public ColorUIResource getInactiveControlTextColor()