Add missing WXK constants for the control keys

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

diff --git a/src/common/appbase.cpp b/src/common/appbase.cpp
index 65231954924eb8ebda4e66d8c2cda625731ab722..ac7d977062a77942fd5c40b09c87e7783626b500 100644 (file)
--- a/src/common/appbase.cpp
+++ b/src/common/appbase.cpp
@@ -6,7 +6,7 @@
 // Created:     19.06.2003 (extracted from common/appcmn.cpp)
 // RCS-ID:      $Id$
 // Copyright:   (c) 2003 Vadim Zeitlin <vadim@wxwindows.org>
 // Created:     19.06.2003 (extracted from common/appcmn.cpp)
 // RCS-ID:      $Id$
 // Copyright:   (c) 2003 Vadim Zeitlin <vadim@wxwindows.org>

-// License:     wxWindows license
+// Licence:     wxWindows licence

 ///////////////////////////////////////////////////////////////////////////////
 
 // ============================================================================
 ///////////////////////////////////////////////////////////////////////////////
 
 // ============================================================================


@@ -25,7 +25,7 @@
 #endif
 
 #ifndef WX_PRECOMP
 #endif
 
 #ifndef WX_PRECOMP

-    #ifdef __WXMSW__
+    #ifdef __WINDOWS__

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


@@ -43,21 +43,25 @@
 #include "wx/filename.h"
 #include "wx/msgout.h"
 #include "wx/scopedptr.h"
 #include "wx/filename.h"
 #include "wx/msgout.h"
 #include "wx/scopedptr.h"

+#include "wx/sysopt.h"

 #include "wx/tokenzr.h"
 #include "wx/thread.h"
 
 #include "wx/tokenzr.h"
 #include "wx/thread.h"
 

-#if wxUSE_EXCEPTIONS && wxUSE_STL
-    #include <exception>
-    #include <typeinfo>
-#endif
+#if wxUSE_STL
+    #if wxUSE_EXCEPTIONS
+        #include <exception>
+        #include <typeinfo>
+    #endif
+    #if wxUSE_INTL
+        #include <locale>
+    #endif
+#endif // wxUSE_STL

 
 

-#ifndef __WXPALMOS5__
-#if !defined(__WXMSW__) || defined(__WXMICROWIN__)
+#if !defined(__WINDOWS__) || defined(__WXMICROWIN__)

   #include  <signal.h>      // for SIGTRAP used by wxTrap()
 #endif  //Win/Unix
 
 #include <locale.h>
   #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"


@@ -66,7 +70,7 @@
 #if wxDEBUG_LEVEL
     #if wxUSE_STACKWALKER
         #include "wx/stackwalk.h"
 #if wxDEBUG_LEVEL
     #if wxUSE_STACKWALKER
         #include "wx/stackwalk.h"

-        #ifdef __WXMSW__
+        #ifdef __WINDOWS__

             #include "wx/msw/debughlp.h"
         #endif
     #endif // wxUSE_STACKWALKER
             #include "wx/msw/debughlp.h"
         #endif
     #endif // wxUSE_STACKWALKER


@@ -146,14 +150,17 @@ wxAppConsoleBase::wxAppConsoleBase()
     // In unicode mode the SetTraceMasks call can cause an apptraits to be
     // created, but since we are still in the constructor the wrong kind will
     // be created for GUI apps.  Destroy it so it can be created again later.
     // In unicode mode the SetTraceMasks call can cause an apptraits to be
     // created, but since we are still in the constructor the wrong kind will
     // be created for GUI apps.  Destroy it so it can be created again later.

-    delete m_traits;
-    m_traits = NULL;
+    wxDELETE(m_traits);

 #endif
 #endif
 #endif
 #endif

+
+    wxEvtHandler::AddFilter(this);

 }
 
 wxAppConsoleBase::~wxAppConsoleBase()
 {
 }
 
 wxAppConsoleBase::~wxAppConsoleBase()
 {

+    wxEvtHandler::RemoveFilter(this);
+

     // we're being destroyed and using this object from now on may not work or
     // even crash so don't leave dangling pointers to it
     ms_appInstance = NULL;
     // we're being destroyed and using this object from now on may not work or
     // even crash so don't leave dangling pointers to it
     ms_appInstance = NULL;


@@ -177,7 +184,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 )


