From 3516deebd394af6e2c1d8c546777d04043eaa29a Mon Sep 17 00:00:00 2001 From: pabs Date: Fri, 27 Jan 2006 04:54:50 +0000 Subject: [PATCH] Fix 1373933, 1358304: problem with gtkmm 2.8 git-svn-id: http://svn.voria.com/code@118 1f10aa63-cdf2-0310-b900-c93c546f37ac --- synfig-studio/trunk/src/gtkmm/canvasview.cpp | 8 ++++---- synfig-studio/trunk/src/gtkmm/dockdialog.cpp | 2 +- synfig-studio/trunk/src/gtkmm/toolbox.cpp | 2 +- 3 files changed, 6 insertions(+), 6 deletions(-) diff --git a/synfig-studio/trunk/src/gtkmm/canvasview.cpp b/synfig-studio/trunk/src/gtkmm/canvasview.cpp index faf8bf4..e17fb3e 100644 --- a/synfig-studio/trunk/src/gtkmm/canvasview.cpp +++ b/synfig-studio/trunk/src/gtkmm/canvasview.cpp @@ -1208,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) @@ -1217,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)) @@ -1248,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 @@ -1279,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")), diff --git a/synfig-studio/trunk/src/gtkmm/dockdialog.cpp b/synfig-studio/trunk/src/gtkmm/dockdialog.cpp index 6a6e3eb..438feab 100644 --- a/synfig-studio/trunk/src/gtkmm/dockdialog.cpp +++ b/synfig-studio/trunk/src/gtkmm/dockdialog.cpp @@ -128,7 +128,7 @@ DockDialog::DockDialog(): */ add_accel_group(App::ui_manager()->get_accel_group()); - App::signal_present_all().connect(sigc::mem_fun(*this,&DockDialog::present)); + App::signal_present_all().connect(sigc::mem_fun0(*this,&DockDialog::present)); } diff --git a/synfig-studio/trunk/src/gtkmm/toolbox.cpp b/synfig-studio/trunk/src/gtkmm/toolbox.cpp index a8b0f36..7295590 100644 --- a/synfig-studio/trunk/src/gtkmm/toolbox.cpp +++ b/synfig-studio/trunk/src/gtkmm/toolbox.cpp @@ -377,7 +377,7 @@ Toolbox::Toolbox(): add_accel_group(App::ui_manager()->get_accel_group()); - App::signal_present_all().connect(sigc::mem_fun(*this,&Toolbox::present)); + App::signal_present_all().connect(sigc::mem_fun0(*this,&Toolbox::present)); } Toolbox::~Toolbox() -- 2.7.4