Strip copyright messages and id tags from individual files

[libs/gltk.git] / source / entry.cpp

diff --git a/source/entry.cpp b/source/entry.cpp
index 2dc046646e49af2af9b07967a090e42f041f0c64..ec6bba702983081fa0de856911da0484a3b50953 100644 (file)
--- a/source/entry.cpp
+++ b/source/entry.cpp
@@ -1,10 +1,3 @@
-/* $Id$
-
-This file is part of libmspgltk
-Copyright © 2007-2011  Mikko Rasa, Mikkosoft Productions
-Distributed under the LGPL
-*/
-
 #include <msp/gl/matrix.h>
 #include <msp/gl/texture.h>
 #include <msp/gl/transform.h>
@@ -129,7 +122,7 @@ void Entry::render_special(const Part &part) const
                part.get_graphic(state)->render(part.get_geometry().w, part.get_geometry().h);
                GL::pop_matrix();
        }
-       else if(part.get_name()=="slider")
+       else if(part.get_name()=="slider" && multiline)
                slider->render();
 }
 
@@ -263,12 +256,9 @@ void Entry::check_view_range()
        else if(row>=first_row+visible_rows)
                first_row = row+1-visible_rows;
 
-       if(slider)
-       {
-               unsigned scroll = max(text.get_n_lines(), visible_rows)-visible_rows;
-               slider->set_range(0, scroll);
-               slider->set_value(scroll-first_row);
-       }
+       unsigned scroll = max(text.get_n_lines(), visible_rows)-visible_rows;
+       slider->set_range(0, scroll);
+       slider->set_value(scroll-first_row);
 }
 
 void Entry::slider_value_changed(double value)