AuroraMiddleware/gtk2
1
0
Fork 0
forked from AuroraMiddleware/gtk
Code Issues Pull Requests Projects Releases Wiki Activity

Merge ssh://git.gnome.org/git/gtk+

Browse Source
This commit is contained in:
Chun-wei Fan 2010-11-10 10:14:13 +08:00
commit ce3680fe15
3 changed files with 17 additions and 13 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
docs/reference/gdk/tmpl/keys.sgml
View File

@ -265,18 +265,6 @@ Returns: %PANGO_DIRECTION_LTR or %PANGO_DIRECTION_RTL.
@Returns:
<!-- ##### FUNCTION gdk_keyval_name ##### -->
<para>
Converts a key value into a symbolic name.
The names are the same as those in the <filename>&lt;gdk/gdkkeysyms.h&gt;</filename> header file
but without the leading "GDK_KEY_".
</para>
@keyval: a key value.
@Returns: a string containing the name of the key, or %NULL if @keyval is not
a valid key. The string should not be modified.
<!-- ##### FUNCTION gdk_keyval_from_name ##### -->
<para>
Converts a key name to a key value.

14
gdk/x11/gdkkeys-x11.c
View File

@ -1606,7 +1606,19 @@ gdk_keymap_translate_keyboard_state (GdkKeymap *keymap,
/* Key handling not part of the keymap */
/**
* gdk_keyval_name:
*
* Converts a key value into a symbolic name.
* The names are the same as those in the
* <filename>&lt;gdk/gdkkeysyms.h&gt;</filename> header file
* but without the leading "GDK_KEY_".
*
* @keyval: a key value.
*
* Return value: (transfer none): a string containing the name of the key, or
* %NULL if @keyval is not a valid key. The string should not be modified.
**/
gchar*
gdk_keyval_name (guint keyval)
{

4
gtk/gtkeditable.c
View File

@ -199,6 +199,8 @@ gtk_editable_base_init (gpointer g_class)
*
* Note that the position is in characters, not in bytes.
* The function updates @position to point after the newly inserted text.
*
* Virtual: do_insert_text
*/
void
gtk_editable_insert_text (GtkEditable *editable,
@ -373,6 +375,8 @@ gtk_editable_delete_selection (GtkEditable *editable)
* the end of the text.
*
* Note that positions are specified in characters, not bytes.
*
* Virtual: set_selection_bounds
*/
void
gtk_editable_select_region (GtkEditable *editable,