renamed HasFocus() to IsActive() to avoid confusion with FindFocus(); documented...

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

diff --git a/docs/changes.txt b/docs/changes.txt
index 532d802b88d306f23752ae528176ba2ad608a91d..d4d7ecdd34e1599ecdb2d1d29b20566d3eb2a132 100644 (file)
--- a/docs/changes.txt
+++ b/docs/changes.txt
@@ -241,6 +241,7 @@ All (GUI):
 - the XRC contrib library was moved to the core
 - wx(Choice/List/Note)book controls send CHANG(ED/ING) events in SetSelection
 - it is now possible to create a wxFont with given size in pixels (d2walter)
 - the XRC contrib library was moved to the core
 - wx(Choice/List/Note)book controls send CHANG(ED/ING) events in SetSelection
 - it is now possible to create a wxFont with given size in pixels (d2walter)

+- added wxTopLevelWindow::IsActive()

 
 Unix:
 
 
 Unix:
 

diff --git a/docs/latex/wx/tlw.tex b/docs/latex/wx/tlw.tex
index 17404418fedf6dd61b1e7f01a857b4c52ed29bae..be43aa4c93047cb1f3056bbb80323ab0e8827334 100644 (file)
--- a/docs/latex/wx/tlw.tex
+++ b/docs/latex/wx/tlw.tex
@@ -67,6 +67,14 @@ Gets a string containing the window title.
 See \helpref{wxTopLevelWindow::SetTitle}{wxtoplevelwindowsettitle}.
 
 
 See \helpref{wxTopLevelWindow::SetTitle}{wxtoplevelwindowsettitle}.
 
 

+\membersection{wxTopLevelWindow::IsActive}\label{wxtoplevelwindowisactive}
+
+\constfunc{bool}{IsActive}{\void}
+
+Returns \true if this window is currently active, i.e. if the user is currently
+working with it.
+
+

 \membersection{wxTopLevelWindow::Iconize}\label{wxtoplevelwindowiconize}
 
 \func{void}{Iconize}{\param{bool}{ iconize}}
 \membersection{wxTopLevelWindow::Iconize}\label{wxtoplevelwindowiconize}
 
 \func{void}{Iconize}{\param{bool}{ iconize}}

diff --git a/include/wx/gtk/toplevel.h b/include/wx/gtk/toplevel.h
index c55ec91352754b57ad034adf90250e7a5f2a70a9..0e6dce880131982f3b724ec2a0792470e6363bf2 100644 (file)
--- a/include/wx/gtk/toplevel.h
+++ b/include/wx/gtk/toplevel.h
@@ -64,7 +64,7 @@ public:
 
     virtual bool Show(bool show = TRUE);
 
 
     virtual bool Show(bool show = TRUE);
 

-    virtual bool HasFocus();
+    virtual bool IsActive();

 
     virtual void SetTitle( const wxString &title );
     virtual wxString GetTitle() const { return m_title; }
 
     virtual void SetTitle( const wxString &title );
     virtual wxString GetTitle() const { return m_title; }

diff --git a/include/wx/gtk1/toplevel.h b/include/wx/gtk1/toplevel.h
index c55ec91352754b57ad034adf90250e7a5f2a70a9..0e6dce880131982f3b724ec2a0792470e6363bf2 100644 (file)
--- a/include/wx/gtk1/toplevel.h
+++ b/include/wx/gtk1/toplevel.h
@@ -64,7 +64,7 @@ public:
 
     virtual bool Show(bool show = TRUE);
 
 
     virtual bool Show(bool show = TRUE);
 

-    virtual bool HasFocus();
+    virtual bool IsActive();

 
     virtual void SetTitle( const wxString &title );
     virtual wxString GetTitle() const { return m_title; }
 
     virtual void SetTitle( const wxString &title );
     virtual wxString GetTitle() const { return m_title; }

diff --git a/include/wx/toplevel.h b/include/wx/toplevel.h
index 89fcba6c0dd31fa04d44620294ea1cf8e18b0956..a18741217d9c19e5897f6c0c0c0e8a36fff9d6e1 100644 (file)
--- a/include/wx/toplevel.h
+++ b/include/wx/toplevel.h
@@ -176,7 +176,7 @@ public:
     virtual void RequestUserAttention(int flags = wxUSER_ATTENTION_INFO);
     
     // Is this the active frame (highlighted in the taskbar)?
     virtual void RequestUserAttention(int flags = wxUSER_ATTENTION_INFO);
     
     // Is this the active frame (highlighted in the taskbar)?

-    virtual bool HasFocus()
+    virtual bool IsActive()

         { return (wxGetTopLevelParent(FindFocus()) == this); }
 
     // implementation only from now on
         { return (wxGetTopLevelParent(FindFocus()) == this); }
 
     // implementation only from now on

diff --git a/src/gtk/toplevel.cpp b/src/gtk/toplevel.cpp
index d5fff696dd247c683f636880743875e9c1bfd666..4b737edd73e8121b6867ee9f3ffbaee444555be8 100644 (file)
--- a/src/gtk/toplevel.cpp
+++ b/src/gtk/toplevel.cpp
@@ -1067,13 +1067,12 @@ bool wxTopLevelWindowGTK::SetShape(const wxRegion& region)
     return do_shape_combine_region(window, region);
 }
 
     return do_shape_combine_region(window, region);
 }
 

-bool wxTopLevelWindowGTK::HasFocus()
+bool wxTopLevelWindowGTK::IsActive()

 {
 #ifdef __WXGTK20__
     return GTK_WINDOW( m_widget )->has_toplevel_focus;
 #else
 {
 #ifdef __WXGTK20__
     return GTK_WINDOW( m_widget )->has_toplevel_focus;
 #else

-    return ( wxGetTopLevelParent(FindFocus()) = this );
+    return wxTopLevelWindowBase::IsActive();

 #endif
 }
 
 #endif
 }
 

-// vi:sts=4:sw=4:et

diff --git a/src/gtk1/toplevel.cpp b/src/gtk1/toplevel.cpp
index d5fff696dd247c683f636880743875e9c1bfd666..4b737edd73e8121b6867ee9f3ffbaee444555be8 100644 (file)
--- a/src/gtk1/toplevel.cpp
+++ b/src/gtk1/toplevel.cpp
@@ -1067,13 +1067,12 @@ bool wxTopLevelWindowGTK::SetShape(const wxRegion& region)
     return do_shape_combine_region(window, region);
 }
 
     return do_shape_combine_region(window, region);
 }
 

-bool wxTopLevelWindowGTK::HasFocus()
+bool wxTopLevelWindowGTK::IsActive()

 {
 #ifdef __WXGTK20__
     return GTK_WINDOW( m_widget )->has_toplevel_focus;
 #else
 {
 #ifdef __WXGTK20__
     return GTK_WINDOW( m_widget )->has_toplevel_focus;
 #else

-    return ( wxGetTopLevelParent(FindFocus()) = this );
+    return wxTopLevelWindowBase::IsActive();

 #endif
 }
 
 #endif
 }
 

-// vi:sts=4:sw=4:et