Reverted previous 'fixes' now that the array bug has been cured

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

diff --git a/src/generic/logg.cpp b/src/generic/logg.cpp
index fd60b1f97223c4937c6e0eedfbf70e46939f2009..969ccb4b2da303618749809d30fe26fa509cd9bd 100644 (file)
--- a/src/generic/logg.cpp
+++ b/src/generic/logg.cpp
@@ -1,5 +1,5 @@
 /////////////////////////////////////////////////////////////////////////////
 /////////////////////////////////////////////////////////////////////////////

-// Name:        logg.cpp
+// Name:        src/generic/logg.cpp

 // Purpose:     wxLog-derived classes which need GUI support (the rest is in
 //              src/common/log.cpp)
 // Author:      Vadim Zeitlin
 // Purpose:     wxLog-derived classes which need GUI support (the rest is in
 //              src/common/log.cpp)
 // Author:      Vadim Zeitlin


@@ -52,12 +52,17 @@
 #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()
   #include  "wx/msw/private.h"
 #endif // Windows
 
 
 #ifdef  __WXMSW__
   // for OutputDebugString()
   #include  "wx/msw/private.h"
 #endif // Windows
 

+#ifdef  __WXPM__
+  #include <time.h>
+#endif
+

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


@@ -66,6 +71,9 @@
     #include "wx/msgdlg.h"
 #endif // wxUSE_LOG_DIALOG/!wxUSE_LOG_DIALOG
 
     #include "wx/msgdlg.h"
 #endif // wxUSE_LOG_DIALOG/!wxUSE_LOG_DIALOG
 

+// the suffix we add to the button to show that the dialog can be expanded
+#define EXPAND_SUFFIX _T(" >>")
+

 // ----------------------------------------------------------------------------
 // private classes
 // ----------------------------------------------------------------------------
 // ----------------------------------------------------------------------------
 // private classes
 // ----------------------------------------------------------------------------


@@ -730,12 +738,38 @@ wxLogDialog::wxLogDialog(wxWindow *parent,
     // translates into click on cancel button)
     wxButton *btnOk = new wxButton(this, wxID_CANCEL, _("OK"));
     sizerButtons->Add(btnOk, 0, wxCENTRE | wxBOTTOM, MARGIN/2);
     // translates into click on cancel button)
     wxButton *btnOk = new wxButton(this, wxID_CANCEL, _("OK"));
     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 + EXPAND_SUFFIX);

     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);
+#ifdef __WXPM__
+            bitmap.SetId(wxICON_SMALL_ERROR);
+#endif
+            break;
+
+        case wxICON_INFORMATION:
+            bitmap = wxArtProvider::GetIcon(wxART_INFORMATION, wxART_MESSAGE_BOX);
+#ifdef __WXPM__
+            bitmap.SetId(wxICON_SMALL_INFO);
+#endif
+            break;
+
+        case wxICON_WARNING:
+            bitmap = wxArtProvider::GetIcon(wxART_WARNING, wxART_MESSAGE_BOX);
+#ifdef __WXPM__
+            bitmap.SetId(wxICON_SMALL_WARNING);
+#endif
+            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();


@@ -748,8 +782,19 @@ wxLogDialog::wxLogDialog(wxWindow *parent,
     SetAutoLayout(TRUE);
     SetSizer(sizerTop);
 
     SetAutoLayout(TRUE);
     SetSizer(sizerTop);
 

-    sizerTop->SetSizeHints(this);
-    sizerTop->Fit(this);
+    // see comments in OnDetails()
+    //
+    // Note: Doing this, this way, triggered a nasty bug in
+    //       wxTopLevelWindowGTK::GtkOnSize which took -1 literally once
+    //       either of maxWidth or maxHeight was set.  This symptom has been
+    //       fixed there, but it is a problem that remains as long as we allow
+    //       unchecked access to the internal size members.  We really need to
+    //       encapuslate window sizes more cleanly and make it clear when -1 will
+    //       be substituted and when it will not.
+
+    wxSize size = sizerTop->Fit(this);
+    m_maxHeight = size.y;
+    SetSizeHints(size.x, size.y, m_maxWidth, m_maxHeight);

 
     btnOk->SetFocus();
 
 
     btnOk->SetFocus();
 


@@ -795,11 +840,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;


@@ -807,7 +852,8 @@ 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.
 
         // This may very well fail if there are insufficient colours available.
         // Degrade gracefully.


@@ -818,8 +864,7 @@ void wxLogDialog::CreateDetailsControls()
             break;
         }
 
             break;
         }
 

-        wxImage img(bmp);
-        imageList->Add(img.Rescale(ICON_SIZE, ICON_SIZE).ConvertToBitmap());
+        imageList->Add(bmp);

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


@@ -949,7 +994,7 @@ void wxLogDialog::OnDetails(wxCommandEvent& WXUNUSED(event))
 
     if ( m_showingDetails )
     {
 
     if ( m_showingDetails )
     {

-        m_btnDetails->SetLabel(ms_details + _T(">>"));
+        m_btnDetails->SetLabel(ms_details + EXPAND_SUFFIX);

 
         sizer->Remove(m_listctrl);
 
 
         sizer->Remove(m_listctrl);
 


@@ -992,9 +1037,34 @@ void wxLogDialog::OnDetails(wxCommandEvent& WXUNUSED(event))
 
     m_showingDetails = !m_showingDetails;
 
 
     m_showingDetails = !m_showingDetails;
 

-    // in any case, our size changed - update
-    sizer->SetSizeHints(this);
-    sizer->Fit(this);
+    // in any case, our size changed - relayout everything and set new hints
+    // ---------------------------------------------------------------------
+
+    // we have to reset min size constraints or Fit() would never reduce the
+    // dialog size when collapsing it and we have to reset max constraint
+    // because it wouldn't expand it otherwise
+
+    m_minHeight =
+    m_maxHeight = -1;
+
+    // wxSizer::FitSize() is private, otherwise we might use it directly...
+    wxSize sizeTotal = GetSize(),
+           sizeClient = GetClientSize();
+
+    wxSize size = sizer->GetMinSize();
+    size.x += sizeTotal.x - sizeClient.x;
+    size.y += sizeTotal.y - sizeClient.y;
+
+    // we don't want to allow expanding the dialog in vertical direction as
+    // this would show the "hidden" details but we can resize the dialog
+    // vertically while the details are shown
+    if ( !m_showingDetails )
+        m_maxHeight = size.y;
+
+    SetSizeHints(size.x, size.y, m_maxWidth, m_maxHeight);
+
+    // don't change the width when expanding/collapsing
+    SetSize(-1, size.y);

 
 #ifdef __WXGTK__
     // VS: this is neccessary in order to force frame redraw under
 
 #ifdef __WXGTK__
     // VS: this is neccessary in order to force frame redraw under


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

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

     // 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');


@@ -1105,3 +1175,4 @@ void wxLogTextCtrl::DoLogString(const wxChar *szString, time_t WXUNUSED(t))
 
 #endif // wxUSE_TEXTCTRL
 
 
 #endif // wxUSE_TEXTCTRL
 

+// vi:sts=4:sw=4:et