From 65eb84265b2a466ae3bbef2d7220f3846f7f5590 Mon Sep 17 00:00:00 2001
From: jean-pierre charras <jp.charras@wanadoo.fr>
Date: Wed, 22 Mar 2023 08:49:26 +0100
Subject: [PATCH] Fix a compil warning issue (mingw specific) also avoid to
 include wx/wx.h in kicad_cli.cpp, it is compil time consuming.

---
 kicad/kicad_cli.cpp                     | 7 +++++--
 pcbnew/exporters/step/exporter_step.cpp | 2 +-
 2 files changed, 6 insertions(+), 3 deletions(-)

diff --git a/kicad/kicad_cli.cpp b/kicad/kicad_cli.cpp
index b793e01c46..5a2f18dd8c 100644
--- a/kicad/kicad_cli.cpp
+++ b/kicad/kicad_cli.cpp
@@ -25,10 +25,9 @@
 
 #include <wx/filename.h>
 #include <wx/log.h>
-#include <wx/app.h>
 #include <wx/stdpaths.h>
 #include <wx/msgdlg.h>
-#include <wx/wx.h>
+#include <wx/wxcrtvararg.h>     //for wxPrintf
 
 #include <kiway.h>
 #include <macros.h>
@@ -75,6 +74,10 @@
 #include "cli/exit_codes.h"
 #include "cli/cli_names.h"
 
+// Add this header after all others, to avoid a collision name in a Windows header
+// on mingw.
+#include <wx/app.h>
+
 // a dummy to quiet linking with EDA_BASE_FRAME::config();
 #include <kiface_base.h>
 KIFACE_BASE& Kiface()
diff --git a/pcbnew/exporters/step/exporter_step.cpp b/pcbnew/exporters/step/exporter_step.cpp
index 340e735bdb..45f578a5e9 100644
--- a/pcbnew/exporters/step/exporter_step.cpp
+++ b/pcbnew/exporters/step/exporter_step.cpp
@@ -123,7 +123,7 @@ EXPORTER_STEP::EXPORTER_STEP( BOARD* aBoard, const EXPORTER_STEP_PARAMS& aParams
     m_solderMaskColor = COLOR4D( 0.08, 0.20, 0.14, 0.83 );
     m_copperColor = COLOR4D( 0.7, 0.61, 0.0, 1.0 );
 
-    // Init m_pcbName to the board short filename (no path, no ext)
+    // Init m_pcbBaseName to the board short filename (no path, no ext)
     // m_pcbName is used later to identify items in step file
     wxFileName fn( aBoard->GetFileName() );
     m_pcbBaseName = fn.GetName();