From eba231a8bb20c9c8b9a7b2f72a3da01dc9f67e82 Mon Sep 17 00:00:00 2001
From: Wayne Stambaugh <stambaughw@gmail.com>
Date: Sun, 8 Jan 2023 11:27:01 -0500
Subject: [PATCH] 3D model selection dialog layout improvements.

---
 3d-viewer/dialogs/dialog_select_3d_model_base.cpp | 4 ++--
 3d-viewer/dialogs/dialog_select_3d_model_base.fbp | 8 ++++++--
 3d-viewer/dialogs/dialog_select_3d_model_base.h   | 5 +++--
 3 files changed, 11 insertions(+), 6 deletions(-)

diff --git a/3d-viewer/dialogs/dialog_select_3d_model_base.cpp b/3d-viewer/dialogs/dialog_select_3d_model_base.cpp
index 4ce557d1fe..5e1825dfc0 100644
--- a/3d-viewer/dialogs/dialog_select_3d_model_base.cpp
+++ b/3d-viewer/dialogs/dialog_select_3d_model_base.cpp
@@ -1,5 +1,5 @@
 ///////////////////////////////////////////////////////////////////////////
-// C++ code generated with wxFormBuilder (version Oct 26 2018)
+// C++ code generated with wxFormBuilder (version 3.10.1-0-g8feb16b)
 // http://www.wxformbuilder.org/
 //
 // PLEASE DO *NOT* EDIT THIS FILE!
@@ -57,7 +57,7 @@ DIALOG_SELECT_3D_MODEL_BASE::DIALOG_SELECT_3D_MODEL_BASE( wxWindow* parent, wxWi
 
 	m_stDirChoice = new wxStaticText( this, wxID_ANY, _("Available paths:"), wxDefaultPosition, wxDefaultSize, 0 );
 	m_stDirChoice->Wrap( -1 );
-	bSizerLower->Add( m_stDirChoice, 0, wxALIGN_CENTER_VERTICAL|wxTOP|wxBOTTOM|wxLEFT, 5 );
+	bSizerLower->Add( m_stDirChoice, 0, wxALIGN_CENTER_VERTICAL|wxBOTTOM|wxLEFT|wxRIGHT|wxTOP, 5 );
 
 	wxArrayString m_dirChoicesChoices;
 	m_dirChoices = new wxChoice( this, wxID_ANY, wxDefaultPosition, wxDefaultSize, m_dirChoicesChoices, 0 );
diff --git a/3d-viewer/dialogs/dialog_select_3d_model_base.fbp b/3d-viewer/dialogs/dialog_select_3d_model_base.fbp
index d9ad916caf..5d4b0626ec 100644
--- a/3d-viewer/dialogs/dialog_select_3d_model_base.fbp
+++ b/3d-viewer/dialogs/dialog_select_3d_model_base.fbp
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8" standalone="yes" ?>
 <wxFormBuilder_Project>
-    <FileVersion major="1" minor="15" />
+    <FileVersion major="1" minor="16" />
     <object class="Project" expanded="1">
         <property name="class_decoration">; </property>
         <property name="code_generation">C++</property>
@@ -14,6 +14,7 @@
         <property name="file">dialog_select_3d_model_base</property>
         <property name="first_id">1000</property>
         <property name="help_provider">none</property>
+        <property name="image_path_wrapper_function_name"></property>
         <property name="indent_with_spaces"></property>
         <property name="internationalize">1</property>
         <property name="name">dialog_select_3d_model_base</property>
@@ -25,6 +26,7 @@
         <property name="skip_php_events">1</property>
         <property name="skip_python_events">1</property>
         <property name="ui_table">UI</property>
+        <property name="use_array_enum">0</property>
         <property name="use_enum">0</property>
         <property name="use_microsoft_bom">0</property>
         <object class="Dialog" expanded="1">
@@ -50,6 +52,7 @@
             <property name="subclass">DIALOG_SHIM; dialog_shim.h; forward_declare</property>
             <property name="title">Select 3D Model</property>
             <property name="tooltip"></property>
+            <property name="two_step_creation">0</property>
             <property name="window_extra_style"></property>
             <property name="window_name"></property>
             <property name="window_style"></property>
@@ -327,7 +330,7 @@
                         <property name="permission">none</property>
                         <object class="sizeritem" expanded="1">
                             <property name="border">5</property>
-                            <property name="flag">wxALIGN_CENTER_VERTICAL|wxTOP|wxBOTTOM|wxLEFT</property>
+                            <property name="flag">wxALIGN_CENTER_VERTICAL|wxBOTTOM|wxLEFT|wxRIGHT|wxTOP</property>
                             <property name="proportion">0</property>
                             <object class="wxStaticText" expanded="1">
                                 <property name="BottomDockable">1</property>
@@ -464,6 +467,7 @@
                                 <property name="aui_name"></property>
                                 <property name="aui_position"></property>
                                 <property name="aui_row"></property>
+                                <property name="auth_needed">0</property>
                                 <property name="best_size"></property>
                                 <property name="bg"></property>
                                 <property name="bitmap"></property>
diff --git a/3d-viewer/dialogs/dialog_select_3d_model_base.h b/3d-viewer/dialogs/dialog_select_3d_model_base.h
index 81f7eff1cb..d0b50f2228 100644
--- a/3d-viewer/dialogs/dialog_select_3d_model_base.h
+++ b/3d-viewer/dialogs/dialog_select_3d_model_base.h
@@ -1,5 +1,5 @@
 ///////////////////////////////////////////////////////////////////////////
-// C++ code generated with wxFormBuilder (version Oct 26 2018)
+// C++ code generated with wxFormBuilder (version 3.10.1-0-g8feb16b)
 // http://www.wxformbuilder.org/
 //
 // PLEASE DO *NOT* EDIT THIS FILE!
@@ -22,10 +22,10 @@
 #include <wx/splitter.h>
 #include <wx/stattext.h>
 #include <wx/choice.h>
+#include <wx/button.h>
 #include <wx/bitmap.h>
 #include <wx/image.h>
 #include <wx/icon.h>
-#include <wx/button.h>
 #include <wx/dialog.h>
 
 ///////////////////////////////////////////////////////////////////////////
@@ -61,6 +61,7 @@ class DIALOG_SELECT_3D_MODEL_BASE : public DIALOG_SHIM
 	public:
 
 		DIALOG_SELECT_3D_MODEL_BASE( wxWindow* parent, wxWindowID id = wxID_ANY, const wxString& title = _("Select 3D Model"), const wxPoint& pos = wxDefaultPosition, const wxSize& size = wxSize( -1,-1 ), long style = wxDEFAULT_DIALOG_STYLE|wxRESIZE_BORDER );
+
 		~DIALOG_SELECT_3D_MODEL_BASE();
 
 		void m_splitterWinOnIdle( wxIdleEvent& )