summaryrefslogtreecommitdiff
path: root/gdk
diff options
context:
space:
mode:
authorEk Kato <ek.kato@gmail.com>2013-07-27 13:55:39 -0700
committerJohn Ralls <jralls@ceridwen.us>2013-07-27 14:09:55 -0700
commitfbfce31889c33e782d14ad595c49e7f7529d9603 (patch)
treede19ec6b5ff372c0e7cc9cebda2c9ced2c299083 /gdk
parentac792f4a06b7d41a34f062af4a16485a9a0eb646 (diff)
downloadgtk+-fbfce31889c33e782d14ad595c49e7f7529d9603.tar.gz
Bug 701332 - Patch for minor glitch in NSTextInput
(cherry picked from commit 43ed68aa33b8e5efde01f7ef10d081b979cd451f)
Diffstat (limited to 'gdk')
-rw-r--r--gdk/quartz/GdkQuartzView.c10
1 files changed, 8 insertions, 2 deletions
diff --git a/gdk/quartz/GdkQuartzView.c b/gdk/quartz/GdkQuartzView.c
index cd25efc029..0254ee319e 100644
--- a/gdk/quartz/GdkQuartzView.c
+++ b/gdk/quartz/GdkQuartzView.c
@@ -122,14 +122,20 @@
-(void)unmarkText
{
GDK_NOTE (EVENTS, g_print ("unmarkText\n"));
+ gchar *prev_str;
markedRange = selectedRange = NSMakeRange (NSNotFound, 0);
+
+ prev_str = g_object_get_data (G_OBJECT (gdk_window), TIC_MARKED_TEXT);
+ if (prev_str)
+ g_free (prev_str);
+ g_object_set_data (G_OBJECT (gdk_window), TIC_MARKED_TEXT, NULL);
}
-(void)setMarkedText: (id)aString selectedRange: (NSRange)newSelection replacementRange: (NSRange)replacementRange
{
GDK_NOTE (EVENTS, g_print ("setMarkedText\n"));
const char *str;
- char *prev_str;
+ gchar *prev_str;
if (replacementRange.location == NSNotFound)
{
@@ -173,7 +179,7 @@
{
GDK_NOTE (EVENTS, g_print ("insertText\n"));
const char *str;
- char *prev_str;
+ gchar *prev_str;
if ([self hasMarkedText])
[self unmarkText];