Hardware defines spec.

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

diff --git a/src/msw/display.cpp b/src/msw/display.cpp
index 4ba49adf6238d99dbd13c64a4aa6190eb1c357e6..ba43859eda2b1d62689e6a38f2c4163d3e9ca7d7 100644 (file)
--- a/src/msw/display.cpp
+++ b/src/msw/display.cpp
@@ -6,7 +6,7 @@
 // Created:     06/21/02
 // RCS-ID:      $Id$
 // Copyright:   (c) wxWidgets team
 // Created:     06/21/02
 // RCS-ID:      $Id$
 // Copyright:   (c) wxWidgets team

-// Licence:     wxWidgets licence
+// Licence:     wxWindows licence

 /////////////////////////////////////////////////////////////////////////////
 
 // ===========================================================================
 /////////////////////////////////////////////////////////////////////////////
 
 // ===========================================================================


@@ -216,7 +216,7 @@ 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


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


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

-         
+

     return true;
 }
 
     return true;
 }