[Wxlua-commit] wxLua/modules/wxluadebug/src wxldebug.cpp,1.1,1.2

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

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

Modified Files:
	wxldebug.cpp 
Log Message:
fix wxMessageDialog in dialogs.i, at least for 2.6
cleanup wxLuaObject to use a single int and enum to store allocation type
wxLuaState can now attach to lua_States or wxLuaStateRefData
wxLuaDebugEvent to use copy constructor for clone
enum debugCommands and debugEvents to wxLuaDebugCommands/Events_Type


Index: wxldebug.cpp
===================================================================
RCS file: /cvsroot/wxlua/wxLua/modules/wxluadebug/src/wxldebug.cpp,v
retrieving revision 1.1
retrieving revision 1.2
diff -C2 -d -r1.1 -r1.2
*** wxldebug.cpp	25 Nov 2005 19:45:36 -0000	1.1
--- wxldebug.cpp	26 Nov 2005 03:15:19 -0000	1.2
***************
*** 46,55 ****
  IMPLEMENT_CLASS(wxLuaBuffer, wxObject)
  
- wxLuaBuffer::wxLuaBuffer(const wxString &fileName, const wxString &buffer) :
-              m_fileName(fileName),
-              m_buffer(buffer)
- {
- }
- 
  // ----------------------------------------------------------------------------
  // wxLuaDebuggerBase
--- 46,49 ----
***************
*** 64,98 ****
  IMPLEMENT_DYNAMIC_CLASS(wxLuaDebugEvent, wxEvent)
  
! wxLuaDebugEvent::wxLuaDebugEvent()
! {
!     m_fHasMessage = false;
!     m_pDebugData  = NULL;
!     m_nReference  = -1;
!     m_fEnabledFlag = false;
! }
! 
! wxLuaDebugEvent::wxLuaDebugEvent(int eventType)
  {
!     SetEventType(eventType);
  
!     m_fHasMessage = false;
!     m_pDebugData  = NULL;
!     m_nReference  = -1;
!     m_fEnabledFlag = false;
  }
  
! wxLuaDebugEvent::wxLuaDebugEvent(int         eventType,
!                                  int         lineNumber,
!                                  const wxString &file,
!                                  bool        enabledFlag)
  {
      SetEventType(eventType);
  
!     m_lineNumber  = lineNumber;
!     m_fileName    = file;
!     m_fHasMessage = false;
!     m_nReference  = -1;
!     m_pDebugData  = NULL;
      m_fEnabledFlag = enabledFlag;
  }
  
--- 58,89 ----
  IMPLEMENT_DYNAMIC_CLASS(wxLuaDebugEvent, wxEvent)
  
! wxLuaDebugEvent::wxLuaDebugEvent(const wxLuaDebugEvent& event)
! 				:wxEvent(event)
  {
!     m_lineNumber   = event.m_lineNumber;
!     m_fileName     = event.m_fileName;
!     m_strMessage   = event.m_strMessage;
!     m_fHasMessage  = event.m_fHasMessage;
!     m_nReference   = event.m_nReference;
!     m_fEnabledFlag = event.m_fEnabledFlag;
!     m_pDebugData   = NULL;
  
!     if (event.GetDebugData() != NULL)
!         SetDebugData(event.GetReference(), event.GetDebugData()->Clone());
!     else
!         SetDebugData(event.GetReference());
  }
  
! wxLuaDebugEvent::wxLuaDebugEvent(int eventType, int lineNumber,
!                                  const wxString &file, bool enabledFlag)
  {
      SetEventType(eventType);
  
!     m_lineNumber   = lineNumber;
!     m_fileName     = file;
!     m_fHasMessage  = false;
!     m_nReference   = -1;
      m_fEnabledFlag = enabledFlag;
+     m_pDebugData   = NULL;
  }
  
***************
*** 111,166 ****
  void wxLuaDebugEvent::SetDebugData(int nReference, wxLuaDebugData *pData)
  {
      m_nReference = nReference;
      m_pDebugData = pData;
  }
  
- int wxLuaDebugEvent::GetLineNumber() const
- {
-     return m_lineNumber;
- }
- 
- wxString wxLuaDebugEvent::GetFileName() const
- {
-     return m_fileName;
- }
- 
- wxString wxLuaDebugEvent::GetMessage() const
- {
-     return m_strMessage;
- }
- 
- bool wxLuaDebugEvent::GetEnabledFlag() const
- {
-     return m_fEnabledFlag;
- }
- 
- const wxLuaDebugData *wxLuaDebugEvent::GetDebugData() const
- {
-     return m_pDebugData;
- }
- 
- int wxLuaDebugEvent::GetReference() const
- {
-     return m_nReference;
- }
- 
- wxEvent *wxLuaDebugEvent::Clone() const
- {
-     wxLuaDebugEvent *pEvent = new wxLuaDebugEvent(GetEventType(),
-                                                   m_lineNumber,
-                                                   m_fileName);
-     if (pEvent != NULL)
-     {
-         if (m_fHasMessage)
-             pEvent->SetMessage(m_strMessage);
- 
-         if (m_pDebugData != NULL)
-             pEvent->SetDebugData(m_nReference, m_pDebugData->Clone());
-         else
-             pEvent->SetDebugData(m_nReference);
-     }
-     return pEvent;
- }
- 
  // ----------------------------------------------------------------------------
  // wxLuaDebugDataItem
--- 102,110 ----
  void wxLuaDebugEvent::SetDebugData(int nReference, wxLuaDebugData *pData)
  {
+     wxCHECK_RET(m_pDebugData == NULL, wxT("Setting wxLuaDebugData twice"));
      m_nReference = nReference;
      m_pDebugData = pData;
  }
  
  // ----------------------------------------------------------------------------
  // wxLuaDebugDataItem
***************
*** 204,209 ****
  wxLuaDebugData::~wxLuaDebugData()
  {
!     size_t idx;
!     for (idx = 0; idx < Count(); ++idx)
      {
          const wxLuaDebugDataItem *pData = Item(idx);
--- 148,153 ----
  wxLuaDebugData::~wxLuaDebugData()
  {
!     size_t idx, count = Count();
!     for (idx = 0; idx < count; ++idx)
      {
          const wxLuaDebugDataItem *pData = Item(idx);
***************
*** 212,222 ****
  }
  
! wxLuaDebugData *wxLuaDebugData::Clone()
  {
      wxLuaDebugData *pCloneData = new wxLuaDebugData;
      if (pCloneData != NULL)
      {
!         size_t idx;
!         for (idx = 0; idx < Count(); ++idx)
          {
              const wxLuaDebugDataItem *pOldData = Item(idx);
--- 156,166 ----
  }
  
! wxLuaDebugData *wxLuaDebugData::Clone() const
  {
      wxLuaDebugData *pCloneData = new wxLuaDebugData;
      if (pCloneData != NULL)
      {
!         size_t idx, count = Count();
!         for (idx = 0; idx < count; ++idx)
          {
              const wxLuaDebugDataItem *pOldData = Item(idx);
***************
*** 495,499 ****
  {
      wxLuaDebugData *pSortedList = new wxLuaDebugData();
!     if (pSortedList != NULL && GetRef(nRef) != 0)
      {
          int nTop = GetTop();
--- 439,443 ----
  {
      wxLuaDebugData *pSortedList = new wxLuaDebugData();
!     if ((pSortedList != NULL) && (GetRef(nRef) != 0))
      {
          int nTop = GetTop();