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/java/awt/Font.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/java/awt/Font.h')
| -rw-r--r-- | libjava/java/awt/Font.h | 10 |
1 files changed, 10 insertions, 0 deletions
diff --git a/libjava/java/awt/Font.h b/libjava/java/awt/Font.h index 07c651f5837..c3b46bf7c75 100644 --- a/libjava/java/awt/Font.h +++ b/libjava/java/awt/Font.h @@ -66,6 +66,9 @@ public: // actually package-private public: static ::java::awt::Font * getFont(::java::lang::String *, ::java::awt::Font *); static ::java::awt::Font * getFont(::java::lang::String *); +public: // actually protected + Font(::java::awt::Font *); +public: Font(::java::lang::String *, jint, jint); Font(::java::util::Map *); public: // actually package-private @@ -80,6 +83,7 @@ public: virtual ::java::lang::String * getFamily(); virtual jint getStyle(); virtual jboolean canDisplay(jchar); + virtual jboolean canDisplay(jint); virtual jint canDisplayUpTo(::java::lang::String *); virtual jint canDisplayUpTo(JArray< jchar > *, jint, jint); virtual jint canDisplayUpTo(::java::text::CharacterIterator *, jint, jint); @@ -123,6 +127,7 @@ public: virtual jboolean equals(::java::lang::Object *); virtual ::java::lang::String * toString(); virtual ::java::awt::font::LineMetrics * getLineMetrics(::java::lang::String *, ::java::awt::font::FontRenderContext *); + virtual jboolean hasLayoutAttributes(); private: void readObject(::java::io::ObjectInputStream *); public: @@ -138,6 +143,11 @@ public: static const jint LAYOUT_RIGHT_TO_LEFT = 1; static const jint LAYOUT_NO_START_CONTEXT = 2; static const jint LAYOUT_NO_LIMIT_CONTEXT = 4; + static ::java::lang::String * DIALOG; + static ::java::lang::String * DIALOG_INPUT; + static ::java::lang::String * MONOSPACED; + static ::java::lang::String * SANS_SERIF; + static ::java::lang::String * SERIF; public: // actually protected ::java::lang::String * __attribute__((aligned(__alignof__( ::java::lang::Object)))) name; jint size; |
