From fda7d682435726bf874d5426b1d443bb14638225 Mon Sep 17 00:00:00 2001
From: Seth Hillbrand <seth@kipro-pcb.com>
Date: Tue, 28 Sep 2021 09:17:45 -0700
Subject: [PATCH] Hide extra edit label elements

By default, we don't need to see the drop-down choice menu in the edit
text dialog.  It is shown by the routines that use it
---
 common/dialogs/dialog_text_entry_base.cpp | 4 ++++
 common/dialogs/dialog_text_entry_base.fbp | 4 ++--
 2 files changed, 6 insertions(+), 2 deletions(-)

diff --git a/common/dialogs/dialog_text_entry_base.cpp b/common/dialogs/dialog_text_entry_base.cpp
index e8b15fbbd6..8329fef407 100644
--- a/common/dialogs/dialog_text_entry_base.cpp
+++ b/common/dialogs/dialog_text_entry_base.cpp
@@ -32,11 +32,15 @@ WX_TEXT_ENTRY_DIALOG_BASE::WX_TEXT_ENTRY_DIALOG_BASE( wxWindow* parent, wxWindow
 
 	m_choiceLabel = new wxStaticText( this, wxID_ANY, _("MyLabel"), wxDefaultPosition, wxDefaultSize, 0 );
 	m_choiceLabel->Wrap( -1 );
+	m_choiceLabel->Hide();
+
 	bSizer3->Add( m_choiceLabel, 2, wxALIGN_CENTER_VERTICAL|wxBOTTOM|wxEXPAND|wxLEFT|wxRIGHT, 5 );
 
 	wxArrayString m_choiceChoices;
 	m_choice = new wxChoice( this, wxID_ANY, wxDefaultPosition, wxDefaultSize, m_choiceChoices, 0 );
 	m_choice->SetSelection( 0 );
+	m_choice->Hide();
+
 	bSizer3->Add( m_choice, 3, wxALIGN_CENTER_VERTICAL|wxBOTTOM|wxEXPAND|wxLEFT|wxRIGHT, 5 );
 
 
diff --git a/common/dialogs/dialog_text_entry_base.fbp b/common/dialogs/dialog_text_entry_base.fbp
index 20ab5c662c..921ee9a765 100644
--- a/common/dialogs/dialog_text_entry_base.fbp
+++ b/common/dialogs/dialog_text_entry_base.fbp
@@ -233,7 +233,7 @@
                                         <property name="floatable">1</property>
                                         <property name="font"></property>
                                         <property name="gripper">0</property>
-                                        <property name="hidden">0</property>
+                                        <property name="hidden">1</property>
                                         <property name="id">wxID_ANY</property>
                                         <property name="label">MyLabel</property>
                                         <property name="markup">0</property>
@@ -295,7 +295,7 @@
                                         <property name="floatable">1</property>
                                         <property name="font"></property>
                                         <property name="gripper">0</property>
-                                        <property name="hidden">0</property>
+                                        <property name="hidden">1</property>
                                         <property name="id">wxID_ANY</property>
                                         <property name="max_size"></property>
                                         <property name="maximize_button">0</property>