all delete functions now send delete notification event

[wxWidgets.git] / include / wx / msw / app.h

diff --git a/include/wx/msw/app.h b/include/wx/msw/app.h
index 54b58a4ee9cd90b5f85802e07fea6ae3c9d2c172..e319a318a19e7e6f42c83928388703c042628d47 100644 (file)
--- a/include/wx/msw/app.h
+++ b/include/wx/msw/app.h
@@ -5,12 +5,12 @@
 // Modified by:
 // Created:     01/02/97
 // RCS-ID:      $Id$
 // Modified by:
 // Created:     01/02/97
 // RCS-ID:      $Id$

-// Copyright:   (c) Julian Smart and Markus Holzem
-// Licence:     wxWindows license
+// Copyright:   (c) Julian Smart
+// Licence:     wxWindows licence

 /////////////////////////////////////////////////////////////////////////////
 
 /////////////////////////////////////////////////////////////////////////////
 

-#ifndef __APPH__
-#define __APPH__
+#ifndef _WX_APP_H_
+#define _WX_APP_H_

 
 #ifdef __GNUG__
 #pragma interface "app.h"
 
 #ifdef __GNUG__
 #pragma interface "app.h"


@@ -30,10 +30,6 @@ class WXDLLEXPORT wxLog;
 
 WXDLLEXPORT_DATA(extern wxApp*) wxTheApp;
 
 
 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();
 
 // Force an exit from main loop
 void WXDLLEXPORT wxExit();
 


@@ -46,7 +42,7 @@ class WXDLLEXPORT wxApp: public wxEvtHandler
 {
   DECLARE_DYNAMIC_CLASS(wxApp)
   wxApp();
 {
   DECLARE_DYNAMIC_CLASS(wxApp)
   wxApp();

-  inline ~wxApp() {}
+  ~wxApp();

 
   static void SetInitializerFunction(wxAppInitializerFunction fn) { m_appInitFn = fn; }
   static wxAppInitializerFunction GetInitializerFunction() { return m_appInitFn; }
 
   static void SetInitializerFunction(wxAppInitializerFunction fn) { m_appInitFn = fn; }
   static wxAppInitializerFunction GetInitializerFunction() { return m_appInitFn; }


@@ -57,9 +53,11 @@ class WXDLLEXPORT wxApp: public wxEvtHandler
   virtual bool Pending() ;
   virtual void Dispatch() ;
 
   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.
   virtual bool OnInit() { return FALSE; };
 
   // No specific tasks to do here.


@@ -69,6 +67,10 @@ class WXDLLEXPORT wxApp: public wxEvtHandler
   virtual int OnRun() { return MainLoop(); };
   virtual int OnExit() { return 0; }
 
   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; }
 
   inline void SetPrintMode(int mode) { m_printMode = mode; }
   inline int GetPrintMode() const { return m_printMode; }
 


@@ -131,11 +133,12 @@ protected:
 public:
 
   // Implementation
 public:
 
   // Implementation

-  static bool Initialize(WXHINSTANCE instance);
-  static void CommonInit();
-  static bool RegisterWindowClasses();
+  static bool Initialize();

   static void CleanUp();
   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();
   virtual bool DoMessage();
   virtual bool ProcessMessage(WXMSG* pMsg);
   void DeletePendingObjects();


@@ -148,8 +151,6 @@ public:
 
 protected:
   bool              m_keepGoing ;
 
 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()
 };
 
 DECLARE_EVENT_TABLE()
 };


@@ -162,5 +163,5 @@ int WXDLLEXPORT wxEntry(WXHINSTANCE hInstance);
 #endif
 
 #endif
 #endif
 
 #endif

-    // __APPH__
+    // _WX_APP_H_