X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/e066e2566a4e5db3510fe6a204d66850eaeceade..8173fefe0a9d61cfe5244a301044aa2269bc1c31:/contrib/src/xml/xh_bmpbt.cpp diff --git a/contrib/src/xml/xh_bmpbt.cpp b/contrib/src/xml/xh_bmpbt.cpp index a4230b1c74..314d91e24c 100644 --- a/contrib/src/xml/xh_bmpbt.cpp +++ b/contrib/src/xml/xh_bmpbt.cpp @@ -36,22 +36,22 @@ wxBitmapButtonXmlHandler::wxBitmapButtonXmlHandler() wxObject *wxBitmapButtonXmlHandler::DoCreateResource() { - wxBitmapButton *button = new wxBitmapButton(m_ParentAsWindow, + wxBitmapButton *button = new wxBitmapButton(m_parentAsWindow, GetID(), - GetBitmap(_T("bitmap")), + GetBitmap(wxT("bitmap")), GetPosition(), GetSize(), - GetStyle(_T("style"), wxBU_AUTODRAW), + GetStyle(wxT("style"), wxBU_AUTODRAW), wxDefaultValidator, GetName()); - if (GetBool(_T("default"), 0) == 1) button->SetDefault(); + if (GetBool(wxT("default"), 0) == 1) button->SetDefault(); SetupWindow(button); - if (!GetParamValue(_T("selected")).IsEmpty()) - button->SetBitmapSelected(GetBitmap(_T("selected"))); - if (!GetParamValue(_T("focus")).IsEmpty()) - button->SetBitmapFocus(GetBitmap(_T("focus"))); - if (!GetParamValue(_T("disabled")).IsEmpty()) - button->SetBitmapDisabled(GetBitmap(_T("disabled"))); + if (!GetParamValue(wxT("selected")).IsEmpty()) + button->SetBitmapSelected(GetBitmap(wxT("selected"))); + if (!GetParamValue(wxT("focus")).IsEmpty()) + button->SetBitmapFocus(GetBitmap(wxT("focus"))); + if (!GetParamValue(wxT("disabled")).IsEmpty()) + button->SetBitmapDisabled(GetBitmap(wxT("disabled"))); return button; } @@ -60,7 +60,7 @@ wxObject *wxBitmapButtonXmlHandler::DoCreateResource() bool wxBitmapButtonXmlHandler::CanHandle(wxXmlNode *node) { - return IsOfClass(node, _T("wxBitmapButton")); + return IsOfClass(node, wxT("wxBitmapButton")); }