summaryrefslogtreecommitdiffstats
path: root/views/controls
diff options
context:
space:
mode:
authoroshima@chromium.org <oshima@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2009-10-12 19:03:58 +0000
committeroshima@chromium.org <oshima@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2009-10-12 19:03:58 +0000
commit092e313cfbb597c4be2336befbf2216769ec496e (patch)
treed74a8b166be95e87279131e18ba2a5bf05247947 /views/controls
parent02d9be518c123b4521034fd76132e06117129b39 (diff)
downloadchromium_src-092e313cfbb597c4be2336befbf2216769ec496e.zip
chromium_src-092e313cfbb597c4be2336befbf2216769ec496e.tar.gz
chromium_src-092e313cfbb597c4be2336befbf2216769ec496e.tar.bz2
AppendText was appending twice due to bad merge happened in the past.
Added append scenario to view_examples BUG=None TEST=run unit_tests and verify with view_examples. Review URL: http://codereview.chromium.org/271055 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@28724 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'views/controls')
-rw-r--r--views/controls/textfield/native_textfield_gtk.cc5
1 files changed, 1 insertions, 4 deletions
diff --git a/views/controls/textfield/native_textfield_gtk.cc b/views/controls/textfield/native_textfield_gtk.cc
index 9704e7e..911ae38 100644
--- a/views/controls/textfield/native_textfield_gtk.cc
+++ b/views/controls/textfield/native_textfield_gtk.cc
@@ -46,10 +46,6 @@ void NativeTextfieldGtk::UpdateText() {
}
void NativeTextfieldGtk::AppendText(const string16& text) {
- gint position = -1;
- gtk_editable_insert_text(GTK_EDITABLE(native_view()),
- UTF16ToUTF8(text).c_str(),
- text.size(), &position);
if (!native_view())
return;
gtk_entry_append_text(GTK_ENTRY(native_view()), UTF16ToUTF8(text).c_str());
@@ -220,6 +216,7 @@ gboolean NativeTextfieldGtk::OnChangedHandler(
}
gboolean NativeTextfieldGtk::OnChanged() {
+ textfield_->SyncText();
Textfield::Controller* controller = textfield_->GetController();
if (controller)
controller->ContentsChanged(textfield_, GetText());