diff --git a/aegisub/src/dialog_properties.cpp b/aegisub/src/dialog_properties.cpp index a336fce85..bcea20c00 100644 --- a/aegisub/src/dialog_properties.cpp +++ b/aegisub/src/dialog_properties.cpp @@ -78,8 +78,8 @@ DialogProperties::DialogProperties(agi::Context *c) // Resolution box wxSizer *ResSizer = new wxStaticBoxSizer(wxHORIZONTAL,this,_("Resolution")); - ResX = new wxTextCtrl(this,-1,"",wxDefaultPosition,wxSize(50,20),0,IntValidator(c->ass->GetScriptInfo("PlayResX"))); - ResY = new wxTextCtrl(this,-1,"",wxDefaultPosition,wxSize(50,20),0,IntValidator(c->ass->GetScriptInfo("PlayResY"))); + ResX = new wxTextCtrl(this,-1,"",wxDefaultPosition,wxSize(50,20),0,IntValidator(c->ass->GetScriptInfoAsInt("PlayResX"))); + ResY = new wxTextCtrl(this,-1,"",wxDefaultPosition,wxSize(50,20),0,IntValidator(c->ass->GetScriptInfoAsInt("PlayResY"))); wxStaticText *ResText = new wxStaticText(this,-1,"x"); wxButton *FromVideo = new wxButton(this,-1,_("From &video")); diff --git a/aegisub/src/validators.cpp b/aegisub/src/validators.cpp index 37c442f2f..d0b5e623e 100644 --- a/aegisub/src/validators.cpp +++ b/aegisub/src/validators.cpp @@ -41,13 +41,6 @@ wxChar decimal_separator() { } } -IntValidator::IntValidator(std::string const& initial) -: allow_negative(false) -{ - agi::util::try_parse(initial, &value); - Bind(wxEVT_CHAR, &IntValidator::OnChar, this); -} - IntValidator::IntValidator(int val, bool allow_negative) : value(val) , allow_negative(allow_negative) @@ -56,7 +49,8 @@ IntValidator::IntValidator(int val, bool allow_negative) } IntValidator::IntValidator(IntValidator const& rgt) -: allow_negative(rgt.allow_negative) +: value(rgt.value) +, allow_negative(rgt.allow_negative) { SetWindow(rgt.GetWindow()); Bind(wxEVT_CHAR, &IntValidator::OnChar, this); diff --git a/aegisub/src/validators.h b/aegisub/src/validators.h index 5a7cfc578..4b951b718 100644 --- a/aegisub/src/validators.h +++ b/aegisub/src/validators.h @@ -36,8 +36,7 @@ class IntValidator : public wxValidator { IntValidator(IntValidator const& rgt); public: - explicit IntValidator(std::string const& value = ""); - explicit IntValidator(int val, bool allow_negative=false); + explicit IntValidator(int val=0, bool allow_negative=false); }; class DoubleValidator : public wxValidator {