From 1886d71e641fd247a1d0997701680c332b70829f Mon Sep 17 00:00:00 2001
From: luca <luca@c028cbd2-c16b-5b4b-a496-9718f37d4682>
Date: Mon, 8 Oct 2007 13:45:54 +0000
Subject: [PATCH] Patch level         :4.0 800 Files correlati     :
 Ricompilazione Demo : [ ] Commento            :aggiunto un wxCheckVersion per
 poter mantenere le modifiche fatte per wx283

git-svn-id: svn://10.65.10.50/trunk@15691 c028cbd2-c16b-5b4b-a496-9718f37d4682
---
 xvaga/xvapp.cpp | 35 ++++++++++++++++-------------------
 1 file changed, 16 insertions(+), 19 deletions(-)

diff --git a/xvaga/xvapp.cpp b/xvaga/xvapp.cpp
index dfe897b91..f41fab248 100755
--- a/xvaga/xvapp.cpp
+++ b/xvaga/xvapp.cpp
@@ -1,23 +1,27 @@
 #include "../xvaga/wxinc.h"
 
-#include <wx/filename.h>
-#include <wx/snglinst.h>
+#if wxCHECK_VERSION(2,8,3)
+	#include <wx/filename.h>
+	#include <wx/snglinst.h>
+#endif
 
 extern int xvt_main(int argc, char** argv);
 
 class TMainApp : public wxApp
 {
   wxLocale m_Locale;
-  wxSingleInstanceChecker* m_sic;
+#if wxCHECK_VERSION(2,8,3)
+	wxSingleInstanceChecker* m_sic;
+#endif
 
 protected:
 	virtual bool OnInit();
   virtual int OnExit();
 
-#if wxCHECK_VERSION(2,6,1)
+
   virtual void OnTimer(wxTimerEvent& event);
   DECLARE_EVENT_TABLE()
-#endif
+
 
   DECLARE_DYNAMIC_CLASS(TMainApp);
 };
@@ -28,7 +32,6 @@ DECLARE_APP(TMainApp)
 
 IMPLEMENT_APP(TMainApp)
 
-#if wxCHECK_VERSION(2,6,1)
 
 #define TIMER_ID 883
 
@@ -41,33 +44,27 @@ void TMainApp::OnTimer(wxTimerEvent& event)
   xvt_main(argc, argv);
 }
 
-#endif
+
 
 bool TMainApp::OnInit()
 {
+#if wxCHECK_VERSION(2,8,3)
   wxFileName strWrk = argv[0];
   const wxString strApp = strWrk.GetName().Lower();
-
   m_sic = new wxSingleInstanceChecker(strApp);
+#endif
   m_Locale.Init(wxLocale::GetSystemLanguage());  // wxLANGUAGE_ITALIAN
 
-#ifdef __WXDEBUG__
-//	wxLog::SetTraceMask(wxTraceMessages);
-#endif
-
-#if wxCHECK_VERSION(2,6,1)
-  wxTimerEvent evt(TIMER_ID);
+	wxTimerEvent evt(TIMER_ID);
 	AddPendingEvent(evt);
-  return true;
-#else
-  xvt_main(argc, argv);
-  return false;
-#endif
+	return true;
 }
 
 int TMainApp::OnExit()
 {
+#if wxCHECK_VERSION(2,8,3)
   delete m_sic;
   m_sic = NULL;
+#endif
   return wxApp::OnExit();
 }
\ No newline at end of file