Remove .gitignore do nothing is ignored.

[synfig.git] / synfig-studio / trunk / src / gtkmm / widget_value.cpp

diff --git a/synfig-studio/trunk/src/gtkmm/widget_value.cpp b/synfig-studio/trunk/src/gtkmm/widget_value.cpp
index 76fe1bb..c6a8b97 100644 (file)
--- a/synfig-studio/trunk/src/gtkmm/widget_value.cpp
+++ b/synfig-studio/trunk/src/gtkmm/widget_value.cpp
@@ -2,7 +2,7 @@
 /*!    \file widget_value.cpp
 **     \brief Template File
 **
-**     $Id: widget_value.cpp,v 1.1.1.1 2005/01/07 03:34:37 darco Exp $
+**     $Id$
 **
 **     \legal
 **     Copyright (c) 2002-2005 Robert B. Quattlebaum Jr., Adrian Bentley
@@ -49,6 +49,8 @@
 #include "app.h"
 #include "widget_distance.h"
 
+#include "general.h"
+
 #endif
 
 using namespace synfig;
@@ -69,12 +71,12 @@ using namespace studio;
 Widget_ValueBase::Widget_ValueBase():
        Glib::ObjectBase        (typeid(Widget_ValueBase)),
        Gtk::HBox(),
-       real_adjustment(0,-2000000000,2000000000,0.05,0.05,0.05),
-       integer_adjustment(0,-2000000000,2000000000,1,1,1),
-       angle_adjustment(0,-2000000000,2000000000,1,1,1)
+       real_adjustment(0,-2000000000,2000000000,0.05,0.05,0),
+       integer_adjustment(0,-2000000000,2000000000,1,1,0),
+       angle_adjustment(0,-2000000000,2000000000,1,1,0)
 {
        set_no_show_all();
-       
+
        label=manage(new class Gtk::Label("Unknown Datatype"));
        pack_start(*label);
        label->show();
@@ -97,7 +99,7 @@ Widget_ValueBase::Widget_ValueBase():
        angle_widget=manage(new class Gtk::SpinButton(angle_adjustment,15,2));
        pack_start(*angle_widget);
 
-       bool_widget=manage(new class Gtk::CheckButton());                     
+       bool_widget=manage(new class Gtk::CheckButton());
        pack_start(*bool_widget);
 
        //color_widget=manage(new class Gtk::ColorSelection());
@@ -105,7 +107,7 @@ Widget_ValueBase::Widget_ValueBase():
 
        string_widget=manage(new class Gtk::Entry());
        pack_start(*string_widget);
-       
+
        canvas_widget=manage(new class Widget_CanvasChooser());
        pack_start(*canvas_widget);
 
@@ -118,7 +120,7 @@ Widget_ValueBase::Widget_ValueBase():
        distance_widget=manage(new class Widget_Distance());
        pack_start(*distance_widget);
 
-       
+
        vector_widget->signal_activate().connect(sigc::mem_fun(*this,&Widget_ValueBase::activate));
        color_widget->signal_activate().connect(sigc::mem_fun(*this,&Widget_ValueBase::activate));
        enum_widget->signal_activate().connect(sigc::mem_fun(*this,&Widget_ValueBase::activate));
@@ -130,7 +132,7 @@ Widget_ValueBase::Widget_ValueBase():
        filename_widget->signal_activate().connect(sigc::mem_fun(*this,&Widget_ValueBase::activate));
        time_widget->signal_activate().connect(sigc::mem_fun(*this,&Widget_ValueBase::activate));
        distance_widget->signal_activate().connect(sigc::mem_fun(*this,&Widget_ValueBase::activate));
-       
+
        /*signal_focus_in_event().connect(
                sigc::bind_return(
                sigc::hide(
@@ -147,7 +149,6 @@ Widget_ValueBase::~Widget_ValueBase()
 void
 Widget_ValueBase::activate()
 {
-       //DEBUGPOINT();
        signal_activate()();
 }
 
@@ -162,7 +163,7 @@ Widget_ValueBase::inside_cellrenderer()
 
        distance_widget->set_has_frame(false);
        //static_cast<Gtk::Entry*>(distance_widget)->gobj()->is_cell_renderer = true; // XXX
-       
+
        integer_widget->set_has_frame(false);
        //static_cast<Gtk::Entry*>(integer_widget)->gobj()->is_cell_renderer = true; // XXX
        vector_widget->set_has_frame(false);
@@ -209,7 +210,7 @@ Widget_ValueBase::set_value(const synfig::ValueBase &data)
        filename_widget->hide();
        time_widget->hide();
        distance_widget->hide();
-       
+
        value=data;
        try{
        switch(value.get_type())
@@ -331,7 +332,7 @@ Widget_ValueBase::get_value()
                {
                        value=enum_widget->get_value();
                }
-                       
+
                break;
        case ValueBase::TYPE_BOOL:
                value=bool_widget->get_active();
@@ -357,7 +358,7 @@ Widget_ValueBase::get_value()
             color.set_g(gdkcolor.get_green_p());
             color.set_b(gdkcolor.get_blue_p());
                        color.set_a(color_widget->get_current_alpha()/65535.0);
-                       
+
                        value=color;
 */
                }
@@ -368,7 +369,7 @@ Widget_ValueBase::get_value()
 
        return value;
 }
-       
+
 
 void
 Widget_ValueBase::on_grab_focus()
@@ -402,7 +403,7 @@ Widget_ValueBase::on_grab_focus()
                {
                        enum_widget->grab_focus();
                }
-                       
+
                break;
        case ValueBase::TYPE_BOOL:
                bool_widget->grab_focus();
@@ -441,7 +442,7 @@ Widget_ValueBase::signal_activate()
                        return distance_widget->signal_activate();
                else
                        return real_widget->signal_activate();
-               
+
                break;
        case ValueBase::TYPE_TIME:
                return time_widget->signal_activate();
@@ -457,7 +458,7 @@ Widget_ValueBase::signal_activate()
                        return integer_widget->signal_activate();
                else
                        return enum_widget->signal_activate();
-                       
+
                break;
        case ValueBase::TYPE_BOOL:
                return string_widget->signal_activate();