reset the tooltip text before changing it, this apparently prevents a spurious redraw...

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

diff --git a/src/common/appcmn.cpp b/src/common/appcmn.cpp
index d3d562d3e6324f41f1e23838a453e4dbbc1eabe6..82fdabf78e515d524b6d2dff811f70ae84574831 100644 (file)
--- a/src/common/appcmn.cpp
+++ b/src/common/appcmn.cpp
@@ -1,6 +1,6 @@
 /////////////////////////////////////////////////////////////////////////////
 /////////////////////////////////////////////////////////////////////////////

-// Name:        common/appcmn.cpp
-// Purpose:     wxAppConsole and wxAppBase methods common to all platforms
+// Name:        src/common/appcmn.cpp
+// Purpose:     wxAppBase methods common to all platforms

 // Author:      Vadim Zeitlin
 // Modified by:
 // Created:     18.10.99
 // Author:      Vadim Zeitlin
 // Modified by:
 // Created:     18.10.99


@@ -17,10 +17,6 @@
 // headers
 // ---------------------------------------------------------------------------
 
 // headers
 // ---------------------------------------------------------------------------
 

-#if defined(__GNUG__) && !defined(NO_GCC_PRAGMA)
-    #pragma implementation "appbase.h"
-#endif
-

 // For compilers that support precompilation, includes "wx.h".
 #include "wx/wxprec.h"
 
 // For compilers that support precompilation, includes "wx.h".
 #include "wx/wxprec.h"
 


@@ -30,25 +26,30 @@
 
 #ifndef WX_PRECOMP
     #include "wx/app.h"
 
 #ifndef WX_PRECOMP
     #include "wx/app.h"

+    #include "wx/window.h"

     #include "wx/bitmap.h"
     #include "wx/bitmap.h"

-    #include "wx/intl.h"
-    #include "wx/list.h"

     #include "wx/log.h"
     #include "wx/msgdlg.h"
     #include "wx/log.h"
     #include "wx/msgdlg.h"

-    #include "wx/bitmap.h"

     #include "wx/confbase.h"
     #include "wx/confbase.h"

+    #include "wx/utils.h"
+    #include "wx/wxcrtvararg.h"

 #endif
 
 #include "wx/apptrait.h"
 #include "wx/cmdline.h"
 #endif
 
 #include "wx/apptrait.h"
 #include "wx/cmdline.h"

-#include "wx/evtloop.h"

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

-#include "wx/utils.h"
-#include "wx/ptr_scpd.h"
+#include "wx/vidmode.h"
+#include "wx/evtloop.h"
+
+#ifdef __WXDEBUG__
+    #if wxUSE_STACKWALKER
+        #include "wx/stackwalk.h"
+    #endif // wxUSE_STACKWALKER
+#endif // __WXDEBUG__

 
 #if defined(__WXMSW__)
 
 #if defined(__WXMSW__)

-  #include  "wx/msw/private.h"  // includes windows.h for LOGFONT
+    #include  "wx/msw/private.h"  // includes windows.h for LOGFONT

 #endif
 
 #if wxUSE_FONTMAP
 #endif
 
 #if wxUSE_FONTMAP


@@ -59,13 +60,7 @@
 #include "wx/build.h"
 WX_CHECK_BUILD_OPTIONS("wxCore")
 
 #include "wx/build.h"
 WX_CHECK_BUILD_OPTIONS("wxCore")
 

-
-// ----------------------------------------------------------------------------
-// wxEventLoopPtr
-// ----------------------------------------------------------------------------
-
-// this defines wxEventLoopPtr
-wxDEFINE_TIED_SCOPED_PTR_TYPE(wxEventLoop);
+WXDLLIMPEXP_DATA_CORE(wxList) wxPendingDelete;

 
 // ============================================================================
 // wxAppBase implementation
 
 // ============================================================================
 // wxAppBase implementation


