diff --git a/src/univ/statusbr.cpp b/src/univ/statusbr.cpp index ab7c9374cf..143b6fcde8 100644 --- a/src/univ/statusbr.cpp +++ b/src/univ/statusbr.cpp @@ -186,9 +186,8 @@ wxString wxStatusBarUniv::GetStatusText(int number) const void wxStatusBarUniv::SetFieldsCount(int number, const int *widths) { - wxStatusBarBase::SetFieldsCount(number, widths); - m_statusText.SetCount(number); + wxStatusBarBase::SetFieldsCount(number, widths); m_widthsAbs.Empty(); } diff --git a/src/x11/app.cpp b/src/x11/app.cpp index d011651a88..b0cfa2c739 100644 --- a/src/x11/app.cpp +++ b/src/x11/app.cpp @@ -598,6 +598,10 @@ void wxApp::DeletePendingObjects() // Create an application context bool wxApp::OnInitGui() { + // Eventually this line will be removed, but for + // now we don't want to try popping up a dialog + // for error messages. + delete wxLog::SetActiveTarget(new wxLogStderr); if (!wxAppBase::OnInitGui()) return FALSE; diff --git a/src/x11/toplevel.cpp b/src/x11/toplevel.cpp index c8e8b8f4a8..e139ee21a4 100644 --- a/src/x11/toplevel.cpp +++ b/src/x11/toplevel.cpp @@ -156,9 +156,6 @@ wxTopLevelWindowX11::~wxTopLevelWindowX11() bool wxTopLevelWindowX11::Show(bool show) { - if ( !wxWindowBase::Show(show) ) - return FALSE; - return wxWindowX11::Show(show); }