From a55950bd68bc2a68c847172c7c0cef730060d94e Mon Sep 17 00:00:00 2001
From: jean-pierre charras <jp.charras@wanadoo.fr>
Date: Thu, 1 Nov 2018 16:50:57 +0100
Subject: [PATCH] DIALOG_COLOR_PICKER_BASE: fix a minor wxWidgets alert.

---
 common/dialogs/dialog_color_picker_base.cpp |   4 +-
 common/dialogs/dialog_color_picker_base.fbp | 191 +++++++++++++++++++-
 common/dialogs/dialog_color_picker_base.h   |   2 +-
 3 files changed, 191 insertions(+), 6 deletions(-)

diff --git a/common/dialogs/dialog_color_picker_base.cpp b/common/dialogs/dialog_color_picker_base.cpp
index 55cdb94842..3fc90a7c19 100644
--- a/common/dialogs/dialog_color_picker_base.cpp
+++ b/common/dialogs/dialog_color_picker_base.cpp
@@ -1,5 +1,5 @@
 ///////////////////////////////////////////////////////////////////////////
-// C++ code generated with wxFormBuilder (version Dec 30 2017)
+// C++ code generated with wxFormBuilder (version Jul 11 2018)
 // http://www.wxformbuilder.org/
 //
 // PLEASE DO *NOT* EDIT THIS FILE!
