Checkbox states

[Kim Ho]

Hi,

This patch implements a getState function for Checkboxes.

Cheers,

Kim

2003-11-28  Kim Ho <kho@redhat.com>
                                                                                
        * gnu/java/awt/peer/gtk/GtkCheckboxPeer.java: Add native
getState
        * java/awt/Checkbox.java (getState): Use native getState
        * java/awt/peer/CheckboxPeer.java: Add getState.
        * jni/gtk-peer/gnu_java_awt_peer_gtk_GtkCheckboxPeer.c
(getState):
        New function. Queries the button for state.

-------------- next part --------------
? deps.mk
? gnu/classpath/Configuration.java
? gnu/java/awt/peer/gtk/GtkCheckboxPeer.class
Index: gnu/java/awt/peer/gtk/GtkCheckboxPeer.java
===================================================================
RCS file: /cvsroot/gcc/gcc/libjava/gnu/java/awt/peer/gtk/GtkCheckboxPeer.java,v
retrieving revision 1.2
diff -c -p -r1.2 GtkCheckboxPeer.java
*** gnu/java/awt/peer/gtk/GtkCheckboxPeer.java	13 Jul 2003 15:09:20 -0000	1.2
--- gnu/java/awt/peer/gtk/GtkCheckboxPeer.java	27 Nov 2003 21:37:56 -0000
*************** public class GtkCheckboxPeer extends Gtk
*** 52,57 ****
--- 52,58 ----
    public native void nativeCreate (GtkCheckboxGroupPeer group);
    public native void nativeSetCheckboxGroup (GtkCheckboxGroupPeer group);
    public native void connectHooks ();
+   public native boolean getState();
  
    public GtkCheckboxPeer (Checkbox c)
    {
Index: java/awt/Checkbox.java
===================================================================
RCS file: /cvsroot/gcc/gcc/libjava/java/awt/Checkbox.java,v
retrieving revision 1.9
diff -c -p -r1.9 Checkbox.java
*** java/awt/Checkbox.java	5 Jun 2003 19:58:39 -0000	1.9
--- java/awt/Checkbox.java	27 Nov 2003 21:37:57 -0000
*************** setLabel(String label)
*** 218,223 ****
--- 218,228 ----
  public boolean
  getState()
  {
+   if (peer != null)
+   {
+   	CheckboxPeer cp = (CheckboxPeer) peer;
+ 	this.state = cp.getState();
+   }
    return(state);
  }
  
Index: java/awt/Component.java
===================================================================
RCS file: /cvsroot/gcc/gcc/libjava/java/awt/Component.java,v
retrieving revision 1.31
diff -c -p -r1.31 Component.java
*** java/awt/Component.java	12 Nov 2003 22:03:49 -0000	1.31
--- java/awt/Component.java	27 Nov 2003 21:38:01 -0000
*************** p   * <li>the set of backward traversal 
*** 4857,4863 ****
      {
        Component.this.removeFocusListener(l);
      }
! 
      /**
       * Converts component changes into property changes.
       *
--- 4857,4863 ----
      {
        Component.this.removeFocusListener(l);
      }
!     
      /**
       * Converts component changes into property changes.
       *
Index: java/awt/peer/CheckboxPeer.java
===================================================================
RCS file: /cvsroot/gcc/gcc/libjava/java/awt/peer/CheckboxPeer.java,v
retrieving revision 1.5
diff -c -p -r1.5 CheckboxPeer.java
*** java/awt/peer/CheckboxPeer.java	11 Oct 2003 18:11:03 -0000	1.5
--- java/awt/peer/CheckboxPeer.java	27 Nov 2003 21:38:01 -0000
*************** public interface CheckboxPeer extends Co
*** 47,52 ****
--- 47,54 ----
    void setLabel (String label);
  
    void setState (boolean state);
+   
+   boolean getState();
  
  } // interface CheckboxPeer
  
Index: jni/gtk-peer/gnu_java_awt_peer_gtk_GtkCheckboxPeer.c
===================================================================
RCS file: /cvsroot/gcc/gcc/libjava/jni/gtk-peer/gnu_java_awt_peer_gtk_GtkCheckboxPeer.c,v
retrieving revision 1.1
diff -c -p -r1.1 gnu_java_awt_peer_gtk_GtkCheckboxPeer.c
*** jni/gtk-peer/gnu_java_awt_peer_gtk_GtkCheckboxPeer.c	31 Jan 2003 17:54:14 -0000	1.1
--- jni/gtk-peer/gnu_java_awt_peer_gtk_GtkCheckboxPeer.c	27 Nov 2003 21:38:04 -0000
*************** Java_gnu_java_awt_peer_gtk_GtkCheckboxPe
*** 163,168 ****
--- 163,182 ----
      NSA_SET_PTR (env, group, native_group);
  }
  
+ JNIEXPORT jboolean JNICALL 
+ Java_gnu_java_awt_peer_gtk_GtkCheckboxPeer_getState
+   (JNIEnv *env, jobject obj)
+ {
+   gboolean selected;
+   void *ptr = NSA_GET_PTR (env, obj);
+   GtkToggleButton *button;
+   gdk_threads_enter();
+   button = GTK_CHECK_BUTTON (ptr);
+   selected = gtk_toggle_button_get_active (button);
+   gdk_threads_leave();
+   return selected;
+ }
+   
  static void
  item_toggled (GtkToggleButton *item, jobject peer)
  {