handle actions of the columns popup menu in wxHeaderCtrl itself (but the derived...

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

diff --git a/include/wx/stackwalk.h b/include/wx/stackwalk.h
index 144dbd8e6d2288fa6c47d511cdf3196b90f9fb74..47805cd73854e9cbd3520c9ab7ea70161de08141 100644 (file)
--- a/include/wx/stackwalk.h
+++ b/include/wx/stackwalk.h
@@ -27,7 +27,7 @@ class WXDLLIMPEXP_BASE wxStackFrameBase
 private:
     // put this inline function here so that it is defined before use
     wxStackFrameBase *ConstCast() const
 private:
     // put this inline function here so that it is defined before use
     wxStackFrameBase *ConstCast() const

-        { return wx_const_cast(wxStackFrameBase *, this); }
+        { return const_cast<wxStackFrameBase *>(this); }

 
 public:
     wxStackFrameBase(size_t level, void *address = NULL)
 
 public:
     wxStackFrameBase(size_t level, void *address = NULL)


@@ -132,10 +132,12 @@ public:
     // notice that Walk() frame itself is not included if skip >= 1)
     virtual void Walk(size_t skip = 1, size_t maxDepth = 200) = 0;
 
     // notice that Walk() frame itself is not included if skip >= 1)
     virtual void Walk(size_t skip = 1, size_t maxDepth = 200) = 0;
 

+#if wxUSE_ON_FATAL_EXCEPTION

     // enumerate stack frames from the location of uncaught exception
     //
     // this version can only be called from wxApp::OnFatalException()
     // enumerate stack frames from the location of uncaught exception
     //
     // this version can only be called from wxApp::OnFatalException()

-    virtual void WalkFromException() = 0;
+    virtual void WalkFromException(size_t maxDepth = 200) = 0;
+#endif // wxUSE_ON_FATAL_EXCEPTION

 
 protected:
     // this function must be overrided to process the given frame
 
 protected:
     // this function must be overrided to process the given frame