archive/jdk
1
0
Fork 0
mirror of https://github.com/openjdk/jdk.git synced 2025-09-21 11:34:38 +02:00
Code Issues Projects Releases Packages Wiki Activity Actions

6624717: Corrupted combo box, GTK L&F, Ubuntu 7.10

Browse source 
Reviewed-by: peterz
This commit is contained in:
Kirill Kirichenko 2008-04-11 16:25:17 +04:00
parent f3cc321cb2
commit 0d3612f2d8
1 changed files with 17 additions and 6 deletions
Download patch file Download diff file Expand all files Collapse all files

23
jdk/src/solaris/native/sun/awt/gtk2_interface.c
View file

@ -333,6 +333,7 @@ static void (*fp_gtk_widget_destroy)(GtkWidget *widget);
static GdkPixbuf* (*fp_gtk_widget_render_icon)(GtkWidget *widget, static GdkPixbuf* (*fp_gtk_widget_render_icon)(GtkWidget *widget,
const gchar *stock_id, GtkIconSize size, const gchar *detail); const gchar *stock_id, GtkIconSize size, const gchar *detail);
static void (*fp_gtk_widget_set_name)(GtkWidget *widget, const gchar *name); static void (*fp_gtk_widget_set_name)(GtkWidget *widget, const gchar *name);
static void (*fp_gtk_widget_set_parent)(GtkWidget *widget, GtkWidget *parent);
static void (*fp_gtk_widget_set_direction)(GtkWidget *widget, static void (*fp_gtk_widget_set_direction)(GtkWidget *widget,
GtkTextDirection direction); GtkTextDirection direction);
static void (*fp_gtk_widget_style_get)(GtkWidget *widget, static void (*fp_gtk_widget_style_get)(GtkWidget *widget,
@ -570,6 +571,8 @@ gboolean gtk2_load()
dl_symbol("gtk_widget_render_icon"); dl_symbol("gtk_widget_render_icon");
fp_gtk_widget_set_name = fp_gtk_widget_set_name =
dl_symbol("gtk_widget_set_name"); dl_symbol("gtk_widget_set_name");
fp_gtk_widget_set_parent =
dl_symbol("gtk_widget_set_parent");
fp_gtk_widget_set_direction = fp_gtk_widget_set_direction =
dl_symbol("gtk_widget_set_direction"); dl_symbol("gtk_widget_set_direction");
fp_gtk_widget_style_get = fp_gtk_widget_style_get =
@ -1040,7 +1043,7 @@ static GtkWidget *gtk2_get_widget(WidgetType widget_type)
(NULL == gtk2_widgets[_GTK_COMBO_BOX_ARROW_BUTTON_TYPE])) (NULL == gtk2_widgets[_GTK_COMBO_BOX_ARROW_BUTTON_TYPE]))
{ {
gtk2_widgets[_GTK_COMBO_BOX_ARROW_BUTTON_TYPE] = gtk2_widgets[_GTK_COMBO_BOX_ARROW_BUTTON_TYPE] =
(*fp_gtk_button_new)(); (*fp_gtk_toggle_button_new)();
} }
result = gtk2_widgets[_GTK_COMBO_BOX_ARROW_BUTTON_TYPE]; result = gtk2_widgets[_GTK_COMBO_BOX_ARROW_BUTTON_TYPE];
break; break;
@ -1414,12 +1417,20 @@ static GtkWidget *gtk2_get_widget(WidgetType widget_type)
widget_type == COMBO_BOX_TEXT_FIELD) widget_type == COMBO_BOX_TEXT_FIELD)
{ {
/* /*
* We add a regular GtkButton/GtkEntry to a GtkComboBoxEntry * We add a regular GtkButton/GtkEntry to a GtkComboBoxEntry
* in order to trick engines into thinking it's a real combobox * in order to trick engines into thinking it's a real combobox
* arrow button/text field. * arrow button/text field.
*/ */
GtkWidget *combo = (*fp_gtk_combo_box_entry_new)(); GtkWidget *combo = (*fp_gtk_combo_box_entry_new)();
(*fp_gtk_container_add)((GtkContainer *)combo, result);
if (widget_type == COMBO_BOX_TEXT_FIELD)
(*fp_gtk_container_add)((GtkContainer *)combo, result);
else
{
(*fp_gtk_widget_set_parent)(result, combo);
((GtkBin*)combo)->child = result;
}
(*fp_gtk_container_add)((GtkContainer *)gtk2_fixed, combo); (*fp_gtk_container_add)((GtkContainer *)gtk2_fixed, combo);
(*fp_gtk_widget_realize)(result); (*fp_gtk_widget_realize)(result);
return result; return result;