From 605d0ab3c173350fbcef7d7aeee88c986dc528c2 Mon Sep 17 00:00:00 2001
From: Wayne Stambaugh <stambaughw@gmail.com>
Date: Sun, 10 Feb 2019 19:07:38 -0500
Subject: [PATCH] Fix exit dialog issue on GTK3 builds.

The main text was cut off at the bottom.  Enabling wrapping seemed to
resolve the issue.
---
 common/dialogs/dialog_exit_base.cpp | 13 ++++++-------
 common/dialogs/dialog_exit_base.fbp | 12 ++++++------
 common/dialogs/dialog_exit_base.h   |  2 +-
 3 files changed, 13 insertions(+), 14 deletions(-)

diff --git a/common/dialogs/dialog_exit_base.cpp b/common/dialogs/dialog_exit_base.cpp
index 35a011dbc6..cd9d427f1b 100644
--- a/common/dialogs/dialog_exit_base.cpp
+++ b/common/dialogs/dialog_exit_base.cpp
@@ -1,5 +1,5 @@
 ///////////////////////////////////////////////////////////////////////////
-// C++ code generated with wxFormBuilder (version Dec  1 2018)
+// C++ code generated with wxFormBuilder (version Nov 21 2018)
 // http://www.wxformbuilder.org/
 //
 // PLEASE DO *NOT* EDIT THIS FILE!
@@ -32,7 +32,7 @@ DIALOG_EXIT_BASE::DIALOG_EXIT_BASE( wxWindow* parent, wxWindowID id, const wxStr
 	bSizerMessages->Add( m_TextInfo, 0, wxALL, 5 );
 
 	m_staticTextWarningMessage = new wxStaticText( this, wxID_ANY, _("If you don't save, all your changes will be permanently lost."), wxDefaultPosition, wxDefaultSize, 0 );
-	m_staticTextWarningMessage->Wrap( -1 );
+	m_staticTextWarningMessage->Wrap( 300 );
 	bSizerMessages->Add( m_staticTextWarningMessage, 0, wxALL, 5 );
 
 
@@ -42,13 +42,12 @@ DIALOG_EXIT_BASE::DIALOG_EXIT_BASE( wxWindow* parent, wxWindowID id, const wxStr
 	bSizerMain->Add( bSizerUpper, 1, wxEXPAND|wxALL, 5 );
 
 	m_staticline = new wxStaticLine( this, wxID_ANY, wxDefaultPosition, wxDefaultSize, wxLI_HORIZONTAL );
-	bSizerMain->Add( m_staticline, 0, wxEXPAND|wxTOP|wxRIGHT|wxLEFT, 10 );
+	bSizerMain->Add( m_staticline, 0, wxEXPAND|wxLEFT|wxRIGHT, 10 );
 
 	m_buttonSizer = new wxBoxSizer( wxHORIZONTAL );
 
-	m_buttonSizer->SetMinSize( wxSize( 475,-1 ) );
 	m_ApplyToAllOpt = new wxCheckBox( this, wxID_ANY, _("Apply to all"), wxDefaultPosition, wxDefaultSize, 0 );
-	m_buttonSizer->Add( m_ApplyToAllOpt, 0, wxALIGN_CENTER_VERTICAL|wxTOP|wxBOTTOM, 5 );
+	m_buttonSizer->Add( m_ApplyToAllOpt, 0, wxALIGN_CENTER_VERTICAL|wxBOTTOM|wxTOP, 5 );
 
 
 	m_buttonSizer->Add( 20, 0, 1, wxRIGHT|wxLEFT, 5 );
@@ -66,10 +65,10 @@ DIALOG_EXIT_BASE::DIALOG_EXIT_BASE( wxWindow* parent, wxWindowID id, const wxStr
 	m_sdbSizer->AddButton( m_sdbSizerCancel );
 	m_sdbSizer->Realize();
 
-	m_buttonSizer->Add( m_sdbSizer, 0, wxALL, 5 );
+	m_buttonSizer->Add( m_sdbSizer, 0, wxBOTTOM|wxTOP, 5 );
 
 
-	bSizerMain->Add( m_buttonSizer, 0, wxEXPAND|wxLEFT, 10 );
+	bSizerMain->Add( m_buttonSizer, 0, wxEXPAND|wxLEFT, 5 );
 
 
 	this->SetSizer( bSizerMain );
diff --git a/common/dialogs/dialog_exit_base.fbp b/common/dialogs/dialog_exit_base.fbp
index 0ac80f322c..902f6fca39 100644
--- a/common/dialogs/dialog_exit_base.fbp
+++ b/common/dialogs/dialog_exit_base.fbp
@@ -253,7 +253,7 @@
                                         <property name="window_extra_style"></property>
                                         <property name="window_name"></property>
                                         <property name="window_style"></property>
-                                        <property name="wrap">-1</property>
+                                        <property name="wrap">300</property>
                                     </object>
                                 </object>
                             </object>
@@ -262,7 +262,7 @@
                 </object>
                 <object class="sizeritem" expanded="1">
                     <property name="border">10</property>
-                    <property name="flag">wxEXPAND|wxTOP|wxRIGHT|wxLEFT</property>
+                    <property name="flag">wxEXPAND|wxLEFT|wxRIGHT</property>
                     <property name="proportion">0</property>
                     <object class="wxStaticLine" expanded="1">
                         <property name="BottomDockable">1</property>
@@ -319,17 +319,17 @@
                     </object>
                 </object>
                 <object class="sizeritem" expanded="1">
-                    <property name="border">10</property>
+                    <property name="border">5</property>
                     <property name="flag">wxEXPAND|wxLEFT</property>
                     <property name="proportion">0</property>
                     <object class="wxBoxSizer" expanded="1">
-                        <property name="minimum_size">475,-1</property>
+                        <property name="minimum_size">-1,-1</property>
                         <property name="name">m_buttonSizer</property>
                         <property name="orient">wxHORIZONTAL</property>
                         <property name="permission">protected</property>
                         <object class="sizeritem" expanded="1">
                             <property name="border">5</property>
-                            <property name="flag">wxALIGN_CENTER_VERTICAL|wxTOP|wxBOTTOM</property>
+                            <property name="flag">wxALIGN_CENTER_VERTICAL|wxBOTTOM|wxTOP</property>
                             <property name="proportion">0</property>
                             <object class="wxCheckBox" expanded="1">
                                 <property name="BottomDockable">1</property>
@@ -486,7 +486,7 @@
                         </object>
                         <object class="sizeritem" expanded="1">
                             <property name="border">5</property>
-                            <property name="flag">wxALL</property>
+                            <property name="flag">wxBOTTOM|wxTOP</property>
                             <property name="proportion">0</property>
                             <object class="wxStdDialogButtonSizer" expanded="1">
                                 <property name="Apply">0</property>
diff --git a/common/dialogs/dialog_exit_base.h b/common/dialogs/dialog_exit_base.h
index b47724f150..cf3f96f50a 100644
--- a/common/dialogs/dialog_exit_base.h
+++ b/common/dialogs/dialog_exit_base.h
@@ -1,5 +1,5 @@
 ///////////////////////////////////////////////////////////////////////////
-// C++ code generated with wxFormBuilder (version Dec  1 2018)
+// C++ code generated with wxFormBuilder (version Nov 21 2018)
 // http://www.wxformbuilder.org/
 //
 // PLEASE DO *NOT* EDIT THIS FILE!