diff options
| author | doko <doko@138bc75d-0d04-0410-961f-82ee72b054a4> | 2007-08-04 10:53:49 +0000 |
|---|---|---|
| committer | doko <doko@138bc75d-0d04-0410-961f-82ee72b054a4> | 2007-08-04 10:53:49 +0000 |
| commit | bfd03af53013b43663c88995c6d5943815e8d75b (patch) | |
| tree | 871b70a606d87369d5aa9d6f621baedc13b49eba /libjava/gnu/java/awt/peer/swing/SwingTextAreaPeer.h | |
| parent | befb0bace8afefe156fe5718f9d1f202d28560c7 (diff) | |
| download | ppe42-gcc-bfd03af53013b43663c88995c6d5943815e8d75b.tar.gz ppe42-gcc-bfd03af53013b43663c88995c6d5943815e8d75b.zip | |
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.
git-svn-id: svn+ssh://gcc.gnu.org/svn/gcc/trunk@127204 138bc75d-0d04-0410-961f-82ee72b054a4
Diffstat (limited to 'libjava/gnu/java/awt/peer/swing/SwingTextAreaPeer.h')
| -rw-r--r-- | libjava/gnu/java/awt/peer/swing/SwingTextAreaPeer.h | 13 |
1 files changed, 5 insertions, 8 deletions
diff --git a/libjava/gnu/java/awt/peer/swing/SwingTextAreaPeer.h b/libjava/gnu/java/awt/peer/swing/SwingTextAreaPeer.h index a9d4b8f60f8..2e58f536a46 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$; }; |
