wxlua-commit — CVS commits of wxLua

[Wxlua-commit] wxLua/modules/wxlua/include wxlcallb.h,1.5,1.6

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

Update of /cvsroot/wxlua/wxLua/modules/wxlua/include
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv28335/wxLua/modules/wxlua/include

Modified Files:
	wxlcallb.h 
Log Message:
try to make the stack tree not segfault in wxLua app (still doesn't work)
no major changes


Index: wxlcallb.h
===================================================================
RCS file: /cvsroot/wxlua/wxLua/modules/wxlua/include/wxlcallb.h,v
retrieving revision 1.5
retrieving revision 1.6
diff -C2 -d -r1.5 -r1.6
*** wxlcallb.h	29 Nov 2005 23:52:12 -0000	1.5
--- wxlcallb.h	5 Dec 2005 06:11:14 -0000	1.6
***************
*** 44,48 ****
  protected:
      // event handler dispatcher back to Lua
!     void CallFunction(wxEvent *pEvent);
  
      // reference to the lua routine to call
--- 44,48 ----
  protected:
      // event handler dispatcher back to Lua
!     virtual void CallFunction(wxEvent *pEvent);
  
      // reference to the lua routine to call

[Wxlua-commit] wxLua/modules/wxlua/src wxlintrp.cpp,1.5,1.6

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

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

Modified Files:
	wxlintrp.cpp 
Log Message:
try to make the stack tree not segfault in wxLua app (still doesn't work)
no major changes


Index: wxlintrp.cpp
===================================================================
RCS file: /cvsroot/wxlua/wxLua/modules/wxlua/src/wxlintrp.cpp,v
retrieving revision 1.5
retrieving revision 1.6
diff -C2 -d -r1.5 -r1.6
*** wxlintrp.cpp	29 Nov 2005 05:45:09 -0000	1.5
--- wxlintrp.cpp	5 Dec 2005 06:11:14 -0000	1.6
***************
*** 262,266 ****
      // FIXME - for select event types we don't want to do anything
      wxEventType evtType = luaInterpreter->GetwxLuaState().GetInEventType();
!     if ((evtType != -1))
          //(evtType == wxEVT_IDLE) && (evtType == wxEVT_PAINT) &&
          //(evtType == wxEVT_DESTROY) && (evtType == wxEVT_CLOSE_WINDOW))
--- 262,266 ----
      // FIXME - for select event types we don't want to do anything
      wxEventType evtType = luaInterpreter->GetwxLuaState().GetInEventType();
!     if ((evtType != wxEVT_NULL))
          //(evtType == wxEVT_IDLE) && (evtType == wxEVT_PAINT) &&
          //(evtType == wxEVT_DESTROY) && (evtType == wxEVT_CLOSE_WINDOW))

[Wxlua-commit] wxLua/apps/wxluaedit/src wxledit.cpp,1.3,1.4

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

Update of /cvsroot/wxlua/wxLua/apps/wxluaedit/src
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv28335/wxLua/apps/wxluaedit/src

Modified Files:
	wxledit.cpp 
Log Message:
try to make the stack tree not segfault in wxLua app (still doesn't work)
no major changes


Index: wxledit.cpp
===================================================================
RCS file: /cvsroot/wxlua/wxLua/apps/wxluaedit/src/wxledit.cpp,v
retrieving revision 1.3
retrieving revision 1.4
diff -C2 -d -r1.3 -r1.4
*** wxledit.cpp	30 Nov 2005 23:52:30 -0000	1.3
--- wxledit.cpp	5 Dec 2005 06:11:14 -0000	1.4
***************
*** 641,645 ****
  
                  luaInterp->SetLuaDebugHook(1, -1, true);
!                 luaInterp->RunString(wxT("print(\"Showing stack\")\n"));
                  luaInterp->SetLuaDebugHook(hook_count, hook_yield, hook_send, hook_mask);
                  luaShell->CheckPrompt(true);
--- 641,645 ----
  
                  luaInterp->SetLuaDebugHook(1, -1, true);
!                 luaInterp->RunString(wxT("print(\"Showing stack\")"));
                  luaInterp->SetLuaDebugHook(hook_count, hook_yield, hook_send, hook_mask);
                  luaShell->CheckPrompt(true);

[Wxlua-commit] wxLua/modules/wxluadebug/src staktree.cpp,1.9,1.10 wxldebug.cpp,1.7,1.8

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

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

Modified Files:
	staktree.cpp wxldebug.cpp 
Log Message:
restore the stacktree for the wxLua app
more code unification for wxLuaDebug classes
revert to EnumerateStack, EnumerateStackEntry, EnumerateTable instead of BuildStack, BuildStackList, BuildTableList


Index: wxldebug.cpp
===================================================================
RCS file: /cvsroot/wxlua/wxLua/modules/wxluadebug/src/wxldebug.cpp,v
retrieving revision 1.7
retrieving revision 1.8
diff -C2 -d -r1.7 -r1.8
*** wxldebug.cpp	1 Dec 2005 06:43:53 -0000	1.7
--- wxldebug.cpp	2 Dec 2005 06:38:31 -0000	1.8
***************
*** 177,189 ****
  }
  
! int wxLuaDebugData::BuildStack(const wxLuaState& wxlState_)
  {
!     wxLuaState wxlState(wxlState_); // unconst the state
  
      int       nIndex = 0;
      bool      fFirst = true;
      int       count = 0;
-     lua_Debug luaDebug;
-     lua_State* L = wxlState.GetLuaState();
  
      while (lua_getstack(L, nIndex, &luaDebug) != 0)
--- 177,190 ----
  }
  
! int wxLuaDebugData::EnumerateStack(const wxLuaState& wxlState_)
  {
!     wxCHECK_MSG(wxlState_.Ok(), 0, wxT("Invalid wxLuaState"));
  
+     wxLuaState wxlState(wxlState_); // unconst the state
+     lua_State* L = wxlState.GetLuaState();
+     lua_Debug luaDebug;
      int       nIndex = 0;
      bool      fFirst = true;
      int       count = 0;
  
      while (lua_getstack(L, nIndex, &luaDebug) != 0)
***************
*** 225,235 ****
  }
  
! int wxLuaDebugData::BuildStackList(const wxLuaState& wxlState_, int stackRef, wxArrayInt& references)
  {
!     wxLuaState wxlState(wxlState_); // unconst the state
  
!     int count = 0;
!     lua_Debug luaDebug;
      lua_State* L = wxlState.GetLuaState();
  
      if (lua_getstack(L, stackRef, &luaDebug) != 0)
--- 226,237 ----
  }
  
! int wxLuaDebugData::EnumerateStackEntry(const wxLuaState& wxlState_, int stackRef, wxArrayInt& references)
  {
!     wxCHECK_MSG(wxlState_.Ok(), 0, wxT("Invalid wxLuaState"));
  
!     wxLuaState wxlState(wxlState_); // unconst the state
      lua_State* L = wxlState.GetLuaState();
+     lua_Debug luaDebug;
+     int count = 0;
  
      if (lua_getstack(L, stackRef, &luaDebug) != 0)
***************
*** 239,307 ****
          while (!name.IsEmpty())
          {
-             bool fIsTable = false;
              wxString type;
              wxString value;
              wxString source = lua2wx(luaDebug.source);
  
!             switch (lua_type(L, -1))
!             {
!                 case LUA_TNIL:
!                     type  = wxT("Nil");
!                     value = wxT("nil");
!                     break;
! 
!                 case LUA_TBOOLEAN:
!                     type = wxT("Boolean");
!                     value = MakeBoolean(lua_toboolean(L, -1));
!                     break;
! 
!                 case LUA_TNUMBER:
!                     type = wxT("Number");
!                     value = MakeNumber(lua_tonumber(L, -1));
!                     break;
! 
!                 case LUA_TSTRING:
!                     type  = wxT("String");
!                     value = lua2wx(lua_tostring(L, -1));
!                     break;
! 
!                 case LUA_TTABLE:
!                     type  = wxT("Table");
!                     value = GetTableInfo(wxlState, -1);
!                     fIsTable = true;
!                     break;
! 
!                 case LUA_TFUNCTION:
!                     if (lua_iscfunction(L, -1))
!                     {
!                         type  = wxT("C Function");
!                         value.Printf(wxT("%p"), lua_tocfunction(L, -1));
!                     }
!                     else
!                     {
!                         type = wxT("Lua Function");
!                         value.Printf(wxT("%p"), lua_topointer(L, -1));
!                     }
!                     break;
! 
!                 case LUA_TUSERDATA:
!                     type  = wxT("User Data");
!                     value = GetUserDataInfo(wxlState, -1);
!                     break;
! 
!                 case LUA_TLIGHTUSERDATA:
!                     type  = wxT("Light User Data");
!                     value = GetUserDataInfo(wxlState, -1, false);
!                     break;
! 
!                 case LUA_TTHREAD:
!                     type = wxT("Thread");
!                     value.Printf(wxT("%p"), lua_topointer(L, -1));
!                     break;
!             }
  
              int nRef = LUA_NOREF;
  
!             if (lua_istable(L, -1)) // FIXME or fIsTable
              {
                  lua_pushvalue(L, -1);
--- 241,253 ----
          while (!name.IsEmpty())
          {
              wxString type;
              wxString value;
              wxString source = lua2wx(luaDebug.source);
  
!             GetTypeValue(wxlState, -1, type, value);
  
              int nRef = LUA_NOREF;
  
!             if (lua_istable(L, -1))
              {
                  lua_pushvalue(L, -1);
***************
*** 324,329 ****
  }
  
! int wxLuaDebugData::BuildTableList(const wxLuaState& wxlState_, int tableRef, int nIndex, wxArrayInt& references)
  {
      wxLuaState wxlState(wxlState_); // unconst the state
      lua_State* L = wxlState.GetLuaState();
--- 270,276 ----
  }
  
! int wxLuaDebugData::EnumerateTable(const wxLuaState& wxlState_, int tableRef, int nIndex, wxArrayInt& references)
  {
+     wxCHECK_MSG(wxlState_.Ok(), 0, wxT("Invalid wxLuaState"));
      wxLuaState wxlState(wxlState_); // unconst the state
      lua_State* L = wxlState.GetLuaState();
***************
*** 334,343 ****
          lua_pushvalue(L, LUA_GLOBALSINDEX);
          int nRef = wxlState.tinsert(-1);
!         Add(new wxLuaDebugDataItem(wxT("Globals"),
!                                        wxT(""),
!                                        wxT(""),
!                                        wxT(""),
!                                        nRef,
!                                        0));
          references.Add(nRef);
      }
--- 281,285 ----
          lua_pushvalue(L, LUA_GLOBALSINDEX);
          int nRef = wxlState.tinsert(-1);
!         Add(new wxLuaDebugDataItem(wxT("Globals"), wxT(""), wxT(""), wxT(""), nRef, 0));
          references.Add(nRef);
      }
***************
*** 352,356 ****
              while (lua_next(L, nTop) != 0)
              {
-                 bool fIsTable = false;
                  wxString type;
                  wxString value;
--- 294,297 ----
***************
*** 401,464 ****
                  }
  
!                 // get the value
!                 switch (lua_type(L, -1))
!                 {
!                     case LUA_TNIL:
!                         type  = wxT("Nil");
!                         value = wxT("nil");
!                         break;
! 
!                     case LUA_TBOOLEAN:
!                         value = MakeBoolean(lua_toboolean(L, -1));
!                         type = wxT("Boolean");
!                         break;
! 
!                     case LUA_TNUMBER:
!                         value = MakeNumber(lua_tonumber(L, -1));
!                         type = wxT("Number");
!                         break;
! 
!                     case LUA_TSTRING:
!                         type  = wxT("String");
!                         value = lua2wx(lua_tostring(L, -1));
!                         break;
! 
!                     case LUA_TTABLE:
!                         type  = wxT("Table");
!                         value = GetTableInfo(wxlState, -1);
!                         fIsTable = true;
!                         break;
! 
!                     case LUA_TFUNCTION:
!                         if (lua_iscfunction(L, -1))
!                         {
!                             type  = wxT("C Function");
!                             value.Printf(wxT("%p"), lua_tocfunction(L, -1));
!                         }
!                         else
!                         {
!                             type = wxT("Lua Function");
!                             value.Printf(wxT("%p"), lua_topointer(L, -1));
!                         }
!                         break;
! 
!                     case LUA_TUSERDATA:
!                         type  = wxT("User Data");
!                         value = GetUserDataInfo(wxlState, -1);
!                         break;
! 
!                     case LUA_TLIGHTUSERDATA:
!                         type  = wxT("Light User Data");
!                         value = GetUserDataInfo(wxlState, -1, false);
!                         break;
! 
!                     case LUA_TTHREAD:
!                         type = wxT("Thread");
!                         value.Printf(wxT("%p"), lua_topointer(L, -1));
!                         break;
!                 }
  
                  int nRef = LUA_NOREF;
!                 if (fIsTable)
                  {
                      nRef = wxlState.tinsert(-1);
--- 342,350 ----
                  }
  
!                 // get the type and value
!                 GetTypeValue(wxlState, -1, type, value);
  
                  int nRef = LUA_NOREF;
!                 if (lua_istable(L, -1))
                  {
                      nRef = wxlState.tinsert(-1);
***************
*** 484,487 ****
--- 370,438 ----
  }
  
+ int wxLuaDebugData::GetTypeValue(const wxLuaState& wxlState, int index, wxString& type, wxString& value)
+ {
+     wxCHECK_MSG(wxlState.Ok(), 0, wxT("Invalid wxLuaState"));
+     lua_State* L = wxlState.GetLuaState();
+     int l_type = lua_type(L, -1);
+ 
+     switch (l_type)
+     {
+         case LUA_TNIL:
+             type  = wxT("Nil");
+             value = wxT("nil");
+             break;
+ 
+         case LUA_TBOOLEAN:
+             type = wxT("Boolean");
+             value = MakeBoolean(lua_toboolean(L, -1));
+             break;
+ 
+         case LUA_TNUMBER:
+             type = wxT("Number");
+             value = MakeNumber(lua_tonumber(L, -1));
+             break;
+ 
+         case LUA_TSTRING:
+             type  = wxT("String");
+             value = lua2wx(lua_tostring(L, -1));
+             break;
+ 
+         case LUA_TTABLE:
+             type  = wxT("Table");
+             value = GetTableInfo(wxlState, -1);
+             break;
+ 
+         case LUA_TFUNCTION:
+             if (lua_iscfunction(L, -1))
+             {
+                 type  = wxT("C Function");
+                 value.Printf(wxT("%p"), lua_tocfunction(L, -1));
+             }
+             else
+             {
+                 type = wxT("Lua Function");
+                 value.Printf(wxT("%p"), lua_topointer(L, -1));
+             }
+             break;
+ 
+         case LUA_TUSERDATA:
+             type  = wxT("User Data");
+             value = GetUserDataInfo(wxlState, -1);
+             break;
+ 
+         case LUA_TLIGHTUSERDATA:
+             type  = wxT("Light User Data");
+             value = GetUserDataInfo(wxlState, -1, false);
+             break;
+ 
+         case LUA_TTHREAD:
+             type = wxT("Thread");
+             value.Printf(wxT("%p"), lua_topointer(L, -1));
+             break;
+     }
+ 
+     return l_type;
+ }
+ 
  wxString wxLuaDebugData::MakeNumber(double dnum)
  {
***************
*** 505,508 ****
--- 456,460 ----
  wxString wxLuaDebugData::GetTableInfo(const wxLuaState& wxlState, int index)
  {
+     wxCHECK_MSG(wxlState.Ok(), wxEmptyString, wxT("Invalid wxLuaState"));
      lua_State* L = wxlState.GetLuaState();
      int         nItems = luaL_getn(L, index);
***************
*** 517,525 ****
  wxString wxLuaDebugData::GetUserDataInfo(const wxLuaState& wxlState_, int index, bool full)
  {
      wxLuaState wxlState(wxlState_); // unconst wxLuaState
      lua_State* L = wxlState.GetLuaState();
      if (full)
      {
- 
          int nTag = wxlState.ttag(index);
  
--- 469,477 ----
  wxString wxLuaDebugData::GetUserDataInfo(const wxLuaState& wxlState_, int index, bool full)
  {
+     wxCHECK_MSG(wxlState_.Ok(), wxEmptyString, wxT("Invalid wxLuaState"));
      wxLuaState wxlState(wxlState_); // unconst wxLuaState
      lua_State* L = wxlState.GetLuaState();
      if (full)
      {
          int nTag = wxlState.ttag(index);
  
***************
*** 537,541 ****
  }
  
- 
  // ----------------------------------------------------------------------------
  // wxLuaInterface (local)
--- 489,492 ----
***************
*** 563,567 ****
  }
  
! wxLuaDebugData *wxLuaInterface::BuildStack()
  {
      wxLuaDebugData *pSortedList = new wxLuaDebugData();
--- 514,518 ----
  }
  
! wxLuaDebugData *wxLuaInterface::EnumerateStack()
  {
      wxLuaDebugData *pSortedList = new wxLuaDebugData();
***************
*** 569,577 ****
          return NULL;
  
!     pSortedList->BuildStack(m_wxlState);
      return pSortedList;
  }
  
! wxLuaDebugData *wxLuaInterface::BuildStackList(int nEntry)
  {
      wxLuaDebugData *pSortedList = new wxLuaDebugData();
--- 520,528 ----
          return NULL;
  
!     pSortedList->EnumerateStack(m_wxlState);
      return pSortedList;
  }
  
! wxLuaDebugData *wxLuaInterface::EnumerateStackEntry(int nEntry)
  {
      wxLuaDebugData *pSortedList = new wxLuaDebugData();
***************
*** 579,587 ****
          return NULL;
  
!     pSortedList->BuildStackList(m_wxlState, nEntry, m_references);
      return pSortedList;
  }
  
! wxLuaDebugData *wxLuaInterface::BuildTableList(int nRef, int nIndex)
  {
      wxLuaDebugData *pSortedList = new wxLuaDebugData();
--- 530,538 ----
          return NULL;
  
!     pSortedList->EnumerateStackEntry(m_wxlState, nEntry, m_references);
      return pSortedList;
  }
  
! wxLuaDebugData *wxLuaInterface::EnumerateTable(int nRef, int nIndex)
  {
      wxLuaDebugData *pSortedList = new wxLuaDebugData();
***************
*** 589,593 ****
          return NULL;
  
!     pSortedList->BuildTableList(m_wxlState, nRef, nIndex, m_references);
      return pSortedList;
  }
--- 540,544 ----
          return NULL;
  
!     pSortedList->EnumerateTable(m_wxlState, nRef, nIndex, m_references);
      return pSortedList;
  }

Index: staktree.cpp
===================================================================
RCS file: /cvsroot/wxlua/wxLua/modules/wxluadebug/src/staktree.cpp,v
retrieving revision 1.9
retrieving revision 1.10
diff -C2 -d -r1.9 -r1.10
*** staktree.cpp	1 Dec 2005 04:17:29 -0000	1.9
--- staktree.cpp	2 Dec 2005 06:38:31 -0000	1.10
***************
*** 141,147 ****
      if (m_pServer != NULL)
          m_pServer->CleanupDebugReferences();
- 
- //    if (m_pServer != NULL)
- //        wxLuaHandler::GetHandler().SetStackFrame(NULL);
  }
  
--- 141,144 ----
***************
*** 155,161 ****
      m_secondValueWindow = NULL;
  
- //    if (m_pServer != NULL)
- //        wxLuaHandler::GetHandler().SetStackFrame(this);
- 
      m_stackComboBox = new wxComboBox( this,
                                        ID_WXLUA_STACKFRAME_COMBO,
--- 152,155 ----
***************
*** 258,262 ****
      else
      {
!         wxLuaDebugData *pSortedList = m_luaInterface->BuildStack();
          if (pSortedList != NULL)
          {
--- 252,256 ----
      else
      {
!         wxLuaDebugData *pSortedList = m_luaInterface->EnumerateStack();
          if (pSortedList != NULL)
          {
***************
*** 330,334 ****
      else
      {
!         wxLuaDebugData *pSortedList = m_luaInterface->BuildStackList(nEntry);
          if (pSortedList != NULL)
          {
--- 324,328 ----
      else
      {
!         wxLuaDebugData *pSortedList = m_luaInterface->EnumerateStackEntry(nEntry);
          if (pSortedList != NULL)
          {
***************
*** 444,448 ****
                      {
                          // insert items
!                         wxLuaDebugData *pSortedList = m_luaInterface->BuildTableList(nRef, nIndex);
                          if (pSortedList != NULL)
                          {
--- 438,442 ----
                      {
                          // insert items
!                         wxLuaDebugData *pSortedList = m_luaInterface->EnumerateTable(nRef, nIndex);
                          if (pSortedList != NULL)
                          {

[Wxlua-commit] wxLua/modules/wxluasocket/src dservice.cpp,1.6,1.7 wxldserv.cpp,1.5,1.6 wxldtarg.cpp,1.5,1.6 wxlsock.cpp,1.2,1.3

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

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

Modified Files:
	dservice.cpp wxldserv.cpp wxldtarg.cpp wxlsock.cpp 
Log Message:
restore the stacktree for the wxLua app
more code unification for wxLuaDebug classes
revert to EnumerateStack, EnumerateStackEntry, EnumerateTable instead of BuildStack, BuildStackList, BuildTableList


Index: wxldtarg.cpp
===================================================================
RCS file: /cvsroot/wxlua/wxLua/modules/wxluasocket/src/wxldtarg.cpp,v
retrieving revision 1.5
retrieving revision 1.6
diff -C2 -d -r1.5 -r1.6
*** wxldtarg.cpp	1 Dec 2005 06:43:54 -0000	1.5
--- wxldtarg.cpp	2 Dec 2005 06:38:31 -0000	1.6
***************
*** 101,105 ****
      m_pThread = new LuaThread(this);
      // Start the thread
!     if ((m_pThread != NULL)                        &&
          (m_pThread->Create() == wxTHREAD_NO_ERROR) &&
          (m_pThread->Run()    == wxTHREAD_NO_ERROR))
--- 101,105 ----
      m_pThread = new LuaThread(this);
      // Start the thread
!     if ((m_pThread != NULL) &&
          (m_pThread->Create() == wxTHREAD_NO_ERROR) &&
          (m_pThread->Run()    == wxTHREAD_NO_ERROR))
***************
*** 419,423 ****
  
      wxLuaHandler::GetHandler().EnterLuaCriticalSection();
!     pSortedList->BuildStack(m_wxlState);
      wxLuaHandler::GetHandler().LeaveLuaCriticalSection();
  
--- 419,423 ----
  
      wxLuaHandler::GetHandler().EnterLuaCriticalSection();
!     pSortedList->EnumerateStack(m_wxlState);
      wxLuaHandler::GetHandler().LeaveLuaCriticalSection();
  
***************
*** 432,436 ****
  
      wxLuaHandler::GetHandler().EnterLuaCriticalSection();
!     pSortedList->BuildStackList(m_wxlState, stackRef, m_references);
      wxLuaHandler::GetHandler().LeaveLuaCriticalSection();
  
--- 432,436 ----
  
      wxLuaHandler::GetHandler().EnterLuaCriticalSection();
!     pSortedList->EnumerateStackEntry(m_wxlState, stackRef, m_references);
      wxLuaHandler::GetHandler().LeaveLuaCriticalSection();
  
***************
*** 445,449 ****
  
      wxLuaHandler::GetHandler().EnterLuaCriticalSection();
!     pSortedList->BuildTableList(m_wxlState, tableRef, nIndex, m_references);
      wxLuaHandler::GetHandler().LeaveLuaCriticalSection();
  
--- 445,449 ----
  
      wxLuaHandler::GetHandler().EnterLuaCriticalSection();
!     pSortedList->EnumerateTable(m_wxlState, tableRef, nIndex, m_references);
      wxLuaHandler::GetHandler().LeaveLuaCriticalSection();
  
***************
*** 557,561 ****
  
                  case LUA_TTABLE:
!                     strResult = wxT("table ") + GetTableInfo(-1);
                      break;
  
--- 557,561 ----
  
                  case LUA_TTABLE:
!                     strResult = wxT("table ") + wxLuaDebugData::GetTableInfo(m_wxlState, -1);
                      break;
  
***************
*** 568,576 ****
  
                  case LUA_TUSERDATA:
!                     strResult = wxT("user data ") + GetUserDataInfo(-1);
                      break;
  
                  case LUA_TLIGHTUSERDATA:
!                     strResult = wxT("light user data ") + GetUserDataInfo(-1, false);
                      break;
  
--- 568,576 ----
  
                  case LUA_TUSERDATA:
!                     strResult = wxT("user data ") + wxLuaDebugData::GetUserDataInfo(m_wxlState, -1);
                      break;
  
                  case LUA_TLIGHTUSERDATA:
!                     strResult = wxT("light user data ") + wxLuaDebugData::GetUserDataInfo(m_wxlState, -1, false);
                      break;
  
***************
*** 591,626 ****
  }
  
- wxString wxLuaDebugTarget::GetTableInfo(int index)
- {
-     int         nItems = luaL_getn(m_wxlState.GetLuaState(), index);
-     const void *pItem  = lua_topointer(m_wxlState.GetLuaState(), index);
- 
-     if (nItems == 0)
-         return wxString::Format(wxT("%p"), pItem);
- 
-     return wxString::Format(wxT("%p (approx %u items)"), pItem, nItems);
- }
- 
- wxString wxLuaDebugTarget::GetUserDataInfo(int index, bool full)
- {
-     lua_State* L = m_wxlState.GetLuaState();
-     if (full)
-     {
- 
-         int nTag = m_wxlState.ttag(index);
- 
-         const char *pTagName = NULL;
-         if (nTag != TLUA_NOTAG)
-             pTagName = m_wxlState.GetLuaTagName(nTag);
- 
-         if (pTagName != NULL)
-             return wxString::Format(wxT("%p (%s)"), lua_touserdata(L, index), pTagName);
- 
-         return wxString::Format(wxT("%p (%u)"), lua_touserdata(L, index), nTag);
-     }
- 
-     return wxString::Format(wxT("%p"), lua_touserdata(L, index));
- }
- 
  bool wxLuaDebugTarget::NotifyBreak(const wxString &fileName, int lineNumber)
  {
--- 591,594 ----

Index: dservice.cpp
===================================================================
RCS file: /cvsroot/wxlua/wxLua/modules/wxluasocket/src/dservice.cpp,v
retrieving revision 1.6
retrieving revision 1.7
diff -C2 -d -r1.6 -r1.7
*** dservice.cpp	1 Dec 2005 06:43:54 -0000	1.6
--- dservice.cpp	2 Dec 2005 06:38:31 -0000	1.7
***************
*** 1585,1589 ****
  
      wxLuaHandler::GetHandler().EnterLuaCriticalSection();
!     pSortedList->BuildStack(m_wxlState);
      wxLuaHandler::GetHandler().LeaveLuaCriticalSection();
  
--- 1585,1589 ----
  
      wxLuaHandler::GetHandler().EnterLuaCriticalSection();
!     pSortedList->EnumerateStack(m_wxlState);
      wxLuaHandler::GetHandler().LeaveLuaCriticalSection();
  
***************
*** 1598,1602 ****
  
      wxLuaHandler::GetHandler().EnterLuaCriticalSection();
!     pSortedList->BuildStackList(m_wxlState, stackRef, m_references);
      wxLuaHandler::GetHandler().LeaveLuaCriticalSection();
  
--- 1598,1602 ----
  
      wxLuaHandler::GetHandler().EnterLuaCriticalSection();
!     pSortedList->EnumerateStackEntry(m_wxlState, stackRef, m_references);
      wxLuaHandler::GetHandler().LeaveLuaCriticalSection();
  
***************
*** 1611,1615 ****
  
      wxLuaHandler::GetHandler().EnterLuaCriticalSection();
!     pSortedList->BuildTableList(m_wxlState, tableRef, nIndex, m_references);
      wxLuaHandler::GetHandler().LeaveLuaCriticalSection();
  
--- 1611,1615 ----
  
      wxLuaHandler::GetHandler().EnterLuaCriticalSection();
!     pSortedList->EnumerateTable(m_wxlState, tableRef, nIndex, m_references);
      wxLuaHandler::GetHandler().LeaveLuaCriticalSection();
  
***************
*** 1743,1747 ****
  
                  case LUA_TTABLE:
!                     strResult = wxT("table ") + GetTableInfo(-1);
                      break;
  
--- 1743,1747 ----
  
                  case LUA_TTABLE:
!                     strResult = wxT("table ") + wxLuaDebugData::GetTableInfo(m_wxlState, -1);
                      break;
  
***************
*** 1754,1762 ****
  
                  case LUA_TUSERDATA:
!                     strResult = wxT("user data ") + GetUserDataInfo(-1);
                      break;
  
                  case LUA_TLIGHTUSERDATA:
!                     strResult = wxT("light user data ") + GetUserDataInfo(-1, false);
                      break;
  
--- 1754,1762 ----
  
                  case LUA_TUSERDATA:
!                     strResult = wxT("user data ") + wxLuaDebugData::GetUserDataInfo(m_wxlState, -1);
                      break;
  
                  case LUA_TLIGHTUSERDATA:
!                     strResult = wxT("light user data ") + wxLuaDebugData::GetUserDataInfo(m_wxlState, -1, false);
                      break;
  
***************
*** 1777,1810 ****
  }
  
- wxString wxLuaDebuggee::GetTableInfo(int index)
- {
-     int         nItems = luaL_getn(m_wxlState.GetLuaState(), index);
-     const void *pItem  = lua_topointer(m_wxlState.GetLuaState(), index);
- 
-     if (nItems == 0)
-         return wxString::Format(wxT("%p"), pItem);
- 
-     return wxString::Format(wxT("%p (approx %u items)"), pItem, nItems);
- }
- 
- wxString wxLuaDebuggee::GetUserDataInfo(int index, bool full)
- {
-     if (full)
-     {
-         int nTag = m_wxlState.ttag(index);
- 
-         const char *pTagName = NULL;
-         if (nTag != TLUA_NOTAG)
-             pTagName = m_wxlState.GetLuaTagName(nTag);
- 
-         if (pTagName != NULL)
-             return wxString::Format(wxT("%p (%s)"), lua_touserdata(m_wxlState.GetLuaState(), index), pTagName);
- 
-         return wxString::Format(wxT("%p (%u)"), lua_touserdata(m_wxlState.GetLuaState(), index), nTag);
-     }
- 
-     return wxString::Format(wxT("%p"), lua_touserdata(m_wxlState.GetLuaState(), index));
- }
- 
  wxFileName wxLuaDebuggee::GetDebugInfo(int &lineNumber) const
  {
--- 1777,1780 ----

Index: wxldserv.cpp
===================================================================
RCS file: /cvsroot/wxlua/wxLua/modules/wxluasocket/src/wxldserv.cpp,v
retrieving revision 1.5
retrieving revision 1.6
diff -C2 -d -r1.5 -r1.6
*** wxldserv.cpp	1 Dec 2005 06:43:54 -0000	1.5
--- wxldserv.cpp	2 Dec 2005 06:38:31 -0000	1.6
***************
*** 667,672 ****
--- 667,675 ----
                                               wxSize(500, 250),
                                               this);
+ 
+         wxLuaHandler::GetHandler().SetStackFrame(m_pStackFrameDialog);
          m_pStackFrameDialog->ShowModal();
          m_pStackFrameDialog->Destroy();
+         wxLuaHandler::GetHandler().SetStackFrame(NULL);
          m_pStackFrameDialog = NULL;
          return true;

Index: wxlsock.cpp
===================================================================
RCS file: /cvsroot/wxlua/wxLua/modules/wxluasocket/src/wxlsock.cpp,v
retrieving revision 1.2
retrieving revision 1.3
diff -C2 -d -r1.2 -r1.3
*** wxlsock.cpp	1 Dec 2005 04:17:29 -0000	1.2
--- wxlsock.cpp	2 Dec 2005 06:38:31 -0000	1.3
***************
*** 29,33 ****
  
  extern const wxCharBuffer wx2lua(const wxString& AppString);
! extern wxString lua2wx(const char * wx2lua);
  
  // ----------------------------------------------------------------------------
--- 29,33 ----
  
  extern const wxCharBuffer wx2lua(const wxString& AppString);
! extern wxString lua2wx(const char* c_str);
  
  // ----------------------------------------------------------------------------

[Wxlua-commit] wxLua/modules/wxluasocket/include dservice.h,1.5,1.6 wxldtarg.h,1.4,1.5 wxlhandl.h,1.1,1.2 wxlsock.h,1.3,1.4

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

Update of /cvsroot/wxlua/wxLua/modules/wxluasocket/include
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv1520/modules/wxluasocket/include

Modified Files:
	dservice.h wxldtarg.h wxlhandl.h wxlsock.h 
Log Message:
restore the stacktree for the wxLua app
more code unification for wxLuaDebug classes
revert to EnumerateStack, EnumerateStackEntry, EnumerateTable instead of BuildStack, BuildStackList, BuildTableList


Index: wxlhandl.h
===================================================================
RCS file: /cvsroot/wxlua/wxLua/modules/wxluasocket/include/wxlhandl.h,v
retrieving revision 1.1
retrieving revision 1.2
diff -C2 -d -r1.1 -r1.2
*** wxlhandl.h	25 Nov 2005 19:03:29 -0000	1.1
--- wxlhandl.h	2 Dec 2005 06:38:31 -0000	1.2
***************
*** 35,42 ****
      virtual bool ProcessEvent(wxEvent& event) = 0;
      virtual void DisplayError(const wxString &strError) const = 0;
! 
! //#if wxUSE_LUASTACKFRAME FIXME - do we need this? see also wxluadebug/src/staktree.cpp
! //    virtual void SetStackFrame(wxLuaStackFrame *pStackFrame) = 0;
! //#endif // wxUSE_LUASTACKFRAME
  
      void EnterLuaCriticalSection() { m_luaCriticalSection.Enter(); }
--- 35,39 ----
      virtual bool ProcessEvent(wxEvent& event) = 0;
      virtual void DisplayError(const wxString &strError) const = 0;
!     virtual void SetStackFrame(wxLuaStackFrame *pStackFrame) = 0;
  
      void EnterLuaCriticalSection() { m_luaCriticalSection.Enter(); }

Index: dservice.h
===================================================================
RCS file: /cvsroot/wxlua/wxLua/modules/wxluasocket/include/dservice.h,v
retrieving revision 1.5
retrieving revision 1.6
diff -C2 -d -r1.5 -r1.6
*** dservice.h	1 Dec 2005 06:43:53 -0000	1.5
--- dservice.h	2 Dec 2005 06:38:31 -0000	1.6
***************
*** 244,249 ****
  private:
      bool AtBreakPoint(const wxFileName &fileName, int lineNumber) const;
-     wxString GetTableInfo(int index);
-     wxString GetUserDataInfo(int index, bool full = true);
  
      wxFileName GetDebugInfo(int &lineNumber) const;
--- 244,247 ----

Index: wxlsock.h
===================================================================
RCS file: /cvsroot/wxlua/wxLua/modules/wxluasocket/include/wxlsock.h,v
retrieving revision 1.3
retrieving revision 1.4
diff -C2 -d -r1.3 -r1.4
*** wxlsock.h	1 Dec 2005 04:17:29 -0000	1.3
--- wxlsock.h	2 Dec 2005 06:38:31 -0000	1.4
***************
*** 117,129 ****
      wxString GetAddress() const;
      // Get the port number of the socket
!     int         GetPort() const;
      // Read the whole buffer of size length into buffer buffer from the socket
!     int         Read(char *buffer, int length);
      // Write the whole buffer of size length to the socket
!     void        Write(const char *buffer, int length);
      // Shutdown the socket in an orderly fashion
!     void        Shutdown(int how);
      // Close the open socket
!     void        Close();
  
  private:
--- 117,129 ----
      wxString GetAddress() const;
      // Get the port number of the socket
!     int GetPort() const;
      // Read the whole buffer of size length into buffer buffer from the socket
!     int Read(char *buffer, int length);
      // Write the whole buffer of size length to the socket
!     void Write(const char *buffer, int length);
      // Shutdown the socket in an orderly fashion
!     void Shutdown(int how);
      // Close the open socket
!     void Close();
  
  private:
***************
*** 170,175 ****
  
      int errnum() const { return m_errnum; }
! 
!     const wxString& description() { return m_description; }
  
  private:
--- 170,174 ----
  
      int errnum() const { return m_errnum; }
!     const wxString& description() const { return m_description; }
  
  private:

Index: wxldtarg.h
===================================================================
RCS file: /cvsroot/wxlua/wxLua/modules/wxluasocket/include/wxldtarg.h,v
retrieving revision 1.4
retrieving revision 1.5
diff -C2 -d -r1.4 -r1.5
*** wxldtarg.h	1 Dec 2005 06:43:53 -0000	1.4
--- wxldtarg.h	2 Dec 2005 06:38:31 -0000	1.5
***************
*** 148,153 ****
      bool WaitForConnect() const;
      bool AtBreakPoint(const wxString &fileName, int lineNumber) const;
-     wxString GetTableInfo(int index);
-     wxString GetUserDataInfo(int index, bool full = true);
      wxString GetDebugInfo(int &lineNumber) const;
  
--- 148,151 ----

[Wxlua-commit] wxLua/modules/wxluadebug/include wxldebug.h,1.8,1.9

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

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

Modified Files:
	wxldebug.h 
Log Message:
restore the stacktree for the wxLua app
more code unification for wxLuaDebug classes
revert to EnumerateStack, EnumerateStackEntry, EnumerateTable instead of BuildStack, BuildStackList, BuildTableList


Index: wxldebug.h
===================================================================
RCS file: /cvsroot/wxlua/wxLua/modules/wxluadebug/include/wxldebug.h,v
retrieving revision 1.8
retrieving revision 1.9
diff -C2 -d -r1.8 -r1.9
*** wxldebug.h	1 Dec 2005 06:43:53 -0000	1.8
--- wxldebug.h	2 Dec 2005 06:38:30 -0000	1.9
***************
*** 101,105 ****
  
  // ----------------------------------------------------------------------------
! // wxLuaDebugData
  // ----------------------------------------------------------------------------
  
--- 101,106 ----
  
  // ----------------------------------------------------------------------------
! // wxLuaDebugData - a wxSortedArray of pointers to wxLuaDebugDataItem(s)
! //                  it has a destructor that deletes them.
  // ----------------------------------------------------------------------------
  
***************
*** 112,122 ****
      // fill this with the stack entries for the wxLuaState
      //   returns the number of stack entries added
!     int BuildStack(const wxLuaState& wxlState);
!     int BuildStackList(const wxLuaState& wxlState, int stackRef, wxArrayInt& references);
!     int BuildTableList(const wxLuaState& wxlState, int nRef, int nEntry, wxArrayInt& references);
  
      static wxString MakeNumber(double dnum);
      static wxString MakeBoolean(int num);
      static wxString GetTableInfo(const wxLuaState& wxlState, int index);
      static wxString GetUserDataInfo(const wxLuaState& wxlState, int index, bool full = true);
  
--- 113,131 ----
      // fill this with the stack entries for the wxLuaState
      //   returns the number of stack entries added
!     int EnumerateStack(const wxLuaState& wxlState);
!     int EnumerateStackEntry(const wxLuaState& wxlState, int stackRef, wxArrayInt& references);
!     int EnumerateTable(const wxLuaState& wxlState, int nRef, int nEntry, wxArrayInt& references);
  
+     // Get a human readable string name of the lua_type(L, index) and the
+     //   value at the index, returns the value of lua_type
+     static int GetTypeValue(const wxLuaState& wxlState, int index, wxString& type, wxString& value);
+     // Write the input number as either an int, uint, or as a double
      static wxString MakeNumber(double dnum);
+     // Convert the number to either "True" or "False" (eg !0 or 0)
      static wxString MakeBoolean(int num);
+     // Get a wxString description about the table at the index in the lua stack
      static wxString GetTableInfo(const wxLuaState& wxlState, int index);
+     // Get a wxString description about user data at the index in the lua stack
+     //  if full then try to look up the name of the user data from the bindings
      static wxString GetUserDataInfo(const wxLuaState& wxlState, int index, bool full = true);
  
***************
*** 135,141 ****
      virtual ~wxLuaInterface();
  
!     wxLuaDebugData *BuildStack();
!     wxLuaDebugData *BuildStackList(int nEntry);
!     wxLuaDebugData *BuildTableList(int nRef, int nEntry);
      wxLuaDebugData *GetGlobalData();
  
--- 144,150 ----
      virtual ~wxLuaInterface();
  
!     wxLuaDebugData *EnumerateStack();
!     wxLuaDebugData *EnumerateStackEntry(int nEntry);
!     wxLuaDebugData *EnumerateTable(int nRef, int nEntry);
      wxLuaDebugData *GetGlobalData();
  

[Wxlua-commit] wxLua/modules/wxluadebug/src wxldebug.cpp,1.6,1.7

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

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

Modified Files:
	wxldebug.cpp 
Log Message:
Make wxLuaDebugData have functions to BuildStack, BuildStackList, BuildTableList
   These replace the same functions in wxLuaInterface
   Replaces EnumerateStack, EnumerateStackEntry, EnumerateTable in wxLuaTarget and wxLuaDebugee
   moved helper functions MakeNumber, MakeBoolean, GetTableInfo, GetUserDataInfo as well


Index: wxldebug.cpp
===================================================================
RCS file: /cvsroot/wxlua/wxLua/modules/wxluadebug/src/wxldebug.cpp,v
retrieving revision 1.6
retrieving revision 1.7
diff -C2 -d -r1.6 -r1.7
*** wxldebug.cpp	1 Dec 2005 04:17:29 -0000	1.6
--- wxldebug.cpp	1 Dec 2005 06:43:53 -0000	1.7
***************
*** 177,219 ****
  }
  
! // ----------------------------------------------------------------------------
! // wxLuaInterface (local)
! // ----------------------------------------------------------------------------
! 
! wxLuaInterface::wxLuaInterface(const wxLuaState& wxlState) : m_wxlState(wxlState)
! {
! }
! 
! wxLuaInterface::~wxLuaInterface()
! {
!     size_t idx, idxMax = m_references.GetCount();
!     for (idx = 0; idx < idxMax; ++idx)
!     {
!         int iItem = m_references.Item(idx);
!         m_wxlState.tremove(iItem);
!     }
! }
! 
! int wxLuaInterface::Ref()
! {
!     int nReference = m_wxlState.tinsert(-1);
!     m_references.Add(nReference);
!     return nReference;
! }
! 
! wxLuaDebugData *wxLuaInterface::BuildStack()
  {
!     wxLuaDebugData *pSortedList = new wxLuaDebugData();
  
!     int       nIndex    = 0;
      lua_Debug luaDebug;
  
!     bool fFirst = true;
! 
!     while (m_wxlState.GetStack(nIndex, &luaDebug) != 0)
      {
!         if (m_wxlState.GetInfo("Sln", &luaDebug) != 0)
          {
!             wxString itemName;
              wxString source = lua2wx(luaDebug.source);
  
--- 177,196 ----
  }
  
! int wxLuaDebugData::BuildStack(const wxLuaState& wxlState_)
  {
!     wxLuaState wxlState(wxlState_); // unconst the state
  
!     int       nIndex = 0;
!     bool      fFirst = true;
!     int       count = 0;
      lua_Debug luaDebug;
+     lua_State* L = wxlState.GetLuaState();
  
!     while (lua_getstack(L, nIndex, &luaDebug) != 0)
      {
!         if (lua_getinfo(L, "Sln", &luaDebug))
          {
!             wxString stackItem;
!             wxString name = lua2wx(luaDebug.name);
              wxString source = lua2wx(luaDebug.source);
  
***************
*** 226,235 ****
  
                  if (luaDebug.name != NULL)
!                     itemName.Printf(_("function %s line %u"), luaDebug.name, currentLine);
                  else
!                     itemName.Printf(_("line %u"), currentLine);
  
!                 wxLuaDebugDataItem *item = new wxLuaDebugDataItem(itemName, wxT(""), wxT(""), source, nIndex, 0);
!                 pSortedList->Add(item);
  
                  fFirst = false;
--- 203,217 ----
  
                  if (luaDebug.name != NULL)
!                     stackItem = wxString::Format(_("function %s line %u"), name.c_str(), currentLine);
                  else
!                     stackItem = wxString::Format(_("line %u"), currentLine);
  
!                 wxLuaDebugDataItem *item = new wxLuaDebugDataItem(stackItem, wxT(""), wxT(""), source, nIndex, 0);
! 
!                 if (item != NULL)
!                 {
!                     Add(item);
!                     count++;
!                 }
  
                  fFirst = false;
***************
*** 239,263 ****
          ++nIndex;
      }
!     return pSortedList;
  }
  
! wxLuaDebugData *wxLuaInterface::BuildStackList(int nEntry)
  {
!     wxLuaDebugData *pSortedList = new wxLuaDebugData();
!     if (pSortedList != NULL)
      {
!         lua_Debug luaDebug;
!         if (m_wxlState.GetStack(nEntry, &luaDebug) != 0)
          {
!             int         idx  = 1;
!             wxString name = m_wxlState.GetLocalwxString(&luaDebug, idx);
!             while (!name.IsEmpty())
              {
                  bool fIsTable = false;
                  wxString type;
                  wxString value;
!                 wxString source = lua2wx(luaDebug.source);
  
!                 switch (m_wxlState.Type(-1))
                  {
                      case LUA_TNIL:
--- 221,406 ----
          ++nIndex;
      }
! 
!     return count;
  }
  
! int wxLuaDebugData::BuildStackList(const wxLuaState& wxlState_, int stackRef, wxArrayInt& references)
  {
!     wxLuaState wxlState(wxlState_); // unconst the state
! 
!     int count = 0;
!     lua_Debug luaDebug;
!     lua_State* L = wxlState.GetLuaState();
! 
!     if (lua_getstack(L, stackRef, &luaDebug) != 0)
      {
!         int idx  = 1;
!         wxString name = lua2wx(lua_getlocal(L, &luaDebug, idx));
!         while (!name.IsEmpty())
          {
!             bool fIsTable = false;
!             wxString type;
!             wxString value;
!             wxString source = lua2wx(luaDebug.source);
! 
!             switch (lua_type(L, -1))
!             {
!                 case LUA_TNIL:
!                     type  = wxT("Nil");
!                     value = wxT("nil");
!                     break;
! 
!                 case LUA_TBOOLEAN:
!                     type = wxT("Boolean");
!                     value = MakeBoolean(lua_toboolean(L, -1));
!                     break;
! 
!                 case LUA_TNUMBER:
!                     type = wxT("Number");
!                     value = MakeNumber(lua_tonumber(L, -1));
!                     break;
! 
!                 case LUA_TSTRING:
!                     type  = wxT("String");
!                     value = lua2wx(lua_tostring(L, -1));
!                     break;
! 
!                 case LUA_TTABLE:
!                     type  = wxT("Table");
!                     value = GetTableInfo(wxlState, -1);
!                     fIsTable = true;
!                     break;
! 
!                 case LUA_TFUNCTION:
!                     if (lua_iscfunction(L, -1))
!                     {
!                         type  = wxT("C Function");
!                         value.Printf(wxT("%p"), lua_tocfunction(L, -1));
!                     }
!                     else
!                     {
!                         type = wxT("Lua Function");
!                         value.Printf(wxT("%p"), lua_topointer(L, -1));
!                     }
!                     break;
! 
!                 case LUA_TUSERDATA:
!                     type  = wxT("User Data");
!                     value = GetUserDataInfo(wxlState, -1);
!                     break;
! 
!                 case LUA_TLIGHTUSERDATA:
!                     type  = wxT("Light User Data");
!                     value = GetUserDataInfo(wxlState, -1, false);
!                     break;
! 
!                 case LUA_TTHREAD:
!                     type = wxT("Thread");
!                     value.Printf(wxT("%p"), lua_topointer(L, -1));
!                     break;
!             }
! 
!             int nRef = LUA_NOREF;
! 
!             if (lua_istable(L, -1)) // FIXME or fIsTable
!             {
!                 lua_pushvalue(L, -1);
!                 nRef = wxlState.tinsert(-1);
!                 references.Add(nRef);
!             }
! 
!             wxLuaDebugDataItem *item = new wxLuaDebugDataItem(name, type, value, source, nRef, 0);
!             if (item != NULL)
!             {
!                 Add(item);
!                 count++;
!             }
! 
!             name = lua2wx(lua_getlocal(L, &luaDebug, ++idx));
!         }
!     }
! 
!     return count;
! }
! 
! int wxLuaDebugData::BuildTableList(const wxLuaState& wxlState_, int tableRef, int nIndex, wxArrayInt& references)
! {
!     wxLuaState wxlState(wxlState_); // unconst the state
!     lua_State* L = wxlState.GetLuaState();
!     int count = 0;
! 
!     if (tableRef == -1)
!     {
!         lua_pushvalue(L, LUA_GLOBALSINDEX);
!         int nRef = wxlState.tinsert(-1);
!         Add(new wxLuaDebugDataItem(wxT("Globals"),
!                                        wxT(""),
!                                        wxT(""),
!                                        wxT(""),
!                                        nRef,
!                                        0));
!         references.Add(nRef);
!     }
!     else
!     {
!         if (wxlState.tget(tableRef) != 0)
!         {
!             int nTop = lua_gettop(L);
! 
!             // start iterating
!             lua_pushnil(L);
!             while (lua_next(L, nTop) != 0)
              {
                  bool fIsTable = false;
                  wxString type;
                  wxString value;
!                 wxString name;
!                 wxString source;
  
!                 // get the index
!                 switch (lua_type(L, -2))
!                 {
!                     case LUA_TNIL:
!                         name = wxT("Nil");
!                         break;
! 
!                     case LUA_TBOOLEAN:
!                         name = MakeBoolean(lua_toboolean(L, -2));
!                         break;
! 
!                     case LUA_TNUMBER:
!                         name = MakeNumber(lua_tonumber(L, -2));
!                         break;
! 
!                     case LUA_TSTRING:
!                         name = lua2wx(lua_tostring(L, -2));
!                         break;
! 
!                     case LUA_TTABLE:
!                         name = GetTableInfo(wxlState, -2);
!                         break;
! 
!                     case LUA_TFUNCTION:
!                         if (lua_iscfunction(L, -2))
!                             name.Printf(wxT("%p"), lua_tocfunction(L, -2));
!                         else
!                             name.Printf(wxT("%p"), lua_topointer(L, -2));
!                         break;
! 
!                     case LUA_TUSERDATA:
!                         name = GetUserDataInfo(wxlState, -2);
!                         break;
! 
!                     case LUA_TLIGHTUSERDATA:
!                         name = GetUserDataInfo(wxlState, -2, false);
!                         break;
! 
!                     case LUA_TTHREAD:
!                         name.Printf(wxT("%p"), lua_topointer(L, -2));
!                         break;
!                 }
! 
!                 // get the value
!                 switch (lua_type(L, -1))
                  {
                      case LUA_TNIL:
***************
*** 267,300 ****
  
                      case LUA_TBOOLEAN:
                          type = wxT("Boolean");
-                         value = MakeBoolean(m_wxlState.ToBoolean(-1));
                          break;
  
                      case LUA_TNUMBER:
                          type = wxT("Number");
-                         value = MakeNumber(m_wxlState.ToNumber(-1));
                          break;
  
                      case LUA_TSTRING:
                          type  = wxT("String");
!                         value = m_wxlState.TowxString(-1);
                          break;
  
                      case LUA_TTABLE:
                          type  = wxT("Table");
!                         value = GetTableInfo(-1);
                          fIsTable = true;
                          break;
  
                      case LUA_TFUNCTION:
!                         if (m_wxlState.IsCFunction(-1))
                          {
                              type  = wxT("C Function");
!                             value.Printf(wxT("%p"), m_wxlState.ToCFunction(-1));
                          }
                          else
                          {
                              type = wxT("Lua Function");
!                             value.Printf(wxT("%p"), m_wxlState.ToPointer(-1));
                          }
                          break;
--- 410,443 ----
  
                      case LUA_TBOOLEAN:
+                         value = MakeBoolean(lua_toboolean(L, -1));
                          type = wxT("Boolean");
                          break;
  
                      case LUA_TNUMBER:
+                         value = MakeNumber(lua_tonumber(L, -1));
                          type = wxT("Number");
                          break;
  
                      case LUA_TSTRING:
                          type  = wxT("String");
!                         value = lua2wx(lua_tostring(L, -1));
                          break;
  
                      case LUA_TTABLE:
                          type  = wxT("Table");
!                         value = GetTableInfo(wxlState, -1);
                          fIsTable = true;
                          break;
  
                      case LUA_TFUNCTION:
!                         if (lua_iscfunction(L, -1))
                          {
                              type  = wxT("C Function");
!                             value.Printf(wxT("%p"), lua_tocfunction(L, -1));
                          }
                          else
                          {
                              type = wxT("Lua Function");
!                             value.Printf(wxT("%p"), lua_topointer(L, -1));
                          }
                          break;
***************
*** 302,530 ****
                      case LUA_TUSERDATA:
                          type  = wxT("User Data");
!                         value = GetUserDataInfo(-1);
                          break;
  
                      case LUA_TLIGHTUSERDATA:
                          type  = wxT("Light User Data");
!                         value = GetUserDataInfo(-1, false);
                          break;
  
                      case LUA_TTHREAD:
!                         type  = wxT("Thread");
!                         value.Printf(wxT("%p"), m_wxlState.ToPointer(-1));
                          break;
                  }
  
                  int nRef = LUA_NOREF;
- 
                  if (fIsTable)
                  {
!                     nRef = Ref();
                  }
                  else
!                     m_wxlState.Pop(1);
! 
!                 wxLuaDebugDataItem *item = new wxLuaDebugDataItem(name, type, value, source, nRef, 0);
!                 pSortedList->Add(item);
  
!                 name = m_wxlState.GetLocalwxString(&luaDebug, ++idx);
              }
          }
      }
  
!     return pSortedList;
  }
  
! wxLuaDebugData *wxLuaInterface::BuildTableList(int nRef, int nIndex)
  {
!     wxLuaDebugData *pSortedList = new wxLuaDebugData();
!     if ((pSortedList != NULL) && (m_wxlState.tget(nRef) != 0))
      {
!         int nTop = m_wxlState.GetTop();
! 
!         // start iterating
!         m_wxlState.PushNil();
!         while (m_wxlState.Next(nTop) != 0)
!         {
!             bool fIsTable = false;
!             wxString type;
!             wxString value;
!             wxString name;
!             wxString source;
! 
!             // get the index
!             switch (m_wxlState.Type(-2))
!             {
!                 case LUA_TNIL:
!                     name = wxT("Nil");
!                     break;
! 
!                 case LUA_TBOOLEAN:
!                     name = MakeBoolean(m_wxlState.ToBoolean(-2));
!                     break;
! 
!                 case LUA_TNUMBER:
!                     name = MakeNumber(m_wxlState.ToNumber(-2));
!                     break;
! 
!                 case LUA_TSTRING:
!                     name = m_wxlState.TowxString(-2);
!                     break;
  
!                 case LUA_TTABLE:
!                     name = GetTableInfo(-2);
!                     break;
  
!                 case LUA_TFUNCTION:
!                     if (m_wxlState.IsCFunction(-2))
!                         name.Printf(wxT("%p"), m_wxlState.ToCFunction(-2));
!                     else
!                         name.Printf(wxT("%p"), m_wxlState.ToPointer(-2));
!                     break;
  
!                 case LUA_TUSERDATA:
!                     name = GetUserDataInfo(-2);
!                     break;
  
!                 case LUA_TLIGHTUSERDATA:
!                     name = GetUserDataInfo(-2, false);
!                     break;
!             }
  
!             // get the value
!             switch (m_wxlState.Type(-1))
!             {
!                 case LUA_TNIL:
!                     type  = wxT("Nil");
!                     value = wxT("nil");
!                     break;
  
!                 case LUA_TBOOLEAN:
!                     value = MakeBoolean(m_wxlState.ToBoolean(-1));
!                     type = wxT("Boolean");
!                     break;
  
!                 case LUA_TNUMBER:
!                     value = MakeNumber(m_wxlState.ToNumber(-1));
!                     type = wxT("Number");
!                     break;
  
!                 case LUA_TSTRING:
!                     type  = wxT("String");
!                     value = m_wxlState.TowxString(-1);
!                     break;
  
!                 case LUA_TTABLE:
!                     type  = wxT("Table");
!                     value = GetTableInfo(-1);
!                     fIsTable = true;
!                     break;
  
!                 case LUA_TFUNCTION:
!                     if (m_wxlState.IsCFunction(-1))
!                     {
!                         type  = wxT("C Function");
!                         value.Printf(wxT("%p"), m_wxlState.ToCFunction(-1));
!                     }
!                     else
!                     {
!                         type = wxT("Lua Function");
!                         value.Printf(wxT("%p"), m_wxlState.ToPointer(-1));
!                     }
!                     break;
  
!                 case LUA_TUSERDATA:
!                     type  = wxT("User Data");
!                     value = GetUserDataInfo(-1);
!                     break;
  
!                 case LUA_TLIGHTUSERDATA:
!                     type  = wxT("Light User Data");
!                     value = GetUserDataInfo(-1, false);
!                     break;
  
-                 case LUA_TTHREAD:
-                     type = wxT("Thread");
-                     value.Printf(wxT("%p"), m_wxlState.ToPointer(-1));
-                     break;
-             }
  
!             int nRef = LUA_NOREF;
!             if (fIsTable)
!                 nRef = Ref();
!             else
!                 m_wxlState.Pop(1);
  
!             wxLuaDebugDataItem *item = new wxLuaDebugDataItem(name, type, value, source, nRef, nIndex);
!             pSortedList->Add(item);
!         }
  
!         // remove reference
!         m_wxlState.Pop(1);
      }
-     return pSortedList;
  }
  
! wxString wxLuaInterface::GetTableInfo(int index)
  {
!     wxString tableInfo;
! 
!     int         nItems = m_wxlState.GetN(index);
!     const void *pItem  = m_wxlState.ToPointer(index);
! 
!     if (nItems == 0)
!         tableInfo.Printf(wxT("%p"), pItem);
!     else
!         tableInfo.Printf(wxT("%p approx %u items)"), pItem, nItems);
! 
!     return tableInfo;
  }
  
! wxString wxLuaInterface::GetUserDataInfo(int index, bool full)
  {
!     wxString userdatainfo;
! 
!     if (full)
!     {
!         wxString pTagName;
!         int nTag = m_wxlState.ttag(index);
! 
!         if (nTag != TLUA_NOTAG)
!             pTagName = lua2wx(m_wxlState.GetLuaTagName(nTag));
! 
!         if (pTagName != wxEmptyString)
!             userdatainfo.Printf(wxT("%p (%s)"), m_wxlState.ToUserData(index), pTagName.c_str());
!         else
!             userdatainfo.Printf(wxT("%p (%u)"), m_wxlState.ToUserData(index), nTag);
!     }
!     else
!         userdatainfo.Printf(wxT("%p"), m_wxlState.ToUserData(index));
  
!     return userdatainfo;
  }
  
! wxString wxLuaInterface::MakeNumber(double dnum)
  {
!     wxString number;
! 
!     long num = (long) dnum;
!     if ((double) num == dnum)
!     {
!         if (num >= 0)
!             number.Printf(wxT("%lu (0x%lx)"), num, num);
!         else
!             number.Printf(wxT("%ld (0x%lx)"), num, num);
!     }
!     else
!         number.Printf(wxT("%g"), dnum);
  
!     return number;
  }
  
! wxString wxLuaInterface::MakeBoolean(int num)
  {
!     if (num)
!         return wxT("True");
!     return wxT("False");
  }
  
--- 445,594 ----
                      case LUA_TUSERDATA:
                          type  = wxT("User Data");
!                         value = GetUserDataInfo(wxlState, -1);
                          break;
  
                      case LUA_TLIGHTUSERDATA:
                          type  = wxT("Light User Data");
!                         value = GetUserDataInfo(wxlState, -1, false);
                          break;
  
                      case LUA_TTHREAD:
!                         type = wxT("Thread");
!                         value.Printf(wxT("%p"), lua_topointer(L, -1));
                          break;
                  }
  
                  int nRef = LUA_NOREF;
                  if (fIsTable)
                  {
!                     nRef = wxlState.tinsert(-1);
!                     references.Add(nRef);
                  }
                  else
!                     lua_pop(L, 1);
  
!                 wxLuaDebugDataItem *item = new wxLuaDebugDataItem(name, type, value, source, nRef, nIndex);
!                 if (item != NULL)
!                 {
!                     Add(item);
!                     count++;
!                 }
              }
+ 
+             // remove reference
+             lua_pop(L, 1);
          }
      }
  
!     return count;
  }
  
! wxString wxLuaDebugData::MakeNumber(double dnum)
  {
!     long num = (long) dnum;
!     if ((double) num == dnum)
      {
!         if (num >= 0)
!             return wxString::Format(wxT("%lu (0x%lx)"), num, num);
  
!         return wxString::Format(wxT("%ld (0x%lx)"), num, num);
!     }
  
!     return wxString::Format(wxT("%g"), dnum);
! }
  
! wxString wxLuaDebugData::MakeBoolean(int num)
! {
!     return num != 0 ? wxT("True") : wxT("False");
! }
  
! wxString wxLuaDebugData::GetTableInfo(const wxLuaState& wxlState, int index)
! {
!     lua_State* L = wxlState.GetLuaState();
!     int         nItems = luaL_getn(L, index);
!     const void *pItem  = lua_topointer(L, index);
  
!     if (nItems == 0)
!         return wxString::Format(wxT("%p"), pItem);
  
!     return wxString::Format(wxT("%p (approx %u items)"), pItem, nItems);
! }
  
! wxString wxLuaDebugData::GetUserDataInfo(const wxLuaState& wxlState_, int index, bool full)
! {
!     wxLuaState wxlState(wxlState_); // unconst wxLuaState
!     lua_State* L = wxlState.GetLuaState();
!     if (full)
!     {
  
!         int nTag = wxlState.ttag(index);
  
!         const char *pTagName = NULL;
!         if (nTag != TLUA_NOTAG)
!             pTagName = wxlState.GetLuaTagName(nTag);
  
!         if (pTagName != NULL)
!             return wxString::Format(wxT("%p (%s)"), lua_touserdata(L, index), pTagName);
  
!         return wxString::Format(wxT("%p (%u)"), lua_touserdata(L, index), nTag);
!     }
  
!     return wxString::Format(wxT("%p"), lua_touserdata(L, index));
! }
  
  
! // ----------------------------------------------------------------------------
! // wxLuaInterface (local)
! // ----------------------------------------------------------------------------
  
! wxLuaInterface::wxLuaInterface(const wxLuaState& wxlState) : m_wxlState(wxlState)
! {
! }
  
! wxLuaInterface::~wxLuaInterface()
! {
!     size_t idx, idxMax = m_references.GetCount();
!     for (idx = 0; idx < idxMax; ++idx)
!     {
!         int iItem = m_references.Item(idx);
!         m_wxlState.tremove(iItem);
      }
  }
  
! int wxLuaInterface::Ref()
  {
!     int nReference = m_wxlState.tinsert(-1);
!     m_references.Add(nReference);
!     return nReference;
  }
  
! wxLuaDebugData *wxLuaInterface::BuildStack()
  {
!     wxLuaDebugData *pSortedList = new wxLuaDebugData();
!     if (pSortedList == NULL)
!         return NULL;
  
!     pSortedList->BuildStack(m_wxlState);
!     return pSortedList;
  }
  
! wxLuaDebugData *wxLuaInterface::BuildStackList(int nEntry)
  {
!     wxLuaDebugData *pSortedList = new wxLuaDebugData();
!     if (pSortedList == NULL)
!         return NULL;
  
!     pSortedList->BuildStackList(m_wxlState, nEntry, m_references);
!     return pSortedList;
  }
  
! wxLuaDebugData *wxLuaInterface::BuildTableList(int nRef, int nIndex)
  {
!     wxLuaDebugData *pSortedList = new wxLuaDebugData();
!     if (pSortedList == NULL)
!         return NULL;
! 
!     pSortedList->BuildTableList(m_wxlState, nRef, nIndex, m_references);
!     return pSortedList;
  }
  

[Wxlua-commit] wxLua/modules/wxlua/include internal.h,1.13,1.14

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

Update of /cvsroot/wxlua/wxLua/modules/wxlua/include
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv24710/wxLua/modules/wxlua/include

Modified Files:
	internal.h 
Log Message:
Make wxLuaDebugData have functions to BuildStack, BuildStackList, BuildTableList
   These replace the same functions in wxLuaInterface
   Replaces EnumerateStack, EnumerateStackEntry, EnumerateTable in wxLuaTarget and wxLuaDebugee
   moved helper functions MakeNumber, MakeBoolean, GetTableInfo, GetUserDataInfo as well


Index: internal.h
===================================================================
RCS file: /cvsroot/wxlua/wxLua/modules/wxlua/include/internal.h,v
retrieving revision 1.13
retrieving revision 1.14
diff -C2 -d -r1.13 -r1.14
*** internal.h	30 Nov 2005 04:46:17 -0000	1.13
--- internal.h	1 Dec 2005 06:43:53 -0000	1.14
***************
*** 319,323 ****
      static void     DumpType(lua_State *L, int index, wxString& type, wxString& value, wxString& info);
      static int      GetTableInfo(lua_State *L, int index, wxString& address, wxString& info);
-     static wxString MakeNumber(double dnum);
      static wxString GetUserDataInfo(lua_State *L, int index);
  
--- 319,322 ----

[Wxlua-commit] wxLua/modules/wxlua/src internal.cpp,1.19,1.20 wxlstate.cpp,1.10,1.11

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

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

Modified Files:
	internal.cpp wxlstate.cpp 
Log Message:
Make wxLuaDebugData have functions to BuildStack, BuildStackList, BuildTableList
   These replace the same functions in wxLuaInterface
   Replaces EnumerateStack, EnumerateStackEntry, EnumerateTable in wxLuaTarget and wxLuaDebugee
   moved helper functions MakeNumber, MakeBoolean, GetTableInfo, GetUserDataInfo as well


Index: internal.cpp
===================================================================
RCS file: /cvsroot/wxlua/wxLua/modules/wxlua/src/internal.cpp,v
retrieving revision 1.19
retrieving revision 1.20
diff -C2 -d -r1.19 -r1.20
*** internal.cpp	30 Nov 2005 04:46:17 -0000	1.19
--- internal.cpp	1 Dec 2005 06:43:53 -0000	1.20
***************
*** 39,42 ****
--- 39,45 ----
  #include "wxlua/include/wxlintrp.h"
  
+ #include "wxluadebug/include/wxldebug.h" // FIXME for wxLuaDebugData
+ 
+ 
  //#ifdef FindText
  //# undef FindText
***************
*** 504,508 ****
          case LUA_TNUMBER:
              type = wxT("Number");
!             value = MakeNumber(lua_tonumber(L, index));
              break;
  
--- 507,511 ----
          case LUA_TNUMBER:
              type = wxT("Number");
!             value = wxLuaDebugData::MakeNumber(lua_tonumber(L, index));
              break;
  
***************
*** 559,580 ****
  }
  
- wxString wxLuaCheckStack::MakeNumber(double dnum)
- {
-     wxString number;
- 
-     long num = (long) dnum;
-     if ((double) num == dnum)
-     {
-         if (num >= 0)
-             number = wxString::Format(wxT("%lu (0x%lx)"), num, num);
-         else
-             number = wxString::Format(wxT("%ld (0x%lx)"), num, num);
-     }
-     else
-         number = wxString::Format(wxT("%g"), dnum);
- 
-     return number;
- }
- 
  void wxLuaCheckStack::DumpTable(lua_State *L, int index, const wxString& tablename, wxHashTable& dumpList, int indent)
  {
--- 562,565 ----

Index: wxlstate.cpp
===================================================================
RCS file: /cvsroot/wxlua/wxLua/modules/wxlua/src/wxlstate.cpp,v
retrieving revision 1.10
retrieving revision 1.11
diff -C2 -d -r1.10 -r1.11
*** wxlstate.cpp	29 Nov 2005 23:52:12 -0000	1.10
--- wxlstate.cpp	1 Dec 2005 06:43:53 -0000	1.11
***************
*** 28,32 ****
  #endif
  
! // For compilers that support precompilation, includes <wx/wx.h>.
  #include "wx/wxprec.h"
  
--- 28,32 ----
  #endif
  
! // For compilers that support precompilation, includes "wx/wx.h"
  #include "wx/wxprec.h"
  

[Wxlua-commit] wxLua/modules/wxluasocket/include dservice.h,1.4,1.5 wxldserv.h,1.3,1.4 wxldtarg.h,1.3,1.4

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

Update of /cvsroot/wxlua/wxLua/modules/wxluasocket/include
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv24710/wxLua/modules/wxluasocket/include

Modified Files:
	dservice.h wxldserv.h wxldtarg.h 
Log Message:
Make wxLuaDebugData have functions to BuildStack, BuildStackList, BuildTableList
   These replace the same functions in wxLuaInterface
   Replaces EnumerateStack, EnumerateStackEntry, EnumerateTable in wxLuaTarget and wxLuaDebugee
   moved helper functions MakeNumber, MakeBoolean, GetTableInfo, GetUserDataInfo as well


Index: wxldserv.h
===================================================================
RCS file: /cvsroot/wxlua/wxLua/modules/wxluasocket/include/wxldserv.h,v
retrieving revision 1.3
retrieving revision 1.4
diff -C2 -d -r1.3 -r1.4
*** wxldserv.h	29 Nov 2005 05:45:10 -0000	1.3
--- wxldserv.h	1 Dec 2005 06:43:53 -0000	1.4
***************
*** 28,38 ****
  
  // ----------------------------------------------------------------------------
! // wxLuaThread
  // ----------------------------------------------------------------------------
  
! class WXDLLIMPEXP_WXLUA wxLuaThread : public wxThread
  {
  public:
!     wxLuaThread(wxLuaDebugServer *pServer) : wxThread(wxTHREAD_JOINABLE)
      {
          m_pServer = pServer;
--- 28,38 ----
  
  // ----------------------------------------------------------------------------
! // wxLuaDebugServerThread - a wxThread for the wxLuaDebugServer
  // ----------------------------------------------------------------------------
  
! class WXDLLIMPEXP_WXLUA wxLuaDebugServerThread : public wxThread
  {
  public:
!     wxLuaDebugServerThread(wxLuaDebugServer *pServer) : wxThread(wxTHREAD_JOINABLE)
      {
          m_pServer = pServer;
***************
*** 51,55 ****
  
  // ----------------------------------------------------------------------------
! // wxLuaDebugServer
  // ----------------------------------------------------------------------------
  
--- 51,56 ----
  
  // ----------------------------------------------------------------------------
! // wxLuaDebugServer - a socket server for a lua program to communicate with a
! //                    wxLuaDebugTarget run in C++.
  // ----------------------------------------------------------------------------
  
***************
*** 95,99 ****
      int             m_portNumber;
      wxProcess      *m_pProcess;
!     wxLuaThread    *m_pThread;
      wxLuaStackFrame  *m_pStackFrameDialog;
      bool            m_fShutdown;
--- 96,100 ----
      int             m_portNumber;
      wxProcess      *m_pProcess;
!     wxLuaDebugServerThread *m_pThread;
      wxLuaStackFrame  *m_pStackFrameDialog;
      bool            m_fShutdown;

Index: wxldtarg.h
===================================================================
RCS file: /cvsroot/wxlua/wxLua/modules/wxluasocket/include/wxldtarg.h,v
retrieving revision 1.3
retrieving revision 1.4
diff -C2 -d -r1.3 -r1.4
*** wxldtarg.h	30 Nov 2005 04:46:17 -0000	1.3
--- wxldtarg.h	1 Dec 2005 06:43:53 -0000	1.4
***************
*** 25,29 ****
  
  // ----------------------------------------------------------------------------
! // wxLuaDebugTarget - Handles Debugger/Debuggee IO
  // ----------------------------------------------------------------------------
  
--- 25,30 ----
  
  // ----------------------------------------------------------------------------
! // wxLuaDebugTarget - a C++ socket target that the wxLuaDebugServer run in lua
! //                    communicates with. Handles the Debugger/Debuggee IO
  // ----------------------------------------------------------------------------
  
***************
*** 149,154 ****
      wxString GetTableInfo(int index);
      wxString GetUserDataInfo(int index, bool full = true);
-     wxString MakeBoolean(int num);
-     wxString MakeNumber(double dnum);
      wxString GetDebugInfo(int &lineNumber) const;
  
--- 150,153 ----

Index: dservice.h
===================================================================
RCS file: /cvsroot/wxlua/wxLua/modules/wxluasocket/include/dservice.h,v
retrieving revision 1.4
retrieving revision 1.5
diff -C2 -d -r1.4 -r1.5
*** dservice.h	25 Nov 2005 19:45:36 -0000	1.4
--- dservice.h	1 Dec 2005 06:43:53 -0000	1.5
***************
*** 185,189 ****
  public:
      wxLuaDebuggee(wxLuaDebugService * debugService, lua_State *state);
!     ~wxLuaDebuggee();
  
      void AddBreakPoint(const wxFileName &fileName, int lineNumber);
--- 185,189 ----
  public:
      wxLuaDebuggee(wxLuaDebugService * debugService, lua_State *state);
!     virtual ~wxLuaDebuggee();
  
      void AddBreakPoint(const wxFileName &fileName, int lineNumber);
***************
*** 206,210 ****
  
      wxLuaDebugService* m_debugService;
!     lua_State          *m_luaState;
  
      LuaBreakPointList   m_breakPointList;
--- 206,210 ----
  
      wxLuaDebugService* m_debugService;
!     wxLuaState         m_wxlState;
  
      LuaBreakPointList   m_breakPointList;
***************
*** 246,255 ****
      wxString GetTableInfo(int index);
      wxString GetUserDataInfo(int index, bool full = true);
-     wxString MakeBoolean(int num);
-     wxString MakeNumber(double dnum);
  
      wxFileName GetDebugInfo(int &lineNumber) const;
  
- 
      // Debug Events from Lua Interpreter
      static void LUACALL LuaDebugHook(lua_State *state, lua_Debug *debug);
--- 246,252 ----
***************
*** 268,272 ****
  public:
      wxLuaDebugService(int portNumber = PORT_LUADEBUG);
!     ~wxLuaDebugService();
  
      // Start Service
--- 265,269 ----
  public:
      wxLuaDebugService(int portNumber = PORT_LUADEBUG);
!     virtual ~wxLuaDebugService();
  
      // Start Service
***************
*** 326,330 ****
  public:
      wxLuaDebugger();
!     ~wxLuaDebugger();
  
      bool Connect(const wxString& hostname = wxT("localhost"), int portNumber = PORT_LUADEBUG);
--- 323,327 ----
  public:
      wxLuaDebugger();
!     virtual ~wxLuaDebugger();
  
      bool Connect(const wxString& hostname = wxT("localhost"), int portNumber = PORT_LUADEBUG);

[Wxlua-commit] wxLua/modules/wxluadebug/include wxldebug.h,1.7,1.8

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

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

Modified Files:
	wxldebug.h 
Log Message:
Make wxLuaDebugData have functions to BuildStack, BuildStackList, BuildTableList
   These replace the same functions in wxLuaInterface
   Replaces EnumerateStack, EnumerateStackEntry, EnumerateTable in wxLuaTarget and wxLuaDebugee
   moved helper functions MakeNumber, MakeBoolean, GetTableInfo, GetUserDataInfo as well


Index: wxldebug.h
===================================================================
RCS file: /cvsroot/wxlua/wxLua/modules/wxluadebug/include/wxldebug.h,v
retrieving revision 1.7
retrieving revision 1.8
diff -C2 -d -r1.7 -r1.8
*** wxldebug.h	1 Dec 2005 04:17:29 -0000	1.7
--- wxldebug.h	1 Dec 2005 06:43:53 -0000	1.8
***************
*** 110,113 ****
--- 110,124 ----
      virtual ~wxLuaDebugData();
  
+     // fill this with the stack entries for the wxLuaState
+     //   returns the number of stack entries added
+     int BuildStack(const wxLuaState& wxlState);
+     int BuildStackList(const wxLuaState& wxlState, int stackRef, wxArrayInt& references);
+     int BuildTableList(const wxLuaState& wxlState, int nRef, int nEntry, wxArrayInt& references);
+ 
+     static wxString MakeNumber(double dnum);
+     static wxString MakeBoolean(int num);
+     static wxString GetTableInfo(const wxLuaState& wxlState, int index);
+     static wxString GetUserDataInfo(const wxLuaState& wxlState, int index, bool full = true);
+ 
      wxLuaDebugData *Clone() const;
      static int SortFunction(wxLuaDebugDataItem *elem1, wxLuaDebugDataItem *elem2 );
***************
*** 134,143 ****
      int Ref();
  
-     wxString GetTableInfo(int index);
-     wxString GetUserDataInfo(int index, bool full = true);
- 
-     static wxString MakeNumber(double dnum);
-     static wxString MakeBoolean(int num);
- 
      wxLuaState m_wxlState;
      wxArrayInt m_references;
--- 145,148 ----

[Wxlua-commit] wxLua/modules/wxluasocket/src Makefile,1.4,1.5 dservice.cpp,1.5,1.6 wxldserv.cpp,1.4,1.5 wxldtarg.cpp,1.4,1.5

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

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

Modified Files:
	Makefile dservice.cpp wxldserv.cpp wxldtarg.cpp 
Log Message:
Make wxLuaDebugData have functions to BuildStack, BuildStackList, BuildTableList
   These replace the same functions in wxLuaInterface
   Replaces EnumerateStack, EnumerateStackEntry, EnumerateTable in wxLuaTarget and wxLuaDebugee
   moved helper functions MakeNumber, MakeBoolean, GetTableInfo, GetUserDataInfo as well


Index: wxldtarg.cpp
===================================================================
RCS file: /cvsroot/wxlua/wxLua/modules/wxluasocket/src/wxldtarg.cpp,v
retrieving revision 1.4
retrieving revision 1.5
diff -C2 -d -r1.4 -r1.5
*** wxldtarg.cpp	1 Dec 2005 04:17:29 -0000	1.4
--- wxldtarg.cpp	1 Dec 2005 06:43:54 -0000	1.5
***************
*** 415,457 ****
  {
      wxLuaDebugData *pSortedList = new wxLuaDebugData();
!     if (pSortedList != NULL)
!     {
!         int       nIndex = 0;
!         bool      fFirst = true;
!         lua_Debug luaDebug;
!         lua_State* L = m_wxlState.GetLuaState();
! 
!         wxLuaHandler::GetHandler().EnterLuaCriticalSection();
! 
!         while (lua_getstack(L, nIndex, &luaDebug) != 0)
!         {
!             if (lua_getinfo(L, "Sln", &luaDebug))
!             {
!                 wxString stackItem;
! 
!                 // skip stack frames that do not have line number
!                 int  currentLine = luaDebug.currentline;
!                 if (!fFirst || (currentLine != -1))
!                 {
!                     if (currentLine == -1)
!                         currentLine = 0;
! 
!                     if (luaDebug.name != NULL)
!                         stackItem.Printf(wxT("function %s line %u"), luaDebug.name, currentLine);
!                     else
!                         stackItem.Printf(wxT("line %u"), currentLine);
! 
!                     wxLuaDebugDataItem *item = new wxLuaDebugDataItem(stackItem, wxT(""), wxT(""), wxT(""), nIndex, 0);
!                     if (item != NULL)
!                         pSortedList->Add(item);
  
!                     fFirst = false;
!                 }
!             }
  
-             ++nIndex;
-         }
-         wxLuaHandler::GetHandler().LeaveLuaCriticalSection();
-     }
      return NotifyStackEnumeration(pSortedList);
  }
--- 415,425 ----
  {
      wxLuaDebugData *pSortedList = new wxLuaDebugData();
!     if (pSortedList == NULL)
!         return false;
  
!     wxLuaHandler::GetHandler().EnterLuaCriticalSection();
!     pSortedList->BuildStack(m_wxlState);
!     wxLuaHandler::GetHandler().LeaveLuaCriticalSection();
  
      return NotifyStackEnumeration(pSortedList);
  }
***************
*** 460,555 ****
  {
      wxLuaDebugData *pSortedList = new wxLuaDebugData;
!     if (pSortedList != NULL)
!     {
!         wxLuaHandler::GetHandler().EnterLuaCriticalSection();
!         {
!             lua_State* L = m_wxlState.GetLuaState();
!             lua_Debug luaDebug;
!             if (lua_getstack(L, stackRef, &luaDebug) != 0)
!             {
!                 int idx  = 1;
!                 wxString name = lua2wx(lua_getlocal(L, &luaDebug, idx));
!                 while (!name.IsEmpty())
!                 {
!                     bool fIsTable = false;
!                     wxString type;
!                     wxString value;
! 
!                     switch (lua_type(L, -1))
!                     {
!                         case LUA_TNIL:
!                             type  = wxT("Nil");
!                             value = wxT("nil");
!                             break;
! 
!                         case LUA_TBOOLEAN:
!                             type = wxT("Boolean");
!                             value = MakeBoolean(lua_toboolean(L, -1));
!                             break;
! 
!                         case LUA_TNUMBER:
!                             type = wxT("Number");
!                             value = MakeNumber(lua_tonumber(L, -1));
!                             break;
! 
!                         case LUA_TSTRING:
!                             type  = wxT("String");
!                             value = lua2wx(lua_tostring(L, -1));
!                             break;
! 
!                         case LUA_TTABLE:
!                             type  = wxT("Table");
!                             value = GetTableInfo(-1);
!                             fIsTable = true;
!                             break;
! 
!                         case LUA_TFUNCTION:
!                             if (lua_iscfunction(L, -1))
!                             {
!                                 type  = wxT("C Function");
!                                 value.Printf(wxT("%p"), lua_tocfunction(L, -1));
!                             }
!                             else
!                             {
!                                 type = wxT("Lua Function");
!                                 value.Printf(wxT("%p"), lua_topointer(L, -1));
!                             }
!                             break;
! 
!                         case LUA_TUSERDATA:
!                             type  = wxT("User Data");
!                             value = GetUserDataInfo(-1);
!                             break;
! 
!                         case LUA_TLIGHTUSERDATA:
!                             type  = wxT("Light User Data");
!                             value = GetUserDataInfo(-1, false);
!                             break;
! 
!                         case LUA_TTHREAD:
!                             type = wxT("Thread");
!                             value.Printf(wxT("%p"), lua_topointer(L, -1));
!                             break;
!                     }
! 
!                     int nRef = LUA_NOREF;
! 
!                     if (lua_istable(L, -1))
!                     {
!                         lua_pushvalue(L, -1);
!                         nRef = m_wxlState.tinsert(-1);
!                         m_references.Add(nRef);
!                     }
  
!                     wxLuaDebugDataItem *item = new wxLuaDebugDataItem(name, type, value, wxT(""), nRef, 0);
!                     if (item != NULL)
!                         pSortedList->Add(item);
  
-                     name = lua2wx(lua_getlocal(L, &luaDebug, ++idx));
-                 }
-             }
-         }
-         wxLuaHandler::GetHandler().LeaveLuaCriticalSection();
-     }
      return NotifyStackEntryEnumeration(stackRef, pSortedList);
  }
--- 428,438 ----
  {
      wxLuaDebugData *pSortedList = new wxLuaDebugData;
!     if (pSortedList == NULL)
!         return false;
  
!     wxLuaHandler::GetHandler().EnterLuaCriticalSection();
!     pSortedList->BuildStackList(m_wxlState, stackRef, m_references);
!     wxLuaHandler::GetHandler().LeaveLuaCriticalSection();
  
      return NotifyStackEntryEnumeration(stackRef, pSortedList);
  }
***************
*** 558,716 ****
  {
      wxLuaDebugData *pSortedList = new wxLuaDebugData();
!     if (pSortedList != NULL)
!     {
!         wxLuaHandler::GetHandler().EnterLuaCriticalSection();
!         {
!             lua_State* L = m_wxlState.GetLuaState();
! 
!             if (tableRef == -1)
!             {
!                 lua_pushvalue(L, LUA_GLOBALSINDEX);
!                 int nRef = m_wxlState.tinsert(-1);
!                 pSortedList->Add(new wxLuaDebugDataItem(wxT("Globals"),
!                                                wxT(""),
!                                                wxT(""),
!                                                wxT(""),
!                                                nRef,
!                                                0));
!                 m_references.Add(nRef);
!             }
!             else
!             {
!                 if (m_wxlState.tget(tableRef) != 0)
!                 {
!                     int nTop = lua_gettop(L);
! 
!                     // start iterating
!                     lua_pushnil(L);
!                     while (lua_next(L, nTop) != 0)
!                     {
!                         bool fIsTable = false;
!                         wxString type;
!                         wxString value;
!                         wxString name;
! 
!                         // get the index
!                         switch (lua_type(L, -2))
!                         {
!                             case LUA_TNIL:
!                                 name = wxT("Nil");
!                                 break;
! 
!                             case LUA_TBOOLEAN:
!                                 name = MakeBoolean(lua_toboolean(L, -2));
!                                 break;
! 
!                             case LUA_TNUMBER:
!                                 name = MakeNumber(lua_tonumber(L, -2));
!                                 break;
! 
!                             case LUA_TSTRING:
!                                 name = lua2wx(lua_tostring(L, -2));
!                                 break;
! 
!                             case LUA_TTABLE:
!                                 name = GetTableInfo(-2);
!                                 break;
! 
!                             case LUA_TFUNCTION:
!                                 if (lua_iscfunction(L, -2))
!                                     name.Printf(wxT("%p"), lua_tocfunction(L, -2));
!                                 else
!                                     name.Printf(wxT("%p"), lua_topointer(L, -2));
!                                 break;
! 
!                             case LUA_TUSERDATA:
!                                 name = GetUserDataInfo(-2);
!                                 break;
! 
!                             case LUA_TLIGHTUSERDATA:
!                                 name = GetUserDataInfo(-2, false);
!                                 break;
! 
!                             case LUA_TTHREAD:
!                                 name.Printf(wxT("%p"), lua_topointer(L, -2));
!                                 break;
!                         }
! 
!                         // get the value
!                         switch (lua_type(L, -1))
!                         {
!                             case LUA_TNIL:
!                                 type  = wxT("Nil");
!                                 value = wxT("nil");
!                                 break;
! 
!                             case LUA_TBOOLEAN:
!                                 value = MakeBoolean(lua_toboolean(L, -1));
!                                 type = wxT("Boolean");
!                                 break;
! 
!                             case LUA_TNUMBER:
!                                 value = MakeNumber(lua_tonumber(L, -1));
!                                 type = wxT("Number");
!                                 break;
! 
!                             case LUA_TSTRING:
!                                 type  = wxT("String");
!                                 value = lua2wx(lua_tostring(L, -1));
!                                 break;
! 
!                             case LUA_TTABLE:
!                                 type  = wxT("Table");
!                                 value = GetTableInfo(-1);
!                                 fIsTable = true;
!                                 break;
! 
!                             case LUA_TFUNCTION:
!                                 if (lua_iscfunction(L, -1))
!                                 {
!                                     type  = wxT("C Function");
!                                     value.Printf(wxT("%p"), lua_tocfunction(L, -1));
!                                 }
!                                 else
!                                 {
!                                     type = wxT("Lua Function");
!                                     value.Printf(wxT("%p"), lua_topointer(L, -1));
!                                 }
!                                 break;
! 
!                             case LUA_TUSERDATA:
!                                 type  = wxT("User Data");
!                                 value = GetUserDataInfo(-1);
!                                 break;
! 
!                             case LUA_TLIGHTUSERDATA:
!                                 type  = wxT("Light User Data");
!                                 value = GetUserDataInfo(-1, false);
!                                 break;
! 
!                             case LUA_TTHREAD:
!                                 type = wxT("Thread");
!                                 value.Printf(wxT("%p"), lua_topointer(L, -1));
!                                 break;
!                         }
! 
!                         int nRef = LUA_NOREF;
!                         if (fIsTable)
!                         {
!                             nRef = m_wxlState.tinsert(-1);
!                             m_references.Add(nRef);
!                         }
!                         else
!                             lua_pop(L, 1);
  
!                         wxLuaDebugDataItem *item = new wxLuaDebugDataItem(name, type, value, wxT(""), nRef, nIndex);
!                         if (item != NULL)
!                             pSortedList->Add(item);
!                     }
  
-                     // remove reference
-                     lua_pop(L, 1);
-                 }
-             }
-         }
-         wxLuaHandler::GetHandler().LeaveLuaCriticalSection();
-     }
      return NotifyTableEnumeration(nItemNode, pSortedList);
  }
--- 441,451 ----
  {
      wxLuaDebugData *pSortedList = new wxLuaDebugData();
!     if (pSortedList == NULL)
!         return false;
  
!     wxLuaHandler::GetHandler().EnterLuaCriticalSection();
!     pSortedList->BuildTableList(m_wxlState, tableRef, nIndex, m_references);
!     wxLuaHandler::GetHandler().LeaveLuaCriticalSection();
  
      return NotifyTableEnumeration(nItemNode, pSortedList);
  }
***************
*** 810,818 ****
  
                  case LUA_TBOOLEAN:
!                     strResult = MakeBoolean(lua_toboolean(L, -1));
                      break;
  
                  case LUA_TNUMBER:
!                     strResult = MakeNumber(lua_tonumber(L, -1));
                      break;
  
--- 545,553 ----
  
                  case LUA_TBOOLEAN:
!                     strResult = wxLuaDebugData::MakeBoolean(lua_toboolean(L, -1));
                      break;
  
                  case LUA_TNUMBER:
!                     strResult = wxLuaDebugData::MakeNumber(lua_tonumber(L, -1));
                      break;
  
***************
*** 888,910 ****
  }
  
- wxString wxLuaDebugTarget::MakeNumber(double dnum)
- {
-     long num = (long) dnum;
-     if ((double) num == dnum)
-     {
-         if (num >= 0)
-             return wxString::Format(wxT("%lu (0x%lx)"), num, num);
- 
-         return wxString::Format(wxT("%ld (0x%lx)"), num, num);
-     }
- 
-     return wxString::Format(wxT("%g"), dnum);
- }
- 
- wxString wxLuaDebugTarget::MakeBoolean(int num)
- {
-     return num != 0 ? wxT("True") : wxT("False");
- }
- 
  bool wxLuaDebugTarget::NotifyBreak(const wxString &fileName, int lineNumber)
  {
--- 623,626 ----

Index: dservice.cpp
===================================================================
RCS file: /cvsroot/wxlua/wxLua/modules/wxluasocket/src/dservice.cpp,v
retrieving revision 1.5
retrieving revision 1.6
diff -C2 -d -r1.5 -r1.6
*** dservice.cpp	1 Dec 2005 04:17:29 -0000	1.5
--- dservice.cpp	1 Dec 2005 06:43:54 -0000	1.6
***************
*** 34,39 ****
  
  #include "wxluasocket/include/dservice.h"
  
! #include <wx/listimpl.cpp>
  
  static const char *debugName = "__wxLuaDebug__";
--- 34,40 ----
  
  #include "wxluasocket/include/dservice.h"
+ #include "wxluasocket/include/wxlhandl.h"
  
! #include "wx/listimpl.cpp"
  
  static const char *debugName = "__wxLuaDebug__";
***************
*** 144,148 ****
      wxLuaDebugData *pSortedList = new wxLuaDebugData();
  
!     size_t idx, idxMax;
      m_Socket->Read((char *) &idxMax, sizeof(idxMax));
  
--- 145,149 ----
      wxLuaDebugData *pSortedList = new wxLuaDebugData();
  
!     size_t idx, idxMax = 0;
      m_Socket->Read((char *) &idxMax, sizeof(idxMax));
  
***************
*** 451,455 ****
          if (debugSocket && debuggee)
          {
!             debugCommands debugCommand = (debugCommands)debugSocket->ReadByte();
              switch(debugCommand)
              {
--- 452,456 ----
          if (debugSocket && debuggee)
          {
!             wxLuaDebugCommands_Type debugCommand = (wxLuaDebugCommands_Type)debugSocket->ReadByte();
              switch(debugCommand)
              {
***************
*** 1117,1121 ****
  
      return (m_debuggerSocket->WriteByte(wxLUA_CMD_ADD_BREAKPOINT) &&
!             m_debuggerSocket->WriteString(fileName)         &&
              m_debuggerSocket->WriteInt(lineNumber));
  }
--- 1118,1122 ----
  
      return (m_debuggerSocket->WriteByte(wxLUA_CMD_ADD_BREAKPOINT) &&
!             m_debuggerSocket->WriteString(fileName) &&
              m_debuggerSocket->WriteInt(lineNumber));
  }
***************
*** 1127,1131 ****
  
      return (m_debuggerSocket->WriteByte(wxLUA_CMD_REMOVE_BREAKPOINT) &&
!             m_debuggerSocket->WriteString(fileName)            &&
              m_debuggerSocket->WriteInt(lineNumber));
  }
--- 1128,1132 ----
  
      return (m_debuggerSocket->WriteByte(wxLUA_CMD_REMOVE_BREAKPOINT) &&
!             m_debuggerSocket->WriteString(fileName) &&
              m_debuggerSocket->WriteInt(lineNumber));
  }
***************
*** 1137,1141 ****
  
      return (m_debuggerSocket->WriteByte(wxLUA_CMD_DISABLE_BREAKPOINT) &&
!             m_debuggerSocket->WriteString(fileName)         &&
              m_debuggerSocket->WriteInt(lineNumber));
  }
--- 1138,1142 ----
  
      return (m_debuggerSocket->WriteByte(wxLUA_CMD_DISABLE_BREAKPOINT) &&
!             m_debuggerSocket->WriteString(fileName) &&
              m_debuggerSocket->WriteInt(lineNumber));
  }
***************
*** 1147,1151 ****
  
      return (m_debuggerSocket->WriteByte(wxLUA_CMD_ENABLE_BREAKPOINT) &&
!             m_debuggerSocket->WriteString(fileName)         &&
              m_debuggerSocket->WriteInt(lineNumber));
  }
--- 1148,1152 ----
  
      return (m_debuggerSocket->WriteByte(wxLUA_CMD_ENABLE_BREAKPOINT) &&
!             m_debuggerSocket->WriteString(fileName) &&
              m_debuggerSocket->WriteInt(lineNumber));
  }
***************
*** 1230,1235 ****
  
      return (m_debuggerSocket->WriteByte(wxLUA_CMD_ENUMERATE_TABLE_REF) &&
!             m_debuggerSocket->WriteInt(tableRef)                 &&
!             m_debuggerSocket->WriteInt(nIndex)                   &&
              m_debuggerSocket->WriteInt(nItemNode));
  }
--- 1231,1236 ----
  
      return (m_debuggerSocket->WriteByte(wxLUA_CMD_ENUMERATE_TABLE_REF) &&
!             m_debuggerSocket->WriteInt(tableRef) &&
!             m_debuggerSocket->WriteInt(nIndex)   &&
              m_debuggerSocket->WriteInt(nItemNode));
  }
***************
*** 1259,1263 ****
  wxLuaDebuggee::wxLuaDebuggee(wxLuaDebugService* debugService, lua_State* luaState) :
      m_debugService(debugService),
!     m_luaState(luaState),
      m_breakPointList(wxKEY_STRING),
      m_forceBreak(false),
--- 1260,1264 ----
  wxLuaDebuggee::wxLuaDebuggee(wxLuaDebugService* debugService, lua_State* luaState) :
      m_debugService(debugService),
!     m_wxlState(luaState),
      m_breakPointList(wxKEY_STRING),
      m_forceBreak(false),
***************
*** 1268,1278 ****
      m_Wait(false)
  {
!     lua_pushlightuserdata(m_luaState, this);
!     lua_setglobal(m_luaState, debugName);
  
!     lua_sethook(m_luaState, LuaDebugHook, LUA_MASKCALL | LUA_MASKLINE | LUA_MASKRET, 0);
  
!     lua_pushcfunction(m_luaState, LuaPrint);
!     lua_setglobal(m_luaState, "print");
  
      wxLuaHandler::GetHandler().EnterLuaCriticalSection();
--- 1269,1280 ----
      m_Wait(false)
  {
!     lua_State* L = m_wxlState.GetLuaState();
!     lua_pushlightuserdata(L, this);
!     lua_setglobal(L, debugName);
  
!     lua_sethook(L, LuaDebugHook, LUA_MASKCALL | LUA_MASKLINE | LUA_MASKRET, 0);
  
!     lua_pushcfunction(L, LuaPrint);
!     lua_setglobal(L, "print");
  
      wxLuaHandler::GetHandler().EnterLuaCriticalSection();
***************
*** 1297,1303 ****
  
      // Unhook
!     lua_sethook(m_luaState, LuaDebugHook, 0, 0);
! 
! 
  }
  
--- 1299,1303 ----
  
      // Unhook
!     lua_sethook(m_wxlState.GetLuaState(), LuaDebugHook, 0, 0);
  }
  
***************
*** 1360,1364 ****
                      {
                          int      lineNumber = 0;
!                         wxFileName fileName   = GetDebugInfo(lineNumber);
  
                          if (m_debugService->NotifyBreak(fileName, lineNumber))
--- 1360,1364 ----
                      {
                          int      lineNumber = 0;
!                         wxFileName fileName = GetDebugInfo(lineNumber);
  
                          if (m_debugService->NotifyBreak(fileName, lineNumber))
***************
*** 1371,1375 ****
                      {
                          int      lineNumber = 0;
!                         wxFileName fileName   = GetDebugInfo(lineNumber);
  
                          if (m_debugService->NotifyBreak(fileName, lineNumber))
--- 1371,1375 ----
                      {
                          int      lineNumber = 0;
!                         wxFileName fileName = GetDebugInfo(lineNumber);
  
                          if (m_debugService->NotifyBreak(fileName, lineNumber))
***************
*** 1382,1386 ****
                      {
                          int      lineNumber = 0;
!                         wxFileName fileName   = GetDebugInfo(lineNumber);
  
                          if (AtBreakPoint(fileName, lineNumber) &&
--- 1382,1386 ----
                      {
                          int      lineNumber = 0;
!                         wxFileName fileName = GetDebugInfo(lineNumber);
  
                          if (AtBreakPoint(fileName, lineNumber) &&
***************
*** 1445,1449 ****
      {
          int iItem = m_references.Item(idx);
!         tremove(m_luaState, iItem);
      }
  }
--- 1445,1449 ----
      {
          int iItem = m_references.Item(idx);
!         m_wxlState.tremove(iItem);
      }
  }
***************
*** 1459,1463 ****
      {
          LuaBreakPoint* breakPoint = new LuaBreakPoint(fileName, lineNumber);
- 
          m_breakPointList.Append(breakPointKey, breakPoint);
  
--- 1459,1462 ----
***************
*** 1486,1490 ****
      {
          LuaBreakPoint* breakPoint = node->GetData();
- 
          m_breakPointList.DeleteNode(node);
  
--- 1485,1488 ----
***************
*** 1583,1627 ****
  {
      wxLuaDebugData *pSortedList = new wxLuaDebugData();
!     if (pSortedList != NULL)
!     {
!         int       nIndex = 0;
!         bool      fFirst = true;
!         lua_Debug luaDebug;
! 
!         wxLuaHandler::GetHandler().EnterLuaCriticalSection();
! 
!         while (lua_getstack(m_luaState, nIndex, &luaDebug) != 0)
!         {
!             if (lua_getinfo(m_luaState, "Sln", &luaDebug))
!             {
!                 wxString name = lua2wx(luaDebug.name);
!                 wxString source = lua2wx(luaDebug.source);
! 
!                 wxString stackItem;
! 
!                 // skip stack frames that do not have line number
!                 int  currentLine = luaDebug.currentline;
!                 if (!fFirst || currentLine != -1)
!                 {
!                     if (currentLine == -1)
!                         currentLine = 0;
! 
!                     if (luaDebug.name != NULL)
!                         stackItem = wxString::Format(_("function %s line %u"), name.c_str(), currentLine);
!                     else
!                         stackItem = wxString::Format(_("line %u"), currentLine);
! 
!                     wxLuaDebugDataItem *item = new wxLuaDebugDataItem(stackItem, wxT(""), wxT(""), source, nIndex, 0);
!                     if (item != NULL)
!                         pSortedList->Add(item);
! 
!                     fFirst = false;
!                 }
!             }
  
!             ++nIndex;
!         }
!         wxLuaHandler::GetHandler().LeaveLuaCriticalSection();
!     }
  
      return m_debugService->NotifyStackEnumeration(pSortedList);
--- 1581,1590 ----
  {
      wxLuaDebugData *pSortedList = new wxLuaDebugData();
!     if (pSortedList == NULL)
!         return false;
  
!     wxLuaHandler::GetHandler().EnterLuaCriticalSection();
!     pSortedList->BuildStack(m_wxlState);
!     wxLuaHandler::GetHandler().LeaveLuaCriticalSection();
  
      return m_debugService->NotifyStackEnumeration(pSortedList);
***************
*** 1631,1726 ****
  {
      wxLuaDebugData *pSortedList = new wxLuaDebugData;
!     if (pSortedList != NULL)
!     {
!         wxLuaHandler::GetHandler().EnterLuaCriticalSection();
!         {
!             lua_Debug luaDebug;
!             if (lua_getstack(m_luaState, stackRef, &luaDebug) != 0)
!             {
!                 int idx  = 1;
!                 wxString name = lua2wx(lua_getlocal(m_luaState, &luaDebug, idx));
!                 while (!name.IsEmpty())
!                 {
!                     bool fIsTable = false;
!                     wxString type;
!                     wxString value;
!                     wxString source = lua2wx(luaDebug.source);
! 
!                     switch (lua_type(m_luaState, -1))
!                     {
!                         case LUA_TNIL:
!                             type  = wxT("Nil");
!                             value = wxT("nil");
!                             break;
! 
!                         case LUA_TBOOLEAN:
!                             type = wxT("Boolean");
!                             value = MakeBoolean(lua_toboolean(m_luaState, -1));
!                             break;
! 
!                         case LUA_TNUMBER:
!                             type = wxT("Number");
!                             value = MakeNumber(lua_tonumber(m_luaState, -1));
!                             break;
! 
!                         case LUA_TSTRING:
!                             type  = wxT("String");
!                             value = lua2wx(lua_tostring(m_luaState, -1));
!                             break;
! 
!                         case LUA_TTABLE:
!                             type  = wxT("Table");
!                             value = GetTableInfo(-1);
!                             fIsTable = true;
!                             break;
! 
!                         case LUA_TFUNCTION:
!                             if (lua_iscfunction(m_luaState, -1))
!                             {
!                                 type  = wxT("C Function");
!                                 value.Printf(wxT("%p"), lua_tocfunction(m_luaState, -1));
!                             }
!                             else
!                             {
!                                 type = wxT("Lua Function");
!                                 value.Printf(wxT("%p"), lua_topointer(m_luaState, -1));
!                             }
!                             break;
! 
!                         case LUA_TUSERDATA:
!                             type  = wxT("User Data");
!                             value = GetUserDataInfo(-1);
!                             break;
! 
!                         case LUA_TLIGHTUSERDATA:
!                             type  = wxT("Light User Data");
!                             value = GetUserDataInfo(-1, false);
!                             break;
! 
!                         case LUA_TTHREAD:
!                             type = wxT("Thread");
!                             value.Printf(wxT("%p"), lua_topointer(m_luaState, -1));
!                             break;
!                     }
! 
!                     int nRef = LUA_NOREF;
! 
!                     if (lua_istable(m_luaState, -1))
!                     {
!                         lua_pushvalue(m_luaState, -1);
!                         nRef = tinsert(m_luaState, -1);
!                         m_references.Add(nRef);
!                     }
! 
!                     wxLuaDebugDataItem *item = new wxLuaDebugDataItem(name, type, value, source, nRef, 0);
!                     if (item != NULL)
!                         pSortedList->Add(item);
  
!                     name = lua2wx(lua_getlocal(m_luaState, &luaDebug, ++idx));
!                 }
!             }
!         }
!         wxLuaHandler::GetHandler().LeaveLuaCriticalSection();
!     }
  
      return m_debugService->NotifyStackEntryEnumeration(stackRef, pSortedList);
--- 1594,1603 ----
  {
      wxLuaDebugData *pSortedList = new wxLuaDebugData;
!     if (pSortedList == NULL)
!         return false;
  
!     wxLuaHandler::GetHandler().EnterLuaCriticalSection();
!     pSortedList->BuildStackList(m_wxlState, stackRef, m_references);
!     wxLuaHandler::GetHandler().LeaveLuaCriticalSection();
  
      return m_debugService->NotifyStackEntryEnumeration(stackRef, pSortedList);
***************
*** 1730,1887 ****
  {
      wxLuaDebugData *pSortedList = new wxLuaDebugData();
!     if (pSortedList != NULL)
!     {
!         wxLuaHandler::GetHandler().EnterLuaCriticalSection();
!         {
!             if (tableRef == -1)
!             {
!                 lua_pushvalue(m_luaState, LUA_GLOBALSINDEX);
!                 int nRef = tinsert(m_luaState, -1);
!                 pSortedList->Add(new wxLuaDebugDataItem(wxT("Globals"),
!                                                wxT(""),
!                                                wxT(""),
!                                                wxT(""),
!                                                nRef,
!                                                0));
!                 m_references.Add(nRef);
!             }
!             else
!             {
!                 if (tget(m_luaState, tableRef) != 0)
!                 {
!                     int nTop = lua_gettop(m_luaState);
! 
!                     // start iterating
!                     lua_pushnil(m_luaState);
!                     while (lua_next(m_luaState, nTop) != 0)
!                     {
!                         bool fIsTable = false;
!                         wxString type;
!                         wxString value;
!                         wxString name;
!                         wxString source;
! 
!                         // get the index
!                         switch (lua_type(m_luaState, -2))
!                         {
!                             case LUA_TNIL:
!                                 name = wxT("Nil");
!                                 break;
! 
!                             case LUA_TBOOLEAN:
!                                 name = MakeBoolean(lua_toboolean(m_luaState, -2));
!                                 break;
! 
!                             case LUA_TNUMBER:
!                                 name = MakeNumber(lua_tonumber(m_luaState, -2));
!                                 break;
! 
!                             case LUA_TSTRING:
!                                 name = lua2wx(lua_tostring(m_luaState, -2));
!                                 break;
! 
!                             case LUA_TTABLE:
!                                 name = GetTableInfo(-2);
!                                 break;
! 
!                             case LUA_TFUNCTION:
!                                 if (lua_iscfunction(m_luaState, -2))
!                                     name.Printf(wxT("%p"), lua_tocfunction(m_luaState, -2));
!                                 else
!                                     name.Printf(wxT("%p"), lua_topointer(m_luaState, -2));
!                                 break;
! 
!                             case LUA_TUSERDATA:
!                                 name = GetUserDataInfo(-2);
!                                 break;
! 
!                             case LUA_TLIGHTUSERDATA:
!                                 name = GetUserDataInfo(-2, false);
!                                 break;
! 
!                             case LUA_TTHREAD:
!                                 name.Printf(wxT("%p"), lua_topointer(m_luaState, -2));
!                                 break;
!                         }
! 
!                         // get the value
!                         switch (lua_type(m_luaState, -1))
!                         {
!                             case LUA_TNIL:
!                                 type  = wxT("Nil");
!                                 value = wxT("nil");
!                                 break;
! 
!                             case LUA_TBOOLEAN:
!                                 value = MakeBoolean(lua_toboolean(m_luaState, -1));
!                                 type = wxT("Boolean");
!                                 break;
! 
!                             case LUA_TNUMBER:
!                                 value = MakeNumber(lua_tonumber(m_luaState, -1));
!                                 type = wxT("Number");
!                                 break;
! 
!                             case LUA_TSTRING:
!                                 type  = wxT("String");
!                                 value = lua2wx(lua_tostring(m_luaState, -1));
!                                 break;
! 
!                             case LUA_TTABLE:
!                                 type  = wxT("Table");
!                                 value = GetTableInfo(-1);
!                                 fIsTable = true;
!                                 break;
! 
!                             case LUA_TFUNCTION:
!                                 if (lua_iscfunction(m_luaState, -1))
!                                 {
!                                     type  = wxT("C Function");
!                                     value.Printf(wxT("%p"), lua_tocfunction(m_luaState, -1));
!                                 }
!                                 else
!                                 {
!                                     type = wxT("Lua Function");
!                                     value.Printf(wxT("%p"), lua_topointer(m_luaState, -1));
!                                 }
!                                 break;
! 
!                             case LUA_TUSERDATA:
!                                 type  = wxT("User Data");
!                                 value = GetUserDataInfo(-1);
!                                 break;
! 
!                             case LUA_TLIGHTUSERDATA:
!                                 type  = wxT("Light User Data");
!                                 value = GetUserDataInfo(-1, false);
!                                 break;
! 
!                             case LUA_TTHREAD:
!                                 type = wxT("Thread");
!                                 value.Printf(wxT("%p"), lua_topointer(m_luaState, -1));
!                                 break;
!                         }
! 
!                         int nRef = LUA_NOREF;
!                         if (fIsTable)
!                         {
!                             nRef = tinsert(m_luaState, -1);
!                             m_references.Add(nRef);
!                         }
!                         else
!                             lua_pop(m_luaState, 1);
! 
!                         wxLuaDebugDataItem *item = new wxLuaDebugDataItem(name, type, value, source, nRef, nIndex);
!                         if (item != NULL)
!                             pSortedList->Add(item);
!                     }
  
!                     // remove reference
!                     lua_pop(m_luaState, 1);
!                 }
!             }
!         }
!         wxLuaHandler::GetHandler().LeaveLuaCriticalSection();
!     }
  
      return m_debugService->NotifyTableEnumeration(nItemNode, pSortedList);
--- 1607,1616 ----
  {
      wxLuaDebugData *pSortedList = new wxLuaDebugData();
!     if (pSortedList == NULL)
!         return false;
  
!     wxLuaHandler::GetHandler().EnterLuaCriticalSection();
!     pSortedList->BuildTableList(m_wxlState, tableRef, nIndex, m_references);
!     wxLuaHandler::GetHandler().LeaveLuaCriticalSection();
  
      return m_debugService->NotifyTableEnumeration(nItemNode, pSortedList);
***************
*** 1895,1937 ****
      wxLuaHandler::GetHandler().EnterLuaCriticalSection();
      {
          if (wxStrpbrk(strExpr.c_str(), wxT(" ~=<>+-*/%(){}[]:;,.\"'")) != NULL)
          {
              // an expression
!             int nOldTop = lua_gettop(m_luaState);
  
              LuaCharBuffer charbuf(strExpr);
!             int nResult = luaL_loadbuffer(m_luaState, charbuf.GetData(), charbuf.Length(), "debug");
  
              if (nResult == 0)
!                 nResult = lua_pcall(m_luaState, 0, LUA_MULTRET, 0);  /* call main */
  
              switch (nResult)
              {
                  default:
!                     if (lua_gettop(m_luaState) == nOldTop)
                      {
!                         lua_pushliteral(m_luaState, "OK");
                      }
                      break;
  
                  case LUA_ERRRUN:
!                     lua_pushliteral(m_luaState, "Error while running the chunk");
                      break;
  
                  case LUA_ERRSYNTAX:
!                     lua_pushliteral(m_luaState, "Syntax error during pre-compilation");
                      break;
  
                  case LUA_ERRMEM:
!                     lua_pushliteral(m_luaState, "Memory allocation error");
                      break;
  
                  case LUA_ERRERR:
!                     lua_pushliteral(m_luaState, "Unexpected error occurred while running the error message handler");
                      break;
              }
  
!             nReference = tinsert(m_luaState, -1);
!             lua_settop(m_luaState, nOldTop);
          }
          else
--- 1624,1668 ----
      wxLuaHandler::GetHandler().EnterLuaCriticalSection();
      {
+         lua_State* L = m_wxlState.GetLuaState();
+ 
          if (wxStrpbrk(strExpr.c_str(), wxT(" ~=<>+-*/%(){}[]:;,.\"'")) != NULL)
          {
              // an expression
!             int nOldTop = lua_gettop(L);
  
              LuaCharBuffer charbuf(strExpr);
!             int nResult = luaL_loadbuffer(L, charbuf.GetData(), charbuf.Length(), "debug");
  
              if (nResult == 0)
!                 nResult = lua_pcall(L, 0, LUA_MULTRET, 0);  /* call main */
  
              switch (nResult)
              {
                  default:
!                     if (lua_gettop(L) == nOldTop)
                      {
!                         lua_pushliteral(L, "OK");
                      }
                      break;
  
                  case LUA_ERRRUN:
!                     lua_pushliteral(L, "Error while running the chunk");
                      break;
  
                  case LUA_ERRSYNTAX:
!                     lua_pushliteral(L, "Syntax error during pre-compilation");
                      break;
  
                  case LUA_ERRMEM:
!                     lua_pushliteral(L, "Memory allocation error");
                      break;
  
                  case LUA_ERRERR:
!                     lua_pushliteral(L, "Unexpected error occurred while running the error message handler");
                      break;
              }
  
!             nReference = m_wxlState.tinsert(-1);
!             lua_settop(L, nOldTop);
          }
          else
***************
*** 1941,1958 ****
               bool      fFound = false;
  
!              while (lua_getstack(m_luaState, iLevel++, &ar) != 0)
               {
                  int    iIndex = 0;
!                 wxString name = lua2wx(lua_getlocal(m_luaState, &ar, ++iIndex));
                  while (!name.IsEmpty())
                  {
                      if (strExpr == name)
                      {
!                         nReference = tinsert(m_luaState, -1);
                          fFound = true;
                          break;
                      }
                      else
!                         lua_pop(m_luaState, 1);
                  }
  
--- 1672,1689 ----
               bool      fFound = false;
  
!              while (lua_getstack(L, iLevel++, &ar) != 0)
               {
                  int    iIndex = 0;
!                 wxString name = lua2wx(lua_getlocal(L, &ar, ++iIndex));
                  while (!name.IsEmpty())
                  {
                      if (strExpr == name)
                      {
!                         nReference = m_wxlState.tinsert(-1);
                          fFound = true;
                          break;
                      }
                      else
!                         lua_pop(L, 1);
                  }
  
***************
*** 1960,1997 ****
                      break;
  
!                 name = lua2wx(lua_getlocal(m_luaState, &ar, ++iIndex));
               }
  
               if (!fFound)
               {
!                   int nOldTop = lua_gettop(m_luaState);
!                   lua_pushvalue(m_luaState, LUA_GLOBALSINDEX);
!                   lua_pushnil(m_luaState);
!                   while (lua_next(m_luaState, -2) != 0)
                    {
!                       if (lua_type(m_luaState, -2) == LUA_TSTRING)
                        {
!                           wxString name = lua2wx(lua_tostring(m_luaState, -2));
                            if (strExpr == name)
                            {
!                               nReference = tinsert(m_luaState, -1); // reference value and pop it.
!                               lua_pop(m_luaState, 1);   // pop index
                                fFound = true;
                                break;
                            }
                            else
!                               lua_pop(m_luaState, 1);  // removes `value';
                        }
                        else
!                           lua_pop(m_luaState, 1);  // removes `value';
                    }
!                   lua_settop(m_luaState, nOldTop); // the table of globals.
               }
          }
  
!         if (nReference != LUA_NOREF && tget(m_luaState, nReference) != 0)
          {
!             tremove(m_luaState, nReference);
!             switch (lua_type(m_luaState, -1))
              {
                  case LUA_TNIL:
--- 1691,1728 ----
                      break;
  
!                 name = lua2wx(lua_getlocal(L, &ar, ++iIndex));
               }
  
               if (!fFound)
               {
!                   int nOldTop = lua_gettop(L);
!                   lua_pushvalue(L, LUA_GLOBALSINDEX);
!                   lua_pushnil(L);
!                   while (lua_next(L, -2) != 0)
                    {
!                       if (lua_type(L, -2) == LUA_TSTRING)
                        {
!                           wxString name = lua2wx(lua_tostring(L, -2));
                            if (strExpr == name)
                            {
!                               nReference = m_wxlState.tinsert(-1); // reference value and pop it.
!                               lua_pop(L, 1);   // pop index
                                fFound = true;
                                break;
                            }
                            else
!                               lua_pop(L, 1);  // removes `value';
                        }
                        else
!                           lua_pop(L, 1);  // removes `value';
                    }
!                   lua_settop(L, nOldTop); // the table of globals.
               }
          }
  
!         if (nReference != LUA_NOREF && (m_wxlState.tget(nReference) != 0))
          {
!             m_wxlState.tremove(nReference);
!             switch (lua_type(L, -1))
              {
                  case LUA_TNIL:
***************
*** 2000,2012 ****
  
                  case LUA_TBOOLEAN:
!                     strResult = MakeBoolean(lua_toboolean(m_luaState, -1));
                      break;
  
                  case LUA_TNUMBER:
!                     strResult = MakeNumber(lua_tonumber(m_luaState, -1));
                      break;
  
                  case LUA_TSTRING:
!                     strResult = wxString::Format(wxT("\"%s\""), lua_tostring(m_luaState, -1));
                      break;
  
--- 1731,1743 ----
  
                  case LUA_TBOOLEAN:
!                     strResult = wxLuaDebugData::MakeBoolean(lua_toboolean(L, -1));
                      break;
  
                  case LUA_TNUMBER:
!                     strResult = wxLuaDebugData::MakeNumber(lua_tonumber(L, -1));
                      break;
  
                  case LUA_TSTRING:
!                     strResult = wxString::Format(wxT("\"%s\""), lua_tostring(L, -1));
                      break;
  
***************
*** 2016,2023 ****
  
                  case LUA_TFUNCTION:
!                     if (lua_iscfunction(m_luaState, -1))
!                         strResult = wxString::Format(wxT("C-function %p"), lua_tocfunction(m_luaState, -1));
                      else
!                         strResult = wxString::Format(wxT("lua function %p"), lua_topointer(m_luaState, -1));
                      break;
  
--- 1747,1754 ----
  
                  case LUA_TFUNCTION:
!                     if (lua_iscfunction(L, -1))
!                         strResult = wxString::Format(wxT("C-function %p"), lua_tocfunction(L, -1));
                      else
!                         strResult = wxString::Format(wxT("lua function %p"), lua_topointer(L, -1));
                      break;
  
***************
*** 2031,2035 ****
  
                  case LUA_TTHREAD:
!                     strResult = wxString::Format(wxT("thread %p"), lua_topointer(m_luaState, -1));
                      break;
  
--- 1762,1766 ----
  
                  case LUA_TTHREAD:
!                     strResult = wxString::Format(wxT("thread %p"), lua_topointer(L, -1));
                      break;
  
***************
*** 2038,2042 ****
              }
  
!             lua_pop(m_luaState, 1);
          }
      }
--- 1769,1773 ----
              }
  
!             lua_pop(L, 1);
          }
      }
***************
*** 2048,2053 ****
  wxString wxLuaDebuggee::GetTableInfo(int index)
  {
!     int         nItems = luaL_getn(m_luaState, index);
!     const void *pItem  = lua_topointer(m_luaState, index);
  
      if (nItems == 0)
--- 1779,1784 ----
  wxString wxLuaDebuggee::GetTableInfo(int index)
  {
!     int         nItems = luaL_getn(m_wxlState.GetLuaState(), index);
!     const void *pItem  = lua_topointer(m_wxlState.GetLuaState(), index);
  
      if (nItems == 0)
***************
*** 2061,2099 ****
      if (full)
      {
!         int nTag = ttag(m_luaState, index);
  
          const char *pTagName = NULL;
          if (nTag != TLUA_NOTAG)
!             pTagName = GetLuaTagName(m_luaState, nTag);
  
          if (pTagName != NULL)
!             return wxString::Format(wxT("%p (%s)"), lua_touserdata(m_luaState, index), pTagName);
! 
!         return wxString::Format(wxT("%p (%u)"), lua_touserdata(m_luaState, index), nTag);
!     }
! 
!     return wxString::Format(wxT("%p"), lua_touserdata(m_luaState, index));
! }
! 
! wxString wxLuaDebuggee::MakeNumber(double dnum)
! {
!     long num = (long) dnum;
!     if ((double) num == dnum)
!     {
!         if (num >= 0)
!             return wxString::Format(wxT("%lu (0x%lx)"), num, num);
  
!         return wxString::Format(wxT("%ld (0x%lx)"), num, num);
      }
  
!     return wxString::Format(wxT("%g"), dnum);
! }
! 
! wxString wxLuaDebuggee::MakeBoolean(int num)
! {
!     if (num)
!         return wxT("True");
! 
!     return wxT("False");
  }
  
--- 1792,1808 ----
      if (full)
      {
!         int nTag = m_wxlState.ttag(index);
  
          const char *pTagName = NULL;
          if (nTag != TLUA_NOTAG)
!             pTagName = m_wxlState.GetLuaTagName(nTag);
  
          if (pTagName != NULL)
!             return wxString::Format(wxT("%p (%s)"), lua_touserdata(m_wxlState.GetLuaState(), index), pTagName);
  
!         return wxString::Format(wxT("%p (%u)"), lua_touserdata(m_wxlState.GetLuaState(), index), nTag);
      }
  
!     return wxString::Format(wxT("%p"), lua_touserdata(m_wxlState.GetLuaState(), index));
  }
  
***************
*** 2101,2106 ****
  {
      lua_Debug luaDebug;
!     lua_getstack(m_luaState, 0, &luaDebug);
!     lua_getinfo(m_luaState, "Sln", &luaDebug);
      lineNumber = luaDebug.currentline - 1;
  
--- 1810,1816 ----
  {
      lua_Debug luaDebug;
!     lua_State* L = m_wxlState.GetLuaState();
!     lua_getstack(L, 0, &luaDebug);
!     lua_getinfo(L, "Sln", &luaDebug);
      lineNumber = luaDebug.currentline - 1;
  
***************
*** 2108,2112 ****
  
      wxString source = lua2wx(luaDebug.source);
!     if (!source.IsEmpty() && source.GetChar(0) == wxT('@'))
          fileName = source.Mid(1);
      else
--- 1818,1822 ----
  
      wxString source = lua2wx(luaDebug.source);
!     if (!source.IsEmpty() && (source.GetChar(0) == wxT('@')))
          fileName = source.Mid(1);
      else

Index: Makefile
===================================================================
RCS file: /cvsroot/wxlua/wxLua/modules/wxluasocket/src/Makefile,v
retrieving revision 1.4
retrieving revision 1.5
diff -C2 -d -r1.4 -r1.5
*** Makefile	25 Nov 2005 19:22:58 -0000	1.4
--- Makefile	1 Dec 2005 06:43:54 -0000	1.5
***************
*** 55,59 ****
  	../include/wxldtarg.h \
  	../include/wxlsock.h \
! 	../include/wxlhandl.h
  
  SOURCES = \
--- 55,60 ----
  	../include/wxldtarg.h \
  	../include/wxlsock.h \
! 	../include/wxlhandl.h \
! 	../include/dservice.h
  
  SOURCES = \
***************
*** 62,66 ****
  	wxldtarg.cpp \
  	wxlsock.cpp \
! 	wxlhandl.cpp
  
  OBJECTS=$(SOURCES:.cpp=.o)
--- 63,68 ----
  	wxldtarg.cpp \
  	wxlsock.cpp \
! 	wxlhandl.cpp \
! 	dservice.cpp
  
  OBJECTS=$(SOURCES:.cpp=.o)

Index: wxldserv.cpp
===================================================================
RCS file: /cvsroot/wxlua/wxLua/modules/wxluasocket/src/wxldserv.cpp,v
retrieving revision 1.4
retrieving revision 1.5
diff -C2 -d -r1.4 -r1.5
*** wxldserv.cpp	1 Dec 2005 04:17:29 -0000	1.4
--- wxldserv.cpp	1 Dec 2005 06:43:54 -0000	1.5
***************
*** 39,42 ****
--- 39,56 ----
  
  // ----------------------------------------------------------------------------
+ // wxLuaDebugServerThread
+ // ----------------------------------------------------------------------------
+ 
+ void *wxLuaDebugServerThread::Entry()
+ {
+     m_pServer->ThreadFunction();
+     return 0;
+ }
+ 
+ void wxLuaDebugServerThread::OnExit()
+ {
+ }
+ 
+ // ----------------------------------------------------------------------------
  // wxLuaDebugServer
  // ----------------------------------------------------------------------------
***************
*** 100,104 ****
      if (!m_fShutdown)
      {
!         m_pThread = new wxLuaThread(this);
  
          return ((m_pThread != NULL)                        &&
--- 114,118 ----
      if (!m_fShutdown)
      {
!         m_pThread = new wxLuaDebugServerThread(this);
  
          return ((m_pThread != NULL)                        &&
***************
*** 498,507 ****
  }
  
- void *wxLuaThread::Entry()
- {
-     m_pServer->ThreadFunction();
-     return 0;
- }
- 
  void wxLuaDebugServer::ThreadFunction()
  {
--- 512,515 ----
***************
*** 649,656 ****
  }
  
- void wxLuaThread::OnExit()
- {
- }
- 
  #if wxCHECK_VERSION(2, 3, 0)
  bool wxLuaDebugServer::DisplayStackDialog(wxWindow *pParent)
--- 657,660 ----

[Wxlua-commit] wxLua/apps/wxlua/src editor.h,1.2,1.3 wxlua.cpp,1.8,1.9 wxlua.h,1.7,1.8

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

Update of /cvsroot/wxlua/wxLua/apps/wxlua/src
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv32720/wxLua/apps/wxlua/src

Modified Files:
	editor.h wxlua.cpp wxlua.h 
Log Message:
wxEVT_DEBUG_XXX -> wxEVT_WXLUA_DEBUG_XXX and export them for DLL
reorder libs for linking in wxluaedit
TRUE/FALSE -> true/false
EVENT_DEBUG_XXX and CMD_XXX -> wxLUA_EVENT_DEBUG_XXX wxLUA_CMD_XXX


Index: wxlua.cpp
===================================================================
RCS file: /cvsroot/wxlua/wxLua/apps/wxlua/src/wxlua.cpp,v
retrieving revision 1.8
retrieving revision 1.9
diff -C2 -d -r1.8 -r1.9
*** wxlua.cpp	30 Nov 2005 04:46:16 -0000	1.8
--- wxlua.cpp	1 Dec 2005 04:17:28 -0000	1.9
***************
*** 59,63 ****
      virtual void DisplayError(const wxString &strError) const { m_app->DisplayError(strError); }
  
- public:
      wxLuaStandaloneApp *m_app;
  };
--- 59,62 ----
***************
*** 72,84 ****
  public:
      // constructors
!     wxLuaException(int nReturnCode) :
!     m_nReturnCode(nReturnCode)
!     {
!     }
! 
!     wxLuaException(const wxLuaException &e) :
!     m_nReturnCode(e.m_nReturnCode)
!     {
!     }
  
  private:
--- 71,76 ----
  public:
      // constructors
!     wxLuaException(int nReturnCode) : m_nReturnCode(nReturnCode) {}
!     wxLuaException(const wxLuaException &e) : m_nReturnCode(e.m_nReturnCode) {}
  
  private:
***************
*** 102,108 ****
      EVT_LUA_DEBUG_HOOK  (-1, wxLuaStandaloneApp::OnLua)
      EVT_LUA_SHUTDOWN    (-1, wxLuaStandaloneApp::OnLua)
!     EVT_DEBUG_STACK_ENUM(wxLuaStandaloneApp::OnDebugStackEnum)
!     EVT_DEBUG_STACK_ENTRY_ENUM(wxLuaStandaloneApp::OnDebugStackEntryEnum)
!     EVT_DEBUG_TABLE_ENUM(wxLuaStandaloneApp::OnDebugTableEnum)
  END_EVENT_TABLE()
  
--- 94,100 ----
      EVT_LUA_DEBUG_HOOK  (-1, wxLuaStandaloneApp::OnLua)
      EVT_LUA_SHUTDOWN    (-1, wxLuaStandaloneApp::OnLua)
!     EVT_WXLUA_DEBUG_STACK_ENUM(wxLuaStandaloneApp::OnDebugStackEnum)
!     EVT_WXLUA_DEBUG_STACK_ENTRY_ENUM(wxLuaStandaloneApp::OnDebugStackEntryEnum)
!     EVT_WXLUA_DEBUG_TABLE_ENUM(wxLuaStandaloneApp::OnDebugTableEnum)
  END_EVENT_TABLE()
  

Index: wxlua.h
===================================================================
RCS file: /cvsroot/wxlua/wxLua/apps/wxlua/src/wxlua.h,v
retrieving revision 1.7
retrieving revision 1.8
diff -C2 -d -r1.7 -r1.8
*** wxlua.h	30 Nov 2005 04:46:16 -0000	1.7
--- wxlua.h	1 Dec 2005 04:17:28 -0000	1.8
***************
*** 39,43 ****
  {
  public:
! // Override the base class virtual functions
      bool OnInit();
      int  OnExit();
--- 39,43 ----
  {
  public:
!     // Override the base class virtual functions
      bool OnInit();
      int  OnExit();

Index: editor.h
===================================================================
RCS file: /cvsroot/wxlua/wxLua/apps/wxlua/src/editor.h,v
retrieving revision 1.2
retrieving revision 1.3
diff -C2 -d -r1.2 -r1.3
*** editor.h	19 Nov 2005 07:08:38 -0000	1.2
--- editor.h	1 Dec 2005 04:17:28 -0000	1.3
***************
*** 9,14 ****
  extern const unsigned char wxLuaEditor[];
  
! const size_t wxLuaEditor_len = 81950;
! const unsigned char wxLuaEditor[81950] = {
   45, 45, 45, 45, 45, 45, 45, 45, 45, 45, 45, 45, 45, 45, 45, 45, 45, 45, 45, 45, 45, 45, 45, 45, 45, 45, 45, 45, 45, 45, 45, 45, 45, 45, 45, 45, 45, 45, 45, 45, 45, 45, 45, 45, 45, 45, 45, 45, 45, 45, 45, 45, 45, 45, 45, 45, 45, 45, 45, 45, 45, 45, 45, 45, 45, 45, 45, 45, 45, 45, 45, 45, 45, 61, 45, 45, 45, 10,
   45, 45, 32, 78, 97,109,101, 58, 32, 32, 32, 32, 32, 32, 32, 32, 69,100,105,116,111,114, 46,119,120, 46,108,117, 97, 10,
--- 9,14 ----
  extern const unsigned char wxLuaEditor[];
  
! const size_t wxLuaEditor_len = 81924;
! const unsigned char wxLuaEditor[81924] = {
   45, 45, 45, 45, 45, 45, 45, 45, 45, 45, 45, 45, 45, 45, 45, 45, 45, 45, 45, 45, 45, 45, 45, 45, 45, 45, 45, 45, 45, 45, 45, 45, 45, 45, 45, 45, 45, 45, 45, 45, 45, 45, 45, 45, 45, 45, 45, 45, 45, 45, 45, 45, 45, 45, 45, 45, 45, 45, 45, 45, 45, 45, 45, 45, 45, 45, 45, 45, 45, 45, 45, 45, 45, 61, 45, 45, 45, 10,
   45, 45, 32, 78, 97,109,101, 58, 32, 32, 32, 32, 32, 32, 32, 32, 69,100,105,116,111,114, 46,119,120, 46,108,117, 97, 10,
***************
*** 720,724 ****
   32, 32, 32, 32, 32, 32, 32, 32, 32, 32, 32, 32, 32, 32, 32, 32, 32, 32, 32, 32, 32, 32, 32, 32,115, 97,118,101, 65,115, 40,101,100,105,116,111,114, 41, 10,
   32, 32, 32, 32, 32, 32, 32, 32, 32, 32, 32, 32, 32, 32, 32, 32, 32, 32, 32,101,110,100, 41, 10,
!  32, 32, 32, 32, 32, 32, 32, 32, 32, 32, 32, 32, 32, 32, 32, 32, 32, 32, 32, 10,
  102,114, 97,109,101, 58, 67,111,110,110,101, 99,116, 69,118,101,110,116, 40,119,120, 46,119,120, 73, 68, 95, 83, 65, 86, 69, 65, 83, 44, 10,
   32, 32, 32, 32, 32, 32, 32, 32, 32, 32, 32, 32, 32, 32, 32, 32, 32, 32, 32,119,120, 46,119,120, 69, 86, 84, 95, 85, 80, 68, 65, 84, 69, 95, 85, 73, 44, 10,
--- 720,724 ----
   32, 32, 32, 32, 32, 32, 32, 32, 32, 32, 32, 32, 32, 32, 32, 32, 32, 32, 32, 32, 32, 32, 32, 32,115, 97,118,101, 65,115, 40,101,100,105,116,111,114, 41, 10,
   32, 32, 32, 32, 32, 32, 32, 32, 32, 32, 32, 32, 32, 32, 32, 32, 32, 32, 32,101,110,100, 41, 10,
!  10,
  102,114, 97,109,101, 58, 67,111,110,110,101, 99,116, 69,118,101,110,116, 40,119,120, 46,119,120, 73, 68, 95, 83, 65, 86, 69, 65, 83, 44, 10,
   32, 32, 32, 32, 32, 32, 32, 32, 32, 32, 32, 32, 32, 32, 32, 32, 32, 32, 32,119,120, 46,119,120, 69, 86, 84, 95, 85, 80, 68, 65, 84, 69, 95, 85, 73, 44, 10,
***************
*** 1168,1172 ****
   32, 32, 32, 32, 32, 32, 32, 32, 32, 32, 32, 32, 32, 32, 32, 32, 32, 32, 32, 32, 32, 32, 32, 32,108,111, 99, 97,108, 32,101,100,105,116,111,114, 32, 61, 32,103,101,116, 69,100,105,116,111,114, 40, 41, 10,
   32, 32, 32, 32, 32, 32, 32, 32, 32, 32, 32, 32, 32, 32, 32, 32, 32, 32, 32, 32, 32, 32, 32, 32,101,100,105,116,111,114, 58, 83,101,108,101, 99,116, 65,108,108, 40, 41, 10,
!  32, 32, 32, 32, 32, 32, 32, 32, 32, 32, 32, 32, 32, 32, 32, 32, 32, 32, 32,101,110,100, 41, 32, 32, 32, 32, 32, 32, 32, 32, 32, 32, 32, 32, 32, 32, 32, 32, 32, 32, 32, 10,
  102,114, 97,109,101, 58, 67,111,110,110,101, 99,116, 69,118,101,110,116, 40,119,120, 46,119,120, 73, 68, 95, 83, 69, 76, 69, 67, 84, 65, 76, 76, 44, 10,
   32, 32, 32, 32, 32, 32, 32, 32, 32, 32, 32, 32, 32, 32, 32, 32, 32, 32, 32,119,120, 46,119,120, 69, 86, 84, 95, 85, 80, 68, 65, 84, 69, 95, 85, 73, 44, 10,
--- 1168,1172 ----
   32, 32, 32, 32, 32, 32, 32, 32, 32, 32, 32, 32, 32, 32, 32, 32, 32, 32, 32, 32, 32, 32, 32, 32,108,111, 99, 97,108, 32,101,100,105,116,111,114, 32, 61, 32,103,101,116, 69,100,105,116,111,114, 40, 41, 10,
   32, 32, 32, 32, 32, 32, 32, 32, 32, 32, 32, 32, 32, 32, 32, 32, 32, 32, 32, 32, 32, 32, 32, 32,101,100,105,116,111,114, 58, 83,101,108,101, 99,116, 65,108,108, 40, 41, 10,
!  32, 32, 32, 32, 32, 32, 32, 32, 32, 32, 32, 32, 32, 32, 32, 32, 32, 32, 32,101,110,100, 41, 10,
  102,114, 97,109,101, 58, 67,111,110,110,101, 99,116, 69,118,101,110,116, 40,119,120, 46,119,120, 73, 68, 95, 83, 69, 76, 69, 67, 84, 65, 76, 76, 44, 10,
   32, 32, 32, 32, 32, 32, 32, 32, 32, 32, 32, 32, 32, 32, 32, 32, 32, 32, 32,119,120, 46,119,120, 69, 86, 84, 95, 85, 80, 68, 65, 84, 69, 95, 85, 73, 44, 10,
***************
*** 1213,1217 ****
   32, 32, 32, 32, 32, 32, 32, 32, 32, 32, 32, 32, 32, 32, 32, 32, 32, 32, 32, 32, 32, 32, 32,101,110, 97, 98,108,101, 77,101,110,117, 73,116,101,109, 40,101,118,101,110,116, 41, 10,
   32, 32, 32, 32, 32, 32, 32, 32, 32, 32, 32, 32, 32, 32, 32, 32, 32, 32, 32,101,110,100, 41, 10,
!  32, 32, 32, 32, 32, 32, 32, 32, 32, 32, 32, 32, 32, 32, 32, 32, 32, 32, 32, 10,
  102,117,110, 99,116,105,111,110, 32,109, 97,107,101, 68,101, 98,117,103, 70,105,108,101, 78, 97,109,101, 40,101,100,105,116,111,114, 44, 32,102,105,108,101, 80, 97,116,104, 41, 10,
   32, 32, 32, 32,105,102, 32,110,111,116, 32,102,105,108,101, 80, 97,116,104, 32,116,104,101,110, 10,
--- 1213,1217 ----
   32, 32, 32, 32, 32, 32, 32, 32, 32, 32, 32, 32, 32, 32, 32, 32, 32, 32, 32, 32, 32, 32, 32,101,110, 97, 98,108,101, 77,101,110,117, 73,116,101,109, 40,101,118,101,110,116, 41, 10,
   32, 32, 32, 32, 32, 32, 32, 32, 32, 32, 32, 32, 32, 32, 32, 32, 32, 32, 32,101,110,100, 41, 10,
!  10,
  102,117,110, 99,116,105,111,110, 32,109, 97,107,101, 68,101, 98,117,103, 70,105,108,101, 78, 97,109,101, 40,101,100,105,116,111,114, 44, 32,102,105,108,101, 80, 97,116,104, 41, 10,
   32, 32, 32, 32,105,102, 32,110,111,116, 32,102,105,108,101, 80, 97,116,104, 32,116,104,101,110, 10,
***************
*** 1561,1565 ****
   10,
   32, 32, 32, 32, 32, 32, 32, 32,115,112,108,105,116,116,101,114, 58, 83,101,116, 68,105,109,101,110,115,105,111,110,115, 40, 48, 44, 32,121,111,102,102,115,101,116, 44, 32,120, 44, 32,121, 32, 45, 32,121,111,102,102,115,101,116, 41, 10,
!  32, 32, 32, 32,101,108,115,101, 32, 10,
   32, 32, 32, 32, 32, 32, 32, 32,101,118,101,110,116, 58, 83,107,105,112, 40, 41, 10,
   32, 32, 32, 32,101,110,100, 10,
--- 1561,1565 ----
   10,
   32, 32, 32, 32, 32, 32, 32, 32,115,112,108,105,116,116,101,114, 58, 83,101,116, 68,105,109,101,110,115,105,111,110,115, 40, 48, 44, 32,121,111,102,102,115,101,116, 44, 32,120, 44, 32,121, 32, 45, 32,121,111,102,102,115,101,116, 41, 10,
!  32, 32, 32, 32,101,108,115,101, 10,
   32, 32, 32, 32, 32, 32, 32, 32,101,118,101,110,116, 58, 83,107,105,112, 40, 41, 10,
   32, 32, 32, 32,101,110,100, 10,
***************
*** 1849,1853 ****
   10,
  101,100,105,116,111,114, 65,112,112, 58, 67,111,110,110,101, 99,116, 69,118,101,110,116, 40, 45, 49, 44, 10,
!  32, 32, 32, 32, 32, 32, 32, 32, 32, 32, 32, 32, 32, 32, 32, 32, 32, 32, 32, 32, 32, 32, 32,119,120, 46,119,120, 69, 86, 84, 95, 68, 69, 66, 85, 71, 95, 67, 76, 73, 69, 78, 84, 95, 67, 79, 78, 78, 69, 67, 84, 69, 68, 44, 10,
   32, 32, 32, 32, 32, 32, 32, 32, 32, 32, 32, 32, 32, 32, 32, 32, 32, 32, 32, 32, 32, 32, 32,102,117,110, 99,116,105,111,110, 32, 40,101,118,101,110,116, 41, 10,
   32, 32, 32, 32, 32, 32, 32, 32, 32, 32, 32, 32, 32, 32, 32, 32, 32, 32, 32, 32, 32, 32, 32, 32, 32, 32, 32, 32,105,102, 32,100,101, 98,117,103, 83,101,114,118,101,114, 32,116,104,101,110, 10,
--- 1849,1853 ----
   10,
  101,100,105,116,111,114, 65,112,112, 58, 67,111,110,110,101, 99,116, 69,118,101,110,116, 40, 45, 49, 44, 10,
!  32, 32, 32, 32, 32, 32, 32, 32, 32, 32, 32, 32, 32, 32, 32, 32, 32, 32, 32, 32, 32, 32, 32,119,120, 46,119,120, 69, 86, 84, 95, 87, 88, 76, 85, 65, 95, 68, 69, 66, 85, 71, 95, 67, 76, 73, 69, 78, 84, 95, 67, 79, 78, 78, 69, 67, 84, 69, 68, 44, 10,
   32, 32, 32, 32, 32, 32, 32, 32, 32, 32, 32, 32, 32, 32, 32, 32, 32, 32, 32, 32, 32, 32, 32,102,117,110, 99,116,105,111,110, 32, 40,101,118,101,110,116, 41, 10,
   32, 32, 32, 32, 32, 32, 32, 32, 32, 32, 32, 32, 32, 32, 32, 32, 32, 32, 32, 32, 32, 32, 32, 32, 32, 32, 32, 32,105,102, 32,100,101, 98,117,103, 83,101,114,118,101,114, 32,116,104,101,110, 10,
***************
*** 1877,1881 ****
   10,
  101,100,105,116,111,114, 65,112,112, 58, 67,111,110,110,101, 99,116, 69,118,101,110,116, 40, 45, 49, 44, 10,
!  32, 32, 32, 32, 32, 32, 32, 32, 32, 32, 32, 32, 32, 32, 32, 32, 32, 32, 32, 32, 32, 32, 32,119,120, 46,119,120, 69, 86, 84, 95, 68, 69, 66, 85, 71, 95, 66, 82, 69, 65, 75, 44, 10,
   32, 32, 32, 32, 32, 32, 32, 32, 32, 32, 32, 32, 32, 32, 32, 32, 32, 32, 32, 32, 32, 32, 32,102,117,110, 99,116,105,111,110, 32, 40,101,118,101,110,116, 41, 10,
   32, 32, 32, 32, 32, 32, 32, 32, 32, 32, 32, 32, 32, 32, 32, 32, 32, 32, 32, 32, 32, 32, 32, 32, 32, 32, 32,108,111, 99, 97,108, 32,114,111,119, 32, 61, 32,101,118,101,110,116, 58, 71,101,116, 76,105,110,101, 78,117,109, 98,101,114, 40, 41, 10,
--- 1877,1881 ----
   10,
  101,100,105,116,111,114, 65,112,112, 58, 67,111,110,110,101, 99,116, 69,118,101,110,116, 40, 45, 49, 44, 10,
!  32, 32, 32, 32, 32, 32, 32, 32, 32, 32, 32, 32, 32, 32, 32, 32, 32, 32, 32, 32, 32, 32, 32,119,120, 46,119,120, 69, 86, 84, 95, 87, 88, 76, 85, 65, 95, 68, 69, 66, 85, 71, 95, 66, 82, 69, 65, 75, 44, 10,
   32, 32, 32, 32, 32, 32, 32, 32, 32, 32, 32, 32, 32, 32, 32, 32, 32, 32, 32, 32, 32, 32, 32,102,117,110, 99,116,105,111,110, 32, 40,101,118,101,110,116, 41, 10,
   32, 32, 32, 32, 32, 32, 32, 32, 32, 32, 32, 32, 32, 32, 32, 32, 32, 32, 32, 32, 32, 32, 32, 32, 32, 32, 32,108,111, 99, 97,108, 32,114,111,119, 32, 61, 32,101,118,101,110,116, 58, 71,101,116, 76,105,110,101, 78,117,109, 98,101,114, 40, 41, 10,
***************
*** 1952,1956 ****
   10,
  101,100,105,116,111,114, 65,112,112, 58, 67,111,110,110,101, 99,116, 69,118,101,110,116, 40, 45, 49, 44, 10,
!  32, 32, 32, 32, 32, 32, 32, 32, 32, 32, 32, 32, 32, 32, 32, 32, 32, 32, 32, 32, 32, 32, 32,119,120, 46,119,120, 69, 86, 84, 95, 68, 69, 66, 85, 71, 95, 80, 82, 73, 78, 84, 44, 10,
   32, 32, 32, 32, 32, 32, 32, 32, 32, 32, 32, 32, 32, 32, 32, 32, 32, 32, 32, 32, 32, 32, 32,102,117,110, 99,116,105,111,110, 32, 40,101,118,101,110,116, 41, 10,
   32, 32, 32, 32, 32, 32, 32, 32, 32, 32, 32, 32, 32, 32, 32, 32, 32, 32, 32, 32, 32, 32, 32, 32, 32, 32, 32,100,105,115,112,108, 97,121, 79,117,116,112,117,116, 40,101,118,101,110,116, 58, 71,101,116, 77,101,115,115, 97,103,101, 40, 41, 41, 10,
--- 1952,1956 ----
   10,
  101,100,105,116,111,114, 65,112,112, 58, 67,111,110,110,101, 99,116, 69,118,101,110,116, 40, 45, 49, 44, 10,
!  32, 32, 32, 32, 32, 32, 32, 32, 32, 32, 32, 32, 32, 32, 32, 32, 32, 32, 32, 32, 32, 32, 32,119,120, 46,119,120, 69, 86, 84, 95, 87, 88, 76, 85, 65, 95, 68, 69, 66, 85, 71, 95, 80, 82, 73, 78, 84, 44, 10,
   32, 32, 32, 32, 32, 32, 32, 32, 32, 32, 32, 32, 32, 32, 32, 32, 32, 32, 32, 32, 32, 32, 32,102,117,110, 99,116,105,111,110, 32, 40,101,118,101,110,116, 41, 10,
   32, 32, 32, 32, 32, 32, 32, 32, 32, 32, 32, 32, 32, 32, 32, 32, 32, 32, 32, 32, 32, 32, 32, 32, 32, 32, 32,100,105,115,112,108, 97,121, 79,117,116,112,117,116, 40,101,118,101,110,116, 58, 71,101,116, 77,101,115,115, 97,103,101, 40, 41, 41, 10,
***************
*** 1958,1962 ****
   10,
  101,100,105,116,111,114, 65,112,112, 58, 67,111,110,110,101, 99,116, 69,118,101,110,116, 40, 45, 49, 44, 10,
!  32, 32, 32, 32, 32, 32, 32, 32, 32, 32, 32, 32, 32, 32, 32, 32, 32, 32, 32, 32, 32, 32, 32,119,120, 46,119,120, 69, 86, 84, 95, 68, 69, 66, 85, 71, 95, 69, 82, 82, 79, 82, 44, 10,
   32, 32, 32, 32, 32, 32, 32, 32, 32, 32, 32, 32, 32, 32, 32, 32, 32, 32, 32, 32, 32, 32, 32,102,117,110, 99,116,105,111,110, 32, 40,101,118,101,110,116, 41, 10,
   32, 32, 32, 32, 32, 32, 32, 32, 32, 32, 32, 32, 32, 32, 32, 32, 32, 32, 32, 32, 32, 32, 32, 32, 32, 32, 32,100,105,115,112,108, 97,121, 79,117,116,112,117,116, 40,101,118,101,110,116, 58, 71,101,116, 77,101,115,115, 97,103,101, 40, 41, 41, 10,
--- 1958,1962 ----
   10,
  101,100,105,116,111,114, 65,112,112, 58, 67,111,110,110,101, 99,116, 69,118,101,110,116, 40, 45, 49, 44, 10,
!  32, 32, 32, 32, 32, 32, 32, 32, 32, 32, 32, 32, 32, 32, 32, 32, 32, 32, 32, 32, 32, 32, 32,119,120, 46,119,120, 69, 86, 84, 95, 87, 88, 76, 85, 65, 95, 68, 69, 66, 85, 71, 95, 69, 82, 82, 79, 82, 44, 10,
   32, 32, 32, 32, 32, 32, 32, 32, 32, 32, 32, 32, 32, 32, 32, 32, 32, 32, 32, 32, 32, 32, 32,102,117,110, 99,116,105,111,110, 32, 40,101,118,101,110,116, 41, 10,
   32, 32, 32, 32, 32, 32, 32, 32, 32, 32, 32, 32, 32, 32, 32, 32, 32, 32, 32, 32, 32, 32, 32, 32, 32, 32, 32,100,105,115,112,108, 97,121, 79,117,116,112,117,116, 40,101,118,101,110,116, 58, 71,101,116, 77,101,115,115, 97,103,101, 40, 41, 41, 10,
***************
*** 1964,1968 ****
   10,
  101,100,105,116,111,114, 65,112,112, 58, 67,111,110,110,101, 99,116, 69,118,101,110,116, 40, 45, 49, 44, 10,
!  32, 32, 32, 32, 32, 32, 32, 32, 32, 32, 32, 32, 32, 32, 32, 32, 32, 32, 32, 32, 32, 32, 32,119,120, 46,119,120, 69, 86, 84, 95, 68, 69, 66, 85, 71, 95, 69, 88, 73, 84, 44, 10,
   32, 32, 32, 32, 32, 32, 32, 32, 32, 32, 32, 32, 32, 32, 32, 32, 32, 32, 32, 32, 32, 32, 32,102,117,110, 99,116,105,111,110, 32, 40,101,118,101,110,116, 41, 10,
   32, 32, 32, 32, 32, 32, 32, 32, 32, 32, 32, 32, 32, 32, 32, 32, 32, 32, 32, 32, 32, 32, 32, 32, 32, 32, 32,102,111,114, 32,105,100, 44, 32,100,111, 99,117,109,101,110,116, 32,105,110, 32,111,112,101,110, 68,111, 99,117,109,101,110,116,115, 32,100,111, 10,
--- 1964,1968 ----
   10,
  101,100,105,116,111,114, 65,112,112, 58, 67,111,110,110,101, 99,116, 69,118,101,110,116, 40, 45, 49, 44, 10,
!  32, 32, 32, 32, 32, 32, 32, 32, 32, 32, 32, 32, 32, 32, 32, 32, 32, 32, 32, 32, 32, 32, 32,119,120, 46,119,120, 69, 86, 84, 95, 87, 88, 76, 85, 65, 95, 68, 69, 66, 85, 71, 95, 69, 88, 73, 84, 44, 10,
   32, 32, 32, 32, 32, 32, 32, 32, 32, 32, 32, 32, 32, 32, 32, 32, 32, 32, 32, 32, 32, 32, 32,102,117,110, 99,116,105,111,110, 32, 40,101,118,101,110,116, 41, 10,
   32, 32, 32, 32, 32, 32, 32, 32, 32, 32, 32, 32, 32, 32, 32, 32, 32, 32, 32, 32, 32, 32, 32, 32, 32, 32, 32,102,111,114, 32,105,100, 44, 32,100,111, 99,117,109,101,110,116, 32,105,110, 32,111,112,101,110, 68,111, 99,117,109,101,110,116,115, 32,100,111, 10,
***************
*** 1982,1986 ****
   10,
  101,100,105,116,111,114, 65,112,112, 58, 67,111,110,110,101, 99,116, 69,118,101,110,116, 40, 45, 49, 44, 10,
!  32, 32, 32, 32, 32, 32, 32, 32, 32, 32, 32, 32, 32, 32, 32, 32, 32, 32, 32, 32, 32, 32, 32,119,120, 46,119,120, 69, 86, 84, 95, 68, 69, 66, 85, 71, 95, 69, 86, 65, 76, 85, 65, 84, 69, 95, 69, 88, 80, 82, 44, 10,
   32, 32, 32, 32, 32, 32, 32, 32, 32, 32, 32, 32, 32, 32, 32, 32, 32, 32, 32, 32, 32, 32, 32,102,117,110, 99,116,105,111,110, 32, 40,101,118,101,110,116, 41, 10,
   32, 32, 32, 32, 32, 32, 32, 32, 32, 32, 32, 32, 32, 32, 32, 32, 32, 32, 32, 32, 32, 32, 32, 32, 32, 32, 32,105,102, 32,119, 97,116, 99,104, 76,105,115,116, 67,116,114,108, 32,116,104,101,110, 10,
--- 1982,1986 ----
   10,
  101,100,105,116,111,114, 65,112,112, 58, 67,111,110,110,101, 99,116, 69,118,101,110,116, 40, 45, 49, 44, 10,
!  32, 32, 32, 32, 32, 32, 32, 32, 32, 32, 32, 32, 32, 32, 32, 32, 32, 32, 32, 32, 32, 32, 32,119,120, 46,119,120, 69, 86, 84, 95, 87, 88, 76, 85, 65, 95, 68, 69, 66, 85, 71, 95, 69, 86, 65, 76, 85, 65, 84, 69, 95, 69, 88, 80, 82, 44, 10,
   32, 32, 32, 32, 32, 32, 32, 32, 32, 32, 32, 32, 32, 32, 32, 32, 32, 32, 32, 32, 32, 32, 32,102,117,110, 99,116,105,111,110, 32, 40,101,118,101,110,116, 41, 10,
   32, 32, 32, 32, 32, 32, 32, 32, 32, 32, 32, 32, 32, 32, 32, 32, 32, 32, 32, 32, 32, 32, 32, 32, 32, 32, 32,105,102, 32,119, 97,116, 99,104, 76,105,115,116, 67,116,114,108, 32,116,104,101,110, 10,
***************
*** 2075,2079 ****
  105,102, 32, 97,114,103,115, 32,116,104,101,110, 10,
   32, 32, 32, 32,108,111, 99, 97,108, 32,102,105,108,101, 76,111, 97,100,101,100, 10,
!  32, 32, 32, 32,112,114,111,103,114, 97,109, 78, 97,109,101, 32, 61, 32, 97,114,103,115, 91, 48, 93, 32, 32, 32, 32, 10,
   32, 32, 32, 32,102,111,114, 32,105,110,100,101,120, 44, 32,102,105,108,101, 78, 97,109,101, 32,105,110, 32, 97,114,103,115, 32,100,111, 10,
   32, 32, 32, 32, 32, 32, 32, 32,105,102, 32,105,110,100,101,120, 32,126, 61, 32, 34,110, 34, 32, 97,110,100, 32,105,110,100,101,120, 32,126, 61, 32, 48, 32,116,104,101,110, 10,
--- 2075,2079 ----
  105,102, 32, 97,114,103,115, 32,116,104,101,110, 10,
   32, 32, 32, 32,108,111, 99, 97,108, 32,102,105,108,101, 76,111, 97,100,101,100, 10,
!  32, 32, 32, 32,112,114,111,103,114, 97,109, 78, 97,109,101, 32, 61, 32, 97,114,103,115, 91, 48, 93, 10,
   32, 32, 32, 32,102,111,114, 32,105,110,100,101,120, 44, 32,102,105,108,101, 78, 97,109,101, 32,105,110, 32, 97,114,103,115, 32,100,111, 10,
   32, 32, 32, 32, 32, 32, 32, 32,105,102, 32,105,110,100,101,120, 32,126, 61, 32, 34,110, 34, 32, 97,110,100, 32,105,110,100,101,120, 32,126, 61, 32, 48, 32,116,104,101,110, 10,

[Wxlua-commit] wxLua/modules/wxluasocket/include wxlsock.h,1.2,1.3

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

Update of /cvsroot/wxlua/wxLua/modules/wxluasocket/include
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv32720/wxLua/modules/wxluasocket/include

Modified Files:
	wxlsock.h 
Log Message:
wxEVT_DEBUG_XXX -> wxEVT_WXLUA_DEBUG_XXX and export them for DLL
reorder libs for linking in wxluaedit
TRUE/FALSE -> true/false
EVENT_DEBUG_XXX and CMD_XXX -> wxLUA_EVENT_DEBUG_XXX wxLUA_CMD_XXX


Index: wxlsock.h
===================================================================
RCS file: /cvsroot/wxlua/wxLua/modules/wxluasocket/include/wxlsock.h,v
retrieving revision 1.2
retrieving revision 1.3
diff -C2 -d -r1.2 -r1.3
*** wxlsock.h	25 Nov 2005 22:00:37 -0000	1.2
--- wxlsock.h	1 Dec 2005 04:17:29 -0000	1.3
***************
*** 54,62 ****
      {
          public:
!             // constructor
              wxLuaAcceptedSocket(socket_type socket, sockaddr_in address);
  
              //wxLuaAcceptedSocket(const wxLuaAcceptedSocket &);
!             wxLuaAcceptedSocket& operator=(const wxLuaAcceptedSocket &);
  
          private:
--- 54,62 ----
      {
          public:
!             // Accepted socket constructor
              wxLuaAcceptedSocket(socket_type socket, sockaddr_in address);
  
              //wxLuaAcceptedSocket(const wxLuaAcceptedSocket &);
!             //wxLuaAcceptedSocket& operator=(const wxLuaAcceptedSocket &);
  
          private:
***************
*** 79,109 ****
      };
  
-     // constructors
      wxLuaSocket();
      wxLuaSocket(const wxLuaAcceptedSocket &acceptedSocket);
  
      // destructor
!     ~wxLuaSocket();
  
!     // server: bind and listen for client connections
      void Listen(u_short port, int backLog = 100);
! 
!     // server: accept a connection from a client
      wxLuaAcceptedSocket Accept();
! 
!     // client: connect a client to a server
      void Connect(const wxString &address, u_short port);
- 
      // Get the socket state
!     SocketState GetState() const
!     {
!         return m_sockstate;
!     }
! 
      // Get the socket handle
!     int GetSocket() const
!     {
!         return m_sock;
!     }
  
      // Test if the socket is readable
--- 79,102 ----
      };
  
      wxLuaSocket();
+     // Socket constructor from an accepted socket
      wxLuaSocket(const wxLuaAcceptedSocket &acceptedSocket);
  
      // destructor
!     virtual ~wxLuaSocket();
  
!     // Create a listening socket, using the specified port number
!     //   server: bind and listen for client connections
      void Listen(u_short port, int backLog = 100);
!     // Accept a connection, returning an accepted socket.
!     //   server: accept a connection from a client
      wxLuaAcceptedSocket Accept();
!     // Connect to a given host and port number
!     //   client: connect a client to a server
      void Connect(const wxString &address, u_short port);
      // Get the socket state
!     SocketState GetState() const { return m_sockstate; }
      // Get the socket handle
!     int GetSocket() const { return m_sock; }
  
      // Test if the socket is readable
***************
*** 125,138 ****
      // Get the port number of the socket
      int         GetPort() const;
- 
      // Read the whole buffer of size length into buffer buffer from the socket
      int         Read(char *buffer, int length);
- 
      // Write the whole buffer of size length to the socket
      void        Write(const char *buffer, int length);
! 
!     // Shutdown the socket
      void        Shutdown(int how);
!     // Close the socket
      void        Close();
  
--- 118,128 ----
      // Get the port number of the socket
      int         GetPort() const;
      // Read the whole buffer of size length into buffer buffer from the socket
      int         Read(char *buffer, int length);
      // Write the whole buffer of size length to the socket
      void        Write(const char *buffer, int length);
!     // Shutdown the socket in an orderly fashion
      void        Shutdown(int how);
!     // Close the open socket
      void        Close();
  
***************
*** 173,239 ****
  
      // constructors
!     wxLuaSocketException(SocketErrorCode code) : m_code(code)
!     {
! #ifdef WIN32
!         m_errnum = ::WSAGetLastError();
!         switch(m_errnum)
!         {
!         case WSANOTINITIALISED:
!             m_description = _("A successful WSAStartup must occur before using this function.");
!             break;
! 
!         case WSAENETDOWN:
!             m_description = _("The network subsystem or the associated service provider has failed.");
!             break;
! 
!         case WSAEAFNOSUPPORT:
!             m_description = _("The specified address family is not supported.");
!             break;
! 
!         case WSAEINPROGRESS:
!             m_description = _("A blocking Windows Sockets 1.1 call is in progress, or the service provider is still processing a callback function.");
!             break;
! 
!         case WSAEMFILE:
!             m_description = _("No more socket descriptors are available.");
!             break;
! 
!         case WSAENOBUFS:
!             m_description = _("No buffer space is available. The socket cannot be created.");
!             break;
! 
!         case WSAEPROTONOSUPPORT:
!             m_description = _("The specified protocol is not supported.");
!             break;
! 
!         case WSAEPROTOTYPE:
!             m_description = _("The specified protocol is the wrong type for this socket.");
!             break;
! 
!         case WSAESOCKTNOSUPPORT:
!             m_description = _("The specified socket type is not supported in this address family.");
!             break;
!         }
! #else
!         m_errnum = errno;
! #endif
!         if (m_description.IsEmpty())
!             m_description = _("Socket Error");
!     }
! 
      wxLuaSocketException(const wxLuaSocketException &e)
!         : m_code(e.m_code), m_errnum(e.m_errnum)
!     {
!     }
  
!     SocketErrorCode GetCode() const
!     {
!         return m_code;
!     }
  
!     int errnum() const
!     {
!         return m_errnum;
!     }
  
      const wxString& description() { return m_description; }
--- 163,173 ----
  
      // constructors
!     wxLuaSocketException(SocketErrorCode code);
      wxLuaSocketException(const wxLuaSocketException &e)
!         : m_code(e.m_code), m_errnum(e.m_errnum) {}
  
!     SocketErrorCode GetCode() const { return m_code; }
  
!     int errnum() const { return m_errnum; }
  
      const wxString& description() { return m_description; }

[Wxlua-commit] wxLua/modules/wxluasocket/src dservice.cpp,1.4,1.5 wxldbgio.cpp,1.2,1.3 wxldserv.cpp,1.3,1.4 wxldtarg.cpp,1.3,1.4 wxlsock.cpp,1.1,1.2

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

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

Modified Files:
	dservice.cpp wxldbgio.cpp wxldserv.cpp wxldtarg.cpp 
	wxlsock.cpp 
Log Message:
wxEVT_DEBUG_XXX -> wxEVT_WXLUA_DEBUG_XXX and export them for DLL
reorder libs for linking in wxluaedit
TRUE/FALSE -> true/false
EVENT_DEBUG_XXX and CMD_XXX -> wxLUA_EVENT_DEBUG_XXX wxLUA_CMD_XXX


Index: wxldtarg.cpp
===================================================================
RCS file: /cvsroot/wxlua/wxLua/modules/wxluasocket/src/wxldtarg.cpp,v
retrieving revision 1.3
retrieving revision 1.4
diff -C2 -d -r1.3 -r1.4
*** wxldtarg.cpp	30 Nov 2005 04:46:17 -0000	1.3
--- wxldtarg.cpp	1 Dec 2005 04:17:29 -0000	1.4
***************
*** 101,107 ****
      m_pThread = new LuaThread(this);
      // Start the thread
!     if (m_pThread != NULL                        &&
!         m_pThread->Create() == wxTHREAD_NO_ERROR &&
!         m_pThread->Run()    == wxTHREAD_NO_ERROR)
      {
          // Wait for the connection to the server to complete
--- 101,107 ----
      m_pThread = new LuaThread(this);
      // Start the thread
!     if ((m_pThread != NULL)                        &&
!         (m_pThread->Create() == wxTHREAD_NO_ERROR) &&
!         (m_pThread->Run()    == wxTHREAD_NO_ERROR))
      {
          // Wait for the connection to the server to complete
***************
*** 118,123 ****
              m_fErrorsSeen = false;
  
!             size_t idx;
!             for (idx = 0; idx < m_bufferList.Count(); ++idx)
              {
                  int rc = LUA_ERRERR;
--- 118,123 ----
              m_fErrorsSeen = false;
  
!             size_t idx, count = m_bufferList.Count();
!             for (idx = 0; idx < count; ++idx)
              {
                  int rc = LUA_ERRERR;
***************
*** 193,197 ****
              switch(debugCommand)
              {
!                 case CMD_ADD_BREAKPOINT:
                      {
                          wxString fileName   = ReadString(&m_clientSocket);
--- 193,197 ----
              switch(debugCommand)
              {
!                 case wxLUA_CMD_ADD_BREAKPOINT:
                      {
                          wxString fileName   = ReadString(&m_clientSocket);
***************
*** 202,206 ****
                      break;
  
!                 case CMD_REMOVE_BREAKPOINT:
                      {
                          wxString fileName   = ReadString(&m_clientSocket);
--- 202,206 ----
                      break;
  
!                 case wxLUA_CMD_REMOVE_BREAKPOINT:
                      {
                          wxString fileName   = ReadString(&m_clientSocket);
***************
*** 211,219 ****
                      break;
  
!                 case CMD_CLEAR_ALL_BREAKPOINTS:
                      ClearAllBreakPoints();
                      break;
  
!                 case CMD_RUN_BUFFER:
                      {
                          wxString fileName = ReadString(&m_clientSocket);
--- 211,219 ----
                      break;
  
!                 case wxLUA_CMD_CLEAR_ALL_BREAKPOINTS:
                      ClearAllBreakPoints();
                      break;
  
!                 case wxLUA_CMD_RUN_BUFFER:
                      {
                          wxString fileName = ReadString(&m_clientSocket);
***************
*** 224,252 ****
                      break;
  
!                 case CMD_DEBUG_STEP:
                      Step();
                      break;
  
!                 case CMD_DEBUG_STEPOVER:
                      StepOver();
                      break;
  
!                 case CMD_DEBUG_STEPOUT:
                      StepOut();
                      break;
  
!                 case CMD_DEBUG_CONTINUE:
                      Continue();
                      break;
  
!                 case CMD_DEBUG_BREAK:
                      Break();
                      break;
  
!                 case CMD_ENUMERATE_STACK:
                      EnumerateStack();
                      break;
  
!                 case CMD_ENUMERATE_STACK_ENTRY:
                      {
                          int stackRef = ReadInt(&m_clientSocket);
--- 224,252 ----
                      break;
  
!                 case wxLUA_CMD_DEBUG_STEP:
                      Step();
                      break;
  
!                 case wxLUA_CMD_DEBUG_STEPOVER:
                      StepOver();
                      break;
  
!                 case wxLUA_CMD_DEBUG_STEPOUT:
                      StepOut();
                      break;
  
!                 case wxLUA_CMD_DEBUG_CONTINUE:
                      Continue();
                      break;
  
!                 case wxLUA_CMD_DEBUG_BREAK:
                      Break();
                      break;
  
!                 case wxLUA_CMD_ENUMERATE_STACK:
                      EnumerateStack();
                      break;
  
!                 case wxLUA_CMD_ENUMERATE_STACK_ENTRY:
                      {
                          int stackRef = ReadInt(&m_clientSocket);
***************
*** 255,259 ****
                      break;
  
!                 case CMD_ENUMERATE_TABLE_REF:
                      {
                          int tableRef  = ReadInt(&m_clientSocket);
--- 255,259 ----
                      break;
  
!                 case wxLUA_CMD_ENUMERATE_TABLE_REF:
                      {
                          int tableRef  = ReadInt(&m_clientSocket);
***************
*** 264,272 ****
                      break;
  
!                 case CMD_RESET:
                      Reset();
                      break;
  
!                 case CMD_EVALUATE_EXPR:
                      {
                          int exprRef       = ReadInt(&m_clientSocket);
--- 264,272 ----
                      break;
  
!                 case wxLUA_CMD_RESET:
                      Reset();
                      break;
  
!                 case wxLUA_CMD_EVALUATE_EXPR:
                      {
                          int exprRef       = ReadInt(&m_clientSocket);
***************
*** 276,280 ****
                      break;
  
!                 case CMD_CLEAR_DEBUG_REFERENCES:
                      {
                          size_t idx, idxMax = m_references.GetCount();
--- 276,280 ----
                      break;
  
!                 case wxLUA_CMD_CLEAR_DEBUG_REFERENCES:
                      {
                          size_t idx, idxMax = m_references.GetCount();
***************
*** 286,292 ****
                      }
                      break;
!                 case CMD_DISABLE_BREAKPOINT:
                      break;
!                 case CMD_ENABLE_BREAKPOINT:
                      break;
              }
--- 286,293 ----
                      }
                      break;
! 
!                 case wxLUA_CMD_DISABLE_BREAKPOINT:
                      break;
!                 case wxLUA_CMD_ENABLE_BREAKPOINT:
                      break;
              }
***************
*** 332,337 ****
  bool wxLuaDebugTarget::Run(const wxString &fileName, const wxString &buffer)
  {
!     wxLuaBuffer *pBuffer = new wxLuaBuffer(fileName,
!                                            buffer);
      if (pBuffer != NULL)
      {
--- 333,338 ----
  bool wxLuaDebugTarget::Run(const wxString &fileName, const wxString &buffer)
  {
!     wxLuaBuffer *pBuffer = new wxLuaBuffer(fileName, buffer);
! 
      if (pBuffer != NULL)
      {
***************
*** 345,353 ****
  {
      m_nextOperation = DEBUG_STEP;
      if (!m_fRunning)
          m_runCondition.Signal();
!     else
!     if (m_fStopped)
          m_debugCondition.Signal();
      return true;
  }
--- 346,355 ----
  {
      m_nextOperation = DEBUG_STEP;
+ 
      if (!m_fRunning)
          m_runCondition.Signal();
!     else if (m_fStopped)
          m_debugCondition.Signal();
+ 
      return true;
  }
***************
*** 357,365 ****
      m_nFramesUntilBreak = 0;
      m_nextOperation = DEBUG_STEPOVER;
      if (!m_fRunning)
          m_runCondition.Signal();
!     else
!     if (m_fStopped)
          m_debugCondition.Signal();
      return true;
  }
--- 359,368 ----
      m_nFramesUntilBreak = 0;
      m_nextOperation = DEBUG_STEPOVER;
+ 
      if (!m_fRunning)
          m_runCondition.Signal();
!     else if (m_fStopped)
          m_debugCondition.Signal();
+ 
      return true;
  }
***************
*** 369,377 ****
      m_nFramesUntilBreak = 1;
      m_nextOperation = DEBUG_STEPOVER;
      if (!m_fRunning)
          m_runCondition.Signal();
!     else
!     if (m_fStopped)
          m_debugCondition.Signal();
      return true;
  }
--- 372,381 ----
      m_nFramesUntilBreak = 1;
      m_nextOperation = DEBUG_STEPOVER;
+ 
      if (!m_fRunning)
          m_runCondition.Signal();
!     else if (m_fStopped)
          m_debugCondition.Signal();
+ 
      return true;
  }
***************
*** 380,388 ****
  {
      m_nextOperation = DEBUG_GO;
      if (!m_fRunning)
          m_runCondition.Signal();
!     else
!     if (m_fStopped)
          m_debugCondition.Signal();
      return true;
  }
--- 384,393 ----
  {
      m_nextOperation = DEBUG_GO;
+ 
      if (!m_fRunning)
          m_runCondition.Signal();
!     else if (m_fStopped)
          m_debugCondition.Signal();
+ 
      return true;
  }
***************
*** 390,394 ****
  bool wxLuaDebugTarget::Break()
  {
!     m_forceBreak = TRUE;
      return true;
  }
--- 395,399 ----
  bool wxLuaDebugTarget::Break()
  {
!     m_forceBreak = true;
      return true;
  }
***************
*** 396,406 ****
  bool wxLuaDebugTarget::Reset()
  {
!     m_forceBreak     = TRUE;
!     m_resetRequested = TRUE;
      if (!m_fRunning)
          m_runCondition.Signal();
!     else
!     if (m_fStopped)
          m_debugCondition.Signal();
      return true;
  }
--- 401,412 ----
  bool wxLuaDebugTarget::Reset()
  {
!     m_forceBreak     = true;
!     m_resetRequested = true;
! 
      if (!m_fRunning)
          m_runCondition.Signal();
!     else if (m_fStopped)
          m_debugCondition.Signal();
+ 
      return true;
  }
***************
*** 426,430 ****
                  // skip stack frames that do not have line number
                  int  currentLine = luaDebug.currentline;
!                 if (!fFirst || currentLine != -1)
                  {
                      if (currentLine == -1)
--- 432,436 ----
                  // skip stack frames that do not have line number
                  int  currentLine = luaDebug.currentline;
!                 if (!fFirst || (currentLine != -1))
                  {
                      if (currentLine == -1)
***************
*** 898,905 ****
  wxString wxLuaDebugTarget::MakeBoolean(int num)
  {
!     if (num)
!         return wxT("True");
! 
!     return wxT("False");
  }
  
--- 904,908 ----
  wxString wxLuaDebugTarget::MakeBoolean(int num)
  {
!     return num != 0 ? wxT("True") : wxT("False");
  }
  
***************
*** 908,912 ****
      if (WaitForConnect())
      {
!         WriteByte(&m_clientSocket, EVENT_DEBUG_BREAK);
          WriteString(&m_clientSocket, fileName);
          WriteInt(&m_clientSocket, lineNumber);
--- 911,915 ----
      if (WaitForConnect())
      {
!         WriteByte(&m_clientSocket, wxLUA_EVENT_DEBUG_BREAK);
          WriteString(&m_clientSocket, fileName);
          WriteInt(&m_clientSocket, lineNumber);
***************
*** 920,924 ****
      if (WaitForConnect())
      {
!         WriteByte(&m_clientSocket, EVENT_DEBUG_ERROR);
          WriteString(&m_clientSocket, errorMsg);
          return true;
--- 923,927 ----
      if (WaitForConnect())
      {
!         WriteByte(&m_clientSocket, wxLUA_EVENT_DEBUG_ERROR);
          WriteString(&m_clientSocket, errorMsg);
          return true;
***************
*** 931,935 ****
      if (WaitForConnect())
      {
!         WriteByte(&m_clientSocket, EVENT_DEBUG_ERROR);
          WriteString(&m_clientSocket, errorMsg);
          return true;
--- 934,938 ----
      if (WaitForConnect())
      {
!         WriteByte(&m_clientSocket, wxLUA_EVENT_DEBUG_ERROR);
          WriteString(&m_clientSocket, errorMsg);
          return true;
***************
*** 946,950 ****
      if (WaitForConnect())
      {
!         WriteByte(&m_clientSocket, EVENT_DEBUG_EXIT);
          return true;
      }
--- 949,953 ----
      if (WaitForConnect())
      {
!         WriteByte(&m_clientSocket, wxLUA_EVENT_DEBUG_EXIT);
          return true;
      }
***************
*** 956,960 ****
      if (WaitForConnect())
      {
!         WriteByte(&m_clientSocket, EVENT_DEBUG_STACK_ENUM);
          WriteDebugData(&m_clientSocket, pDebugData);
          return true;
--- 959,963 ----
      if (WaitForConnect())
      {
!         WriteByte(&m_clientSocket, wxLUA_EVENT_DEBUG_STACK_ENUM);
          WriteDebugData(&m_clientSocket, pDebugData);
          return true;
***************
*** 964,973 ****
  }
  
! bool wxLuaDebugTarget::NotifyStackEntryEnumeration(int          entryRef,
                                                     wxLuaDebugData *pDebugData)
  {
      if (WaitForConnect())
      {
!         WriteByte(&m_clientSocket, EVENT_DEBUG_STACK_ENTRY_ENUM);
          WriteInt(&m_clientSocket, entryRef);
          WriteDebugData(&m_clientSocket, pDebugData);
--- 967,976 ----
  }
  
! bool wxLuaDebugTarget::NotifyStackEntryEnumeration(int             entryRef,
                                                     wxLuaDebugData *pDebugData)
  {
      if (WaitForConnect())
      {
!         WriteByte(&m_clientSocket, wxLUA_EVENT_DEBUG_STACK_ENTRY_ENUM);
          WriteInt(&m_clientSocket, entryRef);
          WriteDebugData(&m_clientSocket, pDebugData);
***************
*** 978,987 ****
  }
  
! bool wxLuaDebugTarget::NotifyTableEnumeration(int          itemNode,
                                                wxLuaDebugData *pDebugData)
  {
      if (WaitForConnect())
      {
!         WriteByte(&m_clientSocket, EVENT_DEBUG_TABLE_ENUM);
          WriteInt(&m_clientSocket, itemNode);
          WriteDebugData(&m_clientSocket, pDebugData);
--- 981,990 ----
  }
  
! bool wxLuaDebugTarget::NotifyTableEnumeration(int             itemNode,
                                                wxLuaDebugData *pDebugData)
  {
      if (WaitForConnect())
      {
!         WriteByte(&m_clientSocket, wxLUA_EVENT_DEBUG_TABLE_ENUM);
          WriteInt(&m_clientSocket, itemNode);
          WriteDebugData(&m_clientSocket, pDebugData);
***************
*** 992,1001 ****
  }
  
! bool wxLuaDebugTarget::NotifyEvaluateExpr(int                exprRef,
                                            const wxString &strResult)
  {
      if (WaitForConnect())
      {
!         WriteByte(&m_clientSocket, EVENT_DEBUG_EVALUATE_EXPR);
          WriteInt(&m_clientSocket, exprRef);
          WriteString(&m_clientSocket, strResult);
--- 995,1004 ----
  }
  
! bool wxLuaDebugTarget::NotifyEvaluateExpr(int             exprRef,
                                            const wxString &strResult)
  {
      if (WaitForConnect())
      {
!         WriteByte(&m_clientSocket, wxLUA_EVENT_DEBUG_EVALUATE_EXPR);
          WriteInt(&m_clientSocket, exprRef);
          WriteString(&m_clientSocket, strResult);
***************
*** 1037,1041 ****
              m_nFramesUntilBreak++;
          else
!         if (event == LUA_HOOKRET || event == LUA_HOOKTAILRET) // return
          {
              if (m_nFramesUntilBreak > 0)
--- 1040,1044 ----
              m_nFramesUntilBreak++;
          else
!         if ((event == LUA_HOOKRET) || (event == LUA_HOOKTAILRET)) // return
          {
              if (m_nFramesUntilBreak > 0)
***************
*** 1118,1122 ****
  }
  
! int LUACALL wxLuaDebugTarget::LuaPrint (lua_State *L)
  {
      int         idx;
--- 1121,1125 ----
  }
  
! int LUACALL wxLuaDebugTarget::LuaPrint(lua_State *L)
  {
      int         idx;

Index: wxldbgio.cpp
===================================================================
RCS file: /cvsroot/wxlua/wxLua/modules/wxluasocket/src/wxldbgio.cpp,v
retrieving revision 1.2
retrieving revision 1.3
diff -C2 -d -r1.2 -r1.3
*** wxldbgio.cpp	25 Nov 2005 19:45:37 -0000	1.2
--- wxldbgio.cpp	1 Dec 2005 04:17:29 -0000	1.3
***************
*** 23,28 ****
  
  #include "wxluasocket/include/wxldbgio.h"
  #include "wxluasocket/include/wxlsock.h"
- #include "wxlua/include/internal.h"
  #include "wxluadebug/include/wxldebug.h"
  
--- 23,28 ----
  
  #include "wxluasocket/include/wxldbgio.h"
+ #include "wxlua/include/wxlstate.h"
  #include "wxluasocket/include/wxlsock.h"
  #include "wxluadebug/include/wxldebug.h"
  
***************
*** 102,106 ****
      try
      {
!         size_t idx, idxMax;
          pSocket->Read((char *) &idxMax, sizeof(idxMax));
  
--- 102,106 ----
      try
      {
!         size_t idx, idxMax = 0;
          pSocket->Read((char *) &idxMax, sizeof(idxMax));
  
***************
*** 248,252 ****
  bool wxLuaDebugIO::WriteString(wxLuaSocket *pSocket, const wxString &value)
  {
!     bool result = FALSE;
      try
      {
--- 248,252 ----
  bool wxLuaDebugIO::WriteString(wxLuaSocket *pSocket, const wxString &value)
  {
!     bool result = false;
      try
      {
***************
*** 258,262 ****
              pSocket->Write(buf.GetData(), buflen);
          }
!         result = TRUE;
      }
      catch(wxLuaSocketException & /*e*/)
--- 258,262 ----
              pSocket->Write(buf.GetData(), buflen);
          }
!         result = true;
      }
      catch(wxLuaSocketException & /*e*/)

Index: dservice.cpp
===================================================================
RCS file: /cvsroot/wxlua/wxLua/modules/wxluasocket/src/dservice.cpp,v
retrieving revision 1.4
retrieving revision 1.5
diff -C2 -d -r1.4 -r1.5
*** dservice.cpp	26 Nov 2005 03:15:20 -0000	1.4
--- dservice.cpp	1 Dec 2005 04:17:29 -0000	1.5
***************
*** 374,378 ****
          m_serverSocket->SetNotify(wxSOCKET_CONNECTION_FLAG);
          m_serverSocket->SetFlags(wxSOCKET_BLOCK);
!         m_serverSocket->Notify(TRUE);
      }
  
--- 374,378 ----
          m_serverSocket->SetNotify(wxSOCKET_CONNECTION_FLAG);
          m_serverSocket->SetFlags(wxSOCKET_BLOCK);
!         m_serverSocket->Notify(true);
      }
  
***************
*** 396,400 ****
      {
          wxLuaDebugSocket* debugSocket;
!         wxSocketBase *sock = m_serverSocket->Accept(FALSE);
          if (!sock)
          {
--- 396,400 ----
      {
          wxLuaDebugSocket* debugSocket;
!         wxSocketBase *sock = m_serverSocket->Accept(false);
          if (!sock)
          {
***************
*** 417,421 ****
          sock->SetEventHandler(*this, SOCKET_ID);
          sock->SetNotify(wxSOCKET_INPUT_FLAG | wxSOCKET_LOST_FLAG);
!         sock->Notify(TRUE);
  
          // Notify Connected Debugger of Existing BreakPoints
--- 417,421 ----
          sock->SetEventHandler(*this, SOCKET_ID);
          sock->SetNotify(wxSOCKET_INPUT_FLAG | wxSOCKET_LOST_FLAG);
!         sock->Notify(true);
  
          // Notify Connected Debugger of Existing BreakPoints
***************
*** 454,458 ****
              switch(debugCommand)
              {
!             case CMD_ADD_BREAKPOINT:
                  {
                      wxString fileName   = debugSocket->ReadString();
--- 454,458 ----
              switch(debugCommand)
              {
!             case wxLUA_CMD_ADD_BREAKPOINT:
                  {
                      wxString fileName   = debugSocket->ReadString();
***************
*** 463,467 ****
                  break;
  
!             case CMD_REMOVE_BREAKPOINT:
                  {
                      wxString fileName   = debugSocket->ReadString();
--- 463,467 ----
                  break;
  
!             case wxLUA_CMD_REMOVE_BREAKPOINT:
                  {
                      wxString fileName   = debugSocket->ReadString();
***************
*** 472,476 ****
                  break;
  
!             case CMD_DISABLE_BREAKPOINT:
                  {
                      wxString fileName   = debugSocket->ReadString();
--- 472,476 ----
                  break;
  
!             case wxLUA_CMD_DISABLE_BREAKPOINT:
                  {
                      wxString fileName   = debugSocket->ReadString();
***************
*** 482,486 ****
  
  
!             case CMD_ENABLE_BREAKPOINT:
                  {
                      wxString fileName   = debugSocket->ReadString();
--- 482,486 ----
  
  
!             case wxLUA_CMD_ENABLE_BREAKPOINT:
                  {
                      wxString fileName   = debugSocket->ReadString();
***************
*** 491,523 ****
                  break;
  
!             case CMD_CLEAR_ALL_BREAKPOINTS:
                  debuggee->ClearAllBreakPoints();
                  break;
  
!             case CMD_DEBUG_STEP:
                  debuggee->Step();
                  break;
  
!             case CMD_DEBUG_STEPOVER:
                  debuggee->StepOver();
                  break;
  
!             case CMD_DEBUG_STEPOUT:
                  debuggee->StepOut();
                  break;
  
!             case CMD_DEBUG_CONTINUE:
                  debuggee->Continue();
                  break;
  
!             case CMD_DEBUG_BREAK:
                  debuggee->Break();
                  break;
  
!             case CMD_ENUMERATE_STACK:
                  debuggee->EnumerateStack();
                  break;
  
!             case CMD_ENUMERATE_STACK_ENTRY:
                  {
                      int stackRef = debugSocket->ReadInt();
--- 491,523 ----
                  break;
  
!             case wxLUA_CMD_CLEAR_ALL_BREAKPOINTS:
                  debuggee->ClearAllBreakPoints();
                  break;
  
!             case wxLUA_CMD_DEBUG_STEP:
                  debuggee->Step();
                  break;
  
!             case wxLUA_CMD_DEBUG_STEPOVER:
                  debuggee->StepOver();
                  break;
  
!             case wxLUA_CMD_DEBUG_STEPOUT:
                  debuggee->StepOut();
                  break;
  
!             case wxLUA_CMD_DEBUG_CONTINUE:
                  debuggee->Continue();
                  break;
  
!             case wxLUA_CMD_DEBUG_BREAK:
                  debuggee->Break();
                  break;
  
!             case wxLUA_CMD_ENUMERATE_STACK:
                  debuggee->EnumerateStack();
                  break;
  
!             case wxLUA_CMD_ENUMERATE_STACK_ENTRY:
                  {
                      int stackRef = debugSocket->ReadInt();
***************
*** 526,530 ****
                  break;
  
!             case CMD_ENUMERATE_TABLE_REF:
                  {
                      int tableRef  = debugSocket->ReadInt();
--- 526,530 ----
                  break;
  
!             case wxLUA_CMD_ENUMERATE_TABLE_REF:
                  {
                      int tableRef  = debugSocket->ReadInt();
***************
*** 535,543 ****
                  break;
  
!             case CMD_RESET:
                  debuggee->Reset();
                  break;
  
!             case CMD_EVALUATE_EXPR:
                  {
                      int      exprRef  = debugSocket->ReadInt();
--- 535,543 ----
                  break;
  
!             case wxLUA_CMD_RESET:
                  debuggee->Reset();
                  break;
  
!             case wxLUA_CMD_EVALUATE_EXPR:
                  {
                      int      exprRef  = debugSocket->ReadInt();
***************
*** 547,556 ****
                  break;
  
!             case CMD_CLEAR_DEBUG_REFERENCES:
                  {
                      debuggee->ClearReferences();
                  }
                  break;
!             case CMD_RUN_BUFFER: break; // FIXME - not impemented
              }
          }
--- 547,556 ----
                  break;
  
!             case wxLUA_CMD_CLEAR_DEBUG_REFERENCES:
                  {
                      debuggee->ClearReferences();
                  }
                  break;
!             case wxLUA_CMD_RUN_BUFFER: break; // FIXME - not impemented
              }
          }
***************
*** 594,598 ****
                  debuggee->Continue();
  
!             wxLuaDebugEvent debugEvent(wxEVT_DEBUG_STOPDEBUGGER);
              wxLuaHandler::GetHandler().ProcessEvent(debugEvent);
          }
--- 594,598 ----
                  debuggee->Continue();
  
!             wxLuaDebugEvent debugEvent(wxEVT_WXLUA_DEBUG_STOPDEBUGGER);
              wxLuaHandler::GetHandler().ProcessEvent(debugEvent);
          }
***************
*** 656,660 ****
      if (!IsDebugger())
      {
!         wxLuaDebugEvent debugEvent(wxEVT_DEBUG_STARTDEBUGGER);
  
          // started debug process
--- 656,660 ----
      if (!IsDebugger())
      {
!         wxLuaDebugEvent debugEvent(wxEVT_WXLUA_DEBUG_STARTDEBUGGER);
  
          // started debug process
***************
*** 673,677 ****
      for (size_t i = 0; i < m_debuggerSocketList.GetCount(); i++)
      {
!         m_debuggerSocketList[i]->WriteByte(EVENT_DEBUG_BREAK);
  #if wxCHECK_VERSION(2,3,0)
          m_debuggerSocketList[i]->WriteString(fileName.GetFullPath());
--- 673,677 ----
      for (size_t i = 0; i < m_debuggerSocketList.GetCount(); i++)
      {
!         m_debuggerSocketList[i]->WriteByte(wxLUA_EVENT_DEBUG_BREAK);
  #if wxCHECK_VERSION(2,3,0)
          m_debuggerSocketList[i]->WriteString(fileName.GetFullPath());
***************
*** 697,701 ****
      for (size_t i = 0; i < m_debuggerSocketList.GetCount(); i++)
      {
!         m_debuggerSocketList[i]->WriteByte(EVENT_DEBUG_ERROR);
          m_debuggerSocketList[i]->WriteString(errorMsg);
  
--- 697,701 ----
      for (size_t i = 0; i < m_debuggerSocketList.GetCount(); i++)
      {
!         m_debuggerSocketList[i]->WriteByte(wxLUA_EVENT_DEBUG_ERROR);
          m_debuggerSocketList[i]->WriteString(errorMsg);
  
***************
*** 716,720 ****
      for (size_t i = 0; i < m_debuggerSocketList.GetCount(); i++)
      {
!         m_debuggerSocketList[i]->WriteByte(EVENT_DEBUG_ERROR);
          m_debuggerSocketList[i]->WriteString(errorMsg);
  
--- 716,720 ----
      for (size_t i = 0; i < m_debuggerSocketList.GetCount(); i++)
      {
!         m_debuggerSocketList[i]->WriteByte(wxLUA_EVENT_DEBUG_ERROR);
          m_debuggerSocketList[i]->WriteString(errorMsg);
  
***************
*** 735,739 ****
      for (size_t i = 0; i < m_debuggerSocketList.GetCount(); i++)
      {
!         m_debuggerSocketList[i]->WriteByte(EVENT_DEBUG_EXIT);
  
          if (!m_debuggerSocketList[i]->Error())
--- 735,739 ----
      for (size_t i = 0; i < m_debuggerSocketList.GetCount(); i++)
      {
!         m_debuggerSocketList[i]->WriteByte(wxLUA_EVENT_DEBUG_EXIT);
  
          if (!m_debuggerSocketList[i]->Error())
***************
*** 753,757 ****
      for (size_t i = 0; i < m_debuggerSocketList.GetCount(); i++)
      {
!         m_debuggerSocketList[i]->WriteByte(EVENT_DEBUG_STACK_ENUM);
          m_debuggerSocketList[i]->WriteDebugData(pDebugData);
  
--- 753,757 ----
      for (size_t i = 0; i < m_debuggerSocketList.GetCount(); i++)
      {
!         m_debuggerSocketList[i]->WriteByte(wxLUA_EVENT_DEBUG_STACK_ENUM);
          m_debuggerSocketList[i]->WriteDebugData(pDebugData);
  
***************
*** 774,778 ****
      for (size_t i = 0; i < m_debuggerSocketList.GetCount(); i++)
      {
!         m_debuggerSocketList[i]->WriteByte(EVENT_DEBUG_STACK_ENTRY_ENUM);
          m_debuggerSocketList[i]->WriteInt(entryRef);
          m_debuggerSocketList[i]->WriteDebugData(pDebugData);
--- 774,778 ----
      for (size_t i = 0; i < m_debuggerSocketList.GetCount(); i++)
      {
!         m_debuggerSocketList[i]->WriteByte(wxLUA_EVENT_DEBUG_STACK_ENTRY_ENUM);
          m_debuggerSocketList[i]->WriteInt(entryRef);
          m_debuggerSocketList[i]->WriteDebugData(pDebugData);
***************
*** 796,800 ****
      for (size_t i = 0; i < m_debuggerSocketList.GetCount(); i++)
      {
!         m_debuggerSocketList[i]->WriteByte(EVENT_DEBUG_TABLE_ENUM);
          m_debuggerSocketList[i]->WriteInt(itemNode);
          m_debuggerSocketList[i]->WriteDebugData(pDebugData);
--- 796,800 ----
      for (size_t i = 0; i < m_debuggerSocketList.GetCount(); i++)
      {
!         m_debuggerSocketList[i]->WriteByte(wxLUA_EVENT_DEBUG_TABLE_ENUM);
          m_debuggerSocketList[i]->WriteInt(itemNode);
          m_debuggerSocketList[i]->WriteDebugData(pDebugData);
***************
*** 818,822 ****
      for (size_t i = 0; i < m_debuggerSocketList.GetCount(); i++)
      {
!         m_debuggerSocketList[i]->WriteByte(EVENT_DEBUG_EVALUATE_EXPR);
          m_debuggerSocketList[i]->WriteInt(exprRef);
          m_debuggerSocketList[i]->WriteString(strResult);
--- 818,822 ----
      for (size_t i = 0; i < m_debuggerSocketList.GetCount(); i++)
      {
!         m_debuggerSocketList[i]->WriteByte(wxLUA_EVENT_DEBUG_EVALUATE_EXPR);
          m_debuggerSocketList[i]->WriteInt(exprRef);
          m_debuggerSocketList[i]->WriteString(strResult);
***************
*** 840,844 ****
          if (!debugSocket || debugSocket == m_debuggerSocketList[i])
          {
!             m_debuggerSocketList[i]->WriteByte(EVENT_DEBUG_BREAKPOINT_ADDED);
  #if wxCHECK_VERSION(2,3,0)
              m_debuggerSocketList[i]->WriteString(breakPoint.GetFileName().GetFullPath());
--- 840,844 ----
          if (!debugSocket || debugSocket == m_debuggerSocketList[i])
          {
!             m_debuggerSocketList[i]->WriteByte(wxLUA_EVENT_DEBUG_BREAKPOINT_ADDED);
  #if wxCHECK_VERSION(2,3,0)
              m_debuggerSocketList[i]->WriteString(breakPoint.GetFileName().GetFullPath());
***************
*** 868,872 ****
          if (!debugSocket || debugSocket == m_debuggerSocketList[i])
          {
!             m_debuggerSocketList[i]->WriteByte(EVENT_DEBUG_BREAKPOINT_REMOVED);
  #if wxCHECK_VERSION(2,3,0)
              m_debuggerSocketList[i]->WriteString(breakPoint.GetFileName().GetFullPath());
--- 868,872 ----
          if (!debugSocket || debugSocket == m_debuggerSocketList[i])
          {
!             m_debuggerSocketList[i]->WriteByte(wxLUA_EVENT_DEBUG_BREAKPOINT_REMOVED);
  #if wxCHECK_VERSION(2,3,0)
              m_debuggerSocketList[i]->WriteString(breakPoint.GetFileName().GetFullPath());
***************
*** 932,936 ****
                      wxSOCKET_INPUT_FLAG |
                      wxSOCKET_LOST_FLAG);
!     sock->Notify(TRUE);
  
      if (!sock->Connect(addr, true))
--- 932,936 ----
                      wxSOCKET_INPUT_FLAG |
                      wxSOCKET_LOST_FLAG);
!     sock->Notify(true);
  
      if (!sock->Connect(addr, true))
***************
*** 979,988 ****
          switch((wxLuaDebugEvents_Type) debuggeeEvent)
          {
!         case EVENT_DEBUG_BREAK:
              {
                  wxString fileName   = m_debuggerSocket->ReadString();
                  int      lineNumber = m_debuggerSocket->ReadInt();
  
!                 wxLuaDebugEvent debugEvent(wxEVT_DEBUG_BREAK, lineNumber, fileName);
  
                  wxLuaHandler::GetHandler().AddPendingEvent(debugEvent);
--- 979,988 ----
          switch((wxLuaDebugEvents_Type) debuggeeEvent)
          {
!         case wxLUA_EVENT_DEBUG_BREAK:
              {
                  wxString fileName   = m_debuggerSocket->ReadString();
                  int      lineNumber = m_debuggerSocket->ReadInt();
  
!                 wxLuaDebugEvent debugEvent(wxEVT_WXLUA_DEBUG_BREAK, lineNumber, fileName);
  
                  wxLuaHandler::GetHandler().AddPendingEvent(debugEvent);
***************
*** 990,998 ****
              break;
  
!         case EVENT_DEBUG_PRINT:
              {
                  wxString strMessage = m_debuggerSocket->ReadString();
  
!                 wxLuaDebugEvent debugEvent(wxEVT_DEBUG_PRINT);
                  debugEvent.SetMessage(strMessage);
  
--- 990,998 ----
              break;
  
!         case wxLUA_EVENT_DEBUG_PRINT:
              {
                  wxString strMessage = m_debuggerSocket->ReadString();
  
!                 wxLuaDebugEvent debugEvent(wxEVT_WXLUA_DEBUG_PRINT);
                  debugEvent.SetMessage(strMessage);
  
***************
*** 1001,1009 ****
              break;
  
!         case EVENT_DEBUG_ERROR:
              {
                  wxString strMessage = m_debuggerSocket->ReadString();
  
!                 wxLuaDebugEvent debugEvent(wxEVT_DEBUG_ERROR);
                  debugEvent.SetMessage(strMessage);
  
--- 1001,1009 ----
              break;
  
!         case wxLUA_EVENT_DEBUG_ERROR:
              {
                  wxString strMessage = m_debuggerSocket->ReadString();
  
!                 wxLuaDebugEvent debugEvent(wxEVT_WXLUA_DEBUG_ERROR);
                  debugEvent.SetMessage(strMessage);
  
***************
*** 1012,1025 ****
              break;
  
!         case EVENT_DEBUG_EXIT:
              {
!                 wxLuaDebugEvent debugEvent(wxEVT_DEBUG_EXIT);
                  wxLuaHandler::GetHandler().AddPendingEvent(debugEvent);
              }
              break;
  
!         case EVENT_DEBUG_STACK_ENUM:
              {
!                 wxLuaDebugEvent  debugEvent(wxEVT_DEBUG_STACK_ENUM);
                  wxLuaDebugData     *pDebugData = m_debuggerSocket->ReadDebugData();
                  if (pDebugData != NULL)
--- 1012,1025 ----
              break;
  
!         case wxLUA_EVENT_DEBUG_EXIT:
              {
!                 wxLuaDebugEvent debugEvent(wxEVT_WXLUA_DEBUG_EXIT);
                  wxLuaHandler::GetHandler().AddPendingEvent(debugEvent);
              }
              break;
  
!         case wxLUA_EVENT_DEBUG_STACK_ENUM:
              {
!                 wxLuaDebugEvent  debugEvent(wxEVT_WXLUA_DEBUG_STACK_ENUM);
                  wxLuaDebugData     *pDebugData = m_debuggerSocket->ReadDebugData();
                  if (pDebugData != NULL)
***************
*** 1030,1036 ****
              break;
  
!         case EVENT_DEBUG_STACK_ENTRY_ENUM:
              {
!                 wxLuaDebugEvent  debugEvent(wxEVT_DEBUG_STACK_ENTRY_ENUM);
                  int              stackRef   = m_debuggerSocket->ReadInt();
                  wxLuaDebugData     *pDebugData = m_debuggerSocket->ReadDebugData();
--- 1030,1036 ----
              break;
  
!         case wxLUA_EVENT_DEBUG_STACK_ENTRY_ENUM:
              {
!                 wxLuaDebugEvent  debugEvent(wxEVT_WXLUA_DEBUG_STACK_ENTRY_ENUM);
                  int              stackRef   = m_debuggerSocket->ReadInt();
                  wxLuaDebugData     *pDebugData = m_debuggerSocket->ReadDebugData();
***************
*** 1042,1048 ****
              break;
  
!         case EVENT_DEBUG_TABLE_ENUM:
              {
!                 wxLuaDebugEvent  debugEvent(wxEVT_DEBUG_TABLE_ENUM);
                  int              itemNode   = m_debuggerSocket->ReadInt();
                  wxLuaDebugData     *pDebugData = m_debuggerSocket->ReadDebugData();
--- 1042,1048 ----
              break;
  
!         case wxLUA_EVENT_DEBUG_TABLE_ENUM:
              {
!                 wxLuaDebugEvent  debugEvent(wxEVT_WXLUA_DEBUG_TABLE_ENUM);
                  int              itemNode   = m_debuggerSocket->ReadInt();
                  wxLuaDebugData     *pDebugData = m_debuggerSocket->ReadDebugData();
***************
*** 1054,1060 ****
              break;
  
!         case EVENT_DEBUG_EVALUATE_EXPR:
              {
!                 wxLuaDebugEvent  debugEvent(wxEVT_DEBUG_EVALUATE_EXPR);
                  int              exprRef   = m_debuggerSocket->ReadInt();
                  wxString         strResult = m_debuggerSocket->ReadString();
--- 1054,1060 ----
              break;
  
!         case wxLUA_EVENT_DEBUG_EVALUATE_EXPR:
              {
!                 wxLuaDebugEvent  debugEvent(wxEVT_WXLUA_DEBUG_EVALUATE_EXPR);
                  int              exprRef   = m_debuggerSocket->ReadInt();
                  wxString         strResult = m_debuggerSocket->ReadString();
***************
*** 1067,1071 ****
              break;
  
!         case EVENT_DEBUG_BREAKPOINT_ADDED:
              {
                  wxString         fileName = m_debuggerSocket->ReadString();
--- 1067,1071 ----
              break;
  
!         case wxLUA_EVENT_DEBUG_BREAKPOINT_ADDED:
              {
                  wxString         fileName = m_debuggerSocket->ReadString();
***************
*** 1073,1087 ****
                  bool             enabled = m_debuggerSocket->ReadInt() ? true : false;
  
!                 wxLuaDebugEvent  debugEvent(wxEVT_DEBUG_BREAKPOINT_ADDED, line, fileName, enabled);
                  wxLuaHandler::GetHandler().AddPendingEvent(debugEvent);
              }
              break;
  
!         case EVENT_DEBUG_BREAKPOINT_REMOVED:
              {
                  wxString         fileName = m_debuggerSocket->ReadString();
                  int              line = m_debuggerSocket->ReadInt();
  
!                 wxLuaDebugEvent  debugEvent(wxEVT_DEBUG_BREAKPOINT_REMOVED, line, fileName);
                  wxLuaHandler::GetHandler().AddPendingEvent(debugEvent);
              }
--- 1073,1087 ----
                  bool             enabled = m_debuggerSocket->ReadInt() ? true : false;
  
!                 wxLuaDebugEvent  debugEvent(wxEVT_WXLUA_DEBUG_BREAKPOINT_ADDED, line, fileName, enabled);
                  wxLuaHandler::GetHandler().AddPendingEvent(debugEvent);
              }
              break;
  
!         case wxLUA_EVENT_DEBUG_BREAKPOINT_REMOVED:
              {
                  wxString         fileName = m_debuggerSocket->ReadString();
                  int              line = m_debuggerSocket->ReadInt();
  
!                 wxLuaDebugEvent  debugEvent(wxEVT_WXLUA_DEBUG_BREAKPOINT_REMOVED, line, fileName);
                  wxLuaHandler::GetHandler().AddPendingEvent(debugEvent);
              }
***************
*** 1116,1120 ****
          return false;
  
!     return (m_debuggerSocket->WriteByte(CMD_ADD_BREAKPOINT) &&
              m_debuggerSocket->WriteString(fileName)         &&
              m_debuggerSocket->WriteInt(lineNumber));
--- 1116,1120 ----
          return false;
  
!     return (m_debuggerSocket->WriteByte(wxLUA_CMD_ADD_BREAKPOINT) &&
              m_debuggerSocket->WriteString(fileName)         &&
              m_debuggerSocket->WriteInt(lineNumber));
***************
*** 1126,1130 ****
          return false;
  
!     return (m_debuggerSocket->WriteByte(CMD_REMOVE_BREAKPOINT) &&
              m_debuggerSocket->WriteString(fileName)            &&
              m_debuggerSocket->WriteInt(lineNumber));
--- 1126,1130 ----
          return false;
  
!     return (m_debuggerSocket->WriteByte(wxLUA_CMD_REMOVE_BREAKPOINT) &&
              m_debuggerSocket->WriteString(fileName)            &&
              m_debuggerSocket->WriteInt(lineNumber));
***************
*** 1136,1140 ****
          return false;
  
!     return (m_debuggerSocket->WriteByte(CMD_DISABLE_BREAKPOINT) &&
              m_debuggerSocket->WriteString(fileName)         &&
              m_debuggerSocket->WriteInt(lineNumber));
--- 1136,1140 ----
          return false;
  
!     return (m_debuggerSocket->WriteByte(wxLUA_CMD_DISABLE_BREAKPOINT) &&
              m_debuggerSocket->WriteString(fileName)         &&
              m_debuggerSocket->WriteInt(lineNumber));
***************
*** 1146,1150 ****
          return false;
  
!     return (m_debuggerSocket->WriteByte(CMD_ENABLE_BREAKPOINT) &&
              m_debuggerSocket->WriteString(fileName)         &&
              m_debuggerSocket->WriteInt(lineNumber));
--- 1146,1150 ----
          return false;
  
!     return (m_debuggerSocket->WriteByte(wxLUA_CMD_ENABLE_BREAKPOINT) &&
              m_debuggerSocket->WriteString(fileName)         &&
              m_debuggerSocket->WriteInt(lineNumber));
***************
*** 1156,1160 ****
          return false;
  
!     return (m_debuggerSocket->WriteByte(CMD_CLEAR_ALL_BREAKPOINTS));
  }
  
--- 1156,1160 ----
          return false;
  
!     return (m_debuggerSocket->WriteByte(wxLUA_CMD_CLEAR_ALL_BREAKPOINTS));
  }
  
***************
*** 1164,1168 ****
          return false;
  
!     return m_debuggerSocket->WriteByte(CMD_DEBUG_STEP);
  }
  
--- 1164,1168 ----
          return false;
  
!     return m_debuggerSocket->WriteByte(wxLUA_CMD_DEBUG_STEP);
  }
  
***************
*** 1172,1176 ****
          return false;
  
!     return m_debuggerSocket->WriteByte(CMD_DEBUG_STEPOVER);
  }
  
--- 1172,1176 ----
          return false;
  
!     return m_debuggerSocket->WriteByte(wxLUA_CMD_DEBUG_STEPOVER);
  }
  
***************
*** 1180,1184 ****
          return false;
  
!     return m_debuggerSocket->WriteByte(CMD_DEBUG_STEPOUT);
  }
  
--- 1180,1184 ----
          return false;
  
!     return m_debuggerSocket->WriteByte(wxLUA_CMD_DEBUG_STEPOUT);
  }
  
***************
*** 1188,1192 ****
          return false;
  
!     return m_debuggerSocket->WriteByte(CMD_DEBUG_CONTINUE);
  }
  
--- 1188,1192 ----
          return false;
  
!     return m_debuggerSocket->WriteByte(wxLUA_CMD_DEBUG_CONTINUE);
  }
  
***************
*** 1196,1200 ****
          return false;
  
!     return m_debuggerSocket->WriteByte(CMD_DEBUG_BREAK);
  }
  
--- 1196,1200 ----
          return false;
  
!     return m_debuggerSocket->WriteByte(wxLUA_CMD_DEBUG_BREAK);
  }
  
***************
*** 1204,1208 ****
          return false;
  
!     return m_debuggerSocket->WriteByte(CMD_ENUMERATE_STACK);
  }
  
--- 1204,1208 ----
          return false;
  
!     return m_debuggerSocket->WriteByte(wxLUA_CMD_ENUMERATE_STACK);
  }
  
***************
*** 1212,1216 ****
          return false;
  
!     return m_debuggerSocket->WriteByte(CMD_RESET);
  }
  
--- 1212,1216 ----
          return false;
  
!     return m_debuggerSocket->WriteByte(wxLUA_CMD_RESET);
  }
  
***************
*** 1220,1224 ****
          return false;
  
!     return (m_debuggerSocket->WriteByte(CMD_ENUMERATE_STACK_ENTRY) &&
              m_debuggerSocket->WriteInt(stackEntry));
  }
--- 1220,1224 ----
          return false;
  
!     return (m_debuggerSocket->WriteByte(wxLUA_CMD_ENUMERATE_STACK_ENTRY) &&
              m_debuggerSocket->WriteInt(stackEntry));
  }
***************
*** 1229,1233 ****
          return false;
  
!     return (m_debuggerSocket->WriteByte(CMD_ENUMERATE_TABLE_REF) &&
              m_debuggerSocket->WriteInt(tableRef)                 &&
              m_debuggerSocket->WriteInt(nIndex)                   &&
--- 1229,1233 ----
          return false;
  
!     return (m_debuggerSocket->WriteByte(wxLUA_CMD_ENUMERATE_TABLE_REF) &&
              m_debuggerSocket->WriteInt(tableRef)                 &&
              m_debuggerSocket->WriteInt(nIndex)                   &&
***************
*** 1240,1249 ****
          return false;
  
!     return (m_debuggerSocket->WriteByte(CMD_CLEAR_DEBUG_REFERENCES));
  }
  
  void wxLuaDebugger::NotifyError(const wxString &msg)
  {
!     wxLuaDebugEvent debugEvent(wxEVT_DEBUG_ERROR);
  
      debugEvent.SetMessage(msg);
--- 1240,1249 ----
          return false;
  
!     return (m_debuggerSocket->WriteByte(wxLUA_CMD_CLEAR_DEBUG_REFERENCES));
  }
  
  void wxLuaDebugger::NotifyError(const wxString &msg)
  {
!     wxLuaDebugEvent debugEvent(wxEVT_WXLUA_DEBUG_ERROR);
  
      debugEvent.SetMessage(msg);
***************
*** 1467,1473 ****
          // Notify Debuggee
  #if wxCHECK_VERSION(2,3,0)
!         wxLuaDebugEvent  debugEvent(wxEVT_DEBUG_BREAKPOINT_ADDED, lineNumber, fileName.GetFullPath());
  #else
!         wxLuaDebugEvent  debugEvent(wxEVT_DEBUG_BREAKPOINT_ADDED, lineNumber, fileName);
  #endif
  
--- 1467,1473 ----
          // Notify Debuggee
  #if wxCHECK_VERSION(2,3,0)
!         wxLuaDebugEvent  debugEvent(wxEVT_WXLUA_DEBUG_BREAKPOINT_ADDED, lineNumber, fileName.GetFullPath());
  #else
!         wxLuaDebugEvent  debugEvent(wxEVT_WXLUA_DEBUG_BREAKPOINT_ADDED, lineNumber, fileName);
  #endif
  
***************
*** 1494,1500 ****
          // Notify Debuggee
  #if wxCHECK_VERSION(2,3,0)
!         wxLuaDebugEvent  debugEvent(wxEVT_DEBUG_BREAKPOINT_REMOVED, lineNumber, fileName.GetFullPath());
  #else
!         wxLuaDebugEvent  debugEvent(wxEVT_DEBUG_BREAKPOINT_REMOVED, lineNumber, fileName);
  #endif
          wxLuaHandler::GetHandler().AddPendingEvent(debugEvent);
--- 1494,1500 ----
          // Notify Debuggee
  #if wxCHECK_VERSION(2,3,0)
!         wxLuaDebugEvent  debugEvent(wxEVT_WXLUA_DEBUG_BREAKPOINT_REMOVED, lineNumber, fileName.GetFullPath());
  #else
!         wxLuaDebugEvent  debugEvent(wxEVT_WXLUA_DEBUG_BREAKPOINT_REMOVED, lineNumber, fileName);
  #endif
          wxLuaHandler::GetHandler().AddPendingEvent(debugEvent);
***************
*** 1569,1579 ****
  void wxLuaDebuggee::Break()
  {
!     m_forceBreak = TRUE;
  }
  
  void wxLuaDebuggee::Reset()
  {
!     m_forceBreak     = TRUE;
!     m_resetRequested = TRUE;
      if (m_InDebugHook)
          InteruptWait();
--- 1569,1579 ----
  void wxLuaDebuggee::Break()
  {
!     m_forceBreak = true;
  }
  
  void wxLuaDebuggee::Reset()
  {
!     m_forceBreak     = true;
!     m_resetRequested = true;
      if (m_InDebugHook)
          InteruptWait();

Index: wxldserv.cpp
===================================================================
RCS file: /cvsroot/wxlua/wxLua/modules/wxluasocket/src/wxldserv.cpp,v
retrieving revision 1.3
retrieving revision 1.4
diff -C2 -d -r1.3 -r1.4
*** wxldserv.cpp	29 Nov 2005 05:45:10 -0000	1.3
--- wxldserv.cpp	1 Dec 2005 04:17:29 -0000	1.4
***************
*** 90,94 ****
  #endif
                                              m_portNumber);
!         m_processID = wxExecute(command, FALSE, m_pProcess);
          return (m_processID != -1);
      }
--- 90,94 ----
  #endif
                                              m_portNumber);
!         m_processID = wxExecute(command, false, m_pProcess);
          return (m_processID != -1);
      }
***************
*** 196,200 ****
          try
          {
!             if (WriteByte(m_acceptedSocket, CMD_ADD_BREAKPOINT) &&
                  WriteString(m_acceptedSocket, fileName)         &&
                  WriteInt(m_acceptedSocket, lineNumber))
--- 196,200 ----
          try
          {
!             if (WriteByte(m_acceptedSocket, wxLUA_CMD_ADD_BREAKPOINT) &&
                  WriteString(m_acceptedSocket, fileName)         &&
                  WriteInt(m_acceptedSocket, lineNumber))
***************
*** 216,220 ****
          try
          {
!             if (WriteByte(m_acceptedSocket, CMD_REMOVE_BREAKPOINT) &&
                  WriteString(m_acceptedSocket, fileName)            &&
                  WriteInt(m_acceptedSocket, lineNumber))
--- 216,220 ----
          try
          {
!             if (WriteByte(m_acceptedSocket, wxLUA_CMD_REMOVE_BREAKPOINT) &&
                  WriteString(m_acceptedSocket, fileName)            &&
                  WriteInt(m_acceptedSocket, lineNumber))
***************
*** 236,240 ****
          try
          {
!             if (WriteByte(m_acceptedSocket, CMD_CLEAR_ALL_BREAKPOINTS))
                  return true;
          }
--- 236,240 ----
          try
          {
!             if (WriteByte(m_acceptedSocket, wxLUA_CMD_CLEAR_ALL_BREAKPOINTS))
                  return true;
          }
***************
*** 248,252 ****
  void wxLuaDebugServer::NotifyError(const wxString &msg)
  {
!     wxLuaDebugEvent debugEvent(wxEVT_DEBUG_ERROR);
  
      debugEvent.SetMessage(msg);
--- 248,252 ----
  void wxLuaDebugServer::NotifyError(const wxString &msg)
  {
!     wxLuaDebugEvent debugEvent(wxEVT_WXLUA_DEBUG_ERROR);
  
      debugEvent.SetMessage(msg);
***************
*** 321,325 ****
          try
          {
!             if (WriteByte(m_acceptedSocket, CMD_RUN_BUFFER) &&
                  WriteString(m_acceptedSocket, fileName) &&
                  WriteString(m_acceptedSocket, buffer))
--- 321,325 ----
          try
          {
!             if (WriteByte(m_acceptedSocket, wxLUA_CMD_RUN_BUFFER) &&
                  WriteString(m_acceptedSocket, fileName) &&
                  WriteString(m_acceptedSocket, buffer))
***************
*** 341,345 ****
          try
          {
!             return WriteByte(m_acceptedSocket, CMD_DEBUG_STEP);
          }
          catch(wxLuaSocketException & /*e*/)
--- 341,345 ----
          try
          {
!             return WriteByte(m_acceptedSocket, wxLUA_CMD_DEBUG_STEP);
          }
          catch(wxLuaSocketException & /*e*/)
***************
*** 356,360 ****
          try
          {
!             return WriteByte(m_acceptedSocket, CMD_DEBUG_STEPOVER);
          }
          catch(wxLuaSocketException & /*e*/)
--- 356,360 ----
          try
          {
!             return WriteByte(m_acceptedSocket, wxLUA_CMD_DEBUG_STEPOVER);
          }
          catch(wxLuaSocketException & /*e*/)
***************
*** 371,375 ****
          try
          {
!             return WriteByte(m_acceptedSocket, CMD_DEBUG_STEPOUT);
          }
          catch(wxLuaSocketException & /*e*/)
--- 371,375 ----
          try
          {
!             return WriteByte(m_acceptedSocket, wxLUA_CMD_DEBUG_STEPOUT);
          }
          catch(wxLuaSocketException & /*e*/)
***************
*** 386,390 ****
          try
          {
!             return WriteByte(m_acceptedSocket, CMD_DEBUG_CONTINUE);
          }
          catch(wxLuaSocketException & /*e*/)
--- 386,390 ----
          try
          {
!             return WriteByte(m_acceptedSocket, wxLUA_CMD_DEBUG_CONTINUE);
          }
          catch(wxLuaSocketException & /*e*/)
***************
*** 401,405 ****
          try
          {
!             return WriteByte(m_acceptedSocket, CMD_DEBUG_BREAK);
          }
          catch(wxLuaSocketException & /*e*/)
--- 401,405 ----
          try
          {
!             return WriteByte(m_acceptedSocket, wxLUA_CMD_DEBUG_BREAK);
          }
          catch(wxLuaSocketException & /*e*/)
***************
*** 416,420 ****
          try
          {
!             return WriteByte(m_acceptedSocket, CMD_ENUMERATE_STACK);
          }
          catch(wxLuaSocketException & /*e*/)
--- 416,420 ----
          try
          {
!             return WriteByte(m_acceptedSocket, wxLUA_CMD_ENUMERATE_STACK);
          }
          catch(wxLuaSocketException & /*e*/)
***************
*** 431,435 ****
          try
          {
!             return WriteByte(m_acceptedSocket, CMD_RESET);
          }
          catch(wxLuaSocketException & /*e*/)
--- 431,435 ----
          try
          {
!             return WriteByte(m_acceptedSocket, wxLUA_CMD_RESET);
          }
          catch(wxLuaSocketException & /*e*/)
***************
*** 446,450 ****
          try
          {
!             if (WriteByte(m_acceptedSocket, CMD_ENUMERATE_STACK_ENTRY) &&
                  WriteInt(m_acceptedSocket, stackEntry))
              {
--- 446,450 ----
          try
          {
!             if (WriteByte(m_acceptedSocket, wxLUA_CMD_ENUMERATE_STACK_ENTRY) &&
                  WriteInt(m_acceptedSocket, stackEntry))
              {
***************
*** 465,469 ****
          try
          {
!             if (WriteByte(m_acceptedSocket, CMD_ENUMERATE_TABLE_REF) &&
                  WriteInt(m_acceptedSocket, tableRef)                 &&
                  WriteInt(m_acceptedSocket, nIndex)                   &&
--- 465,469 ----
          try
          {
!             if (WriteByte(m_acceptedSocket, wxLUA_CMD_ENUMERATE_TABLE_REF) &&
                  WriteInt(m_acceptedSocket, tableRef)                 &&
                  WriteInt(m_acceptedSocket, nIndex)                   &&
***************
*** 486,490 ****
          try
          {
!             if (WriteByte(m_acceptedSocket, CMD_CLEAR_DEBUG_REFERENCES))
              {
                  return true;
--- 486,490 ----
          try
          {
!             if (WriteByte(m_acceptedSocket, wxLUA_CMD_CLEAR_DEBUG_REFERENCES))
              {
                  return true;
***************
*** 525,529 ****
                  {
                      // Notify that a client has connected and we are ready to debug
!                     wxLuaDebugEvent debugEvent(wxEVT_DEBUG_CLIENT_CONNECTED);
  
                      wxLuaHandler::GetHandler().AddPendingEvent(debugEvent);
--- 525,529 ----
                  {
                      // Notify that a client has connected and we are ready to debug
!                     wxLuaDebugEvent debugEvent(wxEVT_WXLUA_DEBUG_CLIENT_CONNECTED);
  
                      wxLuaHandler::GetHandler().AddPendingEvent(debugEvent);
***************
*** 535,544 ****
                          switch((wxLuaDebugEvents_Type) debugEvent)
                          {
!                             case EVENT_DEBUG_BREAK:
                                  {
                                      wxString fileName   = ReadString(m_acceptedSocket);
                                      int      lineNumber = ReadInt(m_acceptedSocket);
  
!                                     wxLuaDebugEvent debugEvent(wxEVT_DEBUG_BREAK, lineNumber, fileName);
  
                                      wxLuaHandler::GetHandler().AddPendingEvent(debugEvent);
--- 535,544 ----
                          switch((wxLuaDebugEvents_Type) debugEvent)
                          {
!                             case wxLUA_EVENT_DEBUG_BREAK:
                                  {
                                      wxString fileName   = ReadString(m_acceptedSocket);
                                      int      lineNumber = ReadInt(m_acceptedSocket);
  
!                                     wxLuaDebugEvent debugEvent(wxEVT_WXLUA_DEBUG_BREAK, lineNumber, fileName);
  
                                      wxLuaHandler::GetHandler().AddPendingEvent(debugEvent);
***************
*** 546,554 ****
                                  break;
  
!                             case EVENT_DEBUG_PRINT:
                                  {
                                      wxString strMessage = ReadString(m_acceptedSocket);
  
!                                     wxLuaDebugEvent debugEvent(wxEVT_DEBUG_PRINT);
                                      debugEvent.SetMessage(strMessage);
  
--- 546,554 ----
                                  break;
  
!                             case wxLUA_EVENT_DEBUG_PRINT:
                                  {
                                      wxString strMessage = ReadString(m_acceptedSocket);
  
!                                     wxLuaDebugEvent debugEvent(wxEVT_WXLUA_DEBUG_PRINT);
                                      debugEvent.SetMessage(strMessage);
  
***************
*** 557,565 ****
                                  break;
  
!                             case EVENT_DEBUG_ERROR:
                                  {
                                      wxString strMessage = ReadString(m_acceptedSocket);
  
!                                     wxLuaDebugEvent debugEvent(wxEVT_DEBUG_ERROR);
                                      debugEvent.SetMessage(strMessage);
  
--- 557,565 ----
                                  break;
  
!                             case wxLUA_EVENT_DEBUG_ERROR:
                                  {
                                      wxString strMessage = ReadString(m_acceptedSocket);
  
!                                     wxLuaDebugEvent debugEvent(wxEVT_WXLUA_DEBUG_ERROR);
                                      debugEvent.SetMessage(strMessage);
  
***************
*** 568,574 ****
                                  break;
  
!                             case EVENT_DEBUG_EXIT:
                                  {
!                                     wxLuaDebugEvent debugEvent(wxEVT_DEBUG_EXIT);
                                      wxLuaHandler::GetHandler().AddPendingEvent(debugEvent);
                                      m_fShutdown = true;
--- 568,574 ----
                                  break;
  
!                             case wxLUA_EVENT_DEBUG_EXIT:
                                  {
!                                     wxLuaDebugEvent debugEvent(wxEVT_WXLUA_DEBUG_EXIT);
                                      wxLuaHandler::GetHandler().AddPendingEvent(debugEvent);
                                      m_fShutdown = true;
***************
*** 576,582 ****
                                  break;
  
!                             case EVENT_DEBUG_STACK_ENUM:
                                  {
!                                     wxLuaDebugEvent  debugEvent(wxEVT_DEBUG_STACK_ENUM);
                                      wxLuaDebugData     *pDebugData = ReadDebugData(m_acceptedSocket);
                                      if (pDebugData != NULL)
--- 576,582 ----
                                  break;
  
!                             case wxLUA_EVENT_DEBUG_STACK_ENUM:
                                  {
!                                     wxLuaDebugEvent  debugEvent(wxEVT_WXLUA_DEBUG_STACK_ENUM);
                                      wxLuaDebugData     *pDebugData = ReadDebugData(m_acceptedSocket);
                                      if (pDebugData != NULL)
***************
*** 587,593 ****
                                  break;
  
!                             case EVENT_DEBUG_STACK_ENTRY_ENUM:
                                  {
!                                     wxLuaDebugEvent  debugEvent(wxEVT_DEBUG_STACK_ENTRY_ENUM);
                                      int              stackRef   = ReadInt(m_acceptedSocket);
                                      wxLuaDebugData  *pDebugData = ReadDebugData(m_acceptedSocket);
--- 587,593 ----
                                  break;
  
!                             case wxLUA_EVENT_DEBUG_STACK_ENTRY_ENUM:
                                  {
!                                     wxLuaDebugEvent  debugEvent(wxEVT_WXLUA_DEBUG_STACK_ENTRY_ENUM);
                                      int              stackRef   = ReadInt(m_acceptedSocket);
                                      wxLuaDebugData  *pDebugData = ReadDebugData(m_acceptedSocket);
***************
*** 599,605 ****
                                  break;
  
!                             case EVENT_DEBUG_TABLE_ENUM:
                                  {
!                                     wxLuaDebugEvent  debugEvent(wxEVT_DEBUG_TABLE_ENUM);
                                      int              itemNode   = ReadInt(m_acceptedSocket);
                                      wxLuaDebugData  *pDebugData = ReadDebugData(m_acceptedSocket);
--- 599,605 ----
                                  break;
  
!                             case wxLUA_EVENT_DEBUG_TABLE_ENUM:
                                  {
!                                     wxLuaDebugEvent  debugEvent(wxEVT_WXLUA_DEBUG_TABLE_ENUM);
                                      int              itemNode   = ReadInt(m_acceptedSocket);
                                      wxLuaDebugData  *pDebugData = ReadDebugData(m_acceptedSocket);
***************
*** 611,617 ****
                                  break;
  
!                             case EVENT_DEBUG_EVALUATE_EXPR:
                                  {
!                                     wxLuaDebugEvent  debugEvent(wxEVT_DEBUG_EVALUATE_EXPR);
                                      int              exprRef   = ReadInt(m_acceptedSocket);
                                      wxString         strResult = ReadString(m_acceptedSocket);
--- 611,617 ----
                                  break;
  
!                             case wxLUA_EVENT_DEBUG_EVALUATE_EXPR:
                                  {
!                                     wxLuaDebugEvent  debugEvent(wxEVT_WXLUA_DEBUG_EVALUATE_EXPR);
                                      int              exprRef   = ReadInt(m_acceptedSocket);
                                      wxString         strResult = ReadString(m_acceptedSocket);
***************
*** 623,628 ****
                                  }
                                  break;
!                         case EVENT_DEBUG_BREAKPOINT_ADDED : break;   // FIXME - unused
!                         case EVENT_DEBUG_BREAKPOINT_REMOVED : break; // FIXME - unused
  
                          }
--- 623,629 ----
                                  }
                                  break;
! 
!                             case wxLUA_EVENT_DEBUG_BREAKPOINT_ADDED : break;   // FIXME - unused
!                             case wxLUA_EVENT_DEBUG_BREAKPOINT_REMOVED : break; // FIXME - unused
  
                          }
***************
*** 677,681 ****
          try
          {
!             if (WriteByte(m_acceptedSocket, CMD_EVALUATE_EXPR) &&
                  WriteInt(m_acceptedSocket, exprRef)            &&
                  WriteString(m_acceptedSocket, strExpression))
--- 678,682 ----
          try
          {
!             if (WriteByte(m_acceptedSocket, wxLUA_CMD_EVALUATE_EXPR) &&
                  WriteInt(m_acceptedSocket, exprRef)            &&
                  WriteString...
 
[truncated message content]

[Wxlua-commit] wxLua/modules/wxluadebug/src splttree.cpp,1.6,1.7 staktree.cpp,1.8,1.9 wxldebug.cpp,1.5,1.6

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

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

Modified Files:
	splttree.cpp staktree.cpp wxldebug.cpp 
Log Message:
wxEVT_DEBUG_XXX -> wxEVT_WXLUA_DEBUG_XXX and export them for DLL
reorder libs for linking in wxluaedit
TRUE/FALSE -> true/false
EVENT_DEBUG_XXX and CMD_XXX -> wxLUA_EVENT_DEBUG_XXX wxLUA_CMD_XXX


Index: splttree.cpp
===================================================================
RCS file: /cvsroot/wxlua/wxLua/modules/wxluadebug/src/splttree.cpp,v
retrieving revision 1.6
retrieving revision 1.7
diff -C2 -d -r1.6 -r1.7
*** splttree.cpp	29 Nov 2005 05:45:10 -0000	1.6
--- splttree.cpp	1 Dec 2005 04:17:29 -0000	1.7
***************
*** 99,103 ****
  #endif
      {
!         ::ShowScrollBar((HWND) GetHWND(), SB_VERT, FALSE);
      }
  #if USE_GENERIC_TREECTRL
--- 99,103 ----
  #endif
      {
!         ::ShowScrollBar((HWND) GetHWND(), SB_VERT, false);
      }
  #if USE_GENERIC_TREECTRL
***************
*** 125,129 ****
      {
          wxGenericTreeCtrl* win = (wxGenericTreeCtrl*) this;
!         win->wxGenericTreeCtrl::SetScrollbars(pixelsPerUnitX, pixelsPerUnitY, noUnitsX, 0, xPos, 0, /* noRefresh */ TRUE);
  
          wxScrolledWindow* scrolledWindow = GetScrolledWindow();
--- 125,129 ----
      {
          wxGenericTreeCtrl* win = (wxGenericTreeCtrl*) this;
!         win->wxGenericTreeCtrl::SetScrollbars(pixelsPerUnitX, pixelsPerUnitY, noUnitsX, 0, xPos, 0, /* noRefresh */ true);
  
          wxScrolledWindow* scrolledWindow = GetScrolledWindow();
***************
*** 261,267 ****
      AdjustRemoteScrollbars();
      if (m_firstCompanionWindow)
!         m_firstCompanionWindow->Refresh(TRUE);
      if (m_secondCompanionWindow)
!         m_secondCompanionWindow->Refresh(TRUE);
      event.Skip();
  }
--- 261,267 ----
      AdjustRemoteScrollbars();
      if (m_firstCompanionWindow)
!         m_firstCompanionWindow->Refresh(true);
      if (m_secondCompanionWindow)
!         m_secondCompanionWindow->Refresh(true);
      event.Skip();
  }
***************
*** 399,405 ****
      wxTreeCtrl::DeleteAllItems();
      if (m_firstCompanionWindow)
!         m_firstCompanionWindow->Refresh(TRUE);
      if (m_secondCompanionWindow)
!         m_secondCompanionWindow->Refresh(TRUE);
  }
  
--- 399,405 ----
      wxTreeCtrl::DeleteAllItems();
      if (m_firstCompanionWindow)
!         m_firstCompanionWindow->Refresh(true);
      if (m_secondCompanionWindow)
!         m_secondCompanionWindow->Refresh(true);
  }
  
***************
*** 613,617 ****
  
      // TODO: scroll the window physically instead of just refreshing.
!     Refresh(TRUE);
  }
  
--- 613,617 ----
  
      // TODO: scroll the window physically instead of just refreshing.
!     Refresh(true);
  }
  
***************
*** 745,749 ****
      // Ensure that events being propagated back up the window hierarchy
      // don't cause an infinite loop
!     static bool inOnScroll = FALSE;
      if (inOnScroll)
      {
--- 745,749 ----
      // Ensure that events being propagated back up the window hierarchy
      // don't cause an infinite loop
!     static bool inOnScroll = false;
      if (inOnScroll)
      {
***************
*** 751,755 ****
          return;
      }
!     inOnScroll = TRUE;
  
      int orient = event.GetOrientation();
--- 751,755 ----
          return;
      }
!     inOnScroll = true;
  
      int orient = event.GetOrientation();
***************
*** 758,762 ****
      if (nScrollInc == 0)
      {
!         inOnScroll = FALSE;
          return;
      }
--- 758,762 ----
      if (nScrollInc == 0)
      {
!         inOnScroll = false;
          return;
      }
***************
*** 764,768 ****
      if (orient == wxHORIZONTAL)
      {
!         inOnScroll = FALSE;
          event.Skip();
          return;
--- 764,768 ----
      if (orient == wxHORIZONTAL)
      {
!         inOnScroll = false;
          event.Skip();
          return;
***************
*** 771,775 ****
      {
          int newPos = m_yScrollPosition + nScrollInc;
!         SetScrollPos(wxVERTICAL, newPos, TRUE );
      }
  
--- 771,775 ----
      {
          int newPos = m_yScrollPosition + nScrollInc;
!         SetScrollPos(wxVERTICAL, newPos, true );
      }
  
***************
*** 804,807 ****
  #endif
  
!     inOnScroll = FALSE;
  }
--- 804,807 ----
  #endif
  
!     inOnScroll = false;
  }

Index: wxldebug.cpp
===================================================================
RCS file: /cvsroot/wxlua/wxLua/modules/wxluadebug/src/wxldebug.cpp,v
retrieving revision 1.5
retrieving revision 1.6
diff -C2 -d -r1.5 -r1.6
*** wxldebug.cpp	29 Nov 2005 23:52:12 -0000	1.5
--- wxldebug.cpp	1 Dec 2005 04:17:29 -0000	1.6
***************
*** 26,42 ****
  #include "wxlua/include/internal.h"
  
! DEFINE_EVENT_TYPE(wxEVT_DEBUG_CLIENT_CONNECTED)
! DEFINE_EVENT_TYPE(wxEVT_DEBUG_BREAK)
! DEFINE_EVENT_TYPE(wxEVT_DEBUG_PRINT)
! DEFINE_EVENT_TYPE(wxEVT_DEBUG_ERROR)
! DEFINE_EVENT_TYPE(wxEVT_DEBUG_EXIT)
! DEFINE_EVENT_TYPE(wxEVT_DEBUG_STACK_ENUM)
! DEFINE_EVENT_TYPE(wxEVT_DEBUG_STACK_ENTRY_ENUM)
! DEFINE_EVENT_TYPE(wxEVT_DEBUG_TABLE_ENUM)
! DEFINE_EVENT_TYPE(wxEVT_DEBUG_EVALUATE_EXPR)
! DEFINE_EVENT_TYPE(wxEVT_DEBUG_STARTDEBUGGER)
! DEFINE_EVENT_TYPE(wxEVT_DEBUG_STOPDEBUGGER)
! DEFINE_EVENT_TYPE(wxEVT_DEBUG_BREAKPOINT_ADDED)
! DEFINE_EVENT_TYPE(wxEVT_DEBUG_BREAKPOINT_REMOVED)
  
  // ----------------------------------------------------------------------------
--- 26,42 ----
  #include "wxlua/include/internal.h"
  
! DEFINE_EVENT_TYPE(wxEVT_WXLUA_DEBUG_CLIENT_CONNECTED)
! DEFINE_EVENT_TYPE(wxEVT_WXLUA_DEBUG_BREAK)
! DEFINE_EVENT_TYPE(wxEVT_WXLUA_DEBUG_PRINT)
! DEFINE_EVENT_TYPE(wxEVT_WXLUA_DEBUG_ERROR)
! DEFINE_EVENT_TYPE(wxEVT_WXLUA_DEBUG_EXIT)
! DEFINE_EVENT_TYPE(wxEVT_WXLUA_DEBUG_STACK_ENUM)
! DEFINE_EVENT_TYPE(wxEVT_WXLUA_DEBUG_STACK_ENTRY_ENUM)
! DEFINE_EVENT_TYPE(wxEVT_WXLUA_DEBUG_TABLE_ENUM)
! DEFINE_EVENT_TYPE(wxEVT_WXLUA_DEBUG_EVALUATE_EXPR)
! DEFINE_EVENT_TYPE(wxEVT_WXLUA_DEBUG_STARTDEBUGGER)
! DEFINE_EVENT_TYPE(wxEVT_WXLUA_DEBUG_STOPDEBUGGER)
! DEFINE_EVENT_TYPE(wxEVT_WXLUA_DEBUG_BREAKPOINT_ADDED)
! DEFINE_EVENT_TYPE(wxEVT_WXLUA_DEBUG_BREAKPOINT_REMOVED)
  
  // ----------------------------------------------------------------------------

Index: staktree.cpp
===================================================================
RCS file: /cvsroot/wxlua/wxLua/modules/wxluadebug/src/staktree.cpp,v
retrieving revision 1.8
retrieving revision 1.9
diff -C2 -d -r1.8 -r1.9
*** staktree.cpp	29 Nov 2005 05:45:10 -0000	1.8
--- staktree.cpp	1 Dec 2005 04:17:29 -0000	1.9
***************
*** 238,242 ****
  
      m_scrolledWindow->SetTargetWindow(m_treeControl);
!     m_scrolledWindow->EnableScrolling(FALSE, FALSE);
  
      // Let the two controls know about each other
--- 238,242 ----
  
      m_scrolledWindow->SetTargetWindow(m_treeControl);
!     m_scrolledWindow->EnableScrolling(false, false);
  
      // Let the two controls know about each other
***************
*** 504,508 ****
                 : wxRemotelyScrolledTreeCtrl(parent, id, pt, sz, style)
  {
!     m_imageList = new wxImageList(16, 16, TRUE);
  #if !defined(__WXMSW__) // || wxUSE_XPM_IN_MSW
      m_imageList->Add(wxIcon(icon1_xpm));
--- 504,508 ----
                 : wxRemotelyScrolledTreeCtrl(parent, id, pt, sz, style)
  {
!     m_imageList = new wxImageList(16, 16, true);
  #if !defined(__WXMSW__) // || wxUSE_XPM_IN_MSW
      m_imageList->Add(wxIcon(icon1_xpm));

[Wxlua-commit] wxLua/docs building.txt,1.1,1.2

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

Update of /cvsroot/wxlua/wxLua/docs
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv32720/wxLua/docs

Modified Files:
	building.txt 
Log Message:
wxEVT_DEBUG_XXX -> wxEVT_WXLUA_DEBUG_XXX and export them for DLL
reorder libs for linking in wxluaedit
TRUE/FALSE -> true/false
EVENT_DEBUG_XXX and CMD_XXX -> wxLUA_EVENT_DEBUG_XXX wxLUA_CMD_XXX


Index: building.txt
===================================================================
RCS file: /cvsroot/wxlua/wxLua/docs/building.txt,v
retrieving revision 1.1
retrieving revision 1.2
diff -C2 -d -r1.1 -r1.2
*** building.txt	23 Nov 2005 06:03:40 -0000	1.1
--- building.txt	1 Dec 2005 04:17:29 -0000	1.2
***************
*** 1,6 ****
  wxLua/docs/build.txt
  
! This document describes how to build wxLua for use as an interpreter of lua 
! scripts and to embedding wxLua in a C++ project.
  
  ------------------------------------------------------------------------------
--- 1,6 ----
  wxLua/docs/build.txt
  
! This document describes how to build wxLua for use as an interpreter of lua
! scripts and for embedding wxLua in a C++ project.
  
  ------------------------------------------------------------------------------
***************
*** 8,12 ****
  ------------------------------------------------------------------------------
  
! wxLua can be compiled in any platform and by any compiler that is supported by 
  wxWidgets.
  
--- 8,12 ----
  ------------------------------------------------------------------------------
  
! wxLua can be compiled in any platform and by any compiler that is supported by
  wxWidgets.
  
***************
*** 16,21 ****
    wxLua/modules/wxbind - the bindings of wxWidgets for use in lua scripts
    wxLua/modules/wxluadebug - helpful classes for debugging lua
!   wxLua/modules/wxluasocket - socket classes to run a wxlua program in a 
!                                 separate process and communicate with the parent
  
  How to build the wxLua libaries
--- 16,21 ----
    wxLua/modules/wxbind - the bindings of wxWidgets for use in lua scripts
    wxLua/modules/wxluadebug - helpful classes for debugging lua
!   wxLua/modules/wxluasocket - socket classes to run a wxlua program in a
!                               separate process and communicate with the parent
  
  How to build the wxLua libaries
***************
*** 24,42 ****
      GCC     : make -f makefile.gcc
      BORLAND : make -f makefile.bcc
!         
    Linux - in root wxLua directory run
      $./configure --prefix=path/to/where/you/want/it/built
      $make
!     
  How to build the wxLua app, the wxLua IDE
!   The app depends on the libaries from modules/lua, wxlua, wxbind, 
    wxluadebug, and wxluasocket. You must have previously built these.
  
    MSW - if and you've run make from wxLua/build/msw you already have it.
!   You want to build/rebuild it then enter wxLua/apps/build/msw and use the 
    same commands for make as described for the libaries.
!     
    Linux - type make in the wxLua/wxlua/src
!    
  ------------------------------------------------------------------------------
  Advanced building options
--- 24,91 ----
      GCC     : make -f makefile.gcc
      BORLAND : make -f makefile.bcc
! 
    Linux - in root wxLua directory run
      $./configure --prefix=path/to/where/you/want/it/built
      $make
! 
!     Or use the Makefiles located in the src dirs of each directory. The
!     Makefiles in the src dirs use wx-config to get the settings so be sure that
!     it's in your path.
! 
  How to build the wxLua app, the wxLua IDE
!   The app depends on the libaries from modules/lua, wxlua, wxbind,
    wxluadebug, and wxluasocket. You must have previously built these.
  
    MSW - if and you've run make from wxLua/build/msw you already have it.
!   You want to build/rebuild it then enter wxLua/apps/build/msw and use the
    same commands for make as described for the libaries.
! 
    Linux - type make in the wxLua/wxlua/src
! 
! ------------------------------------------------------------------------------
! Command line switches for make
! ------------------------------------------------------------------------------
!    Please see the top of the makefile you're using for your compiler. For
! example, if you're using nmake.exe (MS Visual C make program) look at
! makefile.vc. At the top you'll see this
! 
! In modules/build/msw/makefile.vc
! # C compiler
! CC = cl
! # C++ compiler
! CXX = cl
! # Standard flags for CC
! CFLAGS =
! # Standard flags for C++
! CXXFLAGS =
! # Standard preprocessor flags (common for CC and CXX)
! CPPFLAGS =
! # Standard linker flags
! LDFLAGS =
! # The directory where wxWidgets library is installed
! WX_DIR = $(WXWIN)
! # Use DLL build of wx library to use? [0,1]
! WX_SHARED = 0
! # Compile Unicode build of wxWidgets? [0,1]
! WX_UNICODE = 0
! # Use debug build of wxWidgets (define __WXDEBUG__)? [0,1]
! WX_DEBUG = 1
! # Version of the wx library to build against.
! WX_VERSION = 26
! 
! In apps/build/msw/makefile.vc
! # Compile the wxLua app ? [0,1]
! USE_WXLUAAPP = 1
! # Compile the wxLuaEditor app ? [0,1]
! USE_WXLUAEDITAPP = 0
! 
! To change the build settings to match those of your compiled wxWidgets library
! run nmake.exe in wxLua/build/msw as follows (but with your settings):
! 
! >nmake.exe WX_DEBUG=1 USE_WXLUAAPP=1 -f makefile.vc
! 
! and all of the appropriate wxLua libs will be compiled and in the case of
! USE_WXLUAAPP=1 the wxLua program in wxLua/apps/wxlua will be compiled too.
! 
  ------------------------------------------------------------------------------
  Advanced building options
***************
*** 44,75 ****
  
    These directions are for C++ developers who want to use wxLua as a scripting
! language in their own project. This means that you can write scripts to make 
! your code simpler, load and run files on the fly, and allow users to more 
  easily customize your program with their own lua scripts.
  
    You will need the library from wxLua/modules/lua and wxlua at a minimum. With
  these two libraries you have the ability to start an interpreter and run
! straight lua code in it. 
!   To get the ability to create wxWidgets objects and use the functionality of 
! wxWidgets in lua you will also need to build and link to the library in 
! modules/wxbind. The bindings in modules/wxbind contain nearly all of the 
! classes and functions in wxWidgets. They also contain the appropriate 
! wxUSE_XXX #if statements and platform dependent __WXMSW__ checks that 
  wxWidgets uses in their headers to ensure that no matter what platform
  or what type of build you use, the bindings will compile without error.
  The functionality will obviously be limited to your current wxWidgets build
! settings.
!   In order to reduce the size of the wxWidgets bindings there is a file 
! modules/wxbind/src/wxluasetup.h that can be edited to your liking. The header 
! file contains a number of wxLUA_USE_XXX #defines that are fairly self 
! explanitory. By setting some of them to 0 you can block out large chunks of 
! the bindings. NOTE: If you edit the wxluasetup.h file in modules/wxbind/src 
! directory you will affect which bindings will be available to apps/wxlua as 
! well. 
    If you wish to use the build files for modlues/wxbind that exist in wxLua
  for your own project along with your own wxluasetup.h you need to...
  
! 
! 
! 
! 
--- 93,128 ----
  
    These directions are for C++ developers who want to use wxLua as a scripting
! language in their own project. This means that you can write scripts to make
! your code simpler, load and run files on the fly, and allow users to more
  easily customize your program with their own lua scripts.
  
    You will need the library from wxLua/modules/lua and wxlua at a minimum. With
  these two libraries you have the ability to start an interpreter and run
! straight lua code in it.
!   To get the ability to create wxWidgets objects and use the functionality of
! wxWidgets in lua you will also need to build and link to the library in
! modules/wxbind. The bindings in modules/wxbind contain nearly all of the
! classes and functions in wxWidgets. They also contain the appropriate
! wxUSE_XXX #if statements and platform dependent __WXMSW/GTK/MAC__ checks that
  wxWidgets uses in their headers to ensure that no matter what platform
  or what type of build you use, the bindings will compile without error.
  The functionality will obviously be limited to your current wxWidgets build
! settings. If they don't compile for your settings, please be sure to tell us
! on the wxlua-users mailing list on SourceForge.
!   In order to reduce the size of the wxWidgets bindings there is a file
! modules/wxbind/src/wxluasetup.h that can be edited to your liking. The header
! file contains a number of wxLUA_USE_XXX #defines that are fairly self
! explanitory. By setting some of them to 0 you can block out large chunks of
! the bindings. NOTE: If you edit the wxluasetup.h file in modules/wxbind/src
! directory you will affect which bindings will be available to apps/wxlua as
! well.
    If you wish to use the build files for modlues/wxbind that exist in wxLua
  for your own project along with your own wxluasetup.h you need to...
  
! Linking Order:
!    The order in which you link to the wxLua libraries is important since some
! variable are initialized using variables from other libraries. You must always
! link to any binding library after you link to wxlua.
!    The library order in which they should be loaded; lua, wxlua, wxluadebug,
! wxluasocket, wxbind, any other bindings. Note that many linkers actually link
! them in the opposite order in which they appear on the command line.

[Wxlua-commit] wxLua/samples editor.wx.lua,1.3,1.4

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

Update of /cvsroot/wxlua/wxLua/samples
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv32720/wxLua/samples

Modified Files:
	editor.wx.lua 
Log Message:
wxEVT_DEBUG_XXX -> wxEVT_WXLUA_DEBUG_XXX and export them for DLL
reorder libs for linking in wxluaedit
TRUE/FALSE -> true/false
EVENT_DEBUG_XXX and CMD_XXX -> wxLUA_EVENT_DEBUG_XXX wxLUA_CMD_XXX


Index: editor.wx.lua
===================================================================
RCS file: /cvsroot/wxlua/wxLua/samples/editor.wx.lua,v
retrieving revision 1.3
retrieving revision 1.4
diff -C2 -d -r1.3 -r1.4
*** editor.wx.lua	19 Nov 2005 07:08:39 -0000	1.3
--- editor.wx.lua	1 Dec 2005 04:17:29 -0000	1.4
***************
*** 708,712 ****
                          saveAs(editor)
                     end)
!                    
  frame:ConnectEvent(wx.wxID_SAVEAS,
                     wx.wxEVT_UPDATE_UI,
--- 708,712 ----
                          saveAs(editor)
                     end)
! 
  frame:ConnectEvent(wx.wxID_SAVEAS,
                     wx.wxEVT_UPDATE_UI,
***************
*** 1156,1160 ****
                          local editor = getEditor()
                          editor:SelectAll()
!                    end)                   
  frame:ConnectEvent(wx.wxID_SELECTALL,
                     wx.wxEVT_UPDATE_UI,
--- 1156,1160 ----
                          local editor = getEditor()
                          editor:SelectAll()
!                    end)
  frame:ConnectEvent(wx.wxID_SELECTALL,
                     wx.wxEVT_UPDATE_UI,
***************
*** 1201,1205 ****
                         enableMenuItem(event)
                     end)
!                    
  function makeDebugFileName(editor, filePath)
      if not filePath then
--- 1201,1205 ----
                         enableMenuItem(event)
                     end)
! 
  function makeDebugFileName(editor, filePath)
      if not filePath then
***************
*** 1549,1553 ****
  
          splitter:SetDimensions(0, yoffset, x, y - yoffset)
!     else 
          event:Skip()
      end
--- 1549,1553 ----
  
          splitter:SetDimensions(0, yoffset, x, y - yoffset)
!     else
          event:Skip()
      end
***************
*** 1837,1841 ****
  
  editorApp:ConnectEvent(-1,
!                        wx.wxEVT_DEBUG_CLIENT_CONNECTED,
                         function (event)
                              if debugServer then
--- 1837,1841 ----
  
  editorApp:ConnectEvent(-1,
!                        wx.wxEVT_WXLUA_DEBUG_CLIENT_CONNECTED,
                         function (event)
                              if debugServer then
***************
*** 1865,1869 ****
  
  editorApp:ConnectEvent(-1,
!                        wx.wxEVT_DEBUG_BREAK,
                         function (event)
                             local row = event:GetLineNumber()
--- 1865,1869 ----
  
  editorApp:ConnectEvent(-1,
!                        wx.wxEVT_WXLUA_DEBUG_BREAK,
                         function (event)
                             local row = event:GetLineNumber()
***************
*** 1940,1944 ****
  
  editorApp:ConnectEvent(-1,
!                        wx.wxEVT_DEBUG_PRINT,
                         function (event)
                             displayOutput(event:GetMessage())
--- 1940,1944 ----
  
  editorApp:ConnectEvent(-1,
!                        wx.wxEVT_WXLUA_DEBUG_PRINT,
                         function (event)
                             displayOutput(event:GetMessage())
***************
*** 1946,1950 ****
  
  editorApp:ConnectEvent(-1,
!                        wx.wxEVT_DEBUG_ERROR,
                         function (event)
                             displayOutput(event:GetMessage())
--- 1946,1950 ----
  
  editorApp:ConnectEvent(-1,
!                        wx.wxEVT_WXLUA_DEBUG_ERROR,
                         function (event)
                             displayOutput(event:GetMessage())
***************
*** 1952,1956 ****
  
  editorApp:ConnectEvent(-1,
!                        wx.wxEVT_DEBUG_EXIT,
                         function (event)
                             for id, document in openDocuments do
--- 1952,1956 ----
  
  editorApp:ConnectEvent(-1,
!                        wx.wxEVT_WXLUA_DEBUG_EXIT,
                         function (event)
                             for id, document in openDocuments do
***************
*** 1970,1974 ****
  
  editorApp:ConnectEvent(-1,
!                        wx.wxEVT_DEBUG_EVALUATE_EXPR,
                         function (event)
                             if watchListCtrl then
--- 1970,1974 ----
  
  editorApp:ConnectEvent(-1,
!                        wx.wxEVT_WXLUA_DEBUG_EVALUATE_EXPR,
                         function (event)
                             if watchListCtrl then
***************
*** 2063,2067 ****
  if args then
      local fileLoaded
!     programName = args[0]    
      for index, fileName in args do
          if index ~= "n" and index ~= 0 then
--- 2063,2067 ----
  if args then
      local fileLoaded
!     programName = args[0]
      for index, fileName in args do
          if index ~= "n" and index ~= 0 then

[Wxlua-commit] wxLua/modules/wxluadebug/include splttree.h,1.4,1.5 wxldebug.h,1.6,1.7

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

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

Modified Files:
	splttree.h wxldebug.h 
Log Message:
wxEVT_DEBUG_XXX -> wxEVT_WXLUA_DEBUG_XXX and export them for DLL
reorder libs for linking in wxluaedit
TRUE/FALSE -> true/false
EVENT_DEBUG_XXX and CMD_XXX -> wxLUA_EVENT_DEBUG_XXX wxLUA_CMD_XXX


Index: splttree.h
===================================================================
RCS file: /cvsroot/wxlua/wxLua/modules/wxluadebug/include/splttree.h,v
retrieving revision 1.4
retrieving revision 1.5
diff -C2 -d -r1.4 -r1.5
*** splttree.h	29 Nov 2005 05:45:10 -0000	1.4
--- splttree.h	1 Dec 2005 04:17:29 -0000	1.5
***************
*** 64,68 ****
                               int noUnitsX, int noUnitsY,
                               int xPos = 0, int yPos = 0,
!                              bool noRefresh = FALSE );
  
      // In case we're using the generic tree control.
--- 64,68 ----
                               int noUnitsX, int noUnitsY,
                               int xPos = 0, int yPos = 0,
!                              bool noRefresh = false );
  
      // In case we're using the generic tree control.

Index: wxldebug.h
===================================================================
RCS file: /cvsroot/wxlua/wxLua/modules/wxluadebug/include/wxldebug.h,v
retrieving revision 1.6
retrieving revision 1.7
diff -C2 -d -r1.6 -r1.7
*** wxldebug.h	30 Nov 2005 04:46:17 -0000	1.6
--- wxldebug.h	1 Dec 2005 04:17:29 -0000	1.7
***************
*** 150,163 ****
  enum wxLuaDebugEvents_Type
  {
!     EVENT_DEBUG_BREAK,
!     EVENT_DEBUG_PRINT,
!     EVENT_DEBUG_ERROR,
!     EVENT_DEBUG_EXIT,
!     EVENT_DEBUG_STACK_ENUM,
!     EVENT_DEBUG_STACK_ENTRY_ENUM,
!     EVENT_DEBUG_TABLE_ENUM,
!     EVENT_DEBUG_EVALUATE_EXPR,
!     EVENT_DEBUG_BREAKPOINT_ADDED,
!     EVENT_DEBUG_BREAKPOINT_REMOVED
  };
  
--- 150,163 ----
  enum wxLuaDebugEvents_Type
  {
!     wxLUA_EVENT_DEBUG_BREAK,
!     wxLUA_EVENT_DEBUG_PRINT,
!     wxLUA_EVENT_DEBUG_ERROR,
!     wxLUA_EVENT_DEBUG_EXIT,
!     wxLUA_EVENT_DEBUG_STACK_ENUM,
!     wxLUA_EVENT_DEBUG_STACK_ENTRY_ENUM,
!     wxLUA_EVENT_DEBUG_TABLE_ENUM,
!     wxLUA_EVENT_DEBUG_EVALUATE_EXPR,
!     wxLUA_EVENT_DEBUG_BREAKPOINT_ADDED,
!     wxLUA_EVENT_DEBUG_BREAKPOINT_REMOVED
  };
  
***************
*** 168,188 ****
  enum wxLuaDebugCommands_Type
  {
!     CMD_ADD_BREAKPOINT,
!     CMD_REMOVE_BREAKPOINT,
!     CMD_CLEAR_ALL_BREAKPOINTS,
!     CMD_RUN_BUFFER,
!     CMD_DEBUG_STEP,
!     CMD_DEBUG_STEPOVER,
!     CMD_DEBUG_STEPOUT,
!     CMD_DEBUG_CONTINUE,
!     CMD_DEBUG_BREAK,
!     CMD_ENUMERATE_STACK,
!     CMD_ENUMERATE_STACK_ENTRY,
!     CMD_ENUMERATE_TABLE_REF,
!     CMD_EVALUATE_EXPR,
!     CMD_RESET,
!     CMD_CLEAR_DEBUG_REFERENCES,
!     CMD_DISABLE_BREAKPOINT,
!     CMD_ENABLE_BREAKPOINT
  };
  
--- 168,188 ----
  enum wxLuaDebugCommands_Type
  {
!     wxLUA_CMD_ADD_BREAKPOINT,
!     wxLUA_CMD_REMOVE_BREAKPOINT,
!     wxLUA_CMD_CLEAR_ALL_BREAKPOINTS,
!     wxLUA_CMD_RUN_BUFFER,
!     wxLUA_CMD_DEBUG_STEP,
!     wxLUA_CMD_DEBUG_STEPOVER,
!     wxLUA_CMD_DEBUG_STEPOUT,
!     wxLUA_CMD_DEBUG_CONTINUE,
!     wxLUA_CMD_DEBUG_BREAK,
!     wxLUA_CMD_ENUMERATE_STACK,
!     wxLUA_CMD_ENUMERATE_STACK_ENTRY,
!     wxLUA_CMD_ENUMERATE_TABLE_REF,
!     wxLUA_CMD_EVALUATE_EXPR,
!     wxLUA_CMD_RESET,
!     wxLUA_CMD_CLEAR_DEBUG_REFERENCES,
!     wxLUA_CMD_DISABLE_BREAKPOINT,
!     wxLUA_CMD_ENABLE_BREAKPOINT
  };
  
***************
*** 258,292 ****
  typedef void (wxEvtHandler::*wxLuaDebugEventFunction)(wxLuaDebugEvent&);
  
- // FIXME prefix wxLUA on these
- 
  BEGIN_DECLARE_EVENT_TYPES()
!     DECLARE_LOCAL_EVENT_TYPE(wxEVT_DEBUG_CLIENT_CONNECTED,    2510)
!     DECLARE_LOCAL_EVENT_TYPE(wxEVT_DEBUG_BREAK,               2511)
!     DECLARE_LOCAL_EVENT_TYPE(wxEVT_DEBUG_PRINT,               2512)
!     DECLARE_LOCAL_EVENT_TYPE(wxEVT_DEBUG_ERROR,               2513)
!     DECLARE_LOCAL_EVENT_TYPE(wxEVT_DEBUG_EXIT,                2514)
!     DECLARE_LOCAL_EVENT_TYPE(wxEVT_DEBUG_STACK_ENUM,          2515)
!     DECLARE_LOCAL_EVENT_TYPE(wxEVT_DEBUG_STACK_ENTRY_ENUM,    2516)
!     DECLARE_LOCAL_EVENT_TYPE(wxEVT_DEBUG_TABLE_ENUM,          2517)
!     DECLARE_LOCAL_EVENT_TYPE(wxEVT_DEBUG_EVALUATE_EXPR,       2518)
!     DECLARE_LOCAL_EVENT_TYPE(wxEVT_DEBUG_STARTDEBUGGER,       2519)
!     DECLARE_LOCAL_EVENT_TYPE(wxEVT_DEBUG_STOPDEBUGGER,        2520)
!     DECLARE_LOCAL_EVENT_TYPE(wxEVT_DEBUG_BREAKPOINT_ADDED,    2521)
!     DECLARE_LOCAL_EVENT_TYPE(wxEVT_DEBUG_BREAKPOINT_REMOVED,  2522)
  END_DECLARE_EVENT_TYPES()
  
! #define EVT_DEBUG_CLIENT_CONNECTED(id, fn) DECLARE_EVENT_TABLE_ENTRY(wxEVT_DEBUG_BREAK,               id, -1, (wxObjectEventFunction) (wxEventFunction) (wxLuaDebugEventFunction) & fn, (wxObject *) NULL),
! #define EVT_DEBUG_BREAK(id, fn)            DECLARE_EVENT_TABLE_ENTRY(wxEVT_DEBUG_BREAK,               id, -1, (wxObjectEventFunction) (wxEventFunction) (wxLuaDebugEventFunction) & fn, (wxObject *) NULL),
! #define EVT_DEBUG_PRINT(id, fn)            DECLARE_EVENT_TABLE_ENTRY(wxEVT_DEBUG_PRINT,               id, -1, (wxObjectEventFunction) (wxEventFunction) (wxLuaDebugEventFunction) & fn, (wxObject *) NULL),
! #define EVT_DEBUG_ERROR(id, fn)            DECLARE_EVENT_TABLE_ENTRY(wxEVT_DEBUG_ERROR,               id, -1, (wxObjectEventFunction) (wxEventFunction) (wxLuaDebugEventFunction) & fn, (wxObject *) NULL),
! #define EVT_DEBUG_EXIT(id, fn)             DECLARE_EVENT_TABLE_ENTRY(wxEVT_DEBUG_EXIT,                id, -1, (wxObjectEventFunction) (wxEventFunction) (wxLuaDebugEventFunction) & fn, (wxObject *) NULL),
! #define EVT_DEBUG_STACK_ENUM(fn)           DECLARE_EVENT_TABLE_ENTRY(wxEVT_DEBUG_STACK_ENUM,          -1, -1, (wxObjectEventFunction) (wxEventFunction) (wxLuaDebugEventFunction) & fn, (wxObject *) NULL),
! #define EVT_DEBUG_STACK_ENTRY_ENUM(fn)     DECLARE_EVENT_TABLE_ENTRY(wxEVT_DEBUG_STACK_ENTRY_ENUM,    -1, -1, (wxObjectEventFunction) (wxEventFunction) (wxLuaDebugEventFunction) & fn, (wxObject *) NULL),
! #define EVT_DEBUG_TABLE_ENUM(fn)           DECLARE_EVENT_TABLE_ENTRY(wxEVT_DEBUG_TABLE_ENUM,          -1, -1, (wxObjectEventFunction) (wxEventFunction) (wxLuaDebugEventFunction) & fn, (wxObject *) NULL),
! #define EVT_DEBUG_EVALUATE_EXPR(id, fn)    DECLARE_EVENT_TABLE_ENTRY(wxEVT_DEBUG_EVALUATE_EXPR,       id, -1, (wxObjectEventFunction) (wxEventFunction) (wxLuaDebugEventFunction) & fn, (wxObject *) NULL),
! #define EVT_DEBUG_STARTDEBUGGER(fn)        DECLARE_EVENT_TABLE_ENTRY(wxEVT_DEBUG_STARTDEBUGGER,       -1, -1, (wxObjectEventFunction) (wxEventFunction) (wxLuaDebugEventFunction) & fn, (wxObject *) NULL),
! #define EVT_DEBUG_STOPDEBUGGER(fn)         DECLARE_EVENT_TABLE_ENTRY(wxEVT_DEBUG_STOPDEBUGGER,        -1, -1, (wxObjectEventFunction) (wxEventFunction) (wxLuaDebugEventFunction) & fn, (wxObject *) NULL),
! #define EVT_DEBUG_BREAKPOINT_ADDED(fn)     DECLARE_EVENT_TABLE_ENTRY(wxEVT_DEBUG_BREAKPOINT_ADDED,    -1, -1, (wxObjectEventFunction) (wxEventFunction) (wxLuaDebugEventFunction) & fn, (wxObject *) NULL),
! #define EVT_DEBUG_BREAKPOINT_REMOVED(fn)   DECLARE_EVENT_TABLE_ENTRY(wxEVT_DEBUG_BREAKPOINT_REMOVED,  -1, -1, (wxObjectEventFunction) (wxEventFunction) (wxLuaDebugEventFunction) & fn, (wxObject *) NULL),
  
  #endif // WX_LUA_DEBUG_H
--- 258,293 ----
  typedef void (wxEvtHandler::*wxLuaDebugEventFunction)(wxLuaDebugEvent&);
  
  BEGIN_DECLARE_EVENT_TYPES()
!     DECLARE_EXPORTED_EVENT_TYPE(WXDLLIMPEXP_WXLUA, wxEVT_WXLUA_DEBUG_CLIENT_CONNECTED,    2510)
!     DECLARE_EXPORTED_EVENT_TYPE(WXDLLIMPEXP_WXLUA, wxEVT_WXLUA_DEBUG_BREAK,               2511)
!     DECLARE_EXPORTED_EVENT_TYPE(WXDLLIMPEXP_WXLUA, wxEVT_WXLUA_DEBUG_PRINT,               2512)
!     DECLARE_EXPORTED_EVENT_TYPE(WXDLLIMPEXP_WXLUA, wxEVT_WXLUA_DEBUG_ERROR,               2513)
!     DECLARE_EXPORTED_EVENT_TYPE(WXDLLIMPEXP_WXLUA, wxEVT_WXLUA_DEBUG_EXIT,                2514)
!     DECLARE_EXPORTED_EVENT_TYPE(WXDLLIMPEXP_WXLUA, wxEVT_WXLUA_DEBUG_STACK_ENUM,          2515)
!     DECLARE_EXPORTED_EVENT_TYPE(WXDLLIMPEXP_WXLUA, wxEVT_WXLUA_DEBUG_STACK_ENTRY_ENUM,    2516)
!     DECLARE_EXPORTED_EVENT_TYPE(WXDLLIMPEXP_WXLUA, wxEVT_WXLUA_DEBUG_TABLE_ENUM,          2517)
!     DECLARE_EXPORTED_EVENT_TYPE(WXDLLIMPEXP_WXLUA, wxEVT_WXLUA_DEBUG_EVALUATE_EXPR,       2518)
!     DECLARE_EXPORTED_EVENT_TYPE(WXDLLIMPEXP_WXLUA, wxEVT_WXLUA_DEBUG_STARTDEBUGGER,       2519)
!     DECLARE_EXPORTED_EVENT_TYPE(WXDLLIMPEXP_WXLUA, wxEVT_WXLUA_DEBUG_STOPDEBUGGER,        2520)
!     DECLARE_EXPORTED_EVENT_TYPE(WXDLLIMPEXP_WXLUA, wxEVT_WXLUA_DEBUG_BREAKPOINT_ADDED,    2521)
!     DECLARE_EXPORTED_EVENT_TYPE(WXDLLIMPEXP_WXLUA, wxEVT_WXLUA_DEBUG_BREAKPOINT_REMOVED,  2522)
  END_DECLARE_EVENT_TYPES()
  
! #define wxLuaDebugEventHandler(func) \
!     (wxObjectEventFunction)(wxEventFunction)wxStaticCastEvent(wxLuaDebugEventFunction, &func)
! 
! #define EVT_WXLUA_DEBUG_CLIENT_CONNECTED(id, fn) DECLARE_EVENT_TABLE_ENTRY(wxEVT_WXLUA_DEBUG_BREAK,               id, -1, wxLuaDebugEventHandler(fn), (wxObject *) NULL),
! #define EVT_WXLUA_DEBUG_BREAK(id, fn)            DECLARE_EVENT_TABLE_ENTRY(wxEVT_WXLUA_DEBUG_BREAK,               id, -1, wxLuaDebugEventHandler(fn), (wxObject *) NULL),
! #define EVT_WXLUA_DEBUG_PRINT(id, fn)            DECLARE_EVENT_TABLE_ENTRY(wxEVT_WXLUA_DEBUG_PRINT,               id, -1, wxLuaDebugEventHandler(fn), (wxObject *) NULL),
! #define EVT_WXLUA_DEBUG_ERROR(id, fn)            DECLARE_EVENT_TABLE_ENTRY(wxEVT_WXLUA_DEBUG_ERROR,               id, -1, wxLuaDebugEventHandler(fn), (wxObject *) NULL),
! #define EVT_WXLUA_DEBUG_EXIT(id, fn)             DECLARE_EVENT_TABLE_ENTRY(wxEVT_WXLUA_DEBUG_EXIT,                id, -1, wxLuaDebugEventHandler(fn), (wxObject *) NULL),
! #define EVT_WXLUA_DEBUG_STACK_ENUM(fn)           DECLARE_EVENT_TABLE_ENTRY(wxEVT_WXLUA_DEBUG_STACK_ENUM,          -1, -1, wxLuaDebugEventHandler(fn), (wxObject *) NULL),
! #define EVT_WXLUA_DEBUG_STACK_ENTRY_ENUM(fn)     DECLARE_EVENT_TABLE_ENTRY(wxEVT_WXLUA_DEBUG_STACK_ENTRY_ENUM,    -1, -1, wxLuaDebugEventHandler(fn), (wxObject *) NULL),
! #define EVT_WXLUA_DEBUG_TABLE_ENUM(fn)           DECLARE_EVENT_TABLE_ENTRY(wxEVT_WXLUA_DEBUG_TABLE_ENUM,          -1, -1, wxLuaDebugEventHandler(fn), (wxObject *) NULL),
! #define EVT_WXLUA_DEBUG_EVALUATE_EXPR(id, fn)    DECLARE_EVENT_TABLE_ENTRY(wxEVT_WXLUA_DEBUG_EVALUATE_EXPR,       id, -1, wxLuaDebugEventHandler(fn), (wxObject *) NULL),
! #define EVT_WXLUA_DEBUG_STARTDEBUGGER(fn)        DECLARE_EVENT_TABLE_ENTRY(wxEVT_WXLUA_DEBUG_STARTDEBUGGER,       -1, -1, wxLuaDebugEventHandler(fn), (wxObject *) NULL),
! #define EVT_WXLUA_DEBUG_STOPDEBUGGER(fn)         DECLARE_EVENT_TABLE_ENTRY(wxEVT_WXLUA_DEBUG_STOPDEBUGGER,        -1, -1, wxLuaDebugEventHandler(fn), (wxObject *) NULL),
! #define EVT_WXLUA_DEBUG_BREAKPOINT_ADDED(fn)     DECLARE_EVENT_TABLE_ENTRY(wxEVT_WXLUA_DEBUG_BREAKPOINT_ADDED,    -1, -1, wxLuaDebugEventHandler(fn), (wxObject *) NULL),
! #define EVT_WXLUA_DEBUG_BREAKPOINT_REMOVED(fn)   DECLARE_EVENT_TABLE_ENTRY(wxEVT_WXLUA_DEBUG_BREAKPOINT_REMOVED,  -1, -1, wxLuaDebugEventHandler(fn), (wxObject *) NULL),
  
  #endif // WX_LUA_DEBUG_H

[Wxlua-commit] wxLua/apps/wxluaedit/src Makefile,1.1,1.2

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

Update of /cvsroot/wxlua/wxLua/apps/wxluaedit/src
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv32720/wxLua/apps/wxluaedit/src

Modified Files:
	Makefile 
Log Message:
wxEVT_DEBUG_XXX -> wxEVT_WXLUA_DEBUG_XXX and export them for DLL
reorder libs for linking in wxluaedit
TRUE/FALSE -> true/false
EVENT_DEBUG_XXX and CMD_XXX -> wxLUA_EVENT_DEBUG_XXX wxLUA_CMD_XXX


Index: Makefile
===================================================================
RCS file: /cvsroot/wxlua/wxLua/apps/wxluaedit/src/Makefile,v
retrieving revision 1.1
retrieving revision 1.2
diff -C2 -d -r1.1 -r1.2
*** Makefile	24 Nov 2005 06:38:17 -0000	1.1
--- Makefile	1 Dec 2005 04:17:29 -0000	1.2
***************
*** 26,30 ****
  WXCXXFLAGS = $(shell $(WXCONFIG) --cxxflags)
  WXLDLIBS   = $(shell $(WXCONFIG) --libs)
! WXCXX      = $(shell $(WXCONFIG) --cxx) 
  WXLIB_DIR  = $(WXPREFIX)/lib
  # ----------------------------------------------------------------------------
--- 26,30 ----
  WXCXXFLAGS = $(shell $(WXCONFIG) --cxxflags)
  WXLDLIBS   = $(shell $(WXCONFIG) --libs)
! WXCXX      = $(shell $(WXCONFIG) --cxx)
  WXLIB_DIR  = $(WXPREFIX)/lib
  # ----------------------------------------------------------------------------
***************
*** 36,40 ****
  PROGRAM = wxLuaEditor
  
! LUA_LIBS        = $(WXLUA_DIR)/lib/liblua.a $(WXLUA_DIR)/lib/liblualib.a 
  WXLUA_LIB       = $(WXBASENAME)_wxlua-$(WXRELEASE)
  WXLUADEBUG_LIB  = $(WXBASENAME)_wxluadebug-$(WXRELEASE)
--- 36,40 ----
  PROGRAM = wxLuaEditor
  
! LUA_LIBS        = $(WXLUA_DIR)/lib/liblua.a $(WXLUA_DIR)/lib/liblualib.a
  WXLUA_LIB       = $(WXBASENAME)_wxlua-$(WXRELEASE)
  WXLUADEBUG_LIB  = $(WXBASENAME)_wxluadebug-$(WXRELEASE)
***************
*** 47,52 ****
  # The wxSTEditor library name compiled from wxCode/components/wxstedit
  WXSTEDIT_LIB    = $(WXBASENAME)_stedit-$(WXRELEASE)
  
! APPEXTRADEFS=-I$(WXCODE)/components/wxstedit/include -I$(WXLUA_DIR)/modules -I$(WXPREFIX)/contrib/include -fexceptions -DLUACALL=
  
  # This will build a static wxLua app, staticly linked to .a libs
--- 47,53 ----
  # The wxSTEditor library name compiled from wxCode/components/wxstedit
  WXSTEDIT_LIB    = $(WXBASENAME)_stedit-$(WXRELEASE)
+ WXSTEDIT_DIR    = $(WXCODE)/components/wxstedit
  
! APPEXTRADEFS=-I$(WXSTEDIT_DIR)/include -I$(WXLUA_DIR)/modules -I$(WXPREFIX)/contrib/include -fexceptions -DLUACALL=
  
  # This will build a static wxLua app, staticly linked to .a libs
***************
*** 55,59 ****
  # This will build a shared wxLua app, dynamicly linked to .so libs
  #  -l$(WXFL_LIB)
! APPEXTRALIBS=-L$(WXLIB_DIR) -L$(WXLUA_LIBDIR) -l$(WXSTEDIT_LIB) -l$(WXLUA_LIB) -l$(WXLUADEBUG_LIB) -l$(WXLUASOCKET_LIB) -l$(WXSTC_LIB) -l$(WXXRC_LIB) $(LUA_LIBS) -l$(WXLUABIND_LIB)
  
  OBJECTS  = wxluaedit.o wxledit.o
--- 56,60 ----
  # This will build a shared wxLua app, dynamicly linked to .so libs
  #  -l$(WXFL_LIB)
! APPEXTRALIBS=-L$(WXLIB_DIR) -L$(WXLUA_LIBDIR) -l$(WXSTC_LIB) -l$(WXSTEDIT_LIB) -l$(WXXRC_LIB) -l$(WXLUABIND_LIB) -l$(WXLUA_LIB) -l$(WXLUADEBUG_LIB) -l$(WXLUASOCKET_LIB) $(LUA_LIBS)
  
  OBJECTS  = wxluaedit.o wxledit.o
***************
*** 63,75 ****
  	$(CXX) -c $(CXXFLAGS) $(APPEXTRADEFS) -o $@ $<
  
! all: lua wxLuaLib wxLuaDebugLib wxLuaSocketLib wxLuaBindings $(PROGRAM)  
  
  $(PROGRAM): $(OBJECTS) $(LUA_LIBS)
! 	$(CXX) -o $@ $(OBJECTS) $(LDLIBS) $(APPEXTRALIBS) 
  
  lua:
  	@(cd $(WXLUA_DIR)/modules/lua && make)
  
! bindings: 
  	@(cd $(WXLUA_DIR)/bindings/wxwidgets && make)
  
--- 64,76 ----
  	$(CXX) -c $(CXXFLAGS) $(APPEXTRADEFS) -o $@ $<
  
! all: lua wxLuaLib wxLuaDebugLib wxLuaSocketLib wxLuaBindings $(PROGRAM)
  
  $(PROGRAM): $(OBJECTS) $(LUA_LIBS)
! 	$(CXX) -o $@ $(OBJECTS) $(LDLIBS) $(APPEXTRALIBS)
  
  lua:
  	@(cd $(WXLUA_DIR)/modules/lua && make)
  
! bindings:
  	@(cd $(WXLUA_DIR)/bindings/wxwidgets && make)
  

[Wxlua-commit] wxLua/bindings/wxwidgets wxlua.i,1.7,1.8

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

Update of /cvsroot/wxlua/wxLua/bindings/wxwidgets
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv32720/wxLua/bindings/wxwidgets

Modified Files:
	wxlua.i 
Log Message:
wxEVT_DEBUG_XXX -> wxEVT_WXLUA_DEBUG_XXX and export them for DLL
reorder libs for linking in wxluaedit
TRUE/FALSE -> true/false
EVENT_DEBUG_XXX and CMD_XXX -> wxLUA_EVENT_DEBUG_XXX wxLUA_CMD_XXX


Index: wxlua.i
===================================================================
RCS file: /cvsroot/wxlua/wxLua/bindings/wxwidgets/wxlua.i,v
retrieving revision 1.7
retrieving revision 1.8
diff -C2 -d -r1.7 -r1.8
*** wxlua.i	26 Nov 2005 08:46:57 -0000	1.7
--- wxlua.i	1 Dec 2005 04:17:29 -0000	1.8
***************
*** 61,73 ****
  
  %class wxLuaDebugEvent, wxEvent
!     %define %event wxEVT_DEBUG_CLIENT_CONNECTED
!     %define %event wxEVT_DEBUG_BREAK
!     %define %event wxEVT_DEBUG_PRINT
!     %define %event wxEVT_DEBUG_ERROR
!     %define %event wxEVT_DEBUG_EXIT
!     %define %event wxEVT_DEBUG_STACK_ENUM
!     %define %event wxEVT_DEBUG_STACK_ENTRY_ENUM
!     %define %event wxEVT_DEBUG_TABLE_ENUM
!     %define %event wxEVT_DEBUG_EVALUATE_EXPR
  
      int GetLineNumber() const
--- 61,73 ----
  
  %class wxLuaDebugEvent, wxEvent
!     %define %event wxEVT_WXLUA_DEBUG_CLIENT_CONNECTED
!     %define %event wxEVT_WXLUA_DEBUG_BREAK
!     %define %event wxEVT_WXLUA_DEBUG_PRINT
!     %define %event wxEVT_WXLUA_DEBUG_ERROR
!     %define %event wxEVT_WXLUA_DEBUG_EXIT
!     %define %event wxEVT_WXLUA_DEBUG_STACK_ENUM
!     %define %event wxEVT_WXLUA_DEBUG_STACK_ENTRY_ENUM
!     %define %event wxEVT_WXLUA_DEBUG_TABLE_ENUM
!     %define %event wxEVT_WXLUA_DEBUG_EVALUATE_EXPR
  
      int GetLineNumber() const

[Wxlua-commit] wxLua/apps/build/msw apps_app_wxluaedit.dsp,1.2,1.3 makefile.bcc,1.12,1.13 makefile.gcc,1.12,1.13 makefile.vc,1.10,1.11 makefile.wat,1.12,1.13

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

Update of /cvsroot/wxlua/wxLua/apps/build/msw
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv7962/wxLua/apps/build/msw

Modified Files:
	apps_app_wxluaedit.dsp makefile.bcc makefile.gcc makefile.vc 
	makefile.wat 
Log Message:
get wxluaedit apps to work again


Index: makefile.vc
===================================================================
RCS file: /cvsroot/wxlua/wxLua/apps/build/msw/makefile.vc,v
retrieving revision 1.10
retrieving revision 1.11
diff -C2 -d -r1.10 -r1.11
*** makefile.vc	29 Nov 2005 23:52:11 -0000	1.10
--- makefile.vc	30 Nov 2005 23:52:30 -0000	1.11
***************
*** 67,72 ****
  	/I$(WX_DIR)\include /I..\..\..\modules $(__WARNINGS) $(__OPTIMIZEFLAG) \
  	$(__DEBUGINFO) /Fd..\..\..\bin\wxluaedit.pdb $(____DEBUGRUNTIME) \
! 	$(__WX_SHAREDDEFINE_p) /D_WINDOWS /I$(WXSTEDIT)\include /GR /EHsc $(CPPFLAGS) \
! 	$(CXXFLAGS)
  APP_WXLUAEDIT_OBJECTS =  \
  	msvc$(WXLIBPOSTFIX)\app_wxluaedit_wxledit.obj \
--- 67,72 ----
  	/I$(WX_DIR)\include /I..\..\..\modules $(__WARNINGS) $(__OPTIMIZEFLAG) \
  	$(__DEBUGINFO) /Fd..\..\..\bin\wxluaedit.pdb $(____DEBUGRUNTIME) \
! 	$(__WX_SHAREDDEFINE_p) /D_WINDOWS /I$(WXSTEDIT)\include \
! 	/I$(WX_DIR)\contrib\include /GR /EHsc $(CPPFLAGS) $(CXXFLAGS)
  APP_WXLUAEDIT_OBJECTS =  \
  	msvc$(WXLIBPOSTFIX)\app_wxluaedit_wxledit.obj \

Index: apps_app_wxluaedit.dsp
===================================================================
RCS file: /cvsroot/wxlua/wxLua/apps/build/msw/apps_app_wxluaedit.dsp,v
retrieving revision 1.2
retrieving revision 1.3
diff -C2 -d -r1.2 -r1.3
*** apps_app_wxluaedit.dsp	29 Nov 2005 23:52:11 -0000	1.2
--- apps_app_wxluaedit.dsp	30 Nov 2005 23:52:30 -0000	1.3
***************
*** 48,57 ****
  # PROP Intermediate_Dir "msvc6prjud\app_wxluaedit"
  # PROP Target_Dir ""
! # ADD BASE CPP /nologo /FD /MDd /GR /EHsc /I "$(WXWIN)\lib\vc_dll\mswud" /I "$(WXWIN)\include" /I "..\..\..\modules" /W4 /Od /Zi /Gm /GZ /Fd..\..\..\bin\wxluaedit.pdb /I "$(WXSTEDIT)\include" /D "WIN32" /D "_UNICODE" /D "__WXDEBUG__" /D "__WXMSW__" /D "_DEBUG" /D "WXUSINGDLL" /D "_WINDOWS" /c
! # ADD CPP /nologo /FD /MDd /GR /EHsc /I "$(WXWIN)\lib\vc_dll\mswud" /I "$(WXWIN)\include" /I "..\..\..\modules" /W4 /Od /Zi /Gm /GZ /Fd..\..\..\bin\wxluaedit.pdb /I "$(WXSTEDIT)\include" /D "WIN32" /D "_UNICODE" /D "__WXDEBUG__" /D "__WXMSW__" /D "_DEBUG" /D "WXUSINGDLL" /D "_WINDOWS" /c
  # ADD BASE MTL /nologo /D "WIN32" /D "_UNICODE" /D "__WXDEBUG__" /D "__WXMSW__" /D "_DEBUG" /D "WXUSINGDLL" /D "_WINDOWS" /mktyplib203 /win32
  # ADD MTL /nologo /D "WIN32" /D "_UNICODE" /D "__WXDEBUG__" /D "__WXMSW__" /D "_DEBUG" /D "WXUSINGDLL" /D "_WINDOWS" /mktyplib203 /win32
! # ADD BASE RSC /l 0x409 /d "_UNICODE" /d "__WXDEBUG__" /d "__WXMSW__" /i "$(WXWIN)\lib\vc_dll\mswud" /i "$(WXWIN)\include" /i "..\..\..\modules" /d "_DEBUG" /d "WXUSINGDLL" /d "_WINDOWS" /i $(WXSTEDIT)\include
! # ADD RSC /l 0x409 /d "_UNICODE" /d "__WXDEBUG__" /d "__WXMSW__" /i "$(WXWIN)\lib\vc_dll\mswud" /i "$(WXWIN)\include" /i "..\..\..\modules" /d "_DEBUG" /d "WXUSINGDLL" /d "_WINDOWS" /i $(WXSTEDIT)\include
  BSC32=bscmake.exe
  # ADD BASE BSC32 /nologo
--- 48,57 ----
  # PROP Intermediate_Dir "msvc6prjud\app_wxluaedit"
  # PROP Target_Dir ""
! # ADD BASE CPP /nologo /FD /MDd /GR /EHsc /I "$(WXWIN)\lib\vc_dll\mswud" /I "$(WXWIN)\include" /I "..\..\..\modules" /W4 /Od /Zi /Gm /GZ /Fd..\..\..\bin\wxluaedit.pdb /I "$(WXSTEDIT)\include" /I "$(WXWIN)\contrib\include" /D "WIN32" /D "_UNICODE" /D "__WXDEBUG__" /D "__WXMSW__" /D "_DEBUG" /D "WXUSINGDLL" /D "_WINDOWS" /c
! # ADD CPP /nologo /FD /MDd /GR /EHsc /I "$(WXWIN)\lib\vc_dll\mswud" /I "$(WXWIN)\include" /I "..\..\..\modules" /W4 /Od /Zi /Gm /GZ /Fd..\..\..\bin\wxluaedit.pdb /I "$(WXSTEDIT)\include" /I "$(WXWIN)\contrib\include" /D "WIN32" /D "_UNICODE" /D "__WXDEBUG__" /D "__WXMSW__" /D "_DEBUG" /D "WXUSINGDLL" /D "_WINDOWS" /c
  # ADD BASE MTL /nologo /D "WIN32" /D "_UNICODE" /D "__WXDEBUG__" /D "__WXMSW__" /D "_DEBUG" /D "WXUSINGDLL" /D "_WINDOWS" /mktyplib203 /win32
  # ADD MTL /nologo /D "WIN32" /D "_UNICODE" /D "__WXDEBUG__" /D "__WXMSW__" /D "_DEBUG" /D "WXUSINGDLL" /D "_WINDOWS" /mktyplib203 /win32
! # ADD BASE RSC /l 0x409 /d "_UNICODE" /d "__WXDEBUG__" /d "__WXMSW__" /i "$(WXWIN)\lib\vc_dll\mswud" /i "$(WXWIN)\include" /i "..\..\..\modules" /d "_DEBUG" /d "WXUSINGDLL" /d "_WINDOWS" /i "$(WXSTEDIT)\include" /i $(WXWIN)\contrib\include
! # ADD RSC /l 0x409 /d "_UNICODE" /d "__WXDEBUG__" /d "__WXMSW__" /i "$(WXWIN)\lib\vc_dll\mswud" /i "$(WXWIN)\include" /i "..\..\..\modules" /d "_DEBUG" /d "WXUSINGDLL" /d "_WINDOWS" /i "$(WXSTEDIT)\include" /i $(WXWIN)\contrib\include
  BSC32=bscmake.exe
  # ADD BASE BSC32 /nologo
***************
*** 73,82 ****
  # PROP Intermediate_Dir "msvc6prju\app_wxluaedit"
  # PROP Target_Dir ""
! # ADD BASE CPP /nologo /FD /MD /GR /EHsc /I "$(WXWIN)\lib\vc_dll\mswu" /I "$(WXWIN)\include" /I "..\..\..\modules" /w /O2 /Fd..\..\..\bin\wxluaedit.pdb /I "$(WXSTEDIT)\include" /D "WIN32" /D "_UNICODE" /D "__WXMSW__" /D "WXUSINGDLL" /D "_WINDOWS" /c
! # ADD CPP /nologo /FD /MD /GR /EHsc /I "$(WXWIN)\lib\vc_dll\mswu" /I "$(WXWIN)\include" /I "..\..\..\modules" /w /O2 /Fd..\..\..\bin\wxluaedit.pdb /I "$(WXSTEDIT)\include" /D "WIN32" /D "_UNICODE" /D "__WXMSW__" /D "WXUSINGDLL" /D "_WINDOWS" /c
  # ADD BASE MTL /nologo /D "WIN32" /D "_UNICODE" /D "__WXMSW__" /D "WXUSINGDLL" /D "_WINDOWS" /mktyplib203 /win32
  # ADD MTL /nologo /D "WIN32" /D "_UNICODE" /D "__WXMSW__" /D "WXUSINGDLL" /D "_WINDOWS" /mktyplib203 /win32
! # ADD BASE RSC /l 0x409 /d "_UNICODE" /d "__WXMSW__" /i "$(WXWIN)\lib\vc_dll\mswu" /i "$(WXWIN)\include" /i "..\..\..\modules" /d "WXUSINGDLL" /d "_WINDOWS" /i $(WXSTEDIT)\include
! # ADD RSC /l 0x409 /d "_UNICODE" /d "__WXMSW__" /i "$(WXWIN)\lib\vc_dll\mswu" /i "$(WXWIN)\include" /i "..\..\..\modules" /d "WXUSINGDLL" /d "_WINDOWS" /i $(WXSTEDIT)\include
  BSC32=bscmake.exe
  # ADD BASE BSC32 /nologo
--- 73,82 ----
  # PROP Intermediate_Dir "msvc6prju\app_wxluaedit"
  # PROP Target_Dir ""
! # ADD BASE CPP /nologo /FD /MD /GR /EHsc /I "$(WXWIN)\lib\vc_dll\mswu" /I "$(WXWIN)\include" /I "..\..\..\modules" /w /O2 /Fd..\..\..\bin\wxluaedit.pdb /I "$(WXSTEDIT)\include" /I "$(WXWIN)\contrib\include" /D "WIN32" /D "_UNICODE" /D "__WXMSW__" /D "WXUSINGDLL" /D "_WINDOWS" /c
! # ADD CPP /nologo /FD /MD /GR /EHsc /I "$(WXWIN)\lib\vc_dll\mswu" /I "$(WXWIN)\include" /I "..\..\..\modules" /w /O2 /Fd..\..\..\bin\wxluaedit.pdb /I "$(WXSTEDIT)\include" /I "$(WXWIN)\contrib\include" /D "WIN32" /D "_UNICODE" /D "__WXMSW__" /D "WXUSINGDLL" /D "_WINDOWS" /c
  # ADD BASE MTL /nologo /D "WIN32" /D "_UNICODE" /D "__WXMSW__" /D "WXUSINGDLL" /D "_WINDOWS" /mktyplib203 /win32
  # ADD MTL /nologo /D "WIN32" /D "_UNICODE" /D "__WXMSW__" /D "WXUSINGDLL" /D "_WINDOWS" /mktyplib203 /win32
! # ADD BASE RSC /l 0x409 /d "_UNICODE" /d "__WXMSW__" /i "$(WXWIN)\lib\vc_dll\mswu" /i "$(WXWIN)\include" /i "..\..\..\modules" /d "WXUSINGDLL" /d "_WINDOWS" /i "$(WXSTEDIT)\include" /i $(WXWIN)\contrib\include
! # ADD RSC /l 0x409 /d "_UNICODE" /d "__WXMSW__" /i "$(WXWIN)\lib\vc_dll\mswu" /i "$(WXWIN)\include" /i "..\..\..\modules" /d "WXUSINGDLL" /d "_WINDOWS" /i "$(WXSTEDIT)\include" /i $(WXWIN)\contrib\include
  BSC32=bscmake.exe
  # ADD BASE BSC32 /nologo
***************
*** 98,107 ****
  # PROP Intermediate_Dir "msvc6prjd\app_wxluaedit"
  # PROP Target_Dir ""
! # ADD BASE CPP /nologo /FD /MDd /GR /EHsc /I "$(WXWIN)\lib\vc_dll\mswd" /I "$(WXWIN)\include" /I "..\..\..\modules" /W4 /Od /Zi /Gm /GZ /Fd..\..\..\bin\wxluaedit.pdb /I "$(WXSTEDIT)\include" /D "WIN32" /D "__WXDEBUG__" /D "__WXMSW__" /D "_DEBUG" /D "WXUSINGDLL" /D "_WINDOWS" /c
! # ADD CPP /nologo /FD /MDd /GR /EHsc /I "$(WXWIN)\lib\vc_dll\mswd" /I "$(WXWIN)\include" /I "..\..\..\modules" /W4 /Od /Zi /Gm /GZ /Fd..\..\..\bin\wxluaedit.pdb /I "$(WXSTEDIT)\include" /D "WIN32" /D "__WXDEBUG__" /D "__WXMSW__" /D "_DEBUG" /D "WXUSINGDLL" /D "_WINDOWS" /c
  # ADD BASE MTL /nologo /D "WIN32" /D "__WXDEBUG__" /D "__WXMSW__" /D "_DEBUG" /D "WXUSINGDLL" /D "_WINDOWS" /mktyplib203 /win32
  # ADD MTL /nologo /D "WIN32" /D "__WXDEBUG__" /D "__WXMSW__" /D "_DEBUG" /D "WXUSINGDLL" /D "_WINDOWS" /mktyplib203 /win32
! # ADD BASE RSC /l 0x409 /d "__WXDEBUG__" /d "__WXMSW__" /i "$(WXWIN)\lib\vc_dll\mswd" /i "$(WXWIN)\include" /i "..\..\..\modules" /d "_DEBUG" /d "WXUSINGDLL" /d "_WINDOWS" /i $(WXSTEDIT)\include
! # ADD RSC /l 0x409 /d "__WXDEBUG__" /d "__WXMSW__" /i "$(WXWIN)\lib\vc_dll\mswd" /i "$(WXWIN)\include" /i "..\..\..\modules" /d "_DEBUG" /d "WXUSINGDLL" /d "_WINDOWS" /i $(WXSTEDIT)\include
  BSC32=bscmake.exe
  # ADD BASE BSC32 /nologo
--- 98,107 ----
  # PROP Intermediate_Dir "msvc6prjd\app_wxluaedit"
  # PROP Target_Dir ""
! # ADD BASE CPP /nologo /FD /MDd /GR /EHsc /I "$(WXWIN)\lib\vc_dll\mswd" /I "$(WXWIN)\include" /I "..\..\..\modules" /W4 /Od /Zi /Gm /GZ /Fd..\..\..\bin\wxluaedit.pdb /I "$(WXSTEDIT)\include" /I "$(WXWIN)\contrib\include" /D "WIN32" /D "__WXDEBUG__" /D "__WXMSW__" /D "_DEBUG" /D "WXUSINGDLL" /D "_WINDOWS" /c
! # ADD CPP /nologo /FD /MDd /GR /EHsc /I "$(WXWIN)\lib\vc_dll\mswd" /I "$(WXWIN)\include" /I "..\..\..\modules" /W4 /Od /Zi /Gm /GZ /Fd..\..\..\bin\wxluaedit.pdb /I "$(WXSTEDIT)\include" /I "$(WXWIN)\contrib\include" /D "WIN32" /D "__WXDEBUG__" /D "__WXMSW__" /D "_DEBUG" /D "WXUSINGDLL" /D "_WINDOWS" /c
  # ADD BASE MTL /nologo /D "WIN32" /D "__WXDEBUG__" /D "__WXMSW__" /D "_DEBUG" /D "WXUSINGDLL" /D "_WINDOWS" /mktyplib203 /win32
  # ADD MTL /nologo /D "WIN32" /D "__WXDEBUG__" /D "__WXMSW__" /D "_DEBUG" /D "WXUSINGDLL" /D "_WINDOWS" /mktyplib203 /win32
! # ADD BASE RSC /l 0x409 /d "__WXDEBUG__" /d "__WXMSW__" /i "$(WXWIN)\lib\vc_dll\mswd" /i "$(WXWIN)\include" /i "..\..\..\modules" /d "_DEBUG" /d "WXUSINGDLL" /d "_WINDOWS" /i "$(WXSTEDIT)\include" /i $(WXWIN)\contrib\include
! # ADD RSC /l 0x409 /d "__WXDEBUG__" /d "__WXMSW__" /i "$(WXWIN)\lib\vc_dll\mswd" /i "$(WXWIN)\include" /i "..\..\..\modules" /d "_DEBUG" /d "WXUSINGDLL" /d "_WINDOWS" /i "$(WXSTEDIT)\include" /i $(WXWIN)\contrib\include
  BSC32=bscmake.exe
  # ADD BASE BSC32 /nologo
***************
*** 123,132 ****
  # PROP Intermediate_Dir "msvc6prj\app_wxluaedit"
  # PROP Target_Dir ""
! # ADD BASE CPP /nologo /FD /MD /GR /EHsc /I "$(WXWIN)\lib\vc_dll\msw" /I "$(WXWIN)\include" /I "..\..\..\modules" /w /O2 /Fd..\..\..\bin\wxluaedit.pdb /I "$(WXSTEDIT)\include" /D "WIN32" /D "__WXMSW__" /D "WXUSINGDLL" /D "_WINDOWS" /c
! # ADD CPP /nologo /FD /MD /GR /EHsc /I "$(WXWIN)\lib\vc_dll\msw" /I "$(WXWIN)\include" /I "..\..\..\modules" /w /O2 /Fd..\..\..\bin\wxluaedit.pdb /I "$(WXSTEDIT)\include" /D "WIN32" /D "__WXMSW__" /D "WXUSINGDLL" /D "_WINDOWS" /c
  # ADD BASE MTL /nologo /D "WIN32" /D "__WXMSW__" /D "WXUSINGDLL" /D "_WINDOWS" /mktyplib203 /win32
  # ADD MTL /nologo /D "WIN32" /D "__WXMSW__" /D "WXUSINGDLL" /D "_WINDOWS" /mktyplib203 /win32
! # ADD BASE RSC /l 0x409 /d "__WXMSW__" /i "$(WXWIN)\lib\vc_dll\msw" /i "$(WXWIN)\include" /i "..\..\..\modules" /d "WXUSINGDLL" /d "_WINDOWS" /i $(WXSTEDIT)\include
! # ADD RSC /l 0x409 /d "__WXMSW__" /i "$(WXWIN)\lib\vc_dll\msw" /i "$(WXWIN)\include" /i "..\..\..\modules" /d "WXUSINGDLL" /d "_WINDOWS" /i $(WXSTEDIT)\include
  BSC32=bscmake.exe
  # ADD BASE BSC32 /nologo
--- 123,132 ----
  # PROP Intermediate_Dir "msvc6prj\app_wxluaedit"
  # PROP Target_Dir ""
! # ADD BASE CPP /nologo /FD /MD /GR /EHsc /I "$(WXWIN)\lib\vc_dll\msw" /I "$(WXWIN)\include" /I "..\..\..\modules" /w /O2 /Fd..\..\..\bin\wxluaedit.pdb /I "$(WXSTEDIT)\include" /I "$(WXWIN)\contrib\include" /D "WIN32" /D "__WXMSW__" /D "WXUSINGDLL" /D "_WINDOWS" /c
! # ADD CPP /nologo /FD /MD /GR /EHsc /I "$(WXWIN)\lib\vc_dll\msw" /I "$(WXWIN)\include" /I "..\..\..\modules" /w /O2 /Fd..\..\..\bin\wxluaedit.pdb /I "$(WXSTEDIT)\include" /I "$(WXWIN)\contrib\include" /D "WIN32" /D "__WXMSW__" /D "WXUSINGDLL" /D "_WINDOWS" /c
  # ADD BASE MTL /nologo /D "WIN32" /D "__WXMSW__" /D "WXUSINGDLL" /D "_WINDOWS" /mktyplib203 /win32
  # ADD MTL /nologo /D "WIN32" /D "__WXMSW__" /D "WXUSINGDLL" /D "_WINDOWS" /mktyplib203 /win32
! # ADD BASE RSC /l 0x409 /d "__WXMSW__" /i "$(WXWIN)\lib\vc_dll\msw" /i "$(WXWIN)\include" /i "..\..\..\modules" /d "WXUSINGDLL" /d "_WINDOWS" /i "$(WXSTEDIT)\include" /i $(WXWIN)\contrib\include
! # ADD RSC /l 0x409 /d "__WXMSW__" /i "$(WXWIN)\lib\vc_dll\msw" /i "$(WXWIN)\include" /i "..\..\..\modules" /d "WXUSINGDLL" /d "_WINDOWS" /i "$(WXSTEDIT)\include" /i $(WXWIN)\contrib\include
  BSC32=bscmake.exe
  # ADD BASE BSC32 /nologo
***************
*** 148,157 ****
  # PROP Intermediate_Dir "msvc6prjud\app_wxluaedit"
  # PROP Target_Dir ""
! # ADD BASE CPP /nologo /FD /MDd /GR /EHsc /I "$(WXWIN)\lib\vc_lib\mswud" /I "$(WXWIN)\include" /I "..\..\..\modules" /W4 /Od /Zi /Gm /GZ /Fd..\..\..\bin\wxluaedit.pdb /I "$(WXSTEDIT)\include" /D "WIN32" /D "_UNICODE" /D "__WXDEBUG__" /D "__WXMSW__" /D "_DEBUG" /D "_WINDOWS" /c
! # ADD CPP /nologo /FD /MDd /GR /EHsc /I "$(WXWIN)\lib\vc_lib\mswud" /I "$(WXWIN)\include" /I "..\..\..\modules" /W4 /Od /Zi /Gm /GZ /Fd..\..\..\bin\wxluaedit.pdb /I "$(WXSTEDIT)\include" /D "WIN32" /D "_UNICODE" /D "__WXDEBUG__" /D "__WXMSW__" /D "_DEBUG" /D "_WINDOWS" /c
  # ADD BASE MTL /nologo /D "WIN32" /D "_UNICODE" /D "__WXDEBUG__" /D "__WXMSW__" /D "_DEBUG" /D "_WINDOWS" /mktyplib203 /win32
  # ADD MTL /nologo /D "WIN32" /D "_UNICODE" /D "__WXDEBUG__" /D "__WXMSW__" /D "_DEBUG" /D "_WINDOWS" /mktyplib203 /win32
! # ADD BASE RSC /l 0x409 /d "_UNICODE" /d "__WXDEBUG__" /d "__WXMSW__" /i "$(WXWIN)\lib\vc_lib\mswud" /i "$(WXWIN)\include" /i "..\..\..\modules" /d "_DEBUG" /d "_WINDOWS" /i $(WXSTEDIT)\include
! # ADD RSC /l 0x409 /d "_UNICODE" /d "__WXDEBUG__" /d "__WXMSW__" /i "$(WXWIN)\lib\vc_lib\mswud" /i "$(WXWIN)\include" /i "..\..\..\modules" /d "_DEBUG" /d "_WINDOWS" /i $(WXSTEDIT)\include
  BSC32=bscmake.exe
  # ADD BASE BSC32 /nologo
--- 148,157 ----
  # PROP Intermediate_Dir "msvc6prjud\app_wxluaedit"
  # PROP Target_Dir ""
! # ADD BASE CPP /nologo /FD /MDd /GR /EHsc /I "$(WXWIN)\lib\vc_lib\mswud" /I "$(WXWIN)\include" /I "..\..\..\modules" /W4 /Od /Zi /Gm /GZ /Fd..\..\..\bin\wxluaedit.pdb /I "$(WXSTEDIT)\include" /I "$(WXWIN)\contrib\include" /D "WIN32" /D "_UNICODE" /D "__WXDEBUG__" /D "__WXMSW__" /D "_DEBUG" /D "_WINDOWS" /c
! # ADD CPP /nologo /FD /MDd /GR /EHsc /I "$(WXWIN)\lib\vc_lib\mswud" /I "$(WXWIN)\include" /I "..\..\..\modules" /W4 /Od /Zi /Gm /GZ /Fd..\..\..\bin\wxluaedit.pdb /I "$(WXSTEDIT)\include" /I "$(WXWIN)\contrib\include" /D "WIN32" /D "_UNICODE" /D "__WXDEBUG__" /D "__WXMSW__" /D "_DEBUG" /D "_WINDOWS" /c
  # ADD BASE MTL /nologo /D "WIN32" /D "_UNICODE" /D "__WXDEBUG__" /D "__WXMSW__" /D "_DEBUG" /D "_WINDOWS" /mktyplib203 /win32
  # ADD MTL /nologo /D "WIN32" /D "_UNICODE" /D "__WXDEBUG__" /D "__WXMSW__" /D "_DEBUG" /D "_WINDOWS" /mktyplib203 /win32
! # ADD BASE RSC /l 0x409 /d "_UNICODE" /d "__WXDEBUG__" /d "__WXMSW__" /i "$(WXWIN)\lib\vc_lib\mswud" /i "$(WXWIN)\include" /i "..\..\..\modules" /d "_DEBUG" /d "_WINDOWS" /i "$(WXSTEDIT)\include" /i $(WXWIN)\contrib\include
! # ADD RSC /l 0x409 /d "_UNICODE" /d "__WXDEBUG__" /d "__WXMSW__" /i "$(WXWIN)\lib\vc_lib\mswud" /i "$(WXWIN)\include" /i "..\..\..\modules" /d "_DEBUG" /d "_WINDOWS" /i "$(WXSTEDIT)\include" /i $(WXWIN)\contrib\include
  BSC32=bscmake.exe
  # ADD BASE BSC32 /nologo
***************
*** 173,182 ****
  # PROP Intermediate_Dir "msvc6prju\app_wxluaedit"
  # PROP Target_Dir ""
! # ADD BASE CPP /nologo /FD /MD /GR /EHsc /I "$(WXWIN)\lib\vc_lib\mswu" /I "$(WXWIN)\include" /I "..\..\..\modules" /w /O2 /Fd..\..\..\bin\wxluaedit.pdb /I "$(WXSTEDIT)\include" /D "WIN32" /D "_UNICODE" /D "__WXMSW__" /D "_WINDOWS" /c
! # ADD CPP /nologo /FD /MD /GR /EHsc /I "$(WXWIN)\lib\vc_lib\mswu" /I "$(WXWIN)\include" /I "..\..\..\modules" /w /O2 /Fd..\..\..\bin\wxluaedit.pdb /I "$(WXSTEDIT)\include" /D "WIN32" /D "_UNICODE" /D "__WXMSW__" /D "_WINDOWS" /c
  # ADD BASE MTL /nologo /D "WIN32" /D "_UNICODE" /D "__WXMSW__" /D "_WINDOWS" /mktyplib203 /win32
  # ADD MTL /nologo /D "WIN32" /D "_UNICODE" /D "__WXMSW__" /D "_WINDOWS" /mktyplib203 /win32
! # ADD BASE RSC /l 0x409 /d "_UNICODE" /d "__WXMSW__" /i "$(WXWIN)\lib\vc_lib\mswu" /i "$(WXWIN)\include" /i "..\..\..\modules" /d "_WINDOWS" /i $(WXSTEDIT)\include
! # ADD RSC /l 0x409 /d "_UNICODE" /d "__WXMSW__" /i "$(WXWIN)\lib\vc_lib\mswu" /i "$(WXWIN)\include" /i "..\..\..\modules" /d "_WINDOWS" /i $(WXSTEDIT)\include
  BSC32=bscmake.exe
  # ADD BASE BSC32 /nologo
--- 173,182 ----
  # PROP Intermediate_Dir "msvc6prju\app_wxluaedit"
  # PROP Target_Dir ""
! # ADD BASE CPP /nologo /FD /MD /GR /EHsc /I "$(WXWIN)\lib\vc_lib\mswu" /I "$(WXWIN)\include" /I "..\..\..\modules" /w /O2 /Fd..\..\..\bin\wxluaedit.pdb /I "$(WXSTEDIT)\include" /I "$(WXWIN)\contrib\include" /D "WIN32" /D "_UNICODE" /D "__WXMSW__" /D "_WINDOWS" /c
! # ADD CPP /nologo /FD /MD /GR /EHsc /I "$(WXWIN)\lib\vc_lib\mswu" /I "$(WXWIN)\include" /I "..\..\..\modules" /w /O2 /Fd..\..\..\bin\wxluaedit.pdb /I "$(WXSTEDIT)\include" /I "$(WXWIN)\contrib\include" /D "WIN32" /D "_UNICODE" /D "__WXMSW__" /D "_WINDOWS" /c
  # ADD BASE MTL /nologo /D "WIN32" /D "_UNICODE" /D "__WXMSW__" /D "_WINDOWS" /mktyplib203 /win32
  # ADD MTL /nologo /D "WIN32" /D "_UNICODE" /D "__WXMSW__" /D "_WINDOWS" /mktyplib203 /win32
! # ADD BASE RSC /l 0x409 /d "_UNICODE" /d "__WXMSW__" /i "$(WXWIN)\lib\vc_lib\mswu" /i "$(WXWIN)\include" /i "..\..\..\modules" /d "_WINDOWS" /i "$(WXSTEDIT)\include" /i $(WXWIN)\contrib\include
! # ADD RSC /l 0x409 /d "_UNICODE" /d "__WXMSW__" /i "$(WXWIN)\lib\vc_lib\mswu" /i "$(WXWIN)\include" /i "..\..\..\modules" /d "_WINDOWS" /i "$(WXSTEDIT)\include" /i $(WXWIN)\contrib\include
  BSC32=bscmake.exe
  # ADD BASE BSC32 /nologo
***************
*** 198,207 ****
  # PROP Intermediate_Dir "msvc6prjd\app_wxluaedit"
  # PROP Target_Dir ""
! # ADD BASE CPP /nologo /FD /MDd /GR /EHsc /I "$(WXWIN)\lib\vc_lib\mswd" /I "$(WXWIN)\include" /I "..\..\..\modules" /W4 /Od /Zi /Gm /GZ /Fd..\..\..\bin\wxluaedit.pdb /I "$(WXSTEDIT)\include" /D "WIN32" /D "__WXDEBUG__" /D "__WXMSW__" /D "_DEBUG" /D "_WINDOWS" /c
! # ADD CPP /nologo /FD /MDd /GR /EHsc /I "$(WXWIN)\lib\vc_lib\mswd" /I "$(WXWIN)\include" /I "..\..\..\modules" /W4 /Od /Zi /Gm /GZ /Fd..\..\..\bin\wxluaedit.pdb /I "$(WXSTEDIT)\include" /D "WIN32" /D "__WXDEBUG__" /D "__WXMSW__" /D "_DEBUG" /D "_WINDOWS" /c
  # ADD BASE MTL /nologo /D "WIN32" /D "__WXDEBUG__" /D "__WXMSW__" /D "_DEBUG" /D "_WINDOWS" /mktyplib203 /win32
  # ADD MTL /nologo /D "WIN32" /D "__WXDEBUG__" /D "__WXMSW__" /D "_DEBUG" /D "_WINDOWS" /mktyplib203 /win32
! # ADD BASE RSC /l 0x409 /d "__WXDEBUG__" /d "__WXMSW__" /i "$(WXWIN)\lib\vc_lib\mswd" /i "$(WXWIN)\include" /i "..\..\..\modules" /d "_DEBUG" /d "_WINDOWS" /i $(WXSTEDIT)\include
! # ADD RSC /l 0x409 /d "__WXDEBUG__" /d "__WXMSW__" /i "$(WXWIN)\lib\vc_lib\mswd" /i "$(WXWIN)\include" /i "..\..\..\modules" /d "_DEBUG" /d "_WINDOWS" /i $(WXSTEDIT)\include
  BSC32=bscmake.exe
  # ADD BASE BSC32 /nologo
--- 198,207 ----
  # PROP Intermediate_Dir "msvc6prjd\app_wxluaedit"
  # PROP Target_Dir ""
! # ADD BASE CPP /nologo /FD /MDd /GR /EHsc /I "$(WXWIN)\lib\vc_lib\mswd" /I "$(WXWIN)\include" /I "..\..\..\modules" /W4 /Od /Zi /Gm /GZ /Fd..\..\..\bin\wxluaedit.pdb /I "$(WXSTEDIT)\include" /I "$(WXWIN)\contrib\include" /D "WIN32" /D "__WXDEBUG__" /D "__WXMSW__" /D "_DEBUG" /D "_WINDOWS" /c
! # ADD CPP /nologo /FD /MDd /GR /EHsc /I "$(WXWIN)\lib\vc_lib\mswd" /I "$(WXWIN)\include" /I "..\..\..\modules" /W4 /Od /Zi /Gm /GZ /Fd..\..\..\bin\wxluaedit.pdb /I "$(WXSTEDIT)\include" /I "$(WXWIN)\contrib\include" /D "WIN32" /D "__WXDEBUG__" /D "__WXMSW__" /D "_DEBUG" /D "_WINDOWS" /c
  # ADD BASE MTL /nologo /D "WIN32" /D "__WXDEBUG__" /D "__WXMSW__" /D "_DEBUG" /D "_WINDOWS" /mktyplib203 /win32
  # ADD MTL /nologo /D "WIN32" /D "__WXDEBUG__" /D "__WXMSW__" /D "_DEBUG" /D "_WINDOWS" /mktyplib203 /win32
! # ADD BASE RSC /l 0x409 /d "__WXDEBUG__" /d "__WXMSW__" /i "$(WXWIN)\lib\vc_lib\mswd" /i "$(WXWIN)\include" /i "..\..\..\modules" /d "_DEBUG" /d "_WINDOWS" /i "$(WXSTEDIT)\include" /i $(WXWIN)\contrib\include
! # ADD RSC /l 0x409 /d "__WXDEBUG__" /d "__WXMSW__" /i "$(WXWIN)\lib\vc_lib\mswd" /i "$(WXWIN)\include" /i "..\..\..\modules" /d "_DEBUG" /d "_WINDOWS" /i "$(WXSTEDIT)\include" /i $(WXWIN)\contrib\include
  BSC32=bscmake.exe
  # ADD BASE BSC32 /nologo
***************
*** 223,232 ****
  # PROP Intermediate_Dir "msvc6prj\app_wxluaedit"
  # PROP Target_Dir ""
! # ADD BASE CPP /nologo /FD /MD /GR /EHsc /I "$(WXWIN)\lib\vc_lib\msw" /I "$(WXWIN)\include" /I "..\..\..\modules" /w /O2 /Fd..\..\..\bin\wxluaedit.pdb /I "$(WXSTEDIT)\include" /D "WIN32" /D "__WXMSW__" /D "_WINDOWS" /c
! # ADD CPP /nologo /FD /MD /GR /EHsc /I "$(WXWIN)\lib\vc_lib\msw" /I "$(WXWIN)\include" /I "..\..\..\modules" /w /O2 /Fd..\..\..\bin\wxluaedit.pdb /I "$(WXSTEDIT)\include" /D "WIN32" /D "__WXMSW__" /D "_WINDOWS" /c
  # ADD BASE MTL /nologo /D "WIN32" /D "__WXMSW__" /D "_WINDOWS" /mktyplib203 /win32
  # ADD MTL /nologo /D "WIN32" /D "__WXMSW__" /D "_WINDOWS" /mktyplib203 /win32
! # ADD BASE RSC /l 0x409 /d "__WXMSW__" /i "$(WXWIN)\lib\vc_lib\msw" /i "$(WXWIN)\include" /i "..\..\..\modules" /d "_WINDOWS" /i $(WXSTEDIT)\include
! # ADD RSC /l 0x409 /d "__WXMSW__" /i "$(WXWIN)\lib\vc_lib\msw" /i "$(WXWIN)\include" /i "..\..\..\modules" /d "_WINDOWS" /i $(WXSTEDIT)\include
  BSC32=bscmake.exe
  # ADD BASE BSC32 /nologo
--- 223,232 ----
  # PROP Intermediate_Dir "msvc6prj\app_wxluaedit"
  # PROP Target_Dir ""
! # ADD BASE CPP /nologo /FD /MD /GR /EHsc /I "$(WXWIN)\lib\vc_lib\msw" /I "$(WXWIN)\include" /I "..\..\..\modules" /w /O2 /Fd..\..\..\bin\wxluaedit.pdb /I "$(WXSTEDIT)\include" /I "$(WXWIN)\contrib\include" /D "WIN32" /D "__WXMSW__" /D "_WINDOWS" /c
! # ADD CPP /nologo /FD /MD /GR /EHsc /I "$(WXWIN)\lib\vc_lib\msw" /I "$(WXWIN)\include" /I "..\..\..\modules" /w /O2 /Fd..\..\..\bin\wxluaedit.pdb /I "$(WXSTEDIT)\include" /I "$(WXWIN)\contrib\include" /D "WIN32" /D "__WXMSW__" /D "_WINDOWS" /c
  # ADD BASE MTL /nologo /D "WIN32" /D "__WXMSW__" /D "_WINDOWS" /mktyplib203 /win32
  # ADD MTL /nologo /D "WIN32" /D "__WXMSW__" /D "_WINDOWS" /mktyplib203 /win32
! # ADD BASE RSC /l 0x409 /d "__WXMSW__" /i "$(WXWIN)\lib\vc_lib\msw" /i "$(WXWIN)\include" /i "..\..\..\modules" /d "_WINDOWS" /i "$(WXSTEDIT)\include" /i $(WXWIN)\contrib\include
! # ADD RSC /l 0x409 /d "__WXMSW__" /i "$(WXWIN)\lib\vc_lib\msw" /i "$(WXWIN)\include" /i "..\..\..\modules" /d "_WINDOWS" /i "$(WXSTEDIT)\include" /i $(WXWIN)\contrib\include
  BSC32=bscmake.exe
  # ADD BASE BSC32 /nologo

Index: makefile.bcc
===================================================================
RCS file: /cvsroot/wxlua/wxLua/apps/build/msw/makefile.bcc,v
retrieving revision 1.12
retrieving revision 1.13
diff -C2 -d -r1.12 -r1.13
*** makefile.bcc	29 Nov 2005 23:52:11 -0000	1.12
--- makefile.bcc	30 Nov 2005 23:52:30 -0000	1.13
***************
*** 95,99 ****
  	-I$(WX_DIR)$(__WXLIBPATH_FILENAMES)\msw$(WXLIBPOSTFIX) \
  	-I$(WX_DIR)\include -I..\..\..\modules $(__OPTIMIZEFLAG_1) $(__DEBUGINFO) \
! 	-tWM $(__WX_SHAREDDEFINE_p) -I$(WXSTEDIT)\include $(CPPFLAGS) $(CXXFLAGS)
  APP_WXLUAEDIT_OBJECTS =  \
  	borland$(WXLIBPOSTFIX)\app_wxluaedit_wxledit.obj \
--- 95,100 ----
  	-I$(WX_DIR)$(__WXLIBPATH_FILENAMES)\msw$(WXLIBPOSTFIX) \
  	-I$(WX_DIR)\include -I..\..\..\modules $(__OPTIMIZEFLAG_1) $(__DEBUGINFO) \
! 	-tWM $(__WX_SHAREDDEFINE_p) -I$(WXSTEDIT)\include \
! 	-I$(WX_DIR)\contrib\include $(CPPFLAGS) $(CXXFLAGS)
  APP_WXLUAEDIT_OBJECTS =  \
  	borland$(WXLIBPOSTFIX)\app_wxluaedit_wxledit.obj \

Index: makefile.wat
===================================================================
RCS file: /cvsroot/wxlua/wxLua/apps/build/msw/makefile.wat,v
retrieving revision 1.12
retrieving revision 1.13
diff -C2 -d -r1.12 -r1.13
*** makefile.wat	29 Nov 2005 23:52:11 -0000	1.12
--- makefile.wat	30 Nov 2005 23:52:30 -0000	1.13
***************
*** 163,167 ****
  	-i=$(WX_DIR)\include -i=..\..\..\modules $(__WARNINGS) $(__OPTIMIZEFLAG) &
  	$(__DEBUGINFO) -bm $(__WX_SHAREDDEFINE_p) -i=$(%WXSTEDIT)\include &
! 	$(CPPFLAGS) $(CXXFLAGS)
  APP_WXLUAEDIT_OBJECTS =  &
  	watcom$(WXLIBPOSTFIX)\app_wxluaedit_wxledit.obj &
--- 163,167 ----
  	-i=$(WX_DIR)\include -i=..\..\..\modules $(__WARNINGS) $(__OPTIMIZEFLAG) &
  	$(__DEBUGINFO) -bm $(__WX_SHAREDDEFINE_p) -i=$(%WXSTEDIT)\include &
! 	-i=$(WX_DIR)\contrib\include $(CPPFLAGS) $(CXXFLAGS)
  APP_WXLUAEDIT_OBJECTS =  &
  	watcom$(WXLIBPOSTFIX)\app_wxluaedit_wxledit.obj &

Index: makefile.gcc
===================================================================
RCS file: /cvsroot/wxlua/wxLua/apps/build/msw/makefile.gcc,v
retrieving revision 1.12
retrieving revision 1.13
diff -C2 -d -r1.12 -r1.13
*** makefile.gcc	29 Nov 2005 23:52:11 -0000	1.12
--- makefile.gcc	30 Nov 2005 23:52:30 -0000	1.13
***************
*** 66,70 ****
  	-I$(WX_DIR)$(WXLIBPATH)\msw$(WXLIBPOSTFIX) -I$(WX_DIR)\include \
  	-I..\..\..\modules $(__WARNINGS) $(__OPTIMIZEFLAG) $(__DEBUGINFO) -mthreads \
! 	$(__WX_SHAREDDEFINE_p) -I$(WXSTEDIT)\include $(CPPFLAGS) $(CXXFLAGS)
  APP_WXLUAEDIT_OBJECTS =  \
  	mingw$(WXLIBPOSTFIX)\app_wxluaedit_wxledit.o \
--- 66,71 ----
  	-I$(WX_DIR)$(WXLIBPATH)\msw$(WXLIBPOSTFIX) -I$(WX_DIR)\include \
  	-I..\..\..\modules $(__WARNINGS) $(__OPTIMIZEFLAG) $(__DEBUGINFO) -mthreads \
! 	$(__WX_SHAREDDEFINE_p) -I$(WXSTEDIT)\include -I$(WX_DIR)\contrib\include \
! 	$(CPPFLAGS) $(CXXFLAGS)
  APP_WXLUAEDIT_OBJECTS =  \
  	mingw$(WXLIBPOSTFIX)\app_wxluaedit_wxledit.o \

[Wxlua-commit] wxLua/apps/wxluaedit/src wxledit.cpp,1.2,1.3 wxledit.h,1.1,1.2

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

Update of /cvsroot/wxlua/wxLua/apps/wxluaedit/src
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv7962/wxLua/apps/wxluaedit/src

Modified Files:
	wxledit.cpp wxledit.h 
Log Message:
get wxluaedit apps to work again


Index: wxledit.h
===================================================================
RCS file: /cvsroot/wxlua/wxLua/apps/wxluaedit/src/wxledit.h,v
retrieving revision 1.1
retrieving revision 1.2
diff -C2 -d -r1.1 -r1.2
*** wxledit.h	24 Nov 2005 06:38:17 -0000	1.1
--- wxledit.h	30 Nov 2005 23:52:30 -0000	1.2
***************
*** 26,29 ****
--- 26,30 ----
  #include "wx/stedit/stedit.h"
  #include "wx/stedit/steshell.h"
+ #include "wxlua/include/wxlintrp.h"
  
  enum
***************
*** 108,112 ****
      void Init();
      DECLARE_EVENT_TABLE();
!     DECLARE_CLASS(wxLuaShell);
  };
  
--- 109,113 ----
      void Init();
      DECLARE_EVENT_TABLE();
!     DECLARE_ABSTRACT_CLASS(wxLuaShell);
  };
  
***************
*** 145,149 ****
  private:
      DECLARE_EVENT_TABLE();
!     DECLARE_CLASS(wxLuaEditor);
  };
  
--- 146,150 ----
  private:
      DECLARE_EVENT_TABLE();
!     DECLARE_ABSTRACT_CLASS(wxLuaEditor);
  };
  

Index: wxledit.cpp
===================================================================
RCS file: /cvsroot/wxlua/wxLua/apps/wxluaedit/src/wxledit.cpp,v
retrieving revision 1.2
retrieving revision 1.3
diff -C2 -d -r1.2 -r1.3
*** wxledit.cpp	25 Nov 2005 03:03:10 -0000	1.2
--- wxledit.cpp	30 Nov 2005 23:52:30 -0000	1.3
***************
*** 29,35 ****
  
  #include "wxledit.h"
- #include "wxlua/include/wxlintrp.h"
  #include "wxluadebug/include/staktree.h"
! #include "wxluadebug/include/debug.h"
  
  #include "../../../art/wxlua.xpm"
--- 29,34 ----
  
  #include "wxledit.h"
  #include "wxluadebug/include/staktree.h"
! #include "wxluadebug/include/wxldebug.h"
  
  #include "../../../art/wxlua.xpm"
***************
*** 47,51 ****
  // wxLuaShell
  //-----------------------------------------------------------------------------
! IMPLEMENT_CLASS(wxLuaShell, wxSTEditorShell)
  
  BEGIN_EVENT_TABLE(wxLuaShell, wxSTEditorShell)
--- 46,50 ----
  // wxLuaShell
  //-----------------------------------------------------------------------------
! IMPLEMENT_ABSTRACT_CLASS(wxLuaShell, wxSTEditorShell)
  
  BEGIN_EVENT_TABLE(wxLuaShell, wxSTEditorShell)
***************
*** 188,192 ****
  // wxLuaEditor
  //-----------------------------------------------------------------------------
! IMPLEMENT_CLASS(wxLuaEditor, wxSTEditor)
  
  BEGIN_EVENT_TABLE(wxLuaEditor, wxSTEditor)
--- 187,191 ----
  // wxLuaEditor
  //-----------------------------------------------------------------------------
! IMPLEMENT_ABSTRACT_CLASS(wxLuaEditor, wxSTEditor)
  
  BEGIN_EVENT_TABLE(wxLuaEditor, wxSTEditor)

[Wxlua-commit] wxLua/apps/build/bakefiles apps.bkl,1.11,1.12

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

Update of /cvsroot/wxlua/wxLua/apps/build/bakefiles
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv7962/wxLua/apps/build/bakefiles

Modified Files:
	apps.bkl 
Log Message:
get wxluaedit apps to work again


Index: apps.bkl
===================================================================
RCS file: /cvsroot/wxlua/wxLua/apps/build/bakefiles/apps.bkl,v
retrieving revision 1.11
retrieving revision 1.12
diff -C2 -d -r1.11 -r1.12
*** apps.bkl	29 Nov 2005 23:52:11 -0000	1.11
--- apps.bkl	30 Nov 2005 23:52:30 -0000	1.12
***************
*** 105,108 ****
--- 105,110 ----
          </if>
  
+         <if cond="TARGETING_WIN32=='1'"><include>$(WX_DIR)$(DIRSEP)contrib$(DIRSEP)include</include></if>
+ 
          <!-- Libraries must be put in the reverse order they'll be loaded -->
          <wxlua-lib>wxluasocket</wxlua-lib>