mirror of
https://github.com/PCSX2/pcsx2.git
synced 2026-10-15 07:20:54 +02:00
common: reorganize
This commit is contained in:
1 parent
ce8a30bf8f
commit
8fdaaa2eab
239 files changed
+559
-1145
No files matched your search
@@ -0,0 +1,84 @@
|
||||
/* PCSX2 - PS2 Emulator for PCs
|
||||
* Copyright (C) 2002-2010 PCSX2 Dev Team
|
||||
*
|
||||
* PCSX2 is free software: you can redistribute it and/or modify it under the terms
|
||||
* of the GNU Lesser General Public License as published by the Free Software Found-
|
||||
* ation, either version 3 of the License, or (at your option) any later version.
|
||||
*
|
||||
* PCSX2 is distributed in the hope that it will be useful, but WITHOUT ANY WARRANTY;
|
||||
* without even the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR
|
||||
* PURPOSE. See the GNU General Public License for more details.
|
||||
*
|
||||
* You should have received a copy of the GNU General Public License along with PCSX2.
|
||||
* If not, see <http://www.gnu.org/licenses/>.
|
||||
*/
|
||||
|
||||
#include "common/ThreadingDialogs.h"
|
||||
#include "common/pxStaticText.h"
|
||||
|
||||
using namespace pxSizerFlags;
|
||||
|
||||
wxDEFINE_EVENT(pxEvt_ThreadedTaskComplete, wxCommandEvent);
|
||||
|
||||
// --------------------------------------------------------------------------------------
|
||||
// WaitForTaskDialog Implementations
|
||||
// --------------------------------------------------------------------------------------
|
||||
wxIMPLEMENT_DYNAMIC_CLASS(WaitForTaskDialog, wxDialogWithHelpers);
|
||||
|
||||
Threading::WaitForTaskDialog::WaitForTaskDialog(const wxString &title, const wxString &heading)
|
||||
: wxDialogWithHelpers(NULL, _("Waiting for tasks..."))
|
||||
//, m_Timer(this)
|
||||
{
|
||||
SetMinWidth(300);
|
||||
|
||||
//m_sem = sem;
|
||||
//m_mutex = mutex;
|
||||
|
||||
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;
|
||||
|
||||
Bind(pxEvt_ThreadedTaskComplete, &WaitForTaskDialog::OnTaskComplete, this);
|
||||
|
||||
*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.
|
||||
|
||||
//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 ) );
|
||||
}
|
||||
|
||||
void Threading::WaitForTaskDialog::OnTaskComplete(wxCommandEvent &evt)
|
||||
{
|
||||
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.
|
||||
|
||||
// (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);
|
||||
}
|
||||
|
||||
int Threading::WaitForTaskDialog::ShowModal()
|
||||
{
|
||||
int result = _parent::ShowModal();
|
||||
m_sync.RethrowException();
|
||||
return result;
|
||||
}
|
||||
Reference in new issue
Block a user