Store the Resources reference only in Root widget

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

diff --git a/source/button.cpp b/source/button.cpp
index e7548386e0467cd6f8caec148973098b2fe7bffa..8e6e7131cb4157c266b096e4bd121931eb68abdb 100644 (file)
--- a/source/button.cpp
+++ b/source/button.cpp
@@ -12,32 +12,30 @@ Distributed under the LGPL
 namespace Msp {
 namespace GLtk {
 
-Button::Button(const Resources &r, const std::string &t):
-       Widget(r),
+Button::Button(const std::string &t):
        text(),
        icon(0),
        pressed(false)
 {
-       update_style();
        set_text(t);
 }
 
 void Button::set_text(const std::string &t)
 {
-       text=t;
+       text = t;
 }
 
 void Button::set_icon(const GL::Texture2D *i)
 {
-       icon=i;
+       icon = i;
 }
 
 void Button::button_press(int, int, unsigned btn)
 {
        if(btn==1)
        {
-               pressed=true;
-               state|=ACTIVE;
+               pressed = true;
+               state |= ACTIVE;
        }
 }
 
@@ -45,8 +43,8 @@ void Button::button_release(int x, int y, unsigned btn)
 {
        if(pressed && btn==1)
        {
-               state&=~ACTIVE;
-               pressed=false;
+               state &= ~ACTIVE;
+               pressed = false;
 
                if(geom.is_inside_relative(x, y))
                        signal_clicked.emit();
@@ -58,9 +56,9 @@ void Button::pointer_motion(int x, int y)
        if(pressed)
        {
                if(!geom.is_inside_relative(x, y))
-                       state&=~ACTIVE;
+                       state &= ~ACTIVE;
                else
-                       state|=ACTIVE;
+                       state |= ACTIVE;
        }
 }
 
@@ -71,8 +69,8 @@ void Button::render_special(const Part &part) const
        if(part.get_name()=="icon" && icon)
        {
                Geometry rgeom;
-               rgeom.w=icon->get_width();
-               rgeom.h=icon->get_height();
+               rgeom.w = icon->get_width();
+               rgeom.h = icon->get_height();
                part.get_alignment().apply(rgeom, geom, part.get_margin());
 
                icon->bind();
@@ -106,7 +104,7 @@ Button::Loader::Loader(Button &btn):
 
 void Button::Loader::text(const std::string &t)
 {
-       static_cast<Button &>(wdg).text=t;
+       static_cast<Button &>(wdg).text = t;
 }
 
 } // namespace GLtk