memory debugging using VC++ debug CRT works for DLL wxWin builds as well.

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

diff --git a/include/wx/msw/app.h b/include/wx/msw/app.h
index 35719e920692267b01997347565aaf455b5af646..f299a952ea6f0abc6da1c16d459b475f54d02be9 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"


@@ -18,6 +18,7 @@
 
 #include "wx/defs.h"
 #include "wx/object.h"
 
 #include "wx/defs.h"
 #include "wx/object.h"

+#include "wx/event.h"

 
 class WXDLLEXPORT wxFrame;
 class WXDLLEXPORT wxWindow;
 
 class WXDLLEXPORT wxFrame;
 class WXDLLEXPORT wxWindow;


@@ -25,19 +26,11 @@ class WXDLLEXPORT wxApp ;
 class WXDLLEXPORT wxKeyEvent;
 class WXDLLEXPORT wxLog;
 
 class WXDLLEXPORT wxKeyEvent;
 class WXDLLEXPORT wxLog;
 

-#if USE_WXCONFIG
-  class WXDLLEXPORT wxConfig;
-#endif //USE_WXCONFIG 
-

 #define wxPRINT_WINDOWS         1
 #define wxPRINT_POSTSCRIPT      2
 
 WXDLLEXPORT_DATA(extern wxApp*) wxTheApp;
 
 #define wxPRINT_WINDOWS         1
 #define wxPRINT_POSTSCRIPT      2
 
 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();
 


@@ -50,7 +43,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; }


@@ -61,9 +54,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.


@@ -71,7 +66,12 @@ class WXDLLEXPORT wxApp: public wxEvtHandler
 
   // Called to set off the main loop
   virtual int OnRun() { return MainLoop(); };
 
   // Called to set off the main loop
   virtual int OnRun() { return MainLoop(); };

-  virtual int OnExit() { return 0; };
+  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; }
 


@@ -87,6 +87,10 @@ class WXDLLEXPORT wxApp: public wxEvtHandler
   inline void SetAppName(const wxString& name) { m_appName = name; };
   inline wxString GetClassName() const { return m_className; }
   inline void SetClassName(const wxString& name) { m_className = name; }
   inline void SetAppName(const wxString& name) { m_appName = name; };
   inline wxString GetClassName() const { return m_className; }
   inline void SetClassName(const wxString& name) { m_className = name; }

+
+  void SetVendorName(const wxString& vendorName) { m_vendorName = vendorName; }
+  const wxString& GetVendorName() const { return m_vendorName; }
+

   wxWindow *GetTopWindow() const ;
   inline void SetTopWindow(wxWindow *win) { m_topWindow = win; }
 
   wxWindow *GetTopWindow() const ;
   inline void SetTopWindow(wxWindow *win) { m_topWindow = win; }
 


@@ -107,12 +111,6 @@ class WXDLLEXPORT wxApp: public wxEvtHandler
   // Creates a log object
   virtual wxLog* CreateLogTarget();
 
   // Creates a log object
   virtual wxLog* CreateLogTarget();
 

-#if USE_WXCONFIG
-  // override this function to create a global wxConfig object of different
-  // than default type (right now the default implementation returns NULL)
-  virtual wxConfig* CreateConfig() { return NULL; }
-#endif //USE_WXCONFIG 
-

 public:
 //  void (*work_proc)(wxApp*app); // work procedure;
   int               argc;
 public:
 //  void (*work_proc)(wxApp*app); // work procedure;
   int               argc;


@@ -121,7 +119,8 @@ public:
 protected:
   bool              m_wantDebugOutput ;
   wxString          m_className;
 protected:
   bool              m_wantDebugOutput ;
   wxString          m_className;

-  wxString          m_appName;
+  wxString          m_appName,
+                    m_vendorName;

   wxWindow *        m_topWindow;
   bool              m_exitOnFrameDelete;
   bool              m_showOnInit;
   wxWindow *        m_topWindow;
   bool              m_exitOnFrameDelete;
   bool              m_showOnInit;


@@ -135,11 +134,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();


@@ -152,8 +152,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()
 };


@@ -166,5 +164,5 @@ int WXDLLEXPORT wxEntry(WXHINSTANCE hInstance);
 #endif
 
 #endif
 #endif
 
 #endif

-    // __APPH__
+    // _WX_APP_H_