3 files changed, 11 insertions, 11 deletions
diff --git a/scene/gui/control.cpp b/scene/gui/control.cpp
index a4b07d9a13..b3d86f85ea 100644
--- a/scene/gui/control.cpp
+++ b/scene/gui/control.cpp
@@ -96,7 +96,7 @@ Size2 Control::edit_get_minimum_size() const {
 void Control::edit_set_rect(const Rect2& p_edit_rect) {
 
 
-	Matrix32 postxf;
+	Transform2D postxf;
 	postxf.set_rotation_and_scale(data.rotation,data.scale);
 	Vector2 new_pos = postxf.xform(p_edit_rect.pos);
 
@@ -374,7 +374,7 @@ void Control::remove_child_notify(Node *p_child) {
 
 void Control::_update_canvas_item_transform() {
 
-	Matrix32 xform=Matrix32(data.rotation,get_pos());
+	Transform2D xform=Transform2D(data.rotation,get_pos());
 	xform.scale_basis(data.scale);
 	VisualServer::get_singleton()->canvas_item_set_transform(get_canvas_item(),xform);
 
@@ -1382,7 +1382,7 @@ Point2 Control::get_global_pos() const {
 
 void Control::set_global_pos(const Point2& p_point) {
 
-	Matrix32 inv;
+	Transform2D inv;
 
 	if (data.parent_canvas_item) {
 
@@ -1918,9 +1918,9 @@ Control::CursorShape Control::get_cursor_shape(const Point2& p_pos) const {
 	return data.default_cursor;
 }
 
-Matrix32 Control::get_transform() const {
+Transform2D Control::get_transform() const {
 
-	Matrix32 xform=Matrix32(data.rotation,get_pos());
+	Transform2D xform=Transform2D(data.rotation,get_pos());
 	xform.scale_basis(data.scale);
 	return xform;
 }
@@ -1981,7 +1981,7 @@ Control *Control::_get_focus_neighbour(Margin p_margin,int p_count) {
 
 	Point2 points[4];
 
-	Matrix32 xform = get_global_transform();
+	Transform2D xform = get_global_transform();
 	Rect2 rect = get_item_rect();
 
 	points[0]=xform.xform(rect.pos);
@@ -2041,7 +2041,7 @@ void Control::_window_find_focus_neighbour(const Vector2& p_dir, Node *p_at,cons
 
 		Point2 points[4];
 
-		Matrix32 xform = c->get_global_transform();
+		Transform2D xform = c->get_global_transform();
 		Rect2 rect = c->get_item_rect();
 
 		points[0]=xform.xform(rect.pos);
diff --git a/scene/gui/control.h b/scene/gui/control.h
index 709f19f3f2..68795b054c 100644
--- a/scene/gui/control.h
+++ b/scene/gui/control.h
@@ -168,7 +168,7 @@ private:
 	} data;
 
 	// used internally
-	Control* _find_control_at_pos(CanvasItem* p_node,const Point2& p_pos,const Matrix32& p_xform,Matrix32& r_inv_xform);
+	Control* _find_control_at_pos(CanvasItem* p_node,const Point2& p_pos,const Transform2D& p_xform,Transform2D& r_inv_xform);
 
 
 	void _window_find_focus_neighbour(const Vector2& p_dir, Node *p_at, const Point2* p_points ,float p_min,float &r_closest_dist,Control **r_closest);
@@ -389,7 +389,7 @@ public:
 	virtual CursorShape get_cursor_shape(const Point2& p_pos=Point2i()) const;
 
 	virtual Rect2 get_item_rect() const;
-	virtual Matrix32 get_transform() const;
+	virtual Transform2D get_transform() const;
 
 	bool is_toplevel_control() const;
 
diff --git a/scene/gui/file_dialog.cpp b/scene/gui/file_dialog.cpp
index df08c7ea56..1cd04551c5 100644
--- a/scene/gui/file_dialog.cpp
+++ b/scene/gui/file_dialog.cpp
@@ -723,7 +723,7 @@ void FileDialog::_bind_methods() {
 	ClassDB::bind_method(_MD("invalidate"),&FileDialog::invalidate);
 
 	ADD_SIGNAL(MethodInfo("file_selected",PropertyInfo( Variant::STRING,"path")));
-	ADD_SIGNAL(MethodInfo("files_selected",PropertyInfo( Variant::STRING_ARRAY,"paths")));
+	ADD_SIGNAL(MethodInfo("files_selected",PropertyInfo( Variant::POOL_STRING_ARRAY,"paths")));
 	ADD_SIGNAL(MethodInfo("dir_selected",PropertyInfo( Variant::STRING,"dir")));
 
 	BIND_CONSTANT( MODE_OPEN_FILE );
@@ -739,7 +739,7 @@ void FileDialog::_bind_methods() {
 
 	ADD_PROPERTY( PropertyInfo(Variant::INT, "mode", PROPERTY_HINT_ENUM, "Open one,Open many,Open folder,Open any,Save"),_SCS("set_mode"),_SCS("get_mode") );
 	ADD_PROPERTY( PropertyInfo(Variant::INT, "access", PROPERTY_HINT_ENUM, "Resources,User data,File system"),_SCS("set_access"),_SCS("get_access") );
-	ADD_PROPERTY( PropertyInfo(Variant::STRING_ARRAY, "filters"),_SCS("set_filters"),_SCS("get_filters") );
+	ADD_PROPERTY( PropertyInfo(Variant::POOL_STRING_ARRAY, "filters"),_SCS("set_filters"),_SCS("get_filters") );
 	ADD_PROPERTY( PropertyInfo(Variant::BOOL, "show_hidden_files"),_SCS("set_show_hidden_files"),_SCS("is_showing_hidden_files") );
 
 }