diff --git a/src/univ/bmpbuttn.cpp b/src/univ/bmpbuttn.cpp index 638d441937..112dac3646 100644 --- a/src/univ/bmpbuttn.cpp +++ b/src/univ/bmpbuttn.cpp @@ -64,7 +64,7 @@ bool wxBitmapButton::Create(wxWindow *parent, // we add wxBU_EXACTFIT because the bitmap buttons are not the standard // ones and so shouldn't be forced to be of the standard size which is // typically too big for them - if ( !wxButton::Create(parent, id, bitmap, _T(""), + if ( !wxButton::Create(parent, id, bitmap, wxEmptyString, pos, size, style | wxBU_EXACTFIT, validator, name) ) return false; diff --git a/src/univ/menu.cpp b/src/univ/menu.cpp index 962d1549ed..9b682f1b25 100644 --- a/src/univ/menu.cpp +++ b/src/univ/menu.cpp @@ -1832,7 +1832,7 @@ void wxMenuBar::SetLabelTop(size_t pos, const wxString& label) wxString wxMenuBar::GetLabelTop(size_t pos) const { - wxCHECK_MSG( pos < GetCount(), _T(""), _T("invalid index in GetLabelTop") ); + wxCHECK_MSG( pos < GetCount(), wxEmptyString, _T("invalid index in GetLabelTop") ); return m_menuInfos[pos].GetLabel(); } diff --git a/src/univ/notebook.cpp b/src/univ/notebook.cpp index c97f7189b8..f480c05b56 100644 --- a/src/univ/notebook.cpp +++ b/src/univ/notebook.cpp @@ -144,7 +144,7 @@ bool wxNotebook::Create(wxWindow *parent, wxString wxNotebook::GetPageText(size_t nPage) const { - wxCHECK_MSG( IS_VALID_PAGE(nPage), _T(""), _T("invalid notebook page") ); + wxCHECK_MSG( IS_VALID_PAGE(nPage), wxEmptyString, _T("invalid notebook page") ); return m_titles[nPage]; } diff --git a/src/univ/radiobox.cpp b/src/univ/radiobox.cpp index ba7e54ab97..6637727315 100644 --- a/src/univ/radiobox.cpp +++ b/src/univ/radiobox.cpp @@ -112,7 +112,7 @@ wxRadioBox::wxRadioBox(wxWindow *parent, wxWindowID id, const wxString& title, Init(); - (void)Create(parent, id, title, pos, size, chs.GetCount(), + (void)Create(parent, id, title, pos, size, chs.GetCount(), chs.GetStrings(), majorDim, style, val, name); } @@ -129,7 +129,7 @@ bool wxRadioBox::Create(wxWindow *parent, { wxCArrayString chs(choices); - return Create(parent, id, title, pos, size, chs.GetCount(), + return Create(parent, id, title, pos, size, chs.GetCount(), chs.GetStrings(), majorDim, style, val, name); } @@ -309,7 +309,7 @@ void wxRadioBox::OnRadioButton(wxEvent& event) wxString wxRadioBox::GetString(int n) const { - wxCHECK_MSG( IsValid(n), _T(""), + wxCHECK_MSG( IsValid(n), wxEmptyString, _T("invalid index in wxRadioBox::GetString") ); return m_buttons[n]->GetLabel(); diff --git a/src/univ/statusbr.cpp b/src/univ/statusbr.cpp index cbbb9672e4..15485a18a1 100644 --- a/src/univ/statusbr.cpp +++ b/src/univ/statusbr.cpp @@ -183,7 +183,7 @@ void wxStatusBarUniv::SetStatusText(const wxString& text, int number) wxString wxStatusBarUniv::GetStatusText(int number) const { - wxCHECK_MSG( number >= 0 && number < m_nFields, _T(""), + wxCHECK_MSG( number >= 0 && number < m_nFields, wxEmptyString, _T("invalid status bar field index") ); return m_statusText[number]; diff --git a/src/univ/textctrl.cpp b/src/univ/textctrl.cpp index 8583562101..52ba1a4928 100644 --- a/src/univ/textctrl.cpp +++ b/src/univ/textctrl.cpp @@ -821,7 +821,7 @@ wxString wxTextCtrl::GetValue() const void wxTextCtrl::Clear() { - SetValue(_T("")); + SetValue(wxEmptyString); } bool wxTextCtrl::ReplaceLine(wxTextCoord line, @@ -1249,7 +1249,7 @@ void wxTextCtrl::Remove(wxTextPos from, wxTextPos to) // if necessary OrderPositions(from, to); - Replace(from, to, _T("")); + Replace(from, to, wxEmptyString); } void wxTextCtrl::WriteText(const wxString& text) @@ -1651,7 +1651,7 @@ wxString wxTextCtrl::GetLineText(wxTextCoord line) const //this is called during DoGetBestSize if (line == 0 && GetLineCount() == 0) return wxEmptyString ; - wxCHECK_MSG( (size_t)line < GetLineCount(), _T(""), + wxCHECK_MSG( (size_t)line < GetLineCount(), wxEmptyString, _T("line index out of range") ); return GetLines()[line]; diff --git a/src/xrc/xh_bmp.cpp b/src/xrc/xh_bmp.cpp index 47356ff0ed..f2c1a15a43 100644 --- a/src/xrc/xh_bmp.cpp +++ b/src/xrc/xh_bmp.cpp @@ -33,7 +33,7 @@ wxBitmapXmlHandler::wxBitmapXmlHandler() wxObject *wxBitmapXmlHandler::DoCreateResource() { - return new wxBitmap(GetBitmap(wxT(""))); + return new wxBitmap(GetBitmap(wxEmptyString)); } bool wxBitmapXmlHandler::CanHandle(wxXmlNode *node) @@ -50,7 +50,7 @@ wxIconXmlHandler::wxIconXmlHandler() wxObject *wxIconXmlHandler::DoCreateResource() { - return new wxIcon(GetIcon(wxT(""))); + return new wxIcon(GetIcon(wxEmptyString)); } bool wxIconXmlHandler::CanHandle(wxXmlNode *node)