changeset in /hg/icedtea: 2007-10-04 Thomas Fitzsimmons <fitzs...

[Thomas Fitzsimmons]

changeset 0d5ebdf62450 in /hg/icedtea
details: http://icedtea.classpath.org/hg/icedtea?cmd=changeset;node=0d5ebdf62450
description:
	2007-10-04  Thomas Fitzsimmons  <fitzsim at redhat.com>

		PR 73
		* Makefile.am (ICEDTEA_PATCHES): Add
		patches/icedtea-gtkplaf.patch.
		* Makefile.in: Regenerate.
		* patches/icedtea-gtkplaf.patch: New file.

diffstat:

4 files changed, 33 insertions(+)
ChangeLog                     |    8 ++++++++
Makefile.am                   |    1 +
Makefile.in                   |    1 +
patches/icedtea-gtkplaf.patch |   23 +++++++++++++++++++++++

diffs (64 lines):

diff -r d0100142281b -r 0d5ebdf62450 ChangeLog
--- 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  Lillian Angel  <langel at redha
+2007-10-04  Thomas Fitzsimmons  <fitzsim at 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 at redhat.com>
 
 	* INSTALL: Updated docs on how-to-build, and build requirements.
diff -r d0100142281b -r 0d5ebdf62450 Makefile.am
--- a/Makefile.am	Thu Oct 04 14:06:11 2007 -0400
+++ b/Makefile.am	Thu Oct 04 16:43:18 2007 -0400
@@ -140,6 +140,7 @@ ICEDTEA_PATCHES = \
 	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)
 
diff -r d0100142281b -r 0d5ebdf62450 Makefile.in
--- a/Makefile.in	Thu Oct 04 14:06:11 2007 -0400
+++ b/Makefile.in	Thu Oct 04 16:43:18 2007 -0400
@@ -256,6 +256,7 @@ ICEDTEA_PATCHES = \
 	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)
 
diff -r d0100142281b -r 0d5ebdf62450 patches/icedtea-gtkplaf.patch
--- /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)