2003-07-27 Thomas Fitzsimmons <fitzsim@redhat.com.h>

Michael Koch  <konqueror@gmx.de>

	* gnu/java/awt/EmbeddedWindow.java
	(EmbeddedWindow): Extends Frame instead of Window.
	(window_id): New member variable to store the native window handle.
	(create): Removed.
	(EmbeddedWindow): New constructor.
	(addNotify): New method.
	(getHandler): Likewise.
	(setWindowPeer): New native method.
	* gnu/java/awt/EmbeddedWindowSupport.java
	(EmbeddedWindowSupport): Fixed documentation.
	(createEmbeddedWindow): Return EmbeddedWindowPeer instead of
	WindowPeer, give it an EmbeddedWindow instance instead of the raw
	window data.
	* gnu/java/awt/natEmbeddedWindow.cc
	(create): Removed.
	(setWindowPeer): New method.
	* gnu/java/awt/peer/EmbeddedWindowPeer.java,
	gnu/java/awt/peer/gtk/GtkEmbeddedWindowPeer.java,
	jni/gtk-peer/gnu_java_awt_peer_gtk_GtkEmbeddedWindowPeer.c:
	New files
	* gnu/java/awt/peer/gtk/GtkToolkit.java
	(GtkToolkit): Implements EmbeddedWindowSupport.
	(createEmbeddedWindow): New method.
	* java/awt/Window.java
	(Window): Removed.
	* Makefile.am
	(java_source_files): Added EmbeddedWindowPeer.java.
	(gtk_awt_peer_sources): Added GtkEmbeddedWindowPeer.java.
	(gtk_c_source_files): Added gnu_java_awt_peer_gtk_GtkEmbeddedWindowPeer.c.
	* Makefile.in: Regenerated.

Co-Authored-By: Michael Koch <konqueror@gmx.de>

From-SVN: r69859
This commit is contained in:
Thomas Fitzsimmons 2003-07-27 19:04:42 +00:00 committed by Michael Koch
parent b7a78333b1
commit 0963808165
10 changed files with 286 additions and 26 deletions

View file

@ -38,14 +38,15 @@ exception statement from your version. */
package gnu.java.awt;
import java.awt.peer.WindowPeer;
import gnu.java.awt.peer.EmbeddedWindowPeer;
/**
* This interface defines a method for creating embedded windows.
* Declares a method for creating native embedded window peers.
*
* All classes inherited from java.awt.Toolkit that implement this interface
* are assumed to support embedded windows. To embed the real embedded window
* you need to use gnu.java.awt.EmbeddedWindow.
* All classes inherited from java.awt.Toolkit that implement this
* interface are assumed to support the creation of embedded window
* peers. To create an embedded window, use
* gnu.java.awt.EmbeddedWindow.
*
* @see gnu.java.awt.EmbeddedWindow
* @see java.awt.Toolkit
@ -55,13 +56,10 @@ import java.awt.peer.WindowPeer;
public interface EmbeddedWindowSupport
{
/**
* This method creates an embedded window in an application.
* Creates an embedded window peer, and associates it with an
* EmbeddedWindow object.
*
* @param window_id The native handle of a screen area to display an
* AWT window in it.
* @param width The width of the screen area.
* @param height The height of the screen area.
* @param w The embedded window with which to associate a peer.
*/
public WindowPeer createEmbeddedWindow (int window_id,
int width, int height);
public EmbeddedWindowPeer createEmbeddedWindow (EmbeddedWindow w);
}