@@ -77,13 +72,12 @@ wxDEFINE_TIED_SCOPED_PTR_TYPE(wxEventLoop);
 
 wxAppBase::wxAppBase()
 {
 
 wxAppBase::wxAppBase()
 {

-    m_topWindow = (wxWindow *)NULL;
-    m_useBestVisual = FALSE;
-    m_isActive = TRUE;
+    m_topWindow = NULL;

 
 

-#if wxUSE_EVTLOOP_IN_APP
-    m_mainLoop = NULL;
-#endif // wxUSE_EVTLOOP_IN_APP
+    m_useBestVisual = false;
+    m_forceTrueColour = false;
+
+    m_isActive = true;

 
     // We don't want to exit the app if the user code shows a dialog from its
     // OnInit() -- but this is what would happen if we set m_exitOnFrameDelete
 
     // We don't want to exit the app if the user code shows a dialog from its
     // OnInit() -- but this is what would happen if we set m_exitOnFrameDelete


@@ -91,29 +85,28 @@ wxAppBase::wxAppBase()
     // OTOH, if we set it to No initially we'll have to overwrite it with Yes
     // when we enter our OnRun() because we do want the default behaviour from
     // then on. But this would be a problem if the user code calls
     // OTOH, if we set it to No initially we'll have to overwrite it with Yes
     // when we enter our OnRun() because we do want the default behaviour from
     // then on. But this would be a problem if the user code calls

-    // SetExitOnFrameDelete(FALSE) from OnInit().
+    // SetExitOnFrameDelete(false) from OnInit().

     //
     // So we use the special "Later" value which is such that
     //
     // So we use the special "Later" value which is such that

-    // GetExitOnFrameDelete() returns FALSE for it but which we know we can
+    // GetExitOnFrameDelete() returns false for it but which we know we can

     // safely (i.e. without losing the effect of the users SetExitOnFrameDelete
     // call) overwrite in OnRun()
     m_exitOnFrameDelete = Later;
 }
 
     // safely (i.e. without losing the effect of the users SetExitOnFrameDelete
     // call) overwrite in OnRun()
     m_exitOnFrameDelete = Later;
 }
 

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

 {
 {

-    if ( !wxAppConsole::Initialize(argc, argv) )
+    if ( !wxAppConsole::Initialize(argcOrig, argvOrig) )

         return false;
 
         return false;
 

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

     wxInitializeStockLists();
     wxInitializeStockLists();

-    wxInitializeStockObjects();

 
     wxBitmap::InitStandardHandlers();
 
 
     wxBitmap::InitStandardHandlers();
 

+    // for compatibility call the old initialization function too
+    if ( !OnInitGui() )
+        return false;
+

     return true;
 }
 
     return true;
 }
 


@@ -128,30 +121,64 @@ wxAppBase::~wxAppBase()
 
 void wxAppBase::CleanUp()
 {
 
 void wxAppBase::CleanUp()
 {

-    // one last chance for pending objects to be cleaned up
+    // clean up all the pending objects

     DeletePendingObjects();
 
     DeletePendingObjects();
 

+    // and any remaining TLWs (they remove themselves from wxTopLevelWindows
+    // when destroyed, so iterate until none are left)
+    while ( !wxTopLevelWindows.empty() )
+    {
+        // do not use Destroy() here as it only puts the TLW in pending list
+        // but we want to delete them now
+        delete wxTopLevelWindows.GetFirst()->GetData();
+    }
+
+    // undo everything we did in Initialize() above

     wxBitmap::CleanUpHandlers();
 
     wxBitmap::CleanUpHandlers();
 

-    wxDeleteStockObjects();
+    wxStockGDI::DeleteAll();

 
     wxDeleteStockLists();
 
     delete wxTheColourDatabase;
     wxTheColourDatabase = NULL;
 
 
     wxDeleteStockLists();
 
     delete wxTheColourDatabase;
     wxTheColourDatabase = NULL;
 

-#if wxUSE_THREADS
-    delete wxPendingEvents;
-    wxPendingEvents = NULL;
+    wxAppConsole::CleanUp();
+}
+
+// ----------------------------------------------------------------------------
+// various accessors
+// ----------------------------------------------------------------------------
+
+wxWindow* wxAppBase::GetTopWindow() const
+{
+    wxWindow* window = m_topWindow;
+    if (window == NULL && wxTopLevelWindows.GetCount() > 0)
+        window = wxTopLevelWindows.GetFirst()->GetData();
+    return window;
+}
+
+wxVideoMode wxAppBase::GetDisplayMode() const
+{
+    return wxVideoMode();
+}
+
+wxLayoutDirection wxAppBase::GetLayoutDirection() const
+{
+#if wxUSE_INTL
+    const wxLocale *const locale = wxGetLocale();
+    if ( locale )
+    {
+        const wxLanguageInfo *const
+            info = wxLocale::GetLanguageInfo(locale->GetLanguage());

 
 

-    delete wxPendingEventsLocker;
-    wxPendingEventsLocker = NULL;
+        if ( info )
+            return info->LayoutDirection;
+    }
+#endif // wxUSE_INTL

 
 

-    #if wxUSE_VALIDATORS
-        // If we don't do the following, we get an apparent memory leak.
-        ((wxEvtHandler&) wxDefaultValidator).ClearEventLocker();
-    #endif // wxUSE_VALIDATORS
-#endif // wxUSE_THREADS
+    // we don't know
+    return wxLayout_Default;

 }
 
 #if wxUSE_CMDLINE_PARSER
 }
 
 #if wxUSE_CMDLINE_PARSER


