-#include <windows.h>
#include "display.h"
#include "display_private.h"
+#include <windows.h>
using namespace std;
namespace Graphics {
Display::Display(const string &):
- primary_monitor(0),
- priv(new Private),
- focus_window(0)
+ priv(new Private)
{
- static ErrorDialog err_dlg(0);
+ static ErrorDialog err_dlg(nullptr);
for(unsigned i=0;; ++i)
{
DISPLAY_DEVICE adapter_dev;
adapter_dev.cb = sizeof(adapter_dev);
- if(!EnumDisplayDevices(0, i, &adapter_dev, 0))
+ if(!EnumDisplayDevices(nullptr, i, &adapter_dev, 0))
break;
if(adapter_dev.StateFlags&DISPLAY_DEVICE_MIRRORING_DRIVER)
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;
}
}
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()
{
MSG msg;
- if(PeekMessage(&msg, 0, 0, 0, PM_REMOVE))
+ if(PeekMessage(&msg, nullptr, 0, 0, PM_REMOVE))
{
TranslateMessage(&msg);
DispatchMessage(&msg);