From be5f3717c73dfa2bf775f32ae77c2e3979cca217 Mon Sep 17 00:00:00 2001
From: jean-pierre charras <jp.charras@wanadoo.fr>
Date: Sat, 13 Jul 2019 18:32:18 +0200
Subject: [PATCH] Fix minor wxWidgets alerts.

---
 .../dialogs/panel_setup_netclasses_base.cpp   |  8 ++---
 .../dialogs/panel_setup_netclasses_base.fbp   | 32 ++++++++++---------
 pcbnew/dialogs/panel_setup_netclasses_base.h  |  2 +-
 3 files changed, 22 insertions(+), 20 deletions(-)

diff --git a/pcbnew/dialogs/panel_setup_netclasses_base.cpp b/pcbnew/dialogs/panel_setup_netclasses_base.cpp
index e81236985e..b5458a1cf1 100644
--- a/pcbnew/dialogs/panel_setup_netclasses_base.cpp
+++ b/pcbnew/dialogs/panel_setup_netclasses_base.cpp
@@ -1,5 +1,5 @@
 ///////////////////////////////////////////////////////////////////////////
-// C++ code generated with wxFormBuilder (version Oct 26 2018)
+// C++ code generated with wxFormBuilder (version Jul 10 2019)
 // http://www.wxformbuilder.org/
 //
 // PLEASE DO *NOT* EDIT THIS FILE!
