From e364cfdbac6619600f322a5e0025265954fe6908 Mon Sep 17 00:00:00 2001
From: Maciej Suminski <maciej.suminski@cern.ch>
Date: Thu, 11 Aug 2016 14:41:27 +0200
Subject: [PATCH] Renamed wxEVT_SIM* events to EVT_SIM*

---
 eeschema/sim/sim_plot_frame.cpp | 15 +++++++++------
 eeschema/sim/sim_plot_frame.h   |  6 +++---
 2 files changed, 12 insertions(+), 9 deletions(-)

diff --git a/eeschema/sim/sim_plot_frame.cpp b/eeschema/sim/sim_plot_frame.cpp
index ace59cdd95..e67d591353 100644
--- a/eeschema/sim/sim_plot_frame.cpp
+++ b/eeschema/sim/sim_plot_frame.cpp
@@ -45,7 +45,7 @@ public:
 
     REPORTER& Report( const wxString& aText, SEVERITY aSeverity = RPT_UNDEFINED ) override
     {
-        wxCommandEvent* event = new wxCommandEvent( wxEVT_SIM_REPORT );
+        wxCommandEvent* event = new wxCommandEvent( EVT_SIM_REPORT );
         event->SetString( aText );
         wxQueueEvent( m_parent, event );
         return *this;
@@ -58,11 +58,11 @@ public:
         switch( aNewState )
         {
             case SIM_IDLE:
-                event = new wxCommandEvent( wxEVT_SIM_FINISHED );
+                event = new wxCommandEvent( EVT_SIM_FINISHED );
                 break;
 
             case SIM_RUNNING:
-                event = new wxCommandEvent( wxEVT_SIM_STARTED );
+                event = new wxCommandEvent( EVT_SIM_STARTED );
                 break;
         }
 
@@ -83,9 +83,9 @@ SIM_PLOT_FRAME::SIM_PLOT_FRAME( KIWAY* aKiway, wxWindow* aParent )
     m_simulator = NULL;
 
     Connect( wxEVT_CLOSE_WINDOW, wxCloseEventHandler( SIM_PLOT_FRAME::onClose ), NULL, this );
-    Connect( wxEVT_SIM_REPORT, wxCommandEventHandler( SIM_PLOT_FRAME::onSimReport ), NULL, this );
-    Connect( wxEVT_SIM_STARTED, wxCommandEventHandler( SIM_PLOT_FRAME::onSimStarted ), NULL, this );
-    Connect( wxEVT_SIM_FINISHED, wxCommandEventHandler( SIM_PLOT_FRAME::onSimFinished ), NULL, this );
+    Connect( EVT_SIM_REPORT, wxCommandEventHandler( SIM_PLOT_FRAME::onSimReport ), NULL, this );
+    Connect( EVT_SIM_STARTED, wxCommandEventHandler( SIM_PLOT_FRAME::onSimStarted ), NULL, this );
+    Connect( EVT_SIM_FINISHED, wxCommandEventHandler( SIM_PLOT_FRAME::onSimFinished ), NULL, this );
 
     NewPlotPanel();
 }
@@ -394,3 +394,6 @@ void SIM_PLOT_FRAME::SIGNAL_CONTEXT_MENU::onMenuEvent( wxMenuEvent& aEvent )
     }
 }
 
+wxDEFINE_EVENT( EVT_SIM_REPORT, wxCommandEvent );
+wxDEFINE_EVENT( EVT_SIM_STARTED, wxCommandEvent );
+wxDEFINE_EVENT( EVT_SIM_FINISHED, wxCommandEvent );
diff --git a/eeschema/sim/sim_plot_frame.h b/eeschema/sim/sim_plot_frame.h
index d367172bde..d934e930c4 100644
--- a/eeschema/sim/sim_plot_frame.h
+++ b/eeschema/sim/sim_plot_frame.h
@@ -137,8 +137,8 @@ class SIM_PLOT_FRAME : public SIM_PLOT_FRAME_BASE
         };
 };
 
-wxDEFINE_EVENT( wxEVT_SIM_REPORT, wxCommandEvent );
-wxDEFINE_EVENT( wxEVT_SIM_STARTED, wxCommandEvent );
-wxDEFINE_EVENT( wxEVT_SIM_FINISHED, wxCommandEvent );
+wxDECLARE_EVENT( EVT_SIM_REPORT, wxCommandEvent );
+wxDECLARE_EVENT( EVT_SIM_STARTED, wxCommandEvent );
+wxDECLARE_EVENT( EVT_SIM_FINISHED, wxCommandEvent );
 
 #endif // __sim_plot_frame__