1.1 --- a/src/widget.cc	Tue Mar 11 23:04:11 2014 +0200
     1.2 +++ b/src/widget.cc	Thu Mar 20 07:03:58 2014 +0200
     1.3 @@ -1,20 +1,16 @@
     1.4  #include <string>
     1.5 -#include <stringstream>
     1.6 +#include <sstream>
     1.7  #include "widget.h"
     1.8 +#include "boolanm.h"
     1.9  
    1.10  using namespace gameui;
    1.11  
    1.12 -class WidgetImpl {
    1.13 -public:
    1.14 +struct WidgetImpl {
    1.15  	std::string name_prefix;
    1.16  	std::string name;
    1.17  	BBox box;
    1.18 -	VisState vis_st;
    1.19 -	ActiveState act_st;
    1.20  
    1.21 -	float vis, act;
    1.22 -
    1.23 -	long vis_start_time, act_start_time;
    1.24 +	BoolAnim visible, active, press, hover;
    1.25  };
    1.26  
    1.27