Include the matching header first in .cpp files

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

diff --git a/source/graphics/windows/display.cpp b/source/graphics/windows/display.cpp
index 2364f6d9c05422a3413550fceef94ae5a63389f7..d71f81bbfb49857f268fca12681785e009f02693 100644 (file)
--- a/source/graphics/windows/display.cpp
+++ b/source/graphics/windows/display.cpp
@@ -1,6 +1,6 @@
-#include <windows.h>
 #include "display.h"
 #include "display_private.h"
+#include <windows.h>
 
 using namespace std;
 
@@ -55,6 +55,8 @@ Display::Display(const string &):
                        if(have_current && info.dmPelsWidth==current.dmPelsWidth && info.dmPelsHeight==current.dmPelsHeight && info.dmDisplayFrequency==current.dmDisplayFrequency)
                                monitor.desktop_settings.mode = &modes.back();
                }
+
+               monitor.current_settings = monitor.desktop_settings;
        }
 }
 
@@ -88,9 +90,9 @@ void Display::set_mode(const VideoMode &requested_mode, bool)
        if(ret!=DISP_CHANGE_SUCCESSFUL)
                throw unsupported_video_mode(requested_mode);
 
-       for(list<Monitor>::iterator i=monitors.begin(); i!=monitors.end(); ++i)
-               if(&*i==mode->monitor)
-                       i->current_settings.mode = mode;
+       for(Monitor &m: monitors)
+               if(&m==mode->monitor)
+                       m.current_settings.mode = mode;
 }
 
 bool Display::process_events()