X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/786c4e23f5d91c319804b4204ebda023b959794c..c0b0635cf69537ca32377bad5650b39402cb21b6:/src/generic/logg.cpp

diff --git a/src/generic/logg.cpp b/src/generic/logg.cpp
index a3c184b6aa..668a0cabf7 100644
--- a/src/generic/logg.cpp
+++ b/src/generic/logg.cpp
@@ -252,7 +252,7 @@ void wxLogGui::Flush()
 
     wxString appName = wxTheApp->GetAppName();
     if ( !!appName )
-        appName[0u] = wxToupper(appName[0u]);
+        appName[0u] = (wxChar)wxToupper(appName[0u]);
 
     long style;
     wxString titleFormat;
@@ -434,7 +434,7 @@ class wxLogFrame : public wxFrame
 {
 public:
     // ctor & dtor
-    wxLogFrame(wxFrame *pParent, wxLogWindow *log, const wxChar *szTitle);
+    wxLogFrame(wxWindow *pParent, wxLogWindow *log, const wxChar *szTitle);
     virtual ~wxLogFrame();
 
     // menu callbacks
@@ -478,7 +478,7 @@ BEGIN_EVENT_TABLE(wxLogFrame, wxFrame)
     EVT_CLOSE(wxLogFrame::OnCloseWindow)
 END_EVENT_TABLE()
 
-wxLogFrame::wxLogFrame(wxFrame *pParent, wxLogWindow *log, const wxChar *szTitle)
+wxLogFrame::wxLogFrame(wxWindow *pParent, wxLogWindow *log, const wxChar *szTitle)
           : wxFrame(pParent, wxID_ANY, szTitle)
 {
     m_log = log;
@@ -585,7 +585,7 @@ wxLogFrame::~wxLogFrame()
 // wxLogWindow
 // -----------
 
-wxLogWindow::wxLogWindow(wxFrame *pParent,
+wxLogWindow::wxLogWindow(wxWindow *pParent,
                          const wxChar *szTitle,
                          bool bShow,
                          bool bDoPass)
@@ -717,7 +717,7 @@ wxLogDialog::wxLogDialog(wxWindow *parent,
     for ( size_t n = 0; n < count; n++ )
     {
         wxString msg = messages[n];
-        msg.Replace("\n", " ");
+        msg.Replace(wxT("\n"), wxT(" "));
         m_messages.Add(msg);
         m_severity.Add(severity[n]);
         m_times.Add(times[n]);
@@ -744,6 +744,8 @@ wxLogDialog::wxLogDialog(wxWindow *parent,
     // this "Ok" button has wxID_CANCEL id - not very logical, but this allows
     // to close the log dialog with <Esc> which wouldn't work otherwise (as it
     // translates into click on cancel button)
+
+    // FIXME: use stock button here!
     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 + EXPAND_SUFFIX);
@@ -776,7 +778,8 @@ wxLogDialog::wxLogDialog(wxWindow *parent,
         default:
             wxFAIL_MSG(_T("incorrect log style"));
     }
-    sizerAll->Add(new wxStaticBitmap(this, wxID_ANY, bitmap), 0);
+    sizerAll->Add(new wxStaticBitmap(this, wxID_ANY, bitmap), 0,
+                  wxALIGN_CENTRE_VERTICAL);
 
     const wxString& message = messages.Last();
     sizerAll->Add(CreateTextSizer(message), 1,
@@ -820,7 +823,7 @@ void wxLogDialog::CreateDetailsControls()
 {
     // create the save button and separator line if possible
 #if wxUSE_FILE
-    m_btnSave = new wxButton(this, wxID_SAVE, _("&Save..."));
+    m_btnSave = new wxButton(this, wxID_SAVE);
 #endif // wxUSE_FILE
 
 #if wxUSE_STATLINE
@@ -929,7 +932,7 @@ void wxLogDialog::CreateDetailsControls()
     heightMax *= 9;
     heightMax /= 10;
 
-    m_listctrl->SetSize(wxDefaultSize.x, wxMin(height, heightMax));
+    m_listctrl->SetSize(wxDefaultCoord, wxMin(height, heightMax));
 }
 
 void wxLogDialog::OnListSelect(wxListEvent& event)
@@ -1065,7 +1068,7 @@ void wxLogDialog::OnDetails(wxCommandEvent& WXUNUSED(event))
     SetSizeHints(size.x, size.y, m_maxWidth, m_maxHeight);
 
     // don't change the width when expanding/collapsing
-    SetSize(wxDefaultSize.x, size.y);
+    SetSize(wxDefaultCoord, size.y);
 
 #ifdef __WXGTK__
     // VS: this is neccessary in order to force frame redraw under