diff --git a/xvaga/xvaga.cpp b/xvaga/xvaga.cpp
index fabb61848..6e178cffb 100755
--- a/xvaga/xvaga.cpp
+++ b/xvaga/xvaga.cpp
@@ -1393,7 +1393,7 @@ void xvt_app_create(int argc, char **argv, unsigned long flags,
   {
     // Simula main loop
 #if wxCHECK_VERSION(2,6,1)
-    xvt_app_process_pending_events();
+		xvt_app_process_pending_events();
 #else
     a->MainLoop();
 #endif
@@ -3856,11 +3856,11 @@ SLIST xvt_scr_list_wins()
 	SLIST list = xvt_slist_create();
 
   _nice_windows.BeginFind();
-#if wxCHECK_VERSION(2,6,1)
-	for (wxHashTable_Node* node = _nice_windows.Next(); node; node = _nice_windows.Next())
-#else
+//#if wxCHECK_VERSION(2,6,1)
+//	for (wxHashTable_Node* node = _nice_windows.Next(); node; node = _nice_windows.Next())
+//#else
 	for (wxNode* node = _nice_windows.Next(); node; node = _nice_windows.Next())
-#endif
+//#endif
 	{
   	wxObject* pWin = node->GetData();
     AddWinToList(list, (WINDOW)pWin);
diff --git a/xvaga/xvapp.cpp b/xvaga/xvapp.cpp
index 3feef7677..6d67604f5 100755
--- a/xvaga/xvapp.cpp
+++ b/xvaga/xvapp.cpp
@@ -10,8 +10,7 @@ protected:
 	virtual bool OnInit();
 
 #if wxCHECK_VERSION(2,6,1)
-  bool m_bInited;
-  virtual void OnIdle(wxIdleEvent& event);
+  virtual void OnTimer(wxTimerEvent& event);
   DECLARE_EVENT_TABLE()
 #endif
 
@@ -26,17 +25,15 @@ IMPLEMENT_APP(TMainApp)
 
 #if wxCHECK_VERSION(2,6,1)
 
+#define TIMER_ID 883
+
 BEGIN_EVENT_TABLE(TMainApp, wxApp)
-  EVT_IDLE(TMainApp::OnIdle)
+  EVT_TIMER(TIMER_ID, TMainApp::OnTimer)
 END_EVENT_TABLE()
 
-void TMainApp::OnIdle(wxIdleEvent& event)
+void TMainApp::OnTimer(wxTimerEvent& event)
 {
-  if (!m_bInited)
-  {
-    m_bInited = true;
-    xvt_main(argc, argv);
-  }
+  xvt_main(argc, argv);
 }
 
 #endif
@@ -50,7 +47,8 @@ bool TMainApp::OnInit()
 #endif
 
 #if wxCHECK_VERSION(2,6,1)
-  m_bInited = false;
+  wxTimerEvent evt(TIMER_ID);
+	AddPendingEvent(evt);
   return true;
 #else
   xvt_main(argc, argv);