made wxCommandEvent::GetInt() return int, not long (patch 1473771)

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

diff --git a/include/wx/stackwalk.h b/include/wx/stackwalk.h
index 5e8beacc91d14e72b9ec75bac049684a1a86f300..298317ef7df7e6a2608f2fd4d18a924d453a3898 100644 (file)
--- a/include/wx/stackwalk.h
+++ b/include/wx/stackwalk.h
@@ -54,6 +54,9 @@ public:
     // return the instruction pointer offset from the start of the function
     size_t GetOffset() const { ConstCast()->OnGetName(); return m_offset; }
 
     // return the instruction pointer offset from the start of the function
     size_t GetOffset() const { ConstCast()->OnGetName(); return m_offset; }
 

+    // get the module this function belongs to (not always available)
+    wxString GetModule() const { ConstCast()->OnGetName(); return m_module; }
+

 
     // return true if we have the filename and line number for this frame
     bool HasSourceLocation() const { return !GetFileName().empty(); }
 
     // return true if we have the filename and line number for this frame
     bool HasSourceLocation() const { return !GetFileName().empty(); }


@@ -101,7 +104,9 @@ protected:
     size_t m_level;
 
     wxString m_name,
     size_t m_level;
 
     wxString m_name,

+             m_module,

              m_filename;
              m_filename;

+

     size_t m_line;
 
     void *m_address;
     size_t m_line;
 
     void *m_address;


@@ -118,6 +123,9 @@ public:
     // ctor does nothing, use Walk() to walk the stack
     wxStackWalkerBase() { }
 
     // ctor does nothing, use Walk() to walk the stack
     wxStackWalkerBase() { }
 

+    // dtor does nothing neither but should be virtual
+    virtual ~wxStackWalkerBase() { }
+

     // enumerate stack frames from the current location, skipping the initial
     // number of them (this can be useful when Walk() is called from some known
     // location and you don't want to see the first few frames anyhow; also
     // enumerate stack frames from the current location, skipping the initial
     // number of them (this can be useful when Walk() is called from some known
     // location and you don't want to see the first few frames anyhow; also


@@ -136,6 +144,10 @@ protected:
 
 #ifdef __WXMSW__
     #include "wx/msw/stackwalk.h"
 
 #ifdef __WXMSW__
     #include "wx/msw/stackwalk.h"

+#elif defined(__UNIX__)
+    #include "wx/unix/stackwalk.h"
+#else
+    #error "wxStackWalker is not supported, set wxUSE_STACKWALKER to 0"

 #endif
 
 #endif // wxUSE_STACKWALKER
 #endif
 
 #endif // wxUSE_STACKWALKER