@@ -160,8 +187,8 @@ void wxAppBase::CleanUp()
 // GUI-specific command line options handling
 // ----------------------------------------------------------------------------
 
 // GUI-specific command line options handling
 // ----------------------------------------------------------------------------
 

-#define OPTION_THEME   _T("theme")
-#define OPTION_MODE    _T("mode")
+#define OPTION_THEME   "theme"
+#define OPTION_MODE    "mode"

 
 void wxAppBase::OnInitCmdLine(wxCmdLineParser& parser)
 {
 
 void wxAppBase::OnInitCmdLine(wxCmdLineParser& parser)
 {


@@ -174,7 +201,7 @@ void wxAppBase::OnInitCmdLine(wxCmdLineParser& parser)
 #ifdef __WXUNIVERSAL__
         {
             wxCMD_LINE_OPTION,
 #ifdef __WXUNIVERSAL__
         {
             wxCMD_LINE_OPTION,

-            _T(""),
+            NULL,

             OPTION_THEME,
             gettext_noop("specify the theme to use"),
             wxCMD_LINE_VAL_STRING,
             OPTION_THEME,
             gettext_noop("specify the theme to use"),
             wxCMD_LINE_VAL_STRING,


@@ -188,7 +215,7 @@ void wxAppBase::OnInitCmdLine(wxCmdLineParser& parser)
         //     and not mgl/app.cpp
         {
             wxCMD_LINE_OPTION,
         //     and not mgl/app.cpp
         {
             wxCMD_LINE_OPTION,

-            _T(""),
+            NULL,

             OPTION_MODE,
             gettext_noop("specify display mode to use (e.g. 640x480-16)"),
             wxCMD_LINE_VAL_STRING,
             OPTION_MODE,
             gettext_noop("specify display mode to use (e.g. 640x480-16)"),
             wxCMD_LINE_VAL_STRING,


@@ -197,14 +224,7 @@ void wxAppBase::OnInitCmdLine(wxCmdLineParser& parser)
 #endif // __WXMGL__
 
         // terminator
 #endif // __WXMGL__
 
         // terminator

-        {
-            wxCMD_LINE_NONE,
-            _T(""),
-            _T(""),
-            _T(""),
-            wxCMD_LINE_VAL_NONE,
-            0x0
-        }
+        wxCMD_LINE_DESC_END

     };
 
     parser.SetDesc(cmdLineGUIDesc);
     };
 
     parser.SetDesc(cmdLineGUIDesc);


@@ -220,7 +240,7 @@ bool wxAppBase::OnCmdLineParsed(wxCmdLineParser& parser)
         if ( !theme )
         {
             wxLogError(_("Unsupported theme '%s'."), themeName.c_str());
         if ( !theme )
         {
             wxLogError(_("Unsupported theme '%s'."), themeName.c_str());

-            return FALSE;
+            return false;

         }
 
         // Delete the defaultly created theme and set the new theme.
         }
 
         // Delete the defaultly created theme and set the new theme.


@@ -237,11 +257,11 @@ bool wxAppBase::OnCmdLineParsed(wxCmdLineParser& parser)
         if ( wxSscanf(modeDesc.c_str(), _T("%ux%u-%u"), &w, &h, &bpp) != 3 )
         {
             wxLogError(_("Invalid display mode specification '%s'."), modeDesc.c_str());
         if ( wxSscanf(modeDesc.c_str(), _T("%ux%u-%u"), &w, &h, &bpp) != 3 )
         {
             wxLogError(_("Invalid display mode specification '%s'."), modeDesc.c_str());

-            return FALSE;
+            return false;

         }
 
         }
 

-        if ( !SetDisplayMode(wxDisplayModeInfo(w, h, bpp)) )
-            return FALSE;
+        if ( !SetDisplayMode(wxVideoMode(w, h, bpp)) )
+            return false;

     }
 #endif // __WXMGL__
 
     }
 #endif // __WXMGL__
 


@@ -250,59 +270,6 @@ bool wxAppBase::OnCmdLineParsed(wxCmdLineParser& parser)
 
 #endif // wxUSE_CMDLINE_PARSER
 
 
 #endif // wxUSE_CMDLINE_PARSER
 

-// ----------------------------------------------------------------------------
-// main event loop implementation
-// ----------------------------------------------------------------------------
-
-int wxAppBase::MainLoop()
-{
-#if wxUSE_EVTLOOP_IN_APP
-    wxEventLoopTiedPtr mainLoop(&m_mainLoop, new wxEventLoop);
-
-    return m_mainLoop->Run();
-#else // !wxUSE_EVTLOOP_IN_APP
-    return 0;
-#endif // wxUSE_EVTLOOP_IN_APP/!wxUSE_EVTLOOP_IN_APP
-}
-
-void wxAppBase::ExitMainLoop()
-{
-#if wxUSE_EVTLOOP_IN_APP
-    // we should exit from the main event loop, not just any currently active
-    // (e.g. modal dialog) event loop
-    if ( m_mainLoop )
-    {
-        m_mainLoop->Exit(0);
-    }
-#endif // wxUSE_EVTLOOP_IN_APP
-}
-
-bool wxAppBase::Pending()
-{
-#if wxUSE_EVTLOOP_IN_APP
-    // use the currently active message loop here, not m_mainLoop, because if
-    // we're showing a modal dialog (with its own event loop) currently the
-    // main event loop is not running anyhow
-    wxEventLoop * const loop = wxEventLoop::GetActive();
-
-    return loop && loop->Pending();
-#else // wxUSE_EVTLOOP_IN_APP
-    return false;
-#endif // wxUSE_EVTLOOP_IN_APP/!wxUSE_EVTLOOP_IN_APP
-}
-
-bool wxAppBase::Dispatch()
-{
-#if wxUSE_EVTLOOP_IN_APP
-    // see comment in Pending()
-    wxEventLoop * const loop = wxEventLoop::GetActive();
-
-    return loop && loop->Dispatch();
-#else // wxUSE_EVTLOOP_IN_APP
-    return true;
-#endif // wxUSE_EVTLOOP_IN_APP/!wxUSE_EVTLOOP_IN_APP
-}
-

 // ----------------------------------------------------------------------------
 // OnXXX() hooks
 // ----------------------------------------------------------------------------
 // ----------------------------------------------------------------------------
 // OnXXX() hooks
 // ----------------------------------------------------------------------------


@@ -311,10 +278,10 @@ bool wxAppBase::OnInitGui()
 {
 #ifdef __WXUNIVERSAL__
     if ( !wxTheme::Get() && !wxTheme::CreateDefault() )
 {
 #ifdef __WXUNIVERSAL__
     if ( !wxTheme::Get() && !wxTheme::CreateDefault() )

-        return FALSE;
+        return false;

 #endif // __WXUNIVERSAL__
 
 #endif // __WXUNIVERSAL__
 

-    return TRUE;
+    return true;

 }
 
 int wxAppBase::OnRun()
 }
 
 int wxAppBase::OnRun()


@@ -327,7 +294,7 @@ int wxAppBase::OnRun()
     }
     //else: it has been changed, assume the user knows what he is doing
 
     }
     //else: it has been changed, assume the user knows what he is doing
 

