diff --git a/include/wx/html/htmlcell.h b/include/wx/html/htmlcell.h index ffa69ceb37..199768effd 100644 --- a/include/wx/html/htmlcell.h +++ b/include/wx/html/htmlcell.h @@ -648,8 +648,8 @@ protected: class WXDLLIMPEXP_HTML wxHtmlLinkInfo : public wxObject { public: - wxHtmlLinkInfo() : wxObject() - { m_Href = m_Target = wxEmptyString; m_Event = NULL; m_Cell = NULL; } + wxHtmlLinkInfo() + { m_Event = NULL; m_Cell = NULL; } wxHtmlLinkInfo(const wxString& href, const wxString& target = wxString()) : m_Href(href) , m_Target(target) diff --git a/src/html/chm.cpp b/src/html/chm.cpp index 74d1608c69..e38bb6c4ac 100644 --- a/src/html/chm.cpp +++ b/src/html/chm.cpp @@ -516,7 +516,7 @@ size_t wxChmInputStream::OnSysRead(void *buffer, size_t bufsize) wxFileOffset wxChmInputStream::OnSysSeek(wxFileOffset seek, wxSeekMode mode) { - wxString mode_str = wxEmptyString; + wxString mode_str; if ( !m_contentStream || m_contentStream->Eof() ) { diff --git a/src/html/helpwnd.cpp b/src/html/helpwnd.cpp index b7340cccf4..262904486f 100644 --- a/src/html/helpwnd.cpp +++ b/src/html/helpwnd.cpp @@ -829,7 +829,7 @@ bool wxHtmlHelpWindow::KeywordSearch(const wxString& keyword, int foundcnt = 0; wxString foundstr; - wxString book = wxEmptyString; + wxString book; if (!m_Splitter->IsSplit()) { diff --git a/src/html/htmlwin.cpp b/src/html/htmlwin.cpp index 008b30fbb7..5d2e2a3bd8 100644 --- a/src/html/htmlwin.cpp +++ b/src/html/htmlwin.cpp @@ -589,7 +589,7 @@ bool wxHtmlWindow::LoadPage(const wxString& location) else { wxList::compatibility_iterator node; - wxString src = wxEmptyString; + wxString src; #if wxUSE_STATUSBAR if (m_RelatedStatusBarIndex != -1) diff --git a/src/msw/webview_ie.cpp b/src/msw/webview_ie.cpp index 3d11783c76..691a90aeb0 100644 --- a/src/msw/webview_ie.cpp +++ b/src/msw/webview_ie.cpp @@ -1248,7 +1248,7 @@ void wxWebViewIE::onActiveXEvent(wxActiveXEvent& evt) { wxString url = evt[1].GetString(); // TODO: set target parameter if possible - wxString target = wxEmptyString; + wxString target; wxWebViewEvent event(wxEVT_WEBVIEW_NAVIGATED, GetId(), url, target); event.SetEventObject(this); @@ -1299,7 +1299,7 @@ void wxWebViewIE::onActiveXEvent(wxActiveXEvent& evt) //Reset the find values. FindClear(); // TODO: set target parameter if possible - wxString target = wxEmptyString; + wxString target; wxWebViewEvent event(wxEVT_WEBVIEW_LOADED, GetId(), url, target); event.SetEventObject(this); diff --git a/src/ribbon/bar.cpp b/src/ribbon/bar.cpp index 304f92c7c0..e1a3878ece 100644 --- a/src/ribbon/bar.cpp +++ b/src/ribbon/bar.cpp @@ -74,7 +74,7 @@ void wxRibbonBar::AddPage(wxRibbonPage *page) // info.rect not set (intentional) wxClientDC dcTemp(this); - wxString label = wxEmptyString; + wxString label; if(m_flags & wxRIBBON_BAR_SHOW_PAGE_LABELS) label = page->GetLabel(); wxBitmap icon = wxNullBitmap; @@ -174,7 +174,7 @@ bool wxRibbonBar::Realize() { status = false; } - wxString label = wxEmptyString; + wxString label; if(m_flags & wxRIBBON_BAR_SHOW_PAGE_LABELS) label = info.page->GetLabel(); wxBitmap icon = wxNullBitmap;