Merge from default. Hope I did it right...

This commit is contained in:
Emil Martinec
2012-03-08 20:27:30 -06:00
parent 380728e1f0
commit f47b4b5bb0
262 changed files with 41736 additions and 37104 deletions

View File

@@ -52,8 +52,8 @@ FoldableToolPanel::FoldableToolPanel(Gtk::Box* content) : ToolPanel(), parentCon
void FoldableToolPanel::foldThemAll (GdkEventButton* event) {
if (event->button == 3) {
if (listener)
((ToolPanelCoordinator*)listener)->foldAllButOne( parentContainer, this);
(static_cast<ToolPanelCoordinator*>(listener))->foldAllButOne( parentContainer, this);
else
((ToolPanelCoordinator*)tmp)->foldAllButOne( parentContainer, this);
(static_cast<ToolPanelCoordinator*>(tmp))->foldAllButOne( parentContainer, this);
}
}