-    return MainLoop();
+    return wxAppConsole::OnRun();

 }
 
 int wxAppBase::OnExit()
 }
 
 int wxAppBase::OnExit()


@@ -339,11 +306,6 @@ int wxAppBase::OnExit()
     return wxAppConsole::OnExit();
 }
 
     return wxAppConsole::OnExit();
 }
 

-void wxAppBase::Exit()
-{
-    ExitMainLoop();
-}
-

 wxAppTraits *wxAppBase::CreateTraits()
 {
     return new wxGUIAppTraits;
 wxAppTraits *wxAppBase::CreateTraits()
 {
     return new wxGUIAppTraits;


@@ -366,6 +328,29 @@ void wxAppBase::SetActive(bool active, wxWindow * WXUNUSED(lastFocus))
     (void)ProcessEvent(event);
 }
 
     (void)ProcessEvent(event);
 }
 

+bool wxAppBase::SafeYield(wxWindow *win, bool onlyIfNeeded)
+{
+    wxWindowDisabler wd(win);
+
+    wxEventLoopBase * const loop = wxEventLoopBase::GetActive();
+
+    return loop && loop->Yield(onlyIfNeeded);
+}
+
+bool wxAppBase::SafeYieldFor(wxWindow *win, long eventsToProcess)
+{
+    wxWindowDisabler wd(win);
+
+    wxEventLoopBase * const loop = wxEventLoopBase::GetActive();
+
+    return loop && loop->YieldFor(eventsToProcess);
+}
+
+
+// ----------------------------------------------------------------------------
+// idle handling
+// ----------------------------------------------------------------------------
+

 void wxAppBase::DeletePendingObjects()
 {
     wxList::compatibility_iterator node = wxPendingDelete.GetFirst();
 void wxAppBase::DeletePendingObjects()
 {
     wxList::compatibility_iterator node = wxPendingDelete.GetFirst();


@@ -373,62 +358,73 @@ void wxAppBase::DeletePendingObjects()
     {
         wxObject *obj = node->GetData();
 
     {
         wxObject *obj = node->GetData();
 

-        delete obj;
-
-        if (wxPendingDelete.Member(obj))
+        // remove it from the list first so that if we get back here somehow
+        // during the object deletion (e.g. wxYield called from its dtor) we
+        // wouldn't try to delete it the second time
+        if ( wxPendingDelete.Member(obj) )

             wxPendingDelete.Erase(node);
 
             wxPendingDelete.Erase(node);
 

+        delete obj;
+

         // Deleting one object may have deleted other pending
         // objects, so start from beginning of list again.
         node = wxPendingDelete.GetFirst();
     }
 }
 
         // Deleting one object may have deleted other pending
         // objects, so start from beginning of list again.
         node = wxPendingDelete.GetFirst();
     }
 }
 

