Bugfixes: checkboxes to radiobuttons (from J�rgen S) and remove a little

[lyx.git] / src / frontends / xforms / FormMathsMatrix.C

diff --git a/src/frontends/xforms/FormMathsMatrix.C b/src/frontends/xforms/FormMathsMatrix.C
index a16246d67efab941be75e33d0df7531d8655d6c6..336321ede161e998013b09e901447f902c84088e 100644 (file)
--- a/src/frontends/xforms/FormMathsMatrix.C
+++ b/src/frontends/xforms/FormMathsMatrix.C
@@ -15,6 +15,8 @@
 #pragma implementation
 #endif
 
+#include <algorithm>
+
 #include "FormMathsMatrix.h"
 #include "form_maths_matrix.h"
 #include "Dialogs.h"
@@ -22,6 +24,7 @@
 #include "Lsstream.h"
 #include "lyxfunc.h"
 #include "support/LAssert.h"
+#include "support/lyxalgo.h" // lyx::count
 
 #ifndef CXX_GLOBAL_CSTD
 using std::strlen;
@@ -31,14 +34,20 @@ using std::strlen;
 static char h_align_str[80] = "c";
 static char v_align_c[] = "tcb";
 
-extern "C"
-int C_FormMathsMatrixAlignFilter(FL_OBJECT * ob, char const *,
-                                           char const * cur, int c)
-{
-       lyx::Assert(ob);
-       FormMathsMatrix * pre = static_cast<FormMathsMatrix *>(ob->u_vdata);
-       lyx::Assert(pre);
-       return pre->AlignFilter(cur, c);
+
+extern "C" {
+       
+       static
+       int C_FormMathsMatrixAlignFilter(FL_OBJECT * ob, char const *,
+                                        char const * cur, int c)
+       {
+               lyx::Assert(ob);
+               FormMathsMatrix * pre =
+                       static_cast<FormMathsMatrix *>(ob->u_vdata);
+               lyx::Assert(pre);
+               return pre->AlignFilter(cur, c);
+       }
+       
 }
 
 
@@ -86,7 +95,7 @@ void FormMathsMatrix::apply()
        int const ny = int(fl_get_slider_value(dialog_->slider_rows) + 0.5);
  
        ostringstream ost;
-       ost << nx << ' ' << ny << ' ' << c << sh;
+       ost << nx << ' ' << ny << ' ' << c << ' ' << sh;
  
        lv_->getLyXFunc()->dispatch(LFUN_INSERT_MATRIX, ost.str().c_str());
 }
@@ -110,12 +119,15 @@ bool FormMathsMatrix::input(FL_OBJECT * ob, long)
 
 int FormMathsMatrix::AlignFilter(char const * cur, int c)
 {
+       size_t len = strlen(cur);
+       
        int const n = int(fl_get_slider_value(dialog_->slider_columns) + 0.5) -
-               int(strlen(cur));
+               int(len) +
+               int(lyx::count(cur, cur + len, '|'));
        if (n < 0)
                return FL_INVALID;
 
-       if (c == 'c' || c == 'l' || c == 'r') 
+       if (c == 'c' || c == 'l' || c == 'r' || c == '|')
                return FL_VALID;
  
        return FL_INVALID;