← Back to team overview

kicad-developers team mailing list archive

[PATCH 02/14] wxFormBuilder: update older schema files

 

This brings the remaining stragglers to the current wxFB version.

No semantic changes.
---
 common/dialogs/dialog_image_editor.fbp             | 104 +++++++--------------
 common/dialogs/dialog_image_editor_base.cpp        |   5 +
 common/dialogs/dialog_image_editor_base.h          |   2 +-
 gerbview/dialogs/dialog_show_page_borders_base.fbp |   4 +-
 gerbview/dialogs/dialog_show_page_borders_base.h   |   2 +
 5 files changed, 44 insertions(+), 73 deletions(-)

diff --git a/common/dialogs/dialog_image_editor.fbp b/common/dialogs/dialog_image_editor.fbp
index ea403bf..e9e08e1 100644
--- a/common/dialogs/dialog_image_editor.fbp
+++ b/common/dialogs/dialog_image_editor.fbp
@@ -1,11 +1,12 @@
 <?xml version="1.0" encoding="UTF-8" standalone="yes" ?>
 <wxFormBuilder_Project>
-    <FileVersion major="1" minor="11" />
+    <FileVersion major="1" minor="13" />
     <object class="Project" expanded="1">
         <property name="class_decoration"></property>
         <property name="code_generation">C++</property>
         <property name="disconnect_events">1</property>
         <property name="disconnect_mode">source_name</property>
+        <property name="disconnect_php_events">0</property>
         <property name="disconnect_python_events">0</property>
         <property name="embedded_files_path">res</property>
         <property name="encoding">UTF-8</property>
@@ -19,66 +20,35 @@
         <property name="path">.</property>
         <property name="precompiled_header"></property>
         <property name="relative_path">1</property>
+        <property name="skip_lua_events">1</property>
+        <property name="skip_php_events">1</property>
         <property name="skip_python_events">1</property>
+        <property name="ui_table">UI</property>
         <property name="use_enum">0</property>
         <property name="use_microsoft_bom">0</property>
         <object class="Dialog" expanded="1">
-            <property name="BottomDockable">1</property>
-            <property name="LeftDockable">1</property>
-            <property name="RightDockable">1</property>
-            <property name="TopDockable">1</property>
             <property name="aui_managed">0</property>
-            <property name="aui_name"></property>
-            <property name="best_size"></property>
+            <property name="aui_manager_style">wxAUI_MGR_DEFAULT</property>
             <property name="bg"></property>
-            <property name="caption"></property>
-            <property name="caption_visible">1</property>
             <property name="center">wxBOTH</property>
-            <property name="center_pane">0</property>
-            <property name="close_button">1</property>
             <property name="context_help"></property>
             <property name="context_menu">1</property>
-            <property name="default_pane">0</property>
-            <property name="dock">Dock</property>
-            <property name="dock_fixed">0</property>
-            <property name="docking">Left</property>
             <property name="enabled">1</property>
             <property name="event_handler">impl_virtual</property>
             <property name="extra_style"></property>
             <property name="fg"></property>
-            <property name="floatable">1</property>
             <property name="font"></property>
-            <property name="gripper">0</property>
             <property name="hidden">0</property>
             <property name="id">wxID_ANY</property>
-            <property name="layer"></property>
-            <property name="max_size"></property>
-            <property name="maximize_button">0</property>
             <property name="maximum_size"></property>
-            <property name="min_size"></property>
-            <property name="minimize_button">0</property>
             <property name="minimum_size"></property>
-            <property name="moveable">1</property>
             <property name="name">DIALOG_IMAGE_EDITOR_BASE</property>
-            <property name="pane_border">1</property>
-            <property name="pane_position"></property>
-            <property name="pane_size"></property>
-            <property name="pin_button">1</property>
             <property name="pos"></property>
-            <property name="position"></property>
-            <property name="resize">Resizable</property>
-            <property name="row"></property>
-            <property name="show">1</property>
             <property name="size">340,299</property>
             <property name="style">wxDEFAULT_DIALOG_STYLE|wxRESIZE_BORDER</property>
             <property name="subclass"></property>
             <property name="title">Image Editor</property>
