Return NULL from wxWindow::GetCapture() when the capture is being lost.

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

diff --git a/src/common/msgout.cpp b/src/common/msgout.cpp
index ec85ee9c13b5d85b5a24ecad97bbfc09106d6a64..bf98eb48980df4b2971ead75037443ca59cfd9b7 100644 (file)
--- a/src/common/msgout.cpp
+++ b/src/common/msgout.cpp
@@ -4,7 +4,6 @@
 // Author:      Mattia Barbon
 // Modified by:
 // Created:     17.07.02
 // Author:      Mattia Barbon
 // Modified by:
 // Created:     17.07.02

-// RCS-ID:      $Id$

 // Copyright:   (c) the wxWidgets team
 // Licence:     wxWindows licence
 /////////////////////////////////////////////////////////////////////////////
 // Copyright:   (c) the wxWidgets team
 // Licence:     wxWindows licence
 /////////////////////////////////////////////////////////////////////////////


@@ -43,9 +42,6 @@
 #if defined(__WINDOWS__)
     #include "wx/msw/private.h"
 #endif
 #if defined(__WINDOWS__)
     #include "wx/msw/private.h"
 #endif

-#ifdef __WXMAC__
-    #include "wx/mac/private.h"
-#endif

 
 // ===========================================================================
 // implementation
 
 // ===========================================================================
 // implementation


@@ -108,53 +104,58 @@ void wxMessageOutput::DoPrintfUtf8(const char *format, ...)
 // wxMessageOutputBest
 // ----------------------------------------------------------------------------
 
 // wxMessageOutputBest
 // ----------------------------------------------------------------------------
 

-#ifdef __WINDOWS__
-
-// check if we're running in a console under Windows
-static inline bool IsInConsole()
-{
-#ifdef __WXWINCE__
-    return false;
-#else // !__WXWINCE__
-    HANDLE hStdErr = ::GetStdHandle(STD_ERROR_HANDLE);
-    return hStdErr && hStdErr != INVALID_HANDLE_VALUE;
-#endif // __WXWINCE__/!__WXWINCE__
-}
-
-#endif // __WINDOWS__
-

 void wxMessageOutputBest::Output(const wxString& str)
 {
 #ifdef __WINDOWS__
 void wxMessageOutputBest::Output(const wxString& str)
 {
 #ifdef __WINDOWS__

-    if ( !IsInConsole() )
+    // decide whether to use console output or not
+    wxAppTraits * const traits = wxTheApp ? wxTheApp->GetTraits() : NULL;
+    const bool hasStderr = traits ? traits->CanUseStderr() : false;
+
+    if ( !(m_flags & wxMSGOUT_PREFER_MSGBOX) )

     {
     {

-        ::MessageBox(NULL, str.wx_str(), _T("wxWidgets"),
-                     MB_ICONINFORMATION | MB_OK);
+        if ( hasStderr && traits->WriteToStderr(AppendLineFeedIfNeeded(str)) )
+            return;

     }
     }

-    else
-#endif // __WINDOWS__/!__WINDOWS__
-    {
-        const wxWX2MBbuf buf = str.mb_str();

 
 

-        if ( buf )
-            fprintf(stderr, "%s", (const char*) buf);
-        else // print at least something
-            fprintf(stderr, "%s", (const char*) str.ToAscii());
-    }
+    wxString title;
+    if ( wxTheApp )
+        title = wxTheApp->GetAppDisplayName();
+    else // Use some title to avoid default "Error"
+        title = _("Message");
+
+    ::MessageBox(NULL, str.t_str(), title.t_str(), MB_ICONINFORMATION | MB_OK);
+#else // !__WINDOWS__
+    wxUnusedVar(m_flags);
+
+    // TODO: use the native message box for the other ports too
+    wxMessageOutputStderr::Output(str);
+#endif // __WINDOWS__/!__WINDOWS__

 }
 
 // ----------------------------------------------------------------------------
 // wxMessageOutputStderr
 // ----------------------------------------------------------------------------
 
 }
 
 // ----------------------------------------------------------------------------
 // wxMessageOutputStderr
 // ----------------------------------------------------------------------------
 

