cleaned up the checkbox creation code (~70 lines of code became 3)

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

diff --git a/src/generic/logg.cpp b/src/generic/logg.cpp
index 68555e35e6fe8def4ca6bad3357ad49265b7829f..345cb33530b9fca8ede596a4e88b894fd4038fb4 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


@@ -51,6 +52,7 @@
 #include "wx/file.h"
 #include "wx/textfile.h"
 #include "wx/statline.h"
 #include "wx/file.h"
 #include "wx/textfile.h"
 #include "wx/statline.h"

+#include "wx/artprov.h"

 
 #ifdef  __WXMSW__
   // for OutputDebugString()
 
 #ifdef  __WXMSW__
   // for OutputDebugString()


@@ -176,16 +178,13 @@ static wxFrame *gs_pFrame = NULL; // 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;


@@ -194,6 +193,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)
 // ----------------------------------------------------------------------------


@@ -244,9 +251,6 @@ 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();
 
     // avoid showing other log dialogs until we're done with the dialog we're
     size_t nMsgCount = m_aMessages.Count();
 
     // avoid showing other log dialogs until we're done with the dialog we're


@@ -262,7 +266,7 @@ void wxLogGui::Flush()
     {
 #if wxUSE_LOG_DIALOG
 
     {
 #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);
 


@@ -294,7 +298,7 @@ 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();


@@ -312,12 +316,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;
 


@@ -463,6 +465,11 @@ 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);
 
 #if wxUSE_MENUS
             wxTE_READONLY);
 
 #if wxUSE_MENUS


