5 files changed, 22 insertions, 19 deletions
diff --git a/platform/osx/context_gl_osx.h b/platform/osx/context_gl_osx.h
index 4a94c20c00..565a0ee02a 100644
--- a/platform/osx/context_gl_osx.h
+++ b/platform/osx/context_gl_osx.h
@@ -48,8 +48,8 @@ class ContextGL_OSX : public ContextGL {
 
 public:
 
-	virtual void release_current();	
-	virtual void make_current();	
+	virtual void release_current();
+	virtual void make_current();
 	virtual void swap_buffers();
 
 	virtual Error initialize();
diff --git a/platform/osx/dir_access_osx.h b/platform/osx/dir_access_osx.h
index caeeaf643c..8b742b64fa 100644
--- a/platform/osx/dir_access_osx.h
+++ b/platform/osx/dir_access_osx.h
@@ -43,44 +43,44 @@
 	@author Juan Linietsky <reduzio@gmail.com>
 */
 class DirAccessOSX : public DirAccess {
-	
+
 	DIR *dir_stream;
-	
+
 	static DirAccess *create_fs();
-	
+
 	String current_dir;
 	bool _cisdir;
 	bool _cishidden;
-	
+
 public:
-	
+
 	virtual bool list_dir_begin(); ///< This starts dir listing
 	virtual String get_next();
 	virtual bool current_is_dir() const;
 	virtual bool current_is_hidden() const;
-	
-	virtual void list_dir_end(); ///< 
-	
+
+	virtual void list_dir_end(); ///<
+
 	virtual int get_drive_count();
 	virtual String get_drive(int p_drive);
-	
+
 	virtual Error change_dir(String p_dir); ///< can be relative or absolute, return false on success
 	virtual String get_current_dir(); ///< return current dir location
 	virtual Error make_dir(String p_dir);
-	
+
 	virtual bool file_exists(String p_file);
 	virtual bool dir_exists(String p_dir);
 
 	virtual uint64_t get_modified_time(String p_file);
 
 
-		
+
 	virtual Error rename(String p_from, String p_to);
 	virtual Error remove(String p_name);
 
 	virtual size_t get_space_left();
-	
-	
+
+
 	DirAccessOSX();
 	~DirAccessOSX();
 
diff --git a/platform/osx/dir_access_osx.mm b/platform/osx/dir_access_osx.mm
index e345bea60a..29f8fda663 100644
--- a/platform/osx/dir_access_osx.mm
+++ b/platform/osx/dir_access_osx.mm
@@ -297,8 +297,11 @@ Error DirAccessOSX::rename(String p_path,String p_new_path) {
 }
 Error DirAccessOSX::remove(String p_path)  {
 
-	p_path=fix_path(p_path);
-	
+	if (p_path.is_rel_path())
+		p_path=get_current_dir().plus_file(p_path);
+	else
+		p_path=fix_path(p_path);
+
 	struct stat flags;
 	if ((stat(p_path.utf8().get_data(),&flags)!=0))
 		return FAILED;
diff --git a/platform/osx/os_osx.h b/platform/osx/os_osx.h
index a1fd34def7..29c652051a 100644
--- a/platform/osx/os_osx.h
+++ b/platform/osx/os_osx.h
@@ -138,7 +138,7 @@ public:
 	virtual Point2 get_mouse_pos() const;
 	virtual int get_mouse_button_state() const;
 	virtual void set_window_title(const String& p_title);
-	
+
 	virtual Size2 get_window_size() const;
 
 	virtual void set_icon(const Image& p_icon);
diff --git a/platform/osx/os_osx.mm b/platform/osx/os_osx.mm
index bb99e6ade7..4b339af6d4 100644
--- a/platform/osx/os_osx.mm
+++ b/platform/osx/os_osx.mm
@@ -813,7 +813,7 @@ static int translateKey(unsigned int key)
 
 		InputEvent ev;
 		ev.type=InputEvent::MOUSE_BUTTON;
-		ev.mouse_button.button_index=deltaX >0 ? BUTTON_WHEEL_RIGHT : BUTTON_WHEEL_LEFT;
+		ev.mouse_button.button_index=deltaX < 0 ? BUTTON_WHEEL_RIGHT : BUTTON_WHEEL_LEFT;
 		ev.mouse_button.pressed=true;
 		ev.mouse_button.x=mouse_x;
 		ev.mouse_button.y=mouse_y;