made FindWindow() member functions const (this makes it possible to use XRCCTRL(...

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

diff --git a/docs/latex/wx/window.tex b/docs/latex/wx/window.tex
index 6a0f3ab2ed70d85912b4ed3964a89073cebcf47c..8f06ba30335be356b36858b080afa91ef68dd109 100644 (file)
--- a/docs/latex/wx/window.tex
+++ b/docs/latex/wx/window.tex
@@ -570,11 +570,11 @@ Note that this is a static function, so it can be called without needing a wxWin
 
 \membersection{wxWindow::FindWindow}\label{wxwindowfindwindow}
 
-\func{wxWindow*}{FindWindow}{\param{long}{ id}}
+\constfunc{wxWindow*}{FindWindow}{\param{long}{ id}}
 
 Find a child of this window, by identifier.
 
-\func{wxWindow*}{FindWindow}{\param{const wxString\&}{ name}}
+\constfunc{wxWindow*}{FindWindow}{\param{const wxString\&}{ name}}
 
 Find a child of this window, by name.
 

diff --git a/include/wx/window.h b/include/wx/window.h
index 7c72d59bb1fa40b383e18ef467ff371c05ac9f2b..2fc2a8a6d2b861d07bd311ad9563ae25f8106e51 100644 (file)
--- a/include/wx/window.h
+++ b/include/wx/window.h
@@ -570,8 +570,8 @@ public:
 
         // find window among the descendants of this one either by id or by
         // name (return NULL if not found)
-    wxWindow *FindWindow( long winid );
-    wxWindow *FindWindow( const wxString& name );
+    wxWindow *FindWindow(long winid) const;
+    wxWindow *FindWindow(const wxString& name) const;
 
         // Find a window among any window (all return NULL if not found)
     static wxWindow *FindWindowById( long winid, const wxWindow *parent = NULL );

diff --git a/src/common/wincmn.cpp b/src/common/wincmn.cpp
index 0c2192810bd140fa30c69eccd3b74ce65fd0d185..9ff4cee2884e5a85d295b954a2393ec99e33dc2a 100644 (file)
--- a/src/common/wincmn.cpp
+++ b/src/common/wincmn.cpp
@@ -1226,7 +1226,7 @@ void wxWindowBase::ClearBackground()
 // find child window by id or name
 // ----------------------------------------------------------------------------
 
-wxWindow *wxWindowBase::FindWindow( long id )
+wxWindow *wxWindowBase::FindWindow(long id) const
 {
     if ( id == m_windowId )
         return (wxWindow *)this;
@@ -1242,7 +1242,7 @@ wxWindow *wxWindowBase::FindWindow( long id )
     return (wxWindow *)res;
 }
 
-wxWindow *wxWindowBase::FindWindow( const wxString& name )
+wxWindow *wxWindowBase::FindWindow(const wxString& name) const
 {
     if ( name == m_windowName )
         return (wxWindow *)this;