callisto-debian/gtk3
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

rename set_cursor_pos to set_cursor_location in GtkInputContext class

Browse Source 
2001-03-15  HideToshi Tajima  <tajima@happy>

        * modules/input/gtkimcontextxim.c (gtk_im_context_xim_set_cursor_locat
ion):
        * gtk/gtkimmulticontext.c (gtk_im_multicontext_set_cursor_location):
        * gtk/gtkentry.c (update_im_cursor_location):
        * gtk/gtkimcontext.c (gtk_im_context_set_cursor_location):
        * gtk/gtkimcontext.h (struct _GtkIMContextClass): rename
        set_cursor_pos to set_cursor_location in GtkInputContext class
This commit is contained in:
HideToshi Tajima
2001-03-16 01:44:54 +00:00
committed by Hidetoshi Tajima
parent e4d1660042
commit df726ee888
12 changed files with 84 additions and 21 deletions
Download Patch File Download Diff File Expand all files Collapse all files

9
ChangeLog
View File

@ -1,3 +1,12 @@
2001-03-15 HideToshi Tajima <tajima@happy>
* modules/input/gtkimcontextxim.c (gtk_im_context_xim_set_cursor_location):
* gtk/gtkimmulticontext.c (gtk_im_multicontext_set_cursor_location):
* gtk/gtkentry.c (update_im_cursor_location):
* gtk/gtkimcontext.c (gtk_im_context_set_cursor_location):
* gtk/gtkimcontext.h (struct _GtkIMContextClass): rename
set_cursor_pos to set_cursor_location in GtkInputContext class
Thu Mar 15 18:22:44 2001 Jonathan Blandford <jrb@redhat.com>
* gtk/gtkcellrenderer.h: Changed prototype to allow for getting

9
ChangeLog.pre-2-0
View File

@ -1,3 +1,12 @@
2001-03-15 HideToshi Tajima <tajima@happy>
* modules/input/gtkimcontextxim.c (gtk_im_context_xim_set_cursor_location):
* gtk/gtkimmulticontext.c (gtk_im_multicontext_set_cursor_location):
* gtk/gtkentry.c (update_im_cursor_location):
* gtk/gtkimcontext.c (gtk_im_context_set_cursor_location):
* gtk/gtkimcontext.h (struct _GtkIMContextClass): rename
set_cursor_pos to set_cursor_location in GtkInputContext class
Thu Mar 15 18:22:44 2001 Jonathan Blandford <jrb@redhat.com>
* gtk/gtkcellrenderer.h: Changed prototype to allow for getting

9
ChangeLog.pre-2-10
View File

@ -1,3 +1,12 @@
2001-03-15 HideToshi Tajima <tajima@happy>
* modules/input/gtkimcontextxim.c (gtk_im_context_xim_set_cursor_location):
* gtk/gtkimmulticontext.c (gtk_im_multicontext_set_cursor_location):
* gtk/gtkentry.c (update_im_cursor_location):
* gtk/gtkimcontext.c (gtk_im_context_set_cursor_location):
* gtk/gtkimcontext.h (struct _GtkIMContextClass): rename
set_cursor_pos to set_cursor_location in GtkInputContext class
Thu Mar 15 18:22:44 2001 Jonathan Blandford <jrb@redhat.com>
* gtk/gtkcellrenderer.h: Changed prototype to allow for getting

9
ChangeLog.pre-2-2
View File

@ -1,3 +1,12 @@
2001-03-15 HideToshi Tajima <tajima@happy>
* modules/input/gtkimcontextxim.c (gtk_im_context_xim_set_cursor_location):
* gtk/gtkimmulticontext.c (gtk_im_multicontext_set_cursor_location):
* gtk/gtkentry.c (update_im_cursor_location):
* gtk/gtkimcontext.c (gtk_im_context_set_cursor_location):
* gtk/gtkimcontext.h (struct _GtkIMContextClass): rename
set_cursor_pos to set_cursor_location in GtkInputContext class
Thu Mar 15 18:22:44 2001 Jonathan Blandford <jrb@redhat.com>
* gtk/gtkcellrenderer.h: Changed prototype to allow for getting

9
ChangeLog.pre-2-4
View File

