Remove .gitignore do nothing is ignored.

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

diff --git a/synfig-studio/trunk/src/gtkmm/cellrenderer_gradient.cpp b/synfig-studio/trunk/src/gtkmm/cellrenderer_gradient.cpp
index 07d81f1..ffbc218 100644 (file)
--- a/synfig-studio/trunk/src/gtkmm/cellrenderer_gradient.cpp
+++ b/synfig-studio/trunk/src/gtkmm/cellrenderer_gradient.cpp
@@ -1,20 +1,21 @@
-/* === S I N F G =========================================================== */
+/* === S Y N F I G ========================================================= */
 /*!    \file cellrenderer_gradient.cpp
 **     \brief Template File
 **
-**     $Id: cellrenderer_gradient.cpp,v 1.1.1.1 2005/01/07 03:34:35 darco Exp $
+**     $Id$
 **
 **     \legal
-**     Copyright (c) 2002 Robert B. Quattlebaum Jr.
+**     Copyright (c) 2002-2005 Robert B. Quattlebaum Jr., 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
 */
 /* ========================================================================= */
@@ -34,21 +35,19 @@
 #include "widget_gradient.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 namespace studio;
 
 /* === M A C R O S ========================================================= */
 
-#if ! defined(_)
-#define _(x)   (x)
-#endif
-
 /* === G L O B A L S ======================================================= */
 
 /* === P R O C E D U R E S ================================================= */
@@ -58,7 +57,7 @@ using namespace studio;
 CellRenderer_Gradient::CellRenderer_Gradient():
        Glib::ObjectBase        (typeid(CellRenderer_Gradient)),
        Gtk::CellRendererText   (),
-       property_gradient_(*this,"gradient",sinfg::Gradient())
+       property_gradient_(*this,"gradient",synfig::Gradient())
 {
        //CellRendererText::signal_edited().connect(sigc::mem_fun(*this,&studio::CellRenderer_Gradient::string_edited_));
 }
@@ -71,11 +70,11 @@ CellRenderer_Gradient::~CellRenderer_Gradient()
 void
 CellRenderer_Gradient::render_vfunc(
                const Glib::RefPtr<Gdk::Drawable>& window,
-               Gtk::Widget& widget,
-               const Gdk::Rectangle& background_area,
+               Gtk::Widget& /*widget*/,
+               const Gdk::Rectangle& /*background_area*/,
                const Gdk::Rectangle& ca,
-               const Gdk::Rectangle& expose_area,
-               Gtk::CellRendererState flags)
+               const Gdk::Rectangle& /*expose_area*/,
+               Gtk::CellRendererState /*flags*/)
 {
        if(!window)
                return;
@@ -85,12 +84,12 @@ CellRenderer_Gradient::render_vfunc(
 
 Gtk::CellEditable*
 CellRenderer_Gradient::start_editing_vfunc(
-       GdkEvent* event,
-       Gtk::Widget& widget,
-       const Glib::ustring& path,
-       const Gdk::Rectangle& background_area,
-       const Gdk::Rectangle& cell_area,
-       Gtk::CellRendererState flags)
+       GdkEvent* /*event*/,
+       Gtk::Widget& /*widget*/,
+       const Glib::ustring& /*path*/,
+       const Gdk::Rectangle& /*background_area*/,
+       const Gdk::Rectangle& /*cell_area*/,
+       Gtk::CellRendererState /*flags*/)
 {
        return 0;
 }