0.1.8-3

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

diff --git a/src/msw/display.cpp b/src/msw/display.cpp
index 3e87a50557df25eb42c86385d5dcfaf68a9c82df..37c98d45a741a1bdf20a287dac1c7948db2c7dc0 100644 (file)
--- a/src/msw/display.cpp
+++ b/src/msw/display.cpp
@@ -39,6 +39,7 @@
 #include "wx/sysopt.h"
 
 #include "wx/display_impl.h"
 #include "wx/sysopt.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
 #include "wx/msw/missing.h"
 
 // define this to use DirectDraw for display mode switching: this is disabled


@@ -222,7 +223,7 @@ public:
 
     virtual unsigned GetCount() { return unsigned(m_displays.size()); }
     virtual int GetFromPoint(const wxPoint& pt);
 
     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
 
 protected:
     // ctor checks if the current system supports multimon API and dynamically


@@ -572,7 +573,7 @@ int wxDisplayFactoryWin32Base::GetFromPoint(const wxPoint& pt)
                                                        MONITOR_DEFAULTTONULL));
 }
 
                                                        MONITOR_DEFAULTTONULL));
 }
 

-int wxDisplayFactoryWin32Base::GetFromWindow(wxWindow *window)
+int wxDisplayFactoryWin32Base::GetFromWindow(const wxWindow *window)

 {
     return FindDisplayFromHMONITOR(gs_MonitorFromWindow(GetHwndOf(window),
                                                         MONITOR_DEFAULTTONULL));
 {
     return FindDisplayFromHMONITOR(gs_MonitorFromWindow(GetHwndOf(window),
                                                         MONITOR_DEFAULTTONULL));