@@ -186,7 +192,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;
 }
 


@@ -213,11 +218,7 @@ wxEventLoopBase *wxAppConsoleBase::CreateMainLoop()
 
 void wxAppConsoleBase::CleanUp()
 {
 
 void wxAppConsoleBase::CleanUp()
 {

-    if ( m_mainLoop )
-    {
-        delete m_mainLoop;
-        m_mainLoop = NULL;
-    }
+    wxDELETE(m_mainLoop);

 }
 
 // ----------------------------------------------------------------------------
 }
 
 // ----------------------------------------------------------------------------


@@ -349,8 +350,11 @@ bool wxAppConsoleBase::Dispatch()
 bool wxAppConsoleBase::Yield(bool onlyIfNeeded)
 {
     wxEventLoopBase * const loop = wxEventLoopBase::GetActive();
 bool wxAppConsoleBase::Yield(bool onlyIfNeeded)
 {
     wxEventLoopBase * const loop = wxEventLoopBase::GetActive();

+    if ( loop )
+       return loop->Yield(onlyIfNeeded);

 
 

-    return loop && loop->Yield(onlyIfNeeded);
+    wxScopedPtr<wxEventLoopBase> tmpLoop(CreateMainLoop());
+    return tmpLoop->Yield(onlyIfNeeded);

 }
 
 void wxAppConsoleBase::WakeUpIdle()
 }
 
 void wxAppConsoleBase::WakeUpIdle()


@@ -374,6 +378,9 @@ bool wxAppConsoleBase::ProcessIdle()
     wxLog::FlushActive();
 #endif
 
     wxLog::FlushActive();
 #endif
 

+    // Garbage collect all objects previously scheduled for destruction.
+    DeletePendingObjects();
+

     return event.MoreRequested();
 }
 
     return event.MoreRequested();
 }
 


@@ -399,7 +406,7 @@ bool wxAppConsoleBase::IsMainLoopRunning()
 int wxAppConsoleBase::FilterEvent(wxEvent& WXUNUSED(event))
 {
     // process the events normally by default
 int wxAppConsoleBase::FilterEvent(wxEvent& WXUNUSED(event))
 {
     // process the events normally by default

-    return -1;
+    return Event_Skip;

 }
 
 void wxAppConsoleBase::DelayPendingEventHandler(wxEvtHandler* toDelay)
 }
 
 void wxAppConsoleBase::DelayPendingEventHandler(wxEvtHandler* toDelay)


@@ -513,9 +520,6 @@ void wxAppConsoleBase::ProcessPendingEvents()
 
         wxLEAVE_CRIT_SECT(m_handlersWithPendingEventsLocker);
     }
 
         wxLEAVE_CRIT_SECT(m_handlersWithPendingEventsLocker);
     }

-
-    // Garbage collect all objects previously scheduled for destruction.
-    DeletePendingObjects();

 }
 
 void wxAppConsoleBase::DeletePendingEvents()
 }
 
 void wxAppConsoleBase::DeletePendingEvents()


@@ -835,7 +839,19 @@ bool wxConsoleAppTraitsBase::HasStderr()
 #if wxUSE_INTL
 void wxAppTraitsBase::SetLocale()
 {
 #if wxUSE_INTL
 void wxAppTraitsBase::SetLocale()
 {

+    // We want to use the user locale by default in GUI applications in order
+    // to show the numbers, dates &c in the familiar format -- and also accept
+    // this format on input (especially important for decimal comma/dot).

     wxSetlocale(LC_ALL, "");
     wxSetlocale(LC_ALL, "");

+
+#if wxUSE_STL
+    // At least in some environments, e.g. MinGW-64, if the global C++ locale
+    // is different from the global C locale, all stream operations temporarily
+    // change the locale resulting in a huge slowdown (3 times slower in some
+    // real-life applications), so change the C++ locale to match.
+    std::locale::global(std::locale(""));
+#endif  //wxUSE_STL
+

     wxUpdateLocaleIsUtf8();
 }
 #endif
     wxUpdateLocaleIsUtf8();
 }
 #endif


