GtkCssProvider: Handle better wrong enum/flag values.

[~andy/gtk] / gtk / gtkimcontext.c

diff --git a/gtk/gtkimcontext.c b/gtk/gtkimcontext.c
index 3887d4a58ef4b4042f7c1b4014cb67a26a1e5677..d4f5cea09dea93f671daeb8dbd478a7f962c8039 100644 (file)
--- a/gtk/gtkimcontext.c
+++ b/gtk/gtkimcontext.c
@@ -23,7 +23,6 @@
 #include "gtkmain.h"           /* For _gtk_boolean_handled_accumulator */
 #include "gtkmarshalers.h"
 #include "gtkintl.h"
-#include "gtkalias.h"
 
 /**
  * SECTION:gtkimcontext
@@ -35,6 +34,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
@@ -84,7 +95,7 @@
  *
  * After a new loadable input method module has been installed on the system,
  * the configuration file <filename>gtk.immodules</filename> needs to be
- * regenerated by <link linkend="gtk-query-immodules-2.0">gtk-query-immodules-2.0</link>,
+ * regenerated by <link linkend="gtk-query-immodules-3.0">gtk-query-immodules-3.0</link>,
  * in order for the new input method to become available to GTK+ applications.
  */
 
@@ -148,7 +159,7 @@ G_DEFINE_ABSTRACT_TYPE (GtkIMContext, gtk_im_context, G_TYPE_OBJECT)
  *   character.
  * @focus_in: Called via gtk_im_context_focus_in() when the input widget
  *   has gained focus. May be overridden to keep track of the current focus.
- * @focus_out: Called via gtk_im_context_focus_in() when the input widget
+ * @focus_out: Called via gtk_im_context_focus_out() when the input widget
  *   has lost focus. May be overridden to keep track of the current focus.
  * @reset: Called via gtk_im_context_reset() to signal a change such as a
  *   change in cursor position. An input method that implements preediting
@@ -384,7 +395,7 @@ gtk_im_context_real_get_surrounding (GtkIMContext *context,
 /**
  * gtk_im_context_set_client_window:
  * @context: a #GtkIMContext
- * @window:  the client window. This may be %NULL to indicate
+ * @window: (allow-none):  the client window. This may be %NULL to indicate
  *           that the previous client window no longer exists.
  * 
  * Set the client window for the input context; this is the
@@ -697,6 +708,3 @@ gtk_im_context_delete_surrounding (GtkIMContext *context,
 
   return result;
 }
-
-#define __GTK_IM_CONTEXT_C__
-#include "gtkaliasdef.c"