projects
/
synfig.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Run everything in the same thread.
[synfig.git]
/
synfig-studio
/
trunk
/
src
/
gtkmm
/
dockmanager.cpp
diff --git
a/synfig-studio/trunk/src/gtkmm/dockmanager.cpp
b/synfig-studio/trunk/src/gtkmm/dockmanager.cpp
index
64fadc0
..
661b24b
100644
(file)
--- a/
synfig-studio/trunk/src/gtkmm/dockmanager.cpp
+++ b/
synfig-studio/trunk/src/gtkmm/dockmanager.cpp
@@
-6,6
+6,7
@@
**
** \legal
** Copyright (c) 2002-2005 Robert B. Quattlebaum Jr., Adrian Bentley
**
** \legal
** Copyright (c) 2002-2005 Robert B. Quattlebaum Jr., Adrian Bentley
+** Copyright (c) 2007 Chris Moore
**
** This package is free software; you can redistribute it and/or
** modify it under the terms of the GNU General Public License as
**
** This package is free software; you can redistribute it and/or
** modify it under the terms of the GNU General Public License as
@@
-136,7
+137,7
@@
public:
vector<int> data;
String::size_type n=0;
String value_(value);
vector<int> data;
String::size_type n=0;
String value_(value);
- while(value_.size() &&
(signed)value_.size()>n && n>=0
){
+ while(value_.size() &&
value_.size()>n
){
value_=String(value_.begin()+n,value_.end());
int size;
if(!strscanf(value_,"%d",&size))
value_=String(value_.begin()+n,value_.end());
int size;
if(!strscanf(value_,"%d",&size))
@@
-145,9
+146,9
@@
public:
data.push_back(size);
n=value_.find(" ");
data.push_back(size);
n=value_.find(" ");
- if(n
!
=String::npos)
-
n++
;
-
+ if(n
=
=String::npos)
+
break
;
+ n++;
}
dock_dialog.set_dock_book_sizes(data);
}
}
dock_dialog.set_dock_book_sizes(data);
}
@@
-229,7
+230,7
@@
DockManager::~DockManager()
while(!dockable_list_.empty())
{
Dockable* dockable(dockable_list_.back());
while(!dockable_list_.empty())
{
Dockable* dockable(dockable_list_.back());
- synfig::info("DockManager::~DockManager(): Deleting dockable \"%s\"",dockable->get_name().c_str());
+
//
synfig::info("DockManager::~DockManager(): Deleting dockable \"%s\"",dockable->get_name().c_str());
dockable_list_.pop_back();
delete dockable;
}
dockable_list_.pop_back();
delete dockable;
}
@@
-239,7
+240,7
@@
void
DockManager::register_dockable(Dockable& x)
{
dockable_list_.push_back(&x);
DockManager::register_dockable(Dockable& x)
{
dockable_list_.push_back(&x);
- synfig::info("DockManager::register_dockable(): Registered dockable \"%s\"",dockable_list_.back()->get_name().c_str());
+
//
synfig::info("DockManager::register_dockable(): Registered dockable \"%s\"",dockable_list_.back()->get_name().c_str());
signal_dockable_registered()(&x);
}
signal_dockable_registered()(&x);
}