@@ -95,7 +95,7 @@ PANEL_SETUP_NETCLASSES_BASE::PANEL_SETUP_NETCLASSES_BASE( wxWindow* parent, wxWi
 	m_netclassesPane->SetSizer( sbSizerUpper );
 	m_netclassesPane->Layout();
 	sbSizerUpper->Fit( m_netclassesPane );
-	bMargins->Add( m_netclassesPane, 1, wxALIGN_TOP|wxALL|wxEXPAND, 5 );
+	bMargins->Add( m_netclassesPane, 1, wxALL|wxEXPAND, 5 );
 
 	m_membershipPane = new wxPanel( this, wxID_ANY, wxDefaultPosition, wxDefaultSize, wxTAB_TRAVERSAL );
 	wxStaticBoxSizer* sbMembership;
@@ -237,10 +237,10 @@ PANEL_SETUP_NETCLASSES_BASE::PANEL_SETUP_NETCLASSES_BASE( wxWindow* parent, wxWi
 	m_membershipPane->SetSizer( sbMembership );
 	m_membershipPane->Layout();
 	sbMembership->Fit( m_membershipPane );
-	bMargins->Add( m_membershipPane, 1, wxALIGN_BOTTOM|wxALL|wxEXPAND, 5 );
+	bMargins->Add( m_membershipPane, 1, wxALL|wxEXPAND, 5 );
 
 
-	bpanelNetClassesSizer->Add( bMargins, 1, wxALIGN_BOTTOM|wxALIGN_TOP|wxEXPAND|wxRIGHT, 5 );
+	bpanelNetClassesSizer->Add( bMargins, 1, wxEXPAND, 5 );
 
 
 	this->SetSizer( bpanelNetClassesSizer );
diff --git a/pcbnew/dialogs/panel_setup_netclasses_base.fbp b/pcbnew/dialogs/panel_setup_netclasses_base.fbp
index 9224de3613..d0542e659c 100644
--- a/pcbnew/dialogs/panel_setup_netclasses_base.fbp
+++ b/pcbnew/dialogs/panel_setup_netclasses_base.fbp
@@ -14,6 +14,7 @@
         <property name="file">panel_setup_netclasses_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">panel_setup_netclasses_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">1</property>
         <property name="use_microsoft_bom">0</property>
         <object class="Panel" expanded="1">
@@ -57,7 +59,7 @@
                 <property name="permission">none</property>
                 <object class="sizeritem" expanded="1">
                     <property name="border">5</property>
-                    <property name="flag">wxALIGN_BOTTOM|wxALIGN_TOP|wxEXPAND|wxRIGHT</property>
+                    <property name="flag">wxEXPAND</property>
                     <property name="proportion">1</property>
                     <object class="wxBoxSizer" expanded="1">
                         <property name="minimum_size"></property>
@@ -66,7 +68,7 @@
                         <property name="permission">none</property>
                         <object class="sizeritem" expanded="1">
                             <property name="border">5</property>
-                            <property name="flag">wxALIGN_TOP|wxALL|wxEXPAND</property>
+                            <property name="flag">wxALL|wxEXPAND</property>
                             <property name="proportion">1</property>
                             <object class="wxPanel" expanded="1">
                                 <property name="BottomDockable">1</property>
@@ -388,7 +390,7 @@
                         </object>
                         <object class="sizeritem" expanded="1">
                             <property name="border">5</property>
-                            <property name="flag">wxALIGN_BOTTOM|wxALL|wxEXPAND</property>
+                            <property name="flag">wxALL|wxEXPAND</property>
                             <property name="proportion">1</property>
                             <object class="wxPanel" expanded="1">
                                 <property name="BottomDockable">1</property>
@@ -449,20 +451,20 @@
                                     <property name="orient">wxHORIZONTAL</property>
                                     <property name="parent">0</property>
                                     <property name="permission">none</property>
-                                    <object class="sizeritem" expanded="1">
+                                    <object class="sizeritem" expanded="0">
                                         <property name="border">5</property>
                                         <property name="flag">wxEXPAND|wxRIGHT</property>
                                         <property name="proportion">1</property>
-                                        <object class="wxBoxSizer" expanded="1">
+                                        <object class="wxBoxSizer" expanded="0">
                                             <property name="minimum_size"></property>
                                             <property name="name">bLeft</property>
                                             <property name="orient">wxVERTICAL</property>
                                             <property name="permission">none</property>
-                                            <object class="sizeritem" expanded="1">
+                                            <object class="sizeritem" expanded="0">
                                                 <property name="border">5</property>
                                                 <property name="flag">wxEXPAND|wxBOTTOM</property>
                                                 <property name="proportion">0</property>
-                                                <object class="wxStaticBoxSizer" expanded="1">
+                                                <object class="wxStaticBoxSizer" expanded="0">
                                                     <property name="id">wxID_ANY</property>
                                                     <property name="label">Filter Nets</property>
                                                     <property name="minimum_size"></property>
@@ -742,11 +744,11 @@
                                                             </object>
                                                         </object>
                                                     </object>
-                                                    <object class="sizeritem" expanded="1">
+                                                    <object class="sizeritem" expanded="0">
                                                         <property name="border">6</property>
                                                         <property name="flag">wxEXPAND|wxTOP|wxBOTTOM</property>
                                                         <property name="proportion">1</property>
-                                                        <object class="wxBoxSizer" expanded="1">
+                                                        <object class="wxBoxSizer" expanded="0">
                                                             <property name="minimum_size"></property>
                                                             <property name="name">bSizer13</property>
                                                             <property name="orient">wxHORIZONTAL</property>
@@ -911,11 +913,11 @@
                                                     </object>
                                                 </object>
                                             </object>
-                                            <object class="sizeritem" expanded="1">
+                                            <object class="sizeritem" expanded="0">
                                                 <property name="border">8</property>
                                                 <property name="flag">wxEXPAND|wxTOP</property>
                                                 <property name="proportion">1</property>
-                                                <object class="wxStaticBoxSizer" expanded="1">
+                                                <object class="wxStaticBoxSizer" expanded="0">
                                                     <property name="id">wxID_ANY</property>
                                                     <property name="label">Assign Net Class</property>
                                                     <property name="minimum_size"></property>
@@ -1059,11 +1061,11 @@
                                                             </object>
                                                         </object>
                                                     </object>
-                                                    <object class="sizeritem" expanded="1">
+                                                    <object class="sizeritem" expanded="0">
                                                         <property name="border">6</property>
                                                         <property name="flag">wxEXPAND|wxTOP</property>
                                                         <property name="proportion">0</property>
-                                                        <object class="wxBoxSizer" expanded="1">
+                                                        <object class="wxBoxSizer" expanded="0">
                                                             <property name="minimum_size"></property>
                                                             <property name="name">bSizer12</property>
                                                             <property name="orient">wxHORIZONTAL</property>
@@ -1230,11 +1232,11 @@
                                             </object>
                                         </object>
                                     </object>
-                                    <object class="sizeritem" expanded="1">
+                                    <object class="sizeritem" expanded="0">
                                         <property name="border">5</property>
                                         <property name="flag">wxEXPAND|wxLEFT</property>
                                         <property name="proportion">1</property>
-                                        <object class="wxBoxSizer" expanded="1">
+                                        <object class="wxBoxSizer" expanded="0">
                                             <property name="minimum_size"></property>
                                             <property name="name">bRight</property>
                                             <property name="orient">wxVERTICAL</property>
diff --git a/pcbnew/dialogs/panel_setup_netclasses_base.h b/pcbnew/dialogs/panel_setup_netclasses_base.h
index 9a110dd46b..c9e0504ccc 100644
--- a/pcbnew/dialogs/panel_setup_netclasses_base.h
+++ b/pcbnew/dialogs/panel_setup_netclasses_base.h
@@ -1,5 +1,5 @@
 ///////////////////////////////////////////////////////////////////////////
-// C++ code generated with wxFormBuilder (version Oct 26 2018)
+// C++ code generated with wxFormBuilder (version Jul 10 2019)
 // http://www.wxformbuilder.org/
 //
 // PLEASE DO *NOT* EDIT THIS FILE!