-// Returns TRUE if more time is needed.
+// Returns true if more time is needed.

 bool wxAppBase::ProcessIdle()
 {
 bool wxAppBase::ProcessIdle()
 {

+    // call the base class version first, it will process the pending events
+    // (which should be done before the idle events generation) and send the
+    // idle event to wxTheApp itself
+    bool needMore = wxAppConsoleBase::ProcessIdle();

     wxIdleEvent event;
     wxIdleEvent event;

-    bool needMore = FALSE;

     wxWindowList::compatibility_iterator node = wxTopLevelWindows.GetFirst();
     while (node)
     {
         wxWindow* win = node->GetData();
         if (SendIdleEvents(win, event))
     wxWindowList::compatibility_iterator node = wxTopLevelWindows.GetFirst();
     while (node)
     {
         wxWindow* win = node->GetData();
         if (SendIdleEvents(win, event))

-            needMore = TRUE;
+            needMore = true;

         node = node->GetNext();
     }
 
         node = node->GetNext();
     }
 

-    event.SetEventObject(this);
-    (void) ProcessEvent(event);
-    if (event.MoreRequested())
-        needMore = TRUE;
+    // 'Garbage' collection of windows deleted with Close().
+    DeletePendingObjects();
+
+#if wxUSE_LOG
+    // flush the logged messages if any
+    wxLog::FlushActive();
+#endif

 
     wxUpdateUIEvent::ResetUpdateTime();
 
     wxUpdateUIEvent::ResetUpdateTime();

-    
+

     return needMore;
 }
 
 // Send idle event to window and all subwindows
 bool wxAppBase::SendIdleEvents(wxWindow* win, wxIdleEvent& event)
 {
     return needMore;
 }
 
 // Send idle event to window and all subwindows
 bool wxAppBase::SendIdleEvents(wxWindow* win, wxIdleEvent& event)
 {

-    bool needMore = FALSE;
+    bool needMore = false;

 
     win->OnInternalIdle();
 
 
     win->OnInternalIdle();
 

-    if (wxIdleEvent::CanSend(win))
+    // should we send idle event to this window?
+    if ( wxIdleEvent::GetMode() == wxIDLE_PROCESS_ALL ||
+            win->HasExtraStyle(wxWS_EX_PROCESS_IDLE) )

     {
         event.SetEventObject(win);
     {
         event.SetEventObject(win);

-        win->GetEventHandler()->ProcessEvent(event);
+        win->HandleWindowEvent(event);

 
         if (event.MoreRequested())
 
         if (event.MoreRequested())

-            needMore = TRUE;
+            needMore = true;

     }
     wxWindowList::compatibility_iterator node = win->GetChildren().GetFirst();
     while ( node )
     {
         wxWindow *child = node->GetData();
         if (SendIdleEvents(child, event))
     }
     wxWindowList::compatibility_iterator node = win->GetChildren().GetFirst();
     while ( node )
     {
         wxWindow *child = node->GetData();
         if (SendIdleEvents(child, event))

-            needMore = TRUE;
+            needMore = true;

 
         node = node->GetNext();
     }
 
         node = node->GetNext();
     }


@@ -436,27 +432,6 @@ bool wxAppBase::SendIdleEvents(wxWindow* win, wxIdleEvent& event)
     return needMore;
 }
 
     return needMore;
 }
 