-            <property name="toolbar_pane">0</property>
             <property name="tooltip"></property>
-            <property name="validator_data_type"></property>
-            <property name="validator_style">wxFILTER_NONE</property>
-            <property name="validator_type">wxDefaultValidator</property>
-            <property name="validator_variable"></property>
             <property name="window_extra_style"></property>
             <property name="window_name"></property>
             <property name="window_style"></property>
@@ -150,7 +120,10 @@
                                         <property name="LeftDockable">1</property>
                                         <property name="RightDockable">1</property>
                                         <property name="TopDockable">1</property>
+                                        <property name="aui_layer"></property>
                                         <property name="aui_name"></property>
+                                        <property name="aui_position"></property>
+                                        <property name="aui_row"></property>
                                         <property name="best_size"></property>
                                         <property name="bg"></property>
                                         <property name="caption"></property>
@@ -170,7 +143,6 @@
                                         <property name="gripper">0</property>
                                         <property name="hidden">0</property>
                                         <property name="id">wxID_ANY</property>
-                                        <property name="layer"></property>
                                         <property name="max_size"></property>
                                         <property name="maximize_button">0</property>
                                         <property name="maximum_size"></property>
@@ -185,18 +157,12 @@
                                         <property name="permission">protected</property>
                                         <property name="pin_button">1</property>
                                         <property name="pos"></property>
-                                        <property name="position"></property>
                                         <property name="resize">Resizable</property>
-                                        <property name="row"></property>
                                         <property name="show">1</property>
                                         <property name="size"></property>
                                         <property name="subclass"></property>
                                         <property name="toolbar_pane">0</property>
                                         <property name="tooltip"></property>
-                                        <property name="validator_data_type"></property>
-                                        <property name="validator_style">wxFILTER_NONE</property>
-                                        <property name="validator_type">wxDefaultValidator</property>
-                                        <property name="validator_variable"></property>
                                         <property name="window_extra_style"></property>
                                         <property name="window_name"></property>
                                         <property name="window_style">wxFULL_REPAINT_ON_RESIZE|wxSIMPLE_BORDER|wxTAB_TRAVERSAL</property>
@@ -243,7 +209,10 @@
                                                 <property name="LeftDockable">1</property>
                                                 <property name="RightDockable">1</property>
                                                 <property name="TopDockable">1</property>
+                                                <property name="aui_layer"></property>
                                                 <property name="aui_name"></property>
+                                                <property name="aui_position"></property>
+                                                <property name="aui_row"></property>
                                                 <property name="best_size"></property>
                                                 <property name="bg"></property>
                                                 <property name="caption"></property>
@@ -265,7 +234,6 @@
                                                 <property name="hidden">0</property>
                                                 <property name="id">wxID_ANY</property>
                                                 <property name="label">Mirror X</property>
-                                                <property name="layer"></property>
                                                 <property name="max_size"></property>
                                                 <property name="maximize_button">0</property>
                                                 <property name="maximum_size"></property>
@@ -280,9 +248,7 @@
                                                 <property name="permission">protected</property>
                                                 <property name="pin_button">1</property>
                                                 <property name="pos"></property>
-                                                <property name="position"></property>
                                                 <property name="resize">Resizable</property>
-                                                <property name="row"></property>
                                                 <property name="show">1</property>
                                                 <property name="size"></property>
                                                 <property name="style"></property>
@@ -331,7 +297,10 @@
                                                 <property name="LeftDockable">1</property>
                                                 <property name="RightDockable">1</property>
                                                 <property name="TopDockable">1</property>
+                                                <property name="aui_layer"></property>
                                                 <property name="aui_name"></property>
+                                                <property name="aui_position"></property>
+                                                <property name="aui_row"></property>
                                                 <property name="best_size"></property>
                                                 <property name="bg"></property>
                                                 <property name="caption"></property>
@@ -353,7 +322,6 @@
                                                 <property name="hidden">0</property>
                                                 <property name="id">wxID_ANY</property>
                                                 <property name="label">Mirror Y</property>
