X-Git-Url: http://git.tdb.fi/?a=blobdiff_plain;f=source%2Fgraphics%2Fandroid%2Fdisplay.cpp;h=a44687e06db029c2e006c37a9542c3bc65b47f1c;hb=1ea8498c4c729f849095e2f4aa3d282de2000a35;hp=c2e2cf6a96a524f05c98d7becafcb10865ebc380;hpb=d6bdc1d1dd8df202608eeee4fb2a99693ee62d56;p=libs%2Fgui.git diff --git a/source/graphics/android/display.cpp b/source/graphics/android/display.cpp index c2e2cf6..a44687e 100644 --- a/source/graphics/android/display.cpp +++ b/source/graphics/android/display.cpp @@ -1,23 +1,20 @@ -#include -#include #include "display.h" #include "display_private.h" +#include +#include using namespace std; namespace Msp { namespace Graphics { -Display::Display(const string &): - primary_monitor(0) +Display::Display(const string &) { Android::MainThread *thread = reinterpret_cast(Application::get_data()); if(!thread->is_starting_up()) throw logic_error("Display must be created during startup"); priv = new Private; - priv->input_queue = 0; - priv->native_window = 0; thread->signal_native_window_created.connect(sigc::mem_fun(priv, &PlatformDisplayPrivate::native_window_created)); thread->signal_native_window_resized.connect(sigc::mem_fun(priv, &PlatformDisplayPrivate::native_window_resized)); @@ -115,5 +112,6 @@ void PlatformDisplayPrivate::input_queue_destroyed(AInputQueue *) MutexLock lock(event_mutex); input_queue = 0; } + } // namespace Graphics } // namespace Msp