diff --git a/escher/include/escher/expression_field.h b/escher/include/escher/expression_field.h index 6d382f79d..522013f35 100644 --- a/escher/include/escher/expression_field.h +++ b/escher/include/escher/expression_field.h @@ -7,14 +7,12 @@ #include #include -class ExpressionField : public Responder, public View, public EditableField { +class ExpressionField : public Responder, public View { public: ExpressionField(Responder * parentResponder, char * textBuffer, int textBufferLength, TextFieldDelegate * textFieldDelegate, LayoutFieldDelegate * layoutFieldDelegate); - void setEditing(bool isEditing, bool reinitDraftBuffer = true) override; - bool isEditing() const override; - char XNTChar(char defaultXNTChar) override; - bool shouldFinishEditing(Ion::Events::Event event) override; + void setEditing(bool isEditing, bool reinitDraftBuffer = true); + bool isEditing() const; /* Warning: this function is VERY dangerous! Indeed: sometimes the * m_layoutField might overflow the m_textBuffer once serialized * and still have been accepted before because the model can hold a longer @@ -26,7 +24,7 @@ public: bool editionIsInTextField() const; bool isEmpty() const; bool heightIsMaximal() const; - bool handleEventWithText(const char * text, bool indentation = false, bool forceCursorRightOfText = false) override; + bool handleEventWithText(const char * text, bool indentation = false, bool forceCursorRightOfText = false); /* View */ int numberOfSubviews() const override { return 1; } diff --git a/escher/src/expression_field.cpp b/escher/src/expression_field.cpp index 33ba38291..e4a1055d9 100644 --- a/escher/src/expression_field.cpp +++ b/escher/src/expression_field.cpp @@ -35,14 +35,6 @@ bool ExpressionField::isEditing() const { return editionIsInTextField() ? m_textField.isEditing() : m_layoutField.isEditing(); } -char ExpressionField::XNTChar(char defaultXNTChar) { - return editionIsInTextField() ? m_textField.XNTChar(defaultXNTChar) : m_layoutField.XNTChar(defaultXNTChar); -} - -bool ExpressionField::shouldFinishEditing(Ion::Events::Event event) { - return editionIsInTextField() ? m_textField.shouldFinishEditing(event) : m_layoutField.shouldFinishEditing(event); -} - const char * ExpressionField::text() { if (!editionIsInTextField()) { m_layoutField.serialize(m_textBuffer, m_textBufferLength);