-void wxAppBase::OnIdle(wxIdleEvent& WXUNUSED(event))
-{
-    // If there are pending events, we must process them: pending events
-    // are either events to the threads other than main or events posted
-    // with wxPostEvent() functions
-    // GRG: I have moved this here so that all pending events are processed
-    //   before starting to delete any objects. This behaves better (in
-    //   particular, wrt wxPostEvent) and is coherent with wxGTK's current
-    //   behaviour. Changed Feb/2000 before 2.1.14
-    ProcessPendingEvents();
-
-    // 'Garbage' collection of windows deleted with Close().
-    DeletePendingObjects();
-
-#if wxUSE_LOG
-    // flush the logged messages if any
-    wxLog::FlushActive();
-#endif // wxUSE_LOG
-
-}
-

 // ----------------------------------------------------------------------------
 // wxGUIAppTraitsBase
 // ----------------------------------------------------------------------------
 // ----------------------------------------------------------------------------
 // wxGUIAppTraitsBase
 // ----------------------------------------------------------------------------


@@ -465,7 +440,12 @@ void wxAppBase::OnIdle(wxIdleEvent& WXUNUSED(event))
 
 wxLog *wxGUIAppTraitsBase::CreateLogTarget()
 {
 
 wxLog *wxGUIAppTraitsBase::CreateLogTarget()
 {

+#if wxUSE_LOGGUI

     return new wxLogGui;
     return new wxLogGui;

+#else
+    // we must have something!
+    return new wxLogStderr;
+#endif

 }
 
 #endif // wxUSE_LOG
 }
 
 #endif // wxUSE_LOG


@@ -476,15 +456,18 @@ wxMessageOutput *wxGUIAppTraitsBase::CreateMessageOutput()
     // is (according to common practice):
     //     - console apps: to stderr (on any platform)
     //     - GUI apps: stderr on Unix platforms (!)
     // is (according to common practice):
     //     - console apps: to stderr (on any platform)
     //     - GUI apps: stderr on Unix platforms (!)

-    //                 message box under Windows and others
+    //                 stderr if available and message box otherwise on others
+    //                 (currently stderr only Windows if app running from console)

 #ifdef __UNIX__
     return new wxMessageOutputStderr;
 #else // !__UNIX__
     // wxMessageOutputMessageBox doesn't work under Motif
     #ifdef __WXMOTIF__
         return new wxMessageOutputLog;
 #ifdef __UNIX__
     return new wxMessageOutputStderr;
 #else // !__UNIX__
     // wxMessageOutputMessageBox doesn't work under Motif
     #ifdef __WXMOTIF__
         return new wxMessageOutputLog;

+    #elif wxUSE_MSGDLG
+        return new wxMessageOutputBest(wxMSGOUT_PREFER_STDERR);

     #else
     #else

