From: John L. <jr...@us...> - 2005-06-18 20:46:10
|
Update of /cvsroot/wxlua/wxLua/modules/wxluadebug/src In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv2914/wxLua/modules/wxluadebug/src Modified Files: splttree.cpp staktree.cpp Log Message: Updated to wxIDE's wrapper files Index: splttree.cpp =================================================================== RCS file: /cvsroot/wxlua/wxLua/modules/wxluadebug/src/splttree.cpp,v retrieving revision 1.2 retrieving revision 1.3 diff -C2 -d -r1.2 -r1.3 *** splttree.cpp 7 Jun 2005 04:17:40 -0000 1.2 --- splttree.cpp 18 Jun 2005 20:46:00 -0000 1.3 *************** *** 238,246 **** UINT sbCode = SB_THUMBPOSITION; HWND vertScrollBar = 0; ! #if wxMINOR_VERSION < 5 MSWDefWindowProc((WXUINT) WM_VSCROLL, MAKELONG(sbCode, posVert), (WXHWND) vertScrollBar); #else MSWDefWindowProc((WXUINT) WM_VSCROLL, MAKELONG(sbCode, posVert), (WXLPARAM) vertScrollBar); ! #endif } #if USE_GENERIC_TREECTRL --- 238,246 ---- UINT sbCode = SB_THUMBPOSITION; HWND vertScrollBar = 0; ! #if !wxCHECK_VERSION(2,5,0) MSWDefWindowProc((WXUINT) WM_VSCROLL, MAKELONG(sbCode, posVert), (WXHWND) vertScrollBar); #else MSWDefWindowProc((WXUINT) WM_VSCROLL, MAKELONG(sbCode, posVert), (WXLPARAM) vertScrollBar); ! #endif // wxCHECK_VERSION(2,5,0) } #if USE_GENERIC_TREECTRL Index: staktree.cpp =================================================================== RCS file: /cvsroot/wxlua/wxLua/modules/wxluadebug/src/staktree.cpp,v retrieving revision 1.2 retrieving revision 1.3 diff -C2 -d -r1.2 -r1.3 *** staktree.cpp 7 Jun 2005 04:17:40 -0000 1.2 --- staktree.cpp 18 Jun 2005 20:46:01 -0000 1.3 *************** *** 135,140 **** m_pServer->CleanupDebugReferences(); ! if (m_pServer != NULL) ! wxGetLuaHandler().SetStackFrame(NULL); } --- 135,140 ---- m_pServer->CleanupDebugReferences(); ! // if (m_pServer != NULL) ! // wxGetLuaHandler().SetStackFrame(NULL); } *************** *** 148,153 **** m_secondValueWindow = NULL; ! if (m_pServer != NULL) ! wxGetLuaHandler().SetStackFrame(this); m_stackComboBox = new wxComboBox( this, --- 148,153 ---- m_secondValueWindow = NULL; ! // if (m_pServer != NULL) ! // wxGetLuaHandler().SetStackFrame(this); m_stackComboBox = new wxComboBox( this, |