Make the views bookmark bubble work on GTK....

views/controls/textfield/native_textfield_gtk.cc

Index: views/controls/textfield/native_textfield_gtk.cc
===================================================================
--- views/controls/textfield/native_textfield_gtk.cc	(revision 24784)
+++ views/controls/textfield/native_textfield_gtk.cc	(working copy)
@@ -4,13 +4,19 @@
 
 #include "views/controls/textfield/native_textfield_gtk.h"
 
+#include "base/string_util.h"
+#include "views/controls/textfield/textfield.h"
+
 namespace views {
 
 ////////////////////////////////////////////////////////////////////////////////
 // NativeTextfieldGtk, public:
 
 NativeTextfieldGtk::NativeTextfieldGtk(Textfield* textfield)
-    : NativeControlGtk() {
+    : NativeControlGtk(),
+      textfield_(textfield) {
+  DCHECK(!(textfield_->style() & Textfield::STYLE_MULTILINE)) <<

[sky, 2009/08/28 20:23:51]

Can you add a todo or make this a NOTIMPLEMENTED so that we don't miss it.

+      "We don't support multiline yet.";
 }
 
 NativeTextfieldGtk::~NativeTextfieldGtk() {
@@ -20,44 +26,90 @@
 // NativeTextfieldGtk, NativeTextfieldWrapper implementation:
 
 std::wstring NativeTextfieldGtk::GetText() const {
-  return std::wstring();
+  if (!native_view())
+    return std::wstring();
+  return UTF8ToWide(gtk_entry_get_text(GTK_ENTRY(native_view())));
 }
 
 void NativeTextfieldGtk::UpdateText() {
+  if (!native_view())
+    return;
+  gtk_entry_set_text(GTK_ENTRY(native_view()),
+                     WideToUTF8(textfield_->text()).c_str());
 }
 
 void NativeTextfieldGtk::AppendText(const std::wstring& text) {
+  if (!native_view())
+    return;
+  gtk_entry_append_text(GTK_ENTRY(native_view()), WideToUTF8(text).c_str());
 }
 
 std::wstring NativeTextfieldGtk::GetSelectedText() const {
-  return std::wstring();
+  if (!native_view())
+    return std::wstring();
+
+  int begin, end;
+  if (!gtk_editable_get_selection_bounds(GTK_EDITABLE(native_view()),
+                                         &begin, &end))
+    return std::wstring();  // Nothing selected.
+
+  return UTF8ToWide(std::string(
+      &gtk_entry_get_text(GTK_ENTRY(native_view()))[begin],
+      end - begin));
 }
 
 void NativeTextfieldGtk::SelectAll() {
+  if (!native_view())
+    return;
+  // -1 as the end position selects to the end of the text.
+  gtk_editable_select_region(GTK_EDITABLE(native_view()),
+                             0, -1);
 }
 
 void NativeTextfieldGtk::ClearSelection() {
+  if (!native_view())
+    return;
+  gtk_editable_select_region(GTK_EDITABLE(native_view()), 0, 0);
 }
 
 void NativeTextfieldGtk::UpdateBorder() {
+  if (!native_view())
+    return;
+  NOTIMPLEMENTED();
 }
 
 void NativeTextfieldGtk::UpdateBackgroundColor() {
+  if (!native_view())
+    return;
+  NOTIMPLEMENTED();
 }
 
 void NativeTextfieldGtk::UpdateReadOnly() {
+  if (!native_view())
+    return;
+  gtk_editable_set_editable(GTK_EDITABLE(native_view()), textfield_->IsEnabled());

[sky, 2009/08/28 20:23:51]

nit: > 80

 }
 
 void NativeTextfieldGtk::UpdateFont() {
+  if (!native_view())
+    return;
+  NOTIMPLEMENTED();
 }
 
 void NativeTextfieldGtk::UpdateEnabled() {
+  if (!native_view())
+    return;
+  NOTIMPLEMENTED();
 }
 
 void NativeTextfieldGtk::SetHorizontalMargins(int left, int right) {
+  if (!native_view())
+    return;
+  NOTIMPLEMENTED();
 }
 
 void NativeTextfieldGtk::SetFocus() {
+  Focus();
 }
 
 View* NativeTextfieldGtk::GetView() {
@@ -72,7 +124,10 @@
 // NativeTextfieldGtk, NativeControlGtk overrides:
 
 void NativeTextfieldGtk::CreateNativeControl() {
-  // TODO(port): create gtk text field
+  GtkWidget* widget = gtk_entry_new();
+  // TODO(brettw) hook in an observer to get text change events so we can call
+  // the controller.
+  NativeControlCreated(widget);
 }
 
 void NativeTextfieldGtk::NativeControlCreated(GtkWidget* widget) {
@@ -80,4 +135,13 @@
   // TODO(port): post-creation init
 }
 
+////////////////////////////////////////////////////////////////////////////////
+// NativeTextfieldWrapper, public:
+
+// static
+NativeTextfieldWrapper* NativeTextfieldWrapper::CreateWrapper(
+    Textfield* field) {
+  return new NativeTextfieldGtk(field);
+}
+
 }  // namespace views
Property changes on: views/controls/textfield/native_textfield_gtk.cc
___________________________________________________________________
Added: svn:eol-style
   + LF