wxlua-commit

[John L. <jr...@us...>]

Update of /cvsroot/wxlua/wxLua/modules/wxluadebug/src
In directory sc8-pr-cvs9.sourceforge.net:/tmp/cvs-serv32141/wxLua/modules/wxluadebug/src

Modified Files:
	wxldebug.cpp 
Log Message:
Use GetCount not Count for wxArrays
have wxLuaDebugData return the array as a pointer since it may not exist and add checks for it
Rename wxLua socket enums so they start with wxLUASOCKET_XXX
Removed wxLuaBuffer and just use wxArrayString instead
Use wxInt32 wxUint32 for wxLuaSocket code not int, short, etc for 64 bit processors
   rework all wxLuaSocketBase::Read/Write code


Index: wxldebug.cpp
===================================================================
RCS file: /cvsroot/wxlua/wxLua/modules/wxluadebug/src/wxldebug.cpp,v
retrieving revision 1.18
retrieving revision 1.19
diff -C2 -d -r1.18 -r1.19
*** wxldebug.cpp	8 Sep 2006 22:43:47 -0000	1.18
--- wxldebug.cpp	13 Sep 2006 04:13:47 -0000	1.19
***************
*** 45,57 ****
  }
  
! wxLuaDebugDataItem::wxLuaDebugDataItem(const wxLuaDebugDataItem &treeItem)
  {
!     m_itemName    = treeItem.m_itemName;
!     m_itemType    = treeItem.m_itemType;
!     m_itemValue   = treeItem.m_itemValue;
!     m_itemSource  = treeItem.m_itemSource;
!     m_nReference  = treeItem.m_nReference;
!     m_nIndex      = treeItem.m_nIndex;
!     m_fExpanded   = treeItem.m_fExpanded;
  }
  
--- 45,57 ----
  }
  
! wxLuaDebugDataItem::wxLuaDebugDataItem(const wxLuaDebugDataItem &dataItem)
  {
!     m_itemName    = dataItem.m_itemName;
!     m_itemType    = dataItem.m_itemType;
!     m_itemValue   = dataItem.m_itemValue;
!     m_itemSource  = dataItem.m_itemSource;
!     m_nReference  = dataItem.m_nReference;
!     m_nIndex      = dataItem.m_nIndex;
!     m_fExpanded   = dataItem.m_fExpanded;
  }
  
***************
*** 66,70 ****
      ~wxLuaDebugDataRefData()
      {
!         size_t idx, count = m_dataArray.Count();
          for (idx = 0; idx < count; ++idx)
          {
--- 66,70 ----
      ~wxLuaDebugDataRefData()
      {
!         size_t idx, count = m_dataArray.GetCount();
          for (idx = 0; idx < count; ++idx)
          {
***************
*** 84,94 ****
  }
  
! wxLuaDebugDataItemArray& wxLuaDebugData::GetArray()
  {
!     return ((wxLuaDebugDataRefData*)m_refData)->m_dataArray;
  }
! const wxLuaDebugDataItemArray& wxLuaDebugData::GetArray() const
  {
!     return M_DEBUGREFDATA->m_dataArray;
  }
  
--- 84,96 ----
  }
  
! wxLuaDebugDataItemArray* wxLuaDebugData::GetArray()
  {
!     wxCHECK_MSG(M_DEBUGREFDATA != NULL, NULL, wxT("Invalid ref data"));
!     return &(M_DEBUGREFDATA->m_dataArray);
  }
! const wxLuaDebugDataItemArray* wxLuaDebugData::GetArray() const
  {
!     wxCHECK_MSG(M_DEBUGREFDATA != NULL, NULL, wxT("Invalid ref data"));
!     return &(M_DEBUGREFDATA->m_dataArray);
  }
  
***************
*** 100,104 ****
  wxLuaDebugDataItem* wxLuaDebugData::Item(size_t index) const
  {
!     wxCHECK_MSG(M_DEBUGREFDATA != NULL, 0, wxT("Invalid ref data"));
      return M_DEBUGREFDATA->m_dataArray.Item(index);
  }
--- 102,106 ----
  wxLuaDebugDataItem* wxLuaDebugData::Item(size_t index) const
  {
!     wxCHECK_MSG(M_DEBUGREFDATA != NULL, NULL, wxT("Invalid ref data"));
      return M_DEBUGREFDATA->m_dataArray.Item(index);
  }
***************
*** 113,116 ****
--- 115,119 ----
  {
      wxLuaDebugData copyData;
+     wxCHECK_MSG(M_DEBUGREFDATA != NULL, copyData, wxT("Invalid ref data"));
  
      size_t idx, count = GetCount();
***************
*** 133,136 ****
--- 136,140 ----
  {
      wxCHECK_MSG(wxlState_.Ok(), 0, wxT("Invalid wxLuaState"));
+     wxCHECK_MSG(M_DEBUGREFDATA != NULL, 0, wxT("Invalid ref data"));
  
      wxLuaState wxlState(wxlState_); // unconst the state
***************
*** 182,185 ****
--- 186,190 ----
  {
      wxCHECK_MSG(wxlState_.Ok(), 0, wxT("Invalid wxLuaState"));
+     wxCHECK_MSG(M_DEBUGREFDATA != NULL, 0, wxT("Invalid ref data"));
  
      wxLuaState wxlState(wxlState_); // unconst the state
***************
*** 228,231 ****
--- 233,238 ----
  {
      wxCHECK_MSG(wxlState_.Ok(), 0, wxT("Invalid wxLuaState"));
+     wxCHECK_MSG(M_DEBUGREFDATA != NULL, 0, wxT("Invalid ref data"));
+ 
      wxLuaState wxlState(wxlState_); // unconst the state
      lua_State* L = wxlState.GetLuaState();