/[pcsx2_0.9.7]/trunk/common/src/Utilities/wxAppWithHelpers.cpp
ViewVC logotype

Diff of /trunk/common/src/Utilities/wxAppWithHelpers.cpp

Parent Directory Parent Directory | Revision Log Revision Log | View Patch Patch

revision 62 by william, Tue Sep 7 11:08:22 2010 UTC revision 273 by william, Fri Nov 12 01:10:22 2010 UTC
# Line 145  void pxActionEvent::SetException( const Line 145  void pxActionEvent::SetException( const
145    
146  void pxActionEvent::SetException( BaseException* ex )  void pxActionEvent::SetException( BaseException* ex )
147  {  {
148          const wxString& prefix( wxsFormat(L"(%s) ", GetClassInfo()->GetClassName()) );          const wxString& prefix( pxsFmt(L"(%s) ", GetClassInfo()->GetClassName()) );
149          ex->DiagMsg() = prefix + ex->DiagMsg();          ex->DiagMsg() = prefix + ex->DiagMsg();
150    
151          if( !m_state )          if( !m_state )
152          {          {
153                  ScopedPtr<BaseException> exptr( ex );           // auto-delete it after handling.                  ScopedExcept exptr( ex );               // auto-delete it after handling.
154                  ex->Rethrow();                  ex->Rethrow();
155          }          }
156    
# Line 209  void pxSynchronousCommandEvent::SetExcep Line 209  void pxSynchronousCommandEvent::SetExcep
209  {  {
210          if( !m_sync )          if( !m_sync )
211          {          {
212                  ScopedPtr<BaseException> exptr( ex );           // auto-delete it after handling.                  ScopedExcept exptr( ex );               // auto-delete it after handling.
213                  ex->Rethrow();                  ex->Rethrow();
214          }          }
215    
# Line 278  pxExceptionEvent::pxExceptionEvent( cons Line 278  pxExceptionEvent::pxExceptionEvent( cons
278    
279  void pxExceptionEvent::InvokeEvent()  void pxExceptionEvent::InvokeEvent()
280  {  {
281          ScopedPtr<BaseException> deleteMe( m_except );          ScopedExcept deleteMe( m_except );
282          if( deleteMe ) deleteMe->Rethrow();          if( deleteMe ) deleteMe->Rethrow();
283  }  }
284    

Legend:
Removed from v.62  
changed lines
  Added in v.273

  ViewVC Help
Powered by ViewVC 1.1.22