Make wxTLW::Raise() actually bring the window to the top

    and give it the WM's focus (if supported).

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

diff --git a/include/wx/gtk/toplevel.h b/include/wx/gtk/toplevel.h
index 0e6dce880131982f3b724ec2a0792470e6363bf2..d4464c2ec9f8d930880599b6335f18a6bf69c995 100644 (file)
--- a/include/wx/gtk/toplevel.h
+++ b/include/wx/gtk/toplevel.h
@@ -64,6 +64,8 @@ public:
 
     virtual bool Show(bool show = TRUE);
 
+    virtual void Raise();
+
     virtual bool IsActive();
 
     virtual void SetTitle( const wxString &title );

diff --git a/include/wx/gtk1/toplevel.h b/include/wx/gtk1/toplevel.h
index 0e6dce880131982f3b724ec2a0792470e6363bf2..d4464c2ec9f8d930880599b6335f18a6bf69c995 100644 (file)
--- a/include/wx/gtk1/toplevel.h
+++ b/include/wx/gtk1/toplevel.h
@@ -64,6 +64,8 @@ public:
 
     virtual bool Show(bool show = TRUE);
 
+    virtual void Raise();
+
     virtual bool IsActive();
 
     virtual void SetTitle( const wxString &title );

diff --git a/src/gtk/toplevel.cpp b/src/gtk/toplevel.cpp
index c5cbc54a40aeb2a750c09703897926ded776834a..fb7300af9dbb5a6ffefee59158edb6425e9dfaef 100644 (file)
--- a/src/gtk/toplevel.cpp
+++ b/src/gtk/toplevel.cpp
@@ -742,6 +742,15 @@ bool wxTopLevelWindowGTK::Show( bool show )
     return wxWindow::Show( show );
 }
 
+void wxTopLevelWindowGTK::Raise()
+{
+#ifdef __WXGTK20__
+    gtk_window_present( GTK_WINDOW( m_widget ) );
+#else
+    wxWindow::Raise();
+#endif
+}
+
 void wxTopLevelWindowGTK::DoMoveWindow(int WXUNUSED(x), int WXUNUSED(y), int WXUNUSED(width), int WXUNUSED(height) )
 {
     wxFAIL_MSG( wxT("DoMoveWindow called for wxTopLevelWindowGTK") );

diff --git a/src/gtk1/toplevel.cpp b/src/gtk1/toplevel.cpp
index c5cbc54a40aeb2a750c09703897926ded776834a..fb7300af9dbb5a6ffefee59158edb6425e9dfaef 100644 (file)
--- a/src/gtk1/toplevel.cpp
+++ b/src/gtk1/toplevel.cpp
@@ -742,6 +742,15 @@ bool wxTopLevelWindowGTK::Show( bool show )
     return wxWindow::Show( show );
 }
 
+void wxTopLevelWindowGTK::Raise()
+{
+#ifdef __WXGTK20__
+    gtk_window_present( GTK_WINDOW( m_widget ) );
+#else
+    wxWindow::Raise();
+#endif
+}
+
 void wxTopLevelWindowGTK::DoMoveWindow(int WXUNUSED(x), int WXUNUSED(y), int WXUNUSED(width), int WXUNUSED(height) )
 {
     wxFAIL_MSG( wxT("DoMoveWindow called for wxTopLevelWindowGTK") );