From b507f49cecec19f99d2568ee9c8ad849760a11cb Mon Sep 17 00:00:00 2001
From: Thomas Goyne <plorkyeran@aegisub.org>
Date: Sun, 2 Dec 2012 07:55:38 -0800
Subject: [PATCH] Remove the pad argument from GetMarginString

It's no longer ever actually set to true.
---
 aegisub/src/ass_dialogue.cpp  | 4 ++--
 aegisub/src/ass_dialogue.h    | 3 +--
 aegisub/src/subs_edit_box.cpp | 4 ++--
 3 files changed, 5 insertions(+), 6 deletions(-)

diff --git a/aegisub/src/ass_dialogue.cpp b/aegisub/src/ass_dialogue.cpp
index 2e1a86a95..5a2564d07 100644
--- a/aegisub/src/ass_dialogue.cpp
+++ b/aegisub/src/ass_dialogue.cpp
@@ -331,9 +331,9 @@ void AssDialogue::SetMarginString(wxString const& origvalue, int which) {
 	Margin[which] = mid<int>(0, value, 9999);
 }
 
-wxString AssDialogue::GetMarginString(int which, bool pad) const {
+wxString AssDialogue::GetMarginString(int which) const {
 	if (which < 0 || which > 2) throw InvalidMarginIdError();
-	return wxString::Format(pad ? "%04d" : "%d", Margin[which]);
+	return wxString::Format("%d", Margin[which]);
 }
 
 void AssDialogue::ProcessParameters(AssDialogueBlockOverride::ProcessParametersCallback callback,void *userData) {
diff --git a/aegisub/src/ass_dialogue.h b/aegisub/src/ass_dialogue.h
index dfa29e725..25e455b1f 100644
--- a/aegisub/src/ass_dialogue.h
+++ b/aegisub/src/ass_dialogue.h
@@ -182,8 +182,7 @@ public:
 	void SetMarginString(wxString const& value, int which);
 	/// @brief Get a margin
 	/// @param which 0 = left, 1 = right, 2 = vertical
-	/// @param pad Pad the number to four digits
-	wxString GetMarginString(int which, bool pad=true) const;
+	wxString GetMarginString(int which) const;
 	/// Get the line as SSA rather than ASS
 	wxString GetSSAText() const override;
 	/// Does this line collide with the passed line?
diff --git a/aegisub/src/subs_edit_box.cpp b/aegisub/src/subs_edit_box.cpp
index 474a1c7fc..b0cede815 100644
--- a/aegisub/src/subs_edit_box.cpp
+++ b/aegisub/src/subs_edit_box.cpp
@@ -210,7 +210,7 @@ wxTextCtrl *SubsEditBox::MakeMarginCtrl(wxString const& tooltip, int margin, wxS
 	Bind(wxEVT_COMMAND_TEXT_UPDATED, [=](wxCommandEvent&) {
 		wxString value = ctrl->GetValue();
 		SetSelectedRows([&](AssDialogue *d) { d->SetMarginString(value, margin); }, commit_msg, AssFile::COMMIT_DIAG_META);
-		if (line) change_value(ctrl, line->GetMarginString(margin, false));
+		if (line) change_value(ctrl, line->GetMarginString(margin));
 	}, ctrl->GetId());
 
 	return ctrl;
@@ -292,7 +292,7 @@ void SubsEditBox::OnCommit(int type) {
 	if (type & AssFile::COMMIT_DIAG_META) {
 		Layer->SetValue(line->Layer);
 		for (size_t i = 0; i < Margin.size(); ++i)
-			change_value(Margin[i], line->GetMarginString(i, false));
+			change_value(Margin[i], line->GetMarginString(i));
 		CommentBox->SetValue(line->Comment);
 		StyleBox->Select(StyleBox->FindString(line->Style));