@@ -213,7 +213,7 @@ DIALOG_COLOR_PICKER_BASE::DIALOG_COLOR_PICKER_BASE( wxWindow* parent, wxWindowID
 	m_sdbSizer->AddButton( m_sdbSizerCancel );
 	m_sdbSizer->Realize();
 	
-	bButtonsSizer->Add( m_sdbSizer, 1, wxALIGN_RIGHT|wxALL, 5 );
+	bButtonsSizer->Add( m_sdbSizer, 1, wxALL, 5 );
 	
 	
 	bSizerMain->Add( bButtonsSizer, 1, wxEXPAND|wxLEFT, 10 );
diff --git a/common/dialogs/dialog_color_picker_base.fbp b/common/dialogs/dialog_color_picker_base.fbp
index c79eba8f19..8f1b6e51b9 100644
--- a/common/dialogs/dialog_color_picker_base.fbp
+++ b/common/dialogs/dialog_color_picker_base.fbp
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8" standalone="yes" ?>
 <wxFormBuilder_Project>
-    <FileVersion major="1" minor="13" />
+    <FileVersion major="1" minor="14" />
     <object class="Project" expanded="1">
         <property name="class_decoration"></property>
         <property name="code_generation">C++</property>
@@ -14,6 +14,7 @@
         <property name="file">dialog_color_picker_base</property>
         <property name="first_id">1000</property>
         <property name="help_provider">none</property>
+        <property name="indent_with_spaces"></property>
         <property name="internationalize">1</property>
         <property name="name">DIALOG_COLOR_PICKER_BASE</property>
         <property name="namespace"></property>
@@ -54,13 +55,20 @@
             <property name="window_style"></property>
             <event name="OnActivate"></event>
             <event name="OnActivateApp"></event>
-            <event name="OnAuiFindManager"></event>
+            <event name="OnAuiPaneActivated"></event>
             <event name="OnAuiPaneButton"></event>
             <event name="OnAuiPaneClose"></event>
             <event name="OnAuiPaneMaximize"></event>
             <event name="OnAuiPaneRestore"></event>
             <event name="OnAuiRender"></event>
+            <event name="OnAux1DClick"></event>
+            <event name="OnAux1Down"></event>
+            <event name="OnAux1Up"></event>
+            <event name="OnAux2DClick"></event>
+            <event name="OnAux2Down"></event>
+            <event name="OnAux2Up"></event>
             <event name="OnChar"></event>
+            <event name="OnCharHook"></event>
             <event name="OnClose"></event>
             <event name="OnEnterWindow"></event>
             <event name="OnEraseBackground"></event>
@@ -75,17 +83,23 @@
             <event name="OnLeftDClick"></event>
             <event name="OnLeftDown"></event>
             <event name="OnLeftUp"></event>
+            <event name="OnMaximize"></event>
             <event name="OnMiddleDClick"></event>
             <event name="OnMiddleDown"></event>
             <event name="OnMiddleUp"></event>
             <event name="OnMotion"></event>
             <event name="OnMouseEvents"></event>
             <event name="OnMouseWheel"></event>
+            <event name="OnMove"></event>
+            <event name="OnMoveEnd"></event>
+            <event name="OnMoveStart"></event>
+            <event name="OnMoving"></event>
             <event name="OnPaint"></event>
             <event name="OnRightDClick"></event>
             <event name="OnRightDown"></event>
             <event name="OnRightUp"></event>
             <event name="OnSetFocus"></event>
+            <event name="OnShow"></event>
             <event name="OnSize"></event>
             <event name="OnUpdateUI"></event>
             <object class="wxBoxSizer" expanded="1">
@@ -159,7 +173,14 @@
                                 <property name="window_extra_style"></property>
                                 <property name="window_name"></property>
                                 <property name="window_style"></property>
+                                <event name="OnAux1DClick"></event>
+                                <event name="OnAux1Down"></event>
+                                <event name="OnAux1Up"></event>
+                                <event name="OnAux2DClick"></event>
+                                <event name="OnAux2Down"></event>
+                                <event name="OnAux2Up"></event>
                                 <event name="OnChar"></event>
+                                <event name="OnCharHook"></event>
                                 <event name="OnEnterWindow"></event>
                                 <event name="OnEraseBackground"></event>
                                 <event name="OnKeyDown"></event>
@@ -239,7 +260,14 @@
                                         <property name="window_extra_style"></property>
                                         <property name="window_name"></property>
                                         <property name="window_style">wxTAB_TRAVERSAL</property>
+                                        <event name="OnAux1DClick"></event>
+                                        <event name="OnAux1Down"></event>
+                                        <event name="OnAux1Up"></event>
+                                        <event name="OnAux2DClick"></event>
+                                        <event name="OnAux2Down"></event>
+                                        <event name="OnAux2Up"></event>
                                         <event name="OnChar"></event>
+                                        <event name="OnCharHook"></event>
                                         <event name="OnEnterWindow"></event>
                                         <event name="OnEraseBackground"></event>
                                         <event name="OnKeyDown"></event>
@@ -345,7 +373,14 @@
                                                                     <property name="window_extra_style"></property>
                                                                     <property name="window_name"></property>
                                                                     <property name="window_style"></property>
+                                                                    <event name="OnAux1DClick"></event>
+                                                                    <event name="OnAux1Down"></event>
+                                                                    <event name="OnAux1Up"></event>
+                                                                    <event name="OnAux2DClick"></event>
+                                                                    <event name="OnAux2Down"></event>
+                                                                    <event name="OnAux2Up"></event>
                                                                     <event name="OnChar"></event>
+                                                                    <event name="OnCharHook"></event>
                                                                     <event name="OnEnterWindow"></event>
                                                                     <event name="OnEraseBackground"></event>
                                                                     <event name="OnKeyDown"></event>
@@ -419,6 +454,7 @@
                                                                             <property name="hidden">0</property>
                                                                             <property name="id">wxID_ANY</property>
                                                                             <property name="label">Red:</property>
+                                                                            <property name="markup">0</property>
                                                                             <property name="max_size"></property>
                                                                             <property name="maximize_button">0</property>
                                                                             <property name="maximum_size"></property>
@@ -444,7 +480,14 @@
                                                                             <property name="window_name"></property>
                                                                             <property name="window_style"></property>
                                                                             <property name="wrap">-1</property>
+                                                                            <event name="OnAux1DClick"></event>
+                                                                            <event name="OnAux1Down"></event>
+                                                                            <event name="OnAux1Up"></event>
+                                                                            <event name="OnAux2DClick"></event>
+                                                                            <event name="OnAux2Down"></event>
+                                                                            <event name="OnAux2Up"></event>
                                                                             <event name="OnChar"></event>
+                                                                            <event name="OnCharHook"></event>
                                                                             <event name="OnEnterWindow"></event>
                                                                             <event name="OnEraseBackground"></event>
                                                                             <event name="OnKeyDown"></event>
@@ -502,6 +545,7 @@
                                                                             <property name="hidden">0</property>
                                                                             <property name="id">wxID_ANY</property>
                                                                             <property name="label">Green:</property>
+                                                                            <property name="markup">0</property>
                                                                             <property name="max_size"></property>
                                                                             <property name="maximize_button">0</property>
                                                                             <property name="maximum_size"></property>
@@ -527,7 +571,14 @@
                                                                             <property name="window_name"></property>
                                                                             <property name="window_style"></property>
                                                                             <property name="wrap">-1</property>
+                                                                            <event name="OnAux1DClick"></event>
+                                                                            <event name="OnAux1Down"></event>
+                                                                            <event name="OnAux1Up"></event>
+                                                                            <event name="OnAux2DClick"></event>
+                                                                            <event name="OnAux2Down"></event>
+                                                                            <event name="OnAux2Up"></event>
                                                                             <event name="OnChar"></event>
+                                                                            <event name="OnCharHook"></event>
                                                                             <event name="OnEnterWindow"></event>
                                                                             <event name="OnEraseBackground"></event>
                                                                             <event name="OnKeyDown"></event>
@@ -585,6 +636,7 @@
                                                                             <property name="hidden">0</property>
                                                                             <property name="id">wxID_ANY</property>
                                                                             <property name="label">Blue:</property>
+                                                                            <property name="markup">0</property>
                                                                             <property name="max_size"></property>
                                                                             <property name="maximize_button">0</property>
                                                                             <property name="maximum_size"></property>
@@ -610,7 +662,14 @@
                                                                             <property name="window_name"></property>
                                                                             <property name="window_style"></property>
                                                                             <property name="wrap">-1</property>
+                                                                            <event name="OnAux1DClick"></event>
+                                                                            <event name="OnAux1Down"></event>
+                                                                            <event name="OnAux1Up"></event>
+                                                                            <event name="OnAux2DClick"></event>
+                                                                            <event name="OnAux2Down"></event>
+                                                                            <event name="OnAux2Up"></event>
                                                                             <event name="OnChar"></event>
+                                                                            <event name="OnCharHook"></event>
                                                                             <event name="OnEnterWindow"></event>
                                                                             <event name="OnEraseBackground"></event>
                                                                             <event name="OnKeyDown"></event>
@@ -695,7 +754,14 @@
                                                                             <property name="window_extra_style"></property>
                                                                             <property name="window_name"></property>
                                                                             <property name="window_style"></property>
+                                                                            <event name="OnAux1DClick"></event>
+                                                                            <event name="OnAux1Down"></event>
+                                                                            <event name="OnAux1Up"></event>
+                                                                            <event name="OnAux2DClick"></event>
+                                                                            <event name="OnAux2Down"></event>
+                                                                            <event name="OnAux2Up"></event>
                                                                             <event name="OnChar"></event>
+                                                                            <event name="OnCharHook"></event>
                                                                             <event name="OnEnterWindow"></event>
                                                                             <event name="OnEraseBackground"></event>
                                                                             <event name="OnKeyDown"></event>
@@ -783,7 +849,14 @@
                                                                             <property name="window_extra_style"></property>
                                                                             <property name="window_name"></property>
                                                                             <property name="window_style"></property>
+                                                                            <event name="OnAux1DClick"></event>
+                                                                            <event name="OnAux1Down"></event>
+                                                                            <event name="OnAux1Up"></event>
+                                                                            <event name="OnAux2DClick"></event>
+                                                                            <event name="OnAux2Down"></event>
+                                                                            <event name="OnAux2Up"></event>
                                                                             <event name="OnChar"></event>
+                                                                            <event name="OnCharHook"></event>
                                                                             <event name="OnEnterWindow"></event>
                                                                             <event name="OnEraseBackground"></event>
                                                                             <event name="OnKeyDown"></event>
@@ -871,7 +944,14 @@
                                                                             <property name="window_extra_style"></property>
                                                                             <property name="window_name"></property>
                                                                             <property name="window_style"></property>
+                                                                            <event name="OnAux1DClick"></event>
+                                                                            <event name="OnAux1Down"></event>
+                                                                            <event name="OnAux1Up"></event>
+                                                                            <event name="OnAux2DClick"></event>
+                                                                            <event name="OnAux2Down"></event>
+                                                                            <event name="OnAux2Up"></event>
                                                                             <event name="OnChar"></event>
+                                                                            <event name="OnCharHook"></event>
                                                                             <event name="OnEnterWindow"></event>
                                                                             <event name="OnEraseBackground"></event>
                                                                             <event name="OnKeyDown"></event>
@@ -981,7 +1061,14 @@
                                                                             <property name="window_extra_style"></property>
                                                                             <property name="window_name"></property>
                                                                             <property name="window_style"></property>
+                                                                            <event name="OnAux1DClick"></event>
+                                                                            <event name="OnAux1Down"></event>
+                                                                            <event name="OnAux1Up"></event>
+                                                                            <event name="OnAux2DClick"></event>
+                                                                            <event name="OnAux2Down"></event>
+                                                                            <event name="OnAux2Up"></event>
                                                                             <event name="OnChar"></event>
+                                                                            <event name="OnCharHook"></event>
                                                                             <event name="OnEnterWindow"></event>
                                                                             <event name="OnEraseBackground"></event>
                                                                             <event name="OnKeyDown"></event>
@@ -1055,6 +1142,7 @@
                                                                                     <property name="hidden">0</property>
                                                                                     <property name="id">wxID_ANY</property>
                                                                                     <property name="label">Hue:</property>
+                                                                                    <property name="markup">0</property>
                                                                                     <property name="max_size"></property>
                                                                                     <property name="maximize_button">0</property>
                                                                                     <property name="maximum_size"></property>
@@ -1080,7 +1168,14 @@
                                                                                     <property name="window_name"></property>
                                                                                     <property name="window_style"></property>
                                                                                     <property name="wrap">-1</property>
+                                                                                    <event name="OnAux1DClick"></event>
+                                                                                    <event name="OnAux1Down"></event>
+                                                                                    <event name="OnAux1Up"></event>
+                                                                                    <event name="OnAux2DClick"></event>
+                                                                                    <event name="OnAux2Down"></event>
+                                                                                    <event name="OnAux2Up"></event>
                                                                                     <event name="OnChar"></event>
+                                                                                    <event name="OnCharHook"></event>
                                                                                     <event name="OnEnterWindow"></event>
                                                                                     <event name="OnEraseBackground"></event>
                                                                                     <event name="OnKeyDown"></event>
@@ -1138,6 +1233,7 @@
                                                                                     <property name="hidden">0</property>
                                                                                     <property name="id">wxID_ANY</property>
                                                                                     <property name="label">Saturation:</property>
+                                                                                    <property name="markup">0</property>
                                                                                     <property name="max_size"></property>
                                                                                     <property name="maximize_button">0</property>
                                                                                     <property name="maximum_size"></property>
@@ -1163,7 +1259,14 @@
                                                                                     <property name="window_name"></property>
                                                                                     <property name="window_style"></property>
                                                                                     <property name="wrap">-1</property>
+                                                                                    <event name="OnAux1DClick"></event>
+                                                                                    <event name="OnAux1Down"></event>
+                                                                                    <event name="OnAux1Up"></event>
+                                                                                    <event name="OnAux2DClick"></event>
+                                                                                    <event name="OnAux2Down"></event>
+                                                                                    <event name="OnAux2Up"></event>
                                                                                     <event name="OnChar"></event>
+                                                                                    <event name="OnCharHook"></event>
                                                                                     <event name="OnEnterWindow"></event>
                                                                                     <event name="OnEraseBackground"></event>
                                                                                     <event name="OnKeyDown"></event>
@@ -1248,7 +1351,14 @@
                                                                                     <property name="window_extra_style"></property>
                                                                                     <property name="window_name"></property>
                                                                                     <property name="window_style"></property>
+                                                                                    <event name="OnAux1DClick"></event>
+                                                                                    <event name="OnAux1Down"></event>
+                                                                                    <event name="OnAux1Up"></event>
+                                                                                    <event name="OnAux2DClick"></event>
+                                                                                    <event name="OnAux2Down"></event>
+                                                                                    <event name="OnAux2Up"></event>
                                                                                     <event name="OnChar"></event>
+                                                                                    <event name="OnCharHook"></event>
                                                                                     <event name="OnEnterWindow"></event>
                                                                                     <event name="OnEraseBackground"></event>
                                                                                     <event name="OnKeyDown"></event>
@@ -1336,7 +1446,14 @@
                                                                                     <property name="window_extra_style"></property>
                                                                                     <property name="window_name"></property>
                                                                                     <property name="window_style"></property>
+                                                                                    <event name="OnAux1DClick"></event>
+                                                                                    <event name="OnAux1Down"></event>
+                                                                                    <event name="OnAux1Up"></event>
+                                                                                    <event name="OnAux2DClick"></event>
+                                                                                    <event name="OnAux2Down"></event>
+                                                                                    <event name="OnAux2Up"></event>
                                                                                     <event name="OnChar"></event>
+                                                                                    <event name="OnCharHook"></event>
                                                                                     <event name="OnEnterWindow"></event>
                                                                                     <event name="OnEraseBackground"></event>
                                                                                     <event name="OnKeyDown"></event>
@@ -1410,6 +1527,7 @@
                                                                             <property name="hidden">0</property>
                                                                             <property name="id">wxID_ANY</property>
                                                                             <property name="label">Value:</property>
+                                                                            <property name="markup">0</property>
                                                                             <property name="max_size"></property>
                                                                             <property name="maximize_button">0</property>
                                                                             <property name="maximum_size"></property>
@@ -1435,7 +1553,14 @@
                                                                             <property name="window_name"></property>
                                                                             <property name="window_style"></property>
                                                                             <property name="wrap">-1</property>
+                                                                            <event name="OnAux1DClick"></event>
+                                                                            <event name="OnAux1Down"></event>
+                                                                            <event name="OnAux1Up"></event>
+                                                                            <event name="OnAux2DClick"></event>
+                                                                            <event name="OnAux2Down"></event>
+                                                                            <event name="OnAux2Up"></event>
                                                                             <event name="OnChar"></event>
+                                                                            <event name="OnCharHook"></event>
                                                                             <event name="OnEnterWindow"></event>
                                                                             <event name="OnEraseBackground"></event>
                                                                             <event name="OnKeyDown"></event>
@@ -1523,7 +1648,14 @@
                                                                             <property name="window_extra_style"></property>
                                                                             <property name="window_name"></property>
                                                                             <property name="window_style"></property>
+                                                                            <event name="OnAux1DClick"></event>
+                                                                            <event name="OnAux1Down"></event>
+                                                                            <event name="OnAux1Up"></event>
+                                                                            <event name="OnAux2DClick"></event>
+                                                                            <event name="OnAux2Down"></event>
+                                                                            <event name="OnAux2Up"></event>
                                                                             <event name="OnChar"></event>
+                                                                            <event name="OnCharHook"></event>
                                                                             <event name="OnCommandScroll"></event>
                                                                             <event name="OnCommandScrollBottom"></event>
                                                                             <event name="OnCommandScrollChanged"></event>
@@ -1565,6 +1697,7 @@
                                                                             <event name="OnScrollTop"></event>
                                                                             <event name="OnSetFocus"></event>
                                                                             <event name="OnSize"></event>
+                                                                            <event name="OnSlider"></event>
                                                                             <event name="OnUpdateUI"></event>
                                                                         </object>
                                                                     </object>
@@ -1632,7 +1765,14 @@
                                         <property name="window_extra_style"></property>
                                         <property name="window_name"></property>
                                         <property name="window_style">wxTAB_TRAVERSAL</property>
+                                        <event name="OnAux1DClick"></event>
+                                        <event name="OnAux1Down"></event>
+                                        <event name="OnAux1Up"></event>
+                                        <event name="OnAux2DClick"></event>
+                                        <event name="OnAux2Down"></event>
+                                        <event name="OnAux2Up"></event>
                                         <event name="OnChar"></event>
+                                        <event name="OnCharHook"></event>
                                         <event name="OnEnterWindow"></event>
                                         <event name="OnEraseBackground"></event>
                                         <event name="OnKeyDown"></event>
@@ -1735,6 +1875,7 @@
                                         <property name="hidden">0</property>
                                         <property name="id">wxID_ANY</property>
                                         <property name="label">Opacity:</property>
+                                        <property name="markup">0</property>
                                         <property name="max_size"></property>
                                         <property name="maximize_button">0</property>
                                         <property name="maximum_size"></property>
@@ -1760,7 +1901,14 @@
                                         <property name="window_name"></property>
                                         <property name="window_style"></property>
                                         <property name="wrap">-1</property>
+                                        <event name="OnAux1DClick"></event>
+                                        <event name="OnAux1Down"></event>
+                                        <event name="OnAux1Up"></event>
+                                        <event name="OnAux2DClick"></event>
+                                        <event name="OnAux2Down"></event>
+                                        <event name="OnAux2Up"></event>
                                         <event name="OnChar"></event>
+                                        <event name="OnCharHook"></event>
                                         <event name="OnEnterWindow"></event>
                                         <event name="OnEraseBackground"></event>
                                         <event name="OnKeyDown"></event>
@@ -1848,7 +1996,14 @@
                                         <property name="window_extra_style"></property>
                                         <property name="window_name"></property>
                                         <property name="window_style"></property>
+                                        <event name="OnAux1DClick"></event>
+                                        <event name="OnAux1Down"></event>
+                                        <event name="OnAux1Up"></event>
+                                        <event name="OnAux2DClick"></event>
+                                        <event name="OnAux2Down"></event>
+                                        <event name="OnAux2Up"></event>
                                         <event name="OnChar"></event>
+                                        <event name="OnCharHook"></event>
                                         <event name="OnCommandScroll"></event>
                                         <event name="OnCommandScrollBottom"></event>
                                         <event name="OnCommandScrollChanged"></event>
@@ -1890,6 +2045,7 @@
                                         <event name="OnScrollTop"></event>
                                         <event name="OnSetFocus"></event>
                                         <event name="OnSize"></event>
+                                        <event name="OnSlider"></event>
                                         <event name="OnUpdateUI"></event>
                                     </object>
                                 </object>
@@ -1963,7 +2119,14 @@
                         <property name="window_extra_style"></property>
                         <property name="window_name"></property>
                         <property name="window_style"></property>
+                        <event name="OnAux1DClick"></event>
+                        <event name="OnAux1Down"></event>
+                        <event name="OnAux1Up"></event>
+                        <event name="OnAux2DClick"></event>
+                        <event name="OnAux2Down"></event>
+                        <event name="OnAux2Up"></event>
                         <event name="OnChar"></event>
+                        <event name="OnCharHook"></event>
                         <event name="OnEnterWindow"></event>
                         <event name="OnEraseBackground"></event>
                         <event name="OnKeyDown"></event>
@@ -2030,6 +2193,7 @@
                                 <property name="hidden">0</property>
                                 <property name="id">wxID_ANY</property>
                                 <property name="label">Preview (old / new):</property>
+                                <property name="markup">0</property>
                                 <property name="max_size"></property>
                                 <property name="maximize_button">0</property>
                                 <property name="maximum_size"></property>
@@ -2055,7 +2219,14 @@
                                 <property name="window_name"></property>
                                 <property name="window_style"></property>
                                 <property name="wrap">-1</property>
+                                <event name="OnAux1DClick"></event>
+                                <event name="OnAux1Down"></event>
+                                <event name="OnAux1Up"></event>
+                                <event name="OnAux2DClick"></event>
+                                <event name="OnAux2Down"></event>
+                                <event name="OnAux2Up"></event>
                                 <event name="OnChar"></event>
+                                <event name="OnCharHook"></event>
                                 <event name="OnEnterWindow"></event>
                                 <event name="OnEraseBackground"></event>
                                 <event name="OnKeyDown"></event>
@@ -2136,7 +2307,14 @@
                                 <property name="window_extra_style"></property>
                                 <property name="window_name"></property>
                                 <property name="window_style"></property>
+                                <event name="OnAux1DClick"></event>
+                                <event name="OnAux1Down"></event>
+                                <event name="OnAux1Up"></event>
+                                <event name="OnAux2DClick"></event>
+                                <event name="OnAux2Down"></event>
+                                <event name="OnAux2Up"></event>
                                 <event name="OnChar"></event>
+                                <event name="OnCharHook"></event>
                                 <event name="OnEnterWindow"></event>
                                 <event name="OnEraseBackground"></event>
                                 <event name="OnKeyDown"></event>
@@ -2217,7 +2395,14 @@
                                 <property name="window_extra_style"></property>
                                 <property name="window_name"></property>
                                 <property name="window_style"></property>
+                                <event name="OnAux1DClick"></event>
+                                <event name="OnAux1Down"></event>
+                                <event name="OnAux1Up"></event>
+                                <event name="OnAux2DClick"></event>
+                                <event name="OnAux2Down"></event>
+                                <event name="OnAux2Up"></event>
                                 <event name="OnChar"></event>
+                                <event name="OnCharHook"></event>
                                 <event name="OnEnterWindow"></event>
                                 <event name="OnEraseBackground"></event>
                                 <event name="OnKeyDown"></event>
@@ -2244,7 +2429,7 @@
                         </object>
                         <object class="sizeritem" expanded="1">
                             <property name="border">5</property>
-                            <property name="flag">wxALIGN_RIGHT|wxALL</property>
+                            <property name="flag">wxALL</property>
                             <property name="proportion">1</property>
                             <object class="wxStdDialogButtonSizer" expanded="1">
                                 <property name="Apply">0</property>
diff --git a/common/dialogs/dialog_color_picker_base.h b/common/dialogs/dialog_color_picker_base.h
index 8745146b80..005dba97fa 100644
--- a/common/dialogs/dialog_color_picker_base.h
+++ b/common/dialogs/dialog_color_picker_base.h
@@ -1,5 +1,5 @@
 ///////////////////////////////////////////////////////////////////////////
-// C++ code generated with wxFormBuilder (version Dec 30 2017)
+// C++ code generated with wxFormBuilder (version Jul 11 2018)
 // http://www.wxformbuilder.org/
 //
 // PLEASE DO *NOT* EDIT THIS FILE!