mantarimay/Aegisub
1
0
Fork 0
forked from mia/Aegisub
Code Pull requests Activity

Actually copy the current value in IntValidator's copy constructor

Browse source
This commit is contained in:
Thomas Goyne 2013-10-15 16:02:25 -07:00
parent d4a7a1a9b6
commit 9dbca06179
3 changed files with 5 additions and 12 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
aegisub/src/dialog_properties.cpp
View file

@ -78,8 +78,8 @@ DialogProperties::DialogProperties(agi::Context *c)
// Resolution box // Resolution box
wxSizer *ResSizer = new wxStaticBoxSizer(wxHORIZONTAL,this,_("Resolution")); wxSizer *ResSizer = new wxStaticBoxSizer(wxHORIZONTAL,this,_("Resolution"));
ResX = new wxTextCtrl(this,-1,"",wxDefaultPosition,wxSize(50,20),0,IntValidator(c->ass->GetScriptInfo("PlayResX"))); 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->GetScriptInfo("PlayResY"))); ResY = new wxTextCtrl(this,-1,"",wxDefaultPosition,wxSize(50,20),0,IntValidator(c->ass->GetScriptInfoAsInt("PlayResY")));
wxStaticText *ResText = new wxStaticText(this,-1,"x"); wxStaticText *ResText = new wxStaticText(this,-1,"x");
wxButton *FromVideo = new wxButton(this,-1,_("From &video")); wxButton *FromVideo = new wxButton(this,-1,_("From &video"));

10
aegisub/src/validators.cpp
View file

@ -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) IntValidator::IntValidator(int val, bool allow_negative)
: value(val) : value(val)
, allow_negative(allow_negative) , allow_negative(allow_negative)
@ -56,7 +49,8 @@ IntValidator::IntValidator(int val, bool allow_negative)
} }
IntValidator::IntValidator(IntValidator const& rgt) IntValidator::IntValidator(IntValidator const& rgt)
: allow_negative(rgt.allow_negative) : value(rgt.value)
, allow_negative(rgt.allow_negative)
{ {
SetWindow(rgt.GetWindow()); SetWindow(rgt.GetWindow());
Bind(wxEVT_CHAR, &IntValidator::OnChar, this); Bind(wxEVT_CHAR, &IntValidator::OnChar, this);

3
aegisub/src/validators.h
View file

@ -36,8 +36,7 @@ class IntValidator : public wxValidator {
IntValidator(IntValidator const& rgt); IntValidator(IntValidator const& rgt);
public: public:
explicit IntValidator(std::string const& value = ""); explicit IntValidator(int val=0, bool allow_negative=false);
explicit IntValidator(int val, bool allow_negative=false);
}; };
class DoubleValidator : public wxValidator { class DoubleValidator : public wxValidator {