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 #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 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 callback) { + DialogColorPicker dialog(parent, original, callback); + bool ok = dialog.ShowModal() == wxID_OK; + if (!ok) + callback(original); + else + dialog.AddColorToRecent(); + return ok; +}