Correct mistakes in wxStripExtension - correct wxString::npos. Spurred by 1073642...

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

diff --git a/src/common/appbase.cpp b/src/common/appbase.cpp
index 404eb2dd6f8bcc0bb2b914b224bb79727bd94530..1a13c3f3399ca59ceffec508ce81396e98134ccc 100644 (file)
--- a/src/common/appbase.cpp
+++ b/src/common/appbase.cpp
@@ -43,7 +43,7 @@
   #include  <signal.h>      // for SIGTRAP used by wxTrap()
 #endif  //Win/Unix
 
   #include  <signal.h>      // for SIGTRAP used by wxTrap()
 #endif  //Win/Unix
 

-#if defined(__WXMSW__)
+#if defined(__WXMSW__) && !defined(__PALMOS__)

   #include  "wx/msw/wrapwin.h"  // includes windows.h for MessageBox()
 #endif
 
   #include  "wx/msw/wrapwin.h"  // includes windows.h for MessageBox()
 #endif
 


@@ -140,11 +140,13 @@ bool wxAppConsole::Initialize(int& argc, wxChar **argv)
     this->argc = argc;
     this->argv = argv;
 
     this->argc = argc;
     this->argv = argv;
 

+#ifndef __PALMOS__

     if ( m_appName.empty() && argv )
     {
         // the application name is, by default, the name of its executable file
         wxFileName::SplitPath(argv[0], NULL, &m_appName, NULL);
     }
     if ( m_appName.empty() && argv )
     {
         // the application name is, by default, the name of its executable file
         wxFileName::SplitPath(argv[0], NULL, &m_appName, NULL);
     }

+#endif

 
     return true;
 }
 
     return true;
 }