View | Details | Raw Unified | Return to bug 117115
Collapse All | Expand All

(-)gtk/gtkentry.c.old (-16 / +40 lines)
Lines 3938-3944 Link Here
3938
{
3938
{
3939
  g_return_if_fail (GTK_IS_ENTRY (entry));
3939
  g_return_if_fail (GTK_IS_ENTRY (entry));
3940
3940
3941
  if (entry->visible != visible)
3942
    {
3943
      if (GTK_WIDGET_HAS_FOCUS (entry) && !visible)
3944
	gtk_im_context_focus_out (entry->im_context);
3945
3946
      g_object_unref (entry->im_context);
3947
3948
      entry->im_context = (visible ? gtk_im_multicontext_new () : gtk_im_context_simple_new ());
3949
3950
      g_signal_connect (entry->im_context, "commit",
3951
			G_CALLBACK (gtk_entry_commit_cb), entry);
3952
      g_signal_connect (entry->im_context, "preedit_changed",
3953
			G_CALLBACK (gtk_entry_preedit_changed_cb), entry);
3954
      g_signal_connect (entry->im_context, "retrieve_surrounding",
3955
			G_CALLBACK (gtk_entry_retrieve_surrounding_cb), entry);
3956
      g_signal_connect (entry->im_context, "delete_surrounding",
3957
			G_CALLBACK (gtk_entry_delete_surrounding_cb), entry);
3958
3959
      if (GTK_WIDGET_HAS_FOCUS (entry) && visible)
3960
	gtk_im_context_focus_in (entry->im_context);
3961
    }
3962
3941
  entry->visible = visible ? TRUE : FALSE;
3963
  entry->visible = visible ? TRUE : FALSE;
3964
3942
  g_object_notify (G_OBJECT (entry), "visibility");
3965
  g_object_notify (G_OBJECT (entry), "visibility");
3943
  gtk_entry_recompute (entry);
3966
  gtk_entry_recompute (entry);
3944
}
3967
}
Lines 4562-4583 Link Here
4562
			        G_CALLBACK (gtk_entry_select_all), entry);
4585
			        G_CALLBACK (gtk_entry_select_all), entry);
4563
      gtk_widget_show (menuitem);
4586
      gtk_widget_show (menuitem);
4564
      gtk_menu_shell_append (GTK_MENU_SHELL (entry->popup_menu), menuitem);
4587
      gtk_menu_shell_append (GTK_MENU_SHELL (entry->popup_menu), menuitem);
4565
      
4588
 
4566
      menuitem = gtk_separator_menu_item_new ();
4589
      if (entry->visible)
4567
      gtk_widget_show (menuitem);
4590
	{
4568
      gtk_menu_shell_append (GTK_MENU_SHELL (entry->popup_menu), menuitem);
4591
	  menuitem = gtk_separator_menu_item_new ();
4569
      
4592
	  gtk_widget_show (menuitem);
4570
      menuitem = gtk_menu_item_new_with_mnemonic (_("Input _Methods"));
4593
	  gtk_menu_shell_append (GTK_MENU_SHELL (entry->popup_menu), menuitem);
4571
      gtk_widget_set_sensitive (menuitem, entry->editable);      
4594
4572
      gtk_widget_show (menuitem);
4595
	  menuitem = gtk_menu_item_new_with_mnemonic (_("Input _Methods"));
4573
      submenu = gtk_menu_new ();
4596
	  gtk_widget_set_sensitive (menuitem, entry->editable);      
4574
      gtk_menu_item_set_submenu (GTK_MENU_ITEM (menuitem), submenu);
4597
	  gtk_widget_show (menuitem);
4575
      
4598
	  submenu = gtk_menu_new ();
4576
      gtk_menu_shell_append (GTK_MENU_SHELL (entry->popup_menu), menuitem);
4599
	  gtk_menu_item_set_submenu (GTK_MENU_ITEM (menuitem), submenu);
4577
      
4600
	  gtk_menu_shell_append (GTK_MENU_SHELL (entry->popup_menu), menuitem);
4578
      gtk_im_multicontext_append_menuitems (GTK_IM_MULTICONTEXT (entry->im_context),
4601
	  gtk_im_multicontext_append_menuitems (GTK_IM_MULTICONTEXT (entry->im_context),
4579
					    GTK_MENU_SHELL (submenu));
4602
						GTK_MENU_SHELL (submenu));
4580
      
4603
	}
4604
4581
      menuitem = gtk_menu_item_new_with_mnemonic (_("_Insert Unicode Control Character"));
4605
      menuitem = gtk_menu_item_new_with_mnemonic (_("_Insert Unicode Control Character"));
4582
      gtk_widget_show (menuitem);
4606
      gtk_widget_show (menuitem);
4583
      
4607
      

Return to bug 117115