-                                                <property name="layer"></property>
                                                 <property name="max_size"></property>
                                                 <property name="maximize_button">0</property>
                                                 <property name="maximum_size"></property>
@@ -368,9 +336,7 @@
                                                 <property name="permission">protected</property>
                                                 <property name="pin_button">1</property>
                                                 <property name="pos"></property>
-                                                <property name="position"></property>
                                                 <property name="resize">Resizable</property>
-                                                <property name="row"></property>
                                                 <property name="show">1</property>
                                                 <property name="size"></property>
                                                 <property name="style"></property>
@@ -419,7 +385,10 @@
                                                 <property name="LeftDockable">1</property>
                                                 <property name="RightDockable">1</property>
                                                 <property name="TopDockable">1</property>
+                                                <property name="aui_layer"></property>
                                                 <property name="aui_name"></property>
+                                                <property name="aui_position"></property>
+                                                <property name="aui_row"></property>
                                                 <property name="best_size"></property>
                                                 <property name="bg"></property>
                                                 <property name="caption"></property>
@@ -441,7 +410,6 @@
                                                 <property name="hidden">0</property>
                                                 <property name="id">wxID_ANY</property>
                                                 <property name="label">Rotate</property>
-                                                <property name="layer"></property>
                                                 <property name="max_size"></property>
                                                 <property name="maximize_button">0</property>
                                                 <property name="maximum_size"></property>
@@ -456,9 +424,7 @@
                                                 <property name="permission">protected</property>
                                                 <property name="pin_button">1</property>
                                                 <property name="pos"></property>
-                                                <property name="position"></property>
                                                 <property name="resize">Resizable</property>
-                                                <property name="row"></property>
                                                 <property name="show">1</property>
                                                 <property name="size"></property>
                                                 <property name="style"></property>
@@ -507,7 +473,10 @@
                                                 <property name="LeftDockable">1</property>
                                                 <property name="RightDockable">1</property>
                                                 <property name="TopDockable">1</property>
+                                                <property name="aui_layer"></property>
                                                 <property name="aui_name"></property>
+                                                <property name="aui_position"></property>
+                                                <property name="aui_row"></property>
                                                 <property name="best_size"></property>
                                                 <property name="bg"></property>
                                                 <property name="caption"></property>
@@ -529,7 +498,6 @@
                                                 <property name="hidden">0</property>
                                                 <property name="id">wxID_ANY</property>
                                                 <property name="label">Grey</property>
-                                                <property name="layer"></property>
                                                 <property name="max_size"></property>
                                                 <property name="maximize_button">0</property>
                                                 <property name="maximum_size"></property>
@@ -544,9 +512,7 @@
                                                 <property name="permission">protected</property>
                                                 <property name="pin_button">1</property>
                                                 <property name="pos"></property>
-                                                <property name="position"></property>
                                                 <property name="resize">Resizable</property>
-                                                <property name="row"></property>
                                                 <property name="show">1</property>
                                                 <property name="size"></property>
                                                 <property name="style"></property>
@@ -595,7 +561,10 @@
                                                 <property name="LeftDockable">1</property>
                                                 <property name="RightDockable">1</property>
                                                 <property name="TopDockable">1</property>
+                                                <property name="aui_layer"></property>
                                                 <property name="aui_name"></property>
+                                                <property name="aui_position"></property>
+                                                <property name="aui_row"></property>
                                                 <property name="best_size"></property>
                                                 <property name="bg"></property>
                                                 <property name="caption"></property>
@@ -617,7 +586,6 @@
                                                 <property name="hidden">0</property>
                                                 <property name="id">wxID_ANY</property>
                                                 <property name="label">Half Size</property>
-                                                <property name="layer"></property>
                                                 <property name="max_size"></property>
                                                 <property name="maximize_button">0</property>
                                                 <property name="maximum_size"></property>
@@ -632,9 +600,7 @@
                                                 <property name="permission">protected</property>
                                                 <property name="pin_button">1</property>
                                                 <property name="pos"></property>
-                                                <property name="position"></property>
                                                 <property name="resize">Resizable</property>
-                                                <property name="row"></property>
                                                 <property name="show">1</property>
                                                 <property name="size"></property>
                                                 <property name="style"></property>
