cleanup - more reformatting; fixed bug introduced in prior commit

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

diff --git a/src/msw/display.cpp b/src/msw/display.cpp
index fc25e3f476503bd81f0e7e2ccaa92468eb9b8315..536bd14811cd5d130fb9fcf3b69381972c9c5954 100644 (file)
--- a/src/msw/display.cpp
+++ b/src/msw/display.cpp
@@ -1,11 +1,12 @@
 /////////////////////////////////////////////////////////////////////////////
 /////////////////////////////////////////////////////////////////////////////

-// Name:        display.cpp
+// Name:        src/msw/display.cpp

 // Purpose:     MSW Implementation of wxDisplay class
 // Author:      Royce Mitchell III
 // Modified by: VZ (resolutions enumeration/change support, DirectDraw, ...)
 // Purpose:     MSW Implementation of wxDisplay class
 // Author:      Royce Mitchell III
 // Modified by: VZ (resolutions enumeration/change support, DirectDraw, ...)

+//              Ryan Norton (IsPrimary override)

 // Created:     06/21/02
 // RCS-ID:      $Id$
 // Created:     06/21/02
 // RCS-ID:      $Id$

-// Copyright:   (c) wxWindows team
+// Copyright:   (c) wxWidgets team

 // Licence:     wxWindows licence
 /////////////////////////////////////////////////////////////////////////////
 
 // Licence:     wxWindows licence
 /////////////////////////////////////////////////////////////////////////////
 


@@ -17,10 +18,6 @@
 // headers
 // ---------------------------------------------------------------------------
 
 // 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"
 
 // For compilers that support precompilation, includes "wx.h".
 #include "wx/wxprec.h"
 


@@ -31,7 +28,9 @@
 #if wxUSE_DISPLAY
 
 #ifndef WX_PRECOMP
 #if wxUSE_DISPLAY
 
 #ifndef WX_PRECOMP

+   #include "wx/app.h"

    #include "wx/dynarray.h"
    #include "wx/dynarray.h"

+   #include "wx/frame.h"

 #endif
 
 #include "wx/dynload.h"
 #endif
 
 #include "wx/dynload.h"


@@ -53,7 +52,13 @@
     #pragma warning(disable:4706)
 #endif
 
     #pragma warning(disable:4706)
 #endif
 

-#include <multimon.h>
+// with mingw32, we must include windows.h first and it doesn't hurt with other
+// compilers
+#include "wx/msw/wrapwin.h"
+
+#ifndef __WXWINCE__
+    #include <multimon.h>
+#endif // !__WXWINCE__

 
 #ifdef _MSC_VER
     #pragma warning(default:4706)
 
 #ifdef _MSC_VER
     #pragma warning(default:4706)


@@ -214,11 +219,11 @@ wxDDEnumExCallback(GUID *pGuid,
     return true;
 }
 
     return true;
 }
 

