Remove .gitignore do nothing is ignored.

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

diff --git a/synfig-studio/trunk/src/gtkmm/adjust_window.cpp b/synfig-studio/trunk/src/gtkmm/adjust_window.cpp
index 90ca220..0b62737 100644 (file)
--- a/synfig-studio/trunk/src/gtkmm/adjust_window.cpp
+++ b/synfig-studio/trunk/src/gtkmm/adjust_window.cpp
@@ -1,20 +1,21 @@
-/* === S I N F G =========================================================== */
+/* === S Y N F I G ========================================================= */
 /*!    \file adjust_window.cpp
 **     \brief Adjustment Window Implementation File
 **
-**     $Id: adjust_window.cpp,v 1.1.1.1 2005/01/07 03:34:35 darco Exp $
+**     $Id$
 **
 **     \legal
 **     Copyright (c) 2004 Adrian Bentley
 **
-**     This software and associated documentation
-**     are CONFIDENTIAL and PROPRIETARY property of
-**     the above-mentioned copyright holder.
+**     This package is free software; you can redistribute it and/or
+**     modify it under the terms of the GNU General Public License as
+**     published by the Free Software Foundation; either version 2 of
+**     the License, or (at your option) any later version.
 **
-**     You may not copy, print, publish, or in any
-**     other way distribute this software without
-**     a prior written agreement with
-**     the copyright holder.
+**     This package is distributed in the hope that it will be useful,
+**     but WITHOUT ANY WARRANTY; without even the implied warranty of
+**     MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
+**     General Public License for more details.
 **     \endlegal
 */
 /* ========================================================================= */
@@ -31,13 +32,15 @@
 #include "adjust_window.h"
 #include "app.h"
 
+#include "general.h"
+
 #endif
 
 /* === U S I N G =========================================================== */
 
 using namespace std;
 //using namespace etl;
-//using namespace sinfg;
+//using namespace synfig;
 
 using studio::Adjust_Window;
 
@@ -80,14 +83,15 @@ const Gtk::Adjustment *Adjust_Window::get_child_adjustment() const
 void Adjust_Window::set_child_adjustment(Gtk::Adjustment *child)
 {
        childchanged.disconnect();
-       
+
        adj_child = child;
-       
-       sinfg::info("Adjust: connecting to child signals");
+
+       // synfig::info("Adjust: connecting to child signals");
+
        if(child)
        {
                childchanged = child->signal_changed().connect(sigc::mem_fun(*this,&Adjust_Window::update_fromchild));
-               
+
                update_child();
        }
 }
@@ -119,23 +123,23 @@ void Adjust_Window::update_child()
        if(adj_child)
        {
                bool childchanged = false;
-               
+
                double v = get_value();
                double ve = v + get_page_size();
-               
+
                //reset child's values if they need to be...
                if(abs(v - adj_child->get_lower()) > EPSILON)
                {
                        adj_child->set_lower(v);
                        childchanged = true;
                }
-               
+
                if(abs(ve - adj_child->get_upper()) > EPSILON)
                {
                        adj_child->set_upper(ve);
-                       childchanged = true;                                                                    
+                       childchanged = true;
                }
-               
+
                if(childchanged)
                {
                        adj_child->changed();
@@ -146,17 +150,17 @@ void Adjust_Window::update_child()
 void Adjust_Window::update_fromchild()
 {
        if(adj_child)
-       {               
+       {
                double b = adj_child->get_lower();
                double dist = adj_child->get_upper() - b;
-               
+
                //reset our values if they need to be...
                if(abs(get_value() - b) > EPSILON)
                {
                        set_value(b);
                        value_changed();
                }
-               
+
                if(abs(get_page_size() - dist) > EPSILON)
                {
                        set_page_size(dist);