uppercasing menu shortcuts for non-command keystrokes, allowing non-command accelerators

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

diff --git a/src/msw/display.cpp b/src/msw/display.cpp
index ecb46d2913b3ce95bf91b4150fc71a9b026ba142..86f353b6d853ecfc40b8741806a2b61bfab8e975 100644 (file)
--- a/src/msw/display.cpp
+++ b/src/msw/display.cpp
@@ -5,7 +5,7 @@
 // Modified by: VZ (resolutions enumeration/change support, DirectDraw, ...)
 // Created:     06/21/02
 // RCS-ID:      $Id$
 // Modified by: VZ (resolutions enumeration/change support, DirectDraw, ...)
 // Created:     06/21/02
 // RCS-ID:      $Id$

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

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


@@ -17,7 +17,7 @@
 // headers
 // ---------------------------------------------------------------------------
 
 // headers
 // ---------------------------------------------------------------------------
 

-#ifdef __GNUG__
+#if defined(__GNUG__) && !defined(NO_GCC_PRAGMA)

     #pragma implementation "display.h"
 #endif
 
     #pragma implementation "display.h"
 #endif
 


@@ -31,7 +31,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"


@@ -218,7 +220,7 @@ 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 +242,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;


@@ -505,7 +511,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"));
         }