workaround for MGL's weirdness: won't render rectangles of w=1 or h=1

[wxWidgets.git] / src / generic / logg.cpp

diff --git a/src/generic/logg.cpp b/src/generic/logg.cpp
index ca8c9ab26fa83a3a17ccecf31ce903dd985294cd..d87db7a141681729ee7651d31800e9f429d4819a 100644 (file)
--- a/src/generic/logg.cpp
+++ b/src/generic/logg.cpp
@@ -44,6 +44,7 @@
     #include "wx/sizer.h"
     #include "wx/statbmp.h"
     #include "wx/button.h"
     #include "wx/sizer.h"
     #include "wx/statbmp.h"
     #include "wx/button.h"

+    #include "wx/settings.h"

 #endif // WX_PRECOMP
 
 #if wxUSE_LOGGUI || wxUSE_LOGWINDOW
 #endif // WX_PRECOMP
 
 #if wxUSE_LOGGUI || wxUSE_LOGWINDOW


@@ -52,22 +53,16 @@
 #include "wx/textfile.h"
 #include "wx/statline.h"
 
 #include "wx/textfile.h"
 #include "wx/statline.h"
 

-#if wxUSE_LOG
-

 #ifdef  __WXMSW__
   // for OutputDebugString()
   #include  "wx/msw/private.h"
 #endif // Windows
 
 #ifdef  __WXMSW__
   // for OutputDebugString()
   #include  "wx/msw/private.h"
 #endif // Windows
 

-// may be defined to 0 for old behavior (using wxMessageBox) - shouldn't be
-// changed normally (that's why it's here and not in setup.h)
-#define wxUSE_LOG_DIALOG 1
-

 #if wxUSE_LOG_DIALOG
     #include "wx/listctrl.h"
     #include "wx/imaglist.h"
     #include "wx/image.h"
 #if wxUSE_LOG_DIALOG
     #include "wx/listctrl.h"
     #include "wx/imaglist.h"
     #include "wx/image.h"

-#else // !wxUSE_TEXTFILE
+#else // !wxUSE_LOG_DIALOG

     #include "wx/msgdlg.h"
 #endif // wxUSE_LOG_DIALOG/!wxUSE_LOG_DIALOG
 
     #include "wx/msgdlg.h"
 #endif // wxUSE_LOG_DIALOG/!wxUSE_LOG_DIALOG
 


@@ -154,7 +149,7 @@ END_EVENT_TABLE()
 // private functions
 // ----------------------------------------------------------------------------
 
 // private functions
 // ----------------------------------------------------------------------------
 

-#if wxUSE_FILE
+#if wxUSE_FILE && wxUSE_FILEDLG

 
 // pass an uninitialized file object, the function will ask the user for the
 // filename and try to open it, returns TRUE on success (file was opened),
 
 // pass an uninitialized file object, the function will ask the user for the
 // filename and try to open it, returns TRUE on success (file was opened),


@@ -169,8 +164,8 @@ static int OpenLogFile(wxFile& file, wxString *filename = NULL);
 // ----------------------------------------------------------------------------
 
 // we use a global variable to store the frame pointer for wxLogStatus - bad,
 // ----------------------------------------------------------------------------
 
 // we use a global variable to store the frame pointer for wxLogStatus - bad,

-// but it's he easiest way
-static wxFrame *gs_pFrame; // FIXME MT-unsafe
+// but it's the easiest way
+static wxFrame *gs_pFrame = NULL; // FIXME MT-unsafe

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


@@ -182,16 +177,13 @@ static wxFrame *gs_pFrame; // FIXME MT-unsafe
 
 // accepts an additional argument which tells to which frame the output should
 // be directed
 
 // accepts an additional argument which tells to which frame the output should
 // be directed

