Remove unused code

diff --git a/source/button.cpp b/source/button.cpp
index c9bca9adcdeebb25f0478f1faee0804e8fa77d46..91cc88c403365bfabde2a9f943627bd0814c0325 100644 (file)
--- a/source/button.cpp
+++ b/source/button.cpp
@@ -67,7 +67,6 @@ void Button::pointer_motion(int x, int y)
 void Button::render_special(const Part &part) const
 {
        if(part.get_name()=="text")
-               //render_text(part, text);
                text.render(part, geom);
        if(part.get_name()=="icon" && icon)
        {

diff --git a/source/dropdown.cpp b/source/dropdown.cpp
index 5e19ed9ca8534a1aeb27bf8aa8b72a63e16ab4a3..e0710a864c085cc52d67b7b4fd8d9cb2c1100078 100644 (file)
--- a/source/dropdown.cpp
+++ b/source/dropdown.cpp
@@ -100,7 +100,6 @@ void Dropdown::render_special(const Part &part) const
        {
                if(list.get_selected_index()>=0)
                        Text(style, list.get_selected()).render(part, geom);
-                       //render_text(part, list.get_selected());
        }
        else if(part.get_name()=="list" && dropped)
                list.render();

diff --git a/source/widget.cpp b/source/widget.cpp
index 7137260a297165442e0554011b0334ef0149a6d1..8c59c07fe1e9d4b877907499fb6e70c8cee55a4c 100644 (file)
--- a/source/widget.cpp
+++ b/source/widget.cpp
@@ -97,43 +97,12 @@ void Widget::render() const
                        GL::PushMatrix push_;
                        i->render(geom, state);
                }
-                       //render_graphic(*i);
                else
                        render_special(*i);
        }
        GL::pop_matrix();
 }
 
-/*void Widget::render_graphic(const Part &part) const
-{
-       GL::push_matrix();
-       part.render(geom, state);
-       GL::pop_matrix();
-}
-
-void Widget::render_text(const Part &part, const string &text) const
-{
-       const GL::Font *const font=style->get_font();
-       const float font_size=font->get_default_size();
-
-       Geometry rgeom;
-       rgeom.w=static_cast<unsigned>(font->get_string_width(text)*font_size);
-       rgeom.h=static_cast<unsigned>((font->get_ascent()-font->get_descent())*font_size);
-       rgeom.y=static_cast<int>(-font->get_descent()*font_size);
-       part.get_alignment().apply(rgeom, geom, part.get_margin());
-
-       GL::push_matrix();
-       GL::translate(rgeom.x, rgeom.y, 0);
-       GL::scale_uniform(font_size);
-
-       const GL::Color &color=style->get_font_color();
-       GL::Immediate imm((GL::COLOR4_UBYTE, GL::TEXCOORD2, GL::VERTEX2));
-       imm.color(color.r, color.g, color.b);
-       font->draw_string(text, imm);
-
-       GL::pop_matrix();
-}*/
-
 void Widget::pointer_enter()
 {
        state|=HOVER;

diff --git a/source/widget.h b/source/widget.h
index ce88c97d4e65921b6c044bdea79f79a12dd3c11c..69adf9ca52b0fce6b0aaa64fc703badaafbe61fb 100644 (file)
--- a/source/widget.h
+++ b/source/widget.h
@@ -45,7 +45,6 @@ public:
        sigc::signal<void> signal_request_focus;
        sigc::signal<void> signal_grab_pointer;
        sigc::signal<void> signal_ungrab_pointer;
-       sigc::signal<void> signal_request_raise;
 
 protected:
        const Resources &res;
@@ -83,8 +82,6 @@ public:
 
        void render() const;
 protected:
-       /*void render_graphic(const Part &) const;
-       void render_text(const Part &, const std::string &) const;*/
        virtual void render_special(const Part &) const { }
 
 public: