From 462448c7d10e557274d0381194525dab30598c21 Mon Sep 17 00:00:00 2001
From: Thomas Goyne <plorkyeran@aegisub.org>
Date: Tue, 3 Apr 2012 20:40:33 +0000
Subject: [PATCH] Add icons to some of the dialogs missing them

Originally committed to SVN as r6651.
---
 aegisub/src/dialog_automation.cpp    | 2 ++
 aegisub/src/dialog_dummy_video.cpp   | 5 +++--
 aegisub/src/dialog_export.cpp        | 2 ++
 aegisub/src/dialog_selection.cpp     | 3 +++
 aegisub/src/dialog_style_manager.cpp | 1 +
 aegisub/src/preferences.cpp          | 2 +-
 6 files changed, 12 insertions(+), 3 deletions(-)

diff --git a/aegisub/src/dialog_automation.cpp b/aegisub/src/dialog_automation.cpp
index 9f4364412..6871f2e59 100644
--- a/aegisub/src/dialog_automation.cpp
+++ b/aegisub/src/dialog_automation.cpp
@@ -38,6 +38,8 @@
 #include "config.h"
 
 #ifndef AGI_PRE
+#include <algorithm>
+
 #include <wx/button.h>
 #include <wx/filedlg.h>
 #include <wx/filename.h>
diff --git a/aegisub/src/dialog_dummy_video.cpp b/aegisub/src/dialog_dummy_video.cpp
index 7e9ec5464..e5efa4abc 100644
--- a/aegisub/src/dialog_dummy_video.cpp
+++ b/aegisub/src/dialog_dummy_video.cpp
@@ -55,6 +55,7 @@
 #include "colour_button.h"
 #include "compat.h"
 #include "help_button.h"
+#include "libresrc/libresrc.h"
 #include "main.h"
 #include "utils.h"
 #include "video_provider_dummy.h"
@@ -153,14 +154,14 @@ bool DialogDummyVideo::CreateDummyVideo(wxWindow *parent, wxString &out_filename
 	}
 }
 
-
-
 /// @brief DOCME
 /// @param parent
 ///
 DialogDummyVideo::DialogDummyVideo(wxWindow *parent)
 : wxDialog(parent, -1, _("Dummy video options"),wxDefaultPosition,wxDefaultSize)
 {
+	SetIcon(GETICON(use_dummy_video_menu_16));
+
 	// Main controls
 	length_display = 0;
 	resolution_shortcuts = new wxComboBox(this, Dummy_Video_Resolution_Shortcut, "", wxDefaultPosition, wxDefaultSize, 0, 0, wxCB_READONLY);
diff --git a/aegisub/src/dialog_export.cpp b/aegisub/src/dialog_export.cpp
index dc72c5b8c..872404b10 100644
--- a/aegisub/src/dialog_export.cpp
+++ b/aegisub/src/dialog_export.cpp
@@ -51,12 +51,14 @@
 #include "include/aegisub/context.h"
 #include "charset_conv.h"
 #include "help_button.h"
+#include "libresrc/libresrc.h"
 
 DialogExport::DialogExport(agi::Context *c)
 : wxDialog(c->parent, -1, _("Export"), wxDefaultPosition, wxSize(200, 100), wxCAPTION | wxCLOSE_BOX)
 , c(c)
 , exporter(new AssExporter(c))
 {
+	SetIcon(GETICON(export_menu_16));
 	SetExtraStyle(wxWS_EX_VALIDATE_RECURSIVELY);
 
 	wxArrayString filters = exporter->GetAllFilterNames();
diff --git a/aegisub/src/dialog_selection.cpp b/aegisub/src/dialog_selection.cpp
index 5ecb64018..c3bbe1d80 100644
--- a/aegisub/src/dialog_selection.cpp
+++ b/aegisub/src/dialog_selection.cpp
@@ -43,6 +43,7 @@
 #include "frame_main.h"
 #include "help_button.h"
 #include "include/aegisub/context.h"
+#include "libresrc/libresrc.h"
 #include "main.h"
 #include "selection_controller.h"
 
@@ -131,6 +132,8 @@ DialogSelection::DialogSelection(agi::Context *c) :
 wxDialog (c->parent, -1, _("Select"), wxDefaultPosition, wxDefaultSize, wxCAPTION)
 , con(c)
 {
+	SetIcon(GETICON(select_lines_button_16));
+
 	wxSizer *main_sizer = new wxBoxSizer(wxVERTICAL);
 
 	wxSizerFlags main_flags = wxSizerFlags().Expand().Border();
diff --git a/aegisub/src/dialog_style_manager.cpp b/aegisub/src/dialog_style_manager.cpp
index c829da674..215c9b8f1 100644
--- a/aegisub/src/dialog_style_manager.cpp
+++ b/aegisub/src/dialog_style_manager.cpp
@@ -38,6 +38,7 @@
 #include "dialog_style_manager.h"
 
 #ifndef AGI_PRE
+#include <algorithm>
 #include <tr1/functional>
 
 #include <wx/bmpbuttn.h>
diff --git a/aegisub/src/preferences.cpp b/aegisub/src/preferences.cpp
index 49b905749..a6da686ce 100644
--- a/aegisub/src/preferences.cpp
+++ b/aegisub/src/preferences.cpp
@@ -658,7 +658,7 @@ static void PageChanged(wxBookCtrlEvent& evt) {
 }
 
 Preferences::Preferences(wxWindow *parent): wxDialog(parent, -1, _("Preferences"), wxDefaultPosition, wxSize(-1, 500)) {
-	//	SetIcon(GETICON(options_button_16));
+	SetIcon(GETICON(options_button_16));
 
 	book = new wxTreebook(this, -1, wxDefaultPosition, wxDefaultSize);
 	new General(book, this);