gtk+ r22123 - in trunk: . gtk

[murrayc svn gnome org]

Author: murrayc
Date: Thu Jan 15 16:53:27 2009
New Revision: 22123
URL: http://svn.gnome.org/viewvc/gtk+?rev=22123&view=rev

Log:
2009-01-15  Murray Cumming  <murrayc murrayc com>

* gtk/gtkimcontext.c: documentation description: Mention the various 
properties and the environment variable, with links to their 
 documentation.
* gtk/gtksettings.c:
* gtk/gtktextview.c: Make the im-module property documentation more 
expansive.

Modified:
   trunk/ChangeLog
   trunk/gtk/gtkentry.c
   trunk/gtk/gtkimcontext.c
   trunk/gtk/gtksettings.c
   trunk/gtk/gtktextview.c

Modified: trunk/gtk/gtkentry.c
==============================================================================
--- trunk/gtk/gtkentry.c	(original)
+++ trunk/gtk/gtkentry.c	Thu Jan 15 16:53:27 2009
@@ -1089,10 +1089,12 @@
   /**
    * GtkEntry:im-module:
    *
-   * Which IM module should be used for this entry.
+   * Which IM (input method) module should be used for this entry. 
+   * See #GtkIMContext.
    * 
    * Setting this to a non-%NULL value overrides the
-   * system-wide IM module setting. See #GtkSettings:gtk-im-module
+   * system-wide IM module setting. See the GtkSettings 
+   * #GtkSettings:gtk-im-module property.
    *
    * Since: 2.16
    */  

Modified: trunk/gtk/gtkimcontext.c
==============================================================================
--- trunk/gtk/gtkimcontext.c	(original)
+++ trunk/gtk/gtkimcontext.c	Thu Jan 15 16:53:27 2009
@@ -35,6 +35,18 @@
  * is used by GTK+ text input widgets like #GtkEntry to map from key events to
  * Unicode character strings.
  *
+ * The user may change the current input method via a context menu, unless the   
+ * #GtkSettings:gtk-show-input-method-menu GtkSettings property is set to FALSE. 
+ * The default input method can be set programmatically via the 
+ * #GtkSettings:gtk-im-module GtkSettings property. Alternatively, you may set 
+ * the GTK_IM_MODULE environment variable as documented in #gtk-running.
+ *
+ * The #GtkEntry #GtkEntry:im-module and #GtkTextView #GtkTextView:im-module 
+ * properties may also be used to set input methods for specific widget 
+ * instances. For instance, a certain entry widget might be expected to contain 
+ * certain characters which would be easier to input with a certain input 
+ * method.
+ *
  * An input method may consume multiple key events in sequence and finally
  * output the composed result. This is called preediting, and an input method
  * may provide feedback about this process by displaying the intermediate

Modified: trunk/gtk/gtksettings.c
==============================================================================
--- trunk/gtk/gtksettings.c	(original)
+++ trunk/gtk/gtksettings.c	Thu Jan 15 16:53:27 2009
@@ -834,7 +834,11 @@
   /**
    * GtkSettings:gtk-im-module:
    *
-   * Which IM module should be used by default.
+   * Which IM (input method) module should be used by default. This is the 
+   * input method that will be used if the user has not explicitly chosen 
+   * another input method from the IM context menu.  
+   *
+   * See #GtkIMContext and see the #GtkSettings:gtk-show-input-method-menu property.
    */
   result = settings_install_property_parser (class,
 					     g_param_spec_string ("gtk-im-module",

Modified: trunk/gtk/gtktextview.c
==============================================================================
--- trunk/gtk/gtktextview.c	(original)
+++ trunk/gtk/gtktextview.c	Thu Jan 15 16:53:27 2009
@@ -666,10 +666,12 @@
    /**
     * GtkTextView:im-module:
     *
-    * Which IM module should be used for this widget.
+    * Which IM (input method) module should be used for this entry. 
+    * See #GtkIMContext.
     *
     * Setting this to a non-%NULL value overrides the
-    * system-wide IM module setting. See #GtkSettings:gtk-im-module
+    * system-wide IM module setting. See the GtkSettings 
+    * #GtkSettings:gtk-im-module property.
     *
     * Since: 2.16
     */