Rename gtk{,1}/tbargtk.{h,cpp} to toolbar.{h,cpp}.

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

diff --git a/src/generic/logg.cpp b/src/generic/logg.cpp
index d7eb54290f19b132328806da44b982782f4939b9..20357ead229622ace81f1e9cfa71e77c69cf6604 100644 (file)
--- a/src/generic/logg.cpp
+++ b/src/generic/logg.cpp
@@ -371,7 +371,7 @@ void wxLogGui::DoLogRecord(wxLogLevel level,
                 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));
@@ -795,7 +795,7 @@ void wxLogDialog::CreateDetailsControls(wxWindow *parent)
     // 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);
@@ -817,7 +817,7 @@ void wxLogDialog::CreateDetailsControls(wxWindow *parent)
     wxImageList *imageList = new wxImageList(ICON_SIZE, ICON_SIZE);
 
     // order should be the same as in the switch below!
-    static const wxChar* icons[] =
+    static const wxChar* const icons[] =
     {
         wxART_ERROR,
         wxART_WARNING,