From 309bc35af3a940b19c3a89fa229de7e820eb99d2 Mon Sep 17 00:00:00 2001
From: Thomas Goyne <plorkyeran@aegisub.org>
Date: Fri, 6 Apr 2012 15:51:07 +0000
Subject: [PATCH] Don't accept keyboard focus in the color picker controls
 which can't be used via the keyboard. Updates #1467.

Originally committed to SVN as r6671.
---
 aegisub/src/dialog_colorpicker.cpp | 6 ++++++
 1 file changed, 6 insertions(+)

diff --git a/aegisub/src/dialog_colorpicker.cpp b/aegisub/src/dialog_colorpicker.cpp
index 7d323f480..e9101f4f8 100644
--- a/aegisub/src/dialog_colorpicker.cpp
+++ b/aegisub/src/dialog_colorpicker.cpp
@@ -100,6 +100,8 @@ private:
 	void OnPaint(wxPaintEvent &evt);
 	void OnMouse(wxMouseEvent &evt);
 
+	bool AcceptsFocusFromKeyboard() const { return false; }
+
 public:
 	ColorPickerSpectrum(wxWindow *parent, PickerDirection direction, wxSize size);
 
@@ -132,6 +134,8 @@ class ColorPickerRecent : public wxControl {
 	void OnPaint(wxPaintEvent &evt);
 	void OnSize(wxSizeEvent &evt);
 
+	bool AcceptsFocusFromKeyboard() const { return false; }
+
 public:
 	ColorPickerRecent(wxWindow *parent, int cols, int rows, int cellsize);
 
@@ -163,6 +167,8 @@ class ColorPickerScreenDropper : public wxControl {
 	void OnMouse(wxMouseEvent &evt);
 	void OnPaint(wxPaintEvent &evt);
 
+	bool AcceptsFocusFromKeyboard() const { return false; }
+
 public:
 	ColorPickerScreenDropper(wxWindow *parent, int resx, int resy, int magnification);