diff -r 658ad3bc0c8a -r dfbc371b7280 mapeditor.h
--- a/mapeditor.h	Sat Mar 31 09:28:27 2007 +0000
+++ b/mapeditor.h	Sat Mar 31 09:28:27 2007 +0000
@@ -1,7 +1,7 @@
 #ifndef MAPEDITOR_H
 #define MAPEDITOR_H
 
-#include <QBuffer>
+//#include <QBuffer>
 #include <QGraphicsView>
 
 #include "mapcenterobj.h"
@@ -100,10 +100,12 @@
     BranchObj* addNewBranch(int);			// pos allows to add above/below selection
     BranchObj* addNewBranchBefore();		// insert and make selection its
     void deleteSelection();
-	LinkableMapObj* getSelection();	// returns selection
-	void unselect();				// before changing current noteedit
-	void reselect();				// after  changing current noteedit
-	bool select(const QString &);	// Select by string
+	LinkableMapObj* getSelection();			// returns selection
+	BranchObj* getSelectedBranch();			// returns selected branch or NULL
+	FloatImageObj* getSelectedFloatImage();	// returns selected branch or NULL
+	void unselect();						// before changing current noteedit
+	void reselect();						// after  changing current noteedit
+	bool select(const QString &);			// Select by string
 	QString getSelectString();
 private:	
 	void selectInt(LinkableMapObj*);	
@@ -143,6 +145,8 @@
 	void deleteKeepChilds();				// remove but keep childs
 	void deleteChilds();					// remove childs
 	void editMapInfo();						// dialog to enter author, ...
+	void ensureSelectionVisible();		
+	void updateSelection();					// update geometry of selection
 	void updateActions();					// update e.g. format buttons
 	void updateNoteFlag();					// when TextEditor changes
 	void setMapAuthor (const QString &);
@@ -160,6 +164,12 @@
 	int getMapDefXLinkWidth();
 	void toggleMapLinkColorHint();			// after changing linkStyles
     void selectMapLinkColor();
+    void selectMapSelectionColor();
+private:	
+    void setSelectionColorInt(QColor);
+public:	
+    void setSelectionColor(QColor);
+    QColor getSelectionColor();
 	bool scrollBranch();
 	bool unscrollBranch();
     void toggleScroll();
@@ -172,7 +182,9 @@
 	void saveFloatImageInt (FloatImageObj*, const QString &, const QString &);
 public:	
 	void saveFloatImage ();
-	void setFrame(const FrameType &);
+	void setFrameType(const FrameType &);
+	void setFramePenColor (const QColor &);
+	void setFrameBrushColor (const QColor &);
 	void setIncludeImagesVer(bool);
 	void setIncludeImagesHor(bool);
 	void setHideLinkUnselected (bool);
@@ -187,7 +199,6 @@
 											// set /mainwindo/showTestMenu=true...
 
 protected:
-	void ensureSelectionVisible();		
 	virtual void contextMenuEvent ( QContextMenuEvent *e );
     virtual void keyPressEvent(QKeyEvent*);
     virtual void keyReleaseEvent(QKeyEvent*);