removing duplicated method, wiring native maxlength support, see #10269

[wxWidgets.git] / src / common / appbase.cpp

diff --git a/src/common/appbase.cpp b/src/common/appbase.cpp
index 9ac78f57f6010213dc34169ec96703250464d4c9..544f727b9e22a8fafba57817f07a0931782638b9 100644 (file)
--- a/src/common/appbase.cpp
+++ b/src/common/appbase.cpp
@@ -52,13 +52,11 @@
     #include <typeinfo>
 #endif
 
     #include <typeinfo>
 #endif
 

-#ifndef __WXPALMOS5__

 #if !defined(__WXMSW__) || defined(__WXMICROWIN__)
   #include  <signal.h>      // for SIGTRAP used by wxTrap()
 #endif  //Win/Unix
 
 #include <locale.h>
 #if !defined(__WXMSW__) || defined(__WXMICROWIN__)
   #include  <signal.h>      // for SIGTRAP used by wxTrap()
 #endif  //Win/Unix
 
 #include <locale.h>

-#endif // ! __WXPALMOS5__

 
 #if wxUSE_FONTMAP
     #include "wx/fontmap.h"
 
 #if wxUSE_FONTMAP
     #include "wx/fontmap.h"


@@ -181,7 +179,6 @@ bool wxAppConsoleBase::Initialize(int& WXUNUSED(argc), wxChar **WXUNUSED(argv))
 wxString wxAppConsoleBase::GetAppName() const
 {
     wxString name = m_appName;
 wxString wxAppConsoleBase::GetAppName() const
 {
     wxString name = m_appName;

-#ifndef __WXPALMOS__

     if ( name.empty() )
     {
         if ( argv )
     if ( name.empty() )
     {
         if ( argv )


@@ -190,7 +187,6 @@ wxString wxAppConsoleBase::GetAppName() const
             wxFileName::SplitPath(argv[0], NULL, &name, NULL);
         }
     }
             wxFileName::SplitPath(argv[0], NULL, &name, NULL);
         }
     }

-#endif // !__WXPALMOS__

     return name;
 }
 
     return name;
 }
 


@@ -1006,6 +1002,15 @@ bool wxAssertIsEqual(int x, int y)
     return x == y;
 }
 
     return x == y;
 }
 

+void wxAbort()
+{
+#ifdef __WXWINCE__
+    ExitThread(3);
+#else
+    abort();
+#endif
+}
+

 #if wxDEBUG_LEVEL
 
 // break into the debugger
 #if wxDEBUG_LEVEL
 
 // break into the debugger


@@ -1032,7 +1037,7 @@ wxDefaultAssertHandler(const wxString& file,
 {
     // If this option is set, we should abort immediately when assert happens.
     if ( wxSystemOptions::GetOptionInt("exit-on-assert") )
 {
     // If this option is set, we should abort immediately when assert happens.
     if ( wxSystemOptions::GetOptionInt("exit-on-assert") )

-        abort();
+        wxAbort();

 
     // FIXME MT-unsafe
     static int s_bInAssert = 0;
 
     // FIXME MT-unsafe
     static int s_bInAssert = 0;