invalidate the best size when adding or deleting items

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

diff --git a/src/common/msgout.cpp b/src/common/msgout.cpp
index 3e9471de8dfe71cb956ca8fbd196c04306993ce1..44ec5e15971b37c613cf6396450c1c35a25fe637 100755 (executable)
--- a/src/common/msgout.cpp
+++ b/src/common/msgout.cpp
@@ -1,5 +1,5 @@
 /////////////////////////////////////////////////////////////////////////////
 /////////////////////////////////////////////////////////////////////////////

-// Name:        common/msgout.cpp
+// Name:        src/common/msgout.cpp

 // Purpose:     wxMessageOutput implementation
 // Author:      Mattia Barbon
 // Modified by:
 // Purpose:     wxMessageOutput implementation
 // Author:      Mattia Barbon
 // Modified by:


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

-#if defined(__GNUG__) && !defined(NO_GCC_PRAGMA) && !defined(__EMX__)
-// Some older compilers (such as EMX) cannot handle
-// #pragma interface/implementation correctly, iff
-// #pragma implementation is used in _two_ translation
-// units (as created by e.g. event.cpp compiled for
-// libwx_base and event.cpp compiled for libwx_gui_core).
-// So we must not use those pragmas for those compilers in
-// such files.
-    #pragma implementation "msgout.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"
 


@@ -40,6 +29,7 @@
     #include "wx/ffile.h"
     #include "wx/app.h"
     #include "wx/intl.h"
     #include "wx/ffile.h"
     #include "wx/app.h"
     #include "wx/intl.h"

+    #include "wx/log.h"

     #if wxUSE_GUI
         #include "wx/msgdlg.h"
     #endif // wxUSE_GUI
     #if wxUSE_GUI
         #include "wx/msgdlg.h"
     #endif // wxUSE_GUI


@@ -47,8 +37,6 @@
 
 #include "wx/msgout.h"
 #include "wx/apptrait.h"
 
 #include "wx/msgout.h"
 #include "wx/apptrait.h"

-#include "wx/log.h"
-

 #include <stdarg.h>
 #include <stdio.h>
 
 #include <stdarg.h>
 #include <stdio.h>
 


@@ -88,6 +76,18 @@ wxMessageOutput* wxMessageOutput::Set(wxMessageOutput* msgout)
     return old;
 }
 
     return old;
 }
 

+void wxMessageOutput::DoPrintf(const wxChar* format, ...)
+{
+    va_list args;
+    va_start(args, format);
+    wxString out;
+
+    out.PrintfV(format, args);
+    va_end(args);
+
+    Output(out);
+}
+

 // ----------------------------------------------------------------------------
 // wxMessageOutputBest
 // ----------------------------------------------------------------------------
 // ----------------------------------------------------------------------------
 // wxMessageOutputBest
 // ----------------------------------------------------------------------------


@@ -107,24 +107,22 @@ static inline bool IsInConsole()
 
 #endif // __WINDOWS__
 
 
 #endif // __WINDOWS__
 

-void wxMessageOutputBest::Printf(const wxChar* format, ...)
+void wxMessageOutputBest::Output(const wxString& str)

 {
 {

-    va_list args;
-    va_start(args, format);
-    wxString out;
-
-    out.PrintfV(format, args);
-    va_end(args);
-

 #ifdef __WINDOWS__
     if ( !IsInConsole() )
     {
 #ifdef __WINDOWS__
     if ( !IsInConsole() )
     {

-        ::MessageBox(NULL, out, _T("wxWidgets"), MB_ICONINFORMATION | MB_OK);
+        ::MessageBox(NULL, str, _T("wxWidgets"), MB_ICONINFORMATION | MB_OK);

     }
     else
 #endif // __WINDOWS__/!__WINDOWS__
     {
     }
     else
 #endif // __WINDOWS__/!__WINDOWS__
     {

-        fprintf(stderr, "%s", (const char*) out.mb_str());
+        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());

     }
 }
 
     }
 }
 


@@ -132,31 +130,23 @@ void wxMessageOutputBest::Printf(const wxChar* format, ...)
 // wxMessageOutputStderr
 // ----------------------------------------------------------------------------
 
 // wxMessageOutputStderr
 // ----------------------------------------------------------------------------
 

-void wxMessageOutputStderr::Printf(const wxChar* format, ...)
+void wxMessageOutputStderr::Output(const wxString& str)

 {
 {

-    va_list args;
-    va_start(args, format);
-    wxString out;
+    const wxWX2MBbuf buf = str.mb_str();

 
 

-    out.PrintfV(format, args);
-    va_end(args);
-
-    fprintf(stderr, "%s", (const char*) out.mb_str());
+    if ( buf )
+        fprintf(stderr, "%s", (const char*) buf);
+    else // print at least something
+        fprintf(stderr, "%s", (const char*) str.ToAscii());

 }
 
 // ----------------------------------------------------------------------------
 // wxMessageOutputDebug
 // ----------------------------------------------------------------------------
 
 }
 
 // ----------------------------------------------------------------------------
 // wxMessageOutputDebug
 // ----------------------------------------------------------------------------
 

-void wxMessageOutputDebug::Printf(const wxChar* format, ...)
+void wxMessageOutputDebug::Output(const wxString& str)

 {
 {

-    wxString out;
-
-    va_list args;
-    va_start(args, format);
-
-    out.PrintfV(format, args);
-    va_end(args);
+    wxString out(str);

 
 #if defined(__WXMSW__) && !defined(__WXMICROWIN__)
     out.Replace(wxT("\t"), wxT("        "));
 
 #if defined(__WXMSW__) && !defined(__WXMICROWIN__)
     out.Replace(wxT("\t"), wxT("        "));


@@ -187,15 +177,9 @@ void wxMessageOutputDebug::Printf(const wxChar* format, ...)
 // wxMessageOutputLog
 // ----------------------------------------------------------------------------
 
 // wxMessageOutputLog
 // ----------------------------------------------------------------------------
 

-void wxMessageOutputLog::Printf(const wxChar* format, ...)
+void wxMessageOutputLog::Output(const wxString& str)

 {
 {

-    wxString out;
-
-    va_list args;
-    va_start(args, format);
-
-    out.PrintfV(format, args);
-    va_end(args);
+    wxString out(str);

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


@@ -210,14 +194,9 @@ void wxMessageOutputLog::Printf(const wxChar* format, ...)
 
 #if wxUSE_GUI
 
 
 #if wxUSE_GUI
 

-void wxMessageOutputMessageBox::Printf(const wxChar* format, ...)
+void wxMessageOutputMessageBox::Output(const wxString& str)

 {
 {

-    va_list args;
-    va_start(args, format);
-    wxString out;
-
-    out.PrintfV(format, args);
-    va_end(args);
+    wxString out(str);

 
     // the native MSW msg box understands the TABs, others don't
 #ifndef __WXMSW__
 
     // the native MSW msg box understands the TABs, others don't
 #ifndef __WXMSW__


@@ -232,4 +211,3 @@ void wxMessageOutputMessageBox::Printf(const wxChar* format, ...)
 }
 
 #endif // wxUSE_GUI
 }
 
 #endif // wxUSE_GUI

-