[commit-cp] classpath ./ChangeLog gnu/java/awt/peer/gtk/Gtk...

[Mark Wielaard]

CVSROOT:        /cvsroot/classpath
Module name:    classpath
Branch:         
Changes by:     Mark Wielaard <address@hidden>  06/03/09 21:29:58

Modified files:
        .              : ChangeLog 
        gnu/java/awt/peer/gtk: GtkClipboard.java 
                               GtkClipboardNotifier.java 
                               GtkSelection.java GtkToolkit.java 
        include        : gnu_java_awt_peer_gtk_GtkClipboard.h 
                         gnu_java_awt_peer_gtk_GtkSelection.h 
        java/awt       : Toolkit.java 
        native/jni/gtk-peer: gnu_java_awt_peer_gtk_GtkClipboard.c 
                             gnu_java_awt_peer_gtk_GtkSelection.c 
                             gtkpeer.h 

Log message:
        * gnu/java/awt/peer/gtk/GtkClipboard.java (clipboard, selection):
        New static field.
        (stringMimeType, imageMimeType, filesMimeType): Initialize directly.
        (canCache): Likewise.
        (GtkClipboard): Take String argument.
        (getInstance): Removed.
        (getClipboardInstance, getSelectionInstance): New static methods.
        (setSystemContents): Make synchronized. Takes boolean argument.
        (initNativeState): Add clipboard and selection.
        * gnu/java/awt/peer/gtk/GtkClipboardNotifier.java
        (announceClipboardChange, announcePrimaryChange): New static field.
        (announce): Take GtkClipboard as argument.
        (run): Check which clipboard to announce change for.
        * gnu/java/awt/peer/gtk/GtkSelection.java (clipboard): New final
        boolean field.
        (GtkSelection): Take GtkClipboard as argument.
        (requestText, requestImage, requestURIs, requestBytes): Add boolean
        clipboard argument.
        (requestMimeTypes): Likewise.
        * gnu/java/awt/peer/gtk/GtkToolkit.java (getSystemSelection):
        New method.
        * java/awt/Toolkit.java (getSystemSelection): Document.
        * native/jni/gtk-peer/gnu_java_awt_peer_gtk_GtkClipboard.c
        (cp_gtk_selection_instance): New var.
        (current_selection, owner): Removed.
        (clipboard_owner_change_cb): Use clipboard argument.
        (initNativeState): Store clipboard and selection instances. Cache
        setSystemContentsID, provideContentID, provideTextID, provideImageID,
        and provideURIsID.
        (clipboard_get_func): Use clipboard argument.
        (clipboard_clear_func): Likewise. Always call method.
        (advertiseContent): Don't cache method ids here. Check whether to
        use clpboard or selection. Don't set owner or current_selection.
        * native/jni/gtk-peer/gnu_java_awt_peer_gtk_GtkSelection.c
        (requestText, requestImage, requestURIs, requestBytes): Use extra
        boolean argument to select clipboard.
        * native/jni/gtk-peer/gtkpeer.h (cp_gtk_selection): New extern.
        (cp_gtk_clipboard_instance, cp_gtk_selection_instance): Likewise.
        * include/gnu_java_awt_peer_gtk_GtkClipboard.h: Regenerate.
        * include/gnu_java_awt_peer_gtk_GtkSelection.h: Likewise.

CVSWeb URLs:
http://cvs.savannah.gnu.org/viewcvs/classpath/classpath/ChangeLog.diff?tr1=1.6664&tr2=1.6665&r1=text&r2=text
http://cvs.savannah.gnu.org/viewcvs/classpath/classpath/gnu/java/awt/peer/gtk/GtkClipboard.java.diff?tr1=1.10&tr2=1.11&r1=text&r2=text
http://cvs.savannah.gnu.org/viewcvs/classpath/classpath/gnu/java/awt/peer/gtk/GtkClipboardNotifier.java.diff?tr1=1.1&tr2=1.2&r1=text&r2=text
http://cvs.savannah.gnu.org/viewcvs/classpath/classpath/gnu/java/awt/peer/gtk/GtkSelection.java.diff?tr1=1.2&tr2=1.3&r1=text&r2=text
http://cvs.savannah.gnu.org/viewcvs/classpath/classpath/gnu/java/awt/peer/gtk/GtkToolkit.java.diff?tr1=1.81&tr2=1.82&r1=text&r2=text
http://cvs.savannah.gnu.org/viewcvs/classpath/classpath/include/gnu_java_awt_peer_gtk_GtkClipboard.h.diff?tr1=1.5&tr2=1.6&r1=text&r2=text
http://cvs.savannah.gnu.org/viewcvs/classpath/classpath/include/gnu_java_awt_peer_gtk_GtkSelection.h.diff?tr1=1.1&tr2=1.2&r1=text&r2=text
http://cvs.savannah.gnu.org/viewcvs/classpath/classpath/java/awt/Toolkit.java.diff?tr1=1.35&tr2=1.36&r1=text&r2=text
http://cvs.savannah.gnu.org/viewcvs/classpath/classpath/native/jni/gtk-peer/gnu_java_awt_peer_gtk_GtkClipboard.c.diff?tr1=1.18&tr2=1.19&r1=text&r2=text
http://cvs.savannah.gnu.org/viewcvs/classpath/classpath/native/jni/gtk-peer/gnu_java_awt_peer_gtk_GtkSelection.c.diff?tr1=1.3&tr2=1.4&r1=text&r2=text
http://cvs.savannah.gnu.org/viewcvs/classpath/classpath/native/jni/gtk-peer/gtkpeer.h.diff?tr1=1.41&tr2=1.42&r1=text&r2=text