+wxString wxMessageOutputStderr::AppendLineFeedIfNeeded(const wxString& str)
+{
+    wxString strLF(str);
+    if ( strLF.empty() || *strLF.rbegin() != '\n' )
+        strLF += '\n';
+
+    return strLF;
+}
+

 void wxMessageOutputStderr::Output(const wxString& str)
 {
 void wxMessageOutputStderr::Output(const wxString& str)
 {

-    const wxWX2MBbuf buf = str.mb_str();
+    const wxString strWithLF = AppendLineFeedIfNeeded(str);
+    const wxWX2MBbuf buf = strWithLF.mb_str();

 
     if ( buf )
 
     if ( buf )

-        fprintf(stderr, "%s", (const char*) buf);
+        fprintf(m_fp, "%s", (const char*) buf);

     else // print at least something
     else // print at least something

-        fprintf(stderr, "%s", (const char*) str.ToAscii());
+        fprintf(m_fp, "%s", (const char*) strWithLF.ToAscii());
+
+    fflush(m_fp);

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


@@ -163,30 +164,14 @@ void wxMessageOutputStderr::Output(const wxString& str)
 
 void wxMessageOutputDebug::Output(const wxString& str)
 {
 
 void wxMessageOutputDebug::Output(const wxString& str)
 {

-    wxString out(str);
-
-#if defined(__WXMSW__) && !defined(__WXMICROWIN__)
+#if defined(__WINDOWS__) && !defined(__WXMICROWIN__)
+    wxString out(AppendLineFeedIfNeeded(str));

     out.Replace(wxT("\t"), wxT("        "));
     out.Replace(wxT("\n"), wxT("\r\n"));
     out.Replace(wxT("\t"), wxT("        "));
     out.Replace(wxT("\n"), wxT("\r\n"));

-    ::OutputDebugString(out.wx_str());
-#elif defined(__WXMAC__) && !defined(__DARWIN__)
-    if ( wxIsDebuggerRunning() )
-    {
-        Str255 pstr;
-        wxString output = out + wxT(";g") ;
-        wxMacStringToPascal(output.c_str(), pstr);
-
-        #ifdef __powerc
-            DebugStr(pstr);
-        #else
-            SysBreakStr(pstr);
-        #endif
-    }
+    ::OutputDebugString(out.t_str());

 #else
 #else

-    wxFputs( out , stderr ) ;
-    if ( out.Right(1) != wxT("\n") )
-        wxFputs( wxT("\n") , stderr ) ;
-    fflush( stderr ) ;
+    // TODO: use native debug output function for the other ports too
+    wxMessageOutputStderr::Output(str);

 #endif // platform
 }
 
 #endif // platform
 }
 


@@ -200,7 +185,7 @@ void wxMessageOutputLog::Output(const wxString& str)
 
     out.Replace(wxT("\t"), wxT("        "));
 
 
     out.Replace(wxT("\t"), wxT("        "));
 

-    ::wxLogMessage(wxT("%s"), out.c_str());
+    wxLogMessage(wxT("%s"), out.c_str());

 }
 
 #endif // wxUSE_BASE
 }
 
 #endif // wxUSE_BASE


@@ -211,18 +196,19 @@ void wxMessageOutputLog::Output(const wxString& str)
 
 #if wxUSE_GUI && wxUSE_MSGDLG
 
 
 #if wxUSE_GUI && wxUSE_MSGDLG
 

+extern WXDLLEXPORT_DATA(const char) wxMessageBoxCaptionStr[] = "Message";
+

 void wxMessageOutputMessageBox::Output(const wxString& str)
 {
     wxString out(str);
 
     // the native MSW msg box understands the TABs, others don't
 void wxMessageOutputMessageBox::Output(const wxString& str)
 {
     wxString out(str);
 
     // the native MSW msg box understands the TABs, others don't

-#ifndef __WXMSW__
+#ifndef __WINDOWS__

     out.Replace(wxT("\t"), wxT("        "));
 #endif
 
     out.Replace(wxT("\t"), wxT("        "));
 #endif
 

-    wxString title;
-    if ( wxTheApp )
-        title.Printf(_("%s message"), wxTheApp->GetAppName().c_str());
+    wxString title = wxT("wxWidgets") ;
+    if (wxTheApp) title = wxTheApp->GetAppDisplayName();

 
     ::wxMessageBox(out, title);
 }
 
     ::wxMessageBox(out, title);
 }