@@ -683,7 +649,10 @@
                                                 <property name="LeftDockable">1</property>
                                                 <property name="RightDockable">1</property>
                                                 <property name="TopDockable">1</property>
+                                                <property name="aui_layer"></property>
                                                 <property name="aui_name"></property>
+                                                <property name="aui_position"></property>
+                                                <property name="aui_row"></property>
                                                 <property name="best_size"></property>
                                                 <property name="bg"></property>
                                                 <property name="caption"></property>
@@ -705,7 +674,6 @@
                                                 <property name="hidden">0</property>
                                                 <property name="id">wxID_ANY</property>
                                                 <property name="label">Undo Last</property>
-                                                <property name="layer"></property>
                                                 <property name="max_size"></property>
                                                 <property name="maximize_button">0</property>
                                                 <property name="maximum_size"></property>
@@ -720,9 +688,7 @@
                                                 <property name="permission">protected</property>
                                                 <property name="pin_button">1</property>
                                                 <property name="pos"></property>
-                                                <property name="position"></property>
                                                 <property name="resize">Resizable</property>
-                                                <property name="row"></property>
                                                 <property name="show">1</property>
                                                 <property name="size"></property>
                                                 <property name="style"></property>
@@ -771,7 +737,10 @@
                                                 <property name="LeftDockable">1</property>
                                                 <property name="RightDockable">1</property>
                                                 <property name="TopDockable">1</property>
+                                                <property name="aui_layer"></property>
                                                 <property name="aui_name"></property>
+                                                <property name="aui_position"></property>
+                                                <property name="aui_row"></property>
                                                 <property name="best_size"></property>
                                                 <property name="bg"></property>
                                                 <property name="caption"></property>
@@ -792,7 +761,6 @@
                                                 <property name="hidden">0</property>
                                                 <property name="id">wxID_ANY</property>
                                                 <property name="label">Image Scale:</property>
-                                                <property name="layer"></property>
                                                 <property name="max_size"></property>
                                                 <property name="maximize_button">0</property>
                                                 <property name="maximum_size"></property>
@@ -807,19 +775,13 @@
                                                 <property name="permission">protected</property>
                                                 <property name="pin_button">1</property>
                                                 <property name="pos"></property>
-                                                <property name="position"></property>
                                                 <property name="resize">Resizable</property>
-                                                <property name="row"></property>
                                                 <property name="show">1</property>
                                                 <property name="size"></property>
                                                 <property name="style"></property>
                                                 <property name="subclass"></property>
                                                 <property name="toolbar_pane">0</property>
                                                 <property name="tooltip"></property>
-                                                <property name="validator_data_type"></property>
-                                                <property name="validator_style">wxFILTER_NONE</property>
-                                                <property name="validator_type">wxDefaultValidator</property>
-                                                <property name="validator_variable"></property>
                                                 <property name="window_extra_style"></property>
                                                 <property name="window_name"></property>
                                                 <property name="window_style"></property>
@@ -858,7 +820,10 @@
                                                 <property name="LeftDockable">1</property>
                                                 <property name="RightDockable">1</property>
                                                 <property name="TopDockable">1</property>
+                                                <property name="aui_layer"></property>
                                                 <property name="aui_name"></property>
+                                                <property name="aui_position"></property>
+                                                <property name="aui_row"></property>
                                                 <property name="best_size"></property>
                                                 <property name="bg"></property>
                                                 <property name="caption"></property>
@@ -878,7 +843,6 @@
                                                 <property name="gripper">0</property>
                                                 <property name="hidden">0</property>
                                                 <property name="id">wxID_ANY</property>
-                                                <property name="layer"></property>
                                                 <property name="max_size"></property>
                                                 <property name="maximize_button">0</property>
                                                 <property name="maximum_size"></property>
@@ -894,9 +858,7 @@
                                                 <property name="permission">protected</property>
                                                 <property name="pin_button">1</property>
                                                 <property name="pos"></property>
-                                                <property name="position"></property>
                                                 <property name="resize">Resizable</property>
-                                                <property name="row"></property>
                                                 <property name="show">1</property>
                                                 <property name="size"></property>
                                                 <property name="style"></property>
