root/campo-sirio
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Patch level :2.2 2006 nopatch

Browse Source 
Files correlati     :
Ricompilazione Demo : [ ]
Commento            :modifiche necessarie per poter linkare wx263


git-svn-id: svn://10.65.10.50/trunk@13888 c028cbd2-c16b-5b4b-a496-9718f37d4682
This commit is contained in:
luca 2006-04-12 13:11:23 +00:00
parent 41c39eefdd
commit 2a2221cda3
2 changed files with 13 additions and 15 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
xvaga/xvaga.cpp
View File

@ -1393,7 +1393,7 @@ void xvt_app_create(int argc, char **argv, unsigned long flags,
{ {
// Simula main loop // Simula main loop
#if wxCHECK_VERSION(2,6,1) #if wxCHECK_VERSION(2,6,1)
xvt_app_process_pending_events(); xvt_app_process_pending_events();
#else #else
a->MainLoop(); a->MainLoop();
#endif #endif
@ -3856,11 +3856,11 @@ SLIST xvt_scr_list_wins()
SLIST list = xvt_slist_create(); SLIST list = xvt_slist_create();
_nice_windows.BeginFind(); _nice_windows.BeginFind();
#if wxCHECK_VERSION(2,6,1) //#if wxCHECK_VERSION(2,6,1)
for (wxHashTable_Node* node = _nice_windows.Next(); node; node = _nice_windows.Next()) // for (wxHashTable_Node* node = _nice_windows.Next(); node; node = _nice_windows.Next())
#else //#else
for (wxNode* node = _nice_windows.Next(); node; node = _nice_windows.Next()) for (wxNode* node = _nice_windows.Next(); node; node = _nice_windows.Next())
#endif //#endif
{ {
wxObject* pWin = node->GetData(); wxObject* pWin = node->GetData();
AddWinToList(list, (WINDOW)pWin); AddWinToList(list, (WINDOW)pWin);

18
xvaga/xvapp.cpp
View File

@ -10,8 +10,7 @@ protected:
virtual bool OnInit(); virtual bool OnInit();
#if wxCHECK_VERSION(2,6,1) #if wxCHECK_VERSION(2,6,1)
bool m_bInited; virtual void OnTimer(wxTimerEvent& event);
virtual void OnIdle(wxIdleEvent& event);
DECLARE_EVENT_TABLE() DECLARE_EVENT_TABLE()
#endif #endif
@ -26,17 +25,15 @@ IMPLEMENT_APP(TMainApp)
#if wxCHECK_VERSION(2,6,1) #if wxCHECK_VERSION(2,6,1)
#define TIMER_ID 883
BEGIN_EVENT_TABLE(TMainApp, wxApp) BEGIN_EVENT_TABLE(TMainApp, wxApp)
EVT_IDLE(TMainApp::OnIdle) EVT_TIMER(TIMER_ID, TMainApp::OnTimer)
END_EVENT_TABLE() END_EVENT_TABLE()
void TMainApp::OnIdle(wxIdleEvent& event) void TMainApp::OnTimer(wxTimerEvent& event)
{ {
if (!m_bInited) xvt_main(argc, argv);
{
m_bInited = true;
xvt_main(argc, argv);
}
} }
#endif #endif
@ -50,7 +47,8 @@ bool TMainApp::OnInit()
#endif #endif
#if wxCHECK_VERSION(2,6,1) #if wxCHECK_VERSION(2,6,1)
m_bInited = false; wxTimerEvent evt(TIMER_ID);
AddPendingEvent(evt);
return true; return true;
#else #else
xvt_main(argc, argv); xvt_main(argc, argv);