fix for HP aCC

[wxWidgets.git] / include / wx / memory.h

diff --git a/include/wx/memory.h b/include/wx/memory.h
index def1b7345835ba788a06b87f2471de6712e725b4..3291e38eb6f6f9694d99f284b141168362a5293e 100644 (file)
--- a/include/wx/memory.h
+++ b/include/wx/memory.h
@@ -207,6 +207,9 @@ public:
 
 typedef void (wxMemStruct::*PmSFV) ();
 
 
 typedef void (wxMemStruct::*PmSFV) ();
 

+// Type of the app function that can be installed and called at wxWidgets shutdown
+// (after all other registered files with global destructors have been closed down).
+typedef void (*wxShutdownNotifyFunction)();

 
 /*
   Debugging class. This will only have a single instance, but it's
 
 /*
   Debugging class. This will only have a single instance, but it's


@@ -307,6 +310,8 @@ public:
     // This function is used to output the dump
     static void OutputDumpLine(const wxChar *szFormat, ...);
 
     // This function is used to output the dump
     static void OutputDumpLine(const wxChar *szFormat, ...);
 

+    static void SetShutdownNotifyFunction(wxShutdownNotifyFunction shutdownFn);
+

 private:
     // Store these here to allow access to the list without
     // needing to have a wxMemStruct object.
 private:
     // Store these here to allow access to the list without
     // needing to have a wxMemStruct object.


@@ -316,23 +321,25 @@ private:
     // Set to false if we're not checking all previous nodes when
     // we do a new. Set to true when we are.
     static bool                 m_checkPrevious;
     // Set to false if we're not checking all previous nodes when
     // we do a new. Set to true when we are.
     static bool                 m_checkPrevious;

+
+    // Holds a pointer to an optional application function to call at shutdown.
+    static wxShutdownNotifyFunction sm_shutdownFn;
+
+    // Have to access our shutdown hook
+    friend class wxDebugContextDumpDelayCounter;

 };
 
 // Final cleanup (e.g. deleting the log object and doing memory leak checking)
 // will be delayed until all wxDebugContextDumpDelayCounter objects have been
 // destructed. Adding one wxDebugContextDumpDelayCounter per file will delay
 // memory leak checking until after destructing all global objects.
 };
 
 // Final cleanup (e.g. deleting the log object and doing memory leak checking)
 // will be delayed until all wxDebugContextDumpDelayCounter objects have been
 // destructed. Adding one wxDebugContextDumpDelayCounter per file will delay
 // memory leak checking until after destructing all global objects.

+

 class WXDLLIMPEXP_BASE wxDebugContextDumpDelayCounter
 {
 public:
 class WXDLLIMPEXP_BASE wxDebugContextDumpDelayCounter
 {
 public:

-    wxDebugContextDumpDelayCounter() {
-        sm_count++;
-    }
-
-    ~wxDebugContextDumpDelayCounter() {
-        sm_count--;
-        if(!sm_count) DoDump();
-    }
+    wxDebugContextDumpDelayCounter();
+    ~wxDebugContextDumpDelayCounter();
+

 private:
     void DoDump();
     static int sm_count;
 private:
     void DoDump();
     static int sm_count;