X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/f80ea77b4a8bac4ab005bfc592f9cd3262ffa397..dcb39c53303d1ec6884f7bcd7bc9dc101e560e62:/contrib/utils/wxrcedit/pe_adv.cpp diff --git a/contrib/utils/wxrcedit/pe_adv.cpp b/contrib/utils/wxrcedit/pe_adv.cpp index d463b1adbc..e89206d328 100644 --- a/contrib/utils/wxrcedit/pe_adv.cpp +++ b/contrib/utils/wxrcedit/pe_adv.cpp @@ -36,7 +36,7 @@ wxWindow* PropEditCtrlFont::CreateEditCtrl() { PropEditCtrlTxt::CreateEditCtrl(); - m_TextCtrl->Enable(false); + m_TextCtrl->Disable(); return m_TextCtrl; } @@ -115,9 +115,9 @@ void PropEditCtrlColor::OnDetails() if (txt.Length() == 7 && txt[0u] == _T('#') && wxSscanf(txt.c_str(), _T("#%lX"), &tmp) == 1) - clr = wxColour((tmp & 0xFF0000) >> 16, - (tmp & 0x00FF00) >> 8, - (tmp & 0x0000FF)); + clr = wxColour((unsigned char)((tmp & 0xFF0000) >> 16), + (unsigned char)((tmp & 0x00FF00) >> 8), + (unsigned char)((tmp & 0x0000FF))); clr = wxGetColourFromUser(NULL, clr); if (clr.Ok()) @@ -151,7 +151,7 @@ void PropEditCtrlFlags::OnDetails() wxConfigBase *cfg = wxConfigBase::Get(); wxDialog dlg(m_PropFrame, wxID_ANY, _("Flags"), - wxPoint(cfg->Read(_T("flagsdlg_x"), wxDefaultPosition.x), cfg->Read(_T("flagsdlg_y"), wxDefaultPosition.y)), + wxPoint(cfg->Read(_T("flagsdlg_x"), wxDefaultCoord), cfg->Read(_T("flagsdlg_y"), wxDefaultCoord)), wxSize(cfg->Read(_T("flagsdlg_w"), 300), cfg->Read(_T("flagsdlg_h"), 300)), wxDEFAULT_DIALOG_STYLE | wxRESIZE_BORDER); wxSizer *sz = new wxBoxSizer(wxVERTICAL); @@ -165,7 +165,6 @@ void PropEditCtrlFlags::OnDetails() sz->Add(sz2, 0, wxALIGN_RIGHT | wxRIGHT | wxBOTTOM, 10); dlg.SetSizer(sz); - dlg.SetAutoLayout(true); dlg.Layout(); for (i = 0; i < arr.GetCount(); i++) @@ -187,7 +186,7 @@ void PropEditCtrlFlags::OnDetails() for (i = 0; i < arr.GetCount(); i++) if (lbox->IsChecked(i)) txt << arr[i] << _T('|'); - if (!txt.IsEmpty()) txt.RemoveLast(); + if (!txt.empty()) txt.RemoveLast(); m_TextCtrl->SetValue(txt); WriteValue(); @@ -219,7 +218,7 @@ void PropEditCtrlFile::OnDetails() wxString name = wxFileSelector(_("Choose file"), wxPathOnly(txt), wxFileNameFromPath(txt), - _T(""), + wxEmptyString, GetFileTypes(), wxOPEN | wxFILE_MUST_EXIST); if (!name) return;