-void wxLogStatus(wxFrame *pFrame, const wxChar *szFormat, ...)
+void wxVLogStatus(wxFrame *pFrame, const wxChar *szFormat, va_list argptr)

 {
   wxString msg;
 
   wxLog *pLog = wxLog::GetActiveTarget();
   if ( pLog != NULL ) {
 {
   wxString msg;
 
   wxLog *pLog = wxLog::GetActiveTarget();
   if ( pLog != NULL ) {

-    va_list argptr;
-    va_start(argptr, szFormat);

     msg.PrintfV(szFormat, argptr);
     msg.PrintfV(szFormat, argptr);

-    va_end(argptr);

 
     wxASSERT( gs_pFrame == NULL ); // should be reset!
     gs_pFrame = pFrame;
 
     wxASSERT( gs_pFrame == NULL ); // should be reset!
     gs_pFrame = pFrame;


@@ -200,6 +192,14 @@ void wxLogStatus(wxFrame *pFrame, const wxChar *szFormat, ...)
   }
 }
 
   }
 }
 

+void wxLogStatus(wxFrame *pFrame, const wxChar *szFormat, ...)
+{
+    va_list argptr;
+    va_start(argptr, szFormat);
+    wxVLogStatus(pFrame, szFormat, argptr);
+    va_end(argptr);
+}
+

 // ----------------------------------------------------------------------------
 // wxLogGui implementation (FIXME MT-unsafe)
 // ----------------------------------------------------------------------------
 // ----------------------------------------------------------------------------
 // wxLogGui implementation (FIXME MT-unsafe)
 // ----------------------------------------------------------------------------


@@ -250,11 +250,12 @@ void wxLogGui::Flush()
     wxString title;
     title.Printf(titleFormat, appName.c_str());
 
     wxString title;
     title.Printf(titleFormat, appName.c_str());
 

-    // this is the best we can do here
-    wxWindow *parent = wxTheApp->GetTopWindow();
-

     size_t nMsgCount = m_aMessages.Count();
 
     size_t nMsgCount = m_aMessages.Count();
 

