Amebis/wxWidgets
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

always use wxSTAY_ON_TOP (closes #10447)

Browse Source 
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@58679 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
This commit is contained in:
Francesco Montorsi
2009-02-05 17:46:00 +00:00
parent 430bdeb55b
commit e12152104f
2 changed files with 5 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
interface/wx/busyinfo.h
View File

@@ -48,6 +48,9 @@
wxApp::Yield for more details). The simplest way to do it is to use wxApp::Yield for more details). The simplest way to do it is to use
wxWindowDisabler class as illustrated in the above example. 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} @library{wxcore}
@category{cmndlg} @category{cmndlg}
*/ */

8
src/generic/busyinfo.cpp
View File

@@ -43,7 +43,7 @@ wxInfoFrame::wxInfoFrame(wxWindow *parent, const wxString& message)
#else #else
wxSIMPLE_BORDER wxSIMPLE_BORDER
#endif #endif
| wxFRAME_TOOL_WINDOW) | wxFRAME_TOOL_WINDOW | wxSTAY_ON_TOP)
{ {
wxPanel *panel = new wxPanel( this ); wxPanel *panel = new wxPanel( this );
wxStaticText *text = new wxStaticText(panel, wxID_ANY, message); wxStaticText *text = new wxStaticText(panel, wxID_ANY, message);
@@ -115,12 +115,6 @@ wxInfoFrame::wxInfoFrame(wxWindow *parent, const wxString& message)
wxBusyInfo::wxBusyInfo(const wxString& message, wxWindow *parent) wxBusyInfo::wxBusyInfo(const wxString& message, wxWindow *parent)
{ {
m_InfoFrame = new wxInfoFrame(parent, message); 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->Show(true); m_InfoFrame->Show(true);
m_InfoFrame->Refresh(); m_InfoFrame->Refresh();
m_InfoFrame->Update(); m_InfoFrame->Update();