[cp-patches] [patch] rename scrollbar peer jni file

[Thomas Fitzsimmons]

Hi,

I renamed gnu_java_awt_peer_gtk_GtkScrollBarPeer.c
gnu_java_awt_peer_gtk_GtkScrollbarPeer.c.

Tom

2005-07-04  Thomas Fitzsimmons  <address@hidden>

        * native/jni/gtk-peer/gnu_java_awt_peer_gtk_GtkScrollBarPeer.c:
        Rename gnu_java_awt_peer_gtk_GtkScrollbarPeer.c.
        * native/jni/gtk-peer/Makefile.am (libgtkpeer_la_SOURCES): Rename
        gnu_java_awt_peer_gtk_GtkScrollBarPeer.c
        gnu_java_awt_peer_gtk_GtkScrollbarPeer.c.

Index: ChangeLog
===================================================================
RCS file: /cvsroot/classpath/classpath/ChangeLog,v
retrieving revision 1.3986
diff -u -r1.3986 ChangeLog
--- ChangeLog   4 Jul 2005 22:31:40 -0000       1.3986
+++ ChangeLog   4 Jul 2005 23:19:42 -0000
@@ -1,5 +1,11 @@
 2005-07-04  Thomas Fitzsimmons  <address@hidden>
 
+       * native/jni/gtk-peer/gnu_java_awt_peer_gtk_GtkScrollBarPeer.c:
+       Rename gnu_java_awt_peer_gtk_GtkScrollbarPeer.c.
+       * native/jni/gtk-peer/Makefile.am (libgtkpeer_la_SOURCES): Rename
+       gnu_java_awt_peer_gtk_GtkScrollBarPeer.c
+       gnu_java_awt_peer_gtk_GtkScrollbarPeer.c.
+
        * gnu/java/awt/ClasspathToolkit.java (createEmbeddedWindow): New method.
        * gnu/java/awt/EmbeddedWindow.java (addNotify): Assume we're using
        ClasspathToolkit.
Index: native/jni/gtk-peer/Makefile.am
===================================================================
RCS file: /cvsroot/classpath/classpath/native/jni/gtk-peer/Makefile.am,v
retrieving revision 1.24
diff -u -r1.24 Makefile.am
--- native/jni/gtk-peer/Makefile.am     27 Jun 2005 17:27:19 -0000      1.24
+++ native/jni/gtk-peer/Makefile.am     4 Jul 2005 23:19:42 -0000
@@ -38,7 +38,7 @@
                        gnu_java_awt_peer_gtk_GtkMenuPeer.c \
                        gnu_java_awt_peer_gtk_GtkPanelPeer.c \
                        gnu_java_awt_peer_gtk_GtkPopupMenuPeer.c \
-                       gnu_java_awt_peer_gtk_GtkScrollBarPeer.c \
+                       gnu_java_awt_peer_gtk_GtkScrollbarPeer.c \
                        gnu_java_awt_peer_gtk_GtkScrollPanePeer.c \
                        gnu_java_awt_peer_gtk_GtkTextAreaPeer.c \
                        gnu_java_awt_peer_gtk_GtkTextComponentPeer.c \
