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

diff --git a/src/mathed/formulabase.C b/src/mathed/formulabase.C
index aa5121a13358b0d0185a8824075c4773c09a38bc..27430ac5e2cd72f859eb5b716128c20e30ab883d 100644 (file)
--- 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 edd10dadf4b9afa6d7d4a6cb3038b213c5fdcacc..ee4a2d67fa52796dc76c1bc3e1eaad8c8c5a9591 100644 (file)
--- 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 209b9720f295dd79364d88c8bee54fa1f695d0cb..0e3c81287e685757b94b3cbe1fe2c2775fd14983 100644 (file)
--- 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 8704d37429a3343d976d770c981f7c5fc46ead8f..56f452d66314b72a28e96918dfeab8a65170dc45 100644 (file)
--- 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