Fix typo in last commit

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

diff --git a/src/generic/logg.cpp b/src/generic/logg.cpp
index 88a17cd700bc52481aee11b8254285f7cc609164..1cb929ddb0f448d07df8a9eb95ad4c207f1fe38b 100644 (file)
--- a/src/generic/logg.cpp
+++ b/src/generic/logg.cpp
@@ -76,7 +76,7 @@
 #include "wx/datetime.h"
 
 // the suffix we add to the button to show that the dialog can be expanded
 #include "wx/datetime.h"
 
 // the suffix we add to the button to show that the dialog can be expanded

-#define EXPAND_SUFFIX _T(" >>")
+#define EXPAND_SUFFIX wxT(" >>")

 
 #define CAN_SAVE_FILES (wxUSE_FILE && wxUSE_FILEDLG)
 
 
 #define CAN_SAVE_FILES (wxUSE_FILE && wxUSE_FILEDLG)
 


@@ -96,7 +96,7 @@ static wxString TimeStamp(const wxString& format, time_t t)
     if ( !wxStrftime(buf, WXSIZEOF(buf), format, wxLocaltime_r(&t, &tm)) )
     {
         // buffer is too small?
     if ( !wxStrftime(buf, WXSIZEOF(buf), format, wxLocaltime_r(&t, &tm)) )
     {
         // buffer is too small?

-        wxFAIL_MSG(_T("strftime() failed"));
+        wxFAIL_MSG(wxT("strftime() failed"));

     }
     return wxString(buf);
 #else // !wxUSE_DATETIME
     }
     return wxString(buf);
 #else // !wxUSE_DATETIME


@@ -371,7 +371,7 @@ void wxLogGui::DoLogRecord(wxLogLevel level,
                 wxFrame *pFrame = NULL;
 
                 // check if the frame was passed to us explicitly
                 wxFrame *pFrame = NULL;
 
                 // check if the frame was passed to us explicitly

-                wxUIntPtr ptr = NULL;
+                wxUIntPtr ptr = 0;

                 if ( info.GetNumValue(wxLOG_KEY_FRAME, &ptr) )
                 {
                     pFrame = static_cast<wxFrame *>(wxUIntToPtr(ptr));
                 if ( info.GetNumValue(wxLOG_KEY_FRAME, &ptr) )
                 {
                     pFrame = static_cast<wxFrame *>(wxUIntToPtr(ptr));


@@ -417,10 +417,25 @@ void wxLogGui::DoLogRecord(wxLogLevel level,
             m_bHasMessages = true;
             break;
 
             m_bHasMessages = true;
             break;
 

-        default:
-            // let the base class deal with debug/trace messages as well as any
-            // custom levels
+        case wxLOG_Debug:
+        case wxLOG_Trace:
+            // let the base class deal with debug/trace messages

             wxLog::DoLogRecord(level, msg, info);
             wxLog::DoLogRecord(level, msg, info);

+            break;
+
+        case wxLOG_FatalError:
+        case wxLOG_Max:
+            // fatal errors are shown immediately and terminate the program so
+            // we should never see them here
+            wxFAIL_MSG("unexpected log level");
+            break;
+
+        case wxLOG_Progress:
+        case wxLOG_User:
+            // just ignore those: passing them to the base class would result
+            // in asserts from DoLogText() because DoLogTextAtLevel() would
+            // call it as it doesn't know how to handle these levels otherwise
+            break;

     }
 }
 
     }
 }
 


