simplified and cleaned up wxGTK's focus handling

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

diff --git a/src/common/appbase.cpp b/src/common/appbase.cpp
index e7eec2c75ef10f5ccf1ed5dedcc8f65b221d8a6f..7a6978b2556946dcf75624e3ba8ec4fec35c0905 100644 (file)
--- a/src/common/appbase.cpp
+++ b/src/common/appbase.cpp
@@ -51,11 +51,13 @@
     #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"


@@ -165,16 +167,12 @@ wxAppConsoleBase::~wxAppConsoleBase()
 // initilization/cleanup
 // ----------------------------------------------------------------------------
 
 // initilization/cleanup
 // ----------------------------------------------------------------------------
 

-bool wxAppConsoleBase::Initialize(int& argcOrig, wxChar **argvOrig)
+bool wxAppConsoleBase::Initialize(int& WXUNUSED(argc), wxChar **WXUNUSED(argv))

 {
 #if wxUSE_INTL
     GetTraits()->SetLocale();
 #endif // wxUSE_INTL
 
 {
 #if wxUSE_INTL
     GetTraits()->SetLocale();
 #endif // wxUSE_INTL
 

-    // remember the command line arguments
-    argc = argcOrig;
-    argv = argvOrig;
-

 #if wxUSE_THREADS
     wxPendingEventsLocker = new wxCriticalSection;
 #endif
 #if wxUSE_THREADS
     wxPendingEventsLocker = new wxCriticalSection;
 #endif