X-Git-Url: http://git.tdb.fi/?a=blobdiff_plain;f=source%2Fdesigner%2Fdesigner.h;h=c72dd5c680068ed0432902b78b7567fda308d5c2;hb=bc955b09faf8365a72d07bb5ee1253c9b958c897;hp=ece41a5dadb021fb96fc64587472f8763b1338eb;hpb=6c61179fe09af2f5366d50f10aadbf5f83438087;p=r2c2.git

diff --git a/source/designer/designer.h b/source/designer/designer.h
index ece41a5..c72dd5c 100644
--- a/source/designer/designer.h
+++ b/source/designer/designer.h
@@ -17,14 +17,6 @@ class Selection;
 
 class Designer: public Msp::Application
 {
-public:
-	Designer(int, char **);
-	Marklin::Layout *get_layout() { return layout; }
-	Marklin::Layout3D *get_layout_3d() { return layout_3d; }
-	Msp::GL::Font   &get_font()   { return *font; }
-	int             main();
-	void            map_pointer_coords(int, int, float &, float &);
-	~Designer();
 private:
 	enum Mode
 	{
@@ -61,10 +53,20 @@ private:
 	int            pointer_y;
 	int            tooltip_x;
 	int            tooltip_y;
-	std::wstring   tooltip;
+	std::string    tooltip;
 	Msp::Time::TimeStamp tooltip_timeout;
 	Msp::Time::TimeStamp last_tick;
 
+public:
+	Designer(int, char **);
+	~Designer();
+
+	Marklin::Layout *get_layout() { return layout; }
+	Marklin::Layout3D *get_layout_3d() { return layout_3d; }
+	Msp::GL::Font   &get_font()   { return *font; }
+	int             main();
+	void            map_pointer_coords(int, int, float &, float &);
+private:
 	void tick();
 	void key_press(unsigned, unsigned, wchar_t);
 	void key_release(unsigned, unsigned);