diff options
Diffstat (limited to 'libjava/gnu/java/awt/peer/gtk')
| -rw-r--r-- | libjava/gnu/java/awt/peer/gtk/BufferedImageGraphics.h | 1 | ||||
| -rw-r--r-- | libjava/gnu/java/awt/peer/gtk/CairoGraphics2D.h | 13 | ||||
| -rw-r--r-- | libjava/gnu/java/awt/peer/gtk/CairoSurface$CairoDataBuffer.h | 44 | ||||
| -rw-r--r-- | libjava/gnu/java/awt/peer/gtk/CairoSurface.h | 42 | ||||
| -rw-r--r-- | libjava/gnu/java/awt/peer/gtk/ComponentGraphics.h | 3 | ||||
| -rw-r--r-- | libjava/gnu/java/awt/peer/gtk/FreetypeGlyphVector.h | 17 | ||||
| -rw-r--r-- | libjava/gnu/java/awt/peer/gtk/GThreadMutex.h | 41 | ||||
| -rw-r--r-- | libjava/gnu/java/awt/peer/gtk/GThreadNativeMethodRunner.h | 58 | ||||
| -rw-r--r-- | libjava/gnu/java/awt/peer/gtk/GdkFontMetrics.h | 74 | ||||
| -rw-r--r-- | libjava/gnu/java/awt/peer/gtk/GdkFontPeer.h | 2 | ||||
| -rw-r--r-- | libjava/gnu/java/awt/peer/gtk/GdkGraphicsEnvironment.h | 11 | ||||
| -rw-r--r-- | libjava/gnu/java/awt/peer/gtk/GtkToolkit$1.h | 40 | ||||
| -rw-r--r-- | libjava/gnu/java/awt/peer/gtk/GtkToolkit.h | 8 |
13 files changed, 65 insertions, 289 deletions
diff --git a/libjava/gnu/java/awt/peer/gtk/BufferedImageGraphics.h b/libjava/gnu/java/awt/peer/gtk/BufferedImageGraphics.h index ef29b9b8060..032eb270cc1 100644 --- a/libjava/gnu/java/awt/peer/gtk/BufferedImageGraphics.h +++ b/libjava/gnu/java/awt/peer/gtk/BufferedImageGraphics.h @@ -87,7 +87,6 @@ public: // actually protected private: ::java::awt::image::BufferedImage * __attribute__((aligned(__alignof__( ::gnu::java::awt::peer::gtk::CairoGraphics2D)))) image; ::java::awt::image::BufferedImage * buffer; - jboolean locked; jint imageWidth; jint imageHeight; public: // actually package-private diff --git a/libjava/gnu/java/awt/peer/gtk/CairoGraphics2D.h b/libjava/gnu/java/awt/peer/gtk/CairoGraphics2D.h index 1be46fbaf7b..5d5ee497dd8 100644 --- a/libjava/gnu/java/awt/peer/gtk/CairoGraphics2D.h +++ b/libjava/gnu/java/awt/peer/gtk/CairoGraphics2D.h @@ -22,6 +22,7 @@ extern "Java" namespace gtk { class CairoGraphics2D; + class CairoSurface; class GdkFontPeer; } } @@ -109,9 +110,7 @@ public: // actually protected virtual void cairoSetFillRule(jlong, jint); virtual void cairoSetLine(jlong, jdouble, jint, jint, jdouble); virtual void cairoSetDash(jlong, JArray< jdouble > *, jint, jdouble); -public: // actually package-private - virtual void cairoDrawGlyphVector(jlong, ::gnu::java::awt::peer::gtk::GdkFontPeer *, jfloat, jfloat, jint, JArray< jint > *, JArray< jfloat > *); -public: // actually protected + virtual void cairoDrawGlyphVector(jlong, ::gnu::java::awt::peer::gtk::GdkFontPeer *, jfloat, jfloat, jint, JArray< jint > *, JArray< jfloat > *, JArray< jlong > *); virtual void cairoSetFont(jlong, ::gnu::java::awt::peer::gtk::GdkFontPeer *); virtual void cairoRectangle(jlong, jdouble, jdouble, jdouble, jdouble); virtual void cairoArc(jlong, jdouble, jdouble, jdouble, jdouble, jdouble); @@ -126,6 +125,7 @@ public: // actually protected virtual void cairoFill(jlong, jdouble); virtual void cairoClip(jlong); virtual void cairoResetClip(jlong); + virtual void cairoSetAntialias(jlong, jboolean); public: virtual void setTransform(::java::awt::geom::AffineTransform *); private: @@ -200,6 +200,7 @@ public: virtual ::java::awt::RenderingHints * getRenderingHints(); private: jint getInterpolation(); + void setAntialias(jboolean); public: // actually protected virtual jboolean drawImage(::java::awt::Image *, ::java::awt::geom::AffineTransform *, ::java::awt::Color *, ::java::awt::image::ImageObserver *); public: @@ -213,6 +214,9 @@ public: virtual jboolean drawImage(::java::awt::Image *, jint, jint, jint, jint, ::java::awt::image::ImageObserver *); virtual jboolean drawImage(::java::awt::Image *, jint, jint, jint, jint, jint, jint, jint, jint, ::java::awt::Color *, ::java::awt::image::ImageObserver *); virtual jboolean drawImage(::java::awt::Image *, jint, jint, jint, jint, jint, jint, jint, jint, ::java::awt::image::ImageObserver *); +public: // actually protected + virtual void drawCairoSurface(::gnu::java::awt::peer::gtk::CairoSurface *, ::java::awt::geom::AffineTransform *, jdouble, jint); +public: virtual void drawString(::java::lang::String *, jfloat, jfloat); virtual void drawString(::java::lang::String *, jint, jint); virtual void drawString(::java::text::AttributedCharacterIterator *, jint, jint); @@ -237,6 +241,7 @@ private: void updateClip(::java::awt::geom::AffineTransform *); static ::java::awt::Rectangle * computeIntersection(jint, jint, jint, jint, ::java::awt::Rectangle *); public: // actually package-private + static ::java::awt::geom::Rectangle2D * getTransformedBounds(::java::awt::geom::Rectangle2D *, ::java::awt::geom::AffineTransform *); jlong __attribute__((aligned(__alignof__( ::java::awt::Graphics2D)))) nativePointer; ::java::awt::Paint * paint; jboolean customPaint; @@ -250,6 +255,8 @@ public: // actually package-private ::java::awt::CompositeContext * compCtx; private: ::java::awt::RenderingHints * hints; + jboolean antialias; + jboolean ignoreAA; public: // actually protected jboolean shiftDrawCalls; private: diff --git a/libjava/gnu/java/awt/peer/gtk/CairoSurface$CairoDataBuffer.h b/libjava/gnu/java/awt/peer/gtk/CairoSurface$CairoDataBuffer.h deleted file mode 100644 index 3373a83bdbd..00000000000 --- a/libjava/gnu/java/awt/peer/gtk/CairoSurface$CairoDataBuffer.h +++ /dev/null @@ -1,44 +0,0 @@ - -// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*- - -#ifndef __gnu_java_awt_peer_gtk_CairoSurface$CairoDataBuffer__ -#define __gnu_java_awt_peer_gtk_CairoSurface$CairoDataBuffer__ - -#pragma interface - -#include <java/awt/image/DataBuffer.h> -extern "Java" -{ - namespace gnu - { - namespace java - { - namespace awt - { - namespace peer - { - namespace gtk - { - class CairoSurface; - class CairoSurface$CairoDataBuffer; - } - } - } - } - } -} - -class gnu::java::awt::peer::gtk::CairoSurface$CairoDataBuffer : public ::java::awt::image::DataBuffer -{ - -public: - CairoSurface$CairoDataBuffer(::gnu::java::awt::peer::gtk::CairoSurface *); - virtual jint getElem(jint, jint); - virtual void setElem(jint, jint, jint); -public: // actually package-private - ::gnu::java::awt::peer::gtk::CairoSurface * __attribute__((aligned(__alignof__( ::java::awt::image::DataBuffer)))) this$0; -public: - static ::java::lang::Class class$; -}; - -#endif // __gnu_java_awt_peer_gtk_CairoSurface$CairoDataBuffer__ diff --git a/libjava/gnu/java/awt/peer/gtk/CairoSurface.h b/libjava/gnu/java/awt/peer/gtk/CairoSurface.h index bc33bdb6391..7e34ee923b4 100644 --- a/libjava/gnu/java/awt/peer/gtk/CairoSurface.h +++ b/libjava/gnu/java/awt/peer/gtk/CairoSurface.h @@ -33,11 +33,15 @@ extern "Java" namespace awt { class Graphics2D; + class Point; + class Rectangle; namespace image { class BufferedImage; class ColorModel; + class Raster; class SampleModel; + class WritableRaster; } } } @@ -46,25 +50,18 @@ extern "Java" class gnu::java::awt::peer::gtk::CairoSurface : public ::java::awt::image::WritableRaster { - void create(jint, jint, jint); - void destroy(jlong, jlong); - jint nativeGetElem(jlong, jint); - void nativeSetElem(jlong, jint, jint); + void create(jint, jint, jint, JArray< jint > *); + void destroy(jlong, JArray< jint > *); public: virtual void nativeDrawSurface(jlong, jlong, JArray< jdouble > *, jdouble, jint); - virtual void drawSurface(jlong, JArray< jdouble > *, jdouble, jint); public: // actually package-private - virtual JArray< jint > * nativeGetPixels(jlong, jint); -public: - virtual JArray< jint > * getPixels(jint); -public: // actually package-private - virtual void nativeSetPixels(jlong, JArray< jint > *); -public: - virtual void setPixels(JArray< jint > *); -public: // actually package-private - virtual jlong getFlippedBuffer(jlong, jint); + virtual void syncNativeToJava(jlong, JArray< jint > *); + virtual void syncJavaToNative(jlong, JArray< jint > *); + virtual jlong getFlippedBuffer(jlong); public: CairoSurface(jint, jint); + CairoSurface(jint, jint, jint, jint); + CairoSurface(::java::awt::image::SampleModel *, ::gnu::java::awt::peer::gtk::CairoSurface *, ::java::awt::Rectangle *, ::java::awt::Point *); public: // actually package-private CairoSurface(::gnu::java::awt::peer::gtk::GtkImage *); public: @@ -73,6 +70,7 @@ public: // actually protected virtual void finalize(); public: virtual ::gnu::java::awt::peer::gtk::GtkImage * getGtkImage(); + virtual JArray< jint > * getData(); static ::java::awt::image::BufferedImage * getBufferedImage(jint, jint); static ::java::awt::image::BufferedImage * getBufferedImage(::gnu::java::awt::peer::gtk::GtkImage *); static ::java::awt::image::BufferedImage * getBufferedImage(::gnu::java::awt::peer::gtk::CairoSurface *); @@ -81,19 +79,25 @@ public: // actually package-private virtual jlong nativeNewCairoContext(jlong); public: virtual jlong newCairoContext(); + virtual void copyAreaNative(jint, jint, jint, jint, jint, jint, jint); public: // actually package-private virtual void copyAreaNative2(jlong, jint, jint, jint, jint, jint, jint, jint); -public: - virtual void copyAreaNative(jint, jint, jint, jint, jint, jint, jint); public: // actually protected static ::java::awt::image::SampleModel * createCairoSampleModel(jint, jint); +public: + static jboolean isCompatibleColorModel(::java::awt::image::ColorModel *); + static jboolean isCompatibleSampleModel(::java::awt::image::SampleModel *); + virtual ::java::awt::image::Raster * createChild(jint, jint, jint, jint, jint, jint, JArray< jint > *); + virtual ::java::awt::image::WritableRaster * createCompatibleWritableRaster(); + virtual ::java::awt::image::WritableRaster * createCompatibleWritableRaster(jint, jint, jint, jint); + virtual ::java::awt::image::Raster * createTranslatedChild(jint, jint); + virtual ::java::awt::image::WritableRaster * createWritableChild(jint, jint, jint, jint, jint, jint, JArray< jint > *); + virtual ::java::awt::image::WritableRaster * createWritableTranslatedChild(jint, jint); public: // actually package-private - static jint access$0(::gnu::java::awt::peer::gtk::CairoSurface *, jlong, jint); - static void access$1(::gnu::java::awt::peer::gtk::CairoSurface *, jlong, jint, jint); jint __attribute__((aligned(__alignof__( ::java::awt::image::WritableRaster)))) width; jint height; jlong surfacePointer; - jlong bufferPointer; + jboolean sharedBuffer; static ::java::awt::image::ColorModel * cairoColorModel; static ::java::awt::image::ColorModel * cairoCM_pre; static ::java::awt::image::ColorModel * cairoCM_opaque; diff --git a/libjava/gnu/java/awt/peer/gtk/ComponentGraphics.h b/libjava/gnu/java/awt/peer/gtk/ComponentGraphics.h index ce5a55849a7..9379c5ea611 100644 --- a/libjava/gnu/java/awt/peer/gtk/ComponentGraphics.h +++ b/libjava/gnu/java/awt/peer/gtk/ComponentGraphics.h @@ -25,6 +25,7 @@ extern "Java" { namespace gtk { + class CairoSurface; class ComponentGraphics; class GtkComponentPeer; class GtkImage; @@ -132,6 +133,8 @@ public: // actually protected virtual void cairoFill(jlong, jdouble); virtual void cairoClip(jlong); virtual void cairoResetClip(jlong); + virtual void cairoSetAntialias(jlong, jboolean); + virtual void drawCairoSurface(::gnu::java::awt::peer::gtk::CairoSurface *, ::java::awt::geom::AffineTransform *, jdouble, jint); private: static jboolean hasXRenderExtension; ::gnu::java::awt::peer::gtk::GtkComponentPeer * __attribute__((aligned(__alignof__( ::gnu::java::awt::peer::gtk::CairoGraphics2D)))) component; diff --git a/libjava/gnu/java/awt/peer/gtk/FreetypeGlyphVector.h b/libjava/gnu/java/awt/peer/gtk/FreetypeGlyphVector.h index 312e69c0076..47b452ee712 100644 --- a/libjava/gnu/java/awt/peer/gtk/FreetypeGlyphVector.h +++ b/libjava/gnu/java/awt/peer/gtk/FreetypeGlyphVector.h @@ -55,19 +55,24 @@ extern "Java" class gnu::java::awt::peer::gtk::FreetypeGlyphVector : public ::java::awt::font::GlyphVector { + void dispose(JArray< jlong > *); + jlong getNativeFontPointer(jint); public: FreetypeGlyphVector(::java::awt::Font *, ::java::lang::String *, ::java::awt::font::FontRenderContext *); FreetypeGlyphVector(::java::awt::Font *, JArray< jchar > *, jint, jint, ::java::awt::font::FontRenderContext *, jint); FreetypeGlyphVector(::java::awt::Font *, JArray< jint > *, ::java::awt::font::FontRenderContext *); private: FreetypeGlyphVector(::gnu::java::awt::peer::gtk::FreetypeGlyphVector *); +public: + virtual void finalize(); +private: void getGlyphs(); public: - virtual JArray< jint > * getGlyphs(JArray< jint > *); + virtual void getGlyphs(JArray< jint > *, JArray< jint > *, JArray< jlong > *); private: - ::java::awt::geom::Point2D * getKerning(jint, jint); - JArray< jdouble > * getMetricsNative(jint); - ::java::awt::geom::GeneralPath * getGlyphOutlineNative(jint); + ::java::awt::geom::Point2D * getKerning(jint, jint, jlong); + JArray< jdouble > * getMetricsNative(jint, jlong); + ::java::awt::geom::GeneralPath * getGlyphOutlineNative(jint, jlong); public: virtual ::java::lang::Object * clone(); virtual jboolean equals(::java::awt::font::GlyphVector *); @@ -76,6 +81,9 @@ public: virtual void performDefaultLayout(); virtual jint getGlyphCode(jint); virtual JArray< jint > * getGlyphCodes(jint, jint, JArray< jint > *); +public: // actually protected + virtual JArray< jlong > * getGlyphFonts(jint, jint, JArray< jlong > *); +public: virtual ::java::awt::Shape * getGlyphLogicalBounds(jint); virtual void setupGlyphMetrics(); virtual ::java::awt::font::GlyphMetrics * getGlyphMetrics(jint); @@ -101,6 +109,7 @@ private: ::java::awt::font::FontRenderContext * frc; jint nGlyphs; JArray< jint > * glyphCodes; + JArray< jlong > * fontSet; JArray< ::java::awt::geom::AffineTransform * > * glyphTransforms; JArray< ::java::awt::font::GlyphMetrics * > * metricsCache; public: diff --git a/libjava/gnu/java/awt/peer/gtk/GThreadMutex.h b/libjava/gnu/java/awt/peer/gtk/GThreadMutex.h deleted file mode 100644 index c788e827531..00000000000 --- a/libjava/gnu/java/awt/peer/gtk/GThreadMutex.h +++ /dev/null @@ -1,41 +0,0 @@ - -// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*- - -#ifndef __gnu_java_awt_peer_gtk_GThreadMutex__ -#define __gnu_java_awt_peer_gtk_GThreadMutex__ - -#pragma interface - -#include <java/lang/Object.h> -extern "Java" -{ - namespace gnu - { - namespace java - { - namespace awt - { - namespace peer - { - namespace gtk - { - class GThreadMutex; - } - } - } - } - } -} - -class gnu::java::awt::peer::gtk::GThreadMutex : public ::java::lang::Object -{ - -public: // actually package-private - GThreadMutex(); - jint volatile __attribute__((aligned(__alignof__( ::java::lang::Object)))) potentialLockers; - ::java::lang::Object * lockForPotentialLockers; -public: - static ::java::lang::Class class$; -}; - -#endif // __gnu_java_awt_peer_gtk_GThreadMutex__ diff --git a/libjava/gnu/java/awt/peer/gtk/GThreadNativeMethodRunner.h b/libjava/gnu/java/awt/peer/gtk/GThreadNativeMethodRunner.h deleted file mode 100644 index 803f173cf77..00000000000 --- a/libjava/gnu/java/awt/peer/gtk/GThreadNativeMethodRunner.h +++ /dev/null @@ -1,58 +0,0 @@ - -// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*- - -#ifndef __gnu_java_awt_peer_gtk_GThreadNativeMethodRunner__ -#define __gnu_java_awt_peer_gtk_GThreadNativeMethodRunner__ - -#pragma interface - -#include <java/lang/Thread.h> -#include <gcj/array.h> - -extern "Java" -{ - namespace gnu - { - namespace java - { - namespace awt - { - namespace peer - { - namespace gtk - { - class GThreadNativeMethodRunner; - } - } - } - } - } -} - -class gnu::java::awt::peer::gtk::GThreadNativeMethodRunner : public ::java::lang::Thread -{ - -public: // actually package-private - GThreadNativeMethodRunner(jlong, jlong, jboolean); -public: - virtual void run(); -private: - void nativeRun(jlong, jlong); - static jint registerThread(::java::lang::Thread *); -public: // actually package-private - static jint threadToThreadID(::java::lang::Thread *); - static ::java::lang::Thread * threadIDToThread(jint); -private: - void registerSelfJoinable(); -public: // actually package-private - static void deRegisterJoinable(::java::lang::Thread *); -private: - jlong __attribute__((aligned(__alignof__( ::java::lang::Thread)))) funcPtr; - jlong funcArg; - static JArray< ::java::lang::ref::WeakReference * > * threads; - static ::java::util::Set * joinable; -public: - static ::java::lang::Class class$; -}; - -#endif // __gnu_java_awt_peer_gtk_GThreadNativeMethodRunner__ diff --git a/libjava/gnu/java/awt/peer/gtk/GdkFontMetrics.h b/libjava/gnu/java/awt/peer/gtk/GdkFontMetrics.h deleted file mode 100644 index 65ca7a2dea3..00000000000 --- a/libjava/gnu/java/awt/peer/gtk/GdkFontMetrics.h +++ /dev/null @@ -1,74 +0,0 @@ - -// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*- - -#ifndef __gnu_java_awt_peer_gtk_GdkFontMetrics__ -#define __gnu_java_awt_peer_gtk_GdkFontMetrics__ - -#pragma interface - -#include <java/awt/FontMetrics.h> -#include <gcj/array.h> - -extern "Java" -{ - namespace gnu - { - namespace java - { - namespace awt - { - namespace peer - { - namespace gtk - { - class GdkFontMetrics; - class GdkFontPeer; - } - } - } - } - } - namespace java - { - namespace awt - { - class Font; - } - } -} - -class gnu::java::awt::peer::gtk::GdkFontMetrics : public ::java::awt::FontMetrics -{ - - static ::java::awt::Font * initFont(::java::awt::Font *); -public: - GdkFontMetrics(::java::awt::Font *); - virtual jint stringWidth(::java::lang::String *); - virtual jint charWidth(jchar); - virtual jint charsWidth(JArray< jchar > *, jint, jint); - virtual jint getLeading(); - virtual jint getAscent(); - virtual jint getMaxAscent(); - virtual jint getDescent(); - virtual jint getMaxDescent(); - virtual jint getMaxAdvance(); -private: - JArray< jint > * __attribute__((aligned(__alignof__( ::java::awt::FontMetrics)))) font_metrics; -public: // actually package-private - ::gnu::java::awt::peer::gtk::GdkFontPeer * peer; - static const jint FONT_METRICS_ASCENT = 0; - static const jint FONT_METRICS_MAX_ASCENT = 1; - static const jint FONT_METRICS_DESCENT = 2; - static const jint FONT_METRICS_MAX_DESCENT = 3; - static const jint FONT_METRICS_MAX_ADVANCE = 4; - static const jint TEXT_METRICS_X_BEARING = 0; - static const jint TEXT_METRICS_Y_BEARING = 1; - static const jint TEXT_METRICS_WIDTH = 2; - static const jint TEXT_METRICS_HEIGHT = 3; - static const jint TEXT_METRICS_X_ADVANCE = 4; - static const jint TEXT_METRICS_Y_ADVANCE = 5; -public: - static ::java::lang::Class class$; -}; - -#endif // __gnu_java_awt_peer_gtk_GdkFontMetrics__ diff --git a/libjava/gnu/java/awt/peer/gtk/GdkFontPeer.h b/libjava/gnu/java/awt/peer/gtk/GdkFontPeer.h index 903210aca3a..d7168b27bcf 100644 --- a/libjava/gnu/java/awt/peer/gtk/GdkFontPeer.h +++ b/libjava/gnu/java/awt/peer/gtk/GdkFontPeer.h @@ -109,7 +109,7 @@ public: virtual ::java::awt::FontMetrics * getFontMetrics(::java::awt::Font *); public: // actually package-private virtual ::java::awt::font::GlyphMetrics * getGlyphMetrics(jint); - virtual void putGlyphMetrics(jint, ::java::lang::Object *); + virtual void putGlyphMetrics(jint, ::java::awt::font::GlyphMetrics *); static ::java::awt::font::FontRenderContext * DEFAULT_CTX; ::java::util::HashMap * __attribute__((aligned(__alignof__( ::gnu::java::awt::peer::ClasspathFontPeer)))) textLayoutCache; private: diff --git a/libjava/gnu/java/awt/peer/gtk/GdkGraphicsEnvironment.h b/libjava/gnu/java/awt/peer/gtk/GdkGraphicsEnvironment.h index 8249a1e9a3e..49586fc08b1 100644 --- a/libjava/gnu/java/awt/peer/gtk/GdkGraphicsEnvironment.h +++ b/libjava/gnu/java/awt/peer/gtk/GdkGraphicsEnvironment.h @@ -6,7 +6,7 @@ #pragma interface -#include <java/awt/GraphicsEnvironment.h> +#include <gnu/java/awt/ClasspathGraphicsEnvironment.h> #include <gcj/array.h> extern "Java" @@ -38,12 +38,15 @@ extern "Java" namespace image { class BufferedImage; + class ColorModel; + class SampleModel; + class WritableRaster; } } } } -class gnu::java::awt::peer::gtk::GdkGraphicsEnvironment : public ::java::awt::GraphicsEnvironment +class gnu::java::awt::peer::gtk::GdkGraphicsEnvironment : public ::gnu::java::awt::ClasspathGraphicsEnvironment { public: // actually package-private @@ -71,8 +74,10 @@ public: virtual JArray< ::java::lang::String * > * getAvailableFontFamilyNames(::java::util::Locale *); public: // actually package-private virtual JArray< jint > * getMouseCoordinates(); +public: + virtual ::java::awt::image::WritableRaster * createRaster(::java::awt::image::ColorModel *, ::java::awt::image::SampleModel *); private: - jint __attribute__((aligned(__alignof__( ::java::awt::GraphicsEnvironment)))) native_state; + 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; public: diff --git a/libjava/gnu/java/awt/peer/gtk/GtkToolkit$1.h b/libjava/gnu/java/awt/peer/gtk/GtkToolkit$1.h deleted file mode 100644 index 94bac6c75cc..00000000000 --- a/libjava/gnu/java/awt/peer/gtk/GtkToolkit$1.h +++ /dev/null @@ -1,40 +0,0 @@ - -// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*- - -#ifndef __gnu_java_awt_peer_gtk_GtkToolkit$1__ -#define __gnu_java_awt_peer_gtk_GtkToolkit$1__ - -#pragma interface - -#include <java/lang/Thread.h> -extern "Java" -{ - namespace gnu - { - namespace java - { - namespace awt - { - namespace peer - { - namespace gtk - { - class GtkToolkit$1; - } - } - } - } - } -} - -class gnu::java::awt::peer::gtk::GtkToolkit$1 : public ::java::lang::Thread -{ - -public: // actually package-private - GtkToolkit$1(::java::lang::String *); -public: - void run(); - static ::java::lang::Class class$; -}; - -#endif // __gnu_java_awt_peer_gtk_GtkToolkit$1__ diff --git a/libjava/gnu/java/awt/peer/gtk/GtkToolkit.h b/libjava/gnu/java/awt/peer/gtk/GtkToolkit.h index e02c3b6a9ed..66b3fcbaad4 100644 --- a/libjava/gnu/java/awt/peer/gtk/GtkToolkit.h +++ b/libjava/gnu/java/awt/peer/gtk/GtkToolkit.h @@ -141,7 +141,7 @@ class gnu::java::awt::peer::gtk::GtkToolkit : public ::gnu::java::awt::Classpath { public: // actually package-private - static void gtkInit(jint); + static void gtkInit(jint, ::java::lang::Object *); static void gtkMain(); static void gtkQuit(); public: @@ -215,6 +215,10 @@ public: virtual ::java::awt::GraphicsEnvironment * getLocalGraphicsEnvironment(); virtual ::java::awt::Font * createFont(jint, ::java::io::InputStream *); virtual ::java::awt::peer::RobotPeer * createRobot(::java::awt::GraphicsDevice *); + virtual jboolean getLockingKeyState(jint); +public: // actually protected + virtual jint getLockState(jint); +public: virtual void registerImageIOSpis(::javax::imageio::spi::IIORegistry *); public: // actually protected virtual ::java::awt::peer::MouseInfoPeer * getMouseInfoPeer(); @@ -224,6 +228,8 @@ private: void checkHeadless(); public: virtual jint getMouseNumberOfButtons(); +public: // actually package-private + static ::java::lang::Object * GTK_LOCK; private: static ::java::awt::EventQueue * q; ::gnu::java::awt::peer::gtk::GtkToolkit$LRUCache * __attribute__((aligned(__alignof__( ::gnu::java::awt::ClasspathToolkit)))) fontCache; |
