From 8e57c3c48d8c89f8d98457ffb5a53740cc6bbd91 Mon Sep 17 00:00:00 2001 From: darco Date: Sat, 26 Nov 2005 19:46:00 +0000 Subject: [PATCH] Fixed layer drag bug git-svn-id: http://svn.voria.com/code@63 1f10aa63-cdf2-0310-b900-c93c546f37ac --- synfig-studio/trunk/ChangeLog | 3 +++ synfig-studio/trunk/macosxbuild.sh | 7 ++++--- synfig-studio/trunk/src/gtkmm/layertreestore.cpp | 10 +++++----- synfig-studio/trunk/win32build.sh | 3 ++- 4 files changed, 14 insertions(+), 9 deletions(-) diff --git a/synfig-studio/trunk/ChangeLog b/synfig-studio/trunk/ChangeLog index 4ffb2ae..ac7a1e1 100644 --- a/synfig-studio/trunk/ChangeLog +++ b/synfig-studio/trunk/ChangeLog @@ -1,3 +1,6 @@ +2005-11-26 Robert Quattlebaum + * src/gtkmm/layertreestore.cpp: Fixed bug which caused crash on DND layer move + 2005-11-03 Robert Quattlebaum * src/gtkmm/render.cpp: Fixed default render file to use the directory seperator for the given OS, rather than just use forward slashes all the time. diff --git a/synfig-studio/trunk/macosxbuild.sh b/synfig-studio/trunk/macosxbuild.sh index 73400d7..ea21416 100755 --- a/synfig-studio/trunk/macosxbuild.sh +++ b/synfig-studio/trunk/macosxbuild.sh @@ -5,10 +5,11 @@ export PKG_CONFIG_PATH=/usr/local/lib/pkgconfig:/usr/lib/pkgconfig:/usr/X11R6/li export MACOSX_DEPLOYMENT_TARGET=10.4 OPTIONS="" #OPTIONS="$OPTIONS --enable-timelimit=120" -OPTIONS="$OPTIONS --enable-optimization=2" +#OPTIONS="$OPTIONS --enable-optimization=2" #OPTIONS="$OPTIONS --enable-optimization=3 --enable-g5opt" -#OPTIONS="$OPTIONS --disable-optimization" -OPTIONS="$OPTIONS --disable-debug" +OPTIONS="$OPTIONS --disable-optimization" +#OPTIONS="$OPTIONS --disable-debug" +OPTIONS="$OPTIONS --enable-debug" #export LDFLAGS='-undefined dynamic-lookup' LDFLAGS="-prebind -prebind_all_twolevel_modules -twolevel_namespace -bind_at_load -undefined dynamic_lookup" BUILDDIR=macosxbuild diff --git a/synfig-studio/trunk/src/gtkmm/layertreestore.cpp b/synfig-studio/trunk/src/gtkmm/layertreestore.cpp index 5f75084..65be4ad 100644 --- a/synfig-studio/trunk/src/gtkmm/layertreestore.cpp +++ b/synfig-studio/trunk/src/gtkmm/layertreestore.cpp @@ -489,15 +489,15 @@ LayerTreeStore::drag_data_received_vfunc (const TreeModel::Path& dest, const Gtk TreeModel::Path dest_parent(dest); if(!dest_parent.up() || !get_iter(dest_parent)) { - TreeModel::Path dest(dest); - if(!get_iter(dest)) - dest.prev(); + TreeModel::Path dest_(dest); + if(!get_iter(dest_)) + dest_.prev(); - if(!get_iter(dest)) + if(!get_iter(dest_)) return false; { - row=(*get_iter(dest)); + row=(*get_iter(dest_)); dest_canvas=(Canvas::Handle)(row[model.canvas]); } } diff --git a/synfig-studio/trunk/win32build.sh b/synfig-studio/trunk/win32build.sh index af16642..6d657dd 100755 --- a/synfig-studio/trunk/win32build.sh +++ b/synfig-studio/trunk/win32build.sh @@ -2,7 +2,8 @@ OPTIONS="" OPTIONS="$OPTIONS --disable-optimization" -OPTIONS="$OPTIONS --disable-debug" +#OPTIONS="$OPTIONS --disable-debug" +OPTIONS="$OPTIONS --enable-debug" #OPTIONS="$OPTIONS --enable-license-key" -- 2.7.4