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

6804221: Three tests for JTabbedPane produce VM crash on rhel3

Browse Source 
Reviewed-by: stayer, campbell
This commit is contained in:
Peter Zhelezniakov 2009-02-24 19:17:51 +03:00
parent 2ba8da1975
commit 07338e17b5
1 changed files with 5 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
jdk/src/solaris/native/sun/awt/gtk2_interface.c
View File

@ -93,6 +93,7 @@ static int gtk2_pixbuf_height = 0;
/* Static buffer for conversion from java.lang.String to UTF-8 */ /* Static buffer for conversion from java.lang.String to UTF-8 */
static char convertionBuffer[CONV_BUFFER_SIZE]; static char convertionBuffer[CONV_BUFFER_SIZE];
static gboolean new_combo = TRUE;
const char ENV_PREFIX[] = "GTK_MODULES="; const char ENV_PREFIX[] = "GTK_MODULES=";
/*******************/ /*******************/
@ -608,6 +609,7 @@ gboolean gtk2_load()
dlsym(gtk2_libhandle, "gtk_combo_box_entry_new"); dlsym(gtk2_libhandle, "gtk_combo_box_entry_new");
if (fp_gtk_combo_box_entry_new == NULL) { if (fp_gtk_combo_box_entry_new == NULL) {
fp_gtk_combo_box_entry_new = dl_symbol("gtk_combo_new"); fp_gtk_combo_box_entry_new = dl_symbol("gtk_combo_new");
new_combo = FALSE;
} }
fp_gtk_separator_tool_item_new = fp_gtk_separator_tool_item_new =
@ -1423,17 +1425,13 @@ static GtkWidget *gtk2_get_widget(WidgetType widget_type)
*/ */
GtkWidget *combo = (*fp_gtk_combo_box_entry_new)(); GtkWidget *combo = (*fp_gtk_combo_box_entry_new)();
if (widget_type == COMBO_BOX_TEXT_FIELD) if (new_combo && widget_type == COMBO_BOX_ARROW_BUTTON) {
(*fp_gtk_container_add)((GtkContainer *)combo, result);
else
{
(*fp_gtk_widget_set_parent)(result, combo); (*fp_gtk_widget_set_parent)(result, combo);
((GtkBin*)combo)->child = result; ((GtkBin*)combo)->child = result;
} else {
(*fp_gtk_container_add)((GtkContainer *)combo, result);
} }
(*fp_gtk_container_add)((GtkContainer *)gtk2_fixed, combo); (*fp_gtk_container_add)((GtkContainer *)gtk2_fixed, combo);
(*fp_gtk_widget_realize)(result);
return result;
} }
else if (widget_type != TOOL_TIP && else if (widget_type != TOOL_TIP &&
widget_type != INTERNAL_FRAME && widget_type != INTERNAL_FRAME &&