
2007-05-31 Matthias Klose <doko@ubuntu.com> * javax/management/NotificationBroadcasterSupport.java (getNotificationInfo): Add cast. * native/jni/qt-peer/Makefile.am (AM_CXXFLAGS): Add libstdc++ include directories. * native/jni/qt-peer/Makefile.in: Regenerate. libjava/ChangeLog: 2007-06-03 Matthias Klose <doko@ubuntu.com> * java/io/natFileWin32.cc (setFilePermissions): New (stub only). _access: Handle EXEC query, stub only. 2007-06-03 Matthias Klose <doko@ubuntu.com> Merged from classpath: * gnu/java/nio/SelectorProviderImpl.java: Whitespace merge. * java/lang/System.java(inheritedChannel): New. * java/lang/Character.java: Remove stray`;'. * java/net/MulticastSocket.java: Merged. * java/text/DateFormatSymbols.java(getInstance): New, comment updates. * java/text/Collator.java(getInstance): Merged. * java/util/Calendar.java: New attributes ALL_STYLES, SHORT, LONG. getDisplayName, getDisplayNames: New. * java/util/logging/Logger.java: Merged. * Regenerate .class and .h files. 2007-06-03 Matthias Klose <doko@ubuntu.com> * java/io/File.java: Merge with classpath-0.95, new method setFilePermissions, new attribute EXEC. * java/io/natFilePosix.cc (setFilePermissions): New. _access: Handle EXEC query. * classpath/lib/java/io/File.class, java/io/File.h: Regenerate. 2007-06-03 Matthias Klose <doko@ubuntu.com> Imported GNU Classpath 0.95. * classpath/Makefile.in, classpath/native/jni/midi-dssi/Makefile.in, classpath/native/jni/classpath/Makefile.in, classpath/native/jni/Makefile.in, classpath/native/jni/gconf-peer/Makefile.in, classpath/native/jni/java-io/Makefile.in, classpath/native/jni/native-lib/Makefile.in, classpath/native/jni/java-util/Makefile.in, classpath/native/jni/midi-alsa/Makefile.in, classpath/native/jni/java-lang/Makefile.in, classpath/native/jni/java-nio/Makefile.in, classpath/native/jni/java-net/Makefile.in, classpath/native/jni/xmlj/Makefile.in, classpath/native/jni/qt-peer/Makefile.in, classpath/native/jni/gtk-peer/Makefile.in, classpath/native/Makefile.in, classpath/native/jawt/Makefile.in, classpath/native/fdlibm/Makefile.in, classpath/native/plugin/Makefile.in, classpath/resource/Makefile.in, classpath/scripts/Makefile.in, classpath/tools/Makefile.in, classpath/doc/Makefile.in, classpath/doc/api/Makefile.in, classpath/lib/Makefile.in, classpath/external/Makefile.in, classpath/external/jsr166/Makefile.in, classpath/external/sax/Makefile.in, classpath/external/w3c_dom/Makefile.in, classpath/external/relaxngDatatype/Makefile.in, classpath/include/Makefile.in, classpath/examples/Makefile.in: Regenerate. * classpath/config.guess, classpath/config.sub, classpath/ltmain.sh : Update. * classpath/configure, classpath/depcomp, classpath/missing, classpath/aclocal.m4, classpath/install-sh: Regenerate. * gnu/classpath/Configuration.java (CLASSPATH_VERSION): Now 0.95. * sources.am: Regenerate. * Makefile.in: Regenerate. * Update the .class files and generated CNI header files, add new .class and generated CNI header files. * Remove generated files for removed java source files: classpath/gnu/java/net/BASE64.java, classpath/gnu/java/security/util/Base64.java, classpath/gnu/java/awt/peer/gtk/GThreadMutex.java, classpath/gnu/java/awt/peer/gtk/GThreadNativeMethodRunner.java, classpath/gnu/java/awt/font/autofit/Scaler.java, classpath/gnu/classpath/jdwp/util/Value.java, classpath/gnu/javax/net/ssl/Base64.java. * Remove empty directories. * Makefile.am(nat_source_files): Add natVMOperatingSystemMXBeanImpl.cc. * java/lang/Class.java(setAccessible): Merge from classpath. * java/util/Locale.java: Remove. * gnu/java/lang/management/VMOperatingSystemMXBeanImpl.java, gnu/java/lang/management/natVMOperatingSystemMXBeanImpl.cc: New. * gcj/javaprims.h: Update class declarations. * scripts/classes.pl: Update usage. * HACKING: Mention to build all peers. From-SVN: r125302
249 lines
7.7 KiB
Java
249 lines
7.7 KiB
Java
/* GtkFramePeer.java -- Implements FramePeer with GTK
|
|
Copyright (C) 1999, 2002, 2004, 2006, 2007 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., 51 Franklin Street, Fifth Floor, Boston, MA
|
|
02110-1301 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.Frame;
|
|
import java.awt.Image;
|
|
import java.awt.MenuBar;
|
|
import java.awt.Rectangle;
|
|
import java.awt.peer.FramePeer;
|
|
import java.awt.peer.MenuBarPeer;
|
|
|
|
public class GtkFramePeer extends GtkWindowPeer
|
|
implements FramePeer
|
|
{
|
|
private int menuBarHeight;
|
|
private MenuBarPeer menuBar;
|
|
native int getMenuBarHeight (MenuBarPeer bar);
|
|
native void setMenuBarWidthUnlocked (MenuBarPeer bar, int width);
|
|
native void setMenuBarWidth (MenuBarPeer bar, int width);
|
|
native void setMenuBarPeer (MenuBarPeer bar);
|
|
native void removeMenuBarPeer ();
|
|
native void gtkFixedSetVisible (boolean visible);
|
|
|
|
private native void maximize();
|
|
private native void unmaximize();
|
|
private native void iconify();
|
|
private native void deiconify();
|
|
|
|
int getMenuBarHeight ()
|
|
{
|
|
return menuBar == null ? 0 : getMenuBarHeight (menuBar);
|
|
}
|
|
|
|
public void setMenuBar (MenuBar bar)
|
|
{
|
|
if (bar == null && menuBar != null)
|
|
{
|
|
// We're removing the menubar.
|
|
gtkFixedSetVisible (false);
|
|
menuBar = null;
|
|
removeMenuBarPeer ();
|
|
insets.top -= menuBarHeight;
|
|
menuBarHeight = 0;
|
|
// if component has already been validated, we need to revalidate.
|
|
// otherwise, it will be validated when it is shown.
|
|
if (awtComponent.isValid())
|
|
awtComponent.validate ();
|
|
gtkFixedSetVisible (true);
|
|
}
|
|
else if (bar != null && menuBar == null)
|
|
{
|
|
// We're adding a menubar where there was no menubar before.
|
|
gtkFixedSetVisible (false);
|
|
menuBar = (MenuBarPeer) ((MenuBar) bar).getPeer();
|
|
setMenuBarPeer (menuBar);
|
|
int menuBarWidth =
|
|
awtComponent.getWidth () - insets.left - insets.right;
|
|
if (menuBarWidth > 0)
|
|
setMenuBarWidth (menuBar, menuBarWidth);
|
|
menuBarHeight = getMenuBarHeight ();
|
|
insets.top += menuBarHeight;
|
|
// if component has already been validated, we need to revalidate.
|
|
// otherwise, it will be validated when it is shown.
|
|
if (awtComponent.isValid())
|
|
awtComponent.validate ();
|
|
gtkFixedSetVisible (true);
|
|
}
|
|
else if (bar != null && menuBar != null)
|
|
{
|
|
// We're swapping the menubar.
|
|
gtkFixedSetVisible (false);
|
|
removeMenuBarPeer();
|
|
int oldHeight = menuBarHeight;
|
|
int menuBarWidth =
|
|
awtComponent.getWidth () - insets.left - insets.right;
|
|
menuBar = (MenuBarPeer) ((MenuBar) bar).getPeer ();
|
|
setMenuBarPeer (menuBar);
|
|
if (menuBarWidth > 0)
|
|
setMenuBarWidth (menuBar, menuBarWidth);
|
|
menuBarHeight = getMenuBarHeight ();
|
|
if (oldHeight != menuBarHeight)
|
|
{
|
|
insets.top += (menuBarHeight - oldHeight);
|
|
awtComponent.validate ();
|
|
}
|
|
gtkFixedSetVisible (true);
|
|
}
|
|
}
|
|
|
|
public void setBounds (int x, int y, int width, int height)
|
|
{
|
|
int menuBarWidth = width - insets.left - insets.right;
|
|
if (menuBar != null && menuBarWidth > 0)
|
|
setMenuBarWidth (menuBar, menuBarWidth);
|
|
|
|
super.setBounds(x, y, width, height + menuBarHeight);
|
|
}
|
|
|
|
public void setResizable (boolean resizable)
|
|
{
|
|
// Call setSize; otherwise when resizable is changed from true to
|
|
// false the frame will shrink to the dimensions it had before it
|
|
// was resizable.
|
|
setSize (awtComponent.getWidth() - insets.left - insets.right,
|
|
awtComponent.getHeight() - insets.top - insets.bottom
|
|
+ menuBarHeight);
|
|
gtkWindowSetResizable (resizable);
|
|
}
|
|
|
|
protected void postInsetsChangedEvent (int top, int left,
|
|
int bottom, int right)
|
|
{
|
|
insets.top = top + menuBarHeight;
|
|
insets.left = left;
|
|
insets.bottom = bottom;
|
|
insets.right = right;
|
|
}
|
|
|
|
public GtkFramePeer (Frame frame)
|
|
{
|
|
super (frame);
|
|
}
|
|
|
|
void create ()
|
|
{
|
|
// Create a normal decorated window.
|
|
create (GDK_WINDOW_TYPE_HINT_NORMAL,
|
|
!((Frame) awtComponent).isUndecorated ());
|
|
|
|
Frame frame = (Frame) awtComponent;
|
|
|
|
setMenuBar (frame.getMenuBar ());
|
|
|
|
setTitle (frame.getTitle ());
|
|
gtkWindowSetResizable (frame.isResizable ());
|
|
setIconImage(frame.getIconImage());
|
|
}
|
|
|
|
native void nativeSetIconImage (GtkImage image);
|
|
|
|
public void setIconImage (Image image)
|
|
{
|
|
if (image != null)
|
|
{
|
|
GtkImage gtkImage;
|
|
if (image instanceof GtkImage)
|
|
gtkImage = (GtkImage) image;
|
|
else
|
|
gtkImage = new GtkImage(image.getSource());
|
|
|
|
if (gtkImage.isLoaded && ! gtkImage.errorLoading)
|
|
nativeSetIconImage(gtkImage);
|
|
}
|
|
}
|
|
|
|
protected void postConfigureEvent (int x, int y, int width, int height)
|
|
{
|
|
if (menuBar != null && width > 0)
|
|
setMenuBarWidthUnlocked (menuBar, width);
|
|
|
|
// Since insets.top already includes the MenuBar's height, we need
|
|
// to subtract the MenuBar's height from the top inset.
|
|
int frame_height = height - menuBarHeight;
|
|
|
|
// Likewise, since insets.top includes the MenuBar height, we need
|
|
// to add back the MenuBar height to the frame's y position. If
|
|
// no MenuBar exists in this frame, the MenuBar height will be 0.
|
|
int frame_y = y + menuBarHeight;
|
|
|
|
super.postConfigureEvent(x, frame_y, width, frame_height);
|
|
}
|
|
|
|
public int getState ()
|
|
{
|
|
return windowState;
|
|
}
|
|
|
|
public void setState (int state)
|
|
{
|
|
switch (state)
|
|
{
|
|
case Frame.NORMAL:
|
|
if ((windowState & Frame.ICONIFIED) != 0)
|
|
deiconify();
|
|
if ((windowState & Frame.MAXIMIZED_BOTH) != 0)
|
|
unmaximize();
|
|
break;
|
|
case Frame.ICONIFIED:
|
|
iconify();
|
|
break;
|
|
case Frame.MAXIMIZED_BOTH:
|
|
maximize();
|
|
}
|
|
}
|
|
|
|
public void setMaximizedBounds (Rectangle r)
|
|
{
|
|
|
|
}
|
|
public void setBoundsPrivate(int x, int y, int width, int height)
|
|
{
|
|
// TODO Auto-generated method stub
|
|
|
|
}
|
|
|
|
public boolean requestWindowFocus()
|
|
{
|
|
// TODO Auto-generated method stub
|
|
return false;
|
|
}
|
|
}
|
|
|
|
|