X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/fe856cc55bf0213f9d5dc7875c7bde1d2b7655be..02bcd285fac7124a41292d905609220005f51087:/src/common/appbase.cpp?ds=sidebyside

diff --git a/src/common/appbase.cpp b/src/common/appbase.cpp
index 07732a2d9d..fe7471e1c7 100644
--- a/src/common/appbase.cpp
+++ b/src/common/appbase.cpp
@@ -144,11 +144,11 @@ wxAppConsole::~wxAppConsole()
 // initilization/cleanup
 // ----------------------------------------------------------------------------
 
-bool wxAppConsole::Initialize(int& argc, wxChar **argv)
+bool wxAppConsole::Initialize(int& argcOrig, wxChar **argvOrig)
 {
     // remember the command line arguments
-    this->argc = argc;
-    this->argv = argv;
+    argc = argcOrig;
+    argv = argvOrig;
 
 #ifndef __WXPALMOS__
     if ( m_appName.empty() && argv )
@@ -721,7 +721,11 @@ static wxString GetAssertStackTrace()
     protected:
         virtual void OnStackFrame(const wxStackFrame& frame)
         {
-            m_stackTrace << wxString::Format(_T("[%02d] "), frame.GetLevel());
+            m_stackTrace << wxString::Format
+                            (
+                              _T("[%02d] "),
+                              wx_truncate_cast(int, frame.GetLevel())
+                            );
 
             wxString name = frame.GetName();
             if ( !name.empty() )
@@ -730,11 +734,8 @@ static wxString GetAssertStackTrace()
             }
             else
             {
-                m_stackTrace << wxString::Format
-                                (
-                                    _T("0x%08lx"),
-                                    (unsigned long)frame.GetAddress()
-                                );
+                m_stackTrace << wxString::Format(_T("0x%08p"),
+                                                 frame.GetAddress());
             }
 
             if ( frame.HasSourceLocation() )