-        return new wxMessageOutputMessageBox;
+        return new wxMessageOutputStderr;

     #endif
 #endif // __UNIX__/!__UNIX__
 }
     #endif
 #endif // __UNIX__/!__UNIX__
 }


@@ -511,17 +494,34 @@ bool wxGUIAppTraitsBase::ShowAssertDialog(const wxString& msg)
     // under MSW we prefer to use the base class version using ::MessageBox()
     // even if wxMessageBox() is available because it has less chances to
     // double fault our app than our wxMessageBox()
     // under MSW we prefer to use the base class version using ::MessageBox()
     // even if wxMessageBox() is available because it has less chances to
     // double fault our app than our wxMessageBox()

-#if defined(__WXMSW__) || !wxUSE_MSGDLG
+    //
+    // under DFB the message dialog is not always functional right now
+    //
+    // and finally we can't use wxMessageBox() if it wasn't compiled in, of
+    // course
+#if defined(__WXMSW__) || defined(__WXDFB__) || !wxUSE_MSGDLG

     return wxAppTraitsBase::ShowAssertDialog(msg);
 #else // wxUSE_MSGDLG
     return wxAppTraitsBase::ShowAssertDialog(msg);
 #else // wxUSE_MSGDLG

+    wxString msgDlg = msg;
+
+#if wxUSE_STACKWALKER
+    // 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, wxT("[Debug] Generating a stack trace... please wait"));
+    fflush(stderr);
+
+    const wxString stackTrace = GetAssertStackTrace();
+    if ( !stackTrace.empty() )
+        msgDlg << _T("\n\nCall stack:\n") << stackTrace;
+#endif // wxUSE_STACKWALKER
+

     // this message is intentionally not translated -- it is for
     // developpers only
     // this message is intentionally not translated -- it is for
     // developpers only

-    wxString msgDlg(msg);

     msgDlg += wxT("\nDo you want to stop the program?\n")
               wxT("You can also choose [Cancel] to suppress ")
               wxT("further warnings.");
 
     msgDlg += wxT("\nDo you want to stop the program?\n")
               wxT("You can also choose [Cancel] to suppress ")
               wxT("further warnings.");
 

-    switch ( wxMessageBox(msgDlg, wxT("wxWindows Debug Alert"),
+    switch ( wxMessageBox(msgDlg, wxT("wxWidgets Debug Alert"),

                           wxYES_NO | wxCANCEL | wxICON_STOP ) )
     {
         case wxYES:
                           wxYES_NO | wxCANCEL | wxICON_STOP ) )
     {
         case wxYES:


@@ -563,47 +563,3 @@ void wxGUIAppTraitsBase::RemoveFromPendingDelete(wxObject *object)
     wxPendingDelete.DeleteObject(object);
 }
 
     wxPendingDelete.DeleteObject(object);
 }
 

-#if wxUSE_SOCKETS
-
-#if defined(__UNIX__) || defined(__DARWIN__) || defined(__OS2__)
-    #include "wx/unix/gsockunx.h"
-#elif defined(__WINDOWS__)
-    #include "wx/msw/gsockmsw.h"
-#elif defined(__WXMAC__)
-  #include <MacHeaders.c>
-  #define OTUNIXERRORS 1
-  #include <OpenTransport.h>
-  #include <OpenTransportProviders.h>
-  #include <OpenTptInternet.h>
-
-  #include "wx/mac/gsockmac.h"
-#else
-    #error "Must include correct GSocket header here"
-#endif
-
-GSocketGUIFunctionsTable* wxGUIAppTraitsBase::GetSocketGUIFunctionsTable()
-{
-#ifdef __WXMAC__
-    // NB: wxMac does not have any GUI-specific functions in gsocket.c and
-    //     so it doesn't need this table at all
-    return NULL;
-#else // !__WXMAC__
-    static GSocketGUIFunctionsTable table =
-    {
-        _GSocket_GUI_Init,
-        _GSocket_GUI_Cleanup,
-        _GSocket_GUI_Init_Socket,
-        _GSocket_GUI_Destroy_Socket,
-#ifndef __WINDOWS__
-        _GSocket_Install_Callback,
-        _GSocket_Uninstall_Callback,
-#endif
-        _GSocket_Enable_Events,
-        _GSocket_Disable_Events
-    };
-    return &table;
-#endif // __WXMAC__/!__WXMAC__
-}
-
-#endif
-