From 96175b2fe6512d7e762b7b2777a0dbdb07a1c719 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Andr=C3=A9=20P=C3=B6nitz?= Date: Tue, 20 Nov 2001 17:16:21 +0000 Subject: [PATCH] strange enough: parts not commited during the last 'cvs commit' .. git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/trunk@3054 a592a061-630c-0410-9148-cb99ea01b6c8 --- src/mathed/formulabase.C | 6 ++---- src/mathed/math_rootinset.C | 4 ++-- src/mathed/math_rootinset.h | 4 ++-- src/mathed/math_splitinset.h | 4 ++-- 4 files changed, 8 insertions(+), 10 deletions(-) diff --git a/src/mathed/formulabase.C b/src/mathed/formulabase.C index aa5121a133..27430ac5e2 100644 --- a/src/mathed/formulabase.C +++ b/src/mathed/formulabase.C @@ -55,8 +55,6 @@ namespace { // local global -int sel_x; -int sel_y; int first_x; int first_y; @@ -126,7 +124,7 @@ string const InsetFormulaBase::editMessage() const } -void InsetFormulaBase::edit(BufferView * bv, int x, int y, unsigned int button) +void InsetFormulaBase::edit(BufferView * bv, int x, int /*y*/, unsigned int) { if (!bv->lockInset(this)) lyxerr[Debug::MATHED] << "Cannot lock inset!!!" << endl; @@ -282,7 +280,7 @@ void InsetFormulaBase::insetButtonPress(BufferView * bv, mathcursor->setPos(x + xo_, y + yo_); string sel = bv->getLyXText()->selectionAsString(bv->buffer(), false); - //mathed_parse_cell(ar, sel); + mathed_parse_cell(ar, sel); mathcursor->insert(ar); } break; diff --git a/src/mathed/math_rootinset.C b/src/mathed/math_rootinset.C index edd10dadf4..ee4a2d67fa 100644 --- a/src/mathed/math_rootinset.C +++ b/src/mathed/math_rootinset.C @@ -70,7 +70,7 @@ void MathRootInset::normalize(NormalStream & os) const } -bool MathRootInset::idxUp(int & idx, int & pos) const +bool MathRootInset::idxUp(idx_type & idx, pos_type & pos) const { if (idx == 0) return false; @@ -80,7 +80,7 @@ bool MathRootInset::idxUp(int & idx, int & pos) const } -bool MathRootInset::idxDown(int & idx, int & pos) const +bool MathRootInset::idxDown(idx_type & idx, pos_type & pos) const { if (idx == 1) return false; diff --git a/src/mathed/math_rootinset.h b/src/mathed/math_rootinset.h index 209b9720f2..0e3c81287e 100644 --- a/src/mathed/math_rootinset.h +++ b/src/mathed/math_rootinset.h @@ -32,9 +32,9 @@ public: /// MathInset * clone() const; /// - bool idxUp(int & idx, int & pos) const; + bool idxUp(idx_type & idx, pos_type & pos) const; /// - bool idxDown(int & idx, int & pos) const; + bool idxDown(idx_type & idx, pos_type & pos) const; /// void metrics(MathMetricsInfo const & st) const; /// diff --git a/src/mathed/math_splitinset.h b/src/mathed/math_splitinset.h index 8704d37429..56f452d663 100644 --- a/src/mathed/math_splitinset.h +++ b/src/mathed/math_splitinset.h @@ -18,9 +18,9 @@ public: /// void write(WriteStream & os) const; /// - int defaultColSpace(int) { return 0; } + int defaultColSpace(col_type) { return 0; } /// - char defaultColAlign(int) { return 'l'; } + char defaultColAlign(col_type) { return 'l'; } }; #endif