diff --git a/common/dialogs/dialog_image_editor_base.cpp b/common/dialogs/dialog_image_editor_base.cpp
index e11c764..6841688 100644
--- a/common/dialogs/dialog_image_editor_base.cpp
+++ b/common/dialogs/dialog_image_editor_base.cpp
@@ -56,10 +56,13 @@ DIALOG_IMAGE_EDITOR_BASE::DIALOG_IMAGE_EDITOR_BASE( wxWindow* parent, wxWindowID
 	m_textCtrlScale = new wxTextCtrl( this, wxID_ANY, wxEmptyString, wxDefaultPosition, wxDefaultSize, 0 );
 	bSizerRight->Add( m_textCtrlScale, 0, wxBOTTOM|wxRIGHT|wxLEFT|wxEXPAND, 5 );
 	
+	
 	bSizerLeft->Add( bSizerRight, 0, wxEXPAND, 5 );
 	
+	
 	bUpperSizer->Add( bSizerLeft, 1, wxEXPAND, 5 );
 	
+	
 	bSizerMain->Add( bUpperSizer, 1, wxEXPAND, 5 );
 	
 	m_sdbSizer1 = new wxStdDialogButtonSizer();
@@ -68,8 +71,10 @@ DIALOG_IMAGE_EDITOR_BASE::DIALOG_IMAGE_EDITOR_BASE( wxWindow* parent, wxWindowID
 	m_sdbSizer1Cancel = new wxButton( this, wxID_CANCEL );
 	m_sdbSizer1->AddButton( m_sdbSizer1Cancel );
 	m_sdbSizer1->Realize();
+	
 	bSizerMain->Add( m_sdbSizer1, 0, wxALIGN_RIGHT, 5 );
 	
+	
 	this->SetSizer( bSizerMain );
 	this->Layout();
 	
diff --git a/common/dialogs/dialog_image_editor_base.h b/common/dialogs/dialog_image_editor_base.h
index a7522a1..e793962 100644
--- a/common/dialogs/dialog_image_editor_base.h
+++ b/common/dialogs/dialog_image_editor_base.h
@@ -12,11 +12,11 @@
 #include <wx/xrc/xmlres.h>
 #include <wx/intl.h>
 #include <wx/panel.h>
-#include <wx/string.h>
 #include <wx/gdicmn.h>
 #include <wx/font.h>
 #include <wx/colour.h>
 #include <wx/settings.h>
+#include <wx/string.h>
 #include <wx/button.h>
 #include <wx/stattext.h>
 #include <wx/textctrl.h>
diff --git a/gerbview/dialogs/dialog_show_page_borders_base.fbp b/gerbview/dialogs/dialog_show_page_borders_base.fbp
index 3872fe6..fd7b45b 100644
--- a/gerbview/dialogs/dialog_show_page_borders_base.fbp
+++ b/gerbview/dialogs/dialog_show_page_borders_base.fbp
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8" standalone="yes" ?>
 <wxFormBuilder_Project>
-    <FileVersion major="1" minor="11" />
+    <FileVersion major="1" minor="13" />
     <object class="Project" expanded="1">
         <property name="class_decoration"></property>
         <property name="code_generation">C++</property>
@@ -20,8 +20,10 @@
         <property name="path">.</property>
         <property name="precompiled_header"></property>
         <property name="relative_path">1</property>
+        <property name="skip_lua_events">1</property>
         <property name="skip_php_events">1</property>
         <property name="skip_python_events">1</property>
+        <property name="ui_table">UI</property>
         <property name="use_enum">0</property>
         <property name="use_microsoft_bom">0</property>
         <object class="Dialog" expanded="1">
diff --git a/gerbview/dialogs/dialog_show_page_borders_base.h b/gerbview/dialogs/dialog_show_page_borders_base.h
index 4203815..7299156 100644
--- a/gerbview/dialogs/dialog_show_page_borders_base.h
+++ b/gerbview/dialogs/dialog_show_page_borders_base.h
@@ -11,6 +11,8 @@
 #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/radiobox.h>

Follow ups

References