stan/jdk-24
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

8204895: Better icon support

Browse Source 
Reviewed-by: prr, mschoene, aghaisas, rhalade
This commit is contained in:
Sergey Bylokhov 2018-08-16 10:22:25 -07:00
parent b798d67da6
commit 8b36c242ec
1 changed files with 8 additions and 15 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

23
src/java.desktop/unix/native/libawt_xawt/awt/awt_UNIXToolkit.c
View File

@ -1,5 +1,5 @@
/* /*
* Copyright (c) 2004, 2016, Oracle and/or its affiliates. All rights reserved. * Copyright (c) 2004, 2018, Oracle and/or its affiliates. All rights reserved.
* DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
* *
* This code is free software; you can redistribute it and/or modify it * This code is free software; you can redistribute it and/or modify it
@ -161,6 +161,7 @@ Java_sun_awt_UNIXToolkit_load_1stock_1icon(JNIEnv *env, jobject this,
int len; int len;
char *stock_id_str = NULL; char *stock_id_str = NULL;
char *detail_str = NULL; char *detail_str = NULL;
jboolean result = JNI_FALSE;
if (stock_id == NULL) if (stock_id == NULL)
{ {
@ -190,23 +191,15 @@ Java_sun_awt_UNIXToolkit_load_1stock_1icon(JNIEnv *env, jobject this,
(*env)->GetStringUTFRegion(env, detail, 0, len, detail_str); (*env)->GetStringUTFRegion(env, detail, 0, len, detail_str);
} }
if (!init_method(env, this) ) { if (init_method(env, this)) {
free(stock_id_str); result = gtk->get_icon_data(env, widget_type, stock_id_str,
if (detail_str != NULL) { icon_size, text_direction, detail_str,
free(detail_str); icon_upcall_method, this);
}
return JNI_FALSE;
} }
jboolean result = gtk->get_icon_data(env, widget_type, stock_id_str,
icon_size, text_direction, detail_str,
icon_upcall_method, this);
/* Release the strings we've allocated. */ /* Release the strings we've allocated. */
free(stock_id_str); free(stock_id_str);
if (detail_str != NULL) free(detail_str);
{
free(detail_str);
}
return result; return result;
#else /* HEADLESS */ #else /* HEADLESS */
return JNI_FALSE; return JNI_FALSE;