+    // avoid showing other log dialogs until we're done with the dialog we're
+    // showing right now: nested modal dialogs make for really bad UI!
+    Suspend();
+

     wxString str;
     if ( nMsgCount == 1 )
     {
     wxString str;
     if ( nMsgCount == 1 )
     {


@@ -263,7 +264,8 @@ void wxLogGui::Flush()
     else // more than one message
     {
 #if wxUSE_LOG_DIALOG
     else // more than one message
     {
 #if wxUSE_LOG_DIALOG

-        wxLogDialog dlg(parent,
+
+        wxLogDialog dlg(NULL,

                         m_aMessages, m_aSeverity, m_aTimes,
                         title, style);
 
                         m_aMessages, m_aSeverity, m_aTimes,
                         title, style);
 


@@ -295,11 +297,14 @@ void wxLogGui::Flush()
     // situation without it
     if ( !!str )
     {
     // situation without it
     if ( !!str )
     {

-        wxMessageBox(str, title, wxOK | style, parent);
+        wxMessageBox(str, title, wxOK | style);

 
         // no undisplayed messages whatsoever
         Clear();
     }
 
         // no undisplayed messages whatsoever
         Clear();
     }

+
+    // allow flushing the logs again
+    Resume();

 }
 
 // log all kinds of messages
 }
 
 // log all kinds of messages


@@ -310,12 +315,10 @@ void wxLogGui::DoLog(wxLogLevel level, const wxChar *szString, time_t t)
             if ( GetVerbose() )
         case wxLOG_Message:
             {
             if ( GetVerbose() )
         case wxLOG_Message:
             {

-                if ( !m_bErrors ) {
-                    m_aMessages.Add(szString);
-                    m_aSeverity.Add(wxLOG_Message);
-                    m_aTimes.Add((long)t);
-                    m_bHasMessages = TRUE;
-                }
+                m_aMessages.Add(szString);
+                m_aSeverity.Add(wxLOG_Message);
+                m_aTimes.Add((long)t);
+                m_bHasMessages = TRUE;

             }
             break;
 
             }
             break;
 


@@ -341,19 +344,21 @@ void wxLogGui::DoLog(wxLogLevel level, const wxChar *szString, time_t t)
         case wxLOG_Debug:
             #ifdef __WXDEBUG__
             {
         case wxLOG_Debug:
             #ifdef __WXDEBUG__
             {

-                #ifdef __WXMSW__
+                wxString str;
+                TimeStamp(&str);
+                str += szString;
+
+                #if defined(__WXMSW__) && !defined(__WXMICROWIN__)

                     // don't prepend debug/trace here: it goes to the
                     // don't prepend debug/trace here: it goes to the

-                    // debug window anyhow, but do put a timestamp
-                    wxString str;
-                    TimeStamp(&str);
-                    str << szString << wxT("\r\n");
+                    // debug window anyhow
+                    str += wxT("\r\n");

                     OutputDebugString(str);
                 #else
                     // send them to stderr
                     OutputDebugString(str);
                 #else
                     // send them to stderr

-                    wxFprintf(stderr, wxT("%s: %s\n"),
+                    wxFprintf(stderr, wxT("[%s] %s\n"),

                               level == wxLOG_Trace ? wxT("Trace")
                                                    : wxT("Debug"),
                               level == wxLOG_Trace ? wxT("Trace")
                                                    : wxT("Debug"),

-                              szString);
+                              str.c_str());

                     fflush(stderr);
                 #endif
             }
                     fflush(stderr);
                 #endif
             }


@@ -459,8 +464,14 @@ wxLogFrame::wxLogFrame(wxFrame *pParent, wxLogWindow *log, const wxChar *szTitle
             wxDefaultSize,
             wxTE_MULTILINE  |
             wxHSCROLL       |
             wxDefaultSize,
             wxTE_MULTILINE  |
             wxHSCROLL       |

+            // needed for Win32 to avoid 65Kb limit but it doesn't work well
+            // when using RichEdit 2.0 which we always do in the Unicode build
+#if !wxUSE_UNICODE
+            wxTE_RICH       |
+#endif // !wxUSE_UNICODE

             wxTE_READONLY);
 
             wxTE_READONLY);
 

+#if wxUSE_MENUS

     // create menu
     wxMenuBar *pMenuBar = new wxMenuBar;
     wxMenu *pMenu = new wxMenu;
     // create menu
     wxMenuBar *pMenuBar = new wxMenuBar;
     wxMenu *pMenu = new wxMenu;


@@ -472,6 +483,7 @@ wxLogFrame::wxLogFrame(wxFrame *pParent, wxLogWindow *log, const wxChar *szTitle
     pMenu->Append(Menu_Close, _("&Close"), _("Close this window"));
     pMenuBar->Append(pMenu, _("&Log"));
     SetMenuBar(pMenuBar);
     pMenu->Append(Menu_Close, _("&Close"), _("Close this window"));
     pMenuBar->Append(pMenu, _("&Log"));
     SetMenuBar(pMenuBar);

+#endif // wxUSE_MENUS

 
 #if wxUSE_STATUSBAR
     // status bar for menu prompts
 
 #if wxUSE_STATUSBAR
     // status bar for menu prompts


@@ -504,6 +516,7 @@ void wxLogFrame::OnCloseWindow(wxCloseEvent& WXUNUSED(event))
 #if wxUSE_FILE
 void wxLogFrame::OnSave(wxCommandEvent& WXUNUSED(event))
 {
 #if wxUSE_FILE
 void wxLogFrame::OnSave(wxCommandEvent& WXUNUSED(event))
 {

+#if wxUSE_FILEDLG

     wxString filename;
     wxFile file;
     int rc = OpenLogFile(file, &filename);
     wxString filename;
     wxFile file;
     int rc = OpenLogFile(file, &filename);


@@ -532,6 +545,7 @@ void wxLogFrame::OnSave(wxCommandEvent& WXUNUSED(event))
     else {
         wxLogStatus(this, _("Log saved to the file '%s'."), filename.c_str());
     }
     else {
         wxLogStatus(this, _("Log saved to the file '%s'."), filename.c_str());
     }

+#endif

 }
 #endif // wxUSE_FILE
 
 }
 #endif // wxUSE_FILE
 


@@ -547,15 +561,15 @@ wxLogFrame::~wxLogFrame()
 
 // wxLogWindow
 // -----------
 
 // wxLogWindow
 // -----------

+

 wxLogWindow::wxLogWindow(wxFrame *pParent,
                          const wxChar *szTitle,
                          bool bShow,
                          bool bDoPass)
 {
 wxLogWindow::wxLogWindow(wxFrame *pParent,
                          const wxChar *szTitle,
                          bool bShow,
                          bool bDoPass)
 {

-    m_bPassMessages = bDoPass;
+    PassMessages(bDoPass);

 
     m_pLogFrame = new wxLogFrame(pParent, this, szTitle);
 
     m_pLogFrame = new wxLogFrame(pParent, this, szTitle);

-    m_pOldLog = wxLog::SetActiveTarget(this);

 
     if ( bShow )
         m_pLogFrame->Show(TRUE);
 
     if ( bShow )
         m_pLogFrame->Show(TRUE);


@@ -566,21 +580,10 @@ void wxLogWindow::Show(bool bShow)
     m_pLogFrame->Show(bShow);
 }
 
     m_pLogFrame->Show(bShow);
 }
 

-void wxLogWindow::Flush()
-{
-    if ( m_pOldLog != NULL )
-        m_pOldLog->Flush();
-
-    m_bHasMessages = FALSE;
-}
-

 void wxLogWindow::DoLog(wxLogLevel level, const wxChar *szString, time_t t)
 {
     // first let the previous logger show it
 void wxLogWindow::DoLog(wxLogLevel level, const wxChar *szString, time_t t)
 {
     // first let the previous logger show it

-    if ( m_pOldLog != NULL && m_bPassMessages ) {
-        // bogus cast just to access protected DoLog
-        ((wxLogWindow *)m_pOldLog)->DoLog(level, szString, t);
-    }
+    wxLogPassThrough::DoLog(level, szString, t);

 
     if ( m_pLogFrame ) {
         switch ( level ) {
 
     if ( m_pLogFrame ) {
         switch ( level ) {


@@ -653,8 +656,6 @@ void wxLogWindow::OnFrameDelete(wxFrame * WXUNUSED(frame))
 
 wxLogWindow::~wxLogWindow()
 {
 
 wxLogWindow::~wxLogWindow()
 {

-    delete m_pOldLog;
-

     // may be NULL if log frame already auto destroyed itself
     delete m_pLogFrame;
 }
     // may be NULL if log frame already auto destroyed itself
     delete m_pLogFrame;
 }


@@ -675,7 +676,9 @@ wxLogDialog::wxLogDialog(wxWindow *parent,
                          const wxArrayLong& times,
                          const wxString& caption,
                          long style)
                          const wxArrayLong& times,
                          const wxString& caption,
                          long style)

-           : wxDialog(parent, -1, caption)
+           : wxDialog(parent, -1, caption,
+                      wxDefaultPosition, wxDefaultSize,
+                      wxDEFAULT_DIALOG_STYLE | wxRESIZE_BORDER)

 {
     if ( ms_details.IsEmpty() )
     {
 {
     if ( ms_details.IsEmpty() )
     {


@@ -726,20 +729,21 @@ wxLogDialog::wxLogDialog(wxWindow *parent,
     // to close the log dialog with <Esc> which wouldn't work otherwise (as it
     // translates into click on cancel button)
     wxButton *btnOk = new wxButton(this, wxID_CANCEL, _("OK"));
     // to close the log dialog with <Esc> which wouldn't work otherwise (as it
     // translates into click on cancel button)
     wxButton *btnOk = new wxButton(this, wxID_CANCEL, _("OK"));

-    sizerButtons->Add(btnOk, 0, wxCENTRE|wxBOTTOM, MARGIN/2);
+    sizerButtons->Add(btnOk, 0, wxCENTRE | wxBOTTOM, MARGIN/2);

     m_btnDetails = new wxButton(this, wxID_MORE, ms_details + _T(" >>"));
     m_btnDetails = new wxButton(this, wxID_MORE, ms_details + _T(" >>"));

-    sizerButtons->Add(m_btnDetails, 0, wxCENTRE|wxTOP, MARGIN/2 - 1);
+    sizerButtons->Add(m_btnDetails, 0, wxCENTRE | wxTOP, MARGIN/2 - 1);

 
 #ifndef __WIN16__
     wxIcon icon = wxTheApp->GetStdIcon((int)(style & wxICON_MASK));
 
 #ifndef __WIN16__
     wxIcon icon = wxTheApp->GetStdIcon((int)(style & wxICON_MASK));

-    sizerAll->Add(new wxStaticBitmap(this, -1, icon), 0, wxCENTRE);
+    sizerAll->Add(new wxStaticBitmap(this, -1, icon), 0);

 #endif // !Win16
 
     const wxString& message = messages.Last();
 #endif // !Win16
 
     const wxString& message = messages.Last();

-    sizerAll->Add(CreateTextSizer(message), 0, wxCENTRE|wxLEFT|wxRIGHT, MARGIN);
-    sizerAll->Add(sizerButtons, 0, wxALIGN_RIGHT|wxLEFT, MARGIN);
+    sizerAll->Add(CreateTextSizer(message), 1,
+                  wxALIGN_CENTRE_VERTICAL | wxLEFT | wxRIGHT, MARGIN);
+    sizerAll->Add(sizerButtons, 0, wxALIGN_RIGHT | wxLEFT, MARGIN);

 
 

-    sizerTop->Add(sizerAll, 0, wxCENTRE|wxALL, MARGIN);
+    sizerTop->Add(sizerAll, 0, wxALL | wxEXPAND, MARGIN);

 
     SetAutoLayout(TRUE);
     SetSizer(sizerTop);
 
     SetAutoLayout(TRUE);
     SetSizer(sizerTop);


@@ -871,7 +875,13 @@ void wxLogDialog::CreateDetailsControls()
     int y;
     GetTextExtent(_T("H"), (int*)NULL, &y, (int*)NULL, (int*)NULL, &font);
     int height = wxMax(y*(count + 3), 100);
     int y;
     GetTextExtent(_T("H"), (int*)NULL, &y, (int*)NULL, (int*)NULL, &font);
     int height = wxMax(y*(count + 3), 100);

-    m_listctrl->SetSize(-1, height);
+
+    // if the height as computed from list items exceeds, together with the
+    // actual message & controls, the screen, make it smaller
+    int heightMax =
+        (3*wxSystemSettings::GetMetric(wxSYS_SCREEN_Y))/5 - GetSize().y;
+
+    m_listctrl->SetSize(-1, wxMin(height, heightMax));

 }
 
 void wxLogDialog::OnListSelect(wxListEvent& event)
 }
 
 void wxLogDialog::OnListSelect(wxListEvent& event)


@@ -891,6 +901,7 @@ void wxLogDialog::OnOk(wxCommandEvent& WXUNUSED(event))
 
 void wxLogDialog::OnSave(wxCommandEvent& WXUNUSED(event))
 {
 
 void wxLogDialog::OnSave(wxCommandEvent& WXUNUSED(event))
 {

+#if wxUSE_FILEDLG

     wxFile file;
     int rc = OpenLogFile(file);
     if ( rc == -1 )
     wxFile file;
     int rc = OpenLogFile(file);
     if ( rc == -1 )


@@ -925,6 +936,7 @@ void wxLogDialog::OnSave(wxCommandEvent& WXUNUSED(event))
 
     if ( !ok )
         wxLogError(_("Can't save log contents to file."));
 
     if ( !ok )
         wxLogError(_("Can't save log contents to file."));

+#endif

 }
 
 #endif // wxUSE_FILE
 }
 
 #endif // wxUSE_FILE


@@ -991,7 +1003,7 @@ wxLogDialog::~wxLogDialog()
 
 #endif // wxUSE_LOG_DIALOG
 
 
 #endif // wxUSE_LOG_DIALOG
 

-#if wxUSE_FILE
+#if wxUSE_FILE && wxUSE_FILEDLG

 
 // pass an uninitialized file object, the function will ask the user for the
 // filename and try to open it, returns TRUE on success (file was opened),
 
 // pass an uninitialized file object, the function will ask the user for the
 // filename and try to open it, returns TRUE on success (file was opened),


@@ -1069,7 +1081,7 @@ void wxLogTextCtrl::DoLogString(const wxChar *szString, time_t WXUNUSED(t))
     wxString msg;
     TimeStamp(&msg);
 
     wxString msg;
     TimeStamp(&msg);
 

-#ifdef __WXMAC__
+#if defined(__WXMAC__) && !defined(__DARWIN__)

     // VZ: this is a bug in wxMac, it *must* accept '\n' as new line, the
     //     translation must be done in wxTextCtrl, not here! (FIXME)
     msg << szString << wxT('\r');
     // VZ: this is a bug in wxMac, it *must* accept '\n' as new line, the
     //     translation must be done in wxTextCtrl, not here! (FIXME)
     msg << szString << wxT('\r');