summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorRoman Kennke <roman@kennke.org>2008-02-08 22:24:33 +0000
committerRoman Kennke <roman@kennke.org>2008-02-08 22:24:33 +0000
commitf5d75d18b49508c5fa299da5f9d825aa530c5077 (patch)
treeb1c1c22444c5a11f69fdc3194fbcb96b267d18a6
parent13d8e9dc096fc7520582ba77896213a41dc748d8 (diff)
downloadclasspath-f5d75d18b49508c5fa299da5f9d825aa530c5077.tar.gz
2008-02-08 Roman Kennke <kennke@aicas.com>
* gnu/java/awt/peer/gtk/GtkComponentPeer.java, * gnu/java/awt/peer/gtk/GtkToolkit.java: Removed mistakenly committed code.
-rw-r--r--ChangeLog6
-rw-r--r--gnu/java/awt/peer/gtk/GtkComponentPeer.java6
-rw-r--r--gnu/java/awt/peer/gtk/GtkToolkit.java10
3 files changed, 6 insertions, 16 deletions
diff --git a/ChangeLog b/ChangeLog
index 7038c39fa..6a55a9754 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,5 +1,11 @@
2008-02-08 Roman Kennke <kennke@aicas.com>
+ * gnu/java/awt/peer/gtk/GtkComponentPeer.java,
+ * gnu/java/awt/peer/gtk/GtkToolkit.java: Removed mistakenly
+ committed code.
+
+2008-02-08 Roman Kennke <kennke@aicas.com>
+
* gnu/java/awt/peer/gtk/CairoGraphics2D.java,
* gnu/java/awt/peer/gtk/GdkFontPeer.java,
* gnu/java/awt/peer/gtk/GdkGraphicsEnvironment.java,
diff --git a/gnu/java/awt/peer/gtk/GtkComponentPeer.java b/gnu/java/awt/peer/gtk/GtkComponentPeer.java
index 039583f3f..76fefaaa5 100644
--- a/gnu/java/awt/peer/gtk/GtkComponentPeer.java
+++ b/gnu/java/awt/peer/gtk/GtkComponentPeer.java
@@ -80,8 +80,6 @@ import java.awt.peer.WindowPeer;
import java.util.Timer;
import java.util.TimerTask;
-import sun.java2d.pipe.Region;
-
public class GtkComponentPeer extends GtkGenericPeer
implements ComponentPeer
{
@@ -920,8 +918,4 @@ public class GtkComponentPeer extends GtkGenericPeer
return true;
}
- public void applyShape(Region shape)
- {
- // TODO: Implement properly.
- }
}
diff --git a/gnu/java/awt/peer/gtk/GtkToolkit.java b/gnu/java/awt/peer/gtk/GtkToolkit.java
index b11e609ef..486304ef0 100644
--- a/gnu/java/awt/peer/gtk/GtkToolkit.java
+++ b/gnu/java/awt/peer/gtk/GtkToolkit.java
@@ -67,7 +67,6 @@ import java.awt.GraphicsDevice;
import java.awt.GraphicsEnvironment;
import java.awt.HeadlessException;
import java.awt.Image;
-import java.awt.KeyboardFocusManager;
import java.awt.Label;
import java.awt.List;
import java.awt.Menu;
@@ -105,7 +104,6 @@ import java.awt.peer.DialogPeer;
import java.awt.peer.FileDialogPeer;
import java.awt.peer.FontPeer;
import java.awt.peer.FramePeer;
-import java.awt.peer.KeyboardFocusManagerPeer;
import java.awt.peer.LabelPeer;
import java.awt.peer.ListPeer;
import java.awt.peer.MenuBarPeer;
@@ -129,8 +127,6 @@ import java.util.Properties;
import javax.imageio.spi.IIORegistry;
-import sun.awt.KeyboardFocusManagerPeerProvider;
-
/* This class uses a deprecated method java.awt.peer.ComponentPeer.getPeer().
This merits comment. We are basically calling Sun's bluff on this one.
We think Sun has deprecated it simply to discourage its use as it is
@@ -139,7 +135,6 @@ import sun.awt.KeyboardFocusManagerPeerProvider;
that will keep up with every window's peer, but for now this is faster. */
public class GtkToolkit extends gnu.java.awt.ClasspathToolkit
- implements KeyboardFocusManagerPeerProvider
{
static final Object GTK_LOCK;
@@ -768,9 +763,4 @@ public class GtkToolkit extends gnu.java.awt.ClasspathToolkit
return false;
}
- public KeyboardFocusManagerPeer createKeyboardFocusManagerPeer(KeyboardFocusManager manager)
- {
- return null;
- }
-
} // class GtkToolkit