← Back to branch summary

~ubuntu-branches/ubuntu/gutsy/icedtea-java7/gutsy

« back to all changes in this revision

Viewing changes to patches/icedtea-gtkplaf.patch

  • Committer: Bazaar Package Importer
  • Author(s): Matthias Klose
  • Date: 2007-10-07 23:43:28 UTC
  • mfrom: (1.1.1 upstream)
  • Revision ID: james.westby@ubuntu.com-20071007234328-uy4k67jor6a3eftl
Tags: 7~b21-1.4+20071007-0ubuntu1
* Update icedtea to vcs 20071007.
* Update java-access-bridge to 1.20.0.
* Add build-dependency on libxinerama-dev.
* Add Xb-Npp-xxx tags for the -plugin package.
* Name the plugin "GCJ Web Browser Plugin (using IcedTea)", GCJ now
  "Great Cool Java" (according to Michael Koch).
* Compress binary-indep packages using bzip2.

Show diffs side-by-side

added added

removed removed

Lines of Context:
patches/icedtea-gtkplaf.patch
 
1
--- openjdk/j2se/src/solaris/native/sun/awt/gtk2_interface.c.orig       2007-09-27 04:08:04.000000000 -0400
 
2
+++ openjdk/j2se/src/solaris/native/sun/awt/gtk2_interface.c    2007-10-04 16:31:04.000000000 -0400
 
3
@@ -1410,20 +1410,6 @@
 
4
             (*fp_gtk_menu_item_set_submenu)((GtkMenuItem*)root_menu, result);
 
5
             (*fp_gtk_menu_shell_append)((GtkMenuShell *)menu_bar, root_menu);
 
6
         }
 
7
-        else if (widget_type == COMBO_BOX_ARROW_BUTTON ||
 
8
-                 widget_type == COMBO_BOX_TEXT_FIELD)
 
9
-        {
 
10
-            /*
 
11
-             * We add a regular GtkButton/GtkEntry to a GtkComboBoxEntry
 
12
-             * in order to trick engines into thinking it's a real combobox
 
13
-             * arrow button/text field.
 
14
-             */
 
15
-            GtkWidget *combo = (*fp_gtk_combo_box_entry_new)();
 
16
-            (*fp_gtk_container_add)((GtkContainer *)combo, result);
 
17
-            (*fp_gtk_container_add)((GtkContainer *)gtk2_fixed, combo);
 
18
-            (*fp_gtk_widget_realize)(result);
 
19
-            return result;
 
20
-        }
 
21
         else if (widget_type != TOOL_TIP &&
 
22
                  widget_type != INTERNAL_FRAME &&
 
23
                  widget_type != OPTION_PANE)