diff options
author | Matthias Klose <doko@gcc.gnu.org> | 2007-08-04 10:53:49 +0000 |
---|---|---|
committer | Matthias Klose <doko@gcc.gnu.org> | 2007-08-04 10:53:49 +0000 |
commit | f06a83c0b2f7761510836194a6c9a8a72000937c (patch) | |
tree | 871b70a606d87369d5aa9d6f621baedc13b49eba /libjava/gnu/java | |
parent | 2c3de459b647a72fc35d66adeda274ba0f14347b (diff) | |
download | gcc-f06a83c0b2f7761510836194a6c9a8a72000937c.zip gcc-f06a83c0b2f7761510836194a6c9a8a72000937c.tar.gz gcc-f06a83c0b2f7761510836194a6c9a8a72000937c.tar.bz2 |
Import GNU Classpath (libgcj-import-20070727).
libjava/
2007-08-04 Matthias Klose <doko@ubuntu.com>
Import GNU Classpath (libgcj-import-20070727).
* Regenerate class and header files.
* Regenerate auto* files.
* include/jvm.h:
* jni-libjvm.cc (Jv_JNI_InvokeFunctions): Rename type.
* jni.cc (_Jv_JNIFunctions, _Jv_JNI_InvokeFunctions): Likewise.
* jni.cc (_Jv_JNI_CallAnyMethodA, _Jv_JNI_CallAnyVoidMethodA,
_Jv_JNI_CallMethodA, _Jv_JNI_CallVoidMethodA,
_Jv_JNI_CallStaticMethodA, _Jv_JNI_CallStaticVoidMethodA,
_Jv_JNI_NewObjectA, _Jv_JNI_SetPrimitiveArrayRegion): Constify
jvalue parameter.
* java/lang/reflect/natMethod.cc (_Jv_CallAnyMethodA): Likewise.
* java/lang/VMFloat.java (toString, parseFloat): New.
* gnu/awt/xlib/XToolkit.java (setAlwaysOnTop, isModalityTypeSupported,
isModalExclusionTypeSupported): New (stub only).
* gnu/awt/xlib/XCanvasPeer.java (requestFocus): Likewise.
* gnu/awt/xlib/XFramePeer.java (updateMinimumSize, updateIconImages,
updateFocusableWindowState, setModalBlocked, getBoundsPrivate,
setAlwaysOnTop): Likewise.
* gnu/awt/xlib/XFontPeer.java (canDisplay): Update signature.
* scripts/makemake.tcl: Ignore gnu/javax/sound/sampled/gstreamer,
ignore javax.sound.sampled.spi.MixerProvider, ignore .in files.
* HACKING: Mention --enable-gstreamer-peer, removal of generated files.
libjava/classpath/
2007-08-04 Matthias Klose <doko@ubuntu.com>
* java/util/EnumMap.java (clone): Add cast.
From-SVN: r127204
Diffstat (limited to 'libjava/gnu/java')
49 files changed, 768 insertions, 53 deletions
diff --git a/libjava/gnu/java/awt/font/FontDelegate.h b/libjava/gnu/java/awt/font/FontDelegate.h index a84c93e..add9155 100644 --- a/libjava/gnu/java/awt/font/FontDelegate.h +++ b/libjava/gnu/java/awt/font/FontDelegate.h @@ -55,6 +55,7 @@ public: virtual ::java::lang::String * getSubFamilyName(::java::util::Locale *) = 0; virtual ::java::lang::String * getPostScriptName() = 0; virtual jint getNumGlyphs() = 0; + virtual jint getGlyphIndex(jint) = 0; virtual jint getMissingGlyphCode() = 0; virtual ::java::awt::font::GlyphVector * createGlyphVector(::java::awt::Font *, ::java::awt::font::FontRenderContext *, ::java::text::CharacterIterator *) = 0; virtual void getAdvance(jint, jfloat, ::java::awt::geom::AffineTransform *, jboolean, jboolean, jboolean, ::java::awt::geom::Point2D *) = 0; diff --git a/libjava/gnu/java/awt/font/opentype/OpenTypeFont.h b/libjava/gnu/java/awt/font/opentype/OpenTypeFont.h index 7d07889..3fec583 100644 --- a/libjava/gnu/java/awt/font/opentype/OpenTypeFont.h +++ b/libjava/gnu/java/awt/font/opentype/OpenTypeFont.h @@ -88,6 +88,7 @@ private: public: jint getGlyph(jint); ::java::awt::font::GlyphVector * createGlyphVector(::java::awt::Font *, ::java::awt::font::FontRenderContext *, ::java::text::CharacterIterator *); + jint getGlyphIndex(jint); void getAdvance(jint, jfloat, ::java::awt::geom::AffineTransform *, jboolean, jboolean, jboolean, ::java::awt::geom::Point2D *); ::java::awt::geom::GeneralPath * getGlyphOutline(jint, jfloat, ::java::awt::geom::AffineTransform *, jboolean, jboolean, jint); ::gnu::java::awt::font::opentype::truetype::Zone * getRawGlyphOutline(jint, ::java::awt::geom::AffineTransform *); diff --git a/libjava/gnu/java/awt/java2d/AbstractGraphics2D.h b/libjava/gnu/java/awt/java2d/AbstractGraphics2D.h index 48d474b..0356716 100644 --- a/libjava/gnu/java/awt/java2d/AbstractGraphics2D.h +++ b/libjava/gnu/java/awt/java2d/AbstractGraphics2D.h @@ -21,6 +21,7 @@ extern "Java" { class AbstractGraphics2D; class ScanlineConverter; + class ScanlineCoverage; class ShapeCache; } } @@ -176,10 +177,8 @@ public: // actually protected virtual void rawCopyArea(jint, jint, jint, jint, jint, jint); private: void copyAreaImpl(jint, jint, jint, jint, jint, jint); -public: // actually protected - virtual void fillScanline(jint, jint, jint); -private: - void fillScanlineAA(JArray< jint > *, jint, jint, jint, ::java::awt::PaintContext *, jint); +public: + virtual void renderScanline(jint, ::gnu::java::awt::java2d::ScanlineCoverage *); public: // actually protected virtual void init(); virtual ::java::awt::image::WritableRaster * getDestinationRaster(); @@ -191,7 +190,6 @@ private: ::gnu::java::awt::java2d::ShapeCache * getShapeCache(); ::gnu::java::awt::java2d::ScanlineConverter * getScanlineConverter(); static ::java::awt::Font * FONT; - static const jint AA_SAMPLING = 8; static ::java::lang::ThreadLocal * shapeCache; static ::java::lang::ThreadLocal * scanlineConverters; public: // actually protected @@ -206,8 +204,6 @@ private: ::java::awt::Shape * clip__; ::java::awt::RenderingHints * renderingHints; ::java::awt::image::WritableRaster * destinationRaster; - JArray< jint > * alpha; - JArray< ::java::util::ArrayList * > * edgeTable; jboolean isOptimized; static ::java::awt::BasicStroke * STANDARD_STROKE; static ::java::util::HashMap * STANDARD_HINTS; diff --git a/libjava/gnu/java/awt/java2d/Pixelizer.h b/libjava/gnu/java/awt/java2d/Pixelizer.h new file mode 100644 index 0000000..469019a --- /dev/null +++ b/libjava/gnu/java/awt/java2d/Pixelizer.h @@ -0,0 +1,36 @@ + +// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*- + +#ifndef __gnu_java_awt_java2d_Pixelizer__ +#define __gnu_java_awt_java2d_Pixelizer__ + +#pragma interface + +#include <java/lang/Object.h> +extern "Java" +{ + namespace gnu + { + namespace java + { + namespace awt + { + namespace java2d + { + class Pixelizer; + class ScanlineCoverage; + } + } + } + } +} + +class gnu::java::awt::java2d::Pixelizer : public ::java::lang::Object +{ + +public: + virtual void renderScanline(jint, ::gnu::java::awt::java2d::ScanlineCoverage *) = 0; + static ::java::lang::Class class$; +} __attribute__ ((java_interface)); + +#endif // __gnu_java_awt_java2d_Pixelizer__ diff --git a/libjava/gnu/java/awt/java2d/ScanlineConverter.h b/libjava/gnu/java/awt/java2d/ScanlineConverter.h index febf495..8ef5369 100644 --- a/libjava/gnu/java/awt/java2d/ScanlineConverter.h +++ b/libjava/gnu/java/awt/java2d/ScanlineConverter.h @@ -19,11 +19,12 @@ extern "Java" { namespace java2d { - class AbstractGraphics2D; class ActiveEdges; + class Pixelizer; class PolyEdge; class Scanline; class ScanlineConverter; + class ScanlineCoverage; } } } @@ -32,6 +33,7 @@ extern "Java" { namespace awt { + class RenderingHints; class Shape; namespace geom { @@ -47,10 +49,11 @@ class gnu::java::awt::java2d::ScanlineConverter : public ::java::lang::Object public: // actually package-private ScanlineConverter(); - void renderShape(::gnu::java::awt::java2d::AbstractGraphics2D *, ::java::awt::Shape *, ::java::awt::Shape *, ::java::awt::geom::AffineTransform *, jint); +public: + void renderShape(::gnu::java::awt::java2d::Pixelizer *, ::java::awt::Shape *, ::java::awt::Shape *, ::java::awt::geom::AffineTransform *, jint, ::java::awt::RenderingHints *); private: void clear(); - void doScanline(::gnu::java::awt::java2d::AbstractGraphics2D *, jint, jboolean, jboolean); + void doScanline(::gnu::java::awt::java2d::Pixelizer *, jint, jboolean, jboolean); void setResolution(jint); void setUpperBounds(jint); void addShape(::java::awt::geom::PathIterator *, jboolean); @@ -60,6 +63,7 @@ private: void edgePoolAdd(jint, jint, jint, jint, jboolean); static jint FIXED_DIGITS; static jint ONE; + static jint Y_RESOLUTION; jint __attribute__((aligned(__alignof__( ::java::lang::Object)))) numScanlines; JArray< ::gnu::java::awt::java2d::Scanline * > * scanlines; jint upperBounds; @@ -71,6 +75,9 @@ private: ::gnu::java::awt::java2d::PolyEdge * edgePoolLast; jint minY; jint maxY; + jint minX; + jint maxX; + ::gnu::java::awt::java2d::ScanlineCoverage * scanlineCoverage; public: // actually package-private static jboolean $assertionsDisabled; public: diff --git a/libjava/gnu/java/awt/java2d/ScanlineCoverage$Coverage.h b/libjava/gnu/java/awt/java2d/ScanlineCoverage$Coverage.h new file mode 100644 index 0000000..0f1a5b7 --- /dev/null +++ b/libjava/gnu/java/awt/java2d/ScanlineCoverage$Coverage.h @@ -0,0 +1,46 @@ + +// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*- + +#ifndef __gnu_java_awt_java2d_ScanlineCoverage$Coverage__ +#define __gnu_java_awt_java2d_ScanlineCoverage$Coverage__ + +#pragma interface + +#include <java/lang/Object.h> +extern "Java" +{ + namespace gnu + { + namespace java + { + namespace awt + { + namespace java2d + { + class ScanlineCoverage$Coverage; + } + } + } + } +} + +class gnu::java::awt::java2d::ScanlineCoverage$Coverage : public ::java::lang::Object +{ + + ScanlineCoverage$Coverage(); +public: + jint getXPos(); + jint getCoverageDelta(); + ::java::lang::String * toString(); + ::java::lang::String * list(); +public: // actually package-private + ScanlineCoverage$Coverage(::gnu::java::awt::java2d::ScanlineCoverage$Coverage *); + jint __attribute__((aligned(__alignof__( ::java::lang::Object)))) xPos; + jint covDelta; + jint pixelCoverage; + ::gnu::java::awt::java2d::ScanlineCoverage$Coverage * next; +public: + static ::java::lang::Class class$; +}; + +#endif // __gnu_java_awt_java2d_ScanlineCoverage$Coverage__ diff --git a/libjava/gnu/java/awt/java2d/ScanlineCoverage$Iterator.h b/libjava/gnu/java/awt/java2d/ScanlineCoverage$Iterator.h new file mode 100644 index 0000000..2ea741e --- /dev/null +++ b/libjava/gnu/java/awt/java2d/ScanlineCoverage$Iterator.h @@ -0,0 +1,51 @@ + +// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*- + +#ifndef __gnu_java_awt_java2d_ScanlineCoverage$Iterator__ +#define __gnu_java_awt_java2d_ScanlineCoverage$Iterator__ + +#pragma interface + +#include <java/lang/Object.h> +extern "Java" +{ + namespace gnu + { + namespace java + { + namespace awt + { + namespace java2d + { + class ScanlineCoverage; + class ScanlineCoverage$Coverage; + class ScanlineCoverage$Iterator; + class ScanlineCoverage$Range; + } + } + } + } +} + +class gnu::java::awt::java2d::ScanlineCoverage$Iterator : public ::java::lang::Object +{ + +public: // actually package-private + ScanlineCoverage$Iterator(::gnu::java::awt::java2d::ScanlineCoverage *); +public: + ::gnu::java::awt::java2d::ScanlineCoverage$Range * next(); + jboolean hasNext(); +public: // actually package-private + void reset(); +private: + ::gnu::java::awt::java2d::ScanlineCoverage$Range * __attribute__((aligned(__alignof__( ::java::lang::Object)))) range; + ::gnu::java::awt::java2d::ScanlineCoverage$Coverage * currentItem; + jint currentCoverage; + jboolean handledPixelCoverage; +public: // actually package-private + ::gnu::java::awt::java2d::ScanlineCoverage * this$0; +public: + static ::java::lang::Class class$; +}; + +#endif // __gnu_java_awt_java2d_ScanlineCoverage$Iterator__ diff --git a/libjava/gnu/java/awt/java2d/ScanlineCoverage$Range.h b/libjava/gnu/java/awt/java2d/ScanlineCoverage$Range.h new file mode 100644 index 0000000..5f6ccd6 --- /dev/null +++ b/libjava/gnu/java/awt/java2d/ScanlineCoverage$Range.h @@ -0,0 +1,55 @@ + +// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*- + +#ifndef __gnu_java_awt_java2d_ScanlineCoverage$Range__ +#define __gnu_java_awt_java2d_ScanlineCoverage$Range__ + +#pragma interface + +#include <java/lang/Object.h> +extern "Java" +{ + namespace gnu + { + namespace java + { + namespace awt + { + namespace java2d + { + class ScanlineCoverage$Range; + } + } + } + } +} + +class gnu::java::awt::java2d::ScanlineCoverage$Range : public ::java::lang::Object +{ + +public: // actually package-private + ScanlineCoverage$Range(); + void setXPos(jint); +public: + jint getXPos(); +public: // actually package-private + void setLength(jint); +public: + jint getLength(); + jint getXPosEnd(); +public: // actually package-private + void setCoverage(jint); +public: + jint getCoverage(); + ::java::lang::String * toString(); +public: // actually package-private + static jint access$0(::gnu::java::awt::java2d::ScanlineCoverage$Range *); +private: + jint __attribute__((aligned(__alignof__( ::java::lang::Object)))) xPos; + jint length; + jint coverage; +public: + static ::java::lang::Class class$; +}; + +#endif // __gnu_java_awt_java2d_ScanlineCoverage$Range__ diff --git a/libjava/gnu/java/awt/java2d/ScanlineCoverage.h b/libjava/gnu/java/awt/java2d/ScanlineCoverage.h new file mode 100644 index 0000000..46d9ae8 --- /dev/null +++ b/libjava/gnu/java/awt/java2d/ScanlineCoverage.h @@ -0,0 +1,67 @@ + +// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*- + +#ifndef __gnu_java_awt_java2d_ScanlineCoverage__ +#define __gnu_java_awt_java2d_ScanlineCoverage__ + +#pragma interface + +#include <java/lang/Object.h> +extern "Java" +{ + namespace gnu + { + namespace java + { + namespace awt + { + namespace java2d + { + class ScanlineCoverage; + class ScanlineCoverage$Coverage; + class ScanlineCoverage$Iterator; + } + } + } + } +} + +class gnu::java::awt::java2d::ScanlineCoverage : public ::java::lang::Object +{ + +public: + ScanlineCoverage(); + void rewind(); + void clear(); + void add(jint, jint, jint); + jint getMaxCoverage(); +public: // actually package-private + void setMaxCoverage(jint); +public: + jint getMaxX(); + jint getMinX(); +private: + ::gnu::java::awt::java2d::ScanlineCoverage$Coverage * findOrInsert(jint); +public: + ::gnu::java::awt::java2d::ScanlineCoverage$Iterator * iterate(); + jboolean isEmpty(); +public: // actually package-private + static ::gnu::java::awt::java2d::ScanlineCoverage$Coverage * access$0(::gnu::java::awt::java2d::ScanlineCoverage *); + static ::gnu::java::awt::java2d::ScanlineCoverage$Coverage * access$1(::gnu::java::awt::java2d::ScanlineCoverage *); +private: + ::gnu::java::awt::java2d::ScanlineCoverage$Coverage * __attribute__((aligned(__alignof__( ::java::lang::Object)))) head; + ::gnu::java::awt::java2d::ScanlineCoverage$Coverage * current; + ::gnu::java::awt::java2d::ScanlineCoverage$Coverage * currentPrev; + ::gnu::java::awt::java2d::ScanlineCoverage$Coverage * last; + ::gnu::java::awt::java2d::ScanlineCoverage$Coverage * lastPrev; + jint minX; + jint maxX; + jint maxCoverage; + ::gnu::java::awt::java2d::ScanlineCoverage$Iterator * iterator; +public: // actually package-private + static jboolean $assertionsDisabled; +public: + static ::java::lang::Class class$; +}; + +#endif // __gnu_java_awt_java2d_ScanlineCoverage__ diff --git a/libjava/gnu/java/awt/java2d/ShapeCache.h b/libjava/gnu/java/awt/java2d/ShapeCache.h index ac7f3da..1ae8ffd 100644 --- a/libjava/gnu/java/awt/java2d/ShapeCache.h +++ b/libjava/gnu/java/awt/java2d/ShapeCache.h @@ -32,6 +32,7 @@ extern "Java" { class Arc2D; class Ellipse2D; + class GeneralPath; class Line2D; class RoundRectangle2D; } @@ -50,6 +51,7 @@ public: ::java::awt::geom::Ellipse2D * ellipse; ::java::awt::geom::Arc2D * arc; ::java::awt::Polygon * polygon; + ::java::awt::geom::GeneralPath * polyline; static ::java::lang::Class class$; }; diff --git a/libjava/gnu/java/awt/peer/ClasspathFontPeer.h b/libjava/gnu/java/awt/peer/ClasspathFontPeer.h index 2752664..18ab58c 100644 --- a/libjava/gnu/java/awt/peer/ClasspathFontPeer.h +++ b/libjava/gnu/java/awt/peer/ClasspathFontPeer.h @@ -95,7 +95,7 @@ public: virtual jboolean isTransformed(::java::awt::Font *); virtual jfloat getItalicAngle(::java::awt::Font *); virtual jint getStyle(::java::awt::Font *); - virtual jboolean canDisplay(::java::awt::Font *, jchar) = 0; + virtual jboolean canDisplay(::java::awt::Font *, jint) = 0; virtual jint canDisplayUpTo(::java::awt::Font *, ::java::text::CharacterIterator *, jint, jint) = 0; virtual ::java::lang::String * getSubFamilyName(::java::awt::Font *, ::java::util::Locale *) = 0; virtual ::java::lang::String * getPostScriptName(::java::awt::Font *) = 0; diff --git a/libjava/gnu/java/awt/peer/EmbeddedWindowPeer.h b/libjava/gnu/java/awt/peer/EmbeddedWindowPeer.h index 53715c4..89b4c8b 100644 --- a/libjava/gnu/java/awt/peer/EmbeddedWindowPeer.h +++ b/libjava/gnu/java/awt/peer/EmbeddedWindowPeer.h @@ -32,6 +32,7 @@ extern "Java" class Color; class Component; class Cursor; + class Dialog; class Dimension; class Font; class FontMetrics; @@ -60,6 +61,13 @@ extern "Java" } } } + namespace sun + { + namespace awt + { + class CausedFocusEvent$Cause; + } + } } class gnu::java::awt::peer::EmbeddedWindowPeer : public ::java::lang::Object @@ -76,10 +84,16 @@ public: virtual void setMaximizedBounds(::java::awt::Rectangle *) = 0; virtual jboolean isRestackSupported() = 0; virtual void setBoundsPrivate(jint, jint, jint, jint) = 0; + virtual ::java::awt::Rectangle * getBoundsPrivate() = 0; virtual void toBack() = 0; virtual void toFront() = 0; virtual void updateAlwaysOnTop() = 0; virtual jboolean requestWindowFocus() = 0; + virtual void setAlwaysOnTop(jboolean) = 0; + virtual void updateFocusableWindowState() = 0; + virtual void setModalBlocked(::java::awt::Dialog *, jboolean) = 0; + virtual void updateMinimumSize() = 0; + virtual void updateIconImages() = 0; virtual ::java::awt::Insets * insets() = 0; virtual ::java::awt::Insets * getInsets() = 0; virtual void beginValidate() = 0; @@ -140,6 +154,7 @@ public: virtual void setBounds(jint, jint, jint, jint, jint) = 0; virtual jboolean isReparentSupported() = 0; virtual void layout() = 0; + virtual jboolean requestFocus(::java::awt::Component *, jboolean, jboolean, jlong, ::sun::awt::CausedFocusEvent$Cause *) = 0; static ::java::lang::Class class$; } __attribute__ ((java_interface)); diff --git a/libjava/gnu/java/awt/peer/GLightweightPeer.h b/libjava/gnu/java/awt/peer/GLightweightPeer.h index d9e6e58..ecf0b46 100644 --- a/libjava/gnu/java/awt/peer/GLightweightPeer.h +++ b/libjava/gnu/java/awt/peer/GLightweightPeer.h @@ -59,6 +59,13 @@ extern "Java" } } } + namespace sun + { + namespace awt + { + class CausedFocusEvent$Cause; + } + } } class gnu::java::awt::peer::GLightweightPeer : public ::java::lang::Object @@ -127,6 +134,7 @@ public: virtual void setBounds(jint, jint, jint, jint, jint); virtual jboolean isReparentSupported(); virtual void layout(); + virtual jboolean requestFocus(::java::awt::Component *, jboolean, jboolean, jlong, ::sun::awt::CausedFocusEvent$Cause *); static ::java::lang::Class class$; }; diff --git a/libjava/gnu/java/awt/peer/gtk/FreetypeGlyphVector.h b/libjava/gnu/java/awt/peer/gtk/FreetypeGlyphVector.h index 47b452e..f782b9c 100644 --- a/libjava/gnu/java/awt/peer/gtk/FreetypeGlyphVector.h +++ b/libjava/gnu/java/awt/peer/gtk/FreetypeGlyphVector.h @@ -91,6 +91,9 @@ public: virtual ::java::awt::geom::Point2D * getGlyphPosition(jint); virtual JArray< jfloat > * getGlyphPositions(jint, jint, JArray< jfloat > *); virtual ::java::awt::geom::AffineTransform * getGlyphTransform(jint); +public: // actually protected + virtual jboolean hasTransforms(); +public: virtual ::java::awt::Shape * getGlyphVisualBounds(jint); virtual ::java::awt::geom::Rectangle2D * getLogicalBounds(); virtual jint getNumGlyphs(); diff --git a/libjava/gnu/java/awt/peer/gtk/GdkFontPeer.h b/libjava/gnu/java/awt/peer/gtk/GdkFontPeer.h index d7168b27..ebfdd2c 100644 --- a/libjava/gnu/java/awt/peer/gtk/GdkFontPeer.h +++ b/libjava/gnu/java/awt/peer/gtk/GdkFontPeer.h @@ -13,6 +13,10 @@ extern "Java" { namespace gnu { + namespace classpath + { + class Pointer; + } namespace java { namespace awt @@ -93,7 +97,7 @@ public: private: ::java::lang::String * getName(jint, ::java::util::Locale *); public: - virtual jboolean canDisplay(::java::awt::Font *, jchar); + virtual jboolean canDisplay(::java::awt::Font *, jint); virtual jint canDisplayUpTo(::java::awt::Font *, ::java::text::CharacterIterator *, jint, jint); virtual ::java::awt::font::GlyphVector * createGlyphVector(::java::awt::Font *, ::java::awt::font::FontRenderContext *, ::java::text::CharacterIterator *); virtual ::java::awt::font::GlyphVector * createGlyphVector(::java::awt::Font *, ::java::awt::font::FontRenderContext *, JArray< jint > *); @@ -135,6 +139,7 @@ public: // actually package-private ::gnu::java::awt::peer::gtk::GdkFontPeer$GdkFontMetrics * metrics; private: ::java::nio::ByteBuffer * nameTable; + ::gnu::classpath::Pointer * nativeFont; public: static ::java::lang::Class class$; }; diff --git a/libjava/gnu/java/awt/peer/gtk/GdkGraphicsEnvironment.h b/libjava/gnu/java/awt/peer/gtk/GdkGraphicsEnvironment.h index 49586fc..78d947c 100644 --- a/libjava/gnu/java/awt/peer/gtk/GdkGraphicsEnvironment.h +++ b/libjava/gnu/java/awt/peer/gtk/GdkGraphicsEnvironment.h @@ -13,6 +13,10 @@ extern "Java" { namespace gnu { + namespace classpath + { + class Pointer; + } namespace java { namespace awt @@ -49,8 +53,7 @@ extern "Java" class gnu::java::awt::peer::gtk::GdkGraphicsEnvironment : public ::gnu::java::awt::ClasspathGraphicsEnvironment { -public: // actually package-private - static void initStaticState(); + static void initIDs(); public: GdkGraphicsEnvironment(); public: // actually package-private @@ -80,6 +83,7 @@ private: jint __attribute__((aligned(__alignof__( ::gnu::java::awt::ClasspathGraphicsEnvironment)))) native_state; ::gnu::java::awt::peer::gtk::GdkScreenGraphicsDevice * defaultDevice; JArray< ::gnu::java::awt::peer::gtk::GdkScreenGraphicsDevice * > * devices; + ::gnu::classpath::Pointer * display; public: static ::java::lang::Class class$; }; diff --git a/libjava/gnu/java/awt/peer/gtk/GdkPixbufDecoder.h b/libjava/gnu/java/awt/peer/gtk/GdkPixbufDecoder.h index 8f70665..1c5fa79 100644 --- a/libjava/gnu/java/awt/peer/gtk/GdkPixbufDecoder.h +++ b/libjava/gnu/java/awt/peer/gtk/GdkPixbufDecoder.h @@ -13,6 +13,10 @@ extern "Java" { namespace gnu { + namespace classpath + { + class Pointer; + } namespace java { namespace awt @@ -96,6 +100,9 @@ private: jboolean needsClose; public: // actually package-private ::java::util::Vector * curr; +private: + ::gnu::classpath::Pointer * nativeDecoder; +public: // actually package-private static ::java::awt::image::ColorModel * cm; static ::java::util::ArrayList * imageFormatSpecs; private: diff --git a/libjava/gnu/java/awt/peer/gtk/GdkRobotPeer.h b/libjava/gnu/java/awt/peer/gtk/GdkRobotPeer.h index d961df3..24c6a85 100644 --- a/libjava/gnu/java/awt/peer/gtk/GdkRobotPeer.h +++ b/libjava/gnu/java/awt/peer/gtk/GdkRobotPeer.h @@ -60,6 +60,7 @@ public: // actually package-private public: virtual jint getRGBPixel(jint, jint); virtual JArray< jint > * getRGBPixels(::java::awt::Rectangle *); + virtual void dispose(); public: // actually package-private static ::java::awt::image::ColorModel * cm; public: diff --git a/libjava/gnu/java/awt/peer/gtk/GdkScreenGraphicsDevice.h b/libjava/gnu/java/awt/peer/gtk/GdkScreenGraphicsDevice.h index 30c165f..ff0362b 100644 --- a/libjava/gnu/java/awt/peer/gtk/GdkScreenGraphicsDevice.h +++ b/libjava/gnu/java/awt/peer/gtk/GdkScreenGraphicsDevice.h @@ -13,6 +13,10 @@ extern "Java" { namespace gnu { + namespace classpath + { + class Pointer; + } namespace java { namespace awt @@ -46,7 +50,7 @@ class gnu::java::awt::peer::gtk::GdkScreenGraphicsDevice : public ::java::awt::G { public: // actually package-private - static void initStaticState(); + static void initIDs(); GdkScreenGraphicsDevice(::gnu::java::awt::peer::gtk::GdkGraphicsEnvironment *); virtual void init(); virtual ::java::awt::DisplayMode * nativeGetFixedDisplayMode(::gnu::java::awt::peer::gtk::GdkGraphicsEnvironment *); @@ -90,6 +94,8 @@ public: // actually package-private ::java::lang::String * idString; JArray< ::gnu::java::awt::peer::gtk::GdkScreenGraphicsDevice$X11DisplayMode * > * displayModes; ::java::awt::DisplayMode * fixedDisplayMode; +private: + ::gnu::classpath::Pointer * screen; public: static ::java::lang::Class class$; }; diff --git a/libjava/gnu/java/awt/peer/gtk/GtkComponentPeer.h b/libjava/gnu/java/awt/peer/gtk/GtkComponentPeer.h index d29f036..fa35e2a 100644 --- a/libjava/gnu/java/awt/peer/gtk/GtkComponentPeer.h +++ b/libjava/gnu/java/awt/peer/gtk/GtkComponentPeer.h @@ -67,6 +67,13 @@ extern "Java" } } } + namespace sun + { + namespace awt + { + class CausedFocusEvent$Cause; + } + } } class gnu::java::awt::peer::gtk::GtkComponentPeer : public ::gnu::java::awt::peer::gtk::GtkGenericPeer @@ -182,6 +189,7 @@ public: virtual void setBounds(jint, jint, jint, jint, jint); virtual jboolean isReparentSupported(); virtual void layout(); + virtual jboolean requestFocus(::java::awt::Component *, jboolean, jboolean, jlong, ::sun::awt::CausedFocusEvent$Cause *); public: // actually package-private ::java::awt::image::VolatileImage * __attribute__((aligned(__alignof__( ::gnu::java::awt::peer::gtk::GtkGenericPeer)))) backBuffer; ::java::awt::BufferCapabilities * caps; diff --git a/libjava/gnu/java/awt/peer/gtk/GtkFramePeer.h b/libjava/gnu/java/awt/peer/gtk/GtkFramePeer.h index c136fa9..2c8ea0e 100644 --- a/libjava/gnu/java/awt/peer/gtk/GtkFramePeer.h +++ b/libjava/gnu/java/awt/peer/gtk/GtkFramePeer.h @@ -80,6 +80,7 @@ public: virtual void setMaximizedBounds(::java::awt::Rectangle *); virtual void setBoundsPrivate(jint, jint, jint, jint); virtual jboolean requestWindowFocus(); + virtual ::java::awt::Rectangle * getBoundsPrivate(); private: jint __attribute__((aligned(__alignof__( ::gnu::java::awt::peer::gtk::GtkWindowPeer)))) menuBarHeight; ::java::awt::peer::MenuBarPeer * menuBar; diff --git a/libjava/gnu/java/awt/peer/gtk/GtkGenericPeer.h b/libjava/gnu/java/awt/peer/gtk/GtkGenericPeer.h index 6c9c87d..ffb135b 100644 --- a/libjava/gnu/java/awt/peer/gtk/GtkGenericPeer.h +++ b/libjava/gnu/java/awt/peer/gtk/GtkGenericPeer.h @@ -11,6 +11,10 @@ extern "Java" { namespace gnu { + namespace classpath + { + class Pointer; + } namespace java { namespace awt @@ -38,6 +42,7 @@ extern "Java" class gnu::java::awt::peer::gtk::GtkGenericPeer : public ::java::lang::Object { + static void initIDs(); public: virtual void dispose(); public: // actually package-private @@ -57,6 +62,9 @@ private: static jint next_native_state; public: // actually protected ::java::lang::Object * awtWidget; +private: + ::gnu::classpath::Pointer * widget; + ::gnu::classpath::Pointer * globalRef; public: static ::java::lang::Class class$; }; diff --git a/libjava/gnu/java/awt/peer/gtk/GtkToolkit.h b/libjava/gnu/java/awt/peer/gtk/GtkToolkit.h index 66b3fcb..c562e05 100644 --- a/libjava/gnu/java/awt/peer/gtk/GtkToolkit.h +++ b/libjava/gnu/java/awt/peer/gtk/GtkToolkit.h @@ -44,6 +44,8 @@ extern "Java" class Component; class Cursor; class Dialog; + class Dialog$ModalExclusionType; + class Dialog$ModalityType; class Dimension; class EventQueue; class FileDialog; @@ -144,6 +146,10 @@ public: // actually package-private static void gtkInit(jint, ::java::lang::Object *); static void gtkMain(); static void gtkQuit(); +private: + static void initIDs(); +public: // actually package-private + static void initializeGlobalIDs(); public: GtkToolkit(); virtual void beep(); @@ -228,10 +234,13 @@ private: void checkHeadless(); public: virtual jint getMouseNumberOfButtons(); + virtual jboolean isModalExclusionTypeSupported(::java::awt::Dialog$ModalExclusionType *); + virtual jboolean isModalityTypeSupported(::java::awt::Dialog$ModalityType *); public: // actually package-private static ::java::lang::Object * GTK_LOCK; private: static ::java::awt::EventQueue * q; + static jboolean initializedGlobalIDs; ::gnu::java::awt::peer::gtk::GtkToolkit$LRUCache * __attribute__((aligned(__alignof__( ::gnu::java::awt::ClasspathToolkit)))) fontCache; ::gnu::java::awt::peer::gtk::GtkToolkit$LRUCache * imageCache; public: diff --git a/libjava/gnu/java/awt/peer/gtk/GtkWindowPeer.h b/libjava/gnu/java/awt/peer/gtk/GtkWindowPeer.h index da0c325..3eb4c14 100644 --- a/libjava/gnu/java/awt/peer/gtk/GtkWindowPeer.h +++ b/libjava/gnu/java/awt/peer/gtk/GtkWindowPeer.h @@ -30,6 +30,7 @@ extern "Java" namespace awt { class Component; + class Dialog; class Graphics; class Rectangle; class Window; @@ -101,6 +102,11 @@ public: // actually protected virtual void postMouseEvent(jint, jlong, jint, jint, jint, jint, jboolean); public: virtual ::java::awt::Rectangle * getBounds(); + virtual void updateIconImages(); + virtual void updateMinimumSize(); + virtual void setModalBlocked(::java::awt::Dialog *, jboolean); + virtual void updateFocusableWindowState(); + virtual void setAlwaysOnTop(jboolean); public: // actually protected static const jint GDK_WINDOW_TYPE_HINT_NORMAL = 0; static const jint GDK_WINDOW_TYPE_HINT_DIALOG = 1; diff --git a/libjava/gnu/java/awt/peer/headless/HeadlessToolkit.h b/libjava/gnu/java/awt/peer/headless/HeadlessToolkit.h index d7a7217..657b323 100644 --- a/libjava/gnu/java/awt/peer/headless/HeadlessToolkit.h +++ b/libjava/gnu/java/awt/peer/headless/HeadlessToolkit.h @@ -41,6 +41,8 @@ extern "Java" class CheckboxMenuItem; class Choice; class Dialog; + class Dialog$ModalExclusionType; + class Dialog$ModalityType; class Dimension; class EventQueue; class FileDialog; @@ -179,6 +181,8 @@ public: virtual ::java::awt::peer::RobotPeer * createRobot(::java::awt::GraphicsDevice *); virtual ::gnu::java::awt::peer::ClasspathFontPeer * getClasspathFontPeer(::java::lang::String *, ::java::util::Map *); virtual ::java::awt::GraphicsEnvironment * getLocalGraphicsEnvironment(); + virtual jboolean isModalExclusionTypeSupported(::java::awt::Dialog$ModalExclusionType *); + virtual jboolean isModalityTypeSupported(::java::awt::Dialog$ModalityType *); private: ::gnu::java::awt::peer::headless::HeadlessGraphicsEnvironment * __attribute__((aligned(__alignof__( ::gnu::java::awt::ClasspathToolkit)))) graphicsEnv; public: diff --git a/libjava/gnu/java/awt/peer/qt/QtComponentPeer.h b/libjava/gnu/java/awt/peer/qt/QtComponentPeer.h index f596e80..4688b8e 100644 --- a/libjava/gnu/java/awt/peer/qt/QtComponentPeer.h +++ b/libjava/gnu/java/awt/peer/qt/QtComponentPeer.h @@ -65,6 +65,13 @@ extern "Java" } } } + namespace sun + { + namespace awt + { + class CausedFocusEvent$Cause; + } + } } class gnu::java::awt::peer::qt::QtComponentPeer : public ::gnu::java::awt::peer::qt::NativeWrapper @@ -168,6 +175,7 @@ public: virtual void setBounds(jint, jint, jint, jint, jint); virtual jboolean isReparentSupported(); virtual void layout(); + virtual jboolean requestFocus(::java::awt::Component *, jboolean, jboolean, jlong, ::sun::awt::CausedFocusEvent$Cause *); public: // actually protected static const jint POPUP_TRIGGER = 3; ::gnu::java::awt::peer::qt::QtToolkit * __attribute__((aligned(__alignof__( ::gnu::java::awt::peer::qt::NativeWrapper)))) toolkit; diff --git a/libjava/gnu/java/awt/peer/qt/QtFontMetrics.h b/libjava/gnu/java/awt/peer/qt/QtFontMetrics.h index a0655f2..fcb30d2 100644 --- a/libjava/gnu/java/awt/peer/qt/QtFontMetrics.h +++ b/libjava/gnu/java/awt/peer/qt/QtFontMetrics.h @@ -59,7 +59,7 @@ private: void dispose(); public: // actually package-private virtual ::java::awt::geom::Rectangle2D * getStringBounds(::java::lang::String *); - virtual jboolean canDisplay(jchar); + virtual jboolean canDisplay(jint); public: virtual jint getAscent(); virtual jint getDescent(); diff --git a/libjava/gnu/java/awt/peer/qt/QtFontPeer.h b/libjava/gnu/java/awt/peer/qt/QtFontPeer.h index 11ca6cc..0daebcc 100644 --- a/libjava/gnu/java/awt/peer/qt/QtFontPeer.h +++ b/libjava/gnu/java/awt/peer/qt/QtFontPeer.h @@ -64,7 +64,7 @@ private: void create(::java::lang::String *, jint, jint); public: virtual void dispose(); - virtual jboolean canDisplay(::java::awt::Font *, jchar); + virtual jboolean canDisplay(::java::awt::Font *, jint); virtual jint canDisplayUpTo(::java::awt::Font *, ::java::text::CharacterIterator *, jint, jint); virtual ::java::lang::String * getSubFamilyName(::java::awt::Font *, ::java::util::Locale *); virtual ::java::lang::String * getPostScriptName(::java::awt::Font *); diff --git a/libjava/gnu/java/awt/peer/qt/QtFramePeer.h b/libjava/gnu/java/awt/peer/qt/QtFramePeer.h index 1b0f39e..a89557c 100644 --- a/libjava/gnu/java/awt/peer/qt/QtFramePeer.h +++ b/libjava/gnu/java/awt/peer/qt/QtFramePeer.h @@ -66,6 +66,7 @@ public: virtual void setBoundsPrivate(jint, jint, jint, jint); virtual void updateAlwaysOnTop(); virtual jboolean requestWindowFocus(); + virtual ::java::awt::Rectangle * getBoundsPrivate(); private: jint __attribute__((aligned(__alignof__( ::gnu::java::awt::peer::qt::QtWindowPeer)))) theState; public: // actually package-private diff --git a/libjava/gnu/java/awt/peer/qt/QtToolkit.h b/libjava/gnu/java/awt/peer/qt/QtToolkit.h index 471794b..319318a 100644 --- a/libjava/gnu/java/awt/peer/qt/QtToolkit.h +++ b/libjava/gnu/java/awt/peer/qt/QtToolkit.h @@ -43,6 +43,8 @@ extern "Java" class CheckboxMenuItem; class Choice; class Dialog; + class Dialog$ModalExclusionType; + class Dialog$ModalityType; class Dimension; class EventQueue; class FileDialog; @@ -193,6 +195,8 @@ public: virtual ::java::awt::Font * createFont(jint, ::java::io::InputStream *); virtual ::java::awt::peer::RobotPeer * createRobot(::java::awt::GraphicsDevice *); virtual ::gnu::java::awt::peer::EmbeddedWindowPeer * createEmbeddedWindow(::gnu::java::awt::EmbeddedWindow *); + virtual jboolean isModalExclusionTypeSupported(::java::awt::Dialog$ModalExclusionType *); + virtual jboolean isModalityTypeSupported(::java::awt::Dialog$ModalityType *); static ::java::awt::EventQueue * eventQueue; static ::gnu::java::awt::peer::qt::QtRepaintThread * repaintThread; static ::gnu::java::awt::peer::qt::MainQtThread * guiThread; diff --git a/libjava/gnu/java/awt/peer/qt/QtWindowPeer.h b/libjava/gnu/java/awt/peer/qt/QtWindowPeer.h index e451e3c..9e5a147 100644 --- a/libjava/gnu/java/awt/peer/qt/QtWindowPeer.h +++ b/libjava/gnu/java/awt/peer/qt/QtWindowPeer.h @@ -31,6 +31,7 @@ extern "Java" namespace awt { class Component; + class Dialog; } } } @@ -49,6 +50,11 @@ public: virtual void setTitle(::java::lang::String *); virtual void updateAlwaysOnTop(); virtual jboolean requestWindowFocus(); + virtual void updateIconImages(); + virtual void updateMinimumSize(); + virtual void setModalBlocked(::java::awt::Dialog *, jboolean); + virtual void updateFocusableWindowState(); + virtual void setAlwaysOnTop(jboolean); static ::java::lang::Class class$; }; diff --git a/libjava/gnu/java/awt/peer/swing/SwingButtonPeer$SwingButton.h b/libjava/gnu/java/awt/peer/swing/SwingButtonPeer$SwingButton.h index 1bc3725..ffaa2b6c 100644 --- a/libjava/gnu/java/awt/peer/swing/SwingButtonPeer$SwingButton.h +++ b/libjava/gnu/java/awt/peer/swing/SwingButtonPeer$SwingButton.h @@ -37,6 +37,7 @@ extern "Java" class Point; namespace event { + class FocusEvent; class KeyEvent; class MouseEvent; } @@ -66,6 +67,9 @@ public: virtual void handleMouseMotionEvent(::java::awt::event::MouseEvent *); virtual void handleKeyEvent(::java::awt::event::KeyEvent *); virtual ::java::awt::Container * getParent(); + virtual void handleFocusEvent(::java::awt::event::FocusEvent *); + virtual void requestFocus(); + virtual jboolean requestFocus(jboolean); public: // actually package-private ::java::awt::Button * __attribute__((aligned(__alignof__( ::javax::swing::JButton)))) button; ::gnu::java::awt::peer::swing::SwingButtonPeer * this$0; diff --git a/libjava/gnu/java/awt/peer/swing/SwingCheckboxPeer$SwingCheckbox.h b/libjava/gnu/java/awt/peer/swing/SwingCheckboxPeer$SwingCheckbox.h new file mode 100644 index 0000000..d50fe66 --- /dev/null +++ b/libjava/gnu/java/awt/peer/swing/SwingCheckboxPeer$SwingCheckbox.h @@ -0,0 +1,80 @@ + +// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*- + +#ifndef __gnu_java_awt_peer_swing_SwingCheckboxPeer$SwingCheckbox__ +#define __gnu_java_awt_peer_swing_SwingCheckboxPeer$SwingCheckbox__ + +#pragma interface + +#include <javax/swing/JCheckBox.h> +extern "Java" +{ + namespace gnu + { + namespace java + { + namespace awt + { + namespace peer + { + namespace swing + { + class SwingCheckboxPeer; + class SwingCheckboxPeer$SwingCheckbox; + } + } + } + } + } + namespace java + { + namespace awt + { + class Checkbox; + class Container; + class Graphics; + class Image; + class Point; + namespace event + { + class FocusEvent; + class KeyEvent; + class MouseEvent; + } + } + } + namespace javax + { + namespace swing + { + class JComponent; + } + } +} + +class gnu::java::awt::peer::swing::SwingCheckboxPeer$SwingCheckbox : public ::javax::swing::JCheckBox +{ + +public: // actually package-private + SwingCheckboxPeer$SwingCheckbox(::gnu::java::awt::peer::swing::SwingCheckboxPeer *, ::java::awt::Checkbox *); +public: + virtual ::javax::swing::JComponent * getJComponent(); + virtual void handleMouseEvent(::java::awt::event::MouseEvent *); + virtual void handleMouseMotionEvent(::java::awt::event::MouseEvent *); + virtual void handleKeyEvent(::java::awt::event::KeyEvent *); + virtual void handleFocusEvent(::java::awt::event::FocusEvent *); + virtual ::java::awt::Point * getLocationOnScreen(); + virtual jboolean isShowing(); + virtual ::java::awt::Image * createImage(jint, jint); + virtual ::java::awt::Graphics * getGraphics(); + virtual ::java::awt::Container * getParent(); + virtual void requestFocus(); + virtual jboolean requestFocus(jboolean); +public: // actually package-private + ::java::awt::Checkbox * __attribute__((aligned(__alignof__( ::javax::swing::JCheckBox)))) checkbox; + ::gnu::java::awt::peer::swing::SwingCheckboxPeer * this$0; +public: + static ::java::lang::Class class$; +}; + +#endif // __gnu_java_awt_peer_swing_SwingCheckboxPeer$SwingCheckbox__ diff --git a/libjava/gnu/java/awt/peer/swing/SwingCheckboxPeer$SwingCheckboxListener.h b/libjava/gnu/java/awt/peer/swing/SwingCheckboxPeer$SwingCheckboxListener.h new file mode 100644 index 0000000..71517ae --- /dev/null +++ b/libjava/gnu/java/awt/peer/swing/SwingCheckboxPeer$SwingCheckboxListener.h @@ -0,0 +1,56 @@ + +// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*- + +#ifndef __gnu_java_awt_peer_swing_SwingCheckboxPeer$SwingCheckboxListener__ +#define __gnu_java_awt_peer_swing_SwingCheckboxPeer$SwingCheckboxListener__ + +#pragma interface + +#include <java/lang/Object.h> +extern "Java" +{ + namespace gnu + { + namespace java + { + namespace awt + { + namespace peer + { + namespace swing + { + class SwingCheckboxPeer; + class SwingCheckboxPeer$SwingCheckboxListener; + } + } + } + } + } + namespace java + { + namespace awt + { + class Checkbox; + namespace event + { + class ItemEvent; + } + } + } +} + +class gnu::java::awt::peer::swing::SwingCheckboxPeer$SwingCheckboxListener : public ::java::lang::Object +{ + +public: // actually package-private + SwingCheckboxPeer$SwingCheckboxListener(::gnu::java::awt::peer::swing::SwingCheckboxPeer *, ::java::awt::Checkbox *); +public: + virtual void itemStateChanged(::java::awt::event::ItemEvent *); +public: // actually package-private + ::java::awt::Checkbox * __attribute__((aligned(__alignof__( ::java::lang::Object)))) awtCheckbox; + ::gnu::java::awt::peer::swing::SwingCheckboxPeer * this$0; +public: + static ::java::lang::Class class$; +}; + +#endif // __gnu_java_awt_peer_swing_SwingCheckboxPeer$SwingCheckboxListener__ diff --git a/libjava/gnu/java/awt/peer/swing/SwingCheckboxPeer.h b/libjava/gnu/java/awt/peer/swing/SwingCheckboxPeer.h new file mode 100644 index 0000000..bceaa21 --- /dev/null +++ b/libjava/gnu/java/awt/peer/swing/SwingCheckboxPeer.h @@ -0,0 +1,49 @@ + +// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*- + +#ifndef __gnu_java_awt_peer_swing_SwingCheckboxPeer__ +#define __gnu_java_awt_peer_swing_SwingCheckboxPeer__ + +#pragma interface + +#include <gnu/java/awt/peer/swing/SwingComponentPeer.h> +extern "Java" +{ + namespace gnu + { + namespace java + { + namespace awt + { + namespace peer + { + namespace swing + { + class SwingCheckboxPeer; + } + } + } + } + } + namespace java + { + namespace awt + { + class Checkbox; + class CheckboxGroup; + } + } +} + +class gnu::java::awt::peer::swing::SwingCheckboxPeer : public ::gnu::java::awt::peer::swing::SwingComponentPeer +{ + +public: + SwingCheckboxPeer(::java::awt::Checkbox *); + virtual void setCheckboxGroup(::java::awt::CheckboxGroup *); + virtual void setLabel(::java::lang::String *); + virtual void setState(jboolean); + static ::java::lang::Class class$; +}; + +#endif // __gnu_java_awt_peer_swing_SwingCheckboxPeer__ diff --git a/libjava/gnu/java/awt/peer/swing/SwingComponent.h b/libjava/gnu/java/awt/peer/swing/SwingComponent.h index b9777c2..619a05e 100644 --- a/libjava/gnu/java/awt/peer/swing/SwingComponent.h +++ b/libjava/gnu/java/awt/peer/swing/SwingComponent.h @@ -31,6 +31,7 @@ extern "Java" { namespace event { + class FocusEvent; class KeyEvent; class MouseEvent; } @@ -53,6 +54,7 @@ public: virtual void handleMouseEvent(::java::awt::event::MouseEvent *) = 0; virtual void handleMouseMotionEvent(::java::awt::event::MouseEvent *) = 0; virtual void handleKeyEvent(::java::awt::event::KeyEvent *) = 0; + virtual void handleFocusEvent(::java::awt::event::FocusEvent *) = 0; static ::java::lang::Class class$; } __attribute__ ((java_interface)); diff --git a/libjava/gnu/java/awt/peer/swing/SwingComponentPeer.h b/libjava/gnu/java/awt/peer/swing/SwingComponentPeer.h index af2d715..5454968 100644 --- a/libjava/gnu/java/awt/peer/swing/SwingComponentPeer.h +++ b/libjava/gnu/java/awt/peer/swing/SwingComponentPeer.h @@ -47,6 +47,7 @@ extern "Java" class Toolkit; namespace event { + class FocusEvent; class KeyEvent; class MouseEvent; class PaintEvent; @@ -64,6 +65,13 @@ extern "Java" } } } + namespace sun + { + namespace awt + { + class CausedFocusEvent$Cause; + } + } } class gnu::java::awt::peer::swing::SwingComponentPeer : public ::java::lang::Object @@ -130,8 +138,10 @@ public: // actually protected virtual void handleMouseEvent(::java::awt::event::MouseEvent *); virtual void handleMouseMotionEvent(::java::awt::event::MouseEvent *); virtual void handleKeyEvent(::java::awt::event::KeyEvent *); + virtual void handleFocusEvent(::java::awt::event::FocusEvent *); public: virtual ::java::awt::Component * getComponent(); + virtual jboolean requestFocus(::java::awt::Component *, jboolean, jboolean, jlong, ::sun::awt::CausedFocusEvent$Cause *); public: // actually protected ::java::awt::Component * __attribute__((aligned(__alignof__( ::java::lang::Object)))) awtComponent; ::gnu::java::awt::peer::swing::SwingComponent * swingComponent; diff --git a/libjava/gnu/java/awt/peer/swing/SwingContainerPeer.h b/libjava/gnu/java/awt/peer/swing/SwingContainerPeer.h index 40d7839..a3895c0 100644 --- a/libjava/gnu/java/awt/peer/swing/SwingContainerPeer.h +++ b/libjava/gnu/java/awt/peer/swing/SwingContainerPeer.h @@ -7,6 +7,8 @@ #pragma interface #include <gnu/java/awt/peer/swing/SwingComponentPeer.h> +#include <gcj/array.h> + extern "Java" { namespace gnu @@ -48,9 +50,10 @@ class gnu::java::awt::peer::swing::SwingContainerPeer : public ::gnu::java::awt: public: SwingContainerPeer(::java::awt::Container *); -public: // actually package-private +public: // actually protected virtual void addHeavyweightDescendent(::java::awt::Component *); virtual void removeHeavyweightDescendent(::java::awt::Component *); + virtual JArray< ::java::awt::Component * > * getHeavyweightDescendents(); public: virtual ::java::awt::Insets * insets(); virtual ::java::awt::Insets * getInsets(); diff --git a/libjava/gnu/java/awt/peer/swing/SwingFramePeer.h b/libjava/gnu/java/awt/peer/swing/SwingFramePeer.h index 2822fcc..e09ee5d 100644 --- a/libjava/gnu/java/awt/peer/swing/SwingFramePeer.h +++ b/libjava/gnu/java/awt/peer/swing/SwingFramePeer.h @@ -68,6 +68,7 @@ public: virtual void setState(jint) = 0; virtual void setMaximizedBounds(::java::awt::Rectangle *) = 0; virtual void setBoundsPrivate(jint, jint, jint, jint) = 0; + virtual ::java::awt::Rectangle * getBoundsPrivate() = 0; public: // actually package-private ::gnu::java::awt::peer::swing::SwingMenuBarPeer * __attribute__((aligned(__alignof__( ::gnu::java::awt::peer::swing::SwingWindowPeer)))) menuBar; public: diff --git a/libjava/gnu/java/awt/peer/swing/SwingLabelPeer$SwingLabel.h b/libjava/gnu/java/awt/peer/swing/SwingLabelPeer$SwingLabel.h index bc9eb61..561c810 100644 --- a/libjava/gnu/java/awt/peer/swing/SwingLabelPeer$SwingLabel.h +++ b/libjava/gnu/java/awt/peer/swing/SwingLabelPeer$SwingLabel.h @@ -37,6 +37,7 @@ extern "Java" class Point; namespace event { + class FocusEvent; class KeyEvent; class MouseEvent; } @@ -61,6 +62,7 @@ public: virtual void handleMouseEvent(::java::awt::event::MouseEvent *); virtual void handleMouseMotionEvent(::java::awt::event::MouseEvent *); virtual void handleKeyEvent(::java::awt::event::KeyEvent *); + virtual void handleFocusEvent(::java::awt::event::FocusEvent *); virtual ::java::awt::Point * getLocationOnScreen(); virtual jboolean isShowing(); virtual ::java::awt::Image * createImage(jint, jint); diff --git a/libjava/gnu/java/awt/peer/swing/SwingListPeer$SwingList.h b/libjava/gnu/java/awt/peer/swing/SwingListPeer$SwingList.h index 507e1e9..76b8b75 100644 --- a/libjava/gnu/java/awt/peer/swing/SwingListPeer$SwingList.h +++ b/libjava/gnu/java/awt/peer/swing/SwingListPeer$SwingList.h @@ -37,6 +37,7 @@ extern "Java" class Point; namespace event { + class FocusEvent; class KeyEvent; class MouseEvent; } @@ -62,6 +63,7 @@ public: virtual jboolean isLightweight(); virtual void handleMouseMotionEvent(::java::awt::event::MouseEvent *); virtual void handleKeyEvent(::java::awt::event::KeyEvent *); + virtual void handleFocusEvent(::java::awt::event::FocusEvent *); virtual ::java::awt::Point * getLocationOnScreen(); virtual jboolean isShowing(); virtual ::java::awt::Image * createImage(jint, jint); diff --git a/libjava/gnu/java/awt/peer/swing/SwingTextAreaPeer$1.h b/libjava/gnu/java/awt/peer/swing/SwingTextAreaPeer$1.h new file mode 100644 index 0000000..1735bf0 --- /dev/null +++ b/libjava/gnu/java/awt/peer/swing/SwingTextAreaPeer$1.h @@ -0,0 +1,51 @@ + +// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*- + +#ifndef __gnu_java_awt_peer_swing_SwingTextAreaPeer$1__ +#define __gnu_java_awt_peer_swing_SwingTextAreaPeer$1__ + +#pragma interface + +#include <javax/swing/JViewport.h> +extern "Java" +{ + namespace gnu + { + namespace java + { + namespace awt + { + namespace peer + { + namespace swing + { + class SwingTextAreaPeer; + class SwingTextAreaPeer$1; + } + } + } + } + } + namespace java + { + namespace awt + { + class Image; + } + } +} + +class gnu::java::awt::peer::swing::SwingTextAreaPeer$1 : public ::javax::swing::JViewport +{ + +public: // actually package-private + SwingTextAreaPeer$1(::gnu::java::awt::peer::swing::SwingTextAreaPeer *); +public: + ::java::awt::Image * createImage(jint, jint); +public: // actually package-private + ::gnu::java::awt::peer::swing::SwingTextAreaPeer * __attribute__((aligned(__alignof__( ::javax::swing::JViewport)))) this$0; +public: + static ::java::lang::Class class$; +}; + +#endif // __gnu_java_awt_peer_swing_SwingTextAreaPeer$1__ diff --git a/libjava/gnu/java/awt/peer/swing/SwingTextAreaPeer$SwingScrollPane.h b/libjava/gnu/java/awt/peer/swing/SwingTextAreaPeer$SwingScrollPane.h new file mode 100644 index 0000000..040c7f0 --- /dev/null +++ b/libjava/gnu/java/awt/peer/swing/SwingTextAreaPeer$SwingScrollPane.h @@ -0,0 +1,81 @@ + +// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*- + +#ifndef __gnu_java_awt_peer_swing_SwingTextAreaPeer$SwingScrollPane__ +#define __gnu_java_awt_peer_swing_SwingTextAreaPeer$SwingScrollPane__ + +#pragma interface + +#include <javax/swing/JScrollPane.h> +extern "Java" +{ + namespace gnu + { + namespace java + { + namespace awt + { + namespace peer + { + namespace swing + { + class SwingTextAreaPeer; + class SwingTextAreaPeer$SwingScrollPane; + class SwingTextAreaPeer$SwingTextArea; + } + } + } + } + } + namespace java + { + namespace awt + { + class Container; + class Graphics; + class Image; + class Point; + namespace event + { + class FocusEvent; + class KeyEvent; + class MouseEvent; + } + } + } + namespace javax + { + namespace swing + { + class JComponent; + } + } +} + +class gnu::java::awt::peer::swing::SwingTextAreaPeer$SwingScrollPane : public ::javax::swing::JScrollPane +{ + +public: // actually package-private + SwingTextAreaPeer$SwingScrollPane(::gnu::java::awt::peer::swing::SwingTextAreaPeer *, ::gnu::java::awt::peer::swing::SwingTextAreaPeer$SwingTextArea *); +public: + virtual ::javax::swing::JComponent * getJComponent(); + virtual void handleMouseEvent(::java::awt::event::MouseEvent *); + virtual jboolean isLightweight(); + virtual void handleMouseMotionEvent(::java::awt::event::MouseEvent *); + virtual void handleKeyEvent(::java::awt::event::KeyEvent *); + virtual void handleFocusEvent(::java::awt::event::FocusEvent *); + virtual ::java::awt::Point * getLocationOnScreen(); + virtual jboolean isShowing(); + virtual ::java::awt::Image * createImage(jint, jint); + virtual ::java::awt::Graphics * getGraphics(); + virtual ::java::awt::Container * getParent(); + virtual void requestFocus(); + virtual jboolean requestFocus(jboolean); +public: // actually package-private + ::gnu::java::awt::peer::swing::SwingTextAreaPeer$SwingTextArea * __attribute__((aligned(__alignof__( ::javax::swing::JScrollPane)))) textArea; + ::gnu::java::awt::peer::swing::SwingTextAreaPeer * this$0; +public: + static ::java::lang::Class class$; +}; + +#endif // __gnu_java_awt_peer_swing_SwingTextAreaPeer$SwingScrollPane__ diff --git a/libjava/gnu/java/awt/peer/swing/SwingTextAreaPeer$SwingTextArea.h b/libjava/gnu/java/awt/peer/swing/SwingTextAreaPeer$SwingTextArea.h index 6b283b6..fe39275 100644 --- a/libjava/gnu/java/awt/peer/swing/SwingTextAreaPeer$SwingTextArea.h +++ b/libjava/gnu/java/awt/peer/swing/SwingTextAreaPeer$SwingTextArea.h @@ -6,7 +6,7 @@ #pragma interface -#include <javax/swing/JScrollPane.h> +#include <javax/swing/JTextArea.h> extern "Java" { namespace gnu @@ -30,45 +30,41 @@ extern "Java" { namespace awt { - class Component; - class Container; - class Graphics; - class Image; - class Point; namespace event { + class ComponentEvent; + class FocusEvent; + class HierarchyEvent; + class InputMethodEvent; class KeyEvent; class MouseEvent; + class MouseWheelEvent; } } } - namespace javax - { - namespace swing - { - class JComponent; - } - } } -class gnu::java::awt::peer::swing::SwingTextAreaPeer$SwingTextArea : public ::javax::swing::JScrollPane +class gnu::java::awt::peer::swing::SwingTextAreaPeer$SwingTextArea : public ::javax::swing::JTextArea { -public: // actually package-private - SwingTextAreaPeer$SwingTextArea(::gnu::java::awt::peer::swing::SwingTextAreaPeer *, ::java::awt::Component *); + SwingTextAreaPeer$SwingTextArea(::gnu::java::awt::peer::swing::SwingTextAreaPeer *); +public: // actually protected + virtual void processComponentKeyEvent(::java::awt::event::KeyEvent *); + virtual void processMouseMotionEvent(::java::awt::event::MouseEvent *); + virtual void processComponentEvent(::java::awt::event::ComponentEvent *); + virtual void processFocusEvent(::java::awt::event::FocusEvent *); + virtual void processHierarchyBoundsEvent(::java::awt::event::HierarchyEvent *); + virtual void processHierarchyEvent(::java::awt::event::HierarchyEvent *); + virtual void processInputMethodEvent(::java::awt::event::InputMethodEvent *); + virtual void processMouseEvent(::java::awt::event::MouseEvent *); + virtual void processMouseWheelEvent(::java::awt::event::MouseWheelEvent *); + virtual void processKeyEvent(::java::awt::event::KeyEvent *); public: - virtual ::javax::swing::JComponent * getJComponent(); - virtual void handleMouseEvent(::java::awt::event::MouseEvent *); - virtual jboolean isLightweight(); - virtual void handleMouseMotionEvent(::java::awt::event::MouseEvent *); - virtual void handleKeyEvent(::java::awt::event::KeyEvent *); - virtual ::java::awt::Point * getLocationOnScreen(); - virtual jboolean isShowing(); - virtual ::java::awt::Image * createImage(jint, jint); - virtual ::java::awt::Graphics * getGraphics(); - virtual ::java::awt::Container * getParent(); + virtual void requestFocus(); + virtual jboolean requestFocus(jboolean); public: // actually package-private - ::gnu::java::awt::peer::swing::SwingTextAreaPeer * __attribute__((aligned(__alignof__( ::javax::swing::JScrollPane)))) this$0; + SwingTextAreaPeer$SwingTextArea(::gnu::java::awt::peer::swing::SwingTextAreaPeer *, ::gnu::java::awt::peer::swing::SwingTextAreaPeer$SwingTextArea *); + ::gnu::java::awt::peer::swing::SwingTextAreaPeer * __attribute__((aligned(__alignof__( ::javax::swing::JTextArea)))) this$0; public: static ::java::lang::Class class$; }; diff --git a/libjava/gnu/java/awt/peer/swing/SwingTextAreaPeer.h b/libjava/gnu/java/awt/peer/swing/SwingTextAreaPeer.h index a9d4b8f..2e58f53 100644 --- a/libjava/gnu/java/awt/peer/swing/SwingTextAreaPeer.h +++ b/libjava/gnu/java/awt/peer/swing/SwingTextAreaPeer.h @@ -20,6 +20,7 @@ extern "Java" namespace swing { class SwingTextAreaPeer; + class SwingTextAreaPeer$SwingTextArea; } } } @@ -38,13 +39,6 @@ extern "Java" } } } - namespace javax - { - namespace swing - { - class JTextArea; - } - } } class gnu::java::awt::peer::swing::SwingTextAreaPeer : public ::gnu::java::awt::peer::swing::SwingComponentPeer @@ -56,6 +50,8 @@ public: virtual ::java::awt::Dimension * getPreferredSize(jint, jint); virtual void insert(::java::lang::String *, jint); virtual void insertText(::java::lang::String *, jint); + virtual ::java::awt::Dimension * minimumSize(); + virtual ::java::awt::Dimension * preferredSize(); virtual ::java::awt::Dimension * minimumSize(jint, jint); virtual ::java::awt::Dimension * preferredSize(jint, jint); virtual void replaceRange(::java::lang::String *, jint, jint); @@ -72,8 +68,9 @@ public: virtual void setCaretPosition(jint); virtual void setEditable(jboolean); virtual void setText(::java::lang::String *); + virtual void reshape(jint, jint, jint, jint); private: - ::javax::swing::JTextArea * __attribute__((aligned(__alignof__( ::gnu::java::awt::peer::swing::SwingComponentPeer)))) jTextArea; + ::gnu::java::awt::peer::swing::SwingTextAreaPeer$SwingTextArea * __attribute__((aligned(__alignof__( ::gnu::java::awt::peer::swing::SwingComponentPeer)))) jTextArea; public: static ::java::lang::Class class$; }; diff --git a/libjava/gnu/java/awt/peer/swing/SwingTextFieldPeer$SwingTextField.h b/libjava/gnu/java/awt/peer/swing/SwingTextFieldPeer$SwingTextField.h index 08ac138..3a46f67 100644 --- a/libjava/gnu/java/awt/peer/swing/SwingTextFieldPeer$SwingTextField.h +++ b/libjava/gnu/java/awt/peer/swing/SwingTextFieldPeer$SwingTextField.h @@ -37,6 +37,7 @@ extern "Java" class TextField; namespace event { + class FocusEvent; class KeyEvent; class MouseEvent; } @@ -64,8 +65,11 @@ public: virtual void handleMouseEvent(::java::awt::event::MouseEvent *); virtual void handleMouseMotionEvent(::java::awt::event::MouseEvent *); virtual void handleKeyEvent(::java::awt::event::KeyEvent *); + virtual void handleFocusEvent(::java::awt::event::FocusEvent *); virtual ::java::awt::Container * getParent(); virtual ::java::awt::Graphics * getGraphics(); + virtual void requestFocus(); + virtual jboolean requestFocus(jboolean); public: // actually package-private ::java::awt::TextField * __attribute__((aligned(__alignof__( ::javax::swing::JTextField)))) textField; ::gnu::java::awt::peer::swing::SwingTextFieldPeer * this$0; diff --git a/libjava/gnu/java/awt/peer/swing/SwingToolkit.h b/libjava/gnu/java/awt/peer/swing/SwingToolkit.h index c84bfe9..9572f3f 100644 --- a/libjava/gnu/java/awt/peer/swing/SwingToolkit.h +++ b/libjava/gnu/java/awt/peer/swing/SwingToolkit.h @@ -31,6 +31,8 @@ extern "Java" { class Button; class Canvas; + class Dialog$ModalExclusionType; + class Dialog$ModalityType; class Label; class Menu; class MenuBar; @@ -67,6 +69,8 @@ public: // actually protected virtual ::java::awt::peer::PanelPeer * createPanel(::java::awt::Panel *); virtual ::java::awt::peer::TextFieldPeer * createTextField(::java::awt::TextField *); public: + virtual jboolean isModalExclusionTypeSupported(::java::awt::Dialog$ModalExclusionType *); + virtual jboolean isModalityTypeSupported(::java::awt::Dialog$ModalityType *); static ::java::lang::Class class$; }; diff --git a/libjava/gnu/java/awt/peer/swing/SwingWindowPeer.h b/libjava/gnu/java/awt/peer/swing/SwingWindowPeer.h index ce4e987..c4fc73f 100644 --- a/libjava/gnu/java/awt/peer/swing/SwingWindowPeer.h +++ b/libjava/gnu/java/awt/peer/swing/SwingWindowPeer.h @@ -29,6 +29,7 @@ extern "Java" { namespace awt { + class Dialog; class Window; } } @@ -39,6 +40,11 @@ class gnu::java::awt::peer::swing::SwingWindowPeer : public ::gnu::java::awt::pe public: SwingWindowPeer(::java::awt::Window *); + virtual void updateIconImages(); + virtual void updateMinimumSize(); + virtual void setModalBlocked(::java::awt::Dialog *, jboolean); + virtual void updateFocusableWindowState(); + virtual void setAlwaysOnTop(jboolean); virtual void toBack() = 0; virtual void toFront() = 0; virtual void updateAlwaysOnTop() = 0; diff --git a/libjava/gnu/java/math/Fixed.h b/libjava/gnu/java/math/Fixed.h index 92c1c55..18f522e 100644 --- a/libjava/gnu/java/math/Fixed.h +++ b/libjava/gnu/java/math/Fixed.h @@ -30,6 +30,7 @@ public: static jint mul(jint, jint, jint); static jint ceil(jint, jint); static jint floor(jint, jint); + static jint trunc(jint, jint); static jint round(jint, jint); static jfloat floatValue(jint, jint); static jdouble doubleValue(jint, jint); |