Remove .gitignore do nothing is ignored.

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

diff --git a/synfig-studio/trunk/src/gtkmm/widget_color.cpp b/synfig-studio/trunk/src/gtkmm/widget_color.cpp
index 73b63af..2e009b1 100644 (file)
--- a/synfig-studio/trunk/src/gtkmm/widget_color.cpp
+++ b/synfig-studio/trunk/src/gtkmm/widget_color.cpp
@@ -2,7 +2,7 @@
 /*!    \file widget_color.cpp
 **     \brief Template File
 **
-**     $Id: widget_color.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
@@ -34,6 +34,8 @@
 #include "app.h"
 #include <gtkmm/drawingarea.h>
 
+#include "general.h"
+
 #endif
 
 /* === U S I N G =========================================================== */
@@ -45,11 +47,6 @@ using namespace studio;
 
 /* === M A C R O S ========================================================= */
 
-#define use_colorspace_gamma() App::use_colorspace_gamma
-#define colorspace_gamma()     (2.2f)
-#define gamma_in(x)            ((x>0)?pow((float)x,1.0f/colorspace_gamma()):-pow((float)-x,1.0f/colorspace_gamma()))
-#define gamma_out(x)   ((x>0)?pow((float)x,colorspace_gamma()):-pow((float)-x,colorspace_gamma()))
-
 /* === G L O B A L S ======================================================= */
 
 /* === P R O C E D U R E S ================================================= */
@@ -72,18 +69,18 @@ studio::render_color_to_window(const Glib::RefPtr<Gdk::Drawable>& window,const G
 {
        const int height(ca.get_height());
        const int width(ca.get_width());
-       
+
        const int square_size(height/2);
-       
+
        Glib::RefPtr<Gdk::GC> gc(Gdk::GC::create(window));
-       
+
        if(color.get_alpha()!=1.0)
        {
                // In this case we need to render the alpha squares
-               
+
                const Color bg1(Color::blend(color,Color(0.75, 0.75, 0.75),1.0).clamped());
                const Color bg2(Color::blend(color,Color(0.5, 0.5, 0.5),1.0).clamped());
-       
+
                Gdk::Color gdk_c1(colorconv_synfig2gdk(bg1));
                Gdk::Color gdk_c2(colorconv_synfig2gdk(bg2));
 
@@ -91,12 +88,12 @@ studio::render_color_to_window(const Glib::RefPtr<Gdk::Drawable>& window,const G
                for(int i=0;i<width;i+=square_size)
                {
                        const int square_width(min(square_size,width-i));
-                       
+
                        if(toggle)
                        {
                                gc->set_rgb_fg_color(gdk_c1);
-                               window->draw_rectangle(gc, true, ca.get_x()+i, ca.get_y(), square_width, square_size);                          
-               
+                               window->draw_rectangle(gc, true, ca.get_x()+i, ca.get_y(), square_width, square_size);
+
                                gc->set_rgb_fg_color(gdk_c2);
                                window->draw_rectangle(gc, true, ca.get_x()+i, ca.get_y()+square_size, square_width, square_size);
                                toggle=false;
@@ -104,8 +101,8 @@ studio::render_color_to_window(const Glib::RefPtr<Gdk::Drawable>& window,const G
                        else
                        {
                                gc->set_rgb_fg_color(gdk_c2);
-                               window->draw_rectangle(gc, true, ca.get_x()+i, ca.get_y(), square_width, square_size);                          
-               
+                               window->draw_rectangle(gc, true, ca.get_x()+i, ca.get_y(), square_width, square_size);
+
                                gc->set_rgb_fg_color(gdk_c1);
                                window->draw_rectangle(gc, true, ca.get_x()+i, ca.get_y()+square_size, square_width, square_size);
                                toggle=true;
@@ -117,7 +114,7 @@ studio::render_color_to_window(const Glib::RefPtr<Gdk::Drawable>& window,const G
                // In this case we have a solid color to use
                Gdk::Color gdk_c1(colorconv_synfig2gdk(color));
 
-               gc->set_rgb_fg_color(gdk_c1);   
+               gc->set_rgb_fg_color(gdk_c1);
                window->draw_rectangle(gc, true, ca.get_x(), ca.get_y(), width-1, height-1);
        }
        gc->set_rgb_fg_color(Gdk::Color("#ffffff"));
@@ -177,7 +174,7 @@ Widget_Color::on_event(GdkEvent *event)
                        return true;
                }
                break;
-               
+
        default:
                break;
        }
@@ -185,13 +182,13 @@ Widget_Color::on_event(GdkEvent *event)
 }
 
 bool
-Widget_Color::redraw(GdkEventExpose*bleh)
+Widget_Color::redraw(GdkEventExpose */*bleh*/)
 {
        //Glib::RefPtr<Gdk::GC> gc(Gdk::GC::create(get_window()));
 
        const int h(get_height());
-       const int w(get_width());       
-       
+       const int w(get_width());
+
        render_color_to_window(get_window(),Gdk::Rectangle(0,0,w,h),color);
 
        return true;