@@ -728,8 +735,19 @@ wxLogDialog::wxLogDialog(wxWindow *parent,
     sizerButtons->Add(m_btnDetails, 0, wxCENTRE | wxTOP, MARGIN/2 - 1);
 
 #ifndef __WIN16__
     sizerButtons->Add(m_btnDetails, 0, wxCENTRE | wxTOP, MARGIN/2 - 1);
 
 #ifndef __WIN16__

-    wxIcon icon = wxTheApp->GetStdIcon((int)(style & wxICON_MASK));
-    sizerAll->Add(new wxStaticBitmap(this, -1, icon), 0);
+    wxBitmap bitmap;
+    switch ( style & wxICON_MASK )
+    {
+        case wxICON_ERROR:
+            bitmap = wxArtProvider::GetIcon(wxART_ERROR, wxART_MESSAGE_BOX); break;
+        case wxICON_INFORMATION:
+            bitmap = wxArtProvider::GetIcon(wxART_INFORMATION, wxART_MESSAGE_BOX); break;
+        case wxICON_WARNING:
+            bitmap = wxArtProvider::GetIcon(wxART_WARNING, wxART_MESSAGE_BOX); break;
+        default:
+            wxFAIL_MSG(_T("incorrect log style"));
+    }
+    sizerAll->Add(new wxStaticBitmap(this, -1, bitmap), 0);

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


@@ -789,11 +807,11 @@ void wxLogDialog::CreateDetailsControls()
     wxImageList *imageList = new wxImageList(ICON_SIZE, ICON_SIZE);
 
     // order should be the same as in the switch below!
     wxImageList *imageList = new wxImageList(ICON_SIZE, ICON_SIZE);
 
     // order should be the same as in the switch below!

-    static const int icons[] =
+    static const wxChar* icons[] =

     {
     {

-        wxICON_ERROR,
-        wxICON_EXCLAMATION,
-        wxICON_INFORMATION
+        wxART_ERROR,
+        wxART_WARNING,
+        wxART_INFORMATION

     };
 
     bool loadedIcons = TRUE;
     };
 
     bool loadedIcons = TRUE;


@@ -801,17 +819,19 @@ void wxLogDialog::CreateDetailsControls()
 #ifndef __WIN16__
     for ( size_t icon = 0; icon < WXSIZEOF(icons); icon++ )
     {
 #ifndef __WIN16__
     for ( size_t icon = 0; icon < WXSIZEOF(icons); icon++ )
     {

-        wxBitmap bmp = wxTheApp->GetStdIcon(icons[icon]);
+        wxBitmap bmp = wxArtProvider::GetBitmap(icons[icon], wxART_MESSAGE_BOX,
+                                                wxSize(ICON_SIZE, ICON_SIZE));

 
 

-        // This may very well fail if there are insufficient
-        // colours available. Degrade gracefully.
-
-        if (!bmp.Ok())
+        // This may very well fail if there are insufficient colours available.
+        // Degrade gracefully.
+        if ( !bmp.Ok() )
+        {

             loadedIcons = FALSE;
             loadedIcons = FALSE;

-        else
-            imageList->Add(wxImage(bmp).
-                        Rescale(ICON_SIZE, ICON_SIZE).
-                         ConvertToBitmap());
+
+            break;
+        }
+
+        imageList->Add(bmp);

     }
 
     m_listctrl->SetImageList(imageList, wxIMAGE_LIST_SMALL);
     }
 
     m_listctrl->SetImageList(imageList, wxIMAGE_LIST_SMALL);


@@ -828,48 +848,54 @@ void wxLogDialog::CreateDetailsControls()
     size_t count = m_messages.GetCount();
     for ( size_t n = 0; n < count; n++ )
     {
     size_t count = m_messages.GetCount();
     for ( size_t n = 0; n < count; n++ )
     {

-        int image = -1;
+        int image;
+

 #ifndef __WIN16__
 #ifndef __WIN16__

-        switch ( m_severity[n] )
+        if ( loadedIcons )

         {
         {

-            case wxLOG_Error:
-                image = 0;
-                break;
+            switch ( m_severity[n] )
+            {
+                case wxLOG_Error:
+                    image = 0;
+                    break;

 
 

-            case wxLOG_Warning:
-                image = 1;
-                break;
+                case wxLOG_Warning:
+                    image = 1;
+                    break;

 
 

-            default:
-                image = 2;
+                default:
+                    image = 2;
+            }

         }
         }

+        else // failed to load images

 #endif // !Win16
 #endif // !Win16

-
-        if (!loadedIcons)
+        {

             image = -1;
             image = -1;

+        }

 
 

-        if (image > -1)
-            m_listctrl->InsertItem(n, m_messages[n], image);
-        else
-            m_listctrl->InsertItem(n, m_messages[n]);
-
-        m_listctrl->SetItem(n, 1,
-                            TimeStamp(fmt, (time_t)m_times[n]));
+        m_listctrl->InsertItem(n, m_messages[n], image);
+        m_listctrl->SetItem(n, 1, TimeStamp(fmt, (time_t)m_times[n]));

     }
 
     // let the columns size themselves
     m_listctrl->SetColumnWidth(0, wxLIST_AUTOSIZE);
     m_listctrl->SetColumnWidth(1, wxLIST_AUTOSIZE);
 
     }
 
     // let the columns size themselves
     m_listctrl->SetColumnWidth(0, wxLIST_AUTOSIZE);
     m_listctrl->SetColumnWidth(1, wxLIST_AUTOSIZE);
 

-    // get the approx height of the listctrl
-    wxFont font = GetFont();
-    if ( !font.Ok() )
-        font = *wxSWISS_FONT;
+    // calculate an approximately nice height for the listctrl
+    int height = GetCharHeight()*(count + 4);
+
+    // but check that the dialog won't fall fown from the screen
+    //
+    // we use GetMinHeight() to get the height of the dialog part without the
+    // details and we consider that the "Save" button below and the separator
+    // line (and the margins around it) take about as much, hence double it
+    int heightMax = wxGetDisplaySize().y - GetPosition().y - 2*GetMinHeight();
+
+    // we should leave a margin
+    heightMax *= 9;
+    heightMax /= 10;

 
 

-    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);
+    m_listctrl->SetSize(-1, wxMin(height, heightMax));

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


@@ -924,7 +950,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_FILEDLG

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


@@ -962,6 +988,15 @@ void wxLogDialog::OnDetails(wxCommandEvent& WXUNUSED(event))
 
         sizer->Add(m_listctrl, 1, wxEXPAND | (wxALL & ~wxTOP), MARGIN);
 
 
         sizer->Add(m_listctrl, 1, wxEXPAND | (wxALL & ~wxTOP), MARGIN);
 

+        // VZ: this doesn't work as this becomes the initial (and not only
+        //     minimal) listctrl height as well - why?
+#if 0
+        // allow the user to make the dialog shorter than its initial height -
+        // without this it wouldn't work as the list ctrl would have been
+        // incompressible
+        sizer->SetItemMinSize(m_listctrl, 100, 3*GetCharHeight());
+#endif // 0
+

 #if wxUSE_FILE
         sizer->Add(m_btnSave, 0, wxALIGN_RIGHT | (wxALL & ~wxTOP), MARGIN);
 #endif // wxUSE_FILE
 #if wxUSE_FILE
         sizer->Add(m_btnSave, 0, wxALIGN_RIGHT | (wxALL & ~wxTOP), MARGIN);
 #endif // wxUSE_FILE


@@ -1069,7 +1104,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');