haskal
/
kicad
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

kicad: keep KIDIALOG boxes above other windows 

Until answered, dialog boxes should remain at the front.  This flag only
works for MSW and GTK.
This commit is contained in:
Seth Hillbrand 2018-09-08 21:24:29 -07:00
parent ec33381064
commit 4eece522df
1 changed files with 8 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

13
common/confirm.cpp
View File

@ -44,7 +44,8 @@ static std::unordered_map<unsigned long, int> doNotShowAgainDlgs;
KIDIALOG::KIDIALOG( wxWindow* aParent, const wxString& aMessage, KIDIALOG::KIDIALOG( wxWindow* aParent, const wxString& aMessage,
const wxString& aCaption, long aStyle ) const wxString& aCaption, long aStyle )
: wxRichMessageDialog( aParent, aMessage, aCaption, aStyle | wxCENTRE ) : wxRichMessageDialog( aParent, aMessage, aCaption, aStyle | wxCENTRE | wxSTAY_ON_TOP ),
m_hash( 0 )
{ {
} }
@ -136,7 +137,7 @@ wxString KIDIALOG::getCaption( KD_TYPE aType, const wxString& aCaption )
long KIDIALOG::getStyle( KD_TYPE aType ) long KIDIALOG::getStyle( KD_TYPE aType )
{ {
long style = wxOK | wxCENTRE; long style = wxOK | wxCENTRE | wxSTAY_ON_TOP;
switch( aType ) switch( aType )
{ {
@ -235,7 +236,7 @@ void DisplayError( wxWindow* parent, const wxString& text, int displaytime )
int icon = displaytime > 0 ? wxICON_INFORMATION : wxICON_ERROR; int icon = displaytime > 0 ? wxICON_INFORMATION : wxICON_ERROR;
dialog = new wxMessageDialog( parent, text, _( "Warning" ), dialog = new wxMessageDialog( parent, text, _( "Warning" ),
wxOK | wxCENTRE | wxRESIZE_BORDER | icon ); wxOK | wxCENTRE | wxRESIZE_BORDER | icon | wxSTAY_ON_TOP );
dialog->ShowModal(); dialog->ShowModal();
dialog->Destroy(); dialog->Destroy();
@ -247,7 +248,8 @@ void DisplayErrorMessage( wxWindow* aParent, const wxString& aText, const wxStri
wxRichMessageDialog* dlg; wxRichMessageDialog* dlg;
dlg = new wxRichMessageDialog( aParent, aText, _( "Error" ), dlg = new wxRichMessageDialog( aParent, aText, _( "Error" ),
wxOK | wxCENTRE | wxRESIZE_BORDER | wxICON_ERROR ); wxOK | wxCENTRE | wxRESIZE_BORDER |
wxICON_ERROR | wxSTAY_ON_TOP );
if( !aExtraInfo.IsEmpty() ) if( !aExtraInfo.IsEmpty() )
{ {
@ -264,7 +266,8 @@ void DisplayInfoMessage( wxWindow* aParent, const wxString& aMessage, const wxSt
wxRichMessageDialog* dlg; wxRichMessageDialog* dlg;
dlg = new wxRichMessageDialog( aParent, aMessage, _( "Info" ), dlg = new wxRichMessageDialog( aParent, aMessage, _( "Info" ),
wxOK | wxCENTRE | wxRESIZE_BORDER | wxICON_INFORMATION ); wxOK | wxCENTRE | wxRESIZE_BORDER |
wxICON_INFORMATION | wxSTAY_ON_TOP );
if( !aExtraInfo.IsEmpty() ) if( !aExtraInfo.IsEmpty() )
{ {