diff --git a/3d-viewer/3d_viewer/dialogs/dialog_3D_view_option_base.cpp b/3d-viewer/3d_viewer/dialogs/dialog_3D_view_option_base.cpp
index c5890ecc35..1be7e8a5e3 100644
--- a/3d-viewer/3d_viewer/dialogs/dialog_3D_view_option_base.cpp
+++ b/3d-viewer/3d_viewer/dialogs/dialog_3D_view_option_base.cpp
@@ -1,8 +1,8 @@
 ///////////////////////////////////////////////////////////////////////////
-// C++ code generated with wxFormBuilder (version Jul  2 2017)
+// C++ code generated with wxFormBuilder (version Jul 11 2018)
 // http://www.wxformbuilder.org/
 //
-// PLEASE DO "NOT" EDIT THIS FILE!
+// PLEASE DO *NOT* EDIT THIS FILE!
 ///////////////////////////////////////////////////////////////////////////
 
 #include "dialog_3D_view_option_base.h"
@@ -134,7 +134,7 @@ DIALOG_3D_VIEW_OPTIONS_BASE::DIALOG_3D_VIEW_OPTIONS_BASE( wxWindow* parent, wxWi
 	bSizeLeft->Add( fgSizer3DVisibility, 0, wxEXPAND, 5 );
 	
 	
-	bSizerUpper->Add( bSizeLeft, 1, wxALIGN_CENTER_VERTICAL|wxEXPAND, 5 );
+	bSizerUpper->Add( bSizeLeft, 1, wxEXPAND, 5 );
 	
 	m_staticlineVertical = new wxStaticLine( this, wxID_ANY, wxDefaultPosition, wxDefaultSize, wxLI_VERTICAL );
 	bSizerUpper->Add( m_staticlineVertical, 0, wxEXPAND | wxALL, 5 );
diff --git a/3d-viewer/3d_viewer/dialogs/dialog_3D_view_option_base.fbp b/3d-viewer/3d_viewer/dialogs/dialog_3D_view_option_base.fbp
index 8fcc3e751f..6c632fa950 100644
--- a/3d-viewer/3d_viewer/dialogs/dialog_3D_view_option_base.fbp
+++ b/3d-viewer/3d_viewer/dialogs/dialog_3D_view_option_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_3D_view_option_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_3D_view_option_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">
@@ -104,7 +118,7 @@
                         <property name="permission">none</property>
                         <object class="sizeritem" expanded="1">
                             <property name="border">5</property>
-                            <property name="flag">wxALIGN_CENTER_VERTICAL|wxEXPAND</property>
+                            <property name="flag">wxEXPAND</property>
                             <property name="proportion">1</property>
                             <object class="wxBoxSizer" expanded="1">
                                 <property name="minimum_size"></property>
@@ -144,6 +158,7 @@
                                         <property name="hidden">0</property>
                                         <property name="id">wxID_ANY</property>
                                         <property name="label">Render options:</property>
+                                        <property name="markup">0</property>
                                         <property name="max_size"></property>
                                         <property name="maximize_button">0</property>
                                         <property name="maximum_size"></property>
@@ -169,7 +184,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>
@@ -276,7 +298,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>
@@ -363,7 +392,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="OnCheckBox">OnCheckRealisticMode</event>
                                                 <event name="OnEnterWindow"></event>
                                                 <event name="OnEraseBackground"></event>
@@ -455,7 +491,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>
@@ -542,7 +585,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="OnCheckBox"></event>
                                                 <event name="OnEnterWindow"></event>
                                                 <event name="OnEraseBackground"></event>
@@ -634,7 +684,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>
@@ -721,7 +778,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="OnCheckBox"></event>
                                                 <event name="OnEnterWindow"></event>
                                                 <event name="OnEraseBackground"></event>
@@ -813,7 +877,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>
@@ -900,7 +971,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="OnCheckBox"></event>
                                                 <event name="OnEnterWindow"></event>
                                                 <event name="OnEraseBackground"></event>
@@ -992,7 +1070,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>
@@ -1079,7 +1164,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="OnCheckBox"></event>
                                                 <event name="OnEnterWindow"></event>
                                                 <event name="OnEraseBackground"></event>
@@ -1168,6 +1260,7 @@
                                         <property name="hidden">0</property>
                                         <property name="id">wxID_ANY</property>
                                         <property name="label">3D model visibility:</property>
+                                        <property name="markup">0</property>
                                         <property name="max_size"></property>
                                         <property name="maximize_button">0</property>
                                         <property name="maximum_size"></property>
@@ -1193,7 +1286,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>
@@ -1300,7 +1400,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>
@@ -1387,7 +1494,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="OnCheckBox"></event>
                                                 <event name="OnEnterWindow"></event>
                                                 <event name="OnEraseBackground"></event>
@@ -1479,7 +1593,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>
@@ -1566,7 +1687,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="OnCheckBox"></event>
                                                 <event name="OnEnterWindow"></event>
                                                 <event name="OnEraseBackground"></event>
@@ -1658,7 +1786,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>
@@ -1745,7 +1880,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="OnCheckBox"></event>
                                                 <event name="OnEnterWindow"></event>
                                                 <event name="OnEraseBackground"></event>
@@ -1831,7 +1973,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>
@@ -1907,6 +2056,7 @@
                                                 <property name="hidden">0</property>
                                                 <property name="id">wxID_ANY</property>
                                                 <property name="label">Board layers:</property>
+                                                <property name="markup">0</property>
                                                 <property name="max_size"></property>
                                                 <property name="maximize_button">0</property>
                                                 <property name="maximum_size"></property>
@@ -1932,7 +2082,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>
@@ -2039,7 +2196,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>
@@ -2126,7 +2290,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="OnCheckBox"></event>
                                                         <event name="OnEnterWindow"></event>
                                                         <event name="OnEraseBackground"></event>
@@ -2218,7 +2389,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>
@@ -2305,7 +2483,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="OnCheckBox"></event>
                                                         <event name="OnEnterWindow"></event>
                                                         <event name="OnEraseBackground"></event>
@@ -2397,7 +2582,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>
@@ -2484,7 +2676,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="OnCheckBox"></event>
                                                         <event name="OnEnterWindow"></event>
                                                         <event name="OnEraseBackground"></event>
@@ -2576,7 +2775,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>
@@ -2663,7 +2869,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="OnCheckBox"></event>
                                                         <event name="OnEnterWindow"></event>
                                                         <event name="OnEraseBackground"></event>
@@ -2734,6 +2947,7 @@
                                                 <property name="hidden">0</property>
                                                 <property name="id">wxID_ANY</property>
                                                 <property name="label">User layers (not shown in realistic mode):</property>
+                                                <property name="markup">0</property>
                                                 <property name="max_size"></property>
                                                 <property name="maximize_button">0</property>
                                                 <property name="maximum_size"></property>
@@ -2759,7 +2973,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>
@@ -2866,7 +3087,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>
@@ -2953,7 +3181,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="OnCheckBox"></event>
                                                         <event name="OnEnterWindow"></event>
                                                         <event name="OnEraseBackground"></event>
@@ -3045,7 +3280,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>
@@ -3132,7 +3374,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="OnCheckBox"></event>
                                                         <event name="OnEnterWindow"></event>
                                                         <event name="OnEraseBackground"></event>
@@ -3222,7 +3471,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>
diff --git a/3d-viewer/3d_viewer/dialogs/dialog_3D_view_option_base.h b/3d-viewer/3d_viewer/dialogs/dialog_3D_view_option_base.h
index 2986960d6b..cf43681572 100644
--- a/3d-viewer/3d_viewer/dialogs/dialog_3D_view_option_base.h
+++ b/3d-viewer/3d_viewer/dialogs/dialog_3D_view_option_base.h
@@ -1,8 +1,8 @@
 ///////////////////////////////////////////////////////////////////////////
-// C++ code generated with wxFormBuilder (version Jul  2 2017)
+// C++ code generated with wxFormBuilder (version Jul 11 2018)
 // http://www.wxformbuilder.org/
 //
-// PLEASE DO "NOT" EDIT THIS FILE!
+// PLEASE DO *NOT* EDIT THIS FILE!
 ///////////////////////////////////////////////////////////////////////////
 
 #ifndef __DIALOG_3D_VIEW_OPTION_BASE_H__
@@ -11,8 +11,6 @@
 #include <wx/artprov.h>
 #include <wx/xrc/xmlres.h>
 #include <wx/intl.h>
-class DIALOG_SHIM;
-
 #include "dialog_shim.h"
 #include <wx/string.h>
 #include <wx/stattext.h>