wxWindow::IsShown() made 'const'

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

diff --git a/include/wx/gtk/window.h b/include/wx/gtk/window.h
index 2fc9d044553891df4a57aa4a986c4ecc11acfc7d..482556b62607ac3cf6628910046b40dd8c4aa6b4 100644 (file)
--- a/include/wx/gtk/window.h
+++ b/include/wx/gtk/window.h
@@ -152,7 +152,7 @@ class wxWindow: public wxEvtHandler
     
     void OnSysColourChanged( wxSysColourChangedEvent &WXUNUSED(event) ) {};
     
     
     void OnSysColourChanged( wxSysColourChangedEvent &WXUNUSED(event) ) {};
     

-    virtual bool IsShown(void);
+    virtual bool IsShown(void) const;

     virtual bool IsRetained(void);
     virtual wxWindow *FindWindow( long id );
     virtual wxWindow *FindWindow( const wxString& name );
     virtual bool IsRetained(void);
     virtual wxWindow *FindWindow( long id );
     virtual wxWindow *FindWindow( const wxString& name );

diff --git a/include/wx/gtk1/window.h b/include/wx/gtk1/window.h
index 2fc9d044553891df4a57aa4a986c4ecc11acfc7d..482556b62607ac3cf6628910046b40dd8c4aa6b4 100644 (file)
--- a/include/wx/gtk1/window.h
+++ b/include/wx/gtk1/window.h
@@ -152,7 +152,7 @@ class wxWindow: public wxEvtHandler
     
     void OnSysColourChanged( wxSysColourChangedEvent &WXUNUSED(event) ) {};
     
     
     void OnSysColourChanged( wxSysColourChangedEvent &WXUNUSED(event) ) {};
     

-    virtual bool IsShown(void);
+    virtual bool IsShown(void) const;

     virtual bool IsRetained(void);
     virtual wxWindow *FindWindow( long id );
     virtual wxWindow *FindWindow( const wxString& name );
     virtual bool IsRetained(void);
     virtual wxWindow *FindWindow( long id );
     virtual wxWindow *FindWindow( const wxString& name );

diff --git a/src/gtk/window.cpp b/src/gtk/window.cpp
index e8f11103064190dcb8415fd39cf9da44687e4405..7726cf96690214bfc821c1eb5041b8db66991e4a 100644 (file)
--- a/src/gtk/window.cpp
+++ b/src/gtk/window.cpp
@@ -1739,7 +1739,7 @@ wxString wxWindow::GetName(void) const
   return (wxString&)m_windowName;
 };
 
   return (wxString&)m_windowName;
 };
 

-bool wxWindow::IsShown(void)
+bool wxWindow::IsShown(void) const

 {
   return m_isShown;
 };
 {
   return m_isShown;
 };


@@ -2393,7 +2393,7 @@ void wxWindow::GetPositionConstraint(int *x, int *y) const
     GetPosition(x, y);
 }
 
     GetPosition(x, y);
 }
 

-void wxWindow::AcceptsFocus() const
+bool wxWindow::AcceptsFocus() const

 {
   return IsEnabled() && IsShown();
 }
 {
   return IsEnabled() && IsShown();
 }

diff --git a/src/gtk1/window.cpp b/src/gtk1/window.cpp
index e8f11103064190dcb8415fd39cf9da44687e4405..7726cf96690214bfc821c1eb5041b8db66991e4a 100644 (file)
--- a/src/gtk1/window.cpp
+++ b/src/gtk1/window.cpp
@@ -1739,7 +1739,7 @@ wxString wxWindow::GetName(void) const
   return (wxString&)m_windowName;
 };
 
   return (wxString&)m_windowName;
 };
 

-bool wxWindow::IsShown(void)
+bool wxWindow::IsShown(void) const

 {
   return m_isShown;
 };
 {
   return m_isShown;
 };


@@ -2393,7 +2393,7 @@ void wxWindow::GetPositionConstraint(int *x, int *y) const
     GetPosition(x, y);
 }
 
     GetPosition(x, y);
 }
 

-void wxWindow::AcceptsFocus() const
+bool wxWindow::AcceptsFocus() const

 {
   return IsEnabled() && IsShown();
 }
 {
   return IsEnabled() && IsShown();
 }