Fix 1499921 (debian #365102): synfigstudio startup crashes on amd64

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

diff --git a/synfig-studio/trunk/src/gtkmm/canvasview.cpp b/synfig-studio/trunk/src/gtkmm/canvasview.cpp
index 1911347..8ddf3d4 100644 (file)
--- a/synfig-studio/trunk/src/gtkmm/canvasview.cpp
+++ b/synfig-studio/trunk/src/gtkmm/canvasview.cpp
@@ -5,16 +5,17 @@
 **     $Id: canvasview.cpp,v 1.7 2005/01/16 19:55:57 darco Exp $
 **
 **     \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
 */
 /* ========================================================================= */
@@ -1207,7 +1208,7 @@ CanvasView::init_menus()
                sigc::hide_return(sigc::mem_fun(*this, &studio::CanvasView::image_import))
        );
        action_group->add( Gtk::Action::create("render", _("Render")),
-               sigc::mem_fun(render_settings,&studio::RenderSettings::present)
+               sigc::mem_fun0(render_settings,&studio::RenderSettings::present)
        );
        action_group->add( Gtk::Action::create("preview", _("Preview")),
                sigc::mem_fun(*this,&CanvasView::on_preview_option)
@@ -1216,7 +1217,7 @@ CanvasView::init_menus()
                sigc::mem_fun(*this,&CanvasView::on_audio_option)
        );
        action_group->add( Gtk::Action::create("options", _("Options")),
-               sigc::mem_fun(canvas_options,&studio::CanvasOptions::present)
+               sigc::mem_fun0(canvas_options,&studio::CanvasOptions::present)
        );
        action_group->add( Gtk::Action::create("close", Gtk::StockID("gtk-close")),
                sigc::hide_return(sigc::mem_fun(*this,&studio::CanvasView::close))      
@@ -1247,7 +1248,7 @@ CanvasView::init_menus()
        );
 
        action_group->add( Gtk::Action::create("properties", Gtk::StockID("gtk-properties")),
-               sigc::mem_fun(canvas_properties,&studio::CanvasProperties::present)
+               sigc::mem_fun0(canvas_properties,&studio::CanvasProperties::present)
        );
 
        // Preview Quality Menu
@@ -1278,7 +1279,7 @@ CanvasView::init_menus()
        );
        
        action_group->add( Gtk::Action::create("dialog-flipbook", _("Flipbook Dialog")),
-               sigc::mem_fun(*preview_dialog, &studio::Dialog_Preview::present)
+               sigc::mem_fun0(*preview_dialog, &studio::Dialog_Preview::present)
        );
 
        action_group->add( Gtk::Action::create("toggle-grid-show", _("Toggle Grid Show")),
@@ -1349,7 +1350,7 @@ CanvasView::init_menus()
 
 
 #define DUCK_MASK(lower,upper) \
-       duck_mask_##lower=Gtk::ToggleAction::create("mask-" #lower "-ducks", _("Mask "#lower" ducks")); \
+       duck_mask_##lower=Gtk::ToggleAction::create("mask-" #lower "-ducks", _("Show "#lower" ducks")); \
        duck_mask_##lower->set_active((bool)(work_area->get_type_mask()&Duck::TYPE_##upper)); \
        action_group->add( duck_mask_##lower, \
                sigc::bind( \