@ -1,3 +1,12 @@
2001-03-15 HideToshi Tajima <tajima@happy>
* modules/input/gtkimcontextxim.c (gtk_im_context_xim_set_cursor_location):
* gtk/gtkimmulticontext.c (gtk_im_multicontext_set_cursor_location):
* gtk/gtkentry.c (update_im_cursor_location):
* gtk/gtkimcontext.c (gtk_im_context_set_cursor_location):
* gtk/gtkimcontext.h (struct _GtkIMContextClass): rename
set_cursor_pos to set_cursor_location in GtkInputContext class
Thu Mar 15 18:22:44 2001 Jonathan Blandford <jrb@redhat.com>
* gtk/gtkcellrenderer.h: Changed prototype to allow for getting

9
ChangeLog.pre-2-6
View File

@ -1,3 +1,12 @@
2001-03-15 HideToshi Tajima <tajima@happy>
* modules/input/gtkimcontextxim.c (gtk_im_context_xim_set_cursor_location):
* gtk/gtkimmulticontext.c (gtk_im_multicontext_set_cursor_location):
* gtk/gtkentry.c (update_im_cursor_location):
* gtk/gtkimcontext.c (gtk_im_context_set_cursor_location):
* gtk/gtkimcontext.h (struct _GtkIMContextClass): rename
set_cursor_pos to set_cursor_location in GtkInputContext class
Thu Mar 15 18:22:44 2001 Jonathan Blandford <jrb@redhat.com>
* gtk/gtkcellrenderer.h: Changed prototype to allow for getting

9
ChangeLog.pre-2-8
View File

@ -1,3 +1,12 @@
2001-03-15 HideToshi Tajima <tajima@happy>
* modules/input/gtkimcontextxim.c (gtk_im_context_xim_set_cursor_location):
* gtk/gtkimmulticontext.c (gtk_im_multicontext_set_cursor_location):
* gtk/gtkentry.c (update_im_cursor_location):
* gtk/gtkimcontext.c (gtk_im_context_set_cursor_location):
* gtk/gtkimcontext.h (struct _GtkIMContextClass): rename
set_cursor_pos to set_cursor_location in GtkInputContext class
Thu Mar 15 18:22:44 2001 Jonathan Blandford <jrb@redhat.com>
* gtk/gtkcellrenderer.h: Changed prototype to allow for getting

6
gtk/gtkentry.c
View File

@ -2030,7 +2030,7 @@ gtk_entry_reset_layout (GtkEntry *entry)
}
static void
update_im_cursor_position (GtkEntry *entry)
update_im_cursor_location (GtkEntry *entry)
{
GdkRectangle area;
gint strong_x;
@ -2055,7 +2055,7 @@ update_im_cursor_position (GtkEntry *entry)
area.width = area_width;
area.height = area_height;
gtk_im_context_set_cursor_pos (entry->im_context, &area);
gtk_im_context_set_cursor_location (entry->im_context, &area);
}
static gboolean
@ -2068,7 +2068,7 @@ recompute_idle_func (gpointer data)
entry->recompute_idle = FALSE;
update_im_cursor_position (entry);
update_im_cursor_location (entry);
return FALSE;
}

10
gtk/gtkimcontext.c
View File

@ -285,15 +285,15 @@ gtk_im_context_reset (GtkIMContext *context)
/**
* gtk_im_context_set_cursor_pos:
* gtk_im_context_set_cursor_location:
* @context: a #GtkIMContext
*
* Notify the input method that a change in cursor
* position has been made.
**/
void
gtk_im_context_set_cursor_pos (GtkIMContext *context,
GdkRectangle *area)
gtk_im_context_set_cursor_location (GtkIMContext *context,
GdkRectangle *area)
{
GtkIMContextClass *klass;
@ -301,7 +301,7 @@ gtk_im_context_set_cursor_pos (GtkIMContext *context,
g_return_if_fail (GTK_IS_IM_CONTEXT (context));
klass = GTK_IM_CONTEXT_GET_CLASS (context);
if (klass->set_cursor_pos)
klass->set_cursor_pos (context, area);
if (klass->set_cursor_location)
klass->set_cursor_location (context, area);
}

8
gtk/gtkimcontext.h
View File

@ -67,8 +67,8 @@ struct _GtkIMContextClass
void (*focus_in) (GtkIMContext *context);
void (*focus_out) (GtkIMContext *context);
void (*reset) (GtkIMContext *context);
void (*set_cursor_pos) (GtkIMContext *context,
GdkRectangle *area);
void (*set_cursor_location) (GtkIMContext *context,
GdkRectangle *area);
};
GtkType gtk_im_context_get_type (void) G_GNUC_CONST;
@ -84,8 +84,8 @@ gboolean gtk_im_context_filter_keypress (GtkIMContext *context,
void gtk_im_context_focus_in (GtkIMContext *context);
void gtk_im_context_focus_out (GtkIMContext *context);
void gtk_im_context_reset (GtkIMContext *context);
void gtk_im_context_set_cursor_pos (GtkIMContext *context,
GdkRectangle *area);
void gtk_im_context_set_cursor_location (GtkIMContext *context,
GdkRectangle *area);
#ifdef __cplusplus
}

