always use wxSTAY_ON_TOP (closes #10447)

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

diff --git a/interface/wx/busyinfo.h b/interface/wx/busyinfo.h
index 287f8371e6a38ad8e847fb235dadf1e046023634..3600c987addb7b63742924757c27060370e25441 100644 (file)
--- a/interface/wx/busyinfo.h
+++ b/interface/wx/busyinfo.h
@@ -48,6 +48,9 @@
     wxApp::Yield for more details). The simplest way to do it is to use
     wxWindowDisabler class as illustrated in the above example.
 
+    Note that a wxBusyInfo is always built with the @c wxSTAY_ON_TOP window style
+    (see wxFrame window styles for more info).
+
     @library{wxcore}
     @category{cmndlg}
 */

diff --git a/src/generic/busyinfo.cpp b/src/generic/busyinfo.cpp
index ca53631e333129b4e961168562176cb2ee387b6d..cf767882c5dedf8c96de874f3c24c0f95433897d 100644 (file)
--- a/src/generic/busyinfo.cpp
+++ b/src/generic/busyinfo.cpp
@@ -43,7 +43,7 @@ wxInfoFrame::wxInfoFrame(wxWindow *parent, const wxString& message)
 #else
                      wxSIMPLE_BORDER
 #endif
-                     | wxFRAME_TOOL_WINDOW)
+                     | wxFRAME_TOOL_WINDOW | wxSTAY_ON_TOP)
 {
     wxPanel *panel = new wxPanel( this );
     wxStaticText *text = new wxStaticText(panel, wxID_ANY, message);
@@ -114,13 +114,7 @@ wxInfoFrame::wxInfoFrame(wxWindow *parent, const wxString& message)
 
 wxBusyInfo::wxBusyInfo(const wxString& message, wxWindow *parent)
 {
-    m_InfoFrame = new wxInfoFrame( parent, message);
-    if ( parent && parent->HasFlag(wxSTAY_ON_TOP) )
-    {
-        // we must have this flag to be in front of our parent if it has it
-        m_InfoFrame->SetWindowStyleFlag(wxSTAY_ON_TOP);
-    }
-
+    m_InfoFrame = new wxInfoFrame(parent, message);
     m_InfoFrame->Show(true);
     m_InfoFrame->Refresh();
     m_InfoFrame->Update();