
2003-10-02 Thomas Fitzsimmons <fitzsim@redhat.com> * gnu/java/awt/peer/gtk/GtkComponentPeer.java (insets): New field. (initializeInsets): New method. (GtkComponentPeer): Call initializeInsets. Call setCursor and setBounds unconditionally. (setBounds): Convert coordinates if parent is a Window. * gnu/java/awt/peer/gtk/GtkContainerPeer.java (insets): Move field to GtkComponentPeer. (GtkContainerPeer): Don't initialize insets. * gnu/java/awt/peer/gtk/GtkDialogPeer.java (initializeInsets): New method. (create): Call new GtkWindowPeer create method. * gnu/java/awt/peer/gtk/GtkFramePeer.java (initializeInsets): New method. (create): Call new GtkWindowPeer create method. (setBounds): Remove method. (postConfigureEvent): Likewise. * gnu/java/awt/peer/gtk/GtkWindowPeer.java: Replace GTK window type constants with GDK window type constants. (create(int,boolean,int,int,GtkWindowPeer)): New method. (create(int,boolean)): Likewise. (create()): Call create(int,boolean). (nativeSetBounds): New native method declaration. (setBounds): Call native method declaration. (setSize): New native method declaration. (setBoundsCallback): Likewise. (postConfigureEvent): Handle change in insets. Call setSize and setBoundsCallback methods. * java/awt/Window.java (Window): Set visible to false. (setBoundsCallback): New method. * jni/gtk-peer/gnu_java_awt_peer_gtk_GtkComponentPeer.c (gtkWidgetGetLocationOnScreen): If this component is not a container, adjust the location returned based on the peer's allocation. (set(String,boolean)): Revert change from 2003-09-19. * jni/gtk-peer/gnu_java_awt_peer_gtk_GtkEvents.c (awt_event_handler): Fix inset calculation. * jni/gtk-peer/gnu_java_awt_peer_gtk_GtkMainThread.c: Add JNI glue for Window.setBoundsCallback. * jni/gtk-peer/gnu_java_awt_peer_gtk_GtkWindowPeer.c (create): Set up stacking order, window decorations and window manager hints. (setBoundsCallback): New method. (setSize): New method. (nativeSetBounds): New method. * jni/gtk-peer/gtkpeer.h: Declare setBoundsCallbackID. From-SVN: r72043
131 lines
3.4 KiB
Java
131 lines
3.4 KiB
Java
/* GtkContainerPeer.java -- Implements ContainerPeer with GTK
|
|
Copyright (C) 1998, 1999 Free Software Foundation, Inc.
|
|
|
|
This file is part of GNU Classpath.
|
|
|
|
GNU Classpath is free software; you can redistribute it and/or modify
|
|
it under the terms of the GNU General Public License as published by
|
|
the Free Software Foundation; either version 2, or (at your option)
|
|
any later version.
|
|
|
|
GNU Classpath is distributed in the hope that it will be useful, but
|
|
WITHOUT ANY WARRANTY; without even the implied warranty of
|
|
MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
|
|
General Public License for more details.
|
|
|
|
You should have received a copy of the GNU General Public License
|
|
along with GNU Classpath; see the file COPYING. If not, write to the
|
|
Free Software Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA
|
|
02111-1307 USA.
|
|
|
|
Linking this library statically or dynamically with other modules is
|
|
making a combined work based on this library. Thus, the terms and
|
|
conditions of the GNU General Public License cover the whole
|
|
combination.
|
|
|
|
As a special exception, the copyright holders of this library give you
|
|
permission to link this library with independent modules to produce an
|
|
executable, regardless of the license terms of these independent
|
|
modules, and to copy and distribute the resulting executable under
|
|
terms of your choice, provided that you also meet, for each linked
|
|
independent module, the terms and conditions of the license of that
|
|
module. An independent module is a module which is not derived from
|
|
or based on this library. If you modify this library, you may extend
|
|
this exception to your version of the library, but you are not
|
|
obligated to do so. If you do not wish to do so, delete this
|
|
exception statement from your version. */
|
|
|
|
|
|
package gnu.java.awt.peer.gtk;
|
|
|
|
import java.awt.AWTEvent;
|
|
import java.awt.Container;
|
|
import java.awt.Graphics;
|
|
import java.awt.Insets;
|
|
import java.awt.event.PaintEvent;
|
|
import java.awt.peer.ContainerPeer;
|
|
|
|
public class GtkContainerPeer extends GtkComponentPeer
|
|
implements ContainerPeer
|
|
{
|
|
Container c;
|
|
|
|
public GtkContainerPeer(Container c)
|
|
{
|
|
super (c);
|
|
this.c = c;
|
|
}
|
|
|
|
public void beginValidate()
|
|
{
|
|
}
|
|
|
|
public void endValidate()
|
|
{
|
|
// q.postEvent (new PaintEvent (awtComponent, PaintEvent.PAINT,
|
|
// new Rectangle (x, y, width, height)));
|
|
// Graphics gc = getGraphics ();
|
|
// if (gc != null)
|
|
// {
|
|
// awtComponent.update (gc);
|
|
// gc.dispose ();
|
|
// }
|
|
// System.out.println ("got here");
|
|
// awtComponent.repaint ();
|
|
}
|
|
|
|
public Insets getInsets()
|
|
{
|
|
return insets;
|
|
}
|
|
|
|
public Insets insets()
|
|
{
|
|
return getInsets ();
|
|
}
|
|
|
|
public void setBounds (int x, int y, int width, int height)
|
|
{
|
|
super.setBounds (x, y, width, height);
|
|
awtComponent.validate ();
|
|
}
|
|
|
|
public Graphics getGraphics ()
|
|
{
|
|
return new GdkGraphics (this);
|
|
}
|
|
|
|
public void handleEvent (AWTEvent event)
|
|
{
|
|
int id = event.getID();
|
|
|
|
switch (id)
|
|
{
|
|
case PaintEvent.PAINT:
|
|
case PaintEvent.UPDATE:
|
|
{
|
|
try
|
|
{
|
|
Graphics g = getGraphics ();
|
|
g.setClip (((PaintEvent)event).getUpdateRect());
|
|
|
|
if (id == PaintEvent.PAINT)
|
|
awtComponent.paint (g);
|
|
else
|
|
awtComponent.update (g);
|
|
|
|
g.dispose ();
|
|
}
|
|
catch (InternalError e)
|
|
{
|
|
System.err.println (e);
|
|
}
|
|
}
|
|
break;
|
|
}
|
|
}
|
|
|
|
public void beginLayout () { }
|
|
public void endLayout () { }
|
|
public boolean isPaintPending () { return false; }
|
|
}
|