diff options
| author | graydon <graydon@138bc75d-0d04-0410-961f-82ee72b054a4> | 2003-07-18 19:27:42 +0000 |
|---|---|---|
| committer | graydon <graydon@138bc75d-0d04-0410-961f-82ee72b054a4> | 2003-07-18 19:27:42 +0000 |
| commit | 64ecff31768d8bb4a9dd3860d0a5c07985f67ac9 (patch) | |
| tree | a6c4bc57f13f95fac16facbecebe09ad564c8608 /libjava/jni | |
| parent | 2913d162bf68d5a5063adcb98f0707cc3df9abee (diff) | |
| download | gcc-64ecff31768d8bb4a9dd3860d0a5c07985f67ac9.tar.gz | |
2003-07-18 Graydon Hoare <graydon@redhat.com>
* jni/gtk-peer/gnu_java_awt_peer_gtk_GtkScrollBarPeer.c:
Handle missing event cases, connect to "value-changed" signal.
git-svn-id: svn+ssh://gcc.gnu.org/svn/gcc/trunk@69568 138bc75d-0d04-0410-961f-82ee72b054a4
Diffstat (limited to 'libjava/jni')
| -rw-r--r-- | libjava/jni/gtk-peer/gnu_java_awt_peer_gtk_GtkScrollBarPeer.c | 26 |
1 files changed, 25 insertions, 1 deletions
diff --git a/libjava/jni/gtk-peer/gnu_java_awt_peer_gtk_GtkScrollBarPeer.c b/libjava/jni/gtk-peer/gnu_java_awt_peer_gtk_GtkScrollBarPeer.c index a246b372904..2bd3df8cf35 100644 --- a/libjava/jni/gtk-peer/gnu_java_awt_peer_gtk_GtkScrollBarPeer.c +++ b/libjava/jni/gtk-peer/gnu_java_awt_peer_gtk_GtkScrollBarPeer.c @@ -46,6 +46,17 @@ struct range_scrollbar }; static void +post_change_event (GtkRange *range, + struct range_scrollbar *rs) +{ + GtkAdjustment *adj; + adj = gtk_range_get_adjustment (range); + (*gdk_env)->CallVoidMethod (gdk_env, *(rs->scrollbar), postAdjustmentEventID, + AWT_ADJUSTMENT_TRACK, (jint) adj->value); + +} + +static void post_adjustment_event (GtkRange *range, GtkScrollType scroll, struct range_scrollbar *rs) { @@ -56,15 +67,23 @@ post_adjustment_event (GtkRange *range, GtkScrollType scroll, switch (scroll) { + case GTK_SCROLL_STEP_UP: + case GTK_SCROLL_STEP_RIGHT: case GTK_SCROLL_STEP_FORWARD: type = AWT_ADJUSTMENT_UNIT_INCREMENT; break; + case GTK_SCROLL_STEP_DOWN: + case GTK_SCROLL_STEP_LEFT: case GTK_SCROLL_STEP_BACKWARD: type = AWT_ADJUSTMENT_UNIT_DECREMENT; break; + case GTK_SCROLL_PAGE_UP: + case GTK_SCROLL_PAGE_RIGHT: case GTK_SCROLL_PAGE_FORWARD: type = AWT_ADJUSTMENT_BLOCK_INCREMENT; break; + case GTK_SCROLL_PAGE_DOWN: + case GTK_SCROLL_PAGE_LEFT: case GTK_SCROLL_PAGE_BACKWARD: type = AWT_ADJUSTMENT_BLOCK_DECREMENT; break; @@ -118,9 +137,14 @@ Java_gnu_java_awt_peer_gtk_GtkScrollbarPeer_connectHooks rs->scrollbar = (jobject *) malloc (sizeof (jobject)); *(rs->scrollbar) = (*env)->NewGlobalRef (env, obj); gtk_signal_connect (GTK_OBJECT (GTK_RANGE (ptr)), - "move_slider", + "move-slider", GTK_SIGNAL_FUNC (post_adjustment_event), rs); + gtk_signal_connect (GTK_OBJECT (GTK_RANGE (ptr)), + "value-changed", + GTK_SIGNAL_FUNC (post_change_event), rs); + + connect_awt_hook (env, obj, 1, GTK_SCROLLBAR (ptr)->range); gdk_threads_leave (); } |