@@ -595,6 +610,11 @@ wxLogWindow::wxLogWindow(wxWindow *pParent,
                          bool bShow,
                          bool bDoPass)
 {
                          bool bShow,
                          bool bDoPass)
 {

+    // Initialize it to NULL to ensure that we don't crash if any log messages
+    // are generated before the frame is fully created (while this doesn't
+    // happen normally, it might, in principle).
+    m_pLogFrame = NULL;
+

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


@@ -610,9 +630,6 @@ void wxLogWindow::Show(bool bShow)
 
 void wxLogWindow::DoLogTextAtLevel(wxLogLevel level, const wxString& msg)
 {
 
 void wxLogWindow::DoLogTextAtLevel(wxLogLevel level, const wxString& msg)
 {

-    // first let the previous logger show it
-    wxLogPassThrough::DoLogTextAtLevel(level, msg);
-

     if ( !m_pLogFrame )
         return;
 
     if ( !m_pLogFrame )
         return;
 


@@ -709,7 +726,7 @@ wxLogDialog::wxLogDialog(wxWindow *parent,
     bool isPda = (wxSystemSettings::GetScreenType() <= wxSYS_SCREEN_PDA);
 
     // create the controls which are always shown and layout them: we use
     bool isPda = (wxSystemSettings::GetScreenType() <= wxSYS_SCREEN_PDA);
 
     // create the controls which are always shown and layout them: we use

-    // sizers even though our window is not resizeable to calculate the size of
+    // sizers even though our window is not resizable to calculate the size of

     // the dialog properly
     wxBoxSizer *sizerTop = new wxBoxSizer(wxVERTICAL);
     wxBoxSizer *sizerAll = new wxBoxSizer(isPda ? wxVERTICAL : wxHORIZONTAL);
     // the dialog properly
     wxBoxSizer *sizerTop = new wxBoxSizer(wxVERTICAL);
     wxBoxSizer *sizerAll = new wxBoxSizer(isPda ? wxVERTICAL : wxHORIZONTAL);


@@ -795,7 +812,7 @@ void wxLogDialog::CreateDetailsControls(wxWindow *parent)
     // create the list ctrl now
     m_listctrl = new wxListCtrl(parent, wxID_ANY,
                                 wxDefaultPosition, wxDefaultSize,
     // create the list ctrl now
     m_listctrl = new wxListCtrl(parent, wxID_ANY,
                                 wxDefaultPosition, wxDefaultSize,

-                                wxSUNKEN_BORDER |
+                                wxBORDER_SIMPLE |

                                 wxLC_REPORT |
                                 wxLC_NO_HEADER |
                                 wxLC_SINGLE_SEL);
                                 wxLC_REPORT |
                                 wxLC_NO_HEADER |
                                 wxLC_SINGLE_SEL);


@@ -807,17 +824,17 @@ void wxLogDialog::CreateDetailsControls(wxWindow *parent)
 
     // no need to translate these strings as they're not shown to the
     // user anyhow (we use wxLC_NO_HEADER style)
 
     // no need to translate these strings as they're not shown to the
     // user anyhow (we use wxLC_NO_HEADER style)

-    m_listctrl->InsertColumn(0, _T("Message"));
+    m_listctrl->InsertColumn(0, wxT("Message"));

 
     if (hasTimeStamp)
 
     if (hasTimeStamp)

-        m_listctrl->InsertColumn(1, _T("Time"));
+        m_listctrl->InsertColumn(1, wxT("Time"));

 
     // prepare the imagelist
     static const int ICON_SIZE = 16;
     wxImageList *imageList = new wxImageList(ICON_SIZE, ICON_SIZE);
 
     // order should be the same as in the switch below!
 
     // prepare the imagelist
     static const int ICON_SIZE = 16;
     wxImageList *imageList = new wxImageList(ICON_SIZE, ICON_SIZE);
 
     // order should be the same as in the switch below!

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

     {
         wxART_ERROR,
         wxART_WARNING,
     {
         wxART_ERROR,
         wxART_WARNING,


@@ -833,7 +850,7 @@ void wxLogDialog::CreateDetailsControls(wxWindow *parent)
 
         // 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.

-        if ( !bmp.Ok() )
+        if ( !bmp.IsOk() )

         {
             loadedIcons = false;
 
         {
             loadedIcons = false;