From 7fd1d163b790679371170f1a2cc491a2d4b6d559 Mon Sep 17 00:00:00 2001 From: Vadim Zeitlin Date: Thu, 9 Jul 1998 15:59:27 +0000 Subject: [PATCH] wxWindow::IsShown() made 'const' git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@212 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775 --- include/wx/gtk/window.h | 2 +- include/wx/gtk1/window.h | 2 +- src/gtk/window.cpp | 4 ++-- src/gtk1/window.cpp | 4 ++-- 4 files changed, 6 insertions(+), 6 deletions(-) diff --git a/include/wx/gtk/window.h b/include/wx/gtk/window.h index 2fc9d04455..482556b626 100644 --- 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) ) {}; - virtual bool IsShown(void); + virtual bool IsShown(void) const; 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 2fc9d04455..482556b626 100644 --- 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) ) {}; - virtual bool IsShown(void); + virtual bool IsShown(void) const; 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 e8f1110306..7726cf9669 100644 --- a/src/gtk/window.cpp +++ b/src/gtk/window.cpp @@ -1739,7 +1739,7 @@ wxString wxWindow::GetName(void) const return (wxString&)m_windowName; }; -bool wxWindow::IsShown(void) +bool wxWindow::IsShown(void) const { return m_isShown; }; @@ -2393,7 +2393,7 @@ void wxWindow::GetPositionConstraint(int *x, int *y) const GetPosition(x, y); } -void wxWindow::AcceptsFocus() const +bool wxWindow::AcceptsFocus() const { return IsEnabled() && IsShown(); } diff --git a/src/gtk1/window.cpp b/src/gtk1/window.cpp index e8f1110306..7726cf9669 100644 --- a/src/gtk1/window.cpp +++ b/src/gtk1/window.cpp @@ -1739,7 +1739,7 @@ wxString wxWindow::GetName(void) const return (wxString&)m_windowName; }; -bool wxWindow::IsShown(void) +bool wxWindow::IsShown(void) const { return m_isShown; }; @@ -2393,7 +2393,7 @@ void wxWindow::GetPositionConstraint(int *x, int *y) const GetPosition(x, y); } -void wxWindow::AcceptsFocus() const +bool wxWindow::AcceptsFocus() const { return IsEnabled() && IsShown(); } -- 2.47.2