[Top][All Lists]
[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[cp-patches] FYI: gtk-peer compiler warning fixes from libgcj
|
From: |
Mark Wielaard |
|
Subject: |
[cp-patches] FYI: gtk-peer compiler warning fixes from libgcj |
|
Date: |
Wed, 27 Oct 2004 01:44:53 +0200 |
Hi,
This merges in the compiler warning fixes for the gtk-peer C sources
that Andreast and Thomas worked on.
2004-10-26 Thomas Fitzsimmons <address@hidden>
* native/jni/gtk-peer/gnu_java_awt_peer_gtk_GtkFramePeer.c
(nativeSetIconImage): Rename to nativeSetIconImageFromDecoder.
2004-10-26 Andreas Tobler <address@hidden>
* native/jni/gtk-peer/gnu_java_awt_peer_gtk_GThreadNativeMethodRunner.c
(Java_gnu_java_awt_peer_gtk_GThreadNativeMethodRunner_nativeRun):
Fix pointer warning.
2004-10-26 Andreas Tobler <address@hidden>
* native/jni/gtk-peer/gnu_java_awt_peer_gtk_GtkFileDialogPeer.c
(Java_gnu_java_awt_peer_gtk_GtkFileDialogPeer_nativeSetFilenameFilter):
Fix pointer warning.
* native/jni/gtk-peer/gtkpeer.h: Introduce widget_union to fix type
punned warnings.
* native/jni/gtk-peer/gnu_java_awt_peer_gtk_GdkGraphics.c
(Java_gnu_java_awt_peer_gtk_GdkGraphics_clearRect): Use widget_union
to fix type punned pointer warning.
* native/jni/gtk-peer/gnu_java_awt_peer_gtk_GtkEvents.c
(pre_event_handler): Likewise.
* native/jni/gtk-peer/gnu_java_awt_peer_gtk_GtkWindowPeer.c
(window_get_new_state): Introduce unions to fix warnings as above.
(window_property_changed_cb): Likewise.
(window_active_state_change_cb): Mark unused variables unused.
(window_focus_state_change_cb): Likewise.
(window_focus_in_cb): Likewise.
(window_focus_out_cb): Likewise.
* native/jni/gtk-peer/gnu_java_awt_peer_gtk_GdkFontPeer.c
(Java_gnu_java_awt_peer_gtk_GdkFontPeer_setFont): Convert
PangoFontMap correctly with PANGO_FT2FONT_MAP macro.
2004-10-26 Andreas Tobler <address@hidden>
* native/jni/gtk-peer/gnu_java_awt_peer_gtk_GtkTextAreaPeer.c
(Java_gnu_java_awt_peer_gtk_GtkTextAreaPeer_create): Use the
GTK_TEXT_VIEW macro.
* native/jni/gtk-peer/gnu_java_awt_peer_gtk_GtkEvents.c
(connect_awt_hook_cb): Mark unused variable unused.
* native/jni/gtk-peer/gnu_java_awt_peer_gtk_GtkClipboard.c
(selection_get): Do the cast right.
* native/jni/gtk-peer/gnu_java_awt_peer_gtk_GtkChoicePeer.c
(Java_gnu_java_awt_peer_gtk_GtkChoicePeer_create): According to
the gtk API gtk_combo_box_new_text actually returns a GtkWidget.
Remove unused var menu.
(selection_changed): Remove unused value.
* native/jni/gtk-peer/gnu_java_awt_peer_gtk_GtkButtonPeer.c
(Java_gnu_java_awt_peer_gtk_GtkButtonPeer_setNativeBounds): Fix pointer
warning with using an intermediate variable.
* native/jni/gtk-peer/gnu_java_awt_peer_gtk_GdkPixbufDecoder.c
(area_updated): Fix unused var warning for BE archs.
* native/jni/gtk-peer/gnu_java_awt_peer_gtk_GdkGraphics.c
(Java_gnu_java_awt_peer_gtk_GdkGraphics_connectSignals): Remove unused
var.
(realize_cb): Mark unused variable unused.
* native/jni/gtk-peer/gnu_java_awt_peer_gtk_GdkGlyphVector.c
(seek_glyphstring_idx): Fix a C90 warning.
2004-10-26 Andreas Tobler <address@hidden>
* native/jni/gtk-peer/gnu_java_awt_peer_gtk_GThreadNativeMethodRunner.c
(Java_gnu_java_awt_peer_gtk_GThreadNativeMethodRunner_nativeRun):
Mark unused arguments unused.
* native/jni/gtk-peer/gnu_java_awt_peer_gtk_GdkGlyphVector.c
(Java_gnu_java_awt_peer_gtk_GdkGlyphVector_initState),
(Java_gnu_java_awt_peer_gtk_GdkGlyphVector_setGlyphCodes),
(Java_gnu_java_awt_peer_gtk_GdkGlyphVector_glyphCharIndex),
(Java_gnu_java_awt_peer_gtk_GdkGlyphVector_glyphIsHorizontal):
Likewise.
* native/jni/gtk-peer/gnu_java_awt_peer_gtk_GdkFontMetrics.c
(Java_gnu_java_awt_peer_gtk_GdkFontMetrics_getPeerFontMetrics),
(Java_gnu_java_awt_peer_gtk_GdkFontMetrics_getPeerTextMetrics):
Likewise.
* native/jni/gtk-peer/gnu_java_awt_peer_gtk_GtkFileDialogPeer.c
(Java_gnu_java_awt_peer_gtk_GtkFileDialogPeer_nativeSetFilenameFilter):
Likewise.
(filenameFilterCallback): Remove unused var.
(handle_response): Declare str_fileName and remove last else statement.
Committed,
Mark
Index: native/jni/gtk-peer/gnu_java_awt_peer_gtk_GThreadNativeMethodRunner.c
===================================================================
RCS file:
/cvsroot/classpath/classpath/native/jni/gtk-peer/gnu_java_awt_peer_gtk_GThreadNativeMethodRunner.c,v
retrieving revision 1.1
diff -u -r1.1 gnu_java_awt_peer_gtk_GThreadNativeMethodRunner.c
--- native/jni/gtk-peer/gnu_java_awt_peer_gtk_GThreadNativeMethodRunner.c
6 Jun 2004 04:14:13 -0000 1.1
+++ native/jni/gtk-peer/gnu_java_awt_peer_gtk_GThreadNativeMethodRunner.c
26 Oct 2004 23:28:55 -0000
@@ -45,19 +45,18 @@
* Signature: (J)V
*
* Purpose: Run the C function whose function pointer is
- *
+ *
*/
-JNIEXPORT void JNICALL
-Java_gnu_java_awt_peer_gtk_GThreadNativeMethodRunner_nativeRun(JNIEnv
*gdk_env, jobject lcl_obj,
- jlong funcAddr, jlong funcArg)
+JNIEXPORT void JNICALL
+Java_gnu_java_awt_peer_gtk_GThreadNativeMethodRunner_nativeRun(JNIEnv *gdk_env
__attribute__((unused)), jobject lcl_obj __attribute__((unused)), jlong
funcAddr, jlong funcArg)
{
/* Convert the function's address back into a pointer to a C function. */
- void *(*funcPtr)(void *) = (void *(*)(void *)) funcAddr;
-
+ void *(*funcPtr)(void *) = (void *(*)(void *)) (size_t)funcAddr;
+
/* We do not need to worry about the return value from funcPtr(); it's
just thrown away. That is part of the g_threads spec, so no reason
to worry about returning it. */
- (void) funcPtr((void *) funcArg);
+ (void) funcPtr((void *) (size_t)funcArg);
/* Fall off the end and terminate the thread of control. */
}
Index: native/jni/gtk-peer/gnu_java_awt_peer_gtk_GdkFontMetrics.c
===================================================================
RCS file:
/cvsroot/classpath/classpath/native/jni/gtk-peer/gnu_java_awt_peer_gtk_GdkFontMetrics.c,v
retrieving revision 1.11
diff -u -r1.11 gnu_java_awt_peer_gtk_GdkFontMetrics.c
--- native/jni/gtk-peer/gnu_java_awt_peer_gtk_GdkFontMetrics.c 8 Oct 2004
22:49:27 -0000 1.11
+++ native/jni/gtk-peer/gnu_java_awt_peer_gtk_GdkFontMetrics.c 26 Oct 2004
23:28:55 -0000
@@ -42,7 +42,7 @@
#include <gdk/gdkx.h>
JNIEXPORT void JNICALL
Java_gnu_java_awt_peer_gtk_GdkFontMetrics_getPeerFontMetrics
- (JNIEnv *env, jclass clazz, jobject java_font, jdoubleArray java_metrics)
+ (JNIEnv *env, jclass clazz __attribute__ ((unused)), jobject java_font,
jdoubleArray java_metrics)
{
struct peerfont *pfont = NULL;
jdouble *native_metrics = NULL;
@@ -75,7 +75,7 @@
}
JNIEXPORT void JNICALL
Java_gnu_java_awt_peer_gtk_GdkFontMetrics_getPeerTextMetrics
- (JNIEnv *env, jclass clazz, jobject java_font, jstring str, jdoubleArray
java_metrics)
+ (JNIEnv *env, jclass clazz __attribute__ ((unused)), jobject java_font,
jstring str, jdoubleArray java_metrics)
{
struct peerfont *pfont = NULL;
const char *cstr = NULL;
Index: native/jni/gtk-peer/gnu_java_awt_peer_gtk_GdkFontPeer.c
===================================================================
RCS file:
/cvsroot/classpath/classpath/native/jni/gtk-peer/gnu_java_awt_peer_gtk_GdkFontPeer.c,v
retrieving revision 1.1
diff -u -r1.1 gnu_java_awt_peer_gtk_GdkFontPeer.c
--- native/jni/gtk-peer/gnu_java_awt_peer_gtk_GdkFontPeer.c 8 Oct 2004
21:41:41 -0000 1.1
+++ native/jni/gtk-peer/gnu_java_awt_peer_gtk_GdkFontPeer.c 26 Oct 2004
23:28:55 -0000
@@ -114,6 +114,7 @@
struct peerfont *pfont = NULL;
char const *family_name = NULL;
enum java_awt_font_style style;
+ PangoFT2FontMap *ft2_map;
gdk_threads_enter ();
style = (enum java_awt_font_style) style_int;
@@ -148,7 +149,10 @@
if (useGraphics2D)
{
if (pfont->ctx == NULL)
- pfont->ctx = pango_ft2_font_map_create_context
(pango_ft2_font_map_for_display ());
+ {
+ ft2_map = PANGO_FT2_FONT_MAP(pango_ft2_font_map_for_display ());
+ pfont->ctx = pango_ft2_font_map_create_context (ft2_map);
+ }
}
else
{
Index: native/jni/gtk-peer/gnu_java_awt_peer_gtk_GdkGlyphVector.c
===================================================================
RCS file:
/cvsroot/classpath/classpath/native/jni/gtk-peer/gnu_java_awt_peer_gtk_GdkGlyphVector.c,v
retrieving revision 1.7
diff -u -r1.7 gnu_java_awt_peer_gtk_GdkGlyphVector.c
--- native/jni/gtk-peer/gnu_java_awt_peer_gtk_GdkGlyphVector.c 5 Sep 2004
15:02:51 -0000 1.7
+++ native/jni/gtk-peer/gnu_java_awt_peer_gtk_GdkGlyphVector.c 26 Oct 2004
23:28:55 -0000
@@ -58,8 +58,8 @@
NSA_GV_INIT (env, clazz);
}
-JNIEXPORT void JNICALL Java_gnu_java_awt_peer_gtk_GdkGlyphVector_initState
- (JNIEnv *env, jobject self, jobject font, jobject ctx)
+JNIEXPORT void JNICALL Java_gnu_java_awt_peer_gtk_GdkGlyphVector_initState
+ (JNIEnv *env, jobject self, jobject font, jobject ctx __attribute__
((unused)))
{
struct glyphvec *vec = NULL;
struct peerfont *pfont = NULL;
@@ -114,12 +114,13 @@
{
GList *i = NULL;
PangoGlyphItem *gi = NULL;
+ int begin = 0;
g_assert (list != NULL);
g_assert (gs != NULL);
g_assert (nidx != NULL);
- int begin = 0;
+
for (i = g_list_first (list); i != NULL; i = g_list_next (i))
{
g_assert (i->data != NULL);
@@ -330,8 +331,8 @@
}
-JNIEXPORT void JNICALL Java_gnu_java_awt_peer_gtk_GdkGlyphVector_setGlyphCodes
- (JNIEnv *env, jobject self, jintArray codes)
+JNIEXPORT void JNICALL Java_gnu_java_awt_peer_gtk_GdkGlyphVector_setGlyphCodes
+ (JNIEnv *env, jobject self, jintArray codes __attribute__ ((unused)))
{
struct glyphvec *vec = NULL;
@@ -398,8 +399,8 @@
}
-JNIEXPORT jint JNICALL
Java_gnu_java_awt_peer_gtk_GdkGlyphVector_glyphCharIndex
- (JNIEnv *env, jobject self, jint idx)
+JNIEXPORT jint JNICALL Java_gnu_java_awt_peer_gtk_GdkGlyphVector_glyphCharIndex
+(JNIEnv *env __attribute__ ((unused)), jobject self __attribute__ ((unused)),
jint idx)
{
/*
FIXME: this is not correct, rather it assumes a (broken) 1:1
@@ -625,7 +626,7 @@
JNIEXPORT jboolean JNICALL
Java_gnu_java_awt_peer_gtk_GdkGlyphVector_glyphIsHorizontal
- (JNIEnv *env, jobject self, jint idx)
+(JNIEnv *env, jobject self, jint idx __attribute__ ((unused)))
{
struct glyphvec *vec = NULL;
PangoDirection dir;
Index: native/jni/gtk-peer/gnu_java_awt_peer_gtk_GdkGraphics.c
===================================================================
RCS file:
/cvsroot/classpath/classpath/native/jni/gtk-peer/gnu_java_awt_peer_gtk_GdkGraphics.c,v
retrieving revision 1.16
diff -u -r1.16 gnu_java_awt_peer_gtk_GdkGraphics.c
--- native/jni/gtk-peer/gnu_java_awt_peer_gtk_GdkGraphics.c 8 Oct 2004
22:27:35 -0000 1.16
+++ native/jni/gtk-peer/gnu_java_awt_peer_gtk_GdkGraphics.c 26 Oct 2004
23:28:55 -0000
@@ -130,7 +130,6 @@
(JNIEnv *env, jobject obj, jobject peer)
{
void *ptr;
- jobject *gref;
ptr = NSA_GET_PTR (env, peer);
@@ -420,13 +419,15 @@
struct graphics *g;
GdkGCValues saved;
GtkWidget *widget;
+ union widget_union w;
g = (struct graphics *) NSA_GET_PTR (env, obj);
gdk_threads_enter ();
if (GDK_IS_WINDOW (g->drawable))
{
- gdk_window_get_user_data (GDK_WINDOW (g->drawable), (void **) &widget);
+ w.widget = &widget;
+ gdk_window_get_user_data (GDK_WINDOW (g->drawable), w.void_widget);
if (widget == NULL || !GTK_IS_EVENT_BOX (widget))
gdk_window_clear_area ((GdkWindow *) g->drawable,
x + g->x_offset, y + g->y_offset,
@@ -642,7 +643,8 @@
gdk_threads_leave ();
}
-static void realize_cb (GtkWidget *widget, jobject peer)
+static void realize_cb (GtkWidget *widget __attribute__ ((unused)),
+ jobject peer)
{
gdk_threads_leave ();
Index: native/jni/gtk-peer/gnu_java_awt_peer_gtk_GdkPixbufDecoder.c
===================================================================
RCS file:
/cvsroot/classpath/classpath/native/jni/gtk-peer/gnu_java_awt_peer_gtk_GdkPixbufDecoder.c,v
retrieving revision 1.8
diff -u -r1.8 gnu_java_awt_peer_gtk_GdkPixbufDecoder.c
--- native/jni/gtk-peer/gnu_java_awt_peer_gtk_GdkPixbufDecoder.c 8 Oct
2004 18:03:00 -0000 1.8
+++ native/jni/gtk-peer/gnu_java_awt_peer_gtk_GdkPixbufDecoder.c 26 Oct
2004 23:28:56 -0000
@@ -99,14 +99,17 @@
JNIEnv *env;
union env_union e;
jint stride_bytes, stride_pixels, n_channels, n_pixels;
- int i;
jintArray jpixels;
jint *java_pixels;
guchar *gdk_pixels;
GdkPixbuf *pixbuf_no_alpha = NULL;
GdkPixbuf *pixbuf = NULL;
-
+
+#ifndef WORDS_BIGENDIAN
+ int i;
+#endif
+
pixbuf_no_alpha = gdk_pixbuf_loader_get_pixbuf (loader);
if (pixbuf_no_alpha == NULL)
return;
Index: native/jni/gtk-peer/gnu_java_awt_peer_gtk_GtkButtonPeer.c
===================================================================
RCS file:
/cvsroot/classpath/classpath/native/jni/gtk-peer/gnu_java_awt_peer_gtk_GtkButtonPeer.c,v
retrieving revision 1.20
diff -u -r1.20 gnu_java_awt_peer_gtk_GtkButtonPeer.c
--- native/jni/gtk-peer/gnu_java_awt_peer_gtk_GtkButtonPeer.c 16 Oct 2004
16:15:51 -0000 1.20
+++ native/jni/gtk-peer/gnu_java_awt_peer_gtk_GtkButtonPeer.c 26 Oct 2004
23:28:56 -0000
@@ -279,7 +279,7 @@
Java_gnu_java_awt_peer_gtk_GtkButtonPeer_setNativeBounds
(JNIEnv *env, jobject obj, jint x, jint y, jint width, jint height)
{
- GtkWidget *widget;
+ GtkWidget *widget, *child;
void *ptr;
ptr = NSA_GET_PTR (env, obj);
@@ -292,17 +292,17 @@
widget's natural size. */
width = width < 0 ? 0 : width;
height = height < 0 ? 0 : height;
+ child = gtk_bin_get_child (GTK_BIN (widget));
if (!(width == 0 && height == 0))
{
/* Set the event box's size request... */
gtk_widget_set_size_request (widget, width, height);
/* ...and the button's size request... */
- gtk_widget_set_size_request (gtk_bin_get_child (GTK_BIN (widget)),
- width, height);
+ gtk_widget_set_size_request (child, width, height);
/* ...and the label's size request. */
- gtk_widget_set_size_request (gtk_bin_get_child (gtk_bin_get_child
(GTK_BIN (widget))),
- width, height);
+ gtk_widget_set_size_request (gtk_bin_get_child (GTK_BIN (child)), width,
+ height);
if (widget->parent != NULL)
gtk_fixed_move (GTK_FIXED (widget->parent), widget, x, y);
}
Index: native/jni/gtk-peer/gnu_java_awt_peer_gtk_GtkChoicePeer.c
===================================================================
RCS file:
/cvsroot/classpath/classpath/native/jni/gtk-peer/gnu_java_awt_peer_gtk_GtkChoicePeer.c,v
retrieving revision 1.11
diff -u -r1.11 gnu_java_awt_peer_gtk_GtkChoicePeer.c
--- native/jni/gtk-peer/gnu_java_awt_peer_gtk_GtkChoicePeer.c 31 Jul 2004
21:15:06 -0000 1.11
+++ native/jni/gtk-peer/gnu_java_awt_peer_gtk_GtkChoicePeer.c 26 Oct 2004
23:28:56 -0000
@@ -45,8 +45,7 @@
Java_gnu_java_awt_peer_gtk_GtkChoicePeer_create
(JNIEnv *env, jobject obj)
{
- GtkWidget *menu;
- GtkComboBox *combobox;
+ GtkWidget *combobox;
NSA_SET_GLOBAL_REF (env, obj);
@@ -181,7 +180,6 @@
jstring label;
GtkTreeModel *model;
GtkTreeIter iter;
- GValue value;
gchar *selected;
gint index;
Index: native/jni/gtk-peer/gnu_java_awt_peer_gtk_GtkClipboard.c
===================================================================
RCS file:
/cvsroot/classpath/classpath/native/jni/gtk-peer/gnu_java_awt_peer_gtk_GtkClipboard.c,v
retrieving revision 1.7
diff -u -r1.7 gnu_java_awt_peer_gtk_GtkClipboard.c
--- native/jni/gtk-peer/gnu_java_awt_peer_gtk_GtkClipboard.c 29 Mar 2004
07:07:26 -0000 1.7
+++ native/jni/gtk-peer/gnu_java_awt_peer_gtk_GtkClipboard.c 26 Oct 2004
23:28:56 -0000
@@ -148,8 +148,8 @@
utflen = (*gdk_env)->GetStringUTFLength (gdk_env, jstr);
utf = (*gdk_env)->GetStringUTFChars (gdk_env, jstr, NULL);
- gtk_selection_data_set (selection_data, GDK_TARGET_STRING, 8,
- (char *)utf, utflen);
+ gtk_selection_data_set (selection_data, GDK_TARGET_STRING, 8,
+ (const unsigned char*)utf, utflen);
(*gdk_env)->ReleaseStringUTFChars (gdk_env, jstr, utf);
}
Index: native/jni/gtk-peer/gnu_java_awt_peer_gtk_GtkEvents.c
===================================================================
RCS file:
/cvsroot/classpath/classpath/native/jni/gtk-peer/gnu_java_awt_peer_gtk_GtkEvents.c,v
retrieving revision 1.30
diff -u -r1.30 gnu_java_awt_peer_gtk_GtkEvents.c
--- native/jni/gtk-peer/gnu_java_awt_peer_gtk_GtkEvents.c 8 Oct 2004
22:16:09 -0000 1.30
+++ native/jni/gtk-peer/gnu_java_awt_peer_gtk_GtkEvents.c 26 Oct 2004
23:28:56 -0000
@@ -827,14 +827,16 @@
static guint button_number = -1;
static jint click_count = 1;
static int hasBeenDragged;
+ union widget_union w;
/* If it is not a focus change event, the widget must be realized already.
If not, ignore the event (Gtk+ will do the same). */
if (!(event->type == GDK_FOCUS_CHANGE || GTK_WIDGET_REALIZED(widget)))
return FALSE;
-
+
/* Do not handle propagated events. AWT has its own propagation rules */
- gdk_window_get_user_data (event->any.window, (void **) &event_widget);
+ w.widget = &event_widget;
+ gdk_window_get_user_data (event->any.window, w.void_widget);
if (event_widget != widget)
return FALSE;
@@ -1128,7 +1130,8 @@
* can be sure that widget->window is non-NULL, and so can have data
* connected to it.
*/
-void connect_awt_hook_cb (GtkWidget *widget, jobject peer)
+void connect_awt_hook_cb (GtkWidget *widget __attribute__((unused)),
+ jobject peer)
{
void *ptr;
Index: native/jni/gtk-peer/gnu_java_awt_peer_gtk_GtkFileDialogPeer.c
===================================================================
RCS file:
/cvsroot/classpath/classpath/native/jni/gtk-peer/gnu_java_awt_peer_gtk_GtkFileDialogPeer.c,v
retrieving revision 1.15
diff -u -r1.15 gnu_java_awt_peer_gtk_GtkFileDialogPeer.c
--- native/jni/gtk-peer/gnu_java_awt_peer_gtk_GtkFileDialogPeer.c 8 Oct
2004 22:16:09 -0000 1.15
+++ native/jni/gtk-peer/gnu_java_awt_peer_gtk_GtkFileDialogPeer.c 26 Oct
2004 23:28:56 -0000
@@ -127,10 +127,9 @@
This function extracts the filename from the GtkFileFilterInfo object,
and passes it to the Java method. The Java method will call the filter's
accept() method and will give back the return value. */
-gboolean filenameFilterCallback (const GtkFileFilterInfo *filter_info,
- gpointer obj)
+static gboolean filenameFilterCallback (const GtkFileFilterInfo *filter_info,
+ gpointer obj)
{
- gchar* dirname;
jclass cx;
jmethodID id;
jstring *filename;
@@ -151,7 +150,7 @@
JNIEXPORT void JNICALL
Java_gnu_java_awt_peer_gtk_GtkFileDialogPeer_nativeSetFilenameFilter
- (JNIEnv *env, jobject obj, jobject filter_obj)
+ (JNIEnv *env, jobject obj, jobject filter_obj __attribute__((unused)))
{
void *ptr;
GtkFileFilter *filter;
@@ -161,11 +160,8 @@
gdk_threads_enter ();
filter = gtk_file_filter_new();
- gtk_file_filter_add_custom(filter,
- GTK_FILE_FILTER_FILENAME,
- G_CALLBACK(filenameFilterCallback),
- obj,
- NULL);
+ gtk_file_filter_add_custom(filter, GTK_FILE_FILTER_FILENAME,
+ filenameFilterCallback, obj, NULL);
gtk_file_chooser_set_filter(GTK_FILE_CHOOSER(ptr), filter);
@@ -220,7 +216,7 @@
static jmethodID disposeID;
void *ptr;
G_CONST_RETURN gchar *fileName;
- jstring str_fileName;
+ jstring str_fileName = NULL;
/* We only need this for the case when the user closed the window,
or clicked ok or cancel. */
@@ -252,8 +248,6 @@
if (responseId == GTK_RESPONSE_OK) {
fileName = gtk_file_chooser_get_filename (GTK_FILE_CHOOSER (GTK_WIDGET
(ptr)));
str_fileName = (*gdk_env)->NewStringUTF (gdk_env, fileName);
- } else if (responseId == GTK_RESPONSE_CANCEL) {
- str_fileName = NULL;
}
if (!isIDSet)
Index: native/jni/gtk-peer/gnu_java_awt_peer_gtk_GtkFramePeer.c
===================================================================
RCS file:
/cvsroot/classpath/classpath/native/jni/gtk-peer/gnu_java_awt_peer_gtk_GtkFramePeer.c,v
retrieving revision 1.2
diff -u -r1.2 gnu_java_awt_peer_gtk_GtkFramePeer.c
--- native/jni/gtk-peer/gnu_java_awt_peer_gtk_GtkFramePeer.c 22 Sep 2004
11:38:58 -0000 1.2
+++ native/jni/gtk-peer/gnu_java_awt_peer_gtk_GtkFramePeer.c 26 Oct 2004
23:28:56 -0000
@@ -156,7 +156,7 @@
}
JNIEXPORT void JNICALL
-Java_gnu_java_awt_peer_gtk_GtkFramePeer_nativeSetIconImage
+Java_gnu_java_awt_peer_gtk_GtkFramePeer_nativeSetIconImageFromDecoder
(JNIEnv *env, jobject obj, jobject decoder)
{
void *ptr;
Index: native/jni/gtk-peer/gnu_java_awt_peer_gtk_GtkTextAreaPeer.c
===================================================================
RCS file:
/cvsroot/classpath/classpath/native/jni/gtk-peer/gnu_java_awt_peer_gtk_GtkTextAreaPeer.c,v
retrieving revision 1.19
diff -u -r1.19 gnu_java_awt_peer_gtk_GtkTextAreaPeer.c
--- native/jni/gtk-peer/gnu_java_awt_peer_gtk_GtkTextAreaPeer.c 22 Sep 2004
11:03:10 -0000 1.19
+++ native/jni/gtk-peer/gnu_java_awt_peer_gtk_GtkTextAreaPeer.c 26 Oct 2004
23:28:56 -0000
@@ -54,7 +54,7 @@
text = gtk_text_view_new ();
gtk_widget_set_size_request (text, textview_width, textview_height);
- gtk_text_view_set_cursor_visible(text, TRUE);
+ gtk_text_view_set_cursor_visible(GTK_TEXT_VIEW (text), TRUE);
gtk_widget_show (text);
Index: native/jni/gtk-peer/gnu_java_awt_peer_gtk_GtkWindowPeer.c
===================================================================
RCS file:
/cvsroot/classpath/classpath/native/jni/gtk-peer/gnu_java_awt_peer_gtk_GtkWindowPeer.c,v
retrieving revision 1.37
diff -u -r1.37 gnu_java_awt_peer_gtk_GtkWindowPeer.c
--- native/jni/gtk-peer/gnu_java_awt_peer_gtk_GtkWindowPeer.c 16 Oct 2004
16:15:51 -0000 1.37
+++ native/jni/gtk-peer/gnu_java_awt_peer_gtk_GtkWindowPeer.c 26 Oct 2004
23:28:56 -0000
@@ -81,6 +81,19 @@
GdkEventProperty *event,
jobject peer);
+/* Union used for type punning. */
+union extents_union
+{
+ guchar **gu_extents;
+ unsigned long **extents;
+};
+
+union atom_list_union
+{
+ guchar **gu_extents;
+ Atom **atom_list;
+};
+
JNIEXPORT void JNICALL
Java_gnu_java_awt_peer_gtk_GtkWindowPeer_create
(JNIEnv *env, jobject obj, jint type, jboolean decorated,
@@ -370,6 +383,7 @@
int *top, int *left, int *bottom, int *right)
{
unsigned long *extents = NULL;
+ union extents_union gu_ex;
/* Guess frame extents in case _NET_FRAME_EXTENTS is not
supported. */
@@ -383,6 +397,7 @@
request_frame_extents (window);
/* Attempt to retrieve window's frame extents. */
+ gu_ex.extents = &extents;
if (gdk_property_get (window->window,
gdk_atom_intern ("_NET_FRAME_EXTENTS", FALSE),
gdk_atom_intern ("CARDINAL", FALSE),
@@ -392,7 +407,7 @@
NULL,
NULL,
NULL,
- (guchar **)&extents))
+ gu_ex.gu_extents))
{
*left = extents [0];
*right = extents [1];
@@ -506,11 +521,12 @@
}
static void
-window_active_state_change_cb (GtkWidget *widget,
- GParamSpec *pspec,
- jobject peer)
+window_active_state_change_cb (GtkWidget *widget __attribute__((unused)),
+ GParamSpec *pspec __attribute__((unused)),
+ jobject peer __attribute__((unused)))
{
/* FIXME: not sure if this is needed or not. */
+ /* Remove the unused attributes if you fix the below. */
#if 0
if (GTK_WINDOW (widget)->is_active)
(*gdk_env)->CallVoidMethod (gdk_env, peer,
@@ -527,8 +543,8 @@
static void
window_focus_state_change_cb (GtkWidget *widget,
- GParamSpec *pspec,
- jobject peer)
+ GParamSpec *pspec __attribute__((unused)),
+ jobject peer)
{
if (GTK_WINDOW (widget)->has_toplevel_focus)
(*gdk_env)->CallVoidMethod (gdk_env, peer,
@@ -543,9 +559,9 @@
}
static gboolean
-window_focus_in_cb (GtkWidget * widget,
- GdkEventFocus *event,
- jobject peer)
+window_focus_in_cb (GtkWidget * widget __attribute__((unused)),
+ GdkEventFocus *event __attribute__((unused)),
+ jobject peer)
{
(*gdk_env)->CallVoidMethod (gdk_env, peer,
postWindowEventID,
@@ -557,9 +573,9 @@
}
static gboolean
-window_focus_out_cb (GtkWidget * widget,
- GdkEventFocus *event,
- jobject peer)
+window_focus_out_cb (GtkWidget * widget __attribute__((unused)),
+ GdkEventFocus *event __attribute__((unused)),
+ jobject peer)
{
(*gdk_env)->CallVoidMethod (gdk_env, peer,
postWindowEventID,
@@ -625,12 +641,15 @@
gulong atom_count;
gulong bytes_after;
Atom *atom_list = NULL;
+ union atom_list_union alu;
gulong i;
- XGetWindowProperty (GDK_DISPLAY_XDISPLAY (display), GDK_WINDOW_XID
(widget->window),
+ alu.atom_list = &atom_list;
+ XGetWindowProperty (GDK_DISPLAY_XDISPLAY (display),
+ GDK_WINDOW_XID (widget->window),
gdk_x11_get_xatom_by_name_for_display (display,
"_NET_WM_STATE"),
0, G_MAXLONG, False, XA_ATOM, &type, &format, &atom_count,
- &bytes_after, (guchar **)&atom_list);
+ &bytes_after, alu.gu_extents);
if (type != None)
{
@@ -659,6 +678,7 @@
jobject peer)
{
unsigned long *extents;
+ union extents_union gu_ex;
static int id_set = 0;
static jmethodID postInsetsChangedEventID;
@@ -673,7 +693,7 @@
"(IIII)V");
id_set = 1;
}
-
+ gu_ex.extents = &extents;
if (gdk_atom_intern ("_NET_FRAME_EXTENTS", FALSE) == event->atom
&& gdk_property_get (event->window,
gdk_atom_intern ("_NET_FRAME_EXTENTS", FALSE),
@@ -684,7 +704,7 @@
NULL,
NULL,
NULL,
- (guchar **)&extents))
+ gu_ex.gu_extents))
(*gdk_env)->CallVoidMethod (gdk_env, peer,
postInsetsChangedEventID,
(jint) extents[2], /* top */
Index: native/jni/gtk-peer/gtkpeer.h
===================================================================
RCS file: /cvsroot/classpath/classpath/native/jni/gtk-peer/gtkpeer.h,v
retrieving revision 1.26
diff -u -r1.26 gtkpeer.h
--- native/jni/gtk-peer/gtkpeer.h 8 Oct 2004 22:49:28 -0000 1.26
+++ native/jni/gtk-peer/gtkpeer.h 26 Oct 2004 23:28:56 -0000
@@ -486,6 +486,13 @@
const char *label;
};
+/* Union used for type punning. */
+union widget_union
+{
+ void **void_widget;
+ GtkWidget **widget;
+};
+
#define DEBUG_LOCKING 0
#if DEBUG_LOCKING
signature.asc
Description: This is a digitally signed message part
| [Prev in Thread] |
Current Thread |
[Next in Thread] |
- [cp-patches] FYI: gtk-peer compiler warning fixes from libgcj,
Mark Wielaard <=