VeraCrypt
aboutsummaryrefslogtreecommitdiff
path: root/src/Main/Forms/WaitDialog.h
diff options
context:
space:
mode:
authorMounir IDRASSI <mounir.idrassi@idrix.fr>2016-05-10 22:34:27 +0200
committerMounir IDRASSI <mounir.idrassi@idrix.fr>2016-05-10 22:34:27 +0200
commit268ef2d8e904db5068dbdc0fdc7ce3940d6452ea (patch)
treeb1afa687c97fbf5e1ba2c92c5a10479ae5f832f5 /src/Main/Forms/WaitDialog.h
parent6d61f06a5348aebe7dbc0bf44d3e2729c20f7fd0 (diff)
parent5f47d8b6f11cdb3c4c2f43e04e5acfc6ffcb3035 (diff)
downloadVeraCrypt-268ef2d8e904db5068dbdc0fdc7ce3940d6452ea.tar.gz
VeraCrypt-268ef2d8e904db5068dbdc0fdc7ce3940d6452ea.zip
Merge pull request #61 from davidfoerster/normalize-line-terminators
Normalize line terminators
Diffstat (limited to 'src/Main/Forms/WaitDialog.h')
-rw-r--r--src/Main/Forms/WaitDialog.h24
1 files changed, 12 insertions, 12 deletions
diff --git a/src/Main/Forms/WaitDialog.h b/src/Main/Forms/WaitDialog.h
index a33e7e5a..e9c9fa3a 100644
--- a/src/Main/Forms/WaitDialog.h
+++ b/src/Main/Forms/WaitDialog.h
@@ -21,7 +21,7 @@ namespace VeraCrypt
DECLARE_LOCAL_EVENT_TYPE(wxEVT_COMMAND_WAITDIALOG_ADMIN_PASSWORD, -1);
DECLARE_LOCAL_EVENT_TYPE(wxEVT_COMMAND_WAITDIALOG_PIN, -1);
DECLARE_LOCAL_EVENT_TYPE(wxEVT_COMMAND_WAITDIALOG_SHOW_MSG, -1);
-
+
class WaitDialog;
@@ -31,12 +31,12 @@ namespace VeraCrypt
public:
WaitThread(WaitDialog *handler, WaitThreadRoutine* pRoutine) : wxThread(wxTHREAD_DETACHED), m_pRoutine(pRoutine)
{
- m_pHandler = handler;
+ m_pHandler = handler;
}
~WaitThread()
- {
+ {
}
-
+
protected:
virtual ExitCode Entry();
WaitDialog *m_pHandler;
@@ -46,7 +46,7 @@ namespace VeraCrypt
class WaitDialog : public WaitDialogBase, public WaitThreadUI
{
public:
- WaitDialog (wxWindow *parent, const wxString& label, WaitThreadRoutine* pRoutine)
+ WaitDialog (wxWindow *parent, const wxString& label, WaitThreadRoutine* pRoutine)
: WaitDialogBase(parent), WaitThreadUI(pRoutine), m_timer (this)
{
WaitStaticText->SetLabel (label);
@@ -58,11 +58,11 @@ namespace VeraCrypt
Connect( wxID_ANY, wxEVT_COMMAND_WAITDIALOG_ADMIN_PASSWORD, wxCommandEventHandler( WaitDialog::OnAdminPasswordRequest ) );
Connect( wxID_ANY, wxEVT_COMMAND_WAITDIALOG_PIN, wxCommandEventHandler( WaitDialog::OnPinRequest ) );
Connect( wxID_ANY, wxEVT_COMMAND_WAITDIALOG_SHOW_MSG, wxCommandEventHandler( WaitDialog::OnShowMsg ) );
-
+
Connect( wxEVT_TIMER, wxTimerEventHandler( WaitDialog::OnProgressTimer ), NULL, this );
m_thread = new WaitThread(this, pRoutine);
}
-
+
~WaitDialog()
{
Disconnect( wxEVT_TIMER, wxTimerEventHandler( WaitDialog::OnProgressTimer ));
@@ -73,7 +73,7 @@ namespace VeraCrypt
}
virtual void OnWaitDialogInit( wxInitDialogEvent& event )
- {
+ {
m_thread->Run();
m_timer.Start(100);
}
@@ -114,7 +114,7 @@ namespace VeraCrypt
wxQueueEvent (this, pEvent);
m_queue.Receive (sResult);
sResult.ToLong(&lResult);
- }
+ }
return (int) lResult;
}
@@ -143,7 +143,7 @@ namespace VeraCrypt
else
pin = wxT("");
}
-
+
// virtual void OnWaitDialogClose( wxCloseEvent& event ) { }
void OnThreadCompletion(wxCommandEvent &)
{
@@ -187,10 +187,10 @@ namespace VeraCrypt
}
int iResult = wxMessageBox (pParam->m_message, pParam->m_caption, pParam->m_style, this);
- delete pParam;
+ delete pParam;
m_queue.Post(wxString::Format(wxT("%d"), iResult));
}
-
+
void OnProgressTimer(wxTimerEvent& event)
{
WaitProgessBar->Pulse();