5 files changed, 17 insertions, 15 deletions
diff --git a/platform/uwp/context_egl_uwp.h b/platform/uwp/context_egl_uwp.h
index 812bdfb688..0c62fe7456 100644
--- a/platform/uwp/context_egl_uwp.h
+++ b/platform/uwp/context_egl_uwp.h
@@ -37,11 +37,10 @@
 
 #include "core/error_list.h"
 #include "core/os/os.h"
-#include "drivers/gl_context/context_gl.h"
 
 using namespace Windows::UI::Core;
 
-class ContextEGL_UWP : public ContextGL {
+class ContextEGL_UWP {
 
 public:
 	enum Driver {
@@ -64,24 +63,24 @@ private:
 	Driver driver;
 
 public:
-	virtual void release_current();
+	void release_current();
 
-	virtual void make_current();
+	void make_current();
 
-	virtual int get_window_width();
-	virtual int get_window_height();
-	virtual void swap_buffers();
+	int get_window_width();
+	int get_window_height();
+	void swap_buffers();
 
-	virtual void set_use_vsync(bool use) { vsync = use; }
-	virtual bool is_using_vsync() const { return vsync; }
+	void set_use_vsync(bool use) { vsync = use; }
+	bool is_using_vsync() const { return vsync; }
 
-	virtual Error initialize();
+	Error initialize();
 	void reset();
 
 	void cleanup();
 
 	ContextEGL_UWP(CoreWindow ^ p_window, Driver p_driver);
-	virtual ~ContextEGL_UWP();
+	~ContextEGL_UWP();
 };
 
 #endif // CONTEXT_EGL_UWP_H
diff --git a/platform/uwp/detect.py b/platform/uwp/detect.py
index c32a11b396..f8f1b066f6 100644
--- a/platform/uwp/detect.py
+++ b/platform/uwp/detect.py
@@ -1,6 +1,5 @@
 import methods
 import os
-import string
 import sys
 
 
@@ -25,8 +24,6 @@ def can_build():
 
 
 def get_opts():
-    from SCons.Variables import BoolVariable
-
     return [
         ('msvc_version', 'MSVC version to use (ignored if the VCINSTALLDIR environment variable is set)', None),
     ]
diff --git a/platform/uwp/export/export.cpp b/platform/uwp/export/export.cpp
index 8ccf122d9f..a0ab398f89 100644
--- a/platform/uwp/export/export.cpp
+++ b/platform/uwp/export/export.cpp
@@ -505,7 +505,7 @@ void AppxPackager::add_file(String p_file_name, const uint8_t *p_buffer, size_t
 
 	while (p_len - step > 0) {
 
-		size_t block_size = (p_len - step) > BLOCK_SIZE ? BLOCK_SIZE : (p_len - step);
+		size_t block_size = (p_len - step) > BLOCK_SIZE ? (size_t)BLOCK_SIZE : (p_len - step);
 
 		for (uint32_t i = 0; i < block_size; i++) {
 			strm_in.write[i] = p_buffer[step + i];
diff --git a/platform/uwp/os_uwp.cpp b/platform/uwp/os_uwp.cpp
index bc74da8a1b..82f09032f5 100644
--- a/platform/uwp/os_uwp.cpp
+++ b/platform/uwp/os_uwp.cpp
@@ -704,6 +704,11 @@ void OS_UWP::set_cursor_shape(CursorShape p_shape) {
 	cursor_shape = p_shape;
 }
 
+OS::CursorShape OS_UWP::get_cursor_shape() const {
+
+	return cursor_shape;
+}
+
 void OS_UWP::set_custom_mouse_cursor(const RES &p_cursor, CursorShape p_shape, const Vector2 &p_hotspot) {
 	// TODO
 }
diff --git a/platform/uwp/os_uwp.h b/platform/uwp/os_uwp.h
index fd78b3cdf7..00f79efb04 100644
--- a/platform/uwp/os_uwp.h
+++ b/platform/uwp/os_uwp.h
@@ -219,6 +219,7 @@ public:
 	virtual String get_clipboard() const;
 
 	void set_cursor_shape(CursorShape p_shape);
+	CursorShape get_cursor_shape() const;
 	virtual void set_custom_mouse_cursor(const RES &p_cursor, CursorShape p_shape, const Vector2 &p_hotspot);
 	void set_icon(const Ref<Image> &p_icon);