From 766ae98a76edd8da690627463f58b701c17ffd03 Mon Sep 17 00:00:00 2001
From: Thomas Goyne <plorkyeran@aegisub.org>
Date: Fri, 24 Jul 2009 02:10:41 +0000
Subject: [PATCH] Add wxOK to some message boxes that specified flags without
 including either wxOK or wxYESNO.

Originally committed to SVN as r3250.
---
 aegisub/src/dialog_style_editor.cpp  | 2 +-
 aegisub/src/dialog_style_manager.cpp | 2 +-
 aegisub/src/frame_main_events.cpp    | 2 +-
 aegisub/src/options.cpp              | 4 ++--
 aegisub/src/subs_preview.cpp         | 2 +-
 5 files changed, 6 insertions(+), 6 deletions(-)

diff --git a/aegisub/src/dialog_style_editor.cpp b/aegisub/src/dialog_style_editor.cpp
index bc8ea2b30..6d17d8c48 100644
--- a/aegisub/src/dialog_style_editor.cpp
+++ b/aegisub/src/dialog_style_editor.cpp
@@ -439,7 +439,7 @@ void DialogStyleEditor::Apply (bool apply,bool close) {
 		for (unsigned int i=0;i<styles.Count();i++) {
 			if (newStyleName.CmpNoCase(styles[i]) == 0) {
 				if ((isLocal && (grid->ass->GetStyle(styles[i]) != style)) || (!isLocal && (store->GetStyle(styles[i]) != style))) {
-					wxMessageBox(_T("There is already a style with this name. Please choose another name."),_T("Style name conflict."),wxICON_ERROR);
+					wxMessageBox(_T("There is already a style with this name. Please choose another name."),_T("Style name conflict."),wxICON_ERROR|wxOK);
 					return;
 				}
 			}
diff --git a/aegisub/src/dialog_style_manager.cpp b/aegisub/src/dialog_style_manager.cpp
index 5b534875f..5d420cf3d 100644
--- a/aegisub/src/dialog_style_manager.cpp
+++ b/aegisub/src/dialog_style_manager.cpp
@@ -432,7 +432,7 @@ void DialogStyleManager::OnCatalogNew (wxCommandEvent &event) {
 
 		// Make sure that there is no storage with the same name (case insensitive search since Windows filenames are case insensitive)
 		if (CatalogList->FindString(name, false) != wxNOT_FOUND) {
-			wxMessageBox(_("A catalog with that name already exists."),_("Catalog name conflict"),wxICON_ERROR);
+			wxMessageBox(_("A catalog with that name already exists."),_("Catalog name conflict"),wxICON_ERROR|wxOK);
 			return;
 		}
 
diff --git a/aegisub/src/frame_main_events.cpp b/aegisub/src/frame_main_events.cpp
index 3c1fe2297..bafec2156 100644
--- a/aegisub/src/frame_main_events.cpp
+++ b/aegisub/src/frame_main_events.cpp
@@ -1394,7 +1394,7 @@ void FrameMain::OnSetARCustom (wxCommandEvent &event) {
 	}
 
 	// Sanity check
-	if (numval < 0.5 || numval > 5.0) wxMessageBox(_("Invalid value! Aspect ratio must be between 0.5 and 5.0."),_("Invalid Aspect Ratio"),wxICON_ERROR);
+	if (numval < 0.5 || numval > 5.0) wxMessageBox(_("Invalid value! Aspect ratio must be between 0.5 and 5.0."),_("Invalid Aspect Ratio"),wxICON_ERROR|wxOK);
 
 	// Set value
 	else {
diff --git a/aegisub/src/options.cpp b/aegisub/src/options.cpp
index 395c70633..2ce289a51 100644
--- a/aegisub/src/options.cpp
+++ b/aegisub/src/options.cpp
@@ -465,7 +465,7 @@ void OptionsManager::Load() {
 		header = _T("");
 	}
 	if (header != _T("[Config]")) {
-		wxMessageBox(_("Configuration file is either invalid or corrupt. The current file will be backed up and replaced with a default file."),_("Error"),wxCENTRE|wxICON_WARNING);
+		wxMessageBox(_("Configuration file is either invalid or corrupt. The current file will be backed up and replaced with a default file."),_("Error"),wxCENTRE|wxICON_WARNING|wxOK);
 		wxRenameFile(filename,filename + wxString::Format(_T(".%i.backup"),wxGetUTCTime()));
 		modified = true;
 		return;
@@ -480,7 +480,7 @@ void OptionsManager::Load() {
 			curLine = file.ReadLineFromFile();
 		}
 		catch (wxString e) {
-			wxMessageBox(_("Configuration file is either invalid or corrupt. The current file will be backed up and replaced with a default file."),_("Error"),wxCENTRE|wxICON_WARNING);
+			wxMessageBox(_("Configuration file is either invalid or corrupt. The current file will be backed up and replaced with a default file."),_("Error"),wxCENTRE|wxICON_WARNING|wxOK);
 			wxRenameFile(filename,filename + wxString::Format(_T(".%i.backup"),wxGetUTCTime()));
 			modified = true;
 			return;
diff --git a/aegisub/src/subs_preview.cpp b/aegisub/src/subs_preview.cpp
index d640ff647..7ebebcca0 100644
--- a/aegisub/src/subs_preview.cpp
+++ b/aegisub/src/subs_preview.cpp
@@ -148,7 +148,7 @@ void SubtitlesPreview::UpdateBitmap(int w,int h) {
 		provider = SubtitlesProviderFactoryManager::GetProvider();
 	} 
 	catch (...) {
-		wxMessageBox(_T("Could not get any subtitles provider for the preview box. Make sure that you have a provider installed."),_T("No subtitles provider"),wxICON_ERROR);
+		wxMessageBox(_T("Could not get any subtitles provider for the preview box. Make sure that you have a provider installed."),_T("No subtitles provider"),wxICON_ERROR|wxOK);
 	}
 
 	// Provider OK