From 315dee6f229823c9b926157296d76df59d4b3bb3 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Stephan=20A=C3=9Fmus?= Date: Sun, 19 Jan 2014 15:54:45 +0100 Subject: [PATCH] TextEditor: Resolve TODO and call Insert() and Remove()... ... which both already exist in the TextDocument API (stubbed out or untested as they are). --- src/apps/haiku-depot/textview/TextEditor.cpp | 16 ++++++++-------- src/apps/haiku-depot/textview/TextEditor.h | 5 +++-- 2 files changed, 11 insertions(+), 10 deletions(-) diff --git a/src/apps/haiku-depot/textview/TextEditor.cpp b/src/apps/haiku-depot/textview/TextEditor.cpp index ae5948c411..ec034a4df8 100644 --- a/src/apps/haiku-depot/textview/TextEditor.cpp +++ b/src/apps/haiku-depot/textview/TextEditor.cpp @@ -237,23 +237,23 @@ TextEditor::KeyDown(KeyEvent event) } -void +status_t TextEditor::Insert(int32 offset, const BString& string) { - if (!fEditingEnabled) - return; + if (!fEditingEnabled || fDocument.Get() == NULL) + return B_ERROR; - // TODO: ... + return fDocument->Insert(offset, string, fStyleAtCaret); } -void +status_t TextEditor::Remove(int32 offset, int32 length) { - if (!fEditingEnabled) - return; + if (!fEditingEnabled || fDocument.Get() == NULL) + return B_ERROR; - // TODO: ... + return fDocument->Remove(offset, length); } diff --git a/src/apps/haiku-depot/textview/TextEditor.h b/src/apps/haiku-depot/textview/TextEditor.h index 89bdb4735f..12c236c475 100644 --- a/src/apps/haiku-depot/textview/TextEditor.h +++ b/src/apps/haiku-depot/textview/TextEditor.h @@ -58,8 +58,8 @@ public: virtual void KeyDown(KeyEvent event); - virtual void Insert(int32 offset, const BString& string); - virtual void Remove(int32 offset, int32 length); + virtual status_t Insert(int32 offset, const BString& string); + virtual status_t Remove(int32 offset, int32 length); void LineUp(bool select); void LineDown(bool select); @@ -84,6 +84,7 @@ private: bool updateSelectionStyle); void _UpdateStyleAtCaret(); + private: TextDocumentRef fDocument; TextDocumentLayoutRef fLayout;