@@ -897,12 +913,12 @@ wxString wxAppTraitsBase::GetAssertStackTrace()
 {
 #if wxDEBUG_LEVEL
 
 {
 #if wxDEBUG_LEVEL
 

-#if !defined(__WXMSW__)
+#if !defined(__WINDOWS__)

     // on Unix stack frame generation may take some time, depending on the
     // size of the executable mainly... warn the user that we are working
     wxFprintf(stderr, "Collecting stack trace information, please wait...");
     fflush(stderr);
     // on Unix stack frame generation may take some time, depending on the
     // size of the executable mainly... warn the user that we are working
     wxFprintf(stderr, "Collecting stack trace information, please wait...");
     fflush(stderr);

-#endif // !__WXMSW__
+#endif // !__WINDOWS__

 
 
     wxString stackTrace;
 
 
     wxString stackTrace;


@@ -954,7 +970,7 @@ wxString wxAppTraitsBase::GetAssertStackTrace()
     static const int maxLines = 20;
 
     StackDump dump;
     static const int maxLines = 20;
 
     StackDump dump;

-    dump.Walk(2, maxLines); // don't show OnAssert() call itself
+    dump.Walk(8, maxLines); // 8 is chosen to hide all OnAssert() calls

     stackTrace = dump.GetStackTrace();
 
     const int count = stackTrace.Freq(wxT('\n'));
     stackTrace = dump.GetStackTrace();
 
     const int count = stackTrace.Freq(wxT('\n'));


@@ -1003,12 +1019,21 @@ 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
 void wxTrap()
 {
 #if wxDEBUG_LEVEL
 
 // break into the debugger
 void wxTrap()
 {

-#if defined(__WXMSW__) && !defined(__WXMICROWIN__)
+#if defined(__WINDOWS__) && !defined(__WXMICROWIN__)

     DebugBreak();
 #elif defined(_MSL_USING_MW_C_HEADERS) && _MSL_USING_MW_C_HEADERS
     Debugger();
     DebugBreak();
 #elif defined(_MSL_USING_MW_C_HEADERS) && _MSL_USING_MW_C_HEADERS
     Debugger();


@@ -1027,6 +1052,10 @@ wxDefaultAssertHandler(const wxString& file,
                        const wxString& cond,
                        const wxString& msg)
 {
                        const wxString& cond,
                        const wxString& msg)
 {

+    // If this option is set, we should abort immediately when assert happens.
+    if ( wxSystemOptions::GetOptionInt("exit-on-assert") )
+        wxAbort();
+

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


@@ -1167,8 +1196,8 @@ static void LINKAGEMODE SetTraceMasks()
 static
 bool DoShowAssertDialog(const wxString& msg)
 {
 static
 bool DoShowAssertDialog(const wxString& msg)
 {

-    // under MSW we can show the dialog even in the console mode
-#if defined(__WXMSW__) && !defined(__WXMICROWIN__)
+    // under Windows we can show the dialog even in the console mode
+#if defined(__WINDOWS__) && !defined(__WXMICROWIN__)

     wxString msgDlg(msg);
 
     // this message is intentionally not translated -- it is for developers
     wxString msgDlg(msg);
 
     // this message is intentionally not translated -- it is for developers


@@ -1178,7 +1207,7 @@ bool DoShowAssertDialog(const wxString& msg)
               wxT("You can also choose [Cancel] to suppress ")
               wxT("further warnings.");
 
               wxT("You can also choose [Cancel] to suppress ")
               wxT("further warnings.");
 

-    switch ( ::MessageBox(NULL, msgDlg.wx_str(), wxT("wxWidgets Debug Alert"),
+    switch ( ::MessageBox(NULL, msgDlg.t_str(), wxT("wxWidgets Debug Alert"),

                           MB_YESNOCANCEL | MB_ICONSTOP ) )
     {
         case IDYES:
                           MB_YESNOCANCEL | MB_ICONSTOP ) )
     {
         case IDYES:


@@ -1191,9 +1220,9 @@ bool DoShowAssertDialog(const wxString& msg)
 
         //case IDNO: nothing to do
     }
 
         //case IDNO: nothing to do
     }

-#else // !__WXMSW__
+#else // !__WINDOWS__

     wxUnusedVar(msg);
     wxUnusedVar(msg);

-#endif // __WXMSW__/!__WXMSW__
+#endif // __WINDOWS__/!__WINDOWS__

 
     // continue with the asserts by default
     return false;
 
     // continue with the asserts by default
     return false;