mirror of
https://github.com/PCSX2/pcsx2.git
synced 2026-10-15 07:20:54 +02:00
Common: reformat (#4720)
* common: format AlignedMalloc.cpp * common: format AppTrait.h * common: format Assertions.h * common: format CheckedStaticBox * common: format Console * common: format Dependencies.h * common: format EmbeddedImage * common: format EventSource * common: format Exceptions * common: format FastFormatString.cpp * common: format General.h * common: format InitInterface * common: format MathUtils.h * common: format MemsetFast/MemcpyFast * common: format Mutex.cpp * common: format PageFaultSource.h * common: format Path.h * common: format PathUtils.cpp * common: format Pcsx2Types.h * common: format Perf * common: format PersistentThread.h * common: format RwMutex * common: format SafeArray * common: format ScopedAlloc.h * common: format ScopedPtrMT.h * common: format Semaphore.cpp * common: format StringHelpers * common: format ThreadTools.cpp * common: format Threading.h * common: format ThreadingDialogs * common: format ThreadingInternal.h * common: format TraceLog.h * common: format VirtualMemory.cpp * common: format pxCheckBox * common: format pxEvents.h * common: format pxForwardDefs.h * common: format pxRadioPanel * common: format pxStaticText * common: format pxStreams * common: format pxTranslate.cpp * common: format pxWindowTextWriter.cpp * common: format wxAppWithHelpers * common: format wxBaseTools.h * common: format wxGuiTools * common: format wxHelpers.cpp * common: format Darwin directory * common: format Linux directory * common: format Windows directory * common: format LnxCpuDetect.cpp * common: format WinCpuDetect.cpp * common: format bmi.cpp * common: format cpudetect.cpp * common: format cpu_detect_internal.h * common: format fpu.cpp * common: format groups.cpp * common: format instructions.h * common: format internal.h * common: format jmp.cpp * common: format legacy.cpp * common: format legacy_instructions.h * common: format legacy_internal.h * common: format movs.cpp * common: format simd.cpp * common: format tools.h * common: format x86emitter.cpp * common: format x86types.h * common: format bmi.h * common: format dwshift.h * common: format group1.h group2.h group3.h * common: format incdec.h * common: format jmpcall.h * common: format movs.h * common: format simd_arithmetic.h * common: format simd_comparisons.h * common: format simd_helpers.h * common: format simd_moremovs.h * common: format simd_shufflepack.h * common: format simd_templated_helpers.h * common: format test.h
This commit is contained in:
Kojin authored and GitHub committed
1 parent
f9bf87f50d
commit
13dfceff48
102 files changed
+13189
-12692
No files matched your search
+36
-36
@@ -25,60 +25,60 @@ wxDEFINE_EVENT(pxEvt_ThreadedTaskComplete, wxCommandEvent);
|
||||
// --------------------------------------------------------------------------------------
|
||||
wxIMPLEMENT_DYNAMIC_CLASS(WaitForTaskDialog, wxDialogWithHelpers);
|
||||
|
||||
Threading::WaitForTaskDialog::WaitForTaskDialog(const wxString &title, const wxString &heading)
|
||||
: wxDialogWithHelpers(NULL, _("Waiting for tasks..."))
|
||||
Threading::WaitForTaskDialog::WaitForTaskDialog(const wxString& title, const wxString& heading)
|
||||
: wxDialogWithHelpers(NULL, _("Waiting for tasks..."))
|
||||
//, m_Timer(this)
|
||||
{
|
||||
SetMinWidth(300);
|
||||
SetMinWidth(300);
|
||||
|
||||
//m_sem = sem;
|
||||
//m_mutex = mutex;
|
||||
//m_sem = sem;
|
||||
//m_mutex = mutex;
|
||||
|
||||
wxString m_title(title);
|
||||
wxString m_heading(heading);
|
||||
wxString m_title(title);
|
||||
wxString m_heading(heading);
|
||||
|
||||
if (m_title.IsEmpty())
|
||||
m_title = _("Waiting for task...");
|
||||
if (m_heading.IsEmpty())
|
||||
m_heading = m_title;
|
||||
if (m_title.IsEmpty())
|
||||
m_title = _("Waiting for task...");
|
||||
if (m_heading.IsEmpty())
|
||||
m_heading = m_title;
|
||||
|
||||
Bind(pxEvt_ThreadedTaskComplete, &WaitForTaskDialog::OnTaskComplete, this);
|
||||
Bind(pxEvt_ThreadedTaskComplete, &WaitForTaskDialog::OnTaskComplete, this);
|
||||
|
||||
*this += 12;
|
||||
*this += Heading(m_heading).Unwrapped() | StdExpand();
|
||||
*this += 12;
|
||||
*this += 12;
|
||||
*this += Heading(m_heading).Unwrapped() | StdExpand();
|
||||
*this += 12;
|
||||
|
||||
// TODO : Implement a cancel button. Not quite sure the best way to do
|
||||
// that, since it requires a thread or event handler context, or something.
|
||||
// TODO : Implement a cancel button. Not quite sure the best way to do
|
||||
// that, since it requires a thread or event handler context, or something.
|
||||
|
||||
//applyDlg += new wxButton( &applyDlg, wxID_CANCEL ) | pxCenter;
|
||||
//applyDlg += 6;
|
||||
//applyDlg += new wxButton( &applyDlg, wxID_CANCEL ) | pxCenter;
|
||||
//applyDlg += 6;
|
||||
|
||||
//Bind(wxEVT_TIMER, &WaitForTaskDialog::OnTimer, this, m_Timer.GetId());
|
||||
//m_Timer.Start( 200 );
|
||||
//GetSysExecutorThread().PostEvent( new SysExecEvent_ApplyPlugins( this, m_sync ) );
|
||||
//Bind(wxEVT_TIMER, &WaitForTaskDialog::OnTimer, this, m_Timer.GetId());
|
||||
//m_Timer.Start( 200 );
|
||||
//GetSysExecutorThread().PostEvent( new SysExecEvent_ApplyPlugins( this, m_sync ) );
|
||||
}
|
||||
|
||||
void Threading::WaitForTaskDialog::OnTaskComplete(wxCommandEvent &evt)
|
||||
void Threading::WaitForTaskDialog::OnTaskComplete(wxCommandEvent& evt)
|
||||
{
|
||||
evt.Skip();
|
||||
evt.Skip();
|
||||
|
||||
// Note: we don't throw exceptions from the pending task here.
|
||||
// Instead we wait until we exit the modal loop below -- this gives
|
||||
// the caller a chance to handle the exception themselves, and if
|
||||
// not the exception will still fall back on the standard app-level
|
||||
// exception handler.
|
||||
// Note: we don't throw exceptions from the pending task here.
|
||||
// Instead we wait until we exit the modal loop below -- this gives
|
||||
// the caller a chance to handle the exception themselves, and if
|
||||
// not the exception will still fall back on the standard app-level
|
||||
// exception handler.
|
||||
|
||||
// (this also avoids any sticky business with the modal dialog not getting
|
||||
// closed out right due to stack unwinding skipping dialog closure crap)
|
||||
// (this also avoids any sticky business with the modal dialog not getting
|
||||
// closed out right due to stack unwinding skipping dialog closure crap)
|
||||
|
||||
m_sync.WaitForResult_NoExceptions();
|
||||
EndModal(wxID_OK);
|
||||
m_sync.WaitForResult_NoExceptions();
|
||||
EndModal(wxID_OK);
|
||||
}
|
||||
|
||||
int Threading::WaitForTaskDialog::ShowModal()
|
||||
{
|
||||
int result = _parent::ShowModal();
|
||||
m_sync.RethrowException();
|
||||
return result;
|
||||
int result = _parent::ShowModal();
|
||||
m_sync.RethrowException();
|
||||
return result;
|
||||
}
|
||||
Reference in new issue
Block a user