-HRESULT WINAPI wxDDEnumModesCallback(LPDDSURFACEDESC lpDDSurfaceDesc,  
+HRESULT WINAPI wxDDEnumModesCallback(LPDDSURFACEDESC lpDDSurfaceDesc,

                                      LPVOID lpContext)
 {
     // we need at least the mode size
                                      LPVOID lpContext)
 {
     // we need at least the mode size

-    static const int FLAGS_REQUIRED = DDSD_HEIGHT | DDSD_WIDTH;
+    static const DWORD FLAGS_REQUIRED = DDSD_HEIGHT | DDSD_WIDTH;

     if ( (lpDDSurfaceDesc->dwFlags & FLAGS_REQUIRED) == FLAGS_REQUIRED )
     {
         wxArrayVideoModes * const modes = (wxArrayVideoModes *)lpContext;
     if ( (lpDDSurfaceDesc->dwFlags & FLAGS_REQUIRED) == FLAGS_REQUIRED )
     {
         wxArrayVideoModes * const modes = (wxArrayVideoModes *)lpContext;


@@ -240,12 +245,16 @@ HRESULT WINAPI wxDDEnumModesCallback(LPDDSURFACEDESC lpDDSurfaceDesc,
 // initialize gs_displays using DirectX functions
 static bool DoInitDirectX()
 {
 // initialize gs_displays using DirectX functions
 static bool DoInitDirectX()
 {

+#if wxUSE_LOG

     // suppress the errors if ddraw.dll is not found
     wxLog::EnableLogging(false);
     // suppress the errors if ddraw.dll is not found
     wxLog::EnableLogging(false);

+#endif

 
     wxDynamicLibrary dllDX(_T("ddraw.dll"));
 
 
     wxDynamicLibrary dllDX(_T("ddraw.dll"));
 

-    wxLog::EnableLogging(true);
+#if wxUSE_LOG
+    wxLog::EnableLogging();
+#endif

 
     if ( !dllDX.IsLoaded() )
         return false;
 
     if ( !dllDX.IsLoaded() )
         return false;


@@ -318,6 +327,7 @@ wxVideoMode ConvertToVideoMode(const DEVMODE& dm)
                        dm.dmDisplayFrequency > 1 ? dm.dmDisplayFrequency : 0);
 }
 
                        dm.dmDisplayFrequency > 1 ? dm.dmDisplayFrequency : 0);
 }
 

+#ifndef __WXWINCE__

 // emulation of ChangeDisplaySettingsEx() for Win95
 LONG WINAPI ChangeDisplaySettingsExForWin95(LPCTSTR WXUNUSED(lpszDeviceName),
                                             LPDEVMODE lpDevMode,
 // emulation of ChangeDisplaySettingsEx() for Win95
 LONG WINAPI ChangeDisplaySettingsExForWin95(LPCTSTR WXUNUSED(lpszDeviceName),
                                             LPDEVMODE lpDevMode,


@@ -327,6 +337,7 @@ LONG WINAPI ChangeDisplaySettingsExForWin95(LPCTSTR WXUNUSED(lpszDeviceName),
 {
     return ::ChangeDisplaySettings(lpDevMode, dwFlags);
 }
 {
     return ::ChangeDisplaySettings(lpDevMode, dwFlags);
 }

+#endif // !__WXWINCE__

 
 // ----------------------------------------------------------------------------
 // wxDisplayModule
 
 // ----------------------------------------------------------------------------
 // wxDisplayModule


@@ -371,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();
 }


@@ -505,7 +518,11 @@ wxString wxDisplay::GetName() const
         wxZeroMemory(monInfo);
         monInfo.cbSize = sizeof(monInfo);
 
         wxZeroMemory(monInfo);
         monInfo.cbSize = sizeof(monInfo);
 

-        if ( !::GetMonitorInfo(dpyInfo.m_hmon, &monInfo) )
+        // NB: Cast from MONITORINFOEX* to MONITORINFO* is done because
+        //     Mingw headers - unlike the ones from Microsoft's Platform SDK -
+        //     don't derive the former from the latter in C++ mode and so
+        //     the pointer's type is not converted implicitly.
+        if ( !::GetMonitorInfo(dpyInfo.m_hmon, (LPMONITORINFO)&monInfo) )

         {
             wxLogLastError(_T("GetMonitorInfo"));
         }
         {
             wxLogLastError(_T("GetMonitorInfo"));
         }


@@ -534,6 +551,30 @@ wxString wxDisplay::GetNameForEnumSettings() const
     return name;
 }
 
     return name;
 }
 

+// ----------------------------------------------------------------------------
+// determine if this is the primary display
+// ----------------------------------------------------------------------------
+
+bool wxDisplay::IsPrimary() const
+{
+    wxDisplayInfo& dpyInfo = (*gs_displays)[m_index];
+
+    MONITORINFOEX monInfo;
+    wxZeroMemory(monInfo);
+    monInfo.cbSize = sizeof(monInfo);
+
+    // NB: Cast from MONITORINFOEX* to MONITORINFO* is done because
+    //     Mingw headers - unlike the ones from Microsoft's Platform SDK -
+    //     don't derive the former from the latter in C++ mode and so
+    //     the pointer's type is not converted implicitly.
+    if ( !::GetMonitorInfo(dpyInfo.m_hmon, (LPMONITORINFO)&monInfo) )
+    {
+        wxLogLastError(_T("GetMonitorInfo"));
+    }
+
+    return (monInfo.dwFlags & MONITORINFOF_PRIMARY) == MONITORINFOF_PRIMARY;
+}
+

 // ----------------------------------------------------------------------------
 // video modes enumeration
 // ----------------------------------------------------------------------------
 // ----------------------------------------------------------------------------
 // video modes enumeration
 // ----------------------------------------------------------------------------


@@ -648,7 +689,7 @@ bool wxDisplay::DoChangeModeDirectX(const wxVideoMode& mode)
         return false;
     }
 
         return false;
     }
 

-         
+

     return true;
 }
 
     return true;
 }
 


@@ -690,7 +731,11 @@ bool wxDisplay::DoChangeModeWindows(const wxVideoMode& mode)
 
         pDevMode = &dm;
 
 
         pDevMode = &dm;
 

+#ifdef __WXWINCE__
+        flags = 0;
+#else // !__WXWINCE__

         flags = CDS_FULLSCREEN;
         flags = CDS_FULLSCREEN;

+#endif // __WXWINCE__/!__WXWINCE__

     }
 
 
     }
 
 


@@ -709,12 +754,14 @@ bool wxDisplay::DoChangeModeWindows(const wxVideoMode& mode)
         }
         //else: huh, no user32.dll??
 
         }
         //else: huh, no user32.dll??
 

+#ifndef __WXWINCE__

         if ( !pfnChangeDisplaySettingsEx )
         {
             // we must be under Win95 and so there is no multiple monitors
             // support anyhow
             pfnChangeDisplaySettingsEx = ChangeDisplaySettingsExForWin95;
         }
         if ( !pfnChangeDisplaySettingsEx )
         {
             // we must be under Win95 and so there is no multiple monitors
             // support anyhow
             pfnChangeDisplaySettingsEx = ChangeDisplaySettingsExForWin95;
         }

+#endif // !__WXWINCE__

     }
 
     // do change the mode
     }
 
     // do change the mode