/[pcsx2_0.9.7]/trunk/3rdparty/wxWidgets/src/msw/main.cpp
ViewVC logotype

Diff of /trunk/3rdparty/wxWidgets/src/msw/main.cpp

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

revision 31 by william, Tue Sep 7 03:24:11 2010 UTC revision 62 by william, Tue Sep 7 11:08:22 2010 UTC
# Line 100  extern int wxEntryReal(int& argc, wxChar Line 100  extern int wxEntryReal(int& argc, wxChar
100    
101  // global pointer to exception information, only valid inside OnFatalException,  // global pointer to exception information, only valid inside OnFatalException,
102  // used by wxStackWalker and wxCrashReport  // used by wxStackWalker and wxCrashReport
103  extern EXCEPTION_POINTERS *wxGlobalSEInformation = NULL;  EXCEPTION_POINTERS *wxGlobalSEInformation = NULL;
104    
105  // flag telling us whether the application wants to handle exceptions at all  // flag telling us whether the application wants to handle exceptions at all
106  static bool gs_handleExceptions = false;  static bool gs_handleExceptions = false;
# Line 211  int wxEntry(int& argc, wxChar **argv) Line 211  int wxEntry(int& argc, wxChar **argv)
211      wxSEH_HANDLE(-1)      wxSEH_HANDLE(-1)
212  }  }
213    
214  #else // !wxUSE_ON_FATAL_EXCEPTION  // PCSX2: Moved this to inside the wxUSE_ON_FATAL_EXCEPTION condition --air
   
215  #if defined(__VISUALC__) && !defined(__WXWINCE__)  #if defined(__VISUALC__) && !defined(__WXWINCE__)
216    
217  static void  static void
218  wxSETranslator(unsigned int WXUNUSED(code), EXCEPTION_POINTERS * WXUNUSED(ep))  wxSETranslator(unsigned int WXUNUSED(code), EXCEPTION_POINTERS * WXUNUSED(ep))
219  {  {
220      // see wxSETranslator() version for wxUSE_ON_FATAL_EXCEPTION above          // see wxSETranslator() version for wxUSE_ON_FATAL_EXCEPTION above
221      throw;          throw;
222  }  }
223    
224  #endif // __VISUALC__  #endif // __VISUALC__
225    
226    #else // !wxUSE_ON_FATAL_EXCEPTION
227    
228  int wxEntry(int& argc, wxChar **argv)  int wxEntry(int& argc, wxChar **argv)
229  {  {
230      DisableAutomaticSETranslator();      DisableAutomaticSETranslator();

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

  ViewVC Help
Powered by ViewVC 1.1.22