10
gtk/gtkimmulticontext.c
View File

@ -48,7 +48,7 @@ static gboolean gtk_im_multicontext_filter_keypress (GtkIMContext
static void gtk_im_multicontext_focus_in (GtkIMContext *context);
static void gtk_im_multicontext_focus_out (GtkIMContext *context);
static void gtk_im_multicontext_reset (GtkIMContext *context);
static void gtk_im_multicontext_set_cursor_pos (GtkIMContext *context,
static void gtk_im_multicontext_set_cursor_location (GtkIMContext *context,
GdkRectangle *area);
void gtk_im_multicontext_preedit_start_cb (GtkIMContext *slave,
@ -104,7 +104,7 @@ gtk_im_multicontext_class_init (GtkIMMulticontextClass *class)
im_context_class->focus_in = gtk_im_multicontext_focus_in;
im_context_class->focus_out = gtk_im_multicontext_focus_out;
im_context_class->reset = gtk_im_multicontext_reset;
im_context_class->set_cursor_pos = gtk_im_multicontext_set_cursor_pos;
im_context_class->set_cursor_location = gtk_im_multicontext_set_cursor_location;
gobject_class->finalize = gtk_im_multicontext_finalize;
}
@ -275,14 +275,14 @@ gtk_im_multicontext_reset (GtkIMContext *context)
}
static void
gtk_im_multicontext_set_cursor_pos (GtkIMContext *context,
GdkRectangle *area)
gtk_im_multicontext_set_cursor_location (GtkIMContext *context,
GdkRectangle *area)
{
GtkIMMulticontext *multicontext = GTK_IM_MULTICONTEXT (context);
GtkIMContext *slave = gtk_im_multicontext_get_slave (multicontext);
if (slave)
gtk_im_context_set_cursor_pos (slave, area);
gtk_im_context_set_cursor_location (slave, area);
}
void

8
modules/input/gtkimcontextxim.c
View File

@ -40,7 +40,7 @@ static gboolean gtk_im_context_xim_filter_keypress (GtkIMContext *co
static void gtk_im_context_xim_reset (GtkIMContext *context);
static void gtk_im_context_xim_focus_in (GtkIMContext *context);
static void gtk_im_context_xim_focus_out (GtkIMContext *context);
static void gtk_im_context_xim_set_cursor_pos (GtkIMContext *context,
static void gtk_im_context_xim_set_cursor_location (GtkIMContext *context,
GdkRectangle *area);
static void gtk_im_context_xim_get_preedit_string (GtkIMContext *context,
gchar **str,
@ -215,7 +215,7 @@ gtk_im_context_xim_class_init (GtkIMContextXIMClass *class)
im_context_class->get_preedit_string = gtk_im_context_xim_get_preedit_string;
im_context_class->focus_in = gtk_im_context_xim_focus_in;
im_context_class->focus_out = gtk_im_context_xim_focus_out;
im_context_class->set_cursor_pos = gtk_im_context_xim_set_cursor_pos;
im_context_class->set_cursor_location = gtk_im_context_xim_set_cursor_location;
gobject_class->finalize = gtk_im_context_xim_finalize;
}
@ -395,8 +395,8 @@ gtk_im_context_xim_focus_out (GtkIMContext *context)
}
static void
gtk_im_context_xim_set_cursor_pos (GtkIMContext *context,
GdkRectangle *area)
gtk_im_context_xim_set_cursor_location (GtkIMContext *context,
GdkRectangle *area)
{
GtkIMContextXIM *context_xim = GTK_IM_CONTEXT_XIM (context);
XIC ic = gtk_im_context_xim_get_ic (context_xim);