Add OK button to close step export dialog

Because someone out there might shrink their titlebar to absurdly small sizes and then wonder why suddenly the UX is poor.

Fix #9192

utils/kicad2step/kicad2step.cpp

@@ -42,6 +42,9 @@ class KICAD2STEP_FRAME : public KICAD2STEP_FRAME_BASE
 {
 public:
     KICAD2STEP_FRAME( const wxString& title );
+
+protected:
+    virtual void OnOKButtonClick( wxCommandEvent& aEvent ) override;
 };
 
 // Horrible hack until we decouple things more
@@ -75,6 +78,13 @@ KICAD2STEP_FRAME::KICAD2STEP_FRAME( const wxString& title ) :
 {
 }
 
+
+void KICAD2STEP_FRAME::OnOKButtonClick( wxCommandEvent& aEvent )
+{
+    Close();
+}
+
+
 PANEL_KICAD2STEP::PANEL_KICAD2STEP( wxWindow* parent, wxWindowID id, const wxPoint& pos,
                                     const wxSize& size, long style ) :
         wxPanel( parent, id, pos, size, style )

utils/kicad2step/kicad2step_frame_base.cpp

@@ -1,5 +1,5 @@
 ///////////////////////////////////////////////////////////////////////////
-// C++ code generated with wxFormBuilder (version Jul 10 2019)
+// C++ code generated with wxFormBuilder (version Oct 26 2018)
 // http://www.wxformbuilder.org/
 //
 // PLEASE DO *NOT* EDIT THIS FILE!
@@ -12,6 +12,7 @@
 KICAD2STEP_FRAME_BASE::KICAD2STEP_FRAME_BASE( wxWindow* parent, wxWindowID id, const wxString& title, const wxPoint& pos, const wxSize& size, long style ) : wxFrame( parent, id, title, pos, size, style )
 {
 	this->SetSizeHints( wxDefaultSize, wxDefaultSize );
+	this->SetBackgroundColour( wxSystemSettings::GetColour( wxSYS_COLOUR_3DLIGHT ) );
 
 	wxBoxSizer* bSizerMain;
 	bSizerMain = new wxBoxSizer( wxVERTICAL );
@@ -19,13 +20,26 @@ KICAD2STEP_FRAME_BASE::KICAD2STEP_FRAME_BASE( wxWindow* parent, wxWindowID id, c
 	m_panelKicad2Step = new PANEL_KICAD2STEP( this, wxID_ANY, wxDefaultPosition, wxDefaultSize, wxTAB_TRAVERSAL );
 	bSizerMain->Add( m_panelKicad2Step, 1, wxEXPAND, 5 );
 
+	m_sdbSizer1 = new wxStdDialogButtonSizer();
+	m_sdbSizer1OK = new wxButton( this, wxID_OK );
+	m_sdbSizer1->AddButton( m_sdbSizer1OK );
+	m_sdbSizer1->Realize();
+
+	bSizerMain->Add( m_sdbSizer1, 0, wxALL|wxEXPAND, 5 );
+
 
 	this->SetSizer( bSizerMain );
 	this->Layout();
 
 	this->Centre( wxBOTH );
+
+	// Connect Events
+	m_sdbSizer1OK->Connect( wxEVT_COMMAND_BUTTON_CLICKED, wxCommandEventHandler( KICAD2STEP_FRAME_BASE::OnOKButtonClick ), NULL, this );
 }
 
 KICAD2STEP_FRAME_BASE::~KICAD2STEP_FRAME_BASE()
 {
+	// Disconnect Events
+	m_sdbSizer1OK->Disconnect( wxEVT_COMMAND_BUTTON_CLICKED, wxCommandEventHandler( KICAD2STEP_FRAME_BASE::OnOKButtonClick ), NULL, this );
+
 }

utils/kicad2step/kicad2step_frame_base.fbp

@@ -14,7 +14,6 @@
         <property name="file">kicad2step_frame_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">kicad2step_frame</property>
@@ -26,13 +25,12 @@
         <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="Frame" expanded="1">
             <property name="aui_managed">0</property>
             <property name="aui_manager_style">wxAUI_MGR_DEFAULT</property>
-            <property name="bg"></property>
+            <property name="bg">wxSYS_COLOUR_3DLIGHT</property>
             <property name="center">wxBOTH</property>
             <property name="context_help"></property>
             <property name="context_menu">1</property>
@@ -118,6 +116,25 @@
                         <property name="window_style">wxTAB_TRAVERSAL</property>
                     </object>
                 </object>
+                <object class="sizeritem" expanded="1">
+                    <property name="border">5</property>
+                    <property name="flag">wxALL|wxEXPAND</property>
+                    <property name="proportion">0</property>
+                    <object class="wxStdDialogButtonSizer" expanded="1">
+                        <property name="Apply">0</property>
+                        <property name="Cancel">0</property>
+                        <property name="ContextHelp">0</property>
+                        <property name="Help">0</property>
+                        <property name="No">0</property>
+                        <property name="OK">1</property>
+                        <property name="Save">0</property>
+                        <property name="Yes">0</property>
+                        <property name="minimum_size"></property>
+                        <property name="name">m_sdbSizer1</property>
+                        <property name="permission">protected</property>
+                        <event name="OnOKButtonClick">OnOKButtonClick</event>
+                    </object>
+                </object>
             </object>
         </object>
     </object>

utils/kicad2step/kicad2step_frame_base.h

@@ -1,5 +1,5 @@
 ///////////////////////////////////////////////////////////////////////////
-// C++ code generated with wxFormBuilder (version Jul 10 2019)
+// C++ code generated with wxFormBuilder (version Oct 26 2018)
 // http://www.wxformbuilder.org/
 //
 // PLEASE DO *NOT* EDIT THIS FILE!
@@ -18,6 +18,7 @@
 #include <wx/settings.h>
 #include <wx/string.h>
 #include <wx/sizer.h>
+#include <wx/button.h>
 #include <wx/frame.h>
 
 ///////////////////////////////////////////////////////////////////////////
@@ -31,6 +32,12 @@ class KICAD2STEP_FRAME_BASE : public wxFrame
 	private:
 
 	protected:
+		wxStdDialogButtonSizer* m_sdbSizer1;
+		wxButton* m_sdbSizer1OK;
+
+		// Virtual event handlers, overide them in your derived class
+		virtual void OnOKButtonClick( wxCommandEvent& event ) { event.Skip(); }
+
 
 	public:
 		PANEL_KICAD2STEP* m_panelKicad2Step;