From 2072241e548bc4da0c3d58fb645199c44204fb82 Mon Sep 17 00:00:00 2001
From: Thomas Goyne <plorkyeran@aegisub.org>
Date: Sun, 13 Jan 2013 10:46:30 -0800
Subject: [PATCH] Move the implementation of the color picker dialog into an
 anonymous namespace

---
 aegisub/src/dialog_colorpicker.cpp | 24 ++++++++++++++----------
 1 file changed, 14 insertions(+), 10 deletions(-)

diff --git a/aegisub/src/dialog_colorpicker.cpp b/aegisub/src/dialog_colorpicker.cpp
index 4bfa4ffb9..49a05bc90 100644
--- a/aegisub/src/dialog_colorpicker.cpp
+++ b/aegisub/src/dialog_colorpicker.cpp
@@ -72,6 +72,8 @@
 #include <ApplicationServices/ApplicationServices.h>
 #endif
 
+namespace {
+
 class ColorPickerSpectrum : public wxControl {
 public:
 	enum PickerDirection {
@@ -563,16 +565,6 @@ void ColorPickerScreenDropper::DropFromScreenXY(int x, int y) {
 	Refresh(false);
 }
 
-bool GetColorFromUser(wxWindow* parent, agi::Color original, std::function<void (agi::Color)> callback) {
-	DialogColorPicker dialog(parent, original, callback);
-	bool ok = dialog.ShowModal() == wxID_OK;
-	if (!ok)
-		callback(original);
-	else
-		dialog.AddColorToRecent();
-	return ok;
-}
-
 static const int slider_width = 10; ///< width in pixels of the color slider control
 static const int alpha_box_size = 5;
 
@@ -1155,3 +1147,15 @@ void DialogColorPicker::OnCaptureLost(wxMouseCaptureLostEvent&) {
 	screen_dropper_icon->SetCursor(wxNullCursor);
 	screen_dropper_icon->SetBitmap(eyedropper_bitmap);
 }
+
+}
+
+bool GetColorFromUser(wxWindow* parent, agi::Color original, std::function<void (agi::Color)> callback) {
+	DialogColorPicker dialog(parent, original, callback);
+	bool ok = dialog.ShowModal() == wxID_OK;
+	if (!ok)
+		callback(original);
+	else
+		dialog.AddColorToRecent();
+	return ok;
+}