Use nullptr in place of 0 or NULL

[libs/gui.git] / source / graphics / android / window.cpp

diff --git a/source/graphics/android/window.cpp b/source/graphics/android/window.cpp
index 465d32529f4d2511a738f2b8f224e80487ff24a5..ec632aaeafd96b5948e72fe5812b18cc3937249f 100644 (file)
--- a/source/graphics/android/window.cpp
+++ b/source/graphics/android/window.cpp
@@ -1,7 +1,7 @@
-#include "display.h"
-#include "display_private.h"
 #include "window.h"
 #include "window_private.h"
+#include "display.h"
+#include "display_private.h"
 
 using namespace std;
 
@@ -10,7 +10,6 @@ namespace Graphics {
 
 void Window::platform_init()
 {
-       priv->window = 0;
 }
 
 void Window::platform_cleanup()
@@ -33,6 +32,10 @@ void Window::warp_pointer(int, int)
 {
 }
 
+void Window::platform_set_touch_input()
+{
+}
+
 void Window::platform_show()
 {
 }
@@ -53,6 +56,7 @@ bool Window::event(const Event &evnt)
                display.remove_window(*this);
                display.add_window(*this);
                priv->signal_window_acquired.emit(priv->window);
+               signal_got_focus.emit();
                break;
        case WINDOW_RESIZED:
                options.width = ANativeWindow_getWidth(priv->window);
@@ -60,8 +64,9 @@ bool Window::event(const Event &evnt)
                signal_resize.emit(options.width, options.height);
                break;
        case WINDOW_DESTROYED:
+               signal_lost_focus.emit();
                priv->signal_window_lost.emit();
-               priv->window = 0;
+               priv->window = nullptr;
                display.remove_window(*this);
                display.add_window(*this);
                break;