Index: native/jni/gtk-peer/gnu_java_awt_peer_gtk_GtkScrollbarPeer.c
===================================================================
RCS file: native/jni/gtk-peer/gnu_java_awt_peer_gtk_GtkScrollbarPeer.c
diff -N native/jni/gtk-peer/gnu_java_awt_peer_gtk_GtkScrollbarPeer.c
--- /dev/null   1 Jan 1970 00:00:00 -0000
+++ native/jni/gtk-peer/gnu_java_awt_peer_gtk_GtkScrollbarPeer.c        4 Jul 
2005 23:19:42 -0000
@@ -0,0 +1,235 @@
+/* gtkscrollbarpeer.c -- Native implementation of GtkScrollbarPeer
+   Copyright (C) 1998, 1999 Free Software Foundation, Inc.
+
+This file is part of GNU Classpath.
+
+GNU Classpath is free software; you can redistribute it and/or modify
+it under the terms of the GNU General Public License as published by
+the Free Software Foundation; either version 2, or (at your option)
+any later version.
+
+GNU Classpath is distributed in the hope that it will be useful, but
+WITHOUT ANY WARRANTY; without even the implied warranty of
+MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
+General Public License for more details.
+
+You should have received a copy of the GNU General Public License
+along with GNU Classpath; see the file COPYING.  If not, write to the
+Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA
+02110-1301 USA.
+
+Linking this library statically or dynamically with other modules is
+making a combined work based on this library.  Thus, the terms and
+conditions of the GNU General Public License cover the whole
+combination.
+
+As a special exception, the copyright holders of this library give you
+permission to link this library with independent modules to produce an
+executable, regardless of the license terms of these independent
+modules, and to copy and distribute the resulting executable under
+terms of your choice, provided that you also meet, for each linked
+independent module, the terms and conditions of the license of that
+module.  An independent module is a module which is not derived from
+or based on this library.  If you modify this library, you may extend
+this exception to your version of the library, but you are not
+obligated to do so.  If you do not wish to do so, delete this
+exception statement from your version. */
+
+
+#include <math.h>
+#include "gtkpeer.h"
+#include "gnu_java_awt_peer_gtk_GtkComponentPeer.h"
+#include "gnu_java_awt_peer_gtk_GtkScrollbarPeer.h"
+
+#if GTK_MINOR_VERSION > 4
+static gboolean slider_moved_cb (GtkRange *range,
+                                 GtkScrollType scroll,
+                                 gdouble value,
+                                 jobject obj);
+#else
+static void post_change_event (GtkRange *range,
+                              jobject peer);
+#endif
+
+JNIEXPORT void JNICALL
+Java_gnu_java_awt_peer_gtk_GtkScrollbarPeer_create
+  (JNIEnv *env, jobject obj, jint orientation, jint value,
+   jint min, jint max, jint step_incr, jint page_incr, jint visible_amount)
+{
+  GtkWidget *scrollbar;
+  GtkObject *adj;
+
+  /* Create global reference and save it for future use */
+  NSA_SET_GLOBAL_REF (env, obj);
+
+  gdk_threads_enter ();
+
+  adj = gtk_adjustment_new ((gdouble) value,
+                            (gdouble) min,
+                            (gdouble) max,
+                           (gdouble) step_incr,
+                            (gdouble) page_incr,
+                           (gdouble) visible_amount);
+
+  scrollbar = orientation
+    ? gtk_vscrollbar_new (GTK_ADJUSTMENT (adj))
+    : gtk_hscrollbar_new (GTK_ADJUSTMENT (adj));
+
+  GTK_RANGE (scrollbar)->round_digits = 0;
+  /* These calls seem redundant but they are not.  They clamp values
+     so that the slider's entirety is always between the two
+     steppers. */
+  gtk_range_set_range (GTK_RANGE (scrollbar), (gdouble) min, (gdouble) max);
+  gtk_range_set_value (GTK_RANGE (scrollbar), (gdouble) value);
+
+  gdk_threads_leave ();
+
+  NSA_SET_PTR (env, obj, scrollbar);
+}
+
+JNIEXPORT void JNICALL
+Java_gnu_java_awt_peer_gtk_GtkScrollbarPeer_connectSignals
+  (JNIEnv *env, jobject obj)
+{
+  void *ptr = NSA_GET_PTR (env, obj);
+  jobject *gref = NSA_GET_GLOBAL_REF (env, obj);
+  g_assert (gref);
+
+  gdk_threads_enter ();
+
+#if GTK_MINOR_VERSION > 4
+  g_signal_connect (G_OBJECT (ptr), "change-value",
+                    GTK_SIGNAL_FUNC (slider_moved_cb), *gref);
+#else
+  g_signal_connect (G_OBJECT (ptr), "value-changed",
+                    G_CALLBACK (post_change_event), *gref);
+#endif
+
+  gdk_threads_leave ();
+
+  /* Connect the superclass signals.  */
+  Java_gnu_java_awt_peer_gtk_GtkComponentPeer_connectSignals (env, obj);
+}
+
+JNIEXPORT void JNICALL
+Java_gnu_java_awt_peer_gtk_GtkScrollbarPeer_setLineIncrement
+  (JNIEnv *env, jobject obj, jint amount)
+{
+  void *ptr;
+  GtkAdjustment *adj;
+
+  ptr = NSA_GET_PTR (env, obj);
+
+  gdk_threads_enter ();
+
+  adj = gtk_range_get_adjustment (GTK_RANGE (ptr));
+  adj->step_increment = (gdouble) amount;
+  gtk_adjustment_changed (adj);
+
+  gdk_threads_leave ();
+}
+
+JNIEXPORT void JNICALL
+Java_gnu_java_awt_peer_gtk_GtkScrollbarPeer_setPageIncrement
+  (JNIEnv *env, jobject obj, jint amount)
+{
+  void *ptr;
+  GtkAdjustment *adj;
+
+  ptr = NSA_GET_PTR (env, obj);
+
+  gdk_threads_enter ();
+
+  adj = gtk_range_get_adjustment (GTK_RANGE (ptr));
+  adj->page_increment = (gdouble) amount;
+  gtk_adjustment_changed (adj);
+
+  gdk_threads_leave ();
+}
+
+JNIEXPORT void JNICALL
+Java_gnu_java_awt_peer_gtk_GtkScrollbarPeer_setValues
+  (JNIEnv *env, jobject obj, jint value, jint visible, jint min, jint max)
+{
+  void *ptr;
+  GtkAdjustment *adj;
+
+  ptr = NSA_GET_PTR (env, obj);
+
+  gdk_threads_enter ();
+
+  adj = gtk_range_get_adjustment (GTK_RANGE (ptr));
+  adj->page_size = (gdouble) visible;
+
+  gtk_range_set_range (GTK_RANGE (ptr), (gdouble) min, (gdouble) max);
+  gtk_range_set_value (GTK_RANGE (ptr), (gdouble) value);
+
+  gdk_threads_leave ();
+}
+
+#if GTK_MINOR_VERSION > 4
+static gboolean
+slider_moved_cb (GtkRange *range,
+                 GtkScrollType scroll,
+                 gdouble value,
+                 jobject obj)
+{
+  GtkAdjustment *adj = gtk_range_get_adjustment (GTK_RANGE (range));
+
+  value = CLAMP (value, adj->lower,
+                 (adj->upper - adj->page_size));
+
+  if (range->round_digits >= 0)
+    {
+      gdouble power;
+      gint i;
+
+      i = range->round_digits;
+      power = 1;
+      while (i--)
+        power *= 10;
+      
+      value = floor ((value * power) + 0.5) / power;
+    }
+  
+  switch (scroll)
+    {
+    case GTK_SCROLL_STEP_BACKWARD:
+      (*gdk_env())->CallVoidMethod (gdk_env(), obj, postAdjustmentEventID,
+                                    AWT_ADJUSTMENT_UNIT_DECREMENT,
+                                    (jint) value);
+      break;
+    case GTK_SCROLL_STEP_FORWARD:
+      (*gdk_env())->CallVoidMethod (gdk_env(), obj, postAdjustmentEventID,
+                                    AWT_ADJUSTMENT_UNIT_INCREMENT,
+                                    (jint) value);
+      break;
+    case GTK_SCROLL_PAGE_BACKWARD:
+      (*gdk_env())->CallVoidMethod (gdk_env(), obj, postAdjustmentEventID,
+                                    AWT_ADJUSTMENT_BLOCK_DECREMENT,
+                                    (jint) value);
+      break;
+    case GTK_SCROLL_PAGE_FORWARD:
+      (*gdk_env())->CallVoidMethod (gdk_env(), obj, postAdjustmentEventID,
+                                    AWT_ADJUSTMENT_BLOCK_INCREMENT,
+                                    (jint) value);
+      break;
+    default:
+      /* GTK_SCROLL_JUMP: */
+      (*gdk_env())->CallVoidMethod (gdk_env(), obj, postAdjustmentEventID,
+                                    AWT_ADJUSTMENT_TRACK,
+                                    (jint) value);
+      break;
+    }
+  return FALSE;
+}
+#else
+static void
+post_change_event (GtkRange *range, jobject peer)
+{
+  GtkAdjustment *adj;
+  adj = gtk_range_get_adjustment (range);
+  (*gdk_env())->CallVoidMethod (gdk_env(), peer, postAdjustmentEventID,
+                               AWT_ADJUSTMENT_TRACK, (jint) adj->value);
+}
+#endif
Index: native/jni/gtk-peer/gnu_java_awt_peer_gtk_GtkScrollBarPeer.c
===================================================================
RCS file: native/jni/gtk-peer/gnu_java_awt_peer_gtk_GtkScrollBarPeer.c
diff -N native/jni/gtk-peer/gnu_java_awt_peer_gtk_GtkScrollBarPeer.c
--- native/jni/gtk-peer/gnu_java_awt_peer_gtk_GtkScrollBarPeer.c        2 Jul 
2005 20:32:54 -0000       1.16
+++ /dev/null   1 Jan 1970 00:00:00 -0000
@@ -1,235 +0,0 @@
-/* gtkscrollbarpeer.c -- Native implementation of GtkScrollbarPeer
-   Copyright (C) 1998, 1999 Free Software Foundation, Inc.
-
-This file is part of GNU Classpath.
-
-GNU Classpath is free software; you can redistribute it and/or modify
-it under the terms of the GNU General Public License as published by
-the Free Software Foundation; either version 2, or (at your option)
-any later version.
-
-GNU Classpath is distributed in the hope that it will be useful, but
-WITHOUT ANY WARRANTY; without even the implied warranty of
-MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
-General Public License for more details.
-
-You should have received a copy of the GNU General Public License
-along with GNU Classpath; see the file COPYING.  If not, write to the
-Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA
-02110-1301 USA.
-
-Linking this library statically or dynamically with other modules is
-making a combined work based on this library.  Thus, the terms and
-conditions of the GNU General Public License cover the whole
-combination.
-
-As a special exception, the copyright holders of this library give you
-permission to link this library with independent modules to produce an
-executable, regardless of the license terms of these independent
-modules, and to copy and distribute the resulting executable under
-terms of your choice, provided that you also meet, for each linked
-independent module, the terms and conditions of the license of that
-module.  An independent module is a module which is not derived from
-or based on this library.  If you modify this library, you may extend
-this exception to your version of the library, but you are not
-obligated to do so.  If you do not wish to do so, delete this
-exception statement from your version. */
-
-
-#include <math.h>
-#include "gtkpeer.h"
-#include "gnu_java_awt_peer_gtk_GtkComponentPeer.h"
-#include "gnu_java_awt_peer_gtk_GtkScrollbarPeer.h"
-
-#if GTK_MINOR_VERSION > 4
-static gboolean slider_moved_cb (GtkRange *range,
-                                 GtkScrollType scroll,
-                                 gdouble value,
-                                 jobject obj);
-#else
-static void post_change_event (GtkRange *range,
-                              jobject peer);
-#endif
-
-JNIEXPORT void JNICALL
-Java_gnu_java_awt_peer_gtk_GtkScrollbarPeer_create
-  (JNIEnv *env, jobject obj, jint orientation, jint value,
-   jint min, jint max, jint step_incr, jint page_incr, jint visible_amount)
-{
-  GtkWidget *scrollbar;
-  GtkObject *adj;
-
-  /* Create global reference and save it for future use */
-  NSA_SET_GLOBAL_REF (env, obj);
-
-  gdk_threads_enter ();
-
-  adj = gtk_adjustment_new ((gdouble) value,
-                            (gdouble) min,
-                            (gdouble) max,
-                           (gdouble) step_incr,
-                            (gdouble) page_incr,
-                           (gdouble) visible_amount);
-
-  scrollbar = orientation
-    ? gtk_vscrollbar_new (GTK_ADJUSTMENT (adj))
-    : gtk_hscrollbar_new (GTK_ADJUSTMENT (adj));
-
-  GTK_RANGE (scrollbar)->round_digits = 0;
-  /* These calls seem redundant but they are not.  They clamp values
-     so that the slider's entirety is always between the two
-     steppers. */
-  gtk_range_set_range (GTK_RANGE (scrollbar), (gdouble) min, (gdouble) max);
-  gtk_range_set_value (GTK_RANGE (scrollbar), (gdouble) value);
-
-  gdk_threads_leave ();
-
-  NSA_SET_PTR (env, obj, scrollbar);
-}
-
-JNIEXPORT void JNICALL
-Java_gnu_java_awt_peer_gtk_GtkScrollbarPeer_connectSignals
-  (JNIEnv *env, jobject obj)
-{
-  void *ptr = NSA_GET_PTR (env, obj);
-  jobject *gref = NSA_GET_GLOBAL_REF (env, obj);
-  g_assert (gref);
-
-  gdk_threads_enter ();
-
-#if GTK_MINOR_VERSION > 4
-  g_signal_connect (G_OBJECT (ptr), "change-value",
-                    GTK_SIGNAL_FUNC (slider_moved_cb), *gref);
-#else
-  g_signal_connect (G_OBJECT (ptr), "value-changed",
-                    G_CALLBACK (post_change_event), *gref);
-#endif
-
-  gdk_threads_leave ();
-
-  /* Connect the superclass signals.  */
-  Java_gnu_java_awt_peer_gtk_GtkComponentPeer_connectSignals (env, obj);
-}
-
-JNIEXPORT void JNICALL
-Java_gnu_java_awt_peer_gtk_GtkScrollbarPeer_setLineIncrement
-  (JNIEnv *env, jobject obj, jint amount)
-{
-  void *ptr;
-  GtkAdjustment *adj;
-
-  ptr = NSA_GET_PTR (env, obj);
-
-  gdk_threads_enter ();
-
-  adj = gtk_range_get_adjustment (GTK_RANGE (ptr));
-  adj->step_increment = (gdouble) amount;
-  gtk_adjustment_changed (adj);
-
-  gdk_threads_leave ();
-}
-
-JNIEXPORT void JNICALL
-Java_gnu_java_awt_peer_gtk_GtkScrollbarPeer_setPageIncrement
-  (JNIEnv *env, jobject obj, jint amount)
-{
-  void *ptr;
-  GtkAdjustment *adj;
-
-  ptr = NSA_GET_PTR (env, obj);
-
-  gdk_threads_enter ();
-
-  adj = gtk_range_get_adjustment (GTK_RANGE (ptr));
-  adj->page_increment = (gdouble) amount;
-  gtk_adjustment_changed (adj);
-
-  gdk_threads_leave ();
-}
-
-JNIEXPORT void JNICALL
-Java_gnu_java_awt_peer_gtk_GtkScrollbarPeer_setValues
-  (JNIEnv *env, jobject obj, jint value, jint visible, jint min, jint max)
-{
-  void *ptr;
-  GtkAdjustment *adj;
-
-  ptr = NSA_GET_PTR (env, obj);
-
-  gdk_threads_enter ();
-
-  adj = gtk_range_get_adjustment (GTK_RANGE (ptr));
-  adj->page_size = (gdouble) visible;
-
-  gtk_range_set_range (GTK_RANGE (ptr), (gdouble) min, (gdouble) max);
-  gtk_range_set_value (GTK_RANGE (ptr), (gdouble) value);
-
-  gdk_threads_leave ();
-}
-
-#if GTK_MINOR_VERSION > 4
-static gboolean
-slider_moved_cb (GtkRange *range,
-                 GtkScrollType scroll,
-                 gdouble value,
-                 jobject obj)
-{
-  GtkAdjustment *adj = gtk_range_get_adjustment (GTK_RANGE (range));
-
-  value = CLAMP (value, adj->lower,
-                 (adj->upper - adj->page_size));
-
-  if (range->round_digits >= 0)
-    {
-      gdouble power;
-      gint i;
-
-      i = range->round_digits;
-      power = 1;
-      while (i--)
-        power *= 10;
-      
-      value = floor ((value * power) + 0.5) / power;
-    }
-  
-  switch (scroll)
-    {
-    case GTK_SCROLL_STEP_BACKWARD:
-      (*gdk_env())->CallVoidMethod (gdk_env(), obj, postAdjustmentEventID,
-                                    AWT_ADJUSTMENT_UNIT_DECREMENT,
-                                    (jint) value);
-      break;
-    case GTK_SCROLL_STEP_FORWARD:
-      (*gdk_env())->CallVoidMethod (gdk_env(), obj, postAdjustmentEventID,
-                                    AWT_ADJUSTMENT_UNIT_INCREMENT,
-                                    (jint) value);
-      break;
-    case GTK_SCROLL_PAGE_BACKWARD:
-      (*gdk_env())->CallVoidMethod (gdk_env(), obj, postAdjustmentEventID,
-                                    AWT_ADJUSTMENT_BLOCK_DECREMENT,
-                                    (jint) value);
-      break;
-    case GTK_SCROLL_PAGE_FORWARD:
-      (*gdk_env())->CallVoidMethod (gdk_env(), obj, postAdjustmentEventID,
-                                    AWT_ADJUSTMENT_BLOCK_INCREMENT,
-                                    (jint) value);
-      break;
-    default:
-      /* GTK_SCROLL_JUMP: */
-      (*gdk_env())->CallVoidMethod (gdk_env(), obj, postAdjustmentEventID,
-                                    AWT_ADJUSTMENT_TRACK,
-                                    (jint) value);
-      break;
-    }
-  return FALSE;
-}
-#else
-static void
-post_change_event (GtkRange *range, jobject peer)
-{
-  GtkAdjustment *adj;
-  adj = gtk_range_get_adjustment (range);
-  (*gdk_env())->CallVoidMethod (gdk_env(), peer, postAdjustmentEventID,
-                               AWT_ADJUSTMENT_TRACK, (jint) adj->value);
-}
-#endif