Include the matching header first in .cpp files

[libs/gui.git] / source / graphics / cocoa / display.cpp

diff --git a/source/graphics/cocoa/display.cpp b/source/graphics/cocoa/display.cpp
index 5be28cde32f4a7c1ae293e23af292d1bb320c360..367691e222a37ff724af1cd3b87250bf27c027dc 100644 (file)
--- a/source/graphics/cocoa/display.cpp
+++ b/source/graphics/cocoa/display.cpp
@@ -1,16 +1,20 @@
-#include <stdexcept>
-#include "cocoadisplay.h"
 #include "display.h"
 #include "display_private.h"
+#include <stdexcept>
+#include "cocoadisplay.h"
 
 using namespace std;
 
 namespace Msp {
 namespace Graphics {
 
-Display::Display(const std::string &):
-       priv(new Private)
+Display::Display(const string &):
+       primary_monitor(0),
+       priv(new Private),
+       focus_window(0)
 {
+       static ErrorDialog err_dlg(0);
+
        priv->display = create_display();
 }
 
@@ -31,7 +35,7 @@ bool Display::process_events()
        if(!get_event(priv->display, &event.cevent))
                return false;
 
-       map<WindowHandle, Window *>::iterator i = priv->windows.find(event.cevent.any.window);
+       auto i = priv->windows.find(event.cevent.any.window);
        if(i!=priv->windows.end())
                i->second->event(event);