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

Adjust throwing of exceptions to the new style documented in exception.h.

Browse source 
(Good thing nothing is catching these yet, and it's the only case of "new style" exceptions being used.)

Originally committed to SVN as r3365.
This commit is contained in:
Niels Martin Hansen 2009-08-05 20:52:44 +00:00
parent c731a9b437
commit b6a63c15e6
2 changed files with 4 additions and 4 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
aegisub/src/ass_dialogue.cpp
View file

@ -754,7 +754,7 @@ void AssDialogue::SetMarginString(const wxString origvalue,int which) {
if (value > 9999) value = 9999; if (value > 9999) value = 9999;
// Assign // Assign
if (which < 0 || which >= 4) throw new Aegisub::InvalidMarginIdError; if (which < 0 || which >= 4) throw Aegisub::InvalidMarginIdError();
Margin[which] = value; Margin[which] = value;
} }
@ -766,7 +766,7 @@ void AssDialogue::SetMarginString(const wxString origvalue,int which) {
/// @return /// @return
/// ///
wxString AssDialogue::GetMarginString(int which,bool pad) { wxString AssDialogue::GetMarginString(int which,bool pad) {
if (which < 0 || which >= 4) throw new Aegisub::InvalidMarginIdError; if (which < 0 || which >= 4) throw Aegisub::InvalidMarginIdError();
int value = Margin[which]; int value = Margin[which];
if (pad) return wxString::Format(_T("%04i"),value); if (pad) return wxString::Format(_T("%04i"),value);
else return wxString::Format(_T("%i"),value); else return wxString::Format(_T("%i"),value);

4
aegisub/src/ass_style.cpp
View file

@ -478,7 +478,7 @@ void AssStyle::UpdateData() {
/// @param which /// @param which
/// ///
void AssStyle::SetMarginString(const wxString str,int which) { void AssStyle::SetMarginString(const wxString str,int which) {
if (which < 0 || which >= 4) throw new Aegisub::InvalidMarginIdError; if (which < 0 || which >= 4) throw Aegisub::InvalidMarginIdError();
if (!str.IsNumber()) throw _T("Invalid margin value"); if (!str.IsNumber()) throw _T("Invalid margin value");
long value; long value;
str.ToLong(&value); str.ToLong(&value);
@ -495,7 +495,7 @@ void AssStyle::SetMarginString(const wxString str,int which) {
/// @return /// @return
/// ///
wxString AssStyle::GetMarginString(int which) { wxString AssStyle::GetMarginString(int which) {
if (which < 0 || which >= 4) throw new Aegisub::InvalidMarginIdError; if (which < 0 || which >= 4) throw Aegisub::InvalidMarginIdError();
wxString result = wxString::Format(_T("%04i"),Margin[which]); wxString result = wxString::Format(_T("%04i"),Margin[which]);
return result; return result;
} }