Update of /cvsroot/wxlua/wxLua/modules/wxluadebug/src
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv28335/wxLua/modules/wxluadebug/src
Modified Files:
splttree.cpp staktree.cpp wxldebug.cpp
Log Message:
try to make the stack tree not segfault in wxLua app (still doesn't work)
no major changes
Index: splttree.cpp
===================================================================
RCS file: /cvsroot/wxlua/wxLua/modules/wxluadebug/src/splttree.cpp,v
retrieving revision 1.7
retrieving revision 1.8
diff -C2 -d -r1.7 -r1.8
*** splttree.cpp 1 Dec 2005 04:17:29 -0000 1.7
--- splttree.cpp 5 Dec 2005 06:11:14 -0000 1.8
***************
*** 64,71 ****
EVT_SIZE(wxRemotelyScrolledTreeCtrl::OnSize)
EVT_PAINT(wxRemotelyScrolledTreeCtrl::OnPaint)
! EVT_TREE_ITEM_EXPANDED(-1, wxRemotelyScrolledTreeCtrl::OnExpand)
! EVT_TREE_ITEM_COLLAPSED(-1, wxRemotelyScrolledTreeCtrl::OnExpand)
EVT_SCROLLWIN(wxRemotelyScrolledTreeCtrl::OnScroll)
! EVT_TREE_SEL_CHANGED(-1, wxRemotelyScrolledTreeCtrl::OnSelChanged)
END_EVENT_TABLE()
--- 64,71 ----
EVT_SIZE(wxRemotelyScrolledTreeCtrl::OnSize)
EVT_PAINT(wxRemotelyScrolledTreeCtrl::OnPaint)
! EVT_TREE_ITEM_EXPANDED(wxID_ANY, wxRemotelyScrolledTreeCtrl::OnExpand)
! EVT_TREE_ITEM_COLLAPSED(wxID_ANY, wxRemotelyScrolledTreeCtrl::OnExpand)
EVT_SCROLLWIN(wxRemotelyScrolledTreeCtrl::OnScroll)
! EVT_TREE_SEL_CHANGED(wxID_ANY, wxRemotelyScrolledTreeCtrl::OnSelChanged)
END_EVENT_TABLE()
***************
*** 802,805 ****
--- 802,807 ----
#ifdef __WXMAC__
m_targetWindow->MacUpdateImmediately() ;
+ #else
+ m_targetWindow->Update();
#endif
Index: wxldebug.cpp
===================================================================
RCS file: /cvsroot/wxlua/wxLua/modules/wxluadebug/src/wxldebug.cpp,v
retrieving revision 1.8
retrieving revision 1.9
diff -C2 -d -r1.8 -r1.9
*** wxldebug.cpp 2 Dec 2005 06:38:31 -0000 1.8
--- wxldebug.cpp 5 Dec 2005 06:11:15 -0000 1.9
***************
*** 71,76 ****
if (event.GetDebugData() != NULL)
SetDebugData(event.GetReference(), event.GetDebugData()->Clone());
- else
- SetDebugData(event.GetReference());
}
--- 71,74 ----
Index: staktree.cpp
===================================================================
RCS file: /cvsroot/wxlua/wxLua/modules/wxluadebug/src/staktree.cpp,v
retrieving revision 1.10
retrieving revision 1.11
diff -C2 -d -r1.10 -r1.11
*** staktree.cpp 2 Dec 2005 06:38:31 -0000 1.10
--- staktree.cpp 5 Dec 2005 06:11:15 -0000 1.11
***************
*** 33,36 ****
--- 33,37 ----
#include "wxluasocket/include/wxldbgio.h"
#include "wxluasocket/include/wxldserv.h"
+ #include "wxluasocket/include/wxlhandl.h"
#if defined(__WXGTK__) || defined(__WXMAC__) || defined(__WXMOTIF__)
***************
*** 141,144 ****
--- 142,148 ----
if (m_pServer != NULL)
m_pServer->CleanupDebugReferences();
+
+ if (m_pServer != NULL)
+ wxLuaHandler::GetHandler().SetStackFrame(NULL);
}
***************
*** 152,155 ****
--- 156,162 ----
m_secondValueWindow = NULL;
+ if (m_pServer != NULL)
+ wxLuaHandler::GetHandler().SetStackFrame(this); // FIXME remove this
+
m_stackComboBox = new wxComboBox( this,
ID_WXLUA_STACKFRAME_COMBO,
***************
*** 457,462 ****
else
{
! size_t n, count = pSortedList->Count();
! for (n = 0; n < count; ++n)
{
const wxLuaDebugDataItem *item = pSortedList->Item(n);
--- 464,469 ----
else
{
! size_t n;
! for (n = 0; n < pSortedList->Count(); ++n)
{
const wxLuaDebugDataItem *item = pSortedList->Item(n);
***************
*** 506,510 ****
m_imageList->Add(wxIcon(wxT("wxICON_SMALL_FILE"), wxBITMAP_TYPE_ICO_RESOURCE));
#else
! #error "Sorry, we don't have icons available for this platforms."
#endif
SetImageList(m_imageList);
--- 513,517 ----
m_imageList->Add(wxIcon(wxT("wxICON_SMALL_FILE"), wxBITMAP_TYPE_ICO_RESOURCE));
#else
! #error "Sorry, we don't have icons available for this platform."
#endif
SetImageList(m_imageList);
|
