Mercurial > hg > release > icedtea6-1.4
changeset 280:5e982b720d14 cacao
2007-10-04 Thomas Fitzsimmons <fitzsim@redhat.com>
PR 73
* Makefile.am (ICEDTEA_PATCHES): Add
patches/icedtea-gtkplaf.patch.
* Makefile.in: Regenerate.
* patches/icedtea-gtkplaf.patch: New file.
author | Thomas Fitzsimmons <fitzsim@redhat.com> |
---|---|
date | Thu, 04 Oct 2007 16:43:18 -0400 |
parents | b40098da4b0f |
children | 833bfe870b9f |
files | ChangeLog Makefile.am patches/icedtea-gtkplaf.patch |
diffstat | 3 files changed, 32 insertions(+), 0 deletions(-) [+] |
line wrap: on
line diff
--- a/ChangeLog Thu Oct 04 14:06:11 2007 -0400 +++ b/ChangeLog Thu Oct 04 16:43:18 2007 -0400 @@ -1,3 +1,11 @@ +2007-10-04 Thomas Fitzsimmons <fitzsim@redhat.com> + + PR 73 + * Makefile.am (ICEDTEA_PATCHES): Add + patches/icedtea-gtkplaf.patch. + * Makefile.in: Regenerate. + * patches/icedtea-gtkplaf.patch: New file. + 2007-10-04 Lillian Angel <langel@redhat.com> * INSTALL: Updated docs on how-to-build, and build requirements.
--- a/Makefile.am Thu Oct 04 14:06:11 2007 -0400 +++ b/Makefile.am Thu Oct 04 16:43:18 2007 -0400 @@ -146,6 +146,7 @@ patches/icedtea-bytebuffer-compact.patch \ patches/icedtea-float-double-trailing-zeros.patch \ patches/icedtea-xinerama.patch \ + patches/icedtea-gtkplaf.patch \ $(FAST_BUILD_PATCH) \ $(DISTRIBUTION_PATCHES)
--- /dev/null Thu Jan 01 00:00:00 1970 +0000 +++ b/patches/icedtea-gtkplaf.patch Thu Oct 04 16:43:18 2007 -0400 @@ -0,0 +1,23 @@ +--- openjdk/j2se/src/solaris/native/sun/awt/gtk2_interface.c.orig 2007-09-27 04:08:04.000000000 -0400 ++++ openjdk/j2se/src/solaris/native/sun/awt/gtk2_interface.c 2007-10-04 16:31:04.000000000 -0400 +@@ -1410,20 +1410,6 @@ + (*fp_gtk_menu_item_set_submenu)((GtkMenuItem*)root_menu, result); + (*fp_gtk_menu_shell_append)((GtkMenuShell *)menu_bar, root_menu); + } +- else if (widget_type == COMBO_BOX_ARROW_BUTTON || +- widget_type == COMBO_BOX_TEXT_FIELD) +- { +- /* +- * We add a regular GtkButton/GtkEntry to a GtkComboBoxEntry +- * in order to trick engines into thinking it's a real combobox +- * arrow button/text field. +- */ +- GtkWidget *combo = (*fp_gtk_combo_box_entry_new)(); +- (*fp_gtk_container_add)((GtkContainer *)combo, result); +- (*fp_gtk_container_add)((GtkContainer *)gtk2_fixed, combo); +- (*fp_gtk_widget_realize)(result); +- return result; +- } + else if (widget_type != TOOL_TIP && + widget_type != INTERNAL_FRAME && + widget_type != OPTION_PANE)