X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/bbcdf8bc7ca806d8278c7cb6d09d5590378b67d8..6e0d9d43318af6b7865f1d07cd1b64f6eafd0c54:/include/wx/msw/app.h?ds=sidebyside

diff --git a/include/wx/msw/app.h b/include/wx/msw/app.h
index 0889410bf6..f299a952ea 100644
--- a/include/wx/msw/app.h
+++ b/include/wx/msw/app.h
@@ -18,6 +18,7 @@
 
 #include "wx/defs.h"
 #include "wx/object.h"
+#include "wx/event.h"
 
 class WXDLLEXPORT wxFrame;
 class WXDLLEXPORT wxWindow;
@@ -30,10 +31,6 @@ class WXDLLEXPORT wxLog;
 
 WXDLLEXPORT_DATA(extern wxApp*) wxTheApp;
 
-void WXDLLEXPORT wxCleanUp();
-void WXDLLEXPORT wxCommonCleanUp(); // Call this from the platform's wxCleanUp()
-void WXDLLEXPORT wxCommonInit();    // Call this from the platform's initialization
-
 // Force an exit from main loop
 void WXDLLEXPORT wxExit();
 
@@ -46,7 +43,7 @@ class WXDLLEXPORT wxApp: public wxEvtHandler
 {
   DECLARE_DYNAMIC_CLASS(wxApp)
   wxApp();
-  inline ~wxApp() {}
+  ~wxApp();
 
   static void SetInitializerFunction(wxAppInitializerFunction fn) { m_appInitFn = fn; }
   static wxAppInitializerFunction GetInitializerFunction() { return m_appInitFn; }
@@ -57,9 +54,11 @@ class WXDLLEXPORT wxApp: public wxEvtHandler
   virtual bool Pending() ;
   virtual void Dispatch() ;
 
-  virtual void OnIdle(wxIdleEvent& event);
+  void OnIdle(wxIdleEvent& event);
+  void OnEndSession(wxCloseEvent& event);
+  void OnQueryEndSession(wxCloseEvent& event);
 
-// Generic
+  // Generic
   virtual bool OnInit() { return FALSE; };
 
   // No specific tasks to do here.
@@ -69,6 +68,10 @@ class WXDLLEXPORT wxApp: public wxEvtHandler
   virtual int OnRun() { return MainLoop(); };
   virtual int OnExit() { return 0; }
 
+  // called when a fatal exception occurs, this function should take care not
+  // to do anything which might provoke a nested exception!
+  virtual void OnFatalException() { }
+
   inline void SetPrintMode(int mode) { m_printMode = mode; }
   inline int GetPrintMode() const { return m_printMode; }
 
@@ -131,11 +134,12 @@ protected:
 public:
 
   // Implementation
-  static bool Initialize(WXHINSTANCE instance);
-  static void CommonInit();
-  static bool RegisterWindowClasses();
+  static bool Initialize();
   static void CleanUp();
-  static void CommonCleanUp();
+
+  static bool RegisterWindowClasses();
+  // Convert Windows to argc, argv style
+  void ConvertToStandardCommandArgs(char* p);
   virtual bool DoMessage();
   virtual bool ProcessMessage(WXMSG* pMsg);
   void DeletePendingObjects();
@@ -148,8 +152,6 @@ public:
 
 protected:
   bool              m_keepGoing ;
-//  bool              m_resourceCollection;
-//  bool              m_pendingCleanup; // TRUE if we need to check the GDI object lists for cleanup
 
 DECLARE_EVENT_TABLE()
 };