changed GetFromWindow() to take const pointer

git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@44442 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775

diff --git a/docs/latex/wx/display.tex b/docs/latex/wx/display.tex
index 87723079c6d4d32ebd112a76e3eaa1557c74182b..47047a8b6a2216785cfec1e1886208b5499fe49f 100644 (file)
--- a/docs/latex/wx/display.tex
+++ b/docs/latex/wx/display.tex
@@ -106,7 +106,7 @@ Returns the index of the display on which the given point lies.  Returns
 
 \membersection{wxDisplay::GetFromWindow}\label{wxdisplaygetfromwindow}
 
 
 \membersection{wxDisplay::GetFromWindow}\label{wxdisplaygetfromwindow}
 

-\func{static int}{GetFromWindow}{\param{wxWindow* }{win}}
+\func{static int}{GetFromWindow}{\param{const wxWindow* }{win}}

 
 Returns the index of the display on which the given window lies.
 
 
 Returns the index of the display on which the given window lies.
 

diff --git a/include/wx/display.h b/include/wx/display.h
index e31ee3286a64c131b790ad5033b6100bc954c75a..eea6bbb7f6495d1d579ff86c297ad52d43bf06c7 100644 (file)
--- a/include/wx/display.h
+++ b/include/wx/display.h
@@ -62,7 +62,7 @@ public:
 
     // find the display where the given window lies, return wxNOT_FOUND if it
     // is not shown at all
 
     // find the display where the given window lies, return wxNOT_FOUND if it
     // is not shown at all

-    static int GetFromWindow(wxWindow *window);
+    static int GetFromWindow(const wxWindow *window);

 
 
     // return true if the object was initialized successfully
 
 
     // return true if the object was initialized successfully

diff --git a/include/wx/display_impl.h b/include/wx/display_impl.h
index 07eae9a753d02e7cf0dc453db78659089e186eca..4fedb1ffcbdf168162539838d3c712b15a52f651 100644 (file)
--- a/include/wx/display_impl.h
+++ b/include/wx/display_impl.h
@@ -37,7 +37,7 @@ public:
     // return the display for the given window or wxNOT_FOUND
     //
     // the window pointer must not be NULL (i.e. caller should check it)
     // return the display for the given window or wxNOT_FOUND
     //
     // the window pointer must not be NULL (i.e. caller should check it)

-    virtual int GetFromWindow(wxWindow *window);
+    virtual int GetFromWindow(const wxWindow *window);

 };
 
 // ----------------------------------------------------------------------------
 };
 
 // ----------------------------------------------------------------------------

diff --git a/src/common/dpycmn.cpp b/src/common/dpycmn.cpp
index fe867c595d40e2cdf97de67d2834d6a0a3aca757..e728d1b88597aafd1806921cb4db835fce9474f0 100644 (file)
--- a/src/common/dpycmn.cpp
+++ b/src/common/dpycmn.cpp
@@ -145,7 +145,7 @@ wxDisplay::~wxDisplay()
     return Factory().GetFromPoint(pt);
 }
 
     return Factory().GetFromPoint(pt);
 }
 

-/* static */ int wxDisplay::GetFromWindow(wxWindow *window)
+/* static */ int wxDisplay::GetFromWindow(const wxWindow *window)

 {
     wxCHECK_MSG( window, wxNOT_FOUND, _T("invalid window") );
 
 {
     wxCHECK_MSG( window, wxNOT_FOUND, _T("invalid window") );
 


@@ -235,7 +235,7 @@ bool wxDisplay::ChangeMode(const wxVideoMode& mode)
 // wxDisplayFactory implementation
 // ============================================================================
 
 // wxDisplayFactory implementation
 // ============================================================================
 

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

 {
     // consider that the window belongs to the display containing its centre
     const wxRect r(window->GetRect());
 {
     // consider that the window belongs to the display containing its centre
     const wxRect r(window->GetRect());

diff --git a/src/msw/display.cpp b/src/msw/display.cpp
index afd5d732baa15f85f38d5c35c384257b62736f2c..37c98d45a741a1bdf20a287dac1c7948db2c7dc0 100644 (file)
--- a/src/msw/display.cpp
+++ b/src/msw/display.cpp
@@ -223,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


@@ -573,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));