X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/4e675101a7fabdeaed5520257bf3dda457f54178..659863d8a73d02626f4060bb1099fe7bfd80d22a:/src/msw/display.cpp?ds=sidebyside

diff --git a/src/msw/display.cpp b/src/msw/display.cpp
index 6f7181bfa2..1855c0c6a7 100644
--- a/src/msw/display.cpp
+++ b/src/msw/display.cpp
@@ -27,8 +27,9 @@
 
 #if wxUSE_DISPLAY
 
+#include "wx/display.h"
+
 #ifndef WX_PRECOMP
-    #include "wx/msw/missing.h"
     #include "wx/dynarray.h"
     #include "wx/app.h"
     #include "wx/frame.h"
@@ -37,8 +38,9 @@
 #include "wx/dynload.h"
 #include "wx/sysopt.h"
 
-#include "wx/display.h"
 #include "wx/display_impl.h"
+#include "wx/msw/wrapwin.h"
+#include "wx/msw/missing.h"
 
 // define this to use DirectDraw for display mode switching: this is disabled
 // by default because ddraw.h is now always available and also it's not really
@@ -221,7 +223,7 @@ public:
 
     virtual unsigned GetCount() { return unsigned(m_displays.size()); }
     virtual int GetFromPoint(const wxPoint& pt);
-    virtual int GetFromWindow(wxWindow *window);
+    virtual int GetFromWindow(const wxWindow *window);
 
 protected:
     // ctor checks if the current system supports multimon API and dynamically
@@ -480,7 +482,9 @@ wxVideoMode wxDisplayImplWin32Base::GetCurrentMode() const
     // according to MSDN.  The version of GetName() we implement for Win95
     // returns an empty string.
     const wxString name = GetName();
-    const wxChar * const deviceName = name.empty() ? NULL : name.c_str();
+    const wxChar * const deviceName = name.empty()
+                                          ? (const wxChar*)NULL
+                                          : (const wxChar*)name.c_str();
 
     DEVMODE dm;
     dm.dmSize = sizeof(dm);
@@ -571,7 +575,7 @@ int wxDisplayFactoryWin32Base::GetFromPoint(const wxPoint& pt)
                                                        MONITOR_DEFAULTTONULL));
 }
 
-int wxDisplayFactoryWin32Base::GetFromWindow(wxWindow *window)
+int wxDisplayFactoryWin32Base::GetFromWindow(const wxWindow *window)
 {
     return FindDisplayFromHMONITOR(gs_MonitorFromWindow(GetHwndOf(window),
                                                         MONITOR_DEFAULTTONULL));
@@ -667,7 +671,9 @@ wxDisplayImplMultimon::GetModes(const wxVideoMode& modeMatch) const
     // according to MSDN.  The version of GetName() we implement for Win95
     // returns an empty string.
     const wxString name = GetName();
-    const wxChar * const deviceName = name.empty() ? NULL : name.c_str();
+    const wxChar * const deviceName = name.empty()
+                                            ? (const wxChar*)NULL
+                                            : (const wxChar*)name.c_str();
 
     DEVMODE dm;
     dm.dmSize = sizeof(dm);