Remove confirms dependence on pgm_base and unused header
This commit is contained in:
parent
1c11a599c8
commit
eb84c29414
|
@ -28,10 +28,8 @@
|
||||||
#include <wx/choicdlg.h>
|
#include <wx/choicdlg.h>
|
||||||
#include <wx/crt.h>
|
#include <wx/crt.h>
|
||||||
#include <confirm.h>
|
#include <confirm.h>
|
||||||
#include <dialogs/html_message_box.h>
|
|
||||||
#include <functional>
|
#include <functional>
|
||||||
#include <unordered_map>
|
#include <unordered_map>
|
||||||
#include <pgm_base.h>
|
|
||||||
|
|
||||||
// Set of dialogs that have been chosen not to be shown again
|
// Set of dialogs that have been chosen not to be shown again
|
||||||
static std::unordered_map<unsigned long, int> doNotShowAgainDlgs;
|
static std::unordered_map<unsigned long, int> doNotShowAgainDlgs;
|
||||||
|
@ -287,7 +285,7 @@ void DisplayError( wxWindow* aParent, const wxString& aText, int aDisplayTime )
|
||||||
return;
|
return;
|
||||||
}
|
}
|
||||||
|
|
||||||
if( !Pgm().IsGUI() )
|
if( !wxTheApp->IsGUI() )
|
||||||
{
|
{
|
||||||
wxFprintf( stderr, aText );
|
wxFprintf( stderr, aText );
|
||||||
return;
|
return;
|
||||||
|
@ -312,7 +310,7 @@ void DisplayErrorMessage( wxWindow* aParent, const wxString& aText, const wxStri
|
||||||
return;
|
return;
|
||||||
}
|
}
|
||||||
|
|
||||||
if( !Pgm().IsGUI() )
|
if( !wxTheApp->IsGUI() )
|
||||||
{
|
{
|
||||||
wxFprintf( stderr, aText );
|
wxFprintf( stderr, aText );
|
||||||
return;
|
return;
|
||||||
|
@ -339,7 +337,7 @@ void DisplayInfoMessage( wxWindow* aParent, const wxString& aMessage, const wxSt
|
||||||
return;
|
return;
|
||||||
}
|
}
|
||||||
|
|
||||||
if( !Pgm().IsGUI() )
|
if( !wxTheApp->IsGUI() )
|
||||||
{
|
{
|
||||||
wxFprintf( stdout, "%s %s", aMessage, aExtraInfo );
|
wxFprintf( stdout, "%s %s", aMessage, aExtraInfo );
|
||||||
return;
|
return;
|
||||||
|
|
Loading…
Reference in New Issue