X-Git-Url: http://git.tdb.fi/?a=blobdiff_plain;f=source%2Fdesigner%2Fdesigner.h;h=fd70358c56698b0ee923a478d1902becdce06e35;hb=cb4e53ba1b8ea41b978190de6668e9862b9cfea8;hp=5dbb067af15e33528d7880508312c518c3bd8353;hpb=f950f5a77714a155e57c868101911e181a617818;p=r2c2.git

diff --git a/source/designer/designer.h b/source/designer/designer.h
index 5dbb067..fd70358 100644
--- a/source/designer/designer.h
+++ b/source/designer/designer.h
@@ -24,7 +24,7 @@
 #include "manipulator.h"
 #include "measure.h"
 #include "selection.h"
-#include "trackwrap.h"
+#include "selectionwrap.h"
 
 class Toolbar;
 
@@ -65,10 +65,10 @@ private:
 
 	Mode mode;
 	Selection selection;
+	SelectionWrap sel_wrap;
 	Manipulator manipulator;
 	Measure measure;
 	CameraController *camera_ctl;
-	TrackWrap *track_wrap;
 
 	Msp::Time::TimeStamp last_tick;
 
@@ -113,8 +113,8 @@ private:
 	void axis_motion(unsigned, float, float);
 	void apply_camera();
 	void render();
-	void track_added(R2C2::Track &);
-	void track_removed(R2C2::Track &);
+	void object_added(R2C2::Object &);
+	void object_removed(R2C2::Object &);
 	R2C2::Object *pick_object(const R2C2::Vector &);
 	void update_track_icon(R2C2::Track3D &);
 	void selection_changed();