diff -r ac4be290c750 -r 84ae10f6e3a3 mainwindow.cpp
--- a/mainwindow.cpp	Thu Jan 15 00:52:35 2009 +0000
+++ b/mainwindow.cpp	Tue Jan 20 15:23:16 2009 +0000
@@ -2870,7 +2870,7 @@
 	VymModel *m=currentModel();
 	if (m)
 	{
-		BranchObj *bo=(BranchObj*)m->getSelection();
+		BranchObj *bo=m->getSelectedBranch();
 		BranchObj *newbo=m->addNewBranch(0);
 
 		prevSelection=m->getSelectString(bo);
@@ -2897,7 +2897,7 @@
 	VymModel *m=currentModel();
 	if (m)
 	{
-		BranchObj *bo=(BranchObj*)m->getSelection();
+		BranchObj *bo=m->getSelectedBranch();
 		BranchObj *newbo=m->addNewBranchBefore();
 
 		if (newbo) 
@@ -2919,7 +2919,7 @@
 	VymModel *m=currentModel();
 	if ( m)
 	{
-		BranchObj *bo=(BranchObj*)m->getSelection();
+		BranchObj *bo=m->getSelectedBranch();
 		BranchObj *newbo=m->addNewBranch (-1);
 
 		if (newbo) 
@@ -2941,7 +2941,7 @@
 	VymModel *m=currentModel();
 	if (m)
 	{
-		BranchObj *bo=(BranchObj*)m->getSelection();
+		BranchObj *bo=m->getSelectedBranch();
 		BranchObj *newbo=m->addNewBranch (1);
 
 		if (newbo) 
@@ -3405,7 +3405,7 @@
 		actionFilePrint->setEnabled (true);
 
 		// Selection
-		selection=m->getSelection();
+		selection=m->getSelectedLMO();
 
 		// Link style in context menu
 		switch (m->getMapLinkStyle())