wxWindow* PropEditCtrlFont::CreateEditCtrl()
{
PropEditCtrlTxt::CreateEditCtrl();
- m_TextCtrl->Enable(false);
+ m_TextCtrl->Disable();
return m_TextCtrl;
}
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())
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);
sz->Add(sz2, 0, wxALIGN_RIGHT | wxRIGHT | wxBOTTOM, 10);
dlg.SetSizer(sz);
- dlg.SetAutoLayout(true);
dlg.Layout();
for (i = 0; i < arr.GetCount(); i++)
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();
wxString name = wxFileSelector(_("Choose file"),
wxPathOnly(txt),
wxFileNameFromPath(txt),
- _T(""),
+ wxEmptyString,
GetFileTypes(),
wxOPEN | wxFILE_MUST_EXIST);
if (!name) return;