more cursor dispatch

[lyx.git] / src / lyxrow.C

diff --git a/src/lyxrow.C b/src/lyxrow.C
index 67e8a777f19fbeb11228e6c666bf39b3c7399888..fadebef1099bea31d63b66269ee2547e262c7d0a 100644 (file)
--- a/src/lyxrow.C
+++ b/src/lyxrow.C
@@ -21,41 +21,21 @@
 
 using lyx::pos_type;
 
-using std::max;
-using std::min;
 
 Row::Row()
-       : pos_(0), end_(0), fill_(0), height_(0), width_(0), y_(0),
+       : pos_(0), end_(0), fill_(0), height_(0), width_(0), y_offset_(0),
          ascent_of_text_(0), baseline_(0),
          x_(0), fill_separator_(0), fill_hfill_(0), fill_label_hfill_(0)
 {}
 
 
 Row::Row(pos_type pos)
-       : pos_(pos), end_(0), fill_(0), height_(0), width_(0), y_(0),
+       : pos_(pos), end_(0), fill_(0), height_(0), width_(0), y_offset_(0),
          ascent_of_text_(0), baseline_(0),
          x_(0), fill_separator_(0), fill_hfill_(0), fill_label_hfill_(0)
 {}
 
 
-void Row::y(unsigned int newy)
-{
-       y_ = newy;
-}
-
-
-unsigned int Row::y() const
-{
-       return y_;
-}
-
-
-unsigned short Row::height() const
-{
-       return height_;
-}
-
-
 void Row::pos(pos_type p)
 {
        pos_ = p;
@@ -68,13 +48,13 @@ pos_type Row::pos() const
 }
 
 
-void Row::end(pos_type p)
+void Row::endpos(pos_type p)
 {
        end_ = p;
 }
 
 
-pos_type Row::end() const
+pos_type Row::endpos() const
 {
        return end_;
 }
@@ -92,12 +72,6 @@ int Row::fill() const
 }
 
 
-void Row::height(unsigned short h)
-{
-       height_ = h;
-}
-
-
 void Row::width(unsigned int w)
 {
        width_ = w;
@@ -110,13 +84,13 @@ unsigned int Row::width() const
 }
 
 
-void Row::ascent_of_text(unsigned short a)
+void Row::ascent_of_text(unsigned int a)
 {
        ascent_of_text_ = a;
 }
 
 
-unsigned short Row::ascent_of_text() const
+unsigned int Row::ascent_of_text() const
 {
        return ascent_of_text_;
 }
@@ -207,6 +181,6 @@ void Row::dump(const char * s) const
                << " fill: " << fill_
                << " ascent_of_text: " << ascent_of_text_
                << " top_of_text: " << top_of_text_
-               << " y: " << y_ << std::endl;
+               << " y_offset: " << y_offset_ << std::endl;
 }