X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/8193d58f178b7d6a2e5eb1ab591dad6c0b5c063c..94e8d77cbb22041c133edaa00720dff0de45a68a:/src/msw/display.cpp diff --git a/src/msw/display.cpp b/src/msw/display.cpp index 6066895d21..c0e4b95986 100644 --- a/src/msw/display.cpp +++ b/src/msw/display.cpp @@ -18,10 +18,6 @@ // headers // --------------------------------------------------------------------------- -#if defined(__GNUG__) && !defined(NO_GCC_PRAGMA) - #pragma implementation "display.h" -#endif - // For compilers that support precompilation, includes "wx.h". #include "wx/wxprec.h" @@ -382,10 +378,12 @@ size_t wxDisplayBase::GetCount() { InitDisplays(); - // I'm not sure if they really always return the same thing and if this is - // not true I'd like to know in which situation does it happen - wxASSERT_MSG( gs_displays->GetCount() == (size_t)::GetSystemMetrics(SM_CMONITORS), - _T("So how many displays does this system have?") ); + //RN: FIXME: This is wrong - the display info array should reload after every call + //to GetCount() - otherwise it will not be accurate. + //The user can change the number of displays in display properties/settings + //after GetCount or similar is called and really mess this up... + //wxASSERT_MSG( gs_displays->GetCount() == (size_t)::GetSystemMetrics(SM_CMONITORS), + // _T("So how many displays does this system have?") ); return gs_displays->GetCount(); }