Patch from OSAF that maintains radio button selection if Realize is recalled.

[wxWidgets.git] / src / msw / display.cpp

diff --git a/src/msw/display.cpp b/src/msw/display.cpp
index 5dd3994788807bd78d127c5d21c12a781f10d5e2..56845df6e8188a49de2552dd6fffce2ae900bcc8 100644 (file)
--- a/src/msw/display.cpp
+++ b/src/msw/display.cpp
@@ -56,6 +56,10 @@
     #pragma warning(disable:4706)
 #endif
 
     #pragma warning(disable:4706)
 #endif
 

+// with mingw32, we must include windows.h first and it doesn't hurt with other
+// compilers
+#include <windows.h>
+

 #include <multimon.h>
 
 #ifdef _MSC_VER
 #include <multimon.h>
 
 #ifdef _MSC_VER


@@ -378,10 +382,12 @@ size_t wxDisplayBase::GetCount()
 {
     InitDisplays();
 
 {
     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();
 }
 
     return gs_displays->GetCount();
 }