wxlua-commit — CVS commits of wxLua

[Wxlua-commit] wxLua/modules/wxlua/include internal.h,1.12,1.13 wxlbind.h,1.5,1.6 wxlstate.h,1.7,1.8

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

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

Modified Files:
	internal.h wxlbind.h wxlstate.h 
Log Message:
LuaDebugTarget -> wxLuaDebugTarget
wxLuaBind uses wxLuaState
more switching to wxLuaState
wxDEPRECATED for all C functions that require the wxLuaState (Varaibles) use class functions instead


Index: wxlbind.h
===================================================================
RCS file: /cvsroot/wxlua/wxLua/modules/wxlua/include/wxlbind.h,v
retrieving revision 1.5
retrieving revision 1.6
diff -C2 -d -r1.5 -r1.6
*** wxlbind.h	29 Nov 2005 23:52:12 -0000	1.5
--- wxlbind.h	30 Nov 2005 04:46:17 -0000	1.6
***************
*** 123,131 ****
  
      // Binds C Functions/Defines/Object/Events to Lua Table
!     virtual void RegisterBinding(lua_State *L, bool registerTypes);
      // Unbinds C Functions/Defines/Object/Events by clearing Lua Table
!     virtual void UnRegisterBinding(lua_State *L);
  
-     //
      size_t GetLuaClassCount() const { return m_classCount; }
      WXLUACLASS* GetLuaClassList() { return m_classList; }
--- 123,130 ----
  
      // Binds C Functions/Defines/Object/Events to Lua Table
!     virtual void RegisterBinding(const wxLuaState& wxlState, bool registerTypes);
      // Unbinds C Functions/Defines/Object/Events by clearing Lua Table
!     virtual void UnRegisterBinding(const wxLuaState& wxlState);
  
      size_t GetLuaClassCount() const { return m_classCount; }
      WXLUACLASS* GetLuaClassList() { return m_classList; }
***************
*** 153,162 ****
  protected:
      // Registers binding, returns lua table reference to binding
!     virtual int LUACALL RegisterFunctions(lua_State *L, bool registerTypes);
      // Register the classes, definitions, objects and pointers generated by the binding
      // Sort the event list into order for faster event handler processing.
!     virtual void LUACALL RegisterGeneratedClasses(lua_State *L, int tableOffset, bool registerTypes);
  
!     virtual void OnRegister(lua_State * WXUNUSED(L), bool WXUNUSED(registerTypes), int WXUNUSED(luaTable)) {}
  
      // binding objects
--- 152,161 ----
  protected:
      // Registers binding, returns lua table reference to binding
!     virtual int LUACALL RegisterFunctions(const wxLuaState& wxlState, bool registerTypes);
      // Register the classes, definitions, objects and pointers generated by the binding
      // Sort the event list into order for faster event handler processing.
!     virtual void LUACALL RegisterGeneratedClasses(const wxLuaState& wxlState, int tableOffset, bool registerTypes);
  
!     virtual void OnRegister(const wxLuaState& WXUNUSED(wxlState), bool WXUNUSED(registerTypes), int WXUNUSED(luaTable)) {}
  
      // binding objects

Index: wxlstate.h
===================================================================
RCS file: /cvsroot/wxlua/wxLua/modules/wxlua/include/wxlstate.h,v
retrieving revision 1.7
retrieving revision 1.8
diff -C2 -d -r1.7 -r1.8
*** wxlstate.h	29 Nov 2005 23:52:12 -0000	1.7
--- wxlstate.h	30 Nov 2005 04:46:17 -0000	1.8
***************
*** 219,223 ****
  
      void addToTrackedMemoryList(wxObject *pObject);
!     bool removeTrackedMemory(void *pObject, bool fDelete);
  
      void addToTrackedWindowList(wxWindow *win);
--- 219,223 ----
  
      void addToTrackedMemoryList(wxObject *pObject);
!     bool removeTrackedMemory(void *pObject, bool fDelete = true);
  
      void addToTrackedWindowList(wxWindow *win);

Index: internal.h
===================================================================
RCS file: /cvsroot/wxlua/wxLua/modules/wxlua/include/internal.h,v
retrieving revision 1.12
retrieving revision 1.13
diff -C2 -d -r1.12 -r1.13
*** internal.h	29 Nov 2005 23:52:12 -0000	1.12
--- internal.h	30 Nov 2005 04:46:17 -0000	1.13
***************
*** 115,120 ****
  // garbage collection purposes.
  void LUACALL addToTrackedMemoryList(lua_State *L, wxObject *);
! bool LUACALL removeTrackedMemory(lua_State *L, void *pObject, bool fDelete = true);
! void LUACALL addToTrackedWindowList(lua_State *L, wxWindow *);
  
  // ----------------------------------------------------------------------------
--- 115,120 ----
  // garbage collection purposes.
  void LUACALL addToTrackedMemoryList(lua_State *L, wxObject *);
! wxDEPRECATED( bool LUACALL removeTrackedMemory(lua_State *L, void *pObject, bool fDelete = true) );
! wxDEPRECATED( void LUACALL addToTrackedWindowList(lua_State *L, wxWindow *) );
  
  // ----------------------------------------------------------------------------
***************
*** 205,211 ****
  // or if the parameter iParam is nil, NULL is returned.
  // otherwise an error occurs
! void * LUACALL getuserdatatype(lua_State *, int iParam, int iTag);
  // set a user data type
! void LUACALL pushuserdatatype(lua_State *, int iTag, const void *data);
  
  // helper functions to get numbers, booleans and strings safer
--- 205,211 ----
  // or if the parameter iParam is nil, NULL is returned.
  // otherwise an error occurs
! wxDEPRECATED( void * LUACALL getuserdatatype(lua_State *, int iParam, int iTag) );
  // set a user data type
! wxDEPRECATED( void LUACALL pushuserdatatype(lua_State *, int iTag, const void *data) );
  
  // helper functions to get numbers, booleans and strings safer
***************
*** 247,251 ****
  
  // Given a lua tag, return the corresponding tag name
! const char * LUACALL GetLuaTagName(lua_State *L, int nTag);
  
  // global function in Lua for wiring
--- 247,251 ----
  
  // Given a lua tag, return the corresponding tag name
! wxDEPRECATED( const char * LUACALL GetLuaTagName(lua_State *L, int nTag) );
  
  // global function in Lua for wiring
***************
*** 254,263 ****
  
  // get the method or 'get' property for the class at cpIndex
! WXLUAMETHOD * LUACALL getLuaMethod(lua_State *L, const WXLUACLASS *pClass, const char *cpIndex, bool &isProperty);
  // get the property for the class at cpIndex
! WXLUAMETHOD * LUACALL getLuaProperty(lua_State *L, const WXLUACLASS *pClass, const char *cpIndex, bool isSet);
  
  // get the derived method for the class cpIndex
! lua_State * LUACALL getDerivedMethod(void *pObject, const char *method, lua_State *L = NULL);
  
  int LUACALL LuaCall(lua_State *L, int narg, int clear);
--- 254,263 ----
  
  // get the method or 'get' property for the class at cpIndex
! wxDEPRECATED( WXLUAMETHOD * LUACALL getLuaMethod(lua_State *L, const WXLUACLASS *pClass, const char *cpIndex, bool &isProperty) );
  // get the property for the class at cpIndex
! wxDEPRECATED( WXLUAMETHOD * LUACALL getLuaProperty(lua_State *L, const WXLUACLASS *pClass, const char *cpIndex, bool isSet) );
  
  // get the derived method for the class cpIndex
! wxDEPRECATED( lua_State * LUACALL getDerivedMethod(void *pObject, const char *method, lua_State *L = NULL) );
  
  int LUACALL LuaCall(lua_State *L, int narg, int clear);
***************
*** 270,278 ****
  
  // create a reference to the object at index iParam in the Lua index
! int LUACALL tinsert(lua_State *luaState, int iParam);
  // push onto the top of the stack the object referenced by iReference
  bool LUACALL tget(lua_State *luaState, int iReference);
  // remove a Lua reference
! bool LUACALL tremove(lua_State *luaState, int iReference);
  // Get the number of items in the reference table
  int  LUACALL tgetn(lua_State *luaState);
--- 270,278 ----
  
  // create a reference to the object at index iParam in the Lua index
! wxDEPRECATED( int LUACALL tinsert(lua_State *luaState, int iParam) );
  // push onto the top of the stack the object referenced by iReference
  bool LUACALL tget(lua_State *luaState, int iReference);
  // remove a Lua reference
! wxDEPRECATED( bool LUACALL tremove(lua_State *luaState, int iReference) );
  // Get the number of items in the reference table
  int  LUACALL tgetn(lua_State *luaState);
***************
*** 286,290 ****
  void * LUACALL ttouserdata (lua_State *L, int index, bool reset = false);
  // allocate a new metatable return its reference
! int   LUACALL tnewtag(lua_State *L);
  int   LUACALL tnewweaktag(lua_State *L, bool fWeakKey, bool fWeakData);
  // set the metatable of the object at top of stack from the reference tag
--- 286,290 ----
  void * LUACALL ttouserdata (lua_State *L, int index, bool reset = false);
  // allocate a new metatable return its reference
! wxDEPRECATED( int   LUACALL tnewtag(lua_State *L) );
  int   LUACALL tnewweaktag(lua_State *L, bool fWeakKey, bool fWeakData);
  // set the metatable of the object at top of stack from the reference tag
***************
*** 308,326 ****
  {
  public:
!     wxLuaCheckStack(lua_State *lua_state, const wxString &msg);
      ~wxLuaCheckStack();
      void TestStack(const wxString &msg);
  
!     static void DumpGlobals(lua_State *lua_state);
!     static void DumpTable(lua_State *lua_state, const wxString &tableName);
!     static void DumpTable(lua_State *lua_state, int index, const wxString& tablename, wxHashTable& dumpList, int indent);
  
  private:
!     static void     DumpType(lua_State *lua_state, int index, wxString& type, wxString& value, wxString& info);
!     static int      GetTableInfo(lua_State *lua_state, int index, wxString& address, wxString& info);
      static wxString MakeNumber(double dnum);
!     static wxString GetUserDataInfo(lua_State *lua_state, int index);
  
!     lua_State *m_luastate;
      wxString   m_msg;
      int        m_top;
--- 308,326 ----
  {
  public:
!     wxLuaCheckStack(lua_State *L, const wxString &msg);
      ~wxLuaCheckStack();
      void TestStack(const wxString &msg);
  
!     static void DumpGlobals(lua_State *L);
!     static void DumpTable(lua_State *L, const wxString &tableName);
!     static void DumpTable(lua_State *L, int index, const wxString& tablename, wxHashTable& dumpList, int indent);
  
  private:
!     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);
  
!     lua_State *m_luaState;
      wxString   m_msg;
      int        m_top;

[Wxlua-commit] wxLua/modules/wxluasocket/src wxldtarg.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-serv31708/wxLua/modules/wxluasocket/src

Modified Files:
	wxldtarg.cpp 
Log Message:
LuaDebugTarget -> wxLuaDebugTarget
wxLuaBind uses wxLuaState
more switching to wxLuaState
wxDEPRECATED for all C functions that require the wxLuaState (Varaibles) use class functions instead


Index: wxldtarg.cpp
===================================================================
RCS file: /cvsroot/wxlua/wxLua/modules/wxluasocket/src/wxldtarg.cpp,v
retrieving revision 1.2
retrieving revision 1.3
diff -C2 -d -r1.2 -r1.3
*** wxldtarg.cpp	26 Nov 2005 03:15:20 -0000	1.2
--- wxldtarg.cpp	30 Nov 2005 04:46:17 -0000	1.3
***************
*** 33,43 ****
  
  // ----------------------------------------------------------------------------
! // LuaDebugTarget - Handles Debugger/Debuggee IO
  // ----------------------------------------------------------------------------
  
! LuaDebugTarget::LuaDebugTarget(lua_State      *luaState,
!                                const wxString &serverName,
!                                int             portNumber) :
!     m_luaState(luaState),
      m_portNumber(portNumber),
[...1267 lines suppressed...]
      int         idx;
--- 1118,1122 ----
  }
  
! int LUACALL wxLuaDebugTarget::LuaPrint (lua_State *L)
  {
      int         idx;
***************
*** 1130,1134 ****
  
      lua_getglobal(L, debugName);
!     LuaDebugTarget *pTarget = (LuaDebugTarget *) lua_touserdata(L, -1);
      lua_pop(L, 1);
  
--- 1139,1143 ----
  
      lua_getglobal(L, debugName);
!     wxLuaDebugTarget *pTarget = (wxLuaDebugTarget *) lua_touserdata(L, -1);
      lua_pop(L, 1);
  

[Wxlua-commit] wxLua/bindings genwxbind.lua,1.11,1.12

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

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

Modified Files:
	genwxbind.lua 
Log Message:
LuaDebugTarget -> wxLuaDebugTarget
wxLuaBind uses wxLuaState
more switching to wxLuaState
wxDEPRECATED for all C functions that require the wxLuaState (Varaibles) use class functions instead


Index: genwxbind.lua
===================================================================
RCS file: /cvsroot/wxlua/wxLua/bindings/genwxbind.lua,v
retrieving revision 1.11
retrieving revision 1.12
diff -C2 -d -r1.11 -r1.12
*** genwxbind.lua	29 Nov 2005 23:52:11 -0000	1.11
--- genwxbind.lua	30 Nov 2005 04:46:16 -0000	1.12
***************
*** 2511,2520 ****
                          table.insert(codeList, "    // get the data type value\n")
                      end
!                     table.insert(codeList, "    "..memberType.."* val = ("..memberType.."*)wxlState.getuserdatatype(2, s_wxluatag_"..MakeClassVar(memberType).." );\n")
                  elseif not intrinsic then
                      if (comment) then
                          table.insert(codeList, "    // get the data type value\n")
                      end
!                     table.insert(codeList, "    "..memberType.."* val = ("..memberType.."*)wxlState.getuserdatatype(2, s_wxluatag_"..MakeClassVar(memberType).." );\n")
                  elseif memberType == "BOOL" or memberType == "bool" then
                      if (comment) then
--- 2511,2520 ----
                          table.insert(codeList, "    // get the data type value\n")
                      end
!                     table.insert(codeList, "    "..memberType.."* val = ("..memberType.."*)wxlState.getuserdatatype(2, s_wxluatag_"..MakeClassVar(memberType)..");\n")
                  elseif not intrinsic then
                      if (comment) then
                          table.insert(codeList, "    // get the data type value\n")
                      end
!                     table.insert(codeList, "    "..memberType.."* val = ("..memberType.."*)wxlState.getuserdatatype(2, s_wxluatag_"..MakeClassVar(memberType)..");\n")
                  elseif memberType == "BOOL" or memberType == "bool" then
                      if (comment) then
***************
*** 3133,3137 ****
                          table.insert(codeList, "    // push the constructed class pointer\n")
                      end
!                     table.insert(codeList, "    wxlState.pushuserdatatype(s_wxluatag_"..MakeClassVar(parseObject.Name)..", returns );\n")
  
                      table.insert(codeList, "\n    return 1;\n")
--- 3133,3137 ----
                          table.insert(codeList, "    // push the constructed class pointer\n")
                      end
!                     table.insert(codeList, "    wxlState.pushuserdatatype(s_wxluatag_"..MakeClassVar(parseObject.Name)..", returns);\n")
  
                      table.insert(codeList, "\n    return 1;\n")
***************
*** 3148,3152 ****
                          end
  
!                         table.insert(codeList, "    "..parseObject.Name.." * self = ( "..parseObject.Name.." * )wxlState.getuserdatatype(1, s_wxluatag_"..MakeClassVar(parseObject.Name).." );\n")
  
                          -- static member function?
--- 3148,3152 ----
                          end
  
!                         table.insert(codeList, "    "..parseObject.Name.." * self = ("..parseObject.Name.." *)wxlState.getuserdatatype(1, s_wxluatag_"..MakeClassVar(parseObject.Name)..");\n")
  
                          -- static member function?
***************
*** 3211,3215 ****
                                  table.insert(codeList, "    // push the result datatype\n")
                              end
!                             table.insert(codeList, "    wxlState.pushuserdatatype(s_wxluatag_"..MakeClassVar(memberType)..", returns );\n")
                          elseif member.DataType == "BOOL" or member.DataType == "bool" then
                              if (comment) then
--- 3211,3215 ----
                                  table.insert(codeList, "    // push the result datatype\n")
                              end
!                             table.insert(codeList, "    wxlState.pushuserdatatype(s_wxluatag_"..MakeClassVar(memberType)..", returns);\n")
                          elseif member.DataType == "BOOL" or member.DataType == "bool" then
                              if (comment) then
***************
*** 3344,3348 ****
  
                  table.insert(codeList, "    if (self != 0)\n")
!                 table.insert(codeList, "        removeTrackedMemory(L, self);\n")
                  table.insert(codeList, "    return 0;\n")
                  table.insert(codeList, "}\n\n")
--- 3344,3348 ----
  
                  table.insert(codeList, "    if (self != 0)\n")
!                 table.insert(codeList, "        wxlState.removeTrackedMemory(self);\n")
                  table.insert(codeList, "    return 0;\n")
                  table.insert(codeList, "}\n\n")
***************
*** 3372,3376 ****
  
                  table.insert(codeList, "    if (self != 0)\n")
!                 table.insert(codeList, "        if (removeTrackedMemory(L, self))\n")
                  table.insert(codeList, "        {   // if removed, reset the tag so that gc() is not called on this object.\n")
                  table.insert(codeList, "            lua_pushnil(L);\n")
--- 3372,3376 ----
  
                  table.insert(codeList, "    if (self != 0)\n")
!                 table.insert(codeList, "        if (wxlState.removeTrackedMemory(self))\n")
                  table.insert(codeList, "        {   // if removed, reset the tag so that gc() is not called on this object.\n")
                  table.insert(codeList, "            lua_pushnil(L);\n")
***************
*** 3447,3451 ****
      table.insert(fileData, "\n")
      table.insert(fileData, "protected:\n")
!     table.insert(fileData, "    virtual void OnRegister(lua_State *L, bool registerTypes, int luaTable);\n")
      table.insert(fileData, "\n")
      table.insert(fileData, "    DECLARE_CLASS("..hook_binding_class..")\n")
--- 3447,3451 ----
      table.insert(fileData, "\n")
      table.insert(fileData, "protected:\n")
!     table.insert(fileData, "    virtual void OnRegister(const wxLuaState& wxlState, bool registerTypes, int luaTable);\n")
      table.insert(fileData, "\n")
      table.insert(fileData, "    DECLARE_CLASS("..hook_binding_class..")\n")
***************
*** 3625,3629 ****
      table.insert(fileData, "}\n")
      table.insert(fileData, "\n")
!     table.insert(fileData, "void "..hook_binding_class.."::OnRegister(lua_State *L, bool registerTypes, int luaTable)\n")
      table.insert(fileData, "{\n")
  
--- 3625,3629 ----
      table.insert(fileData, "}\n")
      table.insert(fileData, "\n")
!     table.insert(fileData, "void "..hook_binding_class.."::OnRegister(const wxLuaState& wxlState, bool registerTypes, int luaTable)\n")
      table.insert(fileData, "{\n")
  

[Wxlua-commit] wxLua/modules/wxbind/src wxlhtmlwin.cpp,1.4,1.5 wxlprint.cpp,1.4,1.5

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

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

Modified Files:
	wxlhtmlwin.cpp wxlprint.cpp 
Log Message:
LuaDebugTarget -> wxLuaDebugTarget
wxLuaBind uses wxLuaState
more switching to wxLuaState
wxDEPRECATED for all C functions that require the wxLuaState (Varaibles) use class functions instead


Index: wxlprint.cpp
===================================================================
RCS file: /cvsroot/wxlua/wxLua/modules/wxbind/src/wxlprint.cpp,v
retrieving revision 1.4
retrieving revision 1.5
diff -C2 -d -r1.4 -r1.5
*** wxlprint.cpp	29 Nov 2005 05:45:09 -0000	1.4
--- wxlprint.cpp	30 Nov 2005 04:46:17 -0000	1.5
***************
*** 61,77 ****
  {
      wxLuaState wxlState(wxLuaState::getDerivedMethod(this, "GetPageInfo"));
!     if (!wxlState.Ok())
      {
!         int nOldTop = lua_gettop(wxlState.GetLuaState());
          wxlState.tpushusertag(this, s_wxluatag_wxLuaPrintout);
  
          wxlState.LuaCall(1, false);
  
!         *minPage  = (int) lua_tonumber(wxlState.GetLuaState(), -4);
!         *maxPage  = (int) lua_tonumber(wxlState.GetLuaState(), -3);
!         *pageFrom = (int) lua_tonumber(wxlState.GetLuaState(), -2);
!         *pageTo   = (int) lua_tonumber(wxlState.GetLuaState(), -1);
  
!         lua_settop(wxlState.GetLuaState(), nOldTop);
      }
      else
--- 61,78 ----
  {
      wxLuaState wxlState(wxLuaState::getDerivedMethod(this, "GetPageInfo"));
!     if (wxlState.Ok())
      {
!         lua_State *L = wxlState.GetLuaState();
!         int nOldTop = lua_gettop(L);
          wxlState.tpushusertag(this, s_wxluatag_wxLuaPrintout);
  
          wxlState.LuaCall(1, false);
  
!         *minPage  = (int) lua_tonumber(L, -4);
!         *maxPage  = (int) lua_tonumber(L, -3);
!         *pageFrom = (int) lua_tonumber(L, -2);
!         *pageTo   = (int) lua_tonumber(L, -1);
  
!         lua_settop(L, nOldTop);
      }
      else
***************
*** 86,101 ****
  bool wxLuaPrintout::HasPage(int pageNum)
  {
      bool fResult = false;
!     lua_State *luaState = getDerivedMethod(this, "HasPage");
!     if (luaState != NULL)
      {
!         int nOldTop = lua_gettop(luaState);
!         tpushusertag(luaState, this, s_wxluatag_wxLuaPrintout);
!         lua_pushnumber(luaState, pageNum);
  
!         LuaCall(luaState, 2, false);
  
!         fResult = (lua_toboolean(luaState, -1) != false);
!         lua_settop(luaState, nOldTop);
      }
      else
--- 87,103 ----
  bool wxLuaPrintout::HasPage(int pageNum)
  {
+     wxLuaState wxlState(wxLuaState::getDerivedMethod(this, "HasPage"));
      bool fResult = false;
!     if (wxlState.Ok())
      {
!         lua_State *L = wxlState.GetLuaState();
!         int nOldTop = lua_gettop(L);
!         wxlState.tpushusertag(this, s_wxluatag_wxLuaPrintout);
!         lua_pushnumber(L, pageNum);
  
!         wxlState.LuaCall(2, false);
  
!         fResult = (lua_toboolean(L, -1) != false);
!         lua_settop(L, nOldTop);
      }
      else
***************
*** 106,124 ****
  bool wxLuaPrintout::OnBeginDocument(int startPage, int endPage)
  {
      bool fResult = true;
! 
!     lua_State *luaState = getDerivedMethod(this, "OnBeginDocument");
!     if (luaState != NULL)
      {
!         int nOldTop = lua_gettop(luaState);
!         tpushusertag(luaState, this, s_wxluatag_wxLuaPrintout);
!         lua_pushnumber(luaState, startPage);
!         lua_pushnumber(luaState, endPage);
  
!         LuaCall(luaState, 3, false);
  
!         fResult = (lua_toboolean(luaState, -1) != false);
!         lua_pop(luaState, 1);
!         lua_settop(luaState, nOldTop);
      }
      else
--- 108,126 ----
  bool wxLuaPrintout::OnBeginDocument(int startPage, int endPage)
  {
+     wxLuaState wxlState(wxLuaState::getDerivedMethod(this, "OnBeginDocument"));
      bool fResult = true;
!     if (wxlState.Ok())
      {
!         lua_State *L = wxlState.GetLuaState();
!         int nOldTop = lua_gettop(L);
!         wxlState.tpushusertag(this, s_wxluatag_wxLuaPrintout);
!         lua_pushnumber(L, startPage);
!         lua_pushnumber(L, endPage);
  
!         wxlState.LuaCall(3, false);
  
!         fResult = (lua_toboolean(L, -1) != false);
!         lua_pop(L, 1);
!         lua_settop(L, nOldTop);
      }
      else
***************
*** 130,140 ****
  void wxLuaPrintout::OnEndDocument()
  {
!     lua_State *luaState = getDerivedMethod(this, "OnEndDocument");
!     if (luaState != NULL)
      {
!         int nOldTop = lua_gettop(luaState);
!         tpushusertag(luaState, this, s_wxluatag_wxLuaPrintout);
!         LuaCall(luaState, 1, true);
!         lua_settop(luaState, nOldTop);
      }
      else
--- 132,143 ----
  void wxLuaPrintout::OnEndDocument()
  {
!     wxLuaState wxlState(wxLuaState::getDerivedMethod(this, "OnEndDocument"));
!     if (wxlState.Ok())
      {
!         lua_State *L = wxlState.GetLuaState();
!         int nOldTop = lua_gettop(L);
!         wxlState.tpushusertag(this, s_wxluatag_wxLuaPrintout);
!         wxlState.LuaCall(1, true);
!         lua_settop(L, nOldTop);
      }
      else
***************
*** 144,154 ****
  void wxLuaPrintout::OnBeginPrinting()
  {
!     lua_State *luaState = getDerivedMethod(this, "OnBeginPrinting");
!     if (luaState != NULL)
      {
!         int nOldTop = lua_gettop(luaState);
!         tpushusertag(luaState, this, s_wxluatag_wxLuaPrintout);
!         LuaCall(luaState, 1, true);
!         lua_settop(luaState, nOldTop);
      }
      else
--- 147,158 ----
  void wxLuaPrintout::OnBeginPrinting()
  {
!     wxLuaState wxlState(wxLuaState::getDerivedMethod(this, "OnBeginPrinting"));
!     if (wxlState.Ok())
      {
!         lua_State *L = wxlState.GetLuaState();
!         int nOldTop = lua_gettop(L);
!         wxlState.tpushusertag(this, s_wxluatag_wxLuaPrintout);
!         wxlState.LuaCall(1, true);
!         lua_settop(L, nOldTop);
      }
      else
***************
*** 158,168 ****
  void wxLuaPrintout::OnEndPrinting()
  {
!     lua_State *luaState = getDerivedMethod(this, "OnEndPrinting");
!     if (luaState != NULL)
      {
!         int nOldTop = lua_gettop(luaState);
!         tpushusertag(luaState, this, s_wxluatag_wxLuaPrintout);
!         LuaCall(luaState, 1, true);
!         lua_settop(luaState, nOldTop);
      }
      else
--- 162,173 ----
  void wxLuaPrintout::OnEndPrinting()
  {
!     wxLuaState wxlState(wxLuaState::getDerivedMethod(this, "OnEndPrinting"));
!     if (wxlState.Ok())
      {
!         lua_State *L = wxlState.GetLuaState();
!         int nOldTop = lua_gettop(L);
!         wxlState.tpushusertag(this, s_wxluatag_wxLuaPrintout);
!         wxlState.LuaCall(1, true);
!         lua_settop(L, nOldTop);
      }
      else
***************
*** 172,182 ****
  void wxLuaPrintout::OnPreparePrinting()
  {
!     lua_State *luaState = getDerivedMethod(this, "OnPreparePrinting");
!     if (luaState != NULL)
      {
!         int nOldTop = lua_gettop(luaState);
!         tpushusertag(luaState, this, s_wxluatag_wxLuaPrintout);
!         LuaCall(luaState, 1, true);
!         lua_settop(luaState, nOldTop);
      }
      else
--- 177,188 ----
  void wxLuaPrintout::OnPreparePrinting()
  {
!     wxLuaState wxlState(wxLuaState::getDerivedMethod(this, "OnPreparePrinting"));
!     if (wxlState.Ok())
      {
!         lua_State *L = wxlState.GetLuaState();
!         int nOldTop = lua_gettop(L);
!         wxlState.tpushusertag(this, s_wxluatag_wxLuaPrintout);
!         wxlState.LuaCall(1, true);
!         lua_settop(L, nOldTop);
      }
      else
***************
*** 186,201 ****
  bool wxLuaPrintout::OnPrintPage(int pageNum)
  {
      bool fResult = false;
!     lua_State *luaState = getDerivedMethod(this, "OnPrintPage");
!     if (luaState != NULL)
      {
!         int nOldTop = lua_gettop(luaState);
!         tpushusertag(luaState, this, s_wxluatag_wxLuaPrintout);
!         lua_pushnumber(luaState, pageNum);
  
!         LuaCall(luaState, 2, false);
  
!         fResult = (lua_toboolean(luaState, -1) != false);
!         lua_settop(luaState, nOldTop);
      }
      return fResult;
--- 192,208 ----
  bool wxLuaPrintout::OnPrintPage(int pageNum)
  {
+     wxLuaState wxlState(wxLuaState::getDerivedMethod(this, "OnPrintPage"));
      bool fResult = false;
!     if (wxlState.Ok())
      {
!         lua_State *L = wxlState.GetLuaState();
!         int nOldTop = lua_gettop(L);
!         wxlState.tpushusertag(this, s_wxluatag_wxLuaPrintout);
!         lua_pushnumber(L, pageNum);
  
!         wxlState.LuaCall(2, false);
  
!         fResult = (lua_toboolean(L, -1) != false);
!         lua_settop(L, nOldTop);
      }
      return fResult;

Index: wxlhtmlwin.cpp
===================================================================
RCS file: /cvsroot/wxlua/wxLua/modules/wxbind/src/wxlhtmlwin.cpp,v
retrieving revision 1.4
retrieving revision 1.5
diff -C2 -d -r1.4 -r1.5
*** wxlhtmlwin.cpp	29 Nov 2005 05:45:09 -0000	1.4
--- wxlhtmlwin.cpp	30 Nov 2005 04:46:17 -0000	1.5
***************
*** 57,67 ****
  }
  
! wxLuaHtmlWindow::wxLuaHtmlWindow(wxWindow *parent,
!                                  wxWindowID id,
!                                  const wxPoint& pos,
!                                  const wxSize& size,
!                                  long  style,
!                                  const wxString& name) :
!                  wxHtmlWindow(parent, id, pos, size, style, name)
  {
  }
--- 57,64 ----
  }
  
! wxLuaHtmlWindow::wxLuaHtmlWindow(wxWindow *parent, wxWindowID id,
!                                  const wxPoint& pos, const wxSize& size,
!                                  long  style, const wxString& name)
!                 :wxHtmlWindow(parent, id, pos, size, style, name)
  {
  }
***************
*** 69,87 ****
  void wxLuaHtmlWindow::OnCellClicked(wxHtmlCell *cell, wxCoord x, wxCoord y, const wxMouseEvent& event)
  {
      bool fResult = false;
!     lua_State *luaState = getDerivedMethod(this, "OnCellClicked");
!     if (luaState != NULL)
      {
!         int nOldTop = lua_gettop(luaState);
!         tpushusertag(luaState, this, s_wxluatag_wxLuaHtmlWindow);
!         tpushusertag(luaState, cell, s_wxluatag_wxHtmlCell);
!         lua_pushnumber(luaState, x);
!         lua_pushnumber(luaState, y);
!         tpushusertag(luaState, (void *) &event, s_wxluatag_wxMouseEvent);
  
!         LuaCall(luaState, 5, false);
  
!         fResult = (lua_tonumber(luaState, -1) != 0);
!         lua_settop(luaState, nOldTop);
  
          if (fResult)
--- 66,85 ----
  void wxLuaHtmlWindow::OnCellClicked(wxHtmlCell *cell, wxCoord x, wxCoord y, const wxMouseEvent& event)
  {
+     wxLuaState wxlState(wxLuaState::getDerivedMethod(this, "OnCellClicked"));
      bool fResult = false;
!     if (wxlState.Ok())
      {
!         lua_State *L = wxlState.GetLuaState();
!         int nOldTop = lua_gettop(L);
!         wxlState.tpushusertag(this, s_wxluatag_wxLuaHtmlWindow);
!         wxlState.tpushusertag(cell, s_wxluatag_wxHtmlCell);
!         lua_pushnumber(L, x);
!         lua_pushnumber(L, y);
!         wxlState.tpushusertag((void *) &event, s_wxluatag_wxMouseEvent);
  
!         wxlState.LuaCall(5, false);
  
!         fResult = (lua_tonumber(L, -1) != 0);
!         lua_settop(L, nOldTop);
  
          if (fResult)
***************
*** 94,108 ****
  void wxLuaHtmlWindow::OnCellMouseHover(wxHtmlCell *cell, wxCoord x, wxCoord y)
  {
!     lua_State *luaState = getDerivedMethod(this, "OnCellMouseHover");
!     if (luaState != NULL)
      {
!         int nOldTop = lua_gettop(luaState);
!         tpushusertag(luaState, this, s_wxluatag_wxLuaHtmlWindow);
!         tpushusertag(luaState, cell, s_wxluatag_wxHtmlCell);
!         lua_pushnumber(luaState, x);
!         lua_pushnumber(luaState, y);
  
!         LuaCall(luaState, 4, true);
!         lua_settop(luaState, nOldTop);
      }
      else
--- 92,107 ----
  void wxLuaHtmlWindow::OnCellMouseHover(wxHtmlCell *cell, wxCoord x, wxCoord y)
  {
!     wxLuaState wxlState(wxLuaState::getDerivedMethod(this, "OnCellMouseHover"));
!     if (wxlState.Ok())
      {
!         lua_State *L = wxlState.GetLuaState();
!         int nOldTop = lua_gettop(L);
!         wxlState.tpushusertag(this, s_wxluatag_wxLuaHtmlWindow);
!         wxlState.tpushusertag(cell, s_wxluatag_wxHtmlCell);
!         lua_pushnumber(L, x);
!         lua_pushnumber(L, y);
  
!         wxlState.LuaCall(4, true);
!         lua_settop(L, nOldTop);
      }
      else
***************
*** 112,124 ****
  void wxLuaHtmlWindow::OnLinkClicked(const wxHtmlLinkInfo& link)
  {
!     lua_State *luaState = getDerivedMethod(this, "OnLinkClicked");
!     if (luaState != NULL)
      {
!         int nOldTop = lua_gettop(luaState);
!         tpushusertag(luaState, this, s_wxluatag_wxLuaHtmlWindow);
!         tpushusertag(luaState, (void *) &link, s_wxluatag_wxHtmlLinkInfo);
  
!         LuaCall(luaState, 2, true);
!         lua_settop(luaState, nOldTop);
      }
      else
--- 111,124 ----
  void wxLuaHtmlWindow::OnLinkClicked(const wxHtmlLinkInfo& link)
  {
!     wxLuaState wxlState(wxLuaState::getDerivedMethod(this, "OnLinkClicked"));
!     if (wxlState.Ok())
      {
!         lua_State *L = wxlState.GetLuaState();
!         int nOldTop = lua_gettop(L);
!         wxlState.tpushusertag(this, s_wxluatag_wxLuaHtmlWindow);
!         wxlState.tpushusertag((void *) &link, s_wxluatag_wxHtmlLinkInfo);
  
!         wxlState.LuaCall(2, true);
!         lua_settop(L, nOldTop);
      }
      else
***************
*** 128,140 ****
  void wxLuaHtmlWindow::OnSetTitle(const wxString& title)
  {
!     lua_State *luaState = getDerivedMethod(this, "OnSetTitle");
!     if (luaState != NULL)
      {
!         int nOldTop = lua_gettop(luaState);
!         tpushusertag(luaState, this, s_wxluatag_wxLuaHtmlWindow);
!         lua_pushstring(luaState, wx2lua(title));
  
!         LuaCall(luaState, 2, true);
!         lua_settop(luaState, nOldTop);
      }
      else
--- 128,141 ----
  void wxLuaHtmlWindow::OnSetTitle(const wxString& title)
  {
!     wxLuaState wxlState(wxLuaState::getDerivedMethod(this, "OnSetTitle"));
!     if (wxlState.Ok())
      {
!         lua_State *L = wxlState.GetLuaState();
!         int nOldTop = lua_gettop(L);
!         wxlState.tpushusertag(this, s_wxluatag_wxLuaHtmlWindow);
!         lua_pushstring(L, wx2lua(title));
  
!         wxlState.LuaCall(2, true);
!         lua_settop(L, nOldTop);
      }
      else

[Wxlua-commit] wxLua/modules/wxlua/src internal.cpp,1.18,1.19 wxlbind.cpp,1.6,1.7

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

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

Modified Files:
	internal.cpp wxlbind.cpp 
Log Message:
LuaDebugTarget -> wxLuaDebugTarget
wxLuaBind uses wxLuaState
more switching to wxLuaState
wxDEPRECATED for all C functions that require the wxLuaState (Varaibles) use class functions instead


Index: internal.cpp
===================================================================
RCS file: /cvsroot/wxlua/wxLua/modules/wxlua/src/internal.cpp,v
retrieving revision 1.18
retrieving revision 1.19
diff -C2 -d -r1.18 -r1.19
*** internal.cpp	29 Nov 2005 23:52:12 -0000	1.18
--- internal.cpp	30 Nov 2005 04:46:17 -0000	1.19
***************
*** 162,166 ****
      {
          *ptr = u;
!         if (tag != TLUA_NOTAG && tget(L, tag))
          {
              if (lua_setmetatable(L, -2) == 0)
--- 162,166 ----
      {
          *ptr = u;
!         if ((tag != TLUA_NOTAG) && tget(L, tag))
          {
              if (lua_setmetatable(L, -2) == 0)
***************
*** 174,178 ****
  void LUACALL tsettag(lua_State *L, int tag)
  {
!     if (tag != TLUA_NOTAG && tget(L, tag))
      {
          if (!lua_setmetatable(L, -2))
--- 174,178 ----
  void LUACALL tsettag(lua_State *L, int tag)
  {
!     if ((tag != TLUA_NOTAG) && tget(L, tag))
      {
          if (!lua_setmetatable(L, -2))
***************
*** 242,246 ****
  {
      lua_pushstring(L, wxLuaReferences); //, strlen(wxLuaReferences)-1); // FIXME this used to be #define tpushliteralstring(str, sizeof(str)-1)
- 
  }
  
--- 242,245 ----
***************
*** 411,419 ****
  // ----------------------------------------------------------------------------
  
! wxLuaCheckStack::wxLuaCheckStack(lua_State *lua_state, const wxString &msg)
  {
!     m_luastate = lua_state;
      m_msg      = msg;
!     m_top      = lua_gettop(m_luastate);
  }
  
--- 410,418 ----
  // ----------------------------------------------------------------------------
  
! wxLuaCheckStack::wxLuaCheckStack(lua_State *L, const wxString &msg)
  {
!     m_luaState = L;
      m_msg      = msg;
!     m_top      = lua_gettop(m_luaState);
  }
  
***************
*** 431,467 ****
  
  #if  defined(__WXMSW__)
!     wxString buf = wxString::Format(_("Stack state in %s: in %u out %u\r\n"), message.c_str(), m_top, lua_gettop(m_luastate));
      OutputDebugString(buf);
  #elif defined(__WXGTK__) || defined(__WXMAC__)
!     fprintf(stderr, "Stack state in %s: in %u out %u\r\n", (const char *)wx2lua(msg), m_top, lua_gettop(m_luastate));
  #endif
  }
  
! void wxLuaCheckStack::DumpGlobals(lua_State *lua_state)
  {
      wxHashTable* dumpList = new wxHashTable(wxKEY_INTEGER);
  
!     lua_pushvalue(lua_state, LUA_GLOBALSINDEX);
!     DumpTable(lua_state, lua_gettop(lua_state), wxT("Globals"), *dumpList, 0);
!     lua_pop(lua_state, 1);
  
      delete dumpList;
  }
  
! void wxLuaCheckStack::DumpTable(lua_State *lua_state, const wxString &name)
  {
      wxHashTable dumpList(wxKEY_INTEGER);
  
!     lua_pushstring(lua_state, wx2lua(name));
!     lua_gettable(lua_state, LUA_GLOBALSINDEX);
!     DumpTable(lua_state, lua_gettop(lua_state), name, dumpList, 0);
!     lua_pop(lua_state, 1);
  }
  
! int wxLuaCheckStack::GetTableInfo(lua_State *lua_state, int index, wxString& address, wxString& info)
  {
!     int         nTag   = ttag(lua_state, index);
!     int         nItems = luaL_getn(lua_state, index);
!     const void *pItem  = lua_topointer(lua_state, index);
  
      address = wxString::Format(wxT("%p"), pItem);
--- 430,466 ----
  
  #if  defined(__WXMSW__)
!     wxString buf = wxString::Format(_("Stack state in %s: in %u out %u\r\n"), message.c_str(), m_top, lua_gettop(m_luaState));
      OutputDebugString(buf);
  #elif defined(__WXGTK__) || defined(__WXMAC__)
!     fprintf(stderr, "Stack state in %s: in %u out %u\r\n", (const char *)wx2lua(msg), m_top, lua_gettop(m_luaState));
  #endif
  }
  
! void wxLuaCheckStack::DumpGlobals(lua_State *L)
  {
      wxHashTable* dumpList = new wxHashTable(wxKEY_INTEGER);
  
!     lua_pushvalue(L, LUA_GLOBALSINDEX);
!     DumpTable(L, lua_gettop(L), wxT("Globals"), *dumpList, 0);
!     lua_pop(L, 1);
  
      delete dumpList;
  }
  
! void wxLuaCheckStack::DumpTable(lua_State *L, const wxString &name)
  {
      wxHashTable dumpList(wxKEY_INTEGER);
  
!     lua_pushstring(L, wx2lua(name));
!     lua_gettable(L, LUA_GLOBALSINDEX);
!     DumpTable(L, lua_gettop(L), name, dumpList, 0);
!     lua_pop(L, 1);
  }
  
! int wxLuaCheckStack::GetTableInfo(lua_State *L, int index, wxString& address, wxString& info)
  {
!     int         nTag   = ttag(L, index);
!     int         nItems = luaL_getn(L, index);
!     const void *pItem  = lua_topointer(L, index);
  
      address = wxString::Format(wxT("%p"), pItem);
***************
*** 485,489 ****
  }
  
! void wxLuaCheckStack::DumpType(lua_State *lua_state, int index, wxString& type, wxString& value, wxString& info)
  {
      type = wxEmptyString;
--- 484,488 ----
  }
  
! void wxLuaCheckStack::DumpType(lua_State *L, int index, wxString& type, wxString& value, wxString& info)
  {
      type = wxEmptyString;
***************
*** 491,498 ****
      info = wxEmptyString;
  
!     switch (lua_type(lua_state, index))
      {
          default:
!             type = wxString::Format(wxT("%u"), lua_type(lua_state, index));
              value = wxT("?");
              break;
--- 490,497 ----
      info = wxEmptyString;
  
!     switch (lua_type(L, index))
      {
          default:
!             type = wxString::Format(wxT("%u"), lua_type(L, index));
              value = wxT("?");
              break;
***************
*** 505,531 ****
          case LUA_TNUMBER:
              type = wxT("Number");
!             value = MakeNumber(lua_tonumber(lua_state, index));
              break;
  
          case LUA_TSTRING:
              type  = wxT("String");
!             value = lua2wx(lua_tostring(lua_state, index));
              break;
  
          case LUA_TTABLE:
              type  = wxT("Table");
!             GetTableInfo(lua_state, index, value, info);
              break;
  
          case LUA_TFUNCTION:
!             if (lua_iscfunction(lua_state, index))
              {
                  type  = wxT("C Function");
!                 value = wxString::Format(wxT("%p"), lua_tocfunction(lua_state, index));
              }
              else
              {
                  type = wxT("Lua Function");
!                 value = wxString::Format(wxT("%p"), lua_topointer(lua_state, index));
              }
  
--- 504,530 ----
          case LUA_TNUMBER:
              type = wxT("Number");
!             value = MakeNumber(lua_tonumber(L, index));
              break;
  
          case LUA_TSTRING:
              type  = wxT("String");
!             value = lua2wx(lua_tostring(L, index));
              break;
  
          case LUA_TTABLE:
              type  = wxT("Table");
!             GetTableInfo(L, index, value, info);
              break;
  
          case LUA_TFUNCTION:
!             if (lua_iscfunction(L, index))
              {
                  type  = wxT("C Function");
!                 value = wxString::Format(wxT("%p"), lua_tocfunction(L, index));
              }
              else
              {
                  type = wxT("Lua Function");
!                 value = wxString::Format(wxT("%p"), lua_topointer(L, index));
              }
  
***************
*** 534,538 ****
          case LUA_TUSERDATA:
              type  = wxT("User Data");
!             value = GetUserDataInfo(lua_state, index);
              break;
      }
--- 533,537 ----
          case LUA_TUSERDATA:
              type  = wxT("User Data");
!             value = GetUserDataInfo(L, index);
              break;
      }
***************
*** 541,558 ****
  }
  
! wxString wxLuaCheckStack::GetUserDataInfo(lua_State *lua_state, int index)
  {
      wxString userdataInfo;
      wxString tagName;
  
!     int nTag = ttag(lua_state, index);
  
      if (nTag != TLUA_NOTAG)
!         tagName = lua2wx(GetLuaTagName(lua_state, nTag));
  
      if (!tagName.IsEmpty())
!         userdataInfo = wxString::Format(wxT("%p (%s)"), lua_touserdata(lua_state, index), tagName.c_str());
      else
!         userdataInfo = wxString::Format(wxT("%p (%u)"), lua_touserdata(lua_state, index), nTag);
  
      return userdataInfo;
--- 540,558 ----
  }
  
! wxString wxLuaCheckStack::GetUserDataInfo(lua_State *L, int index)
  {
      wxString userdataInfo;
      wxString tagName;
+     wxLuaState wxlState(L);
  
!     int nTag = ttag(L, index);
  
      if (nTag != TLUA_NOTAG)
!         tagName = lua2wx(wxlState.GetLuaTagName(nTag));
  
      if (!tagName.IsEmpty())
!         userdataInfo = wxString::Format(wxT("%p (%s)"), lua_touserdata(L, index), tagName.c_str());
      else
!         userdataInfo = wxString::Format(wxT("%p (%u)"), lua_touserdata(L, index), nTag);
  
      return userdataInfo;
***************
*** 577,581 ****
  }
  
! void wxLuaCheckStack::DumpTable(lua_State *lua_state, int index, const wxString& tablename, wxHashTable& dumpList, int indent)
  {
      wxString indentStr;
--- 577,581 ----
  }
  
! void wxLuaCheckStack::DumpTable(lua_State *L, int index, const wxString& tablename, wxHashTable& dumpList, int indent)
  {
      wxString indentStr;
***************
*** 595,606 ****
          indentStr += wxT(">");
  
!     lua_pushnil(lua_state);
!     while(lua_next(lua_state, index) != 0)
      {
          wxString indexType, indexValue, indexInfo;
          wxString valueType, value, valueInfo;
  
!         DumpType(lua_state, -2, indexType, indexValue, indexInfo);
!         DumpType(lua_state, -1, valueType, value, valueInfo);
  
          wxString info = wxString::Format(wxT("%s%-32s\t%-15s\t%-20s\t%-10s\t%s"),
--- 595,606 ----
          indentStr += wxT(">");
  
!     lua_pushnil(L);
!     while(lua_next(L, index) != 0)
      {
          wxString indexType, indexValue, indexInfo;
          wxString valueType, value, valueInfo;
  
!         DumpType(L, -2, indexType, indexValue, indexInfo);
!         DumpType(L, -1, valueType, value, valueInfo);
  
          wxString info = wxString::Format(wxT("%s%-32s\t%-15s\t%-20s\t%-10s\t%s"),
***************
*** 622,629 ****
                  dumpList.Put(key, (wxObject*)true);
  
!                 int tableIndex = lua_gettop(lua_state);
  
! //                lua_pushvalue(lua_state, lua_gettop(lua_state));
!                 DumpTable(lua_state, tableIndex, tname, dumpList, indent+1);
              }
              else
--- 622,629 ----
                  dumpList.Put(key, (wxObject*)true);
  
!                 int tableIndex = lua_gettop(L);
  
! //                lua_pushvalue(L, lua_gettop(L));
!                 DumpTable(L, tableIndex, tname, dumpList, indent+1);
              }
              else
***************
*** 638,644 ****
  //        fprintf(stderr, wx2lua(outputIndex + outputValue));
  //#endif
!         lua_pop(lua_state, 1);
      }
!     lua_pop(lua_state, 1);
  
      wxLog::FlushActive();
--- 638,644 ----
  //        fprintf(stderr, wx2lua(outputIndex + outputValue));
  //#endif
!         lua_pop(L, 1);
      }
!     lua_pop(L, 1);
  
      wxLog::FlushActive();
***************
*** 662,681 ****
  }
  
- bool IsParentWindowTracked(wxList *list, wxWindow* win)
- {
-     wxCHECK_MSG(list && win, false, wxT("Invalid list or parent"));
-     wxWindow *parent = win;
- 
-     while (parent)
-     {
-         if (list->Find(parent))
-             return true;
- 
-         parent = parent->GetParent();
-     }
- 
-     return false;
- }
- 
  void LUACALL addToTrackedWindowList(lua_State *L, wxWindow *pWindow)
  {
--- 662,665 ----
***************
*** 1239,1243 ****
      wxCHECK_MSG(wxlState.Ok(), 0, wxT("Invalid wxLuaState"));
  
!     if (lua_isuserdata(L, 1) && (lua_islightuserdata(L, 1) == 0) && (ttag(L, 1) == wxlState.GetLuaFunctionTag()))
      {
          wxLuaFunction *pFunction = (wxLuaFunction *)wxlState.ttouserdata(1);
--- 1223,1227 ----
      wxCHECK_MSG(wxlState.Ok(), 0, wxT("Invalid wxLuaState"));
  
!     if (lua_isuserdata(L, 1) && (lua_islightuserdata(L, 1) == 0) && (wxlState.ttag(1) == wxlState.GetLuaFunctionTag()))
      {
          wxLuaFunction *pFunction = (wxLuaFunction *)wxlState.ttouserdata(1);

Index: wxlbind.cpp
===================================================================
RCS file: /cvsroot/wxlua/wxLua/modules/wxlua/src/wxlbind.cpp,v
retrieving revision 1.6
retrieving revision 1.7
diff -C2 -d -r1.6 -r1.7
*** wxlbind.cpp	29 Nov 2005 23:52:12 -0000	1.6
--- wxlbind.cpp	30 Nov 2005 04:46:17 -0000	1.7
***************
*** 71,78 ****
  }
  
! void wxLuaBinding::RegisterBinding(lua_State *L, bool registerTypes)
  {
!     int luaTable = RegisterFunctions(L, registerTypes);
  
      // create a global
      lua_pushstring(L, wx2lua(nameSpace));
--- 71,79 ----
  }
  
! void wxLuaBinding::RegisterBinding(const wxLuaState& wxlState, bool registerTypes)
  {
!     int luaTable = RegisterFunctions(wxlState, registerTypes);
  
+     lua_State *L = wxlState.GetLuaState();
      // create a global
      lua_pushstring(L, wx2lua(nameSpace));
***************
*** 82,87 ****
  }
  
! void wxLuaBinding::UnRegisterBinding(lua_State *L)
  {
      lua_pushstring(L, wx2lua(nameSpace));
      lua_pushnil(L);
--- 83,89 ----
  }
  
! void wxLuaBinding::UnRegisterBinding(const wxLuaState& wxlState)
  {
+     lua_State *L = wxlState.GetLuaState();
      lua_pushstring(L, wx2lua(nameSpace));
      lua_pushnil(L);
***************
*** 89,96 ****
  }
  
! int LUACALL wxLuaBinding::RegisterFunctions(lua_State *L, bool registerTypes)
  {
      if (!registerTypes && !m_typesRegistered)
!         terror(L, "wxLua: First time registration must register types");
  
      // create references table in registry
--- 91,101 ----
  }
  
! int LUACALL wxLuaBinding::RegisterFunctions(const wxLuaState& wxlState_, bool registerTypes)
  {
+     wxLuaState wxlState(wxlState_);
      if (!registerTypes && !m_typesRegistered)
!         wxlState.terror("wxLua: First time registration must register types");
! 
!     lua_State *L = wxlState.GetLuaState();
  
      // create references table in registry
***************
*** 101,105 ****
      // create a tag for the wxLua table
      if (registerTypes)
!         m_wxLuaTable = tnewtag(L);
  
      // create the wxLua table
--- 106,110 ----
      // create a tag for the wxLua table
      if (registerTypes)
!         m_wxLuaTable = wxlState.tnewtag();
  
      // create the wxLua table
***************
*** 108,120 ****
  
      // set the table tag
!     tsettag (L, m_wxLuaTable);
  
      // prevent changes from lua scripts
!     tsettagmethod (L, m_wxLuaTable, "__newindex", wxLuaTableErrorHandler);
  
      // register all out classes etc. in the wxLua table
!     RegisterGeneratedClasses(L, tableOffset, registerTypes);
  
!     OnRegister(L, registerTypes, tableOffset);
  
  	m_typesRegistered = true;
--- 113,125 ----
  
      // set the table tag
!     wxlState.tsettag(m_wxLuaTable);
  
      // prevent changes from lua scripts
!     wxlState.tsettagmethod(m_wxLuaTable, "__newindex", wxLuaTableErrorHandler);
  
      // register all out classes etc. in the wxLua table
!     RegisterGeneratedClasses(wxlState, tableOffset, registerTypes);
  
!     OnRegister(wxlState, registerTypes, tableOffset);
  
  	m_typesRegistered = true;
***************
*** 123,127 ****
  }
  
! void LUACALL wxLuaBinding::RegisterGeneratedClasses(lua_State *L, int tableOffset, bool registerTypes)
  {
      static const luaL_reg funcTable[] =
--- 128,132 ----
  }
  
! void LUACALL wxLuaBinding::RegisterGeneratedClasses(const wxLuaState& wxlState_, int tableOffset, bool registerTypes)
  {
      static const luaL_reg funcTable[] =
***************
*** 131,139 ****
          {"__newindex", setTableFunc   }
      };
!     const unsigned funcCount = sizeof(funcTable)/sizeof(funcTable[0]);
  
      size_t iClass;
      if (registerTypes)
!         m_startTag = tnewtag(L);
  
      int iTag = m_startTag;
--- 136,147 ----
          {"__newindex", setTableFunc   }
      };
!     static const unsigned funcCount = sizeof(funcTable)/sizeof(funcTable[0]);
! 
!     wxLuaState wxlState(wxlState_);
!     lua_State *L = wxlState.GetLuaState();
  
      size_t iClass;
      if (registerTypes)
!         m_startTag = wxlState.tnewtag();
  
      int iTag = m_startTag;
***************
*** 142,146 ****
      m_classList = (*pfGetClassList)(m_classCount);
      for (iClass = 0; iClass < m_classCount; ++iClass,
!         iTag = registerTypes ? tnewtag(L) : iTag + 1)
      {
          WXLUACLASS *pClass = m_classList + iClass;
--- 150,154 ----
      m_classList = (*pfGetClassList)(m_classCount);
      for (iClass = 0; iClass < m_classCount; ++iClass,
!         iTag = registerTypes ? wxlState.tnewtag() : iTag + 1)
      {
          WXLUACLASS *pClass = m_classList + iClass;
***************
*** 152,156 ****
          for (size_t iFunction = 0; iFunction < funcCount; iFunction++)
          {
!             tsettagmethod (L, iTag, funcTable[iFunction].name, funcTable[iFunction].func, (void *) pClass);
          }
  
--- 160,164 ----
          for (size_t iFunction = 0; iFunction < funcCount; iFunction++)
          {
!             wxlState.tsettagmethod(iTag, funcTable[iFunction].name, funcTable[iFunction].func, (void *) pClass);
          }
  

[Wxlua-commit] wxLua/modules/wxluasocket/include wxldtarg.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-serv31708/wxLua/modules/wxluasocket/include

Modified Files:
	wxldtarg.h 
Log Message:
LuaDebugTarget -> wxLuaDebugTarget
wxLuaBind uses wxLuaState
more switching to wxLuaState
wxDEPRECATED for all C functions that require the wxLuaState (Varaibles) use class functions instead


Index: wxldtarg.h
===================================================================
RCS file: /cvsroot/wxlua/wxLua/modules/wxluasocket/include/wxldtarg.h,v
retrieving revision 1.2
retrieving revision 1.3
diff -C2 -d -r1.2 -r1.3
*** wxldtarg.h	25 Nov 2005 19:45:36 -0000	1.2
--- wxldtarg.h	30 Nov 2005 04:46:17 -0000	1.3
***************
*** 25,51 ****
  
  // ----------------------------------------------------------------------------
! // LuaDebugTarget - Handles Debugger/Debuggee IO
  // ----------------------------------------------------------------------------
  
! class LuaDebugTarget : public wxObject, public wxLuaDebugIO
  {
  private:
      class LuaThread : public wxThread
      {
!     public:
!         LuaThread(LuaDebugTarget *pTarget) : wxThread(wxTHREAD_JOINABLE),
!                                              m_pTarget(pTarget) {}
! 
!         bool TestDestroy();
  
!     protected:
!         // thread execution starts here
!         virtual void *Entry();
  
!         // called when the thread exits
!         virtual void OnExit();
  
!     private:
!         LuaDebugTarget *m_pTarget;
      };
  
--- 25,51 ----
  
  // ----------------------------------------------------------------------------
! // wxLuaDebugTarget - Handles Debugger/Debuggee IO
  // ----------------------------------------------------------------------------
  
! class WXDLLIMPEXP_WXLUA wxLuaDebugTarget : public wxObject, public wxLuaDebugIO
  {
  private:
+ 
      class LuaThread : public wxThread
      {
!         public:
!             LuaThread(wxLuaDebugTarget *pTarget) : wxThread(wxTHREAD_JOINABLE),
!                                                    m_pTarget(pTarget) {}
  
!             bool TestDestroy();
  
!         protected:
!             // thread execution starts here
!             virtual void *Entry();
!             // called when the thread exits
!             virtual void OnExit();
  
!         private:
!             wxLuaDebugTarget *m_pTarget;
      };
  
***************
*** 67,74 ****
  public:
  
!     LuaDebugTarget(lua_State      *state,
!                    const wxString &serverName,
!                    int             portNumber);
!     ~LuaDebugTarget();
  
      bool Run();
--- 67,75 ----
  public:
  
!     wxLuaDebugTarget(const wxLuaState& wxlState,
!                      const wxString &serverName,
!                      int             portNumber);
! 
!     virtual ~wxLuaDebugTarget();
  
      bool Run();
***************
*** 88,92 ****
      };
  
!     lua_State          *m_luaState;
      int                 m_portNumber;
      wxString            m_serverName;
--- 89,93 ----
      };
  
!     wxLuaState          m_wxlState;
      int                 m_portNumber;
      wxString            m_serverName;

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

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

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

Modified Files:
	wxldebug.h 
Log Message:
LuaDebugTarget -> wxLuaDebugTarget
wxLuaBind uses wxLuaState
more switching to wxLuaState
wxDEPRECATED for all C functions that require the wxLuaState (Varaibles) use class functions instead


Index: wxldebug.h
===================================================================
RCS file: /cvsroot/wxlua/wxLua/modules/wxluadebug/include/wxldebug.h,v
retrieving revision 1.5
retrieving revision 1.6
diff -C2 -d -r1.5 -r1.6
*** wxldebug.h	29 Nov 2005 23:52:12 -0000	1.5
--- wxldebug.h	30 Nov 2005 04:46:17 -0000	1.6
***************
*** 10,16 ****
  //
  // Original Debugging Model:
! // wxLuaDebugServer, LuaDebugTarget
  // The current process acts as a server - debugger (wxLuaDebugServer)
! // starts a new process which starts up as a client - debuggee (LuaDebugTarget)
  // that connects back to server process.
  //
--- 10,16 ----
  //
  // Original Debugging Model:
! // wxLuaDebugServer, wxLuaDebugTarget
  // The current process acts as a server - debugger (wxLuaDebugServer)
! // starts a new process which starts up as a client - debuggee (wxLuaDebugTarget)
  // that connects back to server process.
  //

[Wxlua-commit] wxLua/apps/wxlua/src wxlua.cpp,1.7,1.8 wxlua.h,1.6,1.7

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

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

Modified Files:
	wxlua.cpp wxlua.h 
Log Message:
LuaDebugTarget -> wxLuaDebugTarget
wxLuaBind uses wxLuaState
more switching to wxLuaState
wxDEPRECATED for all C functions that require the wxLuaState (Varaibles) use class functions instead


Index: wxlua.cpp
===================================================================
RCS file: /cvsroot/wxlua/wxLua/apps/wxlua/src/wxlua.cpp,v
retrieving revision 1.7
retrieving revision 1.8
diff -C2 -d -r1.7 -r1.8
*** wxlua.cpp	26 Nov 2005 08:46:57 -0000	1.7
--- wxlua.cpp	30 Nov 2005 04:46:16 -0000	1.8
***************
*** 178,184 ****
                      int portNumber = wxAtoi(portPtr + 1);
  
!                     m_pDebugTarget = new LuaDebugTarget(m_luaState,
!                                                         serverPtr,
!                                                         portNumber);
                      if (m_pDebugTarget != NULL)
                          return m_pDebugTarget->Run();
--- 178,184 ----
                      int portNumber = wxAtoi(portPtr + 1);
  
!                     m_pDebugTarget = new wxLuaDebugTarget(m_luaState,
!                                                           serverPtr,
!                                                           portNumber);
                      if (m_pDebugTarget != NULL)
                          return m_pDebugTarget->Run();

Index: wxlua.h
===================================================================
RCS file: /cvsroot/wxlua/wxLua/apps/wxlua/src/wxlua.h,v
retrieving revision 1.6
retrieving revision 1.7
diff -C2 -d -r1.6 -r1.7
*** wxlua.h	29 Nov 2005 05:45:09 -0000	1.6
--- wxlua.h	30 Nov 2005 04:46:16 -0000	1.7
***************
*** 75,79 ****
      bool              m_fMemoryBitmapAdded;
  #if wxCHECK_VERSION(2, 3, 0)
!     LuaDebugTarget   *m_pDebugTarget;
  #endif
  
--- 75,79 ----
      bool              m_fMemoryBitmapAdded;
  #if wxCHECK_VERSION(2, 3, 0)
!     wxLuaDebugTarget   *m_pDebugTarget;
  #endif
  

[Wxlua-commit] wxLua/bindings/wxwidgets override.hpp,1.5,1.6 wx.rules,1.8,1.9

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

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

Modified Files:
	override.hpp wx.rules 
Log Message:
LuaDebugTarget -> wxLuaDebugTarget
wxLuaBind uses wxLuaState
more switching to wxLuaState
wxDEPRECATED for all C functions that require the wxLuaState (Varaibles) use class functions instead


Index: override.hpp
===================================================================
RCS file: /cvsroot/wxlua/wxLua/bindings/wxwidgets/override.hpp,v
retrieving revision 1.5
retrieving revision 1.6
diff -C2 -d -r1.5 -r1.6
*** override.hpp	29 Nov 2005 05:45:09 -0000	1.5
--- override.hpp	30 Nov 2005 04:46:16 -0000	1.6
***************
*** 5,10 ****
  static int LUACALL wxPoint_GetX(lua_State *L)
  {
      // get this
!     wxPoint *self = ( wxPoint * ) getuserdatatype(L, 1, s_wxluatag_wxPoint );
      // push the result number
      lua_pushnumber(L, self->x);
--- 5,11 ----
  static int LUACALL wxPoint_GetX(lua_State *L)
  {
+     wxLuaState wxlState(L);
[...5223 lines suppressed...]
***************
*** 4130,4137 ****
  static int LUACALL wxTreeItemId_SetValue(lua_State *L)
  {
      // double value
!     long value = (long) getnumbertype(L, 2);
      // get this
!     wxTreeItemId *self = ( wxTreeItemId * ) getuserdatatype(L, 1, s_wxluatag_wxTreeItemId );
      // call SetValue
      self->m_pItem = (void *) value;
--- 4309,4317 ----
  static int LUACALL wxTreeItemId_SetValue(lua_State *L)
  {
+     wxLuaState wxlState(L);
      // double value
!     long value = (long)wxlState.getnumbertype(2);
      // get this
!     wxTreeItemId *self = (wxTreeItemId *)wxlState.getuserdatatype(1, s_wxluatag_wxTreeItemId);
      // call SetValue
      self->m_pItem = (void *) value;

Index: wx.rules
===================================================================
RCS file: /cvsroot/wxlua/wxLua/bindings/wxwidgets/wx.rules,v
retrieving revision 1.8
retrieving revision 1.9
diff -C2 -d -r1.8 -r1.9
*** wx.rules	29 Nov 2005 05:45:09 -0000	1.8
--- wx.rules	30 Nov 2005 04:46:16 -0000	1.9
***************
*** 68,72 ****
  onregister =
  {
!     "    wxLuaState wxLS(L);\n",
      "    wxCHECK_RET(wxLS.Ok(), wxT(\"Invalid wxLuaState\"));\n",
      "\n",
--- 68,72 ----
  onregister =
  {
!     "    wxLuaState wxLS(wxlState);\n",
      "    wxCHECK_RET(wxLS.Ok(), wxT(\"Invalid wxLuaState\"));\n",
      "\n",
***************
*** 74,83 ****
      "    if (registerTypes)\n",
      "    {\n",
!     "        wxLS.GetLuaStateRefData()->m_wxLuaNull = tnewtag(L);\n",
      "    }\n",
      "\n",
!     "    tpushwxLuaNull(L);\n",
!     "    tpushusertag(L, NULL, wxLS.GetLuaStateRefData()->m_wxLuaNull);\n",
!     "    lua_rawset(L, luaTable);\n",
  }
  
--- 74,83 ----
      "    if (registerTypes)\n",
      "    {\n",
!     "        wxLS.GetLuaStateRefData()->m_wxLuaNull = wxLS.tnewtag();\n",
      "    }\n",
      "\n",
!     "    tpushwxLuaNull(wxLS.GetLuaState());\n",
!     "    wxLS.tpushusertag(NULL, wxLS.GetLuaStateRefData()->m_wxLuaNull);\n",
!     "    lua_rawset(wxLS.GetLuaState(), luaTable);\n",
  }
  

[Wxlua-commit] wxLua/util/build/bakefiles options.bkl,1.4,1.5

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

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

Modified Files:
	options.bkl 
Log Message:
reorder libs in apps.bkl and rebake, (remove -- in bkl, got error)
pulled in generic code in wxLuaInterface into the wxLuaState


Index: options.bkl
===================================================================
RCS file: /cvsroot/wxlua/wxLua/util/build/bakefiles/options.bkl,v
retrieving revision 1.4
retrieving revision 1.5
diff -C2 -d -r1.4 -r1.5
*** options.bkl	26 Nov 2005 14:20:31 -0000	1.4
--- options.bkl	29 Nov 2005 23:52:12 -0000	1.5
***************
*** 24,28 ****
      <!-- options not tied to a specific module
          NOTE: if you change these defaults, then you should also change the
!               defaults for the --enable-* options in configure script:
                see wxLua/build/autoconf/configure.ac
      -->
--- 24,28 ----
      <!-- options not tied to a specific module
          NOTE: if you change these defaults, then you should also change the
!               defaults for the -enable-* options in configure script:
                see wxLua/build/autoconf/configure.ac
      -->

[Wxlua-commit] wxLua/modules/wxlua/include internal.h,1.11,1.12 wxlbind.h,1.4,1.5 wxlcallb.h,1.4,1.5 wxlstate.h,1.6,1.7

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

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

Modified Files:
	internal.h wxlbind.h wxlcallb.h wxlstate.h 
Log Message:
reorder libs in apps.bkl and rebake, (remove -- in bkl, got error)
pulled in generic code in wxLuaInterface into the wxLuaState


Index: wxlcallb.h
===================================================================
RCS file: /cvsroot/wxlua/wxLua/modules/wxlua/include/wxlcallb.h,v
retrieving revision 1.4
retrieving revision 1.5
diff -C2 -d -r1.4 -r1.5
*** wxlcallb.h	29 Nov 2005 05:45:09 -0000	1.4
--- wxlcallb.h	29 Nov 2005 23:52:12 -0000	1.5
***************
*** 56,60 ****
      wxEventType          m_eventType;
  private:
!     DECLARE_ABSTRACT_CLASS(wxLuaCallback);
  };
  
--- 56,60 ----
      wxEventType          m_eventType;
  private:
!     DECLARE_ABSTRACT_CLASS(wxLuaCallback)
  };
  

Index: wxlbind.h
===================================================================
RCS file: /cvsroot/wxlua/wxLua/modules/wxlua/include/wxlbind.h,v
retrieving revision 1.4
retrieving revision 1.5
diff -C2 -d -r1.4 -r1.5
*** wxlbind.h	29 Nov 2005 05:45:09 -0000	1.4
--- wxlbind.h	29 Nov 2005 23:52:12 -0000	1.5
***************
*** 149,153 ****
  
      // Get all the bindings that were created
!     static wxLuaBindingList* GetBindingsList() { return &sm_bindings; }
  
  protected:
--- 149,153 ----
  
      // Get all the bindings that were created
!     static wxLuaBindingList* GetBindingList() { return &sm_bindings; }
  
  protected:

Index: wxlstate.h
===================================================================
RCS file: /cvsroot/wxlua/wxLua/modules/wxlua/include/wxlstate.h,v
retrieving revision 1.6
retrieving revision 1.7
diff -C2 -d -r1.6 -r1.7
*** wxlstate.h	29 Nov 2005 05:45:09 -0000	1.6
--- wxlstate.h	29 Nov 2005 23:52:12 -0000	1.7
***************
*** 49,54 ****
  class WXDLLIMPEXP_WXLUA wxLuaStateRefData;
  
! #include "wx/hashmap.h"
! WX_DECLARE_VOIDPTR_HASH_MAP( wxLuaStateRefData *, wxHashMapLuaStateRefData );
  
  //----------------------------------------------------------------------------
--- 49,89 ----
  class WXDLLIMPEXP_WXLUA wxLuaStateRefData;
  
! // ----------------------------------------------------------------------------
! // String functions - convert between Lua (ansi string) and wxString (encoded)
! // ----------------------------------------------------------------------------
! 
! // Convert a 8-bit Lua String into wxString
! inline WXDLLIMPEXP_WXLUA wxString lua2wx(const char * luastr)
! {
!     if (luastr == NULL)
!         return wxEmptyString;
! 
!     return wxConvertMB2WX(luastr); // this fails on NULL
! }
! 
! // Convert a wxString to 8-bit Lua String
! inline const WXDLLIMPEXP_WXLUA wxCharBuffer wx2lua(const wxString& wxstr)
! {
!     wxCharBuffer buffer(wxConvertWX2MB(wxstr.c_str()));
!     return buffer;
! }
! 
! // Convert a wxString to 8-bit Lua Buffer and store it
! class WXDLLIMPEXP_WXLUA LuaCharBuffer
! {
! public:
!     LuaCharBuffer(const wxString &wxstr) : m_buffer((const char *)NULL)
!     {
!         wxCharBuffer charBuffer = wxConvertWX2MB(wxstr.c_str());
!         m_buffer = charBuffer;
!     }
! 
!     ~LuaCharBuffer() {}
! 
!     size_t Length() const { return strlen((const char*)m_buffer); }
!     const char *GetData() const { return (const char*)m_buffer; }
! 
!     wxCharBuffer m_buffer;
! };
  
  //----------------------------------------------------------------------------
***************
*** 57,60 ****
--- 92,98 ----
  //----------------------------------------------------------------------------
  
+ #include "wx/hashmap.h"
+ WX_DECLARE_VOIDPTR_HASH_MAP( wxLuaStateRefData *, wxHashMapLuaStateRefData );
+ 
  class WXDLLIMPEXP_WXLUA wxLuaStateRefData : public wxObjectRefData
  {
***************
*** 151,155 ****
      wxLuaStateRefData* GetLuaStateRefData() const { return (wxLuaStateRefData*)GetRefData(); }
  
- 
      // Get the wxEventType currently
      wxEventType GetInEventType() const;
--- 189,192 ----
***************
*** 160,164 ****
      void RegisterBindings(bool registerTypes);
  
!     wxLuaBinding* GetLuaBinding(const wxString& nameSpace);
  
      const WXLUACLASS * GetLuaClass(int iClassTag);
--- 197,202 ----
      void RegisterBindings(bool registerTypes);
  
!     // Get the wxLuaBinding with the given nameSpace or NULL for no match
!     wxLuaBinding* GetLuaBinding(const wxString& nameSpace) const;
  
      const WXLUACLASS * GetLuaClass(int iClassTag);
***************
*** 185,189 ****
      void addToTrackedWindowList(wxWindow *win);
      void removeTrackedWindow(wxWindow *win);
!     bool isWindowTracked(wxWindow *win) const;
  
      // -----------------------------------------------------------------------
--- 223,227 ----
      void addToTrackedWindowList(wxWindow *win);
      void removeTrackedWindow(wxWindow *win);
!     bool isWindowTracked(wxWindow *win, bool check_parents = true) const;
  
      // -----------------------------------------------------------------------
***************
*** 283,304 ****
  
      // FIXME LuaStackObject Stack(int index)                         {  return LuaStackObject(this, index);  }
!     int GetTop();
      void SetTop(int index);
      void PushValue(int index);
      // FIXME void PushValue(LuaStackObject object);
      void Remove(int index);
      void Insert(int index);
      void Replace(int index);
!     int CheckStack(int size);
      void XMove(const wxLuaState& to, int n);
!     int Equal(int index1, int index2);
!     int RawEqual(int index1, int index2);
!     int LessThan(int index1, int index2);
  
      // -----------------------------------------------------------------------
      // Raw lua Arg functions.
  
      int TypeError(int narg, const char* tname);
      int ArgError(int narg, const char* extramsg);
      const char* CheckLString(int numArg, size_t* len);
      const char* OptLString(int numArg, const char *def, size_t* len);
--- 321,359 ----
  
      // FIXME LuaStackObject Stack(int index)                         {  return LuaStackObject(this, index);  }
!     int  GetTop();
      void SetTop(int index);
      void PushValue(int index);
      // FIXME void PushValue(LuaStackObject object);
+     void PushNil();
      void Remove(int index);
+     void Pop(int count);
+     int  Next(int index);
      void Insert(int index);
      void Replace(int index);
!     int  CheckStack(int size);
      void XMove(const wxLuaState& to, int n);
!     int  Equal(int index1, int index2);
!     int  RawEqual(int index1, int index2);
!     int  LessThan(int index1, int index2);
  
      // -----------------------------------------------------------------------
      // Raw lua Arg functions.
  
+     void GetGlobals();
+ 
+     int         GetN(int index);
+     int         Type(int index);
+     double      ToNumber(int index);
+     int         ToBoolean(int index);
+     wxString    TowxString(int index);
+     const void *ToPointer(int index);
+     bool        IsCFunction(int index);
+     const void *ToCFunction(int index);
+     const void *ToUserData(int index);
+ 
      int TypeError(int narg, const char* tname);
+     int TypeError(int narg, const wxString& tname) { return TypeError(narg, (const char*)wx2lua(tname)); }
      int ArgError(int narg, const char* extramsg);
+     int ArgError(int narg, const wxString& extramsg) { return ArgError(narg, (const char*)wx2lua(extramsg)); }
      const char* CheckLString(int numArg, size_t* len);
      const char* OptLString(int numArg, const char *def, size_t* len);
***************
*** 322,327 ****
--- 377,385 ----
      int GetStack(int level, lua_Debug* ar);
      int GetInfo(const char* what, lua_Debug* ar);
+     int GetInfo(const wxString& str, lua_Debug* ar) { return GetInfo((const char*)wx2lua(str), ar); }
      const char* GetLocal(const lua_Debug* ar, int n);
+     wxString GetLocalwxString(const lua_Debug* ar, int n) { return lua2wx(GetLocal(ar, n)); }
      const char* SetLocal(const lua_Debug* ar, int n);
+     wxString SetLocalwxString(const lua_Debug* ar, int n) { return lua2wx(SetLocal(ar, n)); }
  
      int SetHook(lua_Hook func, int mask, int count);

Index: internal.h
===================================================================
RCS file: /cvsroot/wxlua/wxLua/modules/wxlua/include/internal.h,v
retrieving revision 1.11
retrieving revision 1.12
diff -C2 -d -r1.11 -r1.12
*** internal.h	29 Nov 2005 05:45:09 -0000	1.11
--- internal.h	29 Nov 2005 23:52:12 -0000	1.12
***************
*** 361,401 ****
  int LUACALL CreateStandaloneBitmaps(lua_State *luaState);
  
- // ----------------------------------------------------------------------------
- // String functions - convert between Lua (ansi string) and wxString (encoded)
- // ----------------------------------------------------------------------------
- 
- // Convert a 8-bit Lua String into wxString
- inline WXDLLIMPEXP_WXLUA wxString lua2wx(const char * luastr)
- {
-     if (luastr == NULL)
-         return wxEmptyString;
- 
-     return wxConvertMB2WX(luastr); // this fails on NULL
- }
- 
- // Convert a wxString to 8-bit Lua String
- inline const WXDLLIMPEXP_WXLUA wxCharBuffer wx2lua(const wxString& wxstr)
- {
-     wxCharBuffer buffer(wxConvertWX2MB(wxstr.c_str()));
-     return buffer;
- }
- 
- // Convert a wxString to 8-bit Lua Buffer and store it
- class WXDLLIMPEXP_WXLUA LuaCharBuffer
- {
- public:
-     LuaCharBuffer(const wxString &wxstr) : m_buffer((const char *)NULL)
-     {
-         wxCharBuffer charBuffer = wxConvertWX2MB(wxstr.c_str());
-         m_buffer = charBuffer;
-     }
- 
-     ~LuaCharBuffer() {}
- 
-     size_t Length() const { return strlen((const char*)m_buffer); }
-     const char *GetData() const { return (const char*)m_buffer; }
- 
-     wxCharBuffer m_buffer;
- };
- 
  #endif // WX_LUA_INTERNALS_H
--- 361,363 ----

[Wxlua-commit] wxLua/modules/wxlua/src internal.cpp,1.17,1.18 wxlbind.cpp,1.5,1.6 wxlcallb.cpp,1.6,1.7 wxlstate.cpp,1.9,1.10

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

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

Modified Files:
	internal.cpp wxlbind.cpp wxlcallb.cpp wxlstate.cpp 
Log Message:
reorder libs in apps.bkl and rebake, (remove -- in bkl, got error)
pulled in generic code in wxLuaInterface into the wxLuaState


Index: internal.cpp
===================================================================
RCS file: /cvsroot/wxlua/wxLua/modules/wxlua/src/internal.cpp,v
retrieving revision 1.17
retrieving revision 1.18
diff -C2 -d -r1.17 -r1.18
*** internal.cpp	29 Nov 2005 05:57:12 -0000	1.17
--- internal.cpp	29 Nov 2005 23:52:12 -0000	1.18
***************
*** 45,56 ****
  extern wxLuaInterpreter    *wxFindLuaInterpreter(lua_State *L);
  
- extern int wxLuaEventListCompareFn(const void *p1, const void *p2); // in wxlbind.cpp
- 
  extern int s_wxluatag_wxBitmap;
  extern int s_wxluatag_wxEvtHandler;
  
  // lua registry table
! const char wxLuaReferences[]  = "wxLuaReferences";
! const char wxLuaNull[]        = "wxNull";
  
  wxString GetSourceLine(lua_State *L)
--- 45,54 ----
  extern wxLuaInterpreter    *wxFindLuaInterpreter(lua_State *L);
  
  extern int s_wxluatag_wxBitmap;
  extern int s_wxluatag_wxEvtHandler;
  
  // lua registry table
! const char* wxLuaReferences = "wxLuaReferences";
! const char* wxLuaNull       = "wxNull";
  
  wxString GetSourceLine(lua_State *L)

Index: wxlstate.cpp
===================================================================
RCS file: /cvsroot/wxlua/wxLua/modules/wxlua/src/wxlstate.cpp,v
retrieving revision 1.9
retrieving revision 1.10
diff -C2 -d -r1.9 -r1.10
*** wxlstate.cpp	29 Nov 2005 05:45:09 -0000	1.9
--- wxlstate.cpp	29 Nov 2005 23:52:12 -0000	1.10
***************
*** 48,57 ****
  extern int wxLuaEventListCompareFn(const void *p1, const void *p2);    // wxlbind.cpp
  extern int wxLuaClassListCompareByTag(const void *p1, const void *p2); // wxlbind.cpp
! const char *wxLuaReferences; // in internal.cpp
! const char *wxLuaNull;       // in internal.cpp
  
  extern int s_wxluatag_wxWindow;
  
! wxLuaState wxNullLuaState;
  
  // ----------------------------------------------------------------------------
--- 48,57 ----
  extern int wxLuaEventListCompareFn(const void *p1, const void *p2);    // wxlbind.cpp
  extern int wxLuaClassListCompareByTag(const void *p1, const void *p2); // wxlbind.cpp
! 
! extern const char* wxLuaNull;
  
  extern int s_wxluatag_wxWindow;
  
! wxLuaState wxNullLuaState(false);
  
  // ----------------------------------------------------------------------------
***************
*** 217,221 ****
  
      wxLuaBindingList::Node *node;
!     for (node = wxLuaBinding::GetBindingsList()->GetFirst(); node; node = node->GetNext() )
      {
          wxLuaBinding* binding = node->GetData();
--- 217,221 ----
  
      wxLuaBindingList::Node *node;
!     for (node = wxLuaBinding::GetBindingList()->GetFirst(); node; node = node->GetNext() )
      {
          wxLuaBinding* binding = node->GetData();
***************
*** 557,562 ****
  
  // Find binding with given nameSpace
! wxLuaBinding* wxLuaState::GetLuaBinding(const wxString& nameSpace)
  {
      wxLuaBindingList::Node *node;
      for (node = M_WXLSTATEDATA->m_bindings.GetFirst(); node; node = node->GetNext() )
--- 557,563 ----
  
  // Find binding with given nameSpace
! wxLuaBinding* wxLuaState::GetLuaBinding(const wxString& nameSpace) const
  {
+     wxCHECK_MSG(GetRefData() != NULL, NULL, wxT("Invalid wxLuaState"));
      wxLuaBindingList::Node *node;
      for (node = M_WXLSTATEDATA->m_bindings.GetFirst(); node; node = node->GetNext() )
***************
*** 573,576 ****
--- 574,578 ----
  const WXLUACLASS* wxLuaState::GetLuaClass(int iClassTag)
  {
+     wxCHECK_MSG(GetRefData() != NULL, NULL, wxT("Invalid wxLuaState"));
      WXLUACLASS classItem;
      classItem.class_tag = &iClassTag;
***************
*** 600,603 ****
--- 602,606 ----
  const WXLUACLASS* wxLuaState::GetLuaClass(const char* className)
  {
+     wxCHECK_MSG(GetRefData() != NULL, NULL, wxT("Invalid wxLuaState"));
      wxLuaBindingList::Node *node;
      for (node = M_WXLSTATEDATA->m_bindings.GetFirst(); node; node = node->GetNext() )
***************
*** 622,625 ****
--- 625,629 ----
  const WXLUACLASS* wxLuaState::GetBaseLuaClass(int iClassTag)
  {
+     wxCHECK_MSG(GetRefData() != NULL, NULL, wxT("Invalid wxLuaState"));
      const WXLUACLASS *pLuaClass = GetLuaClass(iClassTag);
      if (pLuaClass && (pLuaClass->baseclass_tag != -1))
***************
*** 645,649 ****
  const WXLUAEVENT* wxLuaState::GetLuaEvent(wxEvent *pEvent)
  {
!     wxCHECK_MSG(pEvent, NULL, wxT("Invalid wxEvent"));
      WXLUAEVENT eventItem;
      int eventType = pEvent->GetEventType();
--- 649,653 ----
  const WXLUAEVENT* wxLuaState::GetLuaEvent(wxEvent *pEvent)
  {
!     wxCHECK_MSG(Ok() && pEvent, NULL, wxT("Invalid wxLuaState or wxEvent"));
      WXLUAEVENT eventItem;
      int eventType = pEvent->GetEventType();
***************
*** 714,718 ****
  bool wxLuaState::removeTrackedMemory(void *pObject, bool fDelete)
  {
!     wxCHECK_MSG(Ok(), false, wxT("Invalid wxLuaState"))
  
      wxObject *pDeleteObject = M_WXLSTATEDATA->m_pTrackedList->Delete((int) pObject);
--- 718,722 ----
  bool wxLuaState::removeTrackedMemory(void *pObject, bool fDelete)
  {
!     wxCHECK_MSG(Ok() && pObject, false, wxT("Invalid wxLuaState or object"))
  
      wxObject *pDeleteObject = M_WXLSTATEDATA->m_pTrackedList->Delete((int) pObject);
***************
*** 747,751 ****
  }
  
! bool wxLuaState::isWindowTracked(wxWindow *win) const
  {
      wxCHECK_MSG(Ok() && win, false, wxT("Invalid wxLuaState or wxWindow"));
--- 751,755 ----
  }
  
! bool wxLuaState::isWindowTracked(wxWindow *win, bool check_parents) const
  {
      wxCHECK_MSG(Ok() && win, false, wxT("Invalid wxLuaState or wxWindow"));
***************
*** 759,763 ****
              return true;
  
!         parent = parent->GetParent();
      }
  
--- 763,767 ----
              return true;
  
!         parent = check_parents ? parent->GetParent() : NULL;
      }
  
***************
*** 1685,1688 ****
--- 1689,1697 ----
  //    lua_pushvalue(m_state, object);
  //}
+ void wxLuaState::PushNil()
+ {
+     wxCHECK_RET(Ok(), wxT("Invalid wxLuaState"));
+     lua_pushnil(M_WXLSTATEDATA->m_lua_State);
+ }
  void wxLuaState::Remove(int index)
  {
***************
*** 1690,1693 ****
--- 1699,1712 ----
      lua_remove(M_WXLSTATEDATA->m_lua_State, index);
  }
+ void wxLuaState::Pop(int count)
+ {
+     wxCHECK_RET(Ok(), wxT("Invalid wxLuaState"));
+     lua_pop(M_WXLSTATEDATA->m_lua_State, count);
+ }
+ int wxLuaState::Next(int index)
+ {
+     wxCHECK_MSG(Ok(), 0, wxT("Invalid wxLuaState"));
+     return lua_next(M_WXLSTATEDATA->m_lua_State, index);
+ }
  void wxLuaState::Insert(int index)
  {
***************
*** 1730,1733 ****
--- 1749,1804 ----
  // Raw lua Arg functions.
  
+ void wxLuaState::GetGlobals()
+ {
+     wxCHECK_RET(Ok(), wxT("Invalid wxLuaState"));
+     lua_pushvalue(M_WXLSTATEDATA->m_lua_State, LUA_GLOBALSINDEX);
+ }
+ 
+ int wxLuaState::GetN(int index)
+ {
+     wxCHECK_MSG(Ok(), 0, wxT("Invalid wxLuaState"));
+     return luaL_getn(M_WXLSTATEDATA->m_lua_State, index);
+ }
+ int wxLuaState::Type(int index)
+ {
+     wxCHECK_MSG(Ok(), 0, wxT("Invalid wxLuaState"));
+     return lua_type(M_WXLSTATEDATA->m_lua_State, index);
+ }
+ double wxLuaState::ToNumber(int index)
+ {
+     wxCHECK_MSG(Ok(), 0, wxT("Invalid wxLuaState"));
+     return lua_tonumber(M_WXLSTATEDATA->m_lua_State, index);
+ }
+ int wxLuaState::ToBoolean(int index)
+ {
+     wxCHECK_MSG(Ok(), 0, wxT("Invalid wxLuaState"));
+     return lua_toboolean(M_WXLSTATEDATA->m_lua_State, index);
+ }
+ wxString wxLuaState::TowxString(int index)
+ {
+     wxCHECK_MSG(Ok(), wxEmptyString, wxT("Invalid wxLuaState"));
+     return lua2wx(lua_tostring(M_WXLSTATEDATA->m_lua_State, index));
+ }
+ const void *wxLuaState::ToPointer(int index)
+ {
+     wxCHECK_MSG(Ok(), NULL, wxT("Invalid wxLuaState"));
+     return lua_topointer(M_WXLSTATEDATA->m_lua_State, index);
+ }
+ bool wxLuaState::IsCFunction(int index)
+ {
+     wxCHECK_MSG(Ok(), false, wxT("Invalid wxLuaState"));
+     return lua_iscfunction(M_WXLSTATEDATA->m_lua_State, index) != 0;
+ }
+ const void *wxLuaState::ToCFunction(int index)
+ {
+     wxCHECK_MSG(Ok(), NULL, wxT("Invalid wxLuaState"));
+     return (const void *) lua_tocfunction(M_WXLSTATEDATA->m_lua_State, index);
+ }
+ const void *wxLuaState::ToUserData(int index)
+ {
+     wxCHECK_MSG(Ok(), NULL, wxT("Invalid wxLuaState"));
+     return lua_touserdata(M_WXLSTATEDATA->m_lua_State, index);
+ }
+ 
  int wxLuaState::TypeError(int narg, const char* tname)
  {

Index: wxlbind.cpp
===================================================================
RCS file: /cvsroot/wxlua/wxLua/modules/wxlua/src/wxlbind.cpp,v
retrieving revision 1.5
retrieving revision 1.6
diff -C2 -d -r1.5 -r1.6
*** wxlbind.cpp	29 Nov 2005 05:45:09 -0000	1.5
--- wxlbind.cpp	29 Nov 2005 23:52:12 -0000	1.6
***************
*** 95,99 ****
  
      // create references table in registry
! //    lua_pushstring(L, wxLuaReferences);
  //    lua_newtable(L);
  //    lua_rawset(L, LUA_REGISTRYINDEX);
--- 95,99 ----
  
      // create references table in registry
! //    tpushwxLuaReferences(L);
  //    lua_newtable(L);
  //    lua_rawset(L, LUA_REGISTRYINDEX);

Index: wxlcallb.cpp
===================================================================
RCS file: /cvsroot/wxlua/wxLua/modules/wxlua/src/wxlcallb.cpp,v
retrieving revision 1.6
retrieving revision 1.7
diff -C2 -d -r1.6 -r1.7
*** wxlcallb.cpp	29 Nov 2005 05:45:09 -0000	1.6
--- wxlcallb.cpp	29 Nov 2005 23:52:12 -0000	1.7
***************
*** 32,36 ****
  //-----------------------------------------------------------------------------
  
! IMPLEMENT_ABSTRACT_CLASS(wxLuaCallback, wxEvtHandler);
  
  // Encapsulate a lua function reference for use by a event callback
--- 32,36 ----
  //-----------------------------------------------------------------------------
  
! IMPLEMENT_ABSTRACT_CLASS(wxLuaCallback, wxEvtHandler)
  
  // Encapsulate a lua function reference for use by a event callback
***************
*** 162,166 ****
  // ----------------------------------------------------------------------------
  
! IMPLEMENT_ABSTRACT_CLASS(wxLuaDestroyCallback, wxEvtHandler);
  
  wxLuaDestroyCallback::wxLuaDestroyCallback(const wxLuaState& state, int id,
--- 162,166 ----
  // ----------------------------------------------------------------------------
  
! IMPLEMENT_ABSTRACT_CLASS(wxLuaDestroyCallback, wxEvtHandler)
  
  wxLuaDestroyCallback::wxLuaDestroyCallback(const wxLuaState& state, int id,

[Wxlua-commit] wxLua/modules/wxluadebug/src wxldebug.cpp,1.4,1.5

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

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

Modified Files:
	wxldebug.cpp 
Log Message:
reorder libs in apps.bkl and rebake, (remove -- in bkl, got error)
pulled in generic code in wxLuaInterface into the wxLuaState


Index: wxldebug.cpp
===================================================================
RCS file: /cvsroot/wxlua/wxLua/modules/wxluadebug/src/wxldebug.cpp,v
retrieving revision 1.4
retrieving revision 1.5
diff -C2 -d -r1.4 -r1.5
*** wxldebug.cpp	29 Nov 2005 05:45:10 -0000	1.4
--- wxldebug.cpp	29 Nov 2005 23:52:12 -0000	1.5
***************
*** 188,306 ****
  {
      size_t idx, idxMax = m_references.GetCount();
-     lua_State* L = GetLuaState();
      for (idx = 0; idx < idxMax; ++idx)
      {
          int iItem = m_references.Item(idx);
!         tremove(L, iItem);
      }
  }
  
- int wxLuaInterface::GetStack(int nIndex, lua_Debug *luaDebug)
- {
-     return lua_getstack(GetLuaState(), nIndex, luaDebug);
- }
- 
- bool wxLuaInterface::GetInfo(const wxString &what, lua_Debug *luaDebug)
- {
-     return (lua_getinfo(GetLuaState(), wx2lua(what), luaDebug) != 0);
- }
- 
- wxString wxLuaInterface::GetLocal(lua_Debug *luaDebug, int index)
- {
-     return lua2wx(lua_getlocal(GetLuaState(), luaDebug, index));
- }
- 
- void wxLuaInterface::GetGlobals()
- {
-     lua_pushvalue(GetLuaState(), LUA_GLOBALSINDEX);
- }
- 
- int wxLuaInterface::GetTop()
- {
-     return lua_gettop(GetLuaState());
- }
- 
- int wxLuaInterface::Type(int index)
- {
-     return lua_type(GetLuaState(), index);
- }
- 
- double wxLuaInterface::ToNumber(int index)
- {
-     return lua_tonumber(GetLuaState(), index);
- }
- 
- int wxLuaInterface::ToBoolean(int index)
- {
-     return lua_toboolean(GetLuaState(), index);
- }
- 
- wxString wxLuaInterface::ToString(int index)
- {
-     return lua2wx(lua_tostring(GetLuaState(), index));
- }
- 
- const void *wxLuaInterface::ToPointer(int index)
- {
-     return lua_topointer(GetLuaState(), index);
- }
- 
- bool wxLuaInterface::IsCFunction(int index)
- {
-     return lua_iscfunction(GetLuaState(), index) != 0;
- }
- 
- const void *wxLuaInterface::ToCFunction(int index)
- {
-     return (const void *) lua_tocfunction(GetLuaState(), index);
- }
- 
- const void *wxLuaInterface::ToUserData(int index)
- {
-     return lua_touserdata(GetLuaState(), index);
- }
- 
- int wxLuaInterface::GetTag(int index)
- {
-     return ttag(GetLuaState(), index);
- }
- 
- int wxLuaInterface::GetN(int index)
- {
-     return luaL_getn(GetLuaState(), index);
- }
- 
  int wxLuaInterface::Ref()
  {
!     int nReference = tinsert(GetLuaState(), -1);
      m_references.Add(nReference);
      return nReference;
  }
  
- int wxLuaInterface::GetRef(int ref)
- {
-     return tget(GetLuaState(), ref);
- }
- 
- void wxLuaInterface::Pop(int count)
- {
-     lua_pop(GetLuaState(), count);
- }
- 
- void wxLuaInterface::PushNil()
- {
-     lua_pushnil(GetLuaState());
- }
- 
- void wxLuaInterface::PushValue(int index)
- {
-     lua_pushvalue(GetLuaState(), index);
- }
- 
- int wxLuaInterface::Next(int index)
- {
-     return lua_next(GetLuaState(), index);
- }
- 
  wxLuaDebugData *wxLuaInterface::BuildStack()
  {
--- 188,205 ----
  {
      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()
  {
***************
*** 312,318 ****
      bool fFirst = true;
  
!     while (GetStack(nIndex, &luaDebug) != 0)
      {
!         if (GetInfo(wxT("Sln"), &luaDebug))
          {
              wxString itemName;
--- 211,217 ----
      bool fFirst = true;
  
!     while (m_wxlState.GetStack(nIndex, &luaDebug) != 0)
      {
!         if (m_wxlState.GetInfo("Sln", &luaDebug) != 0)
          {
              wxString itemName;
***************
*** 349,356 ****
      {
          lua_Debug luaDebug;
!         if (GetStack(nEntry, &luaDebug) != 0)
          {
              int         idx  = 1;
!             wxString name = GetLocal(&luaDebug, idx);
              while (!name.IsEmpty())
              {
--- 248,255 ----
      {
          lua_Debug luaDebug;
!         if (m_wxlState.GetStack(nEntry, &luaDebug) != 0)
          {
              int         idx  = 1;
!             wxString name = m_wxlState.GetLocalwxString(&luaDebug, idx);
              while (!name.IsEmpty())
              {
***************
*** 360,364 ****
                  wxString source = lua2wx(luaDebug.source);
  
!                 switch (Type(-1))
                  {
                      case LUA_TNIL:
--- 259,263 ----
                  wxString source = lua2wx(luaDebug.source);
  
!                 switch (m_wxlState.Type(-1))
                  {
                      case LUA_TNIL:
***************
*** 369,383 ****
                      case LUA_TBOOLEAN:
                          type = wxT("Boolean");
!                         value = MakeBoolean(ToBoolean(-1));
                          break;
  
                      case LUA_TNUMBER:
                          type = wxT("Number");
!                         value = MakeNumber(ToNumber(-1));
                          break;
  
                      case LUA_TSTRING:
                          type  = wxT("String");
!                         value = ToString(-1);
                          break;
  
--- 268,282 ----
                      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;
  
***************
*** 389,401 ****
  
                      case LUA_TFUNCTION:
!                         if (IsCFunction(-1))
                          {
                              type  = wxT("C Function");
!                             value.Printf(wxT("%p"), ToCFunction(-1));
                          }
                          else
                          {
                              type = wxT("Lua Function");
!                             value.Printf(wxT("%p"), ToPointer(-1));
                          }
                          break;
--- 288,300 ----
  
                      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;
***************
*** 413,417 ****
                      case LUA_TTHREAD:
                          type  = wxT("Thread");
!                         value.Printf(wxT("%p"), ToPointer(-1));
                          break;
                  }
--- 312,316 ----
                      case LUA_TTHREAD:
                          type  = wxT("Thread");
!                         value.Printf(wxT("%p"), m_wxlState.ToPointer(-1));
                          break;
                  }
***************
*** 424,433 ****
                  }
                  else
!                     Pop(1);
  
                  wxLuaDebugDataItem *item = new wxLuaDebugDataItem(name, type, value, source, nRef, 0);
                  pSortedList->Add(item);
  
!                 name = GetLocal(&luaDebug, ++idx);
              }
          }
--- 323,332 ----
                  }
                  else
!                     m_wxlState.Pop(1);
  
                  wxLuaDebugDataItem *item = new wxLuaDebugDataItem(name, type, value, source, nRef, 0);
                  pSortedList->Add(item);
  
!                 name = m_wxlState.GetLocalwxString(&luaDebug, ++idx);
              }
          }
***************
*** 440,452 ****
  {
      wxLuaDebugData *pSortedList = new wxLuaDebugData();
!     if ((pSortedList != NULL) && (GetRef(nRef) != 0))
      {
!         int nTop = GetTop();
  
          // start iterating
!         PushNil();
!         while (Next(nTop) != 0)
          {
!             bool        fIsTable = false;
              wxString type;
              wxString value;
--- 339,351 ----
  {
      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;
***************
*** 455,459 ****
  
              // get the index
!             switch (Type(-2))
              {
                  case LUA_TNIL:
--- 354,358 ----
  
              // get the index
!             switch (m_wxlState.Type(-2))
              {
                  case LUA_TNIL:
***************
*** 462,474 ****
  
                  case LUA_TBOOLEAN:
!                     name = MakeBoolean(ToBoolean(-2));
                      break;
  
                  case LUA_TNUMBER:
!                     name = MakeNumber(ToNumber(-2));
                      break;
  
                  case LUA_TSTRING:
!                     name = ToString(-2);
                      break;
  
--- 361,373 ----
  
                  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;
  
***************
*** 478,485 ****
  
                  case LUA_TFUNCTION:
!                     if (IsCFunction(-2))
!                         name.Printf(wxT("%p"), ToCFunction(-2));
                      else
!                         name.Printf(wxT("%p"), ToPointer(-2));
                      break;
  
--- 377,384 ----
  
                  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;
  
***************
*** 494,498 ****
  
              // get the value
!             switch (Type(-1))
              {
                  case LUA_TNIL:
--- 393,397 ----
  
              // get the value
!             switch (m_wxlState.Type(-1))
              {
                  case LUA_TNIL:
***************
*** 502,511 ****
  
                  case LUA_TBOOLEAN:
!                     value = MakeBoolean(ToBoolean(-1));
                      type = wxT("Boolean");
                      break;
  
                  case LUA_TNUMBER:
!                     value = MakeNumber(ToNumber(-1));
                      type = wxT("Number");
                      break;
--- 401,410 ----
  
                  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;
***************
*** 513,517 ****
                  case LUA_TSTRING:
                      type  = wxT("String");
!                     value = ToString(-1);
                      break;
  
--- 412,416 ----
                  case LUA_TSTRING:
                      type  = wxT("String");
!                     value = m_wxlState.TowxString(-1);
                      break;
  
***************
*** 523,535 ****
  
                  case LUA_TFUNCTION:
!                     if (IsCFunction(-1))
                      {
                          type  = wxT("C Function");
!                         value.Printf(wxT("%p"), ToCFunction(-1));
                      }
                      else
                      {
                          type = wxT("Lua Function");
!                         value.Printf(wxT("%p"), ToPointer(-1));
                      }
                      break;
--- 422,434 ----
  
                  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;
***************
*** 547,551 ****
                  case LUA_TTHREAD:
                      type = wxT("Thread");
!                     value.Printf(wxT("%p"), ToPointer(-1));
                      break;
              }
--- 446,450 ----
                  case LUA_TTHREAD:
                      type = wxT("Thread");
!                     value.Printf(wxT("%p"), m_wxlState.ToPointer(-1));
                      break;
              }
***************
*** 555,559 ****
                  nRef = Ref();
              else
!                 Pop(1);
  
              wxLuaDebugDataItem *item = new wxLuaDebugDataItem(name, type, value, source, nRef, nIndex);
--- 454,458 ----
                  nRef = Ref();
              else
!                 m_wxlState.Pop(1);
  
              wxLuaDebugDataItem *item = new wxLuaDebugDataItem(name, type, value, source, nRef, nIndex);
***************
*** 562,566 ****
  
          // remove reference
!         Pop(1);
      }
      return pSortedList;
--- 461,465 ----
  
          // remove reference
!         m_wxlState.Pop(1);
      }
      return pSortedList;
***************
*** 571,576 ****
      wxString tableInfo;
  
!     int         nItems = GetN(index);
!     const void *pItem  = ToPointer(index);
  
      if (nItems == 0)
--- 470,475 ----
      wxString tableInfo;
  
!     int         nItems = m_wxlState.GetN(index);
!     const void *pItem  = m_wxlState.ToPointer(index);
  
      if (nItems == 0)
***************
*** 589,604 ****
      {
          wxString pTagName;
!         int nTag = GetTag(index);
  
          if (nTag != TLUA_NOTAG)
!             pTagName = lua2wx(GetLuaTagName(GetLuaState(), nTag));
  
          if (pTagName != wxEmptyString)
!             userdatainfo.Printf(wxT("%p (%s)"), ToUserData(index), pTagName.c_str());
          else
!             userdatainfo.Printf(wxT("%p (%u)"), ToUserData(index), nTag);
      }
      else
!         userdatainfo.Printf(wxT("%p"), ToUserData(index));
  
      return userdatainfo;
--- 488,503 ----
      {
          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;
***************
*** 635,639 ****
      if (pSortedList != NULL)
      {
!         GetGlobals();
          int nRef = Ref();
          pSortedList->Add(new wxLuaDebugDataItem(wxT("Globals"), wxT(""), wxT(""), wxT(""), nRef, 0));
--- 534,538 ----
      if (pSortedList != NULL)
      {
!         m_wxlState.GetGlobals();
          int nRef = Ref();
          pSortedList->Add(new wxLuaDebugDataItem(wxT("Globals"), wxT(""), wxT(""), wxT(""), nRef, 0));

[Wxlua-commit] wxLua/modules/build/msw makefile.bcc,1.15,1.16

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

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

Modified Files:
	makefile.bcc 
Log Message:
reorder libs in apps.bkl and rebake, (remove -- in bkl, got error)
pulled in generic code in wxLuaInterface into the wxLuaState


Index: makefile.bcc
===================================================================
RCS file: /cvsroot/wxlua/wxLua/modules/build/msw/makefile.bcc,v
retrieving revision 1.15
retrieving revision 1.16
diff -C2 -d -r1.15 -r1.16
*** makefile.bcc	25 Nov 2005 19:45:36 -0000	1.15
--- makefile.bcc	29 Nov 2005 23:52:11 -0000	1.16
***************
*** 423,427 ****
  ..\..\..\lib\bcc_dll\wxlua_dll.dll: $(WXLUA_DLL_OBJECTS)
  	ilink32 -Tpd -q $(LDFLAGS) -L$(BCCDIR)\lib -L$(BCCDIR)\lib\psdk -L$(WX_DIR)$(__WXLIBPATH_FILENAMES) $(__DEBUGINFO)  -L..\..\..\$(__WXLUA_OUTPUT_FOLDER_FILENAMES) @&&|
! 	c0d32.obj $(WXLUA_DLL_OBJECTS),$@,, wxbase$(WX_VERSION)$(WXLIBPOSTFIX).lib wxmsw$(WX_VERSION)$(WXLIBPOSTFIX)_core.lib wxbase$(WX_VERSION)$(WXLIBPOSTFIX)_xml.lib wxmsw$(WX_VERSION)$(WXLIBPOSTFIX)_adv.lib wxtiff$(WX3RDPARTYLIBPOSTFIX).lib wxjpeg$(WX3RDPARTYLIBPOSTFIX).lib wxpng$(WX3RDPARTYLIBPOSTFIX).lib wxzlib$(WX3RDPARTYLIBPOSTFIX).lib wxregex$(WXLIBPOSTFIX).lib wxexpat$(WX3RDPARTYLIBPOSTFIX).lib ole2w32.lib oleacc.lib import32.lib cw32mt.lib,,
  |
  	implib -f ..\..\..\lib\bcc_dll\wxlua $@
--- 423,427 ----
  ..\..\..\lib\bcc_dll\wxlua_dll.dll: $(WXLUA_DLL_OBJECTS)
  	ilink32 -Tpd -q $(LDFLAGS) -L$(BCCDIR)\lib -L$(BCCDIR)\lib\psdk -L$(WX_DIR)$(__WXLIBPATH_FILENAMES) $(__DEBUGINFO)  -L..\..\..\$(__WXLUA_OUTPUT_FOLDER_FILENAMES) @&&|
! 	c0d32.obj $(WXLUA_DLL_OBJECTS),$@,, wxbase$(WX_VERSION)$(WXLIBPOSTFIX).lib wxmsw$(WX_VERSION)$(WXLIBPOSTFIX)_core.lib wxbase$(WX_VERSION)$(WXLIBPOSTFIX)_xml.lib wxmsw$(WX_VERSION)$(WXLIBPOSTFIX)_adv.lib wxtiff$(WX3RDPARTYLIBPOSTFIX).lib wxjpeg$(WX3RDPARTYLIBPOSTFIX).lib wxpng$(WX3RDPARTYLIBPOSTFIX).lib wxzlib$(WX3RDPARTYLIBPOSTFIX).lib wxregex$(WXLIBPOSTFIX).lib wxexpat$(WX3RDPARTYLIBPOSTFIX).lib ole2w32.lib odbc32.lib oleacc.lib import32.lib cw32mt.lib,,
  |
  	implib -f ..\..\..\lib\bcc_dll\wxlua $@
***************
*** 439,443 ****
  ..\..\..\lib\bcc_dll\wxbind_dll.dll: $(WXBIND_DLL_OBJECTS)
  	ilink32 -Tpd -q $(LDFLAGS) -L$(BCCDIR)\lib -L$(BCCDIR)\lib\psdk -L$(WX_DIR)$(__WXLIBPATH_FILENAMES) $(__DEBUGINFO)  -L..\..\..\$(__WXLUA_OUTPUT_FOLDER_FILENAMES) @&&|
! 	c0d32.obj $(WXBIND_DLL_OBJECTS),$@,, wxbase$(WX_VERSION)$(WXLIBPOSTFIX).lib wxmsw$(WX_VERSION)$(WXLIBPOSTFIX)_core.lib wxbase$(WX_VERSION)$(WXLIBPOSTFIX)_xml.lib wxmsw$(WX_VERSION)$(WXLIBPOSTFIX)_adv.lib wxtiff$(WX3RDPARTYLIBPOSTFIX).lib wxjpeg$(WX3RDPARTYLIBPOSTFIX).lib wxpng$(WX3RDPARTYLIBPOSTFIX).lib wxzlib$(WX3RDPARTYLIBPOSTFIX).lib wxregex$(WXLIBPOSTFIX).lib wxexpat$(WX3RDPARTYLIBPOSTFIX).lib ole2w32.lib oleacc.lib import32.lib cw32mt.lib,,
  |
  	implib -f ..\..\..\lib\bcc_dll\wxbind $@
--- 439,443 ----
  ..\..\..\lib\bcc_dll\wxbind_dll.dll: $(WXBIND_DLL_OBJECTS)
  	ilink32 -Tpd -q $(LDFLAGS) -L$(BCCDIR)\lib -L$(BCCDIR)\lib\psdk -L$(WX_DIR)$(__WXLIBPATH_FILENAMES) $(__DEBUGINFO)  -L..\..\..\$(__WXLUA_OUTPUT_FOLDER_FILENAMES) @&&|
! 	c0d32.obj $(WXBIND_DLL_OBJECTS),$@,, wxbase$(WX_VERSION)$(WXLIBPOSTFIX).lib wxmsw$(WX_VERSION)$(WXLIBPOSTFIX)_core.lib wxbase$(WX_VERSION)$(WXLIBPOSTFIX)_xml.lib wxmsw$(WX_VERSION)$(WXLIBPOSTFIX)_adv.lib wxtiff$(WX3RDPARTYLIBPOSTFIX).lib wxjpeg$(WX3RDPARTYLIBPOSTFIX).lib wxpng$(WX3RDPARTYLIBPOSTFIX).lib wxzlib$(WX3RDPARTYLIBPOSTFIX).lib wxregex$(WXLIBPOSTFIX).lib wxexpat$(WX3RDPARTYLIBPOSTFIX).lib ole2w32.lib odbc32.lib oleacc.lib import32.lib cw32mt.lib,,
  |
  	implib -f ..\..\..\lib\bcc_dll\wxbind $@
***************
*** 455,459 ****
  ..\..\..\lib\bcc_dll\wxluadebug_dll.dll: $(WXLUADEBUG_DLL_OBJECTS)
  	ilink32 -Tpd -q $(LDFLAGS) -L$(BCCDIR)\lib -L$(BCCDIR)\lib\psdk -L$(WX_DIR)$(__WXLIBPATH_FILENAMES) $(__DEBUGINFO)  -L..\..\..\$(__WXLUA_OUTPUT_FOLDER_FILENAMES) @&&|
! 	c0d32.obj $(WXLUADEBUG_DLL_OBJECTS),$@,, wxbase$(WX_VERSION)$(WXLIBPOSTFIX).lib wxmsw$(WX_VERSION)$(WXLIBPOSTFIX)_core.lib wxbase$(WX_VERSION)$(WXLIBPOSTFIX)_xml.lib wxmsw$(WX_VERSION)$(WXLIBPOSTFIX)_adv.lib wxtiff$(WX3RDPARTYLIBPOSTFIX).lib wxjpeg$(WX3RDPARTYLIBPOSTFIX).lib wxpng$(WX3RDPARTYLIBPOSTFIX).lib wxzlib$(WX3RDPARTYLIBPOSTFIX).lib wxregex$(WXLIBPOSTFIX).lib wxexpat$(WX3RDPARTYLIBPOSTFIX).lib ole2w32.lib oleacc.lib import32.lib cw32mt.lib,,
  |
  	implib -f ..\..\..\lib\bcc_dll\wxluadebug $@
--- 455,459 ----
  ..\..\..\lib\bcc_dll\wxluadebug_dll.dll: $(WXLUADEBUG_DLL_OBJECTS)
  	ilink32 -Tpd -q $(LDFLAGS) -L$(BCCDIR)\lib -L$(BCCDIR)\lib\psdk -L$(WX_DIR)$(__WXLIBPATH_FILENAMES) $(__DEBUGINFO)  -L..\..\..\$(__WXLUA_OUTPUT_FOLDER_FILENAMES) @&&|
! 	c0d32.obj $(WXLUADEBUG_DLL_OBJECTS),$@,, wxbase$(WX_VERSION)$(WXLIBPOSTFIX).lib wxmsw$(WX_VERSION)$(WXLIBPOSTFIX)_core.lib wxbase$(WX_VERSION)$(WXLIBPOSTFIX)_xml.lib wxmsw$(WX_VERSION)$(WXLIBPOSTFIX)_adv.lib wxtiff$(WX3RDPARTYLIBPOSTFIX).lib wxjpeg$(WX3RDPARTYLIBPOSTFIX).lib wxpng$(WX3RDPARTYLIBPOSTFIX).lib wxzlib$(WX3RDPARTYLIBPOSTFIX).lib wxregex$(WXLIBPOSTFIX).lib wxexpat$(WX3RDPARTYLIBPOSTFIX).lib ole2w32.lib odbc32.lib oleacc.lib import32.lib cw32mt.lib,,
  |
  	implib -f ..\..\..\lib\bcc_dll\wxluadebug $@
***************
*** 471,475 ****
  ..\..\..\lib\bcc_dll\wxluasocket_dll.dll: $(WXLUASOCKET_DLL_OBJECTS)
  	ilink32 -Tpd -q $(LDFLAGS) -L$(BCCDIR)\lib -L$(BCCDIR)\lib\psdk -L$(WX_DIR)$(__WXLIBPATH_FILENAMES) $(__DEBUGINFO)  -L..\..\..\$(__WXLUA_OUTPUT_FOLDER_FILENAMES) @&&|
! 	c0d32.obj $(WXLUASOCKET_DLL_OBJECTS),$@,, wxbase$(WX_VERSION)$(WXLIBPOSTFIX).lib wxmsw$(WX_VERSION)$(WXLIBPOSTFIX)_core.lib wxbase$(WX_VERSION)$(WXLIBPOSTFIX)_xml.lib wxmsw$(WX_VERSION)$(WXLIBPOSTFIX)_adv.lib wxtiff$(WX3RDPARTYLIBPOSTFIX).lib wxjpeg$(WX3RDPARTYLIBPOSTFIX).lib wxpng$(WX3RDPARTYLIBPOSTFIX).lib wxzlib$(WX3RDPARTYLIBPOSTFIX).lib wxregex$(WXLIBPOSTFIX).lib wxexpat$(WX3RDPARTYLIBPOSTFIX).lib ole2w32.lib oleacc.lib import32.lib cw32mt.lib,,
  |
  	implib -f ..\..\..\lib\bcc_dll\wxluasocket $@
--- 471,475 ----
  ..\..\..\lib\bcc_dll\wxluasocket_dll.dll: $(WXLUASOCKET_DLL_OBJECTS)
  	ilink32 -Tpd -q $(LDFLAGS) -L$(BCCDIR)\lib -L$(BCCDIR)\lib\psdk -L$(WX_DIR)$(__WXLIBPATH_FILENAMES) $(__DEBUGINFO)  -L..\..\..\$(__WXLUA_OUTPUT_FOLDER_FILENAMES) @&&|
! 	c0d32.obj $(WXLUASOCKET_DLL_OBJECTS),$@,, wxbase$(WX_VERSION)$(WXLIBPOSTFIX).lib wxmsw$(WX_VERSION)$(WXLIBPOSTFIX)_core.lib wxbase$(WX_VERSION)$(WXLIBPOSTFIX)_xml.lib wxmsw$(WX_VERSION)$(WXLIBPOSTFIX)_adv.lib wxtiff$(WX3RDPARTYLIBPOSTFIX).lib wxjpeg$(WX3RDPARTYLIBPOSTFIX).lib wxpng$(WX3RDPARTYLIBPOSTFIX).lib wxzlib$(WX3RDPARTYLIBPOSTFIX).lib wxregex$(WXLIBPOSTFIX).lib wxexpat$(WX3RDPARTYLIBPOSTFIX).lib ole2w32.lib odbc32.lib oleacc.lib import32.lib cw32mt.lib,,
  |
  	implib -f ..\..\..\lib\bcc_dll\wxluasocket $@

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

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

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

Modified Files:
	wxldebug.h 
Log Message:
reorder libs in apps.bkl and rebake, (remove -- in bkl, got error)
pulled in generic code in wxLuaInterface into the wxLuaState


Index: wxldebug.h
===================================================================
RCS file: /cvsroot/wxlua/wxLua/modules/wxluadebug/include/wxldebug.h,v
retrieving revision 1.4
retrieving revision 1.5
diff -C2 -d -r1.4 -r1.5
*** wxldebug.h	29 Nov 2005 05:45:10 -0000	1.4
--- wxldebug.h	29 Nov 2005 23:52:12 -0000	1.5
***************
*** 129,158 ****
      wxLuaDebugData *GetGlobalData();
  
-     lua_State *GetLuaState() const { return m_wxlState.GetLuaState(); }
      wxLuaState GetwxLuaState() const { return m_wxlState; }
  
  private:
!     int         GetStack(int nIndex, lua_Debug *luaDebug);
!     bool        GetInfo(const wxString &opts, lua_Debug *luaDebug);
!     wxString    GetLocal(lua_Debug *luaDebug, int index);
!     void        GetGlobals();
!     int         GetTop();
!     int         Type(int index);
!     double      ToNumber(int index);
!     int         ToBoolean(int index);
!     wxString    ToString(int index);
!     const void *ToPointer(int index);
!     bool        IsCFunction(int index);
!     const void *ToCFunction(int index);
!     const void *ToUserData(int index);
!     int         GetTag(int index);
!     int         GetN(int index);
!     int         Ref();
!     int         GetRef(int ref);
!     void        Pop(int count);
!     void        PushNil();
!     void        PushValue(int index);
!     int         Next(int index);
!     bool        IsLuaTable(int index) const;
  
      wxString GetTableInfo(int index);
--- 129,136 ----
      wxLuaDebugData *GetGlobalData();
  
      wxLuaState GetwxLuaState() const { return m_wxlState; }
  
  private:
!     int Ref();
  
      wxString GetTableInfo(int index);

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

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

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

Modified Files:
	apps_app_wxlua.dsp apps_app_wxluaedit.dsp makefile.bcc 
	makefile.gcc makefile.vc makefile.wat 
Log Message:
reorder libs in apps.bkl and rebake, (remove -- in bkl, got error)
pulled in generic code in wxLuaInterface into the wxLuaState


Index: makefile.bcc
===================================================================
RCS file: /cvsroot/wxlua/wxLua/apps/build/msw/makefile.bcc,v
retrieving revision 1.11
retrieving revision 1.12
diff -C2 -d -r1.11 -r1.12
*** makefile.bcc	25 Nov 2005 23:06:10 -0000	1.11
--- makefile.bcc	29 Nov 2005 23:52:11 -0000	1.12
***************
*** 192,196 ****
  ..\..\..\bin\wxlua.exe: $(APP_WXLUA_OBJECTS)  borland$(WXLIBPOSTFIX)\app_wxlua_wxlua.res
  	ilink32 -Tpe -q $(LDFLAGS) -L$(BCCDIR)\lib -L$(BCCDIR)\lib\psdk -L$(WX_DIR)$(__WXLIBPATH_FILENAMES) $(__DEBUGINFO)  -L..\..\..\$(__WXLUA_OUTPUT_FOLDER_FILENAMES) -aa @&&|
! 	c0w32.obj $(APP_WXLUA_OBJECTS),$@,, wxluadebug.lib wxluasocket.lib wxlua.lib wxbind.lib lua.lib wxmsw$(WX_VERSION)$(WXLIBPOSTFIX)_adv.lib wxbase$(WX_VERSION)$(WXLIBPOSTFIX).lib wxmsw$(WX_VERSION)$(WXLIBPOSTFIX)_core.lib wxmsw$(WX_VERSION)$(WXLIBPOSTFIX)_html.lib wxmsw$(WX_VERSION)$(WXLIBPOSTFIX)_media.lib wxbase$(WX_VERSION)$(WXLIBPOSTFIX)_net.lib wxbase$(WX_VERSION)$(WXLIBPOSTFIX)_xml.lib wxmsw$(WX_VERSION)$(WXLIBPOSTFIX)_xrc.lib wxmsw$(WX_VERSION)$(WXLIBPOSTFIX)_stc.lib wxtiff$(WX3RDPARTYLIBPOSTFIX).lib wxjpeg$(WX3RDPARTYLIBPOSTFIX).lib wxpng$(WX3RDPARTYLIBPOSTFIX).lib wxzlib$(WX3RDPARTYLIBPOSTFIX).lib wxregex$(WXLIBPOSTFIX).lib wxexpat$(WX3RDPARTYLIBPOSTFIX).lib ole2w32.lib oleacc.lib import32.lib cw32mt.lib,, borland$(WXLIBPOSTFIX)\app_wxlua_wxlua.res
  |
  !endif
--- 192,196 ----
  ..\..\..\bin\wxlua.exe: $(APP_WXLUA_OBJECTS)  borland$(WXLIBPOSTFIX)\app_wxlua_wxlua.res
  	ilink32 -Tpe -q $(LDFLAGS) -L$(BCCDIR)\lib -L$(BCCDIR)\lib\psdk -L$(WX_DIR)$(__WXLIBPATH_FILENAMES) $(__DEBUGINFO)  -L..\..\..\$(__WXLUA_OUTPUT_FOLDER_FILENAMES) -aa @&&|
! 	c0w32.obj $(APP_WXLUA_OBJECTS),$@,, wxluasocket.lib wxluadebug.lib wxbind.lib wxlua.lib lua.lib wxmsw$(WX_VERSION)$(WXLIBPOSTFIX)_stc.lib wxmsw$(WX_VERSION)$(WXLIBPOSTFIX)_xrc.lib wxmsw$(WX_VERSION)$(WXLIBPOSTFIX)_html.lib wxmsw$(WX_VERSION)$(WXLIBPOSTFIX)_media.lib wxmsw$(WX_VERSION)$(WXLIBPOSTFIX)_adv.lib wxbase$(WX_VERSION)$(WXLIBPOSTFIX)_net.lib wxbase$(WX_VERSION)$(WXLIBPOSTFIX)_xml.lib wxmsw$(WX_VERSION)$(WXLIBPOSTFIX)_core.lib wxbase$(WX_VERSION)$(WXLIBPOSTFIX).lib wxtiff$(WX3RDPARTYLIBPOSTFIX).lib wxjpeg$(WX3RDPARTYLIBPOSTFIX).lib wxpng$(WX3RDPARTYLIBPOSTFIX).lib wxzlib$(WX3RDPARTYLIBPOSTFIX).lib wxregex$(WXLIBPOSTFIX).lib wxexpat$(WX3RDPARTYLIBPOSTFIX).lib ole2w32.lib odbc32.lib oleacc.lib import32.lib cw32mt.lib,, borland$(WXLIBPOSTFIX)\app_wxlua_wxlua.res
  |
  !endif
***************
*** 199,203 ****
  ..\..\..\bin\wxluaedit.exe: $(APP_WXLUAEDIT_OBJECTS)  borland$(WXLIBPOSTFIX)\app_wxluaedit_wxluaedit.res
  	ilink32 -Tpe -q $(LDFLAGS) -L$(BCCDIR)\lib -L$(BCCDIR)\lib\psdk -L$(WX_DIR)$(__WXLIBPATH_FILENAMES) $(__DEBUGINFO)  -L..\..\..\$(__WXLUA_OUTPUT_FOLDER_FILENAMES) -aa @&&|
! 	c0w32.obj $(APP_WXLUAEDIT_OBJECTS),$@,, wxluadebug.lib wxluasocket.lib wxlua.lib wxbind.lib lua.lib wxmsw$(WX_VERSION)$(WXLIBPOSTFIX)_adv.lib wxbase$(WX_VERSION)$(WXLIBPOSTFIX).lib wxmsw$(WX_VERSION)$(WXLIBPOSTFIX)_core.lib wxmsw$(WX_VERSION)$(WXLIBPOSTFIX)_html.lib wxmsw$(WX_VERSION)$(WXLIBPOSTFIX)_media.lib wxbase$(WX_VERSION)$(WXLIBPOSTFIX)_net.lib wxbase$(WX_VERSION)$(WXLIBPOSTFIX)_xml.lib wxmsw$(WX_VERSION)$(WXLIBPOSTFIX)_xrc.lib wxmsw$(WX_VERSION)$(WXLIBPOSTFIX)_stc.lib wxmsw$(WX_VERSION)$(WXLIBPOSTFIX)_stedit.lib wxtiff$(WX3RDPARTYLIBPOSTFIX).lib wxjpeg$(WX3RDPARTYLIBPOSTFIX).lib wxpng$(WX3RDPARTYLIBPOSTFIX).lib wxzlib$(WX3RDPARTYLIBPOSTFIX).lib wxregex$(WXLIBPOSTFIX).lib wxexpat$(WX3RDPARTYLIBPOSTFIX).lib ole2w32.lib oleacc.lib import32.lib cw32mt.lib,, borland$(WXLIBPOSTFIX)\app_wxluaedit_wxluaedit.res
  |
  !endif
--- 199,203 ----
  ..\..\..\bin\wxluaedit.exe: $(APP_WXLUAEDIT_OBJECTS)  borland$(WXLIBPOSTFIX)\app_wxluaedit_wxluaedit.res
  	ilink32 -Tpe -q $(LDFLAGS) -L$(BCCDIR)\lib -L$(BCCDIR)\lib\psdk -L$(WX_DIR)$(__WXLIBPATH_FILENAMES) $(__DEBUGINFO)  -L..\..\..\$(__WXLUA_OUTPUT_FOLDER_FILENAMES) -aa @&&|
! 	c0w32.obj $(APP_WXLUAEDIT_OBJECTS),$@,, wxluasocket.lib wxluadebug.lib wxbind.lib wxlua.lib lua.lib wxmsw$(WX_VERSION)$(WXLIBPOSTFIX)_stedit.lib wxmsw$(WX_VERSION)$(WXLIBPOSTFIX)_stc.lib wxmsw$(WX_VERSION)$(WXLIBPOSTFIX)_xrc.lib wxmsw$(WX_VERSION)$(WXLIBPOSTFIX)_html.lib wxmsw$(WX_VERSION)$(WXLIBPOSTFIX)_media.lib wxmsw$(WX_VERSION)$(WXLIBPOSTFIX)_adv.lib wxbase$(WX_VERSION)$(WXLIBPOSTFIX)_net.lib wxbase$(WX_VERSION)$(WXLIBPOSTFIX)_xml.lib wxmsw$(WX_VERSION)$(WXLIBPOSTFIX)_core.lib wxbase$(WX_VERSION)$(WXLIBPOSTFIX).lib wxtiff$(WX3RDPARTYLIBPOSTFIX).lib wxjpeg$(WX3RDPARTYLIBPOSTFIX).lib wxpng$(WX3RDPARTYLIBPOSTFIX).lib wxzlib$(WX3RDPARTYLIBPOSTFIX).lib wxregex$(WXLIBPOSTFIX).lib wxexpat$(WX3RDPARTYLIBPOSTFIX).lib ole2w32.lib odbc32.lib oleacc.lib import32.lib cw32mt.lib,, borland$(WXLIBPOSTFIX)\app_wxluaedit_wxluaedit.res
  |
  !endif

Index: apps_app_wxlua.dsp
===================================================================
RCS file: /cvsroot/wxlua/wxLua/apps/build/msw/apps_app_wxlua.dsp,v
retrieving revision 1.1
retrieving revision 1.2
diff -C2 -d -r1.1 -r1.2
*** apps_app_wxlua.dsp	25 Nov 2005 23:08:13 -0000	1.1
--- apps_app_wxlua.dsp	29 Nov 2005 23:52:11 -0000	1.2
***************
*** 58,63 ****
  # ADD BSC32 /nologo
  LINK32=link.exe
! # ADD BASE LINK32 wxluadebug.lib wxluasocket.lib wxlua.lib wxbind.lib lua.lib wxmsw26ud_adv.lib wxbase26ud.lib wxmsw26ud_core.lib wxmsw26ud_html.lib wxmsw26ud_media.lib wxbase26ud_net.lib wxbase26ud_xml.lib wxmsw26ud_xrc.lib wxmsw26ud_stc.lib wxtiffd.lib wxjpegd.lib wxpngd.lib wxzlibd.lib wxregexud.lib wxexpatd.lib kernel32.lib user32.lib gdi32.lib comdlg32.lib winspool.lib winmm.lib shell32.lib comctl32.lib ole32.lib oleaut32.lib uuid.lib rpcrt4.lib advapi32.lib wsock32.lib odbc32.lib oleacc.lib /nologo /machine:i386 /out:"..\..\..\bin\wxlua.exe" /libpath:"$(WXWIN)\lib\vc_dll" /libpath:"..\..\..\lib\vc_dll" /subsystem:windows /debug
! # ADD LINK32 wxluadebug.lib wxluasocket.lib wxlua.lib wxbind.lib lua.lib wxmsw26ud_adv.lib wxbase26ud.lib wxmsw26ud_core.lib wxmsw26ud_html.lib wxmsw26ud_media.lib wxbase26ud_net.lib wxbase26ud_xml.lib wxmsw26ud_xrc.lib wxmsw26ud_stc.lib wxtiffd.lib wxjpegd.lib wxpngd.lib wxzlibd.lib wxregexud.lib wxexpatd.lib kernel32.lib user32.lib gdi32.lib comdlg32.lib winspool.lib winmm.lib shell32.lib comctl32.lib ole32.lib oleaut32.lib uuid.lib rpcrt4.lib advapi32.lib wsock32.lib odbc32.lib oleacc.lib /nologo /machine:i386 /out:"..\..\..\bin\wxlua.exe" /libpath:"$(WXWIN)\lib\vc_dll" /libpath:"..\..\..\lib\vc_dll" /subsystem:windows /debug
  
  !ELSEIF  "$(CFG)" == "app_wxlua - Win32 DLL Unicode Release"
--- 58,63 ----
  # ADD BSC32 /nologo
  LINK32=link.exe
! # ADD BASE LINK32 wxluasocket.lib wxluadebug.lib wxbind.lib wxlua.lib lua.lib wxmsw26ud_stc.lib wxmsw26ud_xrc.lib wxmsw26ud_html.lib wxmsw26ud_media.lib wxmsw26ud_adv.lib wxbase26ud_net.lib wxbase26ud_xml.lib wxmsw26ud_core.lib wxbase26ud.lib wxtiffd.lib wxjpegd.lib wxpngd.lib wxzlibd.lib wxregexud.lib wxexpatd.lib kernel32.lib user32.lib gdi32.lib comdlg32.lib winspool.lib winmm.lib shell32.lib comctl32.lib ole32.lib oleaut32.lib uuid.lib rpcrt4.lib advapi32.lib wsock32.lib odbc32.lib oleacc.lib /nologo /machine:i386 /out:"..\..\..\bin\wxlua.exe" /libpath:"$(WXWIN)\lib\vc_dll" /libpath:"..\..\..\lib\vc_dll" /subsystem:windows /debug
! # ADD LINK32 wxluasocket.lib wxluadebug.lib wxbind.lib wxlua.lib lua.lib wxmsw26ud_stc.lib wxmsw26ud_xrc.lib wxmsw26ud_html.lib wxmsw26ud_media.lib wxmsw26ud_adv.lib wxbase26ud_net.lib wxbase26ud_xml.lib wxmsw26ud_core.lib wxbase26ud.lib wxtiffd.lib wxjpegd.lib wxpngd.lib wxzlibd.lib wxregexud.lib wxexpatd.lib kernel32.lib user32.lib gdi32.lib comdlg32.lib winspool.lib winmm.lib shell32.lib comctl32.lib ole32.lib oleaut32.lib uuid.lib rpcrt4.lib advapi32.lib wsock32.lib odbc32.lib oleacc.lib /nologo /machine:i386 /out:"..\..\..\bin\wxlua.exe" /libpath:"$(WXWIN)\lib\vc_dll" /libpath:"..\..\..\lib\vc_dll" /subsystem:windows /debug
  
  !ELSEIF  "$(CFG)" == "app_wxlua - Win32 DLL Unicode Release"
***************
*** 83,88 ****
  # ADD BSC32 /nologo
  LINK32=link.exe
! # ADD BASE LINK32 wxluadebug.lib wxluasocket.lib wxlua.lib wxbind.lib lua.lib wxmsw26u_adv.lib wxbase26u.lib wxmsw26u_core.lib wxmsw26u_html.lib wxmsw26u_media.lib wxbase26u_net.lib wxbase26u_xml.lib wxmsw26u_xrc.lib wxmsw26u_stc.lib wxtiff.lib wxjpeg.lib wxpng.lib wxzlib.lib wxregexu.lib wxexpat.lib kernel32.lib user32.lib gdi32.lib comdlg32.lib winspool.lib winmm.lib shell32.lib comctl32.lib ole32.lib oleaut32.lib uuid.lib rpcrt4.lib advapi32.lib wsock32.lib odbc32.lib oleacc.lib /nologo /machine:i386 /out:"..\..\..\bin\wxlua.exe" /libpath:"$(WXWIN)\lib\vc_dll" /libpath:"..\..\..\lib\vc_dll" /subsystem:windows
! # ADD LINK32 wxluadebug.lib wxluasocket.lib wxlua.lib wxbind.lib lua.lib wxmsw26u_adv.lib wxbase26u.lib wxmsw26u_core.lib wxmsw26u_html.lib wxmsw26u_media.lib wxbase26u_net.lib wxbase26u_xml.lib wxmsw26u_xrc.lib wxmsw26u_stc.lib wxtiff.lib wxjpeg.lib wxpng.lib wxzlib.lib wxregexu.lib wxexpat.lib kernel32.lib user32.lib gdi32.lib comdlg32.lib winspool.lib winmm.lib shell32.lib comctl32.lib ole32.lib oleaut32.lib uuid.lib rpcrt4.lib advapi32.lib wsock32.lib odbc32.lib oleacc.lib /nologo /machine:i386 /out:"..\..\..\bin\wxlua.exe" /libpath:"$(WXWIN)\lib\vc_dll" /libpath:"..\..\..\lib\vc_dll" /subsystem:windows
  
  !ELSEIF  "$(CFG)" == "app_wxlua - Win32 DLL Debug"
--- 83,88 ----
  # ADD BSC32 /nologo
  LINK32=link.exe
! # ADD BASE LINK32 wxluasocket.lib wxluadebug.lib wxbind.lib wxlua.lib lua.lib wxmsw26u_stc.lib wxmsw26u_xrc.lib wxmsw26u_html.lib wxmsw26u_media.lib wxmsw26u_adv.lib wxbase26u_net.lib wxbase26u_xml.lib wxmsw26u_core.lib wxbase26u.lib wxtiff.lib wxjpeg.lib wxpng.lib wxzlib.lib wxregexu.lib wxexpat.lib kernel32.lib user32.lib gdi32.lib comdlg32.lib winspool.lib winmm.lib shell32.lib comctl32.lib ole32.lib oleaut32.lib uuid.lib rpcrt4.lib advapi32.lib wsock32.lib odbc32.lib oleacc.lib /nologo /machine:i386 /out:"..\..\..\bin\wxlua.exe" /libpath:"$(WXWIN)\lib\vc_dll" /libpath:"..\..\..\lib\vc_dll" /subsystem:windows
! # ADD LINK32 wxluasocket.lib wxluadebug.lib wxbind.lib wxlua.lib lua.lib wxmsw26u_stc.lib wxmsw26u_xrc.lib wxmsw26u_html.lib wxmsw26u_media.lib wxmsw26u_adv.lib wxbase26u_net.lib wxbase26u_xml.lib wxmsw26u_core.lib wxbase26u.lib wxtiff.lib wxjpeg.lib wxpng.lib wxzlib.lib wxregexu.lib wxexpat.lib kernel32.lib user32.lib gdi32.lib comdlg32.lib winspool.lib winmm.lib shell32.lib comctl32.lib ole32.lib oleaut32.lib uuid.lib rpcrt4.lib advapi32.lib wsock32.lib odbc32.lib oleacc.lib /nologo /machine:i386 /out:"..\..\..\bin\wxlua.exe" /libpath:"$(WXWIN)\lib\vc_dll" /libpath:"..\..\..\lib\vc_dll" /subsystem:windows
  
  !ELSEIF  "$(CFG)" == "app_wxlua - Win32 DLL Debug"
***************
*** 108,113 ****
  # ADD BSC32 /nologo
  LINK32=link.exe
! # ADD BASE LINK32 wxluadebug.lib wxluasocket.lib wxlua.lib wxbind.lib lua.lib wxmsw26d_adv.lib wxbase26d.lib wxmsw26d_core.lib wxmsw26d_html.lib wxmsw26d_media.lib wxbase26d_net.lib wxbase26d_xml.lib wxmsw26d_xrc.lib wxmsw26d_stc.lib wxtiffd.lib wxjpegd.lib wxpngd.lib wxzlibd.lib wxregexd.lib wxexpatd.lib kernel32.lib user32.lib gdi32.lib comdlg32.lib winspool.lib winmm.lib shell32.lib comctl32.lib ole32.lib oleaut32.lib uuid.lib rpcrt4.lib advapi32.lib wsock32.lib odbc32.lib oleacc.lib /nologo /machine:i386 /out:"..\..\..\bin\wxlua.exe" /libpath:"$(WXWIN)\lib\vc_dll" /libpath:"..\..\..\lib\vc_dll" /subsystem:windows /debug
! # ADD LINK32 wxluadebug.lib wxluasocket.lib wxlua.lib wxbind.lib lua.lib wxmsw26d_adv.lib wxbase26d.lib wxmsw26d_core.lib wxmsw26d_html.lib wxmsw26d_media.lib wxbase26d_net.lib wxbase26d_xml.lib wxmsw26d_xrc.lib wxmsw26d_stc.lib wxtiffd.lib wxjpegd.lib wxpngd.lib wxzlibd.lib wxregexd.lib wxexpatd.lib kernel32.lib user32.lib gdi32.lib comdlg32.lib winspool.lib winmm.lib shell32.lib comctl32.lib ole32.lib oleaut32.lib uuid.lib rpcrt4.lib advapi32.lib wsock32.lib odbc32.lib oleacc.lib /nologo /machine:i386 /out:"..\..\..\bin\wxlua.exe" /libpath:"$(WXWIN)\lib\vc_dll" /libpath:"..\..\..\lib\vc_dll" /subsystem:windows /debug
  
  !ELSEIF  "$(CFG)" == "app_wxlua - Win32 DLL Release"
--- 108,113 ----
  # ADD BSC32 /nologo
  LINK32=link.exe
! # ADD BASE LINK32 wxluasocket.lib wxluadebug.lib wxbind.lib wxlua.lib lua.lib wxmsw26d_stc.lib wxmsw26d_xrc.lib wxmsw26d_html.lib wxmsw26d_media.lib wxmsw26d_adv.lib wxbase26d_net.lib wxbase26d_xml.lib wxmsw26d_core.lib wxbase26d.lib wxtiffd.lib wxjpegd.lib wxpngd.lib wxzlibd.lib wxregexd.lib wxexpatd.lib kernel32.lib user32.lib gdi32.lib comdlg32.lib winspool.lib winmm.lib shell32.lib comctl32.lib ole32.lib oleaut32.lib uuid.lib rpcrt4.lib advapi32.lib wsock32.lib odbc32.lib oleacc.lib /nologo /machine:i386 /out:"..\..\..\bin\wxlua.exe" /libpath:"$(WXWIN)\lib\vc_dll" /libpath:"..\..\..\lib\vc_dll" /subsystem:windows /debug
! # ADD LINK32 wxluasocket.lib wxluadebug.lib wxbind.lib wxlua.lib lua.lib wxmsw26d_stc.lib wxmsw26d_xrc.lib wxmsw26d_html.lib wxmsw26d_media.lib wxmsw26d_adv.lib wxbase26d_net.lib wxbase26d_xml.lib wxmsw26d_core.lib wxbase26d.lib wxtiffd.lib wxjpegd.lib wxpngd.lib wxzlibd.lib wxregexd.lib wxexpatd.lib kernel32.lib user32.lib gdi32.lib comdlg32.lib winspool.lib winmm.lib shell32.lib comctl32.lib ole32.lib oleaut32.lib uuid.lib rpcrt4.lib advapi32.lib wsock32.lib odbc32.lib oleacc.lib /nologo /machine:i386 /out:"..\..\..\bin\wxlua.exe" /libpath:"$(WXWIN)\lib\vc_dll" /libpath:"..\..\..\lib\vc_dll" /subsystem:windows /debug
  
  !ELSEIF  "$(CFG)" == "app_wxlua - Win32 DLL Release"
***************
*** 133,138 ****
  # ADD BSC32 /nologo
  LINK32=link.exe
! # ADD BASE LINK32 wxluadebug.lib wxluasocket.lib wxlua.lib wxbind.lib lua.lib wxmsw26_adv.lib wxbase26.lib wxmsw26_core.lib wxmsw26_html.lib wxmsw26_media.lib wxbase26_net.lib wxbase26_xml.lib wxmsw26_xrc.lib wxmsw26_stc.lib wxtiff.lib wxjpeg.lib wxpng.lib wxzlib.lib wxregex.lib wxexpat.lib kernel32.lib user32.lib gdi32.lib comdlg32.lib winspool.lib winmm.lib shell32.lib comctl32.lib ole32.lib oleaut32.lib uuid.lib rpcrt4.lib advapi32.lib wsock32.lib odbc32.lib oleacc.lib /nologo /machine:i386 /out:"..\..\..\bin\wxlua.exe" /libpath:"$(WXWIN)\lib\vc_dll" /libpath:"..\..\..\lib\vc_dll" /subsystem:windows
! # ADD LINK32 wxluadebug.lib wxluasocket.lib wxlua.lib wxbind.lib lua.lib wxmsw26_adv.lib wxbase26.lib wxmsw26_core.lib wxmsw26_html.lib wxmsw26_media.lib wxbase26_net.lib wxbase26_xml.lib wxmsw26_xrc.lib wxmsw26_stc.lib wxtiff.lib wxjpeg.lib wxpng.lib wxzlib.lib wxregex.lib wxexpat.lib kernel32.lib user32.lib gdi32.lib comdlg32.lib winspool.lib winmm.lib shell32.lib comctl32.lib ole32.lib oleaut32.lib uuid.lib rpcrt4.lib advapi32.lib wsock32.lib odbc32.lib oleacc.lib /nologo /machine:i386 /out:"..\..\..\bin\wxlua.exe" /libpath:"$(WXWIN)\lib\vc_dll" /libpath:"..\..\..\lib\vc_dll" /subsystem:windows
  
  !ELSEIF  "$(CFG)" == "app_wxlua - Win32 Unicode Debug"
--- 133,138 ----
  # ADD BSC32 /nologo
  LINK32=link.exe
! # ADD BASE LINK32 wxluasocket.lib wxluadebug.lib wxbind.lib wxlua.lib lua.lib wxmsw26_stc.lib wxmsw26_xrc.lib wxmsw26_html.lib wxmsw26_media.lib wxmsw26_adv.lib wxbase26_net.lib wxbase26_xml.lib wxmsw26_core.lib wxbase26.lib wxtiff.lib wxjpeg.lib wxpng.lib wxzlib.lib wxregex.lib wxexpat.lib kernel32.lib user32.lib gdi32.lib comdlg32.lib winspool.lib winmm.lib shell32.lib comctl32.lib ole32.lib oleaut32.lib uuid.lib rpcrt4.lib advapi32.lib wsock32.lib odbc32.lib oleacc.lib /nologo /machine:i386 /out:"..\..\..\bin\wxlua.exe" /libpath:"$(WXWIN)\lib\vc_dll" /libpath:"..\..\..\lib\vc_dll" /subsystem:windows
! # ADD LINK32 wxluasocket.lib wxluadebug.lib wxbind.lib wxlua.lib lua.lib wxmsw26_stc.lib wxmsw26_xrc.lib wxmsw26_html.lib wxmsw26_media.lib wxmsw26_adv.lib wxbase26_net.lib wxbase26_xml.lib wxmsw26_core.lib wxbase26.lib wxtiff.lib wxjpeg.lib wxpng.lib wxzlib.lib wxregex.lib wxexpat.lib kernel32.lib user32.lib gdi32.lib comdlg32.lib winspool.lib winmm.lib shell32.lib comctl32.lib ole32.lib oleaut32.lib uuid.lib rpcrt4.lib advapi32.lib wsock32.lib odbc32.lib oleacc.lib /nologo /machine:i386 /out:"..\..\..\bin\wxlua.exe" /libpath:"$(WXWIN)\lib\vc_dll" /libpath:"..\..\..\lib\vc_dll" /subsystem:windows
  
  !ELSEIF  "$(CFG)" == "app_wxlua - Win32 Unicode Debug"
***************
*** 158,163 ****
  # ADD BSC32 /nologo
  LINK32=link.exe
! # ADD BASE LINK32 wxluadebug.lib wxluasocket.lib wxlua.lib wxbind.lib lua.lib wxmsw26ud_adv.lib wxbase26ud.lib wxmsw26ud_core.lib wxmsw26ud_html.lib wxmsw26ud_media.lib wxbase26ud_net.lib wxbase26ud_xml.lib wxmsw26ud_xrc.lib wxmsw26ud_stc.lib wxtiffd.lib wxjpegd.lib wxpngd.lib wxzlibd.lib wxregexud.lib wxexpatd.lib kernel32.lib user32.lib gdi32.lib comdlg32.lib winspool.lib winmm.lib shell32.lib comctl32.lib ole32.lib oleaut32.lib uuid.lib rpcrt4.lib advapi32.lib wsock32.lib odbc32.lib oleacc.lib /nologo /machine:i386 /out:"..\..\..\bin\wxlua.exe" /libpath:"$(WXWIN)\lib\vc_lib" /libpath:"..\..\..\lib\vc_lib" /subsystem:windows /debug
! # ADD LINK32 wxluadebug.lib wxluasocket.lib wxlua.lib wxbind.lib lua.lib wxmsw26ud_adv.lib wxbase26ud.lib wxmsw26ud_core.lib wxmsw26ud_html.lib wxmsw26ud_media.lib wxbase26ud_net.lib wxbase26ud_xml.lib wxmsw26ud_xrc.lib wxmsw26ud_stc.lib wxtiffd.lib wxjpegd.lib wxpngd.lib wxzlibd.lib wxregexud.lib wxexpatd.lib kernel32.lib user32.lib gdi32.lib comdlg32.lib winspool.lib winmm.lib shell32.lib comctl32.lib ole32.lib oleaut32.lib uuid.lib rpcrt4.lib advapi32.lib wsock32.lib odbc32.lib oleacc.lib /nologo /machine:i386 /out:"..\..\..\bin\wxlua.exe" /libpath:"$(WXWIN)\lib\vc_lib" /libpath:"..\..\..\lib\vc_lib" /subsystem:windows /debug
  
  !ELSEIF  "$(CFG)" == "app_wxlua - Win32 Unicode Release"
--- 158,163 ----
  # ADD BSC32 /nologo
  LINK32=link.exe
! # ADD BASE LINK32 wxluasocket.lib wxluadebug.lib wxbind.lib wxlua.lib lua.lib wxmsw26ud_stc.lib wxmsw26ud_xrc.lib wxmsw26ud_html.lib wxmsw26ud_media.lib wxmsw26ud_adv.lib wxbase26ud_net.lib wxbase26ud_xml.lib wxmsw26ud_core.lib wxbase26ud.lib wxtiffd.lib wxjpegd.lib wxpngd.lib wxzlibd.lib wxregexud.lib wxexpatd.lib kernel32.lib user32.lib gdi32.lib comdlg32.lib winspool.lib winmm.lib shell32.lib comctl32.lib ole32.lib oleaut32.lib uuid.lib rpcrt4.lib advapi32.lib wsock32.lib odbc32.lib oleacc.lib /nologo /machine:i386 /out:"..\..\..\bin\wxlua.exe" /libpath:"$(WXWIN)\lib\vc_lib" /libpath:"..\..\..\lib\vc_lib" /subsystem:windows /debug
! # ADD LINK32 wxluasocket.lib wxluadebug.lib wxbind.lib wxlua.lib lua.lib wxmsw26ud_stc.lib wxmsw26ud_xrc.lib wxmsw26ud_html.lib wxmsw26ud_media.lib wxmsw26ud_adv.lib wxbase26ud_net.lib wxbase26ud_xml.lib wxmsw26ud_core.lib wxbase26ud.lib wxtiffd.lib wxjpegd.lib wxpngd.lib wxzlibd.lib wxregexud.lib wxexpatd.lib kernel32.lib user32.lib gdi32.lib comdlg32.lib winspool.lib winmm.lib shell32.lib comctl32.lib ole32.lib oleaut32.lib uuid.lib rpcrt4.lib advapi32.lib wsock32.lib odbc32.lib oleacc.lib /nologo /machine:i386 /out:"..\..\..\bin\wxlua.exe" /libpath:"$(WXWIN)\lib\vc_lib" /libpath:"..\..\..\lib\vc_lib" /subsystem:windows /debug
  
  !ELSEIF  "$(CFG)" == "app_wxlua - Win32 Unicode Release"
***************
*** 183,188 ****
  # ADD BSC32 /nologo
  LINK32=link.exe
! # ADD BASE LINK32 wxluadebug.lib wxluasocket.lib wxlua.lib wxbind.lib lua.lib wxmsw26u_adv.lib wxbase26u.lib wxmsw26u_core.lib wxmsw26u_html.lib wxmsw26u_media.lib wxbase26u_net.lib wxbase26u_xml.lib wxmsw26u_xrc.lib wxmsw26u_stc.lib wxtiff.lib wxjpeg.lib wxpng.lib wxzlib.lib wxregexu.lib wxexpat.lib kernel32.lib user32.lib gdi32.lib comdlg32.lib winspool.lib winmm.lib shell32.lib comctl32.lib ole32.lib oleaut32.lib uuid.lib rpcrt4.lib advapi32.lib wsock32.lib odbc32.lib oleacc.lib /nologo /machine:i386 /out:"..\..\..\bin\wxlua.exe" /libpath:"$(WXWIN)\lib\vc_lib" /libpath:"..\..\..\lib\vc_lib" /subsystem:windows
! # ADD LINK32 wxluadebug.lib wxluasocket.lib wxlua.lib wxbind.lib lua.lib wxmsw26u_adv.lib wxbase26u.lib wxmsw26u_core.lib wxmsw26u_html.lib wxmsw26u_media.lib wxbase26u_net.lib wxbase26u_xml.lib wxmsw26u_xrc.lib wxmsw26u_stc.lib wxtiff.lib wxjpeg.lib wxpng.lib wxzlib.lib wxregexu.lib wxexpat.lib kernel32.lib user32.lib gdi32.lib comdlg32.lib winspool.lib winmm.lib shell32.lib comctl32.lib ole32.lib oleaut32.lib uuid.lib rpcrt4.lib advapi32.lib wsock32.lib odbc32.lib oleacc.lib /nologo /machine:i386 /out:"..\..\..\bin\wxlua.exe" /libpath:"$(WXWIN)\lib\vc_lib" /libpath:"..\..\..\lib\vc_lib" /subsystem:windows
  
  !ELSEIF  "$(CFG)" == "app_wxlua - Win32 Debug"
--- 183,188 ----
  # ADD BSC32 /nologo
  LINK32=link.exe
! # ADD BASE LINK32 wxluasocket.lib wxluadebug.lib wxbind.lib wxlua.lib lua.lib wxmsw26u_stc.lib wxmsw26u_xrc.lib wxmsw26u_html.lib wxmsw26u_media.lib wxmsw26u_adv.lib wxbase26u_net.lib wxbase26u_xml.lib wxmsw26u_core.lib wxbase26u.lib wxtiff.lib wxjpeg.lib wxpng.lib wxzlib.lib wxregexu.lib wxexpat.lib kernel32.lib user32.lib gdi32.lib comdlg32.lib winspool.lib winmm.lib shell32.lib comctl32.lib ole32.lib oleaut32.lib uuid.lib rpcrt4.lib advapi32.lib wsock32.lib odbc32.lib oleacc.lib /nologo /machine:i386 /out:"..\..\..\bin\wxlua.exe" /libpath:"$(WXWIN)\lib\vc_lib" /libpath:"..\..\..\lib\vc_lib" /subsystem:windows
! # ADD LINK32 wxluasocket.lib wxluadebug.lib wxbind.lib wxlua.lib lua.lib wxmsw26u_stc.lib wxmsw26u_xrc.lib wxmsw26u_html.lib wxmsw26u_media.lib wxmsw26u_adv.lib wxbase26u_net.lib wxbase26u_xml.lib wxmsw26u_core.lib wxbase26u.lib wxtiff.lib wxjpeg.lib wxpng.lib wxzlib.lib wxregexu.lib wxexpat.lib kernel32.lib user32.lib gdi32.lib comdlg32.lib winspool.lib winmm.lib shell32.lib comctl32.lib ole32.lib oleaut32.lib uuid.lib rpcrt4.lib advapi32.lib wsock32.lib odbc32.lib oleacc.lib /nologo /machine:i386 /out:"..\..\..\bin\wxlua.exe" /libpath:"$(WXWIN)\lib\vc_lib" /libpath:"..\..\..\lib\vc_lib" /subsystem:windows
  
  !ELSEIF  "$(CFG)" == "app_wxlua - Win32 Debug"
***************
*** 208,213 ****
  # ADD BSC32 /nologo
  LINK32=link.exe
! # ADD BASE LINK32 wxluadebug.lib wxluasocket.lib wxlua.lib wxbind.lib lua.lib wxmsw26d_adv.lib wxbase26d.lib wxmsw26d_core.lib wxmsw26d_html.lib wxmsw26d_media.lib wxbase26d_net.lib wxbase26d_xml.lib wxmsw26d_xrc.lib wxmsw26d_stc.lib wxtiffd.lib wxjpegd.lib wxpngd.lib wxzlibd.lib wxregexd.lib wxexpatd.lib kernel32.lib user32.lib gdi32.lib comdlg32.lib winspool.lib winmm.lib shell32.lib comctl32.lib ole32.lib oleaut32.lib uuid.lib rpcrt4.lib advapi32.lib wsock32.lib odbc32.lib oleacc.lib /nologo /machine:i386 /out:"..\..\..\bin\wxlua.exe" /libpath:"$(WXWIN)\lib\vc_lib" /libpath:"..\..\..\lib\vc_lib" /subsystem:windows /debug
! # ADD LINK32 wxluadebug.lib wxluasocket.lib wxlua.lib wxbind.lib lua.lib wxmsw26d_adv.lib wxbase26d.lib wxmsw26d_core.lib wxmsw26d_html.lib wxmsw26d_media.lib wxbase26d_net.lib wxbase26d_xml.lib wxmsw26d_xrc.lib wxmsw26d_stc.lib wxtiffd.lib wxjpegd.lib wxpngd.lib wxzlibd.lib wxregexd.lib wxexpatd.lib kernel32.lib user32.lib gdi32.lib comdlg32.lib winspool.lib winmm.lib shell32.lib comctl32.lib ole32.lib oleaut32.lib uuid.lib rpcrt4.lib advapi32.lib wsock32.lib odbc32.lib oleacc.lib /nologo /machine:i386 /out:"..\..\..\bin\wxlua.exe" /libpath:"$(WXWIN)\lib\vc_lib" /libpath:"..\..\..\lib\vc_lib" /subsystem:windows /debug
  
  !ELSEIF  "$(CFG)" == "app_wxlua - Win32 Release"
--- 208,213 ----
  # ADD BSC32 /nologo
  LINK32=link.exe
! # ADD BASE LINK32 wxluasocket.lib wxluadebug.lib wxbind.lib wxlua.lib lua.lib wxmsw26d_stc.lib wxmsw26d_xrc.lib wxmsw26d_html.lib wxmsw26d_media.lib wxmsw26d_adv.lib wxbase26d_net.lib wxbase26d_xml.lib wxmsw26d_core.lib wxbase26d.lib wxtiffd.lib wxjpegd.lib wxpngd.lib wxzlibd.lib wxregexd.lib wxexpatd.lib kernel32.lib user32.lib gdi32.lib comdlg32.lib winspool.lib winmm.lib shell32.lib comctl32.lib ole32.lib oleaut32.lib uuid.lib rpcrt4.lib advapi32.lib wsock32.lib odbc32.lib oleacc.lib /nologo /machine:i386 /out:"..\..\..\bin\wxlua.exe" /libpath:"$(WXWIN)\lib\vc_lib" /libpath:"..\..\..\lib\vc_lib" /subsystem:windows /debug
! # ADD LINK32 wxluasocket.lib wxluadebug.lib wxbind.lib wxlua.lib lua.lib wxmsw26d_stc.lib wxmsw26d_xrc.lib wxmsw26d_html.lib wxmsw26d_media.lib wxmsw26d_adv.lib wxbase26d_net.lib wxbase26d_xml.lib wxmsw26d_core.lib wxbase26d.lib wxtiffd.lib wxjpegd.lib wxpngd.lib wxzlibd.lib wxregexd.lib wxexpatd.lib kernel32.lib user32.lib gdi32.lib comdlg32.lib winspool.lib winmm.lib shell32.lib comctl32.lib ole32.lib oleaut32.lib uuid.lib rpcrt4.lib advapi32.lib wsock32.lib odbc32.lib oleacc.lib /nologo /machine:i386 /out:"..\..\..\bin\wxlua.exe" /libpath:"$(WXWIN)\lib\vc_lib" /libpath:"..\..\..\lib\vc_lib" /subsystem:windows /debug
  
  !ELSEIF  "$(CFG)" == "app_wxlua - Win32 Release"
***************
*** 233,238 ****
  # ADD BSC32 /nologo
  LINK32=link.exe
! # ADD BASE LINK32 wxluadebug.lib wxluasocket.lib wxlua.lib wxbind.lib lua.lib wxmsw26_adv.lib wxbase26.lib wxmsw26_core.lib wxmsw26_html.lib wxmsw26_media.lib wxbase26_net.lib wxbase26_xml.lib wxmsw26_xrc.lib wxmsw26_stc.lib wxtiff.lib wxjpeg.lib wxpng.lib wxzlib.lib wxregex.lib wxexpat.lib kernel32.lib user32.lib gdi32.lib comdlg32.lib winspool.lib winmm.lib shell32.lib comctl32.lib ole32.lib oleaut32.lib uuid.lib rpcrt4.lib advapi32.lib wsock32.lib odbc32.lib oleacc.lib /nologo /machine:i386 /out:"..\..\..\bin\wxlua.exe" /libpath:"$(WXWIN)\lib\vc_lib" /libpath:"..\..\..\lib\vc_lib" /subsystem:windows
! # ADD LINK32 wxluadebug.lib wxluasocket.lib wxlua.lib wxbind.lib lua.lib wxmsw26_adv.lib wxbase26.lib wxmsw26_core.lib wxmsw26_html.lib wxmsw26_media.lib wxbase26_net.lib wxbase26_xml.lib wxmsw26_xrc.lib wxmsw26_stc.lib wxtiff.lib wxjpeg.lib wxpng.lib wxzlib.lib wxregex.lib wxexpat.lib kernel32.lib user32.lib gdi32.lib comdlg32.lib winspool.lib winmm.lib shell32.lib comctl32.lib ole32.lib oleaut32.lib uuid.lib rpcrt4.lib advapi32.lib wsock32.lib odbc32.lib oleacc.lib /nologo /machine:i386 /out:"..\..\..\bin\wxlua.exe" /libpath:"$(WXWIN)\lib\vc_lib" /libpath:"..\..\..\lib\vc_lib" /subsystem:windows
  
  !ENDIF
--- 233,238 ----
  # ADD BSC32 /nologo
  LINK32=link.exe
! # ADD BASE LINK32 wxluasocket.lib wxluadebug.lib wxbind.lib wxlua.lib lua.lib wxmsw26_stc.lib wxmsw26_xrc.lib wxmsw26_html.lib wxmsw26_media.lib wxmsw26_adv.lib wxbase26_net.lib wxbase26_xml.lib wxmsw26_core.lib wxbase26.lib wxtiff.lib wxjpeg.lib wxpng.lib wxzlib.lib wxregex.lib wxexpat.lib kernel32.lib user32.lib gdi32.lib comdlg32.lib winspool.lib winmm.lib shell32.lib comctl32.lib ole32.lib oleaut32.lib uuid.lib rpcrt4.lib advapi32.lib wsock32.lib odbc32.lib oleacc.lib /nologo /machine:i386 /out:"..\..\..\bin\wxlua.exe" /libpath:"$(WXWIN)\lib\vc_lib" /libpath:"..\..\..\lib\vc_lib" /subsystem:windows
! # ADD LINK32 wxluasocket.lib wxluadebug.lib wxbind.lib wxlua.lib lua.lib wxmsw26_stc.lib wxmsw26_xrc.lib wxmsw26_html.lib wxmsw26_media.lib wxmsw26_adv.lib wxbase26_net.lib wxbase26_xml.lib wxmsw26_core.lib wxbase26.lib wxtiff.lib wxjpeg.lib wxpng.lib wxzlib.lib wxregex.lib wxexpat.lib kernel32.lib user32.lib gdi32.lib comdlg32.lib winspool.lib winmm.lib shell32.lib comctl32.lib ole32.lib oleaut32.lib uuid.lib rpcrt4.lib advapi32.lib wsock32.lib odbc32.lib oleacc.lib /nologo /machine:i386 /out:"..\..\..\bin\wxlua.exe" /libpath:"$(WXWIN)\lib\vc_lib" /libpath:"..\..\..\lib\vc_lib" /subsystem:windows
  
  !ENDIF

Index: makefile.wat
===================================================================
RCS file: /cvsroot/wxlua/wxLua/apps/build/msw/makefile.wat,v
retrieving revision 1.11
retrieving revision 1.12
diff -C2 -d -r1.11 -r1.12
*** makefile.wat	25 Nov 2005 23:06:10 -0000	1.11
--- makefile.wat	29 Nov 2005 23:52:11 -0000	1.12
***************
*** 194,198 ****
  	@%append watcom$(WXLIBPOSTFIX)\app_wxlua.lbc $(LDFLAGS) libpath $(WX_DIR)$(__WXLIBPATH_FILENAMES) $(__DEBUGINFO_0)  libpath ..\..\..\$(__WXLUA_OUTPUT_FOLDER_FILENAMES) system nt_win ref '_WinMain@16'
  	@for %i in ($(APP_WXLUA_OBJECTS)) do @%append watcom$(WXLIBPOSTFIX)\app_wxlua.lbc file %i
! 	@for %i in ( wxluadebug.lib wxluasocket.lib wxlua.lib wxbind.lib lua.lib wxmsw$(WX_VERSION)$(WXLIBPOSTFIX)_adv.lib wxbase$(WX_VERSION)$(WXLIBPOSTFIX).lib wxmsw$(WX_VERSION)$(WXLIBPOSTFIX)_core.lib wxmsw$(WX_VERSION)$(WXLIBPOSTFIX)_html.lib wxmsw$(WX_VERSION)$(WXLIBPOSTFIX)_media.lib wxbase$(WX_VERSION)$(WXLIBPOSTFIX)_net.lib wxbase$(WX_VERSION)$(WXLIBPOSTFIX)_xml.lib wxmsw$(WX_VERSION)$(WXLIBPOSTFIX)_xrc.lib wxmsw$(WX_VERSION)$(WXLIBPOSTFIX)_stc.lib wxtiff$(WX3RDPARTYLIBPOSTFIX).lib wxjpeg$(WX3RDPARTYLIBPOSTFIX).lib wxpng$(WX3RDPARTYLIBPOSTFIX).lib wxzlib$(WX3RDPARTYLIBPOSTFIX).lib wxregex$(WXLIBPOSTFIX).lib wxexpat$(WX3RDPARTYLIBPOSTFIX).lib kernel32.lib user32.lib gdi32.lib comdlg32.lib winspool.lib winmm.lib shell32.lib comctl32.lib ole32.lib oleaut32.lib uuid.lib rpcrt4.lib advapi32.lib wsock32.lib odbc32.lib) do @%append watcom$(WXLIBPOSTFIX)\app_wxlua.lbc library %i
  	@%append watcom$(WXLIBPOSTFIX)\app_wxlua.lbc option resource=watcom$(WXLIBPOSTFIX)\app_wxlua_wxlua.res
  	wlink @watcom$(WXLIBPOSTFIX)\app_wxlua.lbc
--- 194,198 ----
  	@%append watcom$(WXLIBPOSTFIX)\app_wxlua.lbc $(LDFLAGS) libpath $(WX_DIR)$(__WXLIBPATH_FILENAMES) $(__DEBUGINFO_0)  libpath ..\..\..\$(__WXLUA_OUTPUT_FOLDER_FILENAMES) system nt_win ref '_WinMain@16'
  	@for %i in ($(APP_WXLUA_OBJECTS)) do @%append watcom$(WXLIBPOSTFIX)\app_wxlua.lbc file %i
! 	@for %i in ( wxluasocket.lib wxluadebug.lib wxbind.lib wxlua.lib lua.lib wxmsw$(WX_VERSION)$(WXLIBPOSTFIX)_stc.lib wxmsw$(WX_VERSION)$(WXLIBPOSTFIX)_xrc.lib wxmsw$(WX_VERSION)$(WXLIBPOSTFIX)_html.lib wxmsw$(WX_VERSION)$(WXLIBPOSTFIX)_media.lib wxmsw$(WX_VERSION)$(WXLIBPOSTFIX)_adv.lib wxbase$(WX_VERSION)$(WXLIBPOSTFIX)_net.lib wxbase$(WX_VERSION)$(WXLIBPOSTFIX)_xml.lib wxmsw$(WX_VERSION)$(WXLIBPOSTFIX)_core.lib wxbase$(WX_VERSION)$(WXLIBPOSTFIX).lib wxtiff$(WX3RDPARTYLIBPOSTFIX).lib wxjpeg$(WX3RDPARTYLIBPOSTFIX).lib wxpng$(WX3RDPARTYLIBPOSTFIX).lib wxzlib$(WX3RDPARTYLIBPOSTFIX).lib wxregex$(WXLIBPOSTFIX).lib wxexpat$(WX3RDPARTYLIBPOSTFIX).lib kernel32.lib user32.lib gdi32.lib comdlg32.lib winspool.lib winmm.lib shell32.lib comctl32.lib ole32.lib oleaut32.lib uuid.lib rpcrt4.lib advapi32.lib wsock32.lib odbc32.lib) do @%append watcom$(WXLIBPOSTFIX)\app_wxlua.lbc library %i
  	@%append watcom$(WXLIBPOSTFIX)\app_wxlua.lbc option resource=watcom$(WXLIBPOSTFIX)\app_wxlua_wxlua.res
  	wlink @watcom$(WXLIBPOSTFIX)\app_wxlua.lbc
***************
*** 207,211 ****
  	@%append watcom$(WXLIBPOSTFIX)\app_wxluaedit.lbc $(LDFLAGS) libpath $(WX_DIR)$(__WXLIBPATH_FILENAMES) $(__DEBUGINFO_0)  libpath ..\..\..\$(__WXLUA_OUTPUT_FOLDER_FILENAMES) system nt_win ref '_WinMain@16'
  	@for %i in ($(APP_WXLUAEDIT_OBJECTS)) do @%append watcom$(WXLIBPOSTFIX)\app_wxluaedit.lbc file %i
! 	@for %i in ( wxluadebug.lib wxluasocket.lib wxlua.lib wxbind.lib lua.lib wxmsw$(WX_VERSION)$(WXLIBPOSTFIX)_adv.lib wxbase$(WX_VERSION)$(WXLIBPOSTFIX).lib wxmsw$(WX_VERSION)$(WXLIBPOSTFIX)_core.lib wxmsw$(WX_VERSION)$(WXLIBPOSTFIX)_html.lib wxmsw$(WX_VERSION)$(WXLIBPOSTFIX)_media.lib wxbase$(WX_VERSION)$(WXLIBPOSTFIX)_net.lib wxbase$(WX_VERSION)$(WXLIBPOSTFIX)_xml.lib wxmsw$(WX_VERSION)$(WXLIBPOSTFIX)_xrc.lib wxmsw$(WX_VERSION)$(WXLIBPOSTFIX)_stc.lib wxmsw$(WX_VERSION)$(WXLIBPOSTFIX)_stedit.lib wxtiff$(WX3RDPARTYLIBPOSTFIX).lib wxjpeg$(WX3RDPARTYLIBPOSTFIX).lib wxpng$(WX3RDPARTYLIBPOSTFIX).lib wxzlib$(WX3RDPARTYLIBPOSTFIX).lib wxregex$(WXLIBPOSTFIX).lib wxexpat$(WX3RDPARTYLIBPOSTFIX).lib kernel32.lib user32.lib gdi32.lib comdlg32.lib winspool.lib winmm.lib shell32.lib comctl32.lib ole32.lib oleaut32.lib uuid.lib rpcrt4.lib advapi32.lib wsock32.lib odbc32.lib) do @%append watcom$(WXLIBPOSTFIX)\app_wxluaedit.lbc library %i
  	@%append watcom$(WXLIBPOSTFIX)\app_wxluaedit.lbc option resource=watcom$(WXLIBPOSTFIX)\app_wxluaedit_wxluaedit.res
  	wlink @watcom$(WXLIBPOSTFIX)\app_wxluaedit.lbc
--- 207,211 ----
  	@%append watcom$(WXLIBPOSTFIX)\app_wxluaedit.lbc $(LDFLAGS) libpath $(WX_DIR)$(__WXLIBPATH_FILENAMES) $(__DEBUGINFO_0)  libpath ..\..\..\$(__WXLUA_OUTPUT_FOLDER_FILENAMES) system nt_win ref '_WinMain@16'
  	@for %i in ($(APP_WXLUAEDIT_OBJECTS)) do @%append watcom$(WXLIBPOSTFIX)\app_wxluaedit.lbc file %i
! 	@for %i in ( wxluasocket.lib wxluadebug.lib wxbind.lib wxlua.lib lua.lib wxmsw$(WX_VERSION)$(WXLIBPOSTFIX)_stedit.lib wxmsw$(WX_VERSION)$(WXLIBPOSTFIX)_stc.lib wxmsw$(WX_VERSION)$(WXLIBPOSTFIX)_xrc.lib wxmsw$(WX_VERSION)$(WXLIBPOSTFIX)_html.lib wxmsw$(WX_VERSION)$(WXLIBPOSTFIX)_media.lib wxmsw$(WX_VERSION)$(WXLIBPOSTFIX)_adv.lib wxbase$(WX_VERSION)$(WXLIBPOSTFIX)_net.lib wxbase$(WX_VERSION)$(WXLIBPOSTFIX)_xml.lib wxmsw$(WX_VERSION)$(WXLIBPOSTFIX)_core.lib wxbase$(WX_VERSION)$(WXLIBPOSTFIX).lib wxtiff$(WX3RDPARTYLIBPOSTFIX).lib wxjpeg$(WX3RDPARTYLIBPOSTFIX).lib wxpng$(WX3RDPARTYLIBPOSTFIX).lib wxzlib$(WX3RDPARTYLIBPOSTFIX).lib wxregex$(WXLIBPOSTFIX).lib wxexpat$(WX3RDPARTYLIBPOSTFIX).lib kernel32.lib user32.lib gdi32.lib comdlg32.lib winspool.lib winmm.lib shell32.lib comctl32.lib ole32.lib oleaut32.lib uuid.lib rpcrt4.lib advapi32.lib wsock32.lib odbc32.lib) do @%append watcom$(WXLIBPOSTFIX)\app_wxluaedit.lbc library %i
  	@%append watcom$(WXLIBPOSTFIX)\app_wxluaedit.lbc option resource=watcom$(WXLIBPOSTFIX)\app_wxluaedit_wxluaedit.res
  	wlink @watcom$(WXLIBPOSTFIX)\app_wxluaedit.lbc

Index: makefile.gcc
===================================================================
RCS file: /cvsroot/wxlua/wxLua/apps/build/msw/makefile.gcc,v
retrieving revision 1.11
retrieving revision 1.12
diff -C2 -d -r1.11 -r1.12
*** makefile.gcc	25 Nov 2005 23:06:10 -0000	1.11
--- makefile.gcc	29 Nov 2005 23:52:11 -0000	1.12
***************
*** 164,173 ****
  ifeq ($(USE_WXLUAAPP),1)
  ..\..\..\bin\wxlua.exe: $(APP_WXLUA_OBJECTS) mingw$(WXLIBPOSTFIX)\app_wxlua_wxlua_rc.o
! 	$(CXX) -o $@ $(APP_WXLUA_OBJECTS) $(LDFLAGS) -mthreads -L$(WX_DIR)$(WXLIBPATH) $(__DEBUGINFO) -mthreads -L..\..\..\$(__WXLUA_OUTPUT_FOLDER_FILENAMES) -Wl,--subsystem,windows -mwindows  -lwxluadebug -lwxluasocket -lwxlua -lwxbind -llua -lwxmsw$(WX_VERSION)$(WXLIBPOSTFIX)_adv -lwxbase$(WX_VERSION)$(WXLIBPOSTFIX) -lwxmsw$(WX_VERSION)$(WXLIBPOSTFIX)_core -lwxmsw$(WX_VERSION)$(WXLIBPOSTFIX)_html -lwxmsw$(WX_VERSION)$(WXLIBPOSTFIX)_media -lwxbase$(WX_VERSION)$(WXLIBPOSTFIX)_net -lwxbase$(WX_VERSION)$(WXLIBPOSTFIX)_xml -lwxmsw$(WX_VERSION)$(WXLIBPOSTFIX)_xrc -lwxmsw$(WX_VERSION)$(WXLIBPOSTFIX)_stc -lwxtiff$(WX3RDPARTYLIBPOSTFIX) -lwxjpeg$(WX3RDPARTYLIBPOSTFIX) -lwxpng$(WX3RDPARTYLIBPOSTFIX) -lwxzlib$(WX3RDPARTYLIBPOSTFIX) -lwxregex$(WXLIBPOSTFIX) -lwxexpat$(WX3RDPARTYLIBPOSTFIX) -lkernel32 -luser32 -lgdi32 -lcomdlg32 -lwinspool -lwinmm -lshell32 -lcomctl32 -lole32 -loleaut32 -luuid -lrpcrt4 -ladvapi32 -lwsock32 -lodbc32
  endif
  
  ifeq ($(USE_WXLUAEDITAPP),1)
  ..\..\..\bin\wxluaedit.exe: $(APP_WXLUAEDIT_OBJECTS) mingw$(WXLIBPOSTFIX)\app_wxluaedit_wxluaedit_rc.o
! 	$(CXX) -o $@ $(APP_WXLUAEDIT_OBJECTS) $(LDFLAGS) -mthreads -L$(WX_DIR)$(WXLIBPATH) $(__DEBUGINFO) -mthreads -L..\..\..\$(__WXLUA_OUTPUT_FOLDER_FILENAMES) -Wl,--subsystem,windows -mwindows  -lwxluadebug -lwxluasocket -lwxlua -lwxbind -llua -lwxmsw$(WX_VERSION)$(WXLIBPOSTFIX)_adv -lwxbase$(WX_VERSION)$(WXLIBPOSTFIX) -lwxmsw$(WX_VERSION)$(WXLIBPOSTFIX)_core -lwxmsw$(WX_VERSION)$(WXLIBPOSTFIX)_html -lwxmsw$(WX_VERSION)$(WXLIBPOSTFIX)_media -lwxbase$(WX_VERSION)$(WXLIBPOSTFIX)_net -lwxbase$(WX_VERSION)$(WXLIBPOSTFIX)_xml -lwxmsw$(WX_VERSION)$(WXLIBPOSTFIX)_xrc -lwxmsw$(WX_VERSION)$(WXLIBPOSTFIX)_stc -lwxmsw$(WX_VERSION)$(WXLIBPOSTFIX)_stedit -lwxtiff$(WX3RDPARTYLIBPOSTFIX) -lwxjpeg$(WX3RDPARTYLIBPOSTFIX) -lwxpng$(WX3RDPARTYLIBPOSTFIX) -lwxzlib$(WX3RDPARTYLIBPOSTFIX) -lwxregex$(WXLIBPOSTFIX) -lwxexpat$(WX3RDPARTYLIBPOSTFIX) -lkernel32 -luser32 -lgdi32 -lcomdlg32 -lwinspool -lwinmm -lshell32 -lcomctl32 -lole32 -loleaut32 -luuid -lrpcrt4 -ladvapi32 -lwsock32 -lodbc32
  endif
  
--- 164,173 ----
  ifeq ($(USE_WXLUAAPP),1)
  ..\..\..\bin\wxlua.exe: $(APP_WXLUA_OBJECTS) mingw$(WXLIBPOSTFIX)\app_wxlua_wxlua_rc.o
! 	$(CXX) -o $@ $(APP_WXLUA_OBJECTS) $(LDFLAGS) -mthreads -L$(WX_DIR)$(WXLIBPATH) $(__DEBUGINFO) -mthreads -L..\..\..\$(__WXLUA_OUTPUT_FOLDER_FILENAMES) -Wl,--subsystem,windows -mwindows  -lwxluasocket -lwxluadebug -lwxbind -lwxlua -llua -lwxmsw$(WX_VERSION)$(WXLIBPOSTFIX)_stc -lwxmsw$(WX_VERSION)$(WXLIBPOSTFIX)_xrc -lwxmsw$(WX_VERSION)$(WXLIBPOSTFIX)_html -lwxmsw$(WX_VERSION)$(WXLIBPOSTFIX)_media -lwxmsw$(WX_VERSION)$(WXLIBPOSTFIX)_adv -lwxbase$(WX_VERSION)$(WXLIBPOSTFIX)_net -lwxbase$(WX_VERSION)$(WXLIBPOSTFIX)_xml -lwxmsw$(WX_VERSION)$(WXLIBPOSTFIX)_core -lwxbase$(WX_VERSION)$(WXLIBPOSTFIX) -lwxtiff$(WX3RDPARTYLIBPOSTFIX) -lwxjpeg$(WX3RDPARTYLIBPOSTFIX) -lwxpng$(WX3RDPARTYLIBPOSTFIX) -lwxzlib$(WX3RDPARTYLIBPOSTFIX) -lwxregex$(WXLIBPOSTFIX) -lwxexpat$(WX3RDPARTYLIBPOSTFIX) -lkernel32 -luser32 -lgdi32 -lcomdlg32 -lwinspool -lwinmm -lshell32 -lcomctl32 -lole32 -loleaut32 -luuid -lrpcrt4 -ladvapi32 -lwsock32 -lodbc32
  endif
  
  ifeq ($(USE_WXLUAEDITAPP),1)
  ..\..\..\bin\wxluaedit.exe: $(APP_WXLUAEDIT_OBJECTS) mingw$(WXLIBPOSTFIX)\app_wxluaedit_wxluaedit_rc.o
! 	$(CXX) -o $@ $(APP_WXLUAEDIT_OBJECTS) $(LDFLAGS) -mthreads -L$(WX_DIR)$(WXLIBPATH) $(__DEBUGINFO) -mthreads -L..\..\..\$(__WXLUA_OUTPUT_FOLDER_FILENAMES) -Wl,--subsystem,windows -mwindows  -lwxluasocket -lwxluadebug -lwxbind -lwxlua -llua -lwxmsw$(WX_VERSION)$(WXLIBPOSTFIX)_stedit -lwxmsw$(WX_VERSION)$(WXLIBPOSTFIX)_stc -lwxmsw$(WX_VERSION)$(WXLIBPOSTFIX)_xrc -lwxmsw$(WX_VERSION)$(WXLIBPOSTFIX)_html -lwxmsw$(WX_VERSION)$(WXLIBPOSTFIX)_media -lwxmsw$(WX_VERSION)$(WXLIBPOSTFIX)_adv -lwxbase$(WX_VERSION)$(WXLIBPOSTFIX)_net -lwxbase$(WX_VERSION)$(WXLIBPOSTFIX)_xml -lwxmsw$(WX_VERSION)$(WXLIBPOSTFIX)_core -lwxbase$(WX_VERSION)$(WXLIBPOSTFIX) -lwxtiff$(WX3RDPARTYLIBPOSTFIX) -lwxjpeg$(WX3RDPARTYLIBPOSTFIX) -lwxpng$(WX3RDPARTYLIBPOSTFIX) -lwxzlib$(WX3RDPARTYLIBPOSTFIX) -lwxregex$(WXLIBPOSTFIX) -lwxexpat$(WX3RDPARTYLIBPOSTFIX) -lkernel32 -luser32 -lgdi32 -lcomdlg32 -lwinspool -lwinmm -lshell32 -lcomctl32 -lole32 -loleaut32 -luuid -lrpcrt4 -ladvapi32 -lwsock32 -lodbc32
  endif
  

Index: apps_app_wxluaedit.dsp
===================================================================
RCS file: /cvsroot/wxlua/wxLua/apps/build/msw/apps_app_wxluaedit.dsp,v
retrieving revision 1.1
retrieving revision 1.2
diff -C2 -d -r1.1 -r1.2
*** apps_app_wxluaedit.dsp	25 Nov 2005 23:08:13 -0000	1.1
--- apps_app_wxluaedit.dsp	29 Nov 2005 23:52:11 -0000	1.2
***************
*** 58,63 ****
  # ADD BSC32 /nologo
  LINK32=link.exe
! # ADD BASE LINK32 wxluadebug.lib wxluasocket.lib wxlua.lib wxbind.lib lua.lib wxmsw26ud_adv.lib wxbase26ud.lib wxmsw26ud_core.lib wxmsw26ud_html.lib wxmsw26ud_media.lib wxbase26ud_net.lib wxbase26ud_xml.lib wxmsw26ud_xrc.lib wxmsw26ud_stc.lib wxmsw26ud_stedit.lib wxtiffd.lib wxjpegd.lib wxpngd.lib wxzlibd.lib wxregexud.lib wxexpatd.lib kernel32.lib user32.lib gdi32.lib comdlg32.lib winspool.lib winmm.lib shell32.lib comctl32.lib ole32.lib oleaut32.lib uuid.lib rpcrt4.lib advapi32.lib wsock32.lib odbc32.lib oleacc.lib /nologo /machine:i386 /out:"..\..\..\bin\wxluaedit.exe" /libpath:"$(WXWIN)\lib\vc_dll" /libpath:"..\..\..\lib\vc_dll" /subsystem:windows /debug
! # ADD LINK32 wxluadebug.lib wxluasocket.lib wxlua.lib wxbind.lib lua.lib wxmsw26ud_adv.lib wxbase26ud.lib wxmsw26ud_core.lib wxmsw26ud_html.lib wxmsw26ud_media.lib wxbase26ud_net.lib wxbase26ud_xml.lib wxmsw26ud_xrc.lib wxmsw26ud_stc.lib wxmsw26ud_stedit.lib wxtiffd.lib wxjpegd.lib wxpngd.lib wxzlibd.lib wxregexud.lib wxexpatd.lib kernel32.lib user32.lib gdi32.lib comdlg32.lib winspool.lib winmm.lib shell32.lib comctl32.lib ole32.lib oleaut32.lib uuid.lib rpcrt4.lib advapi32.lib wsock32.lib odbc32.lib oleacc.lib /nologo /machine:i386 /out:"..\..\..\bin\wxluaedit.exe" /libpath:"$(WXWIN)\lib\vc_dll" /libpath:"..\..\..\lib\vc_dll" /subsystem:windows /debug
  
  !ELSEIF  "$(CFG)" == "app_wxluaedit - Win32 DLL Unicode Release"
--- 58,63 ----
  # ADD BSC32 /nologo
  LINK32=link.exe
! # ADD BASE LINK32 wxluasocket.lib wxluadebug.lib wxbind.lib wxlua.lib lua.lib wxmsw26ud_stedit.lib wxmsw26ud_stc.lib wxmsw26ud_xrc.lib wxmsw26ud_html.lib wxmsw26ud_media.lib wxmsw26ud_adv.lib wxbase26ud_net.lib wxbase26ud_xml.lib wxmsw26ud_core.lib wxbase26ud.lib wxtiffd.lib wxjpegd.lib wxpngd.lib wxzlibd.lib wxregexud.lib wxexpatd.lib kernel32.lib user32.lib gdi32.lib comdlg32.lib winspool.lib winmm.lib shell32.lib comctl32.lib ole32.lib oleaut32.lib uuid.lib rpcrt4.lib advapi32.lib wsock32.lib odbc32.lib oleacc.lib /nologo /machine:i386 /out:"..\..\..\bin\wxluaedit.exe" /libpath:"$(WXWIN)\lib\vc_dll" /libpath:"..\..\..\lib\vc_dll" /subsystem:windows /debug
! # ADD LINK32 wxluasocket.lib wxluadebug.lib wxbind.lib wxlua.lib lua.lib wxmsw26ud_stedit.lib wxmsw26ud_stc.lib wxmsw26ud_xrc.lib wxmsw26ud_html.lib wxmsw26ud_media.lib wxmsw26ud_adv.lib wxbase26ud_net.lib wxbase26ud_xml.lib wxmsw26ud_core.lib wxbase26ud.lib wxtiffd.lib wxjpegd.lib wxpngd.lib wxzlibd.lib wxregexud.lib wxexpatd.lib kernel32.lib user32.lib gdi32.lib comdlg32.lib winspool.lib winmm.lib shell32.lib comctl32.lib ole32.lib oleaut32.lib uuid.lib rpcrt4.lib advapi32.lib wsock32.lib odbc32.lib oleacc.lib /nologo /machine:i386 /out:"..\..\..\bin\wxluaedit.exe" /libpath:"$(WXWIN)\lib\vc_dll" /libpath:"..\..\..\lib\vc_dll" /subsystem:windows /debug
  
  !ELSEIF  "$(CFG)" == "app_wxluaedit - Win32 DLL Unicode Release"
***************
*** 83,88 ****
  # ADD BSC32 /nologo
  LINK32=link.exe
! # ADD BASE LINK32 wxluadebug.lib wxluasocket.lib wxlua.lib wxbind.lib lua.lib wxmsw26u_adv.lib wxbase26u.lib wxmsw26u_core.lib wxmsw26u_html.lib wxmsw26u_media.lib wxbase26u_net.lib wxbase26u_xml.lib wxmsw26u_xrc.lib wxmsw26u_stc.lib wxmsw26u_stedit.lib wxtiff.lib wxjpeg.lib wxpng.lib wxzlib.lib wxregexu.lib wxexpat.lib kernel32.lib user32.lib gdi32.lib comdlg32.lib winspool.lib winmm.lib shell32.lib comctl32.lib ole32.lib oleaut32.lib uuid.lib rpcrt4.lib advapi32.lib wsock32.lib odbc32.lib oleacc.lib /nologo /machine:i386 /out:"..\..\..\bin\wxluaedit.exe" /libpath:"$(WXWIN)\lib\vc_dll" /libpath:"..\..\..\lib\vc_dll" /subsystem:windows
! # ADD LINK32 wxluadebug.lib wxluasocket.lib wxlua.lib wxbind.lib lua.lib wxmsw26u_adv.lib wxbase26u.lib wxmsw26u_core.lib wxmsw26u_html.lib wxmsw26u_media.lib wxbase26u_net.lib wxbase26u_xml.lib wxmsw26u_xrc.lib wxmsw26u_stc.lib wxmsw26u_stedit.lib wxtiff.lib wxjpeg.lib wxpng.lib wxzlib.lib wxregexu.lib wxexpat.lib kernel32.lib user32.lib gdi32.lib comdlg32.lib winspool.lib winmm.lib shell32.lib comctl32.lib ole32.lib oleaut32.lib uuid.lib rpcrt4.lib advapi32.lib wsock32.lib odbc32.lib oleacc.lib /nologo /machine:i386 /out:"..\..\..\bin\wxluaedit.exe" /libpath:"$(WXWIN)\lib\vc_dll" /libpath:"..\..\..\lib\vc_dll" /subsystem:windows
  
  !ELSEIF  "$(CFG)" == "app_wxluaedit - Win32 DLL Debug"
--- 83,88 ----
  # ADD BSC32 /nologo
  LINK32=link.exe
! # ADD BASE LINK32 wxluasocket.lib wxluadebug.lib wxbind.lib wxlua.lib lua.lib wxmsw26u_stedit.lib wxmsw26u_stc.lib wxmsw26u_xrc.lib wxmsw26u_html.lib wxmsw26u_media.lib wxmsw26u_adv.lib wxbase26u_net.lib wxbase26u_xml.lib wxmsw26u_core.lib wxbase26u.lib wxtiff.lib wxjpeg.lib wxpng.lib wxzlib.lib wxregexu.lib wxexpat.lib kernel32.lib user32.lib gdi32.lib comdlg32.lib winspool.lib winmm.lib shell32.lib comctl32.lib ole32.lib oleaut32.lib uuid.lib rpcrt4.lib advapi32.lib wsock32.lib odbc32.lib oleacc.lib /nologo /machine:i386 /out:"..\..\..\bin\wxluaedit.exe" /libpath:"$(WXWIN)\lib\vc_dll" /libpath:"..\..\..\lib\vc_dll" /subsystem:windows
! # ADD LINK32 wxluasocket.lib wxluadebug.lib wxbind.lib wxlua.lib lua.lib wxmsw26u_stedit.lib wxmsw26u_stc.lib wxmsw26u_xrc.lib wxmsw26u_html.lib wxmsw26u_media.lib wxmsw26u_adv.lib wxbase26u_net.lib wxbase26u_xml.lib wxmsw26u_core.lib wxbase26u.lib wxtiff.lib wxjpeg.lib wxpng.lib wxzlib.lib wxregexu.lib wxexpat.lib kernel32.lib user32.lib gdi32.lib comdlg32.lib winspool.lib winmm.lib shell32.lib comctl32.lib ole32.lib oleaut32.lib uuid.lib rpcrt4.lib advapi32.lib wsock32.lib odbc32.lib oleacc.lib /nologo /machine:i386 /out:"..\..\..\bin\wxluaedit.exe" /libpath:"$(WXWIN)\lib\vc_dll" /libpath:"..\..\..\lib\vc_dll" /subsystem:windows
  
  !ELSEIF  "$(CFG)" == "app_wxluaedit - Win32 DLL Debug"
***************
*** 108,113 ****
  # ADD BSC32 /nologo
  LINK32=link.exe
! # ADD BASE LINK32 wxluadebug.lib wxluasocket.lib wxlua.lib wxbind.lib lua.lib wxmsw26d_adv.lib wxbase26d.lib wxmsw26d_core.lib wxmsw26d_html.lib wxmsw26d_media.lib wxbase26d_net.lib wxbase26d_xml.lib wxmsw26d_xrc.lib wxmsw26d_stc.lib wxmsw26d_stedit.lib wxtiffd.lib wxjpegd.lib wxpngd.lib wxzlibd.lib wxregexd.lib wxexpatd.lib kernel32.lib user32.lib gdi32.lib comdlg32.lib winspool.lib winmm.lib shell32.lib comctl32.lib ole32.lib oleaut32.lib uuid.lib rpcrt4.lib advapi32.lib wsock32.lib odbc32.lib oleacc.lib /nologo /machine:i386 /out:"..\..\..\bin\wxluaedit.exe" /libpath:"$(WXWIN)\lib\vc_dll" /libpath:"..\..\..\lib\vc_dll" /subsystem:windows /debug
! # ADD LINK32 wxluadebug.lib wxluasocket.lib wxlua.lib wxbind.lib lua.lib wxmsw26d_adv.lib wxbase26d.lib wxmsw26d_core.lib wxmsw26d_html.lib wxmsw26d_media.lib wxbase26d_net.lib wxbase26d_xml.lib wxmsw26d_xrc.lib wxmsw26d_stc.lib wxmsw26d_stedit.lib wxtiffd.lib wxjpegd.lib wxpngd.lib wxzlibd.lib wxregexd.lib wxexpatd.lib kernel32.lib user32.lib gdi32.lib comdlg32.lib winspool.lib winmm.lib shell32.lib comctl32.lib ole32.lib oleaut32.lib uuid.lib rpcrt4.lib advapi32.lib wsock32.lib odbc32.lib oleacc.lib /nologo /machine:i386 /out:"..\..\..\bin\wxluaedit.exe" /libpath:"$(WXWIN)\lib\vc_dll" /libpath:"..\..\..\lib\vc_dll" /subsystem:windows /debug
  
  !ELSEIF  "$(CFG)" == "app_wxluaedit - Win32 DLL Release"
--- 108,113 ----
  # ADD BSC32 /nologo
  LINK32=link.exe
! # ADD BASE LINK32 wxluasocket.lib wxluadebug.lib wxbind.lib wxlua.lib lua.lib wxmsw26d_stedit.lib wxmsw26d_stc.lib wxmsw26d_xrc.lib wxmsw26d_html.lib wxmsw26d_media.lib wxmsw26d_adv.lib wxbase26d_net.lib wxbase26d_xml.lib wxmsw26d_core.lib wxbase26d.lib wxtiffd.lib wxjpegd.lib wxpngd.lib wxzlibd.lib wxregexd.lib wxexpatd.lib kernel32.lib user32.lib gdi32.lib comdlg32.lib winspool.lib winmm.lib shell32.lib comctl32.lib ole32.lib oleaut32.lib uuid.lib rpcrt4.lib advapi32.lib wsock32.lib odbc32.lib oleacc.lib /nologo /machine:i386 /out:"..\..\..\bin\wxluaedit.exe" /libpath:"$(WXWIN)\lib\vc_dll" /libpath:"..\..\..\lib\vc_dll" /subsystem:windows /debug
! # ADD LINK32 wxluasocket.lib wxluadebug.lib wxbind.lib wxlua.lib lua.lib wxmsw26d_stedit.lib wxmsw26d_stc.lib wxmsw26d_xrc.lib wxmsw26d_html.lib wxmsw26d_media.lib wxmsw26d_adv.lib wxbase26d_net.lib wxbase26d_xml.lib wxmsw26d_core.lib wxbase26d.lib wxtiffd.lib wxjpegd.lib wxpngd.lib wxzlibd.lib wxregexd.lib wxexpatd.lib kernel32.lib user32.lib gdi32.lib comdlg32.lib winspool.lib winmm.lib shell32.lib comctl32.lib ole32.lib oleaut32.lib uuid.lib rpcrt4.lib advapi32.lib wsock32.lib odbc32.lib oleacc.lib /nologo /machine:i386 /out:"..\..\..\bin\wxluaedit.exe" /libpath:"$(WXWIN)\lib\vc_dll" /libpath:"..\..\..\lib\vc_dll" /subsystem:windows /debug
  
  !ELSEIF  "$(CFG)" == "app_wxluaedit - Win32 DLL Release"
***************
*** 133,138 ****
  # ADD BSC32 /nologo
  LINK32=link.exe
! # ADD BASE LINK32 wxluadebug.lib wxluasocket.lib wxlua.lib wxbind.lib lua.lib wxmsw26_adv.lib wxbase26.lib wxmsw26_core.lib wxmsw26_html.lib wxmsw26_media.lib wxbase26_net.lib wxbase26_xml.lib wxmsw26_xrc.lib wxmsw26_stc.lib wxmsw26_stedit.lib wxtiff.lib wxjpeg.lib wxpng.lib wxzlib.lib wxregex.lib wxexpat.lib kernel32.lib user32.lib gdi32.lib comdlg32.lib winspool.lib winmm.lib shell32.lib comctl32.lib ole32.lib oleaut32.lib uuid.lib rpcrt4.lib advapi32.lib wsock32.lib odbc32.lib oleacc.lib /nologo /machine:i386 /out:"..\..\..\bin\wxluaedit.exe" /libpath:"$(WXWIN)\lib\vc_dll" /libpath:"..\..\..\lib\vc_dll" /subsystem:windows
! # ADD LINK32 wxluadebug.lib wxluasocket.lib wxlua.lib wxbind.lib lua.lib wxmsw26_adv.lib wxbase26.lib wxmsw26_core.lib wxmsw26_html.lib wxmsw26_media.lib wxbase26_net.lib wxbase26_xml.lib wxmsw26_xrc.lib wxmsw26_stc.lib wxmsw26_stedit.lib wxtiff.lib wxjpeg.lib wxpng.lib wxzlib.lib wxregex.lib wxexpat.lib kernel32.lib user32.lib gdi32.lib comdlg32.lib winspool.lib winmm.lib shell32.lib comctl32.lib ole32.lib oleaut32.lib uuid.lib rpcrt4.lib advapi32.lib wsock32.lib odbc32.lib oleacc.lib /nologo /machine:i386 /out:"..\..\..\bin\wxluaedit.exe" /libpath:"$(WXWIN)\lib\vc_dll" /libpath:"..\..\..\lib\vc_dll" /subsystem:windows
  
  !ELSEIF  "$(CFG)" == "app_wxluaedit - Win32 Unicode Debug"
--- 133,138 ----
  # ADD BSC32 /nologo
  LINK32=link.exe
! # ADD BASE LINK32 wxluasocket.lib wxluadebug.lib wxbind.lib wxlua.lib lua.lib wxmsw26_stedit.lib wxmsw26_stc.lib wxmsw26_xrc.lib wxmsw26_html.lib wxmsw26_media.lib wxmsw26_adv.lib wxbase26_net.lib wxbase26_xml.lib wxmsw26_core.lib wxbase26.lib wxtiff.lib wxjpeg.lib wxpng.lib wxzlib.lib wxregex.lib wxexpat.lib kernel32.lib user32.lib gdi32.lib comdlg32.lib winspool.lib winmm.lib shell32.lib comctl32.lib ole32.lib oleaut32.lib uuid.lib rpcrt4.lib advapi32.lib wsock32.lib odbc32.lib oleacc.lib /nologo /machine:i386 /out:"..\..\..\bin\wxluaedit.exe" /libpath:"$(WXWIN)\lib\vc_dll" /libpath:"..\..\..\lib\vc_dll" /subsystem:windows
! # ADD LINK32 wxluasocket.lib wxluadebug.lib wxbind.lib wxlua.lib lua.lib wxmsw26_stedit.lib wxmsw26_stc.lib wxmsw26_xrc.lib wxmsw26_html.lib wxmsw26_media.lib wxmsw26_adv.lib wxbase26_net.lib wxbase26_xml.lib wxmsw26_core.lib wxbase26.lib wxtiff.lib wxjpeg.lib wxpng.lib wxzlib.lib wxregex.lib wxexpat.lib kernel32.lib user32.lib gdi32.lib comdlg32.lib winspool.lib winmm.lib shell32.lib comctl32.lib ole32.lib oleaut32.lib uuid.lib rpcrt4.lib advapi32.lib wsock32.lib odbc32.lib oleacc.lib /nologo /machine:i386 /out:"..\..\..\bin\wxluaedit.exe" /libpath:"$(WXWIN)\lib\vc_dll" /libpath:"..\..\..\lib\vc_dll" /subsystem:windows
  
  !ELSEIF  "$(CFG)" == "app_wxluaedit - Win32 Unicode Debug"
***************
*** 158,163 ****
  # ADD BSC32 /nologo
  LINK32=link.exe
! # ADD BASE LINK32 wxluadebug.lib wxluasocket.lib wxlua.lib wxbind.lib lua.lib wxmsw26ud_adv.lib wxbase26ud.lib wxmsw26ud_core.lib wxmsw26ud_html.lib wxmsw26ud_media.lib wxbase26ud_net.lib wxbase26ud_xml.lib wxmsw26ud_xrc.lib wxmsw26ud_stc.lib wxmsw26ud_stedit.lib wxtiffd.lib wxjpegd.lib wxpngd.lib wxzlibd.lib wxregexud.lib wxexpatd.lib kernel32.lib user32.lib gdi32.lib comdlg32.lib winspool.lib winmm.lib shell32.lib comctl32.lib ole32.lib oleaut32.lib uuid.lib rpcrt4.lib advapi32.lib wsock32.lib odbc32.lib oleacc.lib /nologo /machine:i386 /out:"..\..\..\bin\wxluaedit.exe" /libpath:"$(WXWIN)\lib\vc_lib" /libpath:"..\..\..\lib\vc_lib" /subsystem:windows /debug
! # ADD LINK32 wxluadebug.lib wxluasocket.lib wxlua.lib wxbind.lib lua.lib wxmsw26ud_adv.lib wxbase26ud.lib wxmsw26ud_core.lib wxmsw26ud_html.lib wxmsw26ud_media.lib wxbase26ud_net.lib wxbase26ud_xml.lib wxmsw26ud_xrc.lib wxmsw26ud_stc.lib wxmsw26ud_stedit.lib wxtiffd.lib wxjpegd.lib wxpngd.lib wxzlibd.lib wxregexud.lib wxexpatd.lib kernel32.lib user32.lib gdi32.lib comdlg32.lib winspool.lib winmm.lib shell32.lib comctl32.lib ole32.lib oleaut32.lib uuid.lib rpcrt4.lib advapi32.lib wsock32.lib odbc32.lib oleacc.lib /nologo /machine:i386 /out:"..\..\..\bin\wxluaedit.exe" /libpath:"$(WXWIN)\lib\vc_lib" /libpath:"..\..\..\lib\vc_lib" /subsystem:windows /debug
  
  !ELSEIF  "$(CFG)" == "app_wxluaedit - Win32 Unicode Release"
--- 158,163 ----
  # ADD BSC32 /nologo
  LINK32=link.exe
! # ADD BASE LINK32 wxluasocket.lib wxluadebug.lib wxbind.lib wxlua.lib lua.lib wxmsw26ud_stedit.lib wxmsw26ud_stc.lib wxmsw26ud_xrc.lib wxmsw26ud_html.lib wxmsw26ud_media.lib wxmsw26ud_adv.lib wxbase26ud_net.lib wxbase26ud_xml.lib wxmsw26ud_core.lib wxbase26ud.lib wxtiffd.lib wxjpegd.lib wxpngd.lib wxzlibd.lib wxregexud.lib wxexpatd.lib kernel32.lib user32.lib gdi32.lib comdlg32.lib winspool.lib winmm.lib shell32.lib comctl32.lib ole32.lib oleaut32.lib uuid.lib rpcrt4.lib advapi32.lib wsock32.lib odbc32.lib oleacc.lib /nologo /machine:i386 /out:"..\..\..\bin\wxluaedit.exe" /libpath:"$(WXWIN)\lib\vc_lib" /libpath:"..\..\..\lib\vc_lib" /subsystem:windows /debug
! # ADD LINK32 wxluasocket.lib wxluadebug.lib wxbind.lib wxlua.lib lua.lib wxmsw26ud_stedit.lib wxmsw26ud_stc.lib wxmsw26ud_xrc.lib wxmsw26ud_html.lib wxmsw26ud_media.lib wxmsw26ud_adv.lib wxbase26ud_net.lib wxbase26ud_xml.lib wxmsw26ud_core.lib wxbase26ud.lib wxtiffd.lib wxjpegd.lib wxpngd.lib wxzlibd.lib wxregexud.lib wxexpatd.lib kernel32.lib user32.lib gdi32.lib comdlg32.lib winspool.lib winmm.lib shell32.lib comctl32.lib ole32.lib oleaut32.lib uuid.lib rpcrt4.lib advapi32.lib wsock32.lib odbc32.lib oleacc.lib /nologo /machine:i386 /out:"..\..\..\bin\wxluaedit.exe" /libpath:"$(WXWIN)\lib\vc_lib" /libpath:"..\..\..\lib\vc_lib" /subsystem:windows /debug
  
  !ELSEIF  "$(CFG)" == "app_wxluaedit - Win32 Unicode Release"
***************
*** 183,188 ****
  # ADD BSC32 /nologo
  LINK32=link.exe
! # ADD BASE LINK32 wxluadebug.lib wxluasocket.lib wxlua.lib wxbind.lib lua.lib wxmsw26u_adv.lib wxbase26u.lib wxmsw26u_core.lib wxmsw26u_html.lib wxmsw26u_media.lib wxbase26u_net.lib wxbase26u_xml.lib wxmsw26u_xrc.lib wxmsw26u_stc.lib wxmsw26u_stedit.lib wxtiff.lib wxjpeg.lib wxpng.lib wxzlib.lib wxregexu.lib wxexpat.lib kernel32.lib user32.lib gdi32.lib comdlg32.lib winspool.lib winmm.lib shell32.lib comctl32.lib ole32.lib oleaut32.lib uuid.lib rpcrt4.lib advapi32.lib wsock32.lib odbc32.lib oleacc.lib /nologo /machine:i386 /out:"..\..\..\bin\wxluaedit.exe" /libpath:"$(WXWIN)\lib\vc_lib" /libpath:"..\..\..\lib\vc_lib" /subsystem:windows
! # ADD LINK32 wxluadebug.lib wxluasocket.lib wxlua.lib wxbind.lib lua.lib wxmsw26u_adv.lib wxbase26u.lib wxmsw26u_core.lib wxmsw26u_html.lib wxmsw26u_media.lib wxbase26u_net.lib wxbase26u_xml.lib wxmsw26u_xrc.lib wxmsw26u_stc.lib wxmsw26u_stedit.lib wxtiff.lib wxjpeg.lib wxpng.lib wxzlib.lib wxregexu.lib wxexpat.lib kernel32.lib user32.lib gdi32.lib comdlg32.lib winspool.lib winmm.lib shell32.lib comctl32.lib ole32.lib oleaut32.lib uuid.lib rpcrt4.lib advapi32.lib wsock32.lib odbc32.lib oleacc.lib /nologo /machine:i386 /out:"..\..\..\bin\wxluaedit.exe" /libpath:"$(WXWIN)\lib\vc_lib" /libpath:"..\..\..\lib\vc_lib" /subsystem:windows
  
  !ELSEIF  "$(CFG)" == "app_wxluaedit - Win32 Debug"
--- 183,188 ----
  # ADD BSC32 /nologo
  LINK32=link.exe
! # ADD BASE LINK32 wxluasocket.lib wxluadebug.lib wxbind.lib wxlua.lib lua.lib wxmsw26u_stedit.lib wxmsw26u_stc.lib wxmsw26u_xrc.lib wxmsw26u_html.lib wxmsw26u_media.lib wxmsw26u_adv.lib wxbase26u_net.lib wxbase26u_xml.lib wxmsw26u_core.lib wxbase26u.lib wxtiff.lib wxjpeg.lib wxpng.lib wxzlib.lib wxregexu.lib wxexpat.lib kernel32.lib user32.lib gdi32.lib comdlg32.lib winspool.lib winmm.lib shell32.lib comctl32.lib ole32.lib oleaut32.lib uuid.lib rpcrt4.lib advapi32.lib wsock32.lib odbc32.lib oleacc.lib /nologo /machine:i386 /out:"..\..\..\bin\wxluaedit.exe" /libpath:"$(WXWIN)\lib\vc_lib" /libpath:"..\..\..\lib\vc_lib" /subsystem:windows
! # ADD LINK32 wxluasocket.lib wxluadebug.lib wxbind.lib wxlua.lib lua.lib wxmsw26u_stedit.lib wxmsw26u_stc.lib wxmsw26u_xrc.lib wxmsw26u_html.lib wxmsw26u_media.lib wxmsw26u_adv.lib wxbase26u_net.lib wxbase26u_xml.lib wxmsw26u_core.lib wxbase26u.lib wxtiff.lib wxjpeg.lib wxpng.lib wxzlib.lib wxregexu.lib wxexpat.lib kernel32.lib user32.lib gdi32.lib comdlg32.lib winspool.lib winmm.lib shell32.lib comctl32.lib ole32.lib oleaut32.lib uuid.lib rpcrt4.lib advapi32.lib wsock32.lib odbc32.lib oleacc.lib /nologo /machine:i386 /out:"..\..\..\bin\wxluaedit.exe" /libpath:"$(WXWIN)\lib\vc_lib" /libpath:"..\..\..\lib\vc_lib" /subsystem:windows
  
  !ELSEIF  "$(CFG)" == "app_wxluaedit - Win32 Debug"
***************
*** 208,213 ****
  # ADD BSC32 /nologo
  LINK32=link.exe
! # ADD BASE LINK32 wxluadebug.lib wxluasocket.lib wxlua.lib wxbind.lib lua.lib wxmsw26d_adv.lib wxbase26d.lib wxmsw26d_core.lib wxmsw26d_html.lib wxmsw26d_media.lib wxbase26d_net.lib wxbase26d_xml.lib wxmsw26d_xrc.lib wxmsw26d_stc.lib wxmsw26d_stedit.lib wxtiffd.lib wxjpegd.lib wxpngd.lib wxzlibd.lib wxregexd.lib wxexpatd.lib kernel32.lib user32.lib gdi32.lib comdlg32.lib winspool.lib winmm.lib shell32.lib comctl32.lib ole32.lib oleaut32.lib uuid.lib rpcrt4.lib advapi32.lib wsock32.lib odbc32.lib oleacc.lib /nologo /machine:i386 /out:"..\..\..\bin\wxluaedit.exe" /libpath:"$(WXWIN)\lib\vc_lib" /libpath:"..\..\..\lib\vc_lib" /subsystem:windows /debug
! # ADD LINK32 wxluadebug.lib wxluasocket.lib wxlua.lib wxbind.lib lua.lib wxmsw26d_adv.lib wxbase26d.lib wxmsw26d_core.lib wxmsw26d_html.lib wxmsw26d_media.lib wxbase26d_net.lib wxbase26d_xml.lib wxmsw26d_xrc.lib wxmsw26d_stc.lib wxmsw26d_stedit.lib wxtiffd.lib wxjpegd.lib wxpngd.lib wxzlibd.lib wxregexd.lib wxexpatd.lib kernel32.lib user32.lib gdi32.lib comdlg32.lib winspool.lib winmm.lib shell32.lib comctl32.lib ole32.lib oleaut32.lib uuid.lib rpcrt4.lib advapi32.lib wsock32.lib odbc32.lib oleacc.lib /nologo /machine:i386 /out:"..\..\..\bin\wxluaedit.exe" /libpath:"$(WXWIN)\lib\vc_lib" /libpath:"..\..\..\lib\vc_lib" /subsystem:windows /debug
  
  !ELSEIF  "$(CFG)" == "app_wxluaedit - Win32 Release"
--- 208,213 ----
  # ADD BSC32 /nologo
  LINK32=link.exe
! # ADD BASE LINK32 wxluasocket.lib wxluadebug.lib wxbind.lib wxlua.lib lua.lib wxmsw26d_stedit.lib wxmsw26d_stc.lib wxmsw26d_xrc.lib wxmsw26d_html.lib wxmsw26d_media.lib wxmsw26d_adv.lib wxbase26d_net.lib wxbase26d_xml.lib wxmsw26d_core.lib wxbase26d.lib wxtiffd.lib wxjpegd.lib wxpngd.lib wxzlibd.lib wxregexd.lib wxexpatd.lib kernel32.lib user32.lib gdi32.lib comdlg32.lib winspool.lib winmm.lib shell32.lib comctl32.lib ole32.lib oleaut32.lib uuid.lib rpcrt4.lib advapi32.lib wsock32.lib odbc32.lib oleacc.lib /nologo /machine:i386 /out:"..\..\..\bin\wxluaedit.exe" /libpath:"$(WXWIN)\lib\vc_lib" /libpath:"..\..\..\lib\vc_lib" /subsystem:windows /debug
! # ADD LINK32 wxluasocket.lib wxluadebug.lib wxbind.lib wxlua.lib lua.lib wxmsw26d_stedit.lib wxmsw26d_stc.lib wxmsw26d_xrc.lib wxmsw26d_html.lib wxmsw26d_media.lib wxmsw26d_adv.lib wxbase26d_net.lib wxbase26d_xml.lib wxmsw26d_core.lib wxbase26d.lib wxtiffd.lib wxjpegd.lib wxpngd.lib wxzlibd.lib wxregexd.lib wxexpatd.lib kernel32.lib user32.lib gdi32.lib comdlg32.lib winspool.lib winmm.lib shell32.lib comctl32.lib ole32.lib oleaut32.lib uuid.lib rpcrt4.lib advapi32.lib wsock32.lib odbc32.lib oleacc.lib /nologo /machine:i386 /out:"..\..\..\bin\wxluaedit.exe" /libpath:"$(WXWIN)\lib\vc_lib" /libpath:"..\..\..\lib\vc_lib" /subsystem:windows /debug
  
  !ELSEIF  "$(CFG)" == "app_wxluaedit - Win32 Release"
***************
*** 233,238 ****
  # ADD BSC32 /nologo
  LINK32=link.exe
! # ADD BASE LINK32 wxluadebug.lib wxluasocket.lib wxlua.lib wxbind.lib lua.lib wxmsw26_adv.lib wxbase26.lib wxmsw26_core.lib wxmsw26_html.lib wxmsw26_media.lib wxbase26_net.lib wxbase26_xml.lib wxmsw26_xrc.lib wxmsw26_stc.lib wxmsw26_stedit.lib wxtiff.lib wxjpeg.lib wxpng.lib wxzlib.lib wxregex.lib wxexpat.lib kernel32.lib user32.lib gdi32.lib comdlg32.lib winspool.lib winmm.lib shell32.lib comctl32.lib ole32.lib oleaut32.lib uuid.lib rpcrt4.lib advapi32.lib wsock32.lib odbc32.lib oleacc.lib /nologo /machine:i386 /out:"..\..\..\bin\wxluaedit.exe" /libpath:"$(WXWIN)\lib\vc_lib" /libpath:"..\..\..\lib\vc_lib" /subsystem:windows
! # ADD LINK32 wxluadebug.lib wxluasocket.lib wxlua.lib wxbind.lib lua.lib wxmsw26_adv.lib wxbase26.lib wxmsw26_core.lib wxmsw26_html.lib wxmsw26_media.lib wxbase26_net.lib wxbase26_xml.lib wxmsw26_xrc.lib wxmsw26_stc.lib wxmsw26_stedit.lib wxtiff.lib wxjpeg.lib wxpng.lib wxzlib.lib wxregex.lib wxexpat.lib kernel32.lib user32.lib gdi32.lib comdlg32.lib winspool.lib winmm.lib shell32.lib comctl32.lib ole32.lib oleaut32.lib uuid.lib rpcrt4.lib advapi32.lib wsock32.lib odbc32.lib oleacc.lib /nologo /machine:i386 /out:"..\..\..\bin\wxluaedit.exe" /libpath:"$(WXWIN)\lib\vc_lib" /libpath:"..\..\..\lib\vc_lib" /subsystem:windows
  
  !ENDIF
--- 233,238 ----
  # ADD BSC32 /nologo
  LINK32=link.exe
! # ADD BASE LINK32 wxluasocket.lib wxluadebug.lib wxbind.lib wxlua.lib lua.lib wxmsw26_stedit.lib wxmsw26_stc.lib wxmsw26_xrc.lib wxmsw26_html.lib wxmsw26_media.lib wxmsw26_adv.lib wxbase26_net.lib wxbase26_xml.lib wxmsw26_core.lib wxbase26.lib wxtiff.lib wxjpeg.lib wxpng.lib wxzlib.lib wxregex.lib wxexpat.lib kernel32.lib user32.lib gdi32.lib comdlg32.lib winspool.lib winmm.lib shell32.lib comctl32.lib ole32.lib oleaut32.lib uuid.lib rpcrt4.lib advapi32.lib wsock32.lib odbc32.lib oleacc.lib /nologo /machine:i386 /out:"..\..\..\bin\wxluaedit.exe" /libpath:"$(WXWIN)\lib\vc_lib" /libpath:"..\..\..\lib\vc_lib" /subsystem:windows
! # ADD LINK32 wxluasocket.lib wxluadebug.lib wxbind.lib wxlua.lib lua.lib wxmsw26_stedit.lib wxmsw26_stc.lib wxmsw26_xrc.lib wxmsw26_html.lib wxmsw26_media.lib wxmsw26_adv.lib wxbase26_net.lib wxbase26_xml.lib wxmsw26_core.lib wxbase26.lib w...
 
[truncated message content]

[Wxlua-commit] wxLua/bindings genwxbind.lua,1.10,1.11

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

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

Modified Files:
	genwxbind.lua 
Log Message:
reorder libs in apps.bkl and rebake, (remove -- in bkl, got error)
pulled in generic code in wxLuaInterface into the wxLuaState


Index: genwxbind.lua
===================================================================
RCS file: /cvsroot/wxlua/wxLua/bindings/genwxbind.lua,v
retrieving revision 1.10
retrieving revision 1.11
diff -C2 -d -r1.10 -r1.11
*** genwxbind.lua	29 Nov 2005 05:45:09 -0000	1.10
--- genwxbind.lua	29 Nov 2005 23:52:11 -0000	1.11
***************
*** 3723,3727 ****
      table.insert(fileData, "    "..hook_binding_class.."Init()\n")
      table.insert(fileData, "    {\n")
!     table.insert(fileData, "        m_binding.GetBindingsList()->Append(&m_binding);\n")
      table.insert(fileData, "    }\n")
      table.insert(fileData, "    "..hook_binding_class.." m_binding;\n")
--- 3723,3727 ----
      table.insert(fileData, "    "..hook_binding_class.."Init()\n")
      table.insert(fileData, "    {\n")
!     table.insert(fileData, "        m_binding.GetBindingList()->Append(&m_binding);\n")
      table.insert(fileData, "    }\n")
      table.insert(fileData, "    "..hook_binding_class.." m_binding;\n")

[Wxlua-commit] wxLua/apps/build/bakefiles apps.bkl,1.10,1.11 options.bkl,1.3,1.4

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

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

Modified Files:
	apps.bkl options.bkl 
Log Message:
reorder libs in apps.bkl and rebake, (remove -- in bkl, got error)
pulled in generic code in wxLuaInterface into the wxLuaState


Index: options.bkl
===================================================================
RCS file: /cvsroot/wxlua/wxLua/apps/build/bakefiles/options.bkl,v
retrieving revision 1.3
retrieving revision 1.4
diff -C2 -d -r1.3 -r1.4
*** options.bkl	26 Nov 2005 14:06:05 -0000	1.3
--- options.bkl	29 Nov 2005 23:52:11 -0000	1.4
***************
*** 17,21 ****
      <!-- module enable/disable option defaults
          NOTE: if you change these defaults, then you should also change the
!               defaults for the --enable-* options in configure script:
                see wxLua/build/autoconf/configure.ac
      -->
--- 17,21 ----
      <!-- module enable/disable option defaults
          NOTE: if you change these defaults, then you should also change the
!               defaults for the -enable-* options in configure script:
                see wxLua/build/autoconf/configure.ac
      -->

Index: apps.bkl
===================================================================
RCS file: /cvsroot/wxlua/wxLua/apps/build/bakefiles/apps.bkl,v
retrieving revision 1.10
retrieving revision 1.11
diff -C2 -d -r1.10 -r1.11
*** apps.bkl	26 Nov 2005 14:06:05 -0000	1.10
--- apps.bkl	29 Nov 2005 23:52:11 -0000	1.11
***************
*** 65,85 ****
          <win32-res>wxlua/src/wxlua.rc</win32-res>
  
!         <!-- Libraries must be put in the right order ! -->
!         <wxlua-lib>wxluadebug</wxlua-lib>
          <wxlua-lib>wxluasocket</wxlua-lib>
!         <wxlua-lib>wxlua</wxlua-lib>
          <wxlua-lib>wxbind</wxlua-lib>
          <wxlua-lib>lua</wxlua-lib>
  
!         <wx-lib>adv</wx-lib>
!         <wx-lib>base</wx-lib>
!         <wx-lib>core</wx-lib>
          <wx-lib>html</wx-lib>
          <wx-lib>media</wx-lib>
          <wx-lib>net</wx-lib>
          <wx-lib>xml</wx-lib>
!         <wx-lib>xrc</wx-lib>
  
-         <wx-lib>stc</wx-lib>
      </exe>
  
--- 65,86 ----
          <win32-res>wxlua/src/wxlua.rc</win32-res>
  
!         <!-- Libraries must be put in the reverse order they'll be loaded -->
          <wxlua-lib>wxluasocket</wxlua-lib>
!         <wxlua-lib>wxluadebug</wxlua-lib>
          <wxlua-lib>wxbind</wxlua-lib>
+         <wxlua-lib>wxlua</wxlua-lib>
          <wxlua-lib>lua</wxlua-lib>
  
!         <wx-lib>stc</wx-lib>
! 
!         <wx-lib>xrc</wx-lib>
          <wx-lib>html</wx-lib>
          <wx-lib>media</wx-lib>
+         <wx-lib>adv</wx-lib>
          <wx-lib>net</wx-lib>
          <wx-lib>xml</wx-lib>
!         <wx-lib>core</wx-lib>
!         <wx-lib>base</wx-lib>
  
      </exe>
  
***************
*** 104,127 ****
          </if>
  
!         <!-- Libraries must be put in the right order ! -->
!         <wxlua-lib>wxluadebug</wxlua-lib>
          <wxlua-lib>wxluasocket</wxlua-lib>
!         <wxlua-lib>wxlua</wxlua-lib>
          <wxlua-lib>wxbind</wxlua-lib>
          <wxlua-lib>lua</wxlua-lib>
  
!         <wx-lib>adv</wx-lib>
!         <wx-lib>base</wx-lib>
!         <wx-lib>core</wx-lib>
          <wx-lib>html</wx-lib>
          <wx-lib>media</wx-lib>
          <wx-lib>net</wx-lib>
          <wx-lib>xml</wx-lib>
!         <wx-lib>xrc</wx-lib>
! 
!         <wx-lib>stc</wx-lib>
! 
!         <!-- Library for wxstedit -->
!         <wx-lib>stedit</wx-lib>
      </exe>
  
--- 105,128 ----
          </if>
  
!         <!-- Libraries must be put in the reverse order they'll be loaded -->
          <wxlua-lib>wxluasocket</wxlua-lib>
!         <wxlua-lib>wxluadebug</wxlua-lib>
          <wxlua-lib>wxbind</wxlua-lib>
+         <wxlua-lib>wxlua</wxlua-lib>
          <wxlua-lib>lua</wxlua-lib>
  
!         <wx-lib>stedit</wx-lib> <!-- Library for wxCode's wxstedit -->
! 
!         <wx-lib>stc</wx-lib>
! 
!         <wx-lib>xrc</wx-lib>
          <wx-lib>html</wx-lib>
          <wx-lib>media</wx-lib>
+         <wx-lib>adv</wx-lib>
          <wx-lib>net</wx-lib>
          <wx-lib>xml</wx-lib>
!         <wx-lib>core</wx-lib>
!         <wx-lib>base</wx-lib>
!         
      </exe>
  

[Wxlua-commit] wxLua/modules/build/bakefiles options.bkl,1.5,1.6

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

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

Modified Files:
	options.bkl 
Log Message:
reorder libs in apps.bkl and rebake, (remove -- in bkl, got error)
pulled in generic code in wxLuaInterface into the wxLuaState


Index: options.bkl
===================================================================
RCS file: /cvsroot/wxlua/wxLua/modules/build/bakefiles/options.bkl,v
retrieving revision 1.5
retrieving revision 1.6
diff -C2 -d -r1.5 -r1.6
*** options.bkl	26 Nov 2005 14:20:30 -0000	1.5
--- options.bkl	29 Nov 2005 23:52:11 -0000	1.6
***************
*** 17,21 ****
      <!-- module enable/disable option defaults
          NOTE: if you change these defaults, then you should also change the
!               defaults for the --enable-* options in configure script:
                see wxLua/build/autoconf/configure.ac
      -->
--- 17,21 ----
      <!-- module enable/disable option defaults
          NOTE: if you change these defaults, then you should also change the
!               defaults for the -enable-* options in configure script:
                see wxLua/build/autoconf/configure.ac
      -->

[Wxlua-commit] wxLua/apps Makefile.in,1.10,1.11

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

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

Modified Files:
	Makefile.in 
Log Message:
reorder libs in apps.bkl and rebake, (remove -- in bkl, got error)
pulled in generic code in wxLuaInterface into the wxLuaState


Index: Makefile.in
===================================================================
RCS file: /cvsroot/wxlua/wxLua/apps/Makefile.in,v
retrieving revision 1.10
retrieving revision 1.11
diff -C2 -d -r1.10 -r1.11
*** Makefile.in	25 Nov 2005 23:06:10 -0000	1.10
--- Makefile.in	29 Nov 2005 23:52:11 -0000	1.11
***************
*** 80,84 ****
  
  @COND_USE_WXLUAAPP_1@../bin/wxlua$(EXEEXT): $(APP_WXLUA_OBJECTS) $(__app_wxlua___win32rc)
! @COND_USE_WXLUAAPP_1@	$(CXX) -o $@ $(APP_WXLUA_OBJECTS) $(LDFLAGS) -L../lib $(LDFLAGS_GUI)  $(WX_LIBS) -lwxluadebug -lwxluasocket -lwxlua -lwxbind -llua
  @COND_USE_WXLUAAPP_1@	
  @COND_USE_WXLUAAPP_1@	$(__app_wxlua___mac_setfilecmd)
--- 80,84 ----
  
  @COND_USE_WXLUAAPP_1@../bin/wxlua$(EXEEXT): $(APP_WXLUA_OBJECTS) $(__app_wxlua___win32rc)
! @COND_USE_WXLUAAPP_1@	$(CXX) -o $@ $(APP_WXLUA_OBJECTS) $(LDFLAGS) -L../lib $(LDFLAGS_GUI)  -lwxluasocket -lwxluadebug -lwxbind -lwxlua -llua $(WX_LIBS)
  @COND_USE_WXLUAAPP_1@	
  @COND_USE_WXLUAAPP_1@	$(__app_wxlua___mac_setfilecmd)
***************
*** 86,90 ****
  
  @COND_USE_WXLUAEDITAPP_1@../bin/wxluaedit$(EXEEXT): $(APP_WXLUAEDIT_OBJECTS) $(__app_wxluaedit___win32rc)
! @COND_USE_WXLUAEDITAPP_1@	$(CXX) -o $@ $(APP_WXLUAEDIT_OBJECTS) $(LDFLAGS) -L../lib $(LDFLAGS_GUI)  $(WX_LIBS) -lwxluadebug -lwxluasocket -lwxlua -lwxbind -llua
  @COND_USE_WXLUAEDITAPP_1@	
  @COND_USE_WXLUAEDITAPP_1@	$(__app_wxluaedit___mac_setfilecmd)
--- 86,90 ----
  
  @COND_USE_WXLUAEDITAPP_1@../bin/wxluaedit$(EXEEXT): $(APP_WXLUAEDIT_OBJECTS) $(__app_wxluaedit___win32rc)
! @COND_USE_WXLUAEDITAPP_1@	$(CXX) -o $@ $(APP_WXLUAEDIT_OBJECTS) $(LDFLAGS) -L../lib $(LDFLAGS_GUI)  -lwxluasocket -lwxluadebug -lwxbind -lwxlua -llua $(WX_LIBS)
  @COND_USE_WXLUAEDITAPP_1@	
  @COND_USE_WXLUAEDITAPP_1@	$(__app_wxluaedit___mac_setfilecmd)

[Wxlua-commit] wxLua/modules/wxlua/src internal.cpp,1.16,1.17

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

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

Modified Files:
	internal.cpp 
Log Message:
compile fix for lconsole
unused var internal.cpp


Index: internal.cpp
===================================================================
RCS file: /cvsroot/wxlua/wxLua/modules/wxlua/src/internal.cpp,v
retrieving revision 1.16
retrieving revision 1.17
diff -C2 -d -r1.16 -r1.17
*** internal.cpp	29 Nov 2005 05:45:09 -0000	1.16
--- internal.cpp	29 Nov 2005 05:57:12 -0000	1.17
***************
*** 1061,1065 ****
  lua_State * LUACALL getDerivedMethod(void *pObject, const char *method, lua_State *L)
  {
!     wxLuaState wxlState(wxLuaState::getDerivedMethod(pObject, method));
      if (!wxlState.Ok())
          return NULL;
--- 1061,1065 ----
  lua_State * LUACALL getDerivedMethod(void *pObject, const char *method, lua_State *L)
  {
!     wxLuaState wxlState(wxLuaState::getDerivedMethod(pObject, method, L));
      if (!wxlState.Ok())
          return NULL;

[Wxlua-commit] wxLua/apps/wxlua/src lconsole.cpp,1.2,1.3

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

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

Modified Files:
	lconsole.cpp 
Log Message:
compile fix for lconsole
unused var internal.cpp


Index: lconsole.cpp
===================================================================
RCS file: /cvsroot/wxlua/wxLua/apps/wxlua/src/lconsole.cpp,v
retrieving revision 1.2
retrieving revision 1.3
diff -C2 -d -r1.2 -r1.3
*** lconsole.cpp	29 Nov 2005 05:45:09 -0000	1.2
--- lconsole.cpp	29 Nov 2005 05:57:12 -0000	1.3
***************
*** 116,120 ****
  wxLuaConsole::wxLuaConsole(wxLuaStandaloneApp *pApp, lua_State *pState)
               : wxFrame(0, -1, wxT("wxLua Console"), wxPoint(0, 0), wxSize(250, 340)),
!                m_pApp(pApp), m_fError(false),
  {
      pApp->SetLuaConsole(this);
--- 116,120 ----
  wxLuaConsole::wxLuaConsole(wxLuaStandaloneApp *pApp, lua_State *pState)
               : wxFrame(0, -1, wxT("wxLua Console"), wxPoint(0, 0), wxSize(250, 340)),
!                m_pApp(pApp), m_fError(false)
  {
      pApp->SetLuaConsole(this);

[Wxlua-commit] wxLua/modules/wxluasocket/src wxldserv.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-serv21610/wxLua/modules/wxluasocket/src

Modified Files:
	wxldserv.cpp 
Log Message:
Makefile - lib order is important
cleanup in lconsole, wxlua app
all static int s_wxXXX lua tags now s_wxluatag_wxXXX to make them easier to find
functions to get the structs with the bindings are prepended with wxLuaXXX
DECLARE/IMPLEMENT_CLASS replaced with either XXX_ABSTRACT/DYNAMIC_CLASS
window ids for the stacktree now ID_WXLUA_XXX


Index: wxldserv.cpp
===================================================================
RCS file: /cvsroot/wxlua/wxLua/modules/wxluasocket/src/wxldserv.cpp,v
retrieving revision 1.2
retrieving revision 1.3
diff -C2 -d -r1.2 -r1.3
*** wxldserv.cpp	26 Nov 2005 03:15:20 -0000	1.2
--- wxldserv.cpp	29 Nov 2005 05:45:10 -0000	1.3
***************
*** 41,45 ****
  // wxLuaDebugServer
  // ----------------------------------------------------------------------------
! IMPLEMENT_CLASS(wxLuaDebugServer, wxLuaDebuggerBase)
  
  wxLuaDebugServer::wxLuaDebugServer(int portNumber) :
--- 41,45 ----
  // wxLuaDebugServer
  // ----------------------------------------------------------------------------
! IMPLEMENT_ABSTRACT_CLASS(wxLuaDebugServer, wxLuaDebuggerBase)
  
  wxLuaDebugServer::wxLuaDebugServer(int portNumber) :

[Wxlua-commit] wxLua/modules/wxlua/src internal.cpp,1.15,1.16 wxlbind.cpp,1.4,1.5 wxlcallb.cpp,1.5,1.6 wxlintrp.cpp,1.4,1.5 wxlstate.cpp,1.8,1.9

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

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

Modified Files:
	internal.cpp wxlbind.cpp wxlcallb.cpp wxlintrp.cpp 
	wxlstate.cpp 
Log Message:
Makefile - lib order is important
cleanup in lconsole, wxlua app
all static int s_wxXXX lua tags now s_wxluatag_wxXXX to make them easier to find
functions to get the structs with the bindings are prepended with wxLuaXXX
DECLARE/IMPLEMENT_CLASS replaced with either XXX_ABSTRACT/DYNAMIC_CLASS
window ids for the stacktree now ID_WXLUA_XXX


Index: internal.cpp
===================================================================
RCS file: /cvsroot/wxlua/wxLua/modules/wxlua/src/internal.cpp,v
retrieving revision 1.15
retrieving revision 1.16
diff -C2 -d -r1.15 -r1.16
*** internal.cpp	28 Nov 2005 06:05:08 -0000	1.15
--- internal.cpp	29 Nov 2005 05:45:09 -0000	1.16
***************
*** 37,62 ****
  #include "wxlua/include/internal.h"
  #include "wxlua/include/wxlcallb.h"
- #include "wxbind/include/wxbind.h"
  #include "wxlua/include/wxlintrp.h"
  
! class wxStyledTextCtrlDocument;   // for void* wxStyledTextCtrl::GetDocPointer()
! 
! #ifdef FindText
! # undef FindText
! #endif
! 
! // always defined in wxLuaWrap.cpp
! extern int s_wxIcon;
! extern int s_wxWindow;
! extern int s_wxEvtHandler;
! extern int s_wxEvent;
! extern int s_wxBitmap;
! 
! //#if defined(__WXGTK__) || defined(__WXMAC__) || defined(__WXMOTIF__)
! //    #include "../../../art/wxlua.xpm"
  //#endif
  
  extern int wxLuaEventListCompareFn(const void *p1, const void *p2); // in wxlbind.cpp
  
  // lua registry table
  const char wxLuaReferences[]  = "wxLuaReferences";
--- 37,53 ----
  #include "wxlua/include/internal.h"
  #include "wxlua/include/wxlcallb.h"
  #include "wxlua/include/wxlintrp.h"
  
! //#ifdef FindText
! //# undef FindText
  //#endif
  
+ extern wxLuaInterpreter    *wxFindLuaInterpreter(lua_State *L);
+ 
  extern int wxLuaEventListCompareFn(const void *p1, const void *p2); // in wxlbind.cpp
  
+ extern int s_wxluatag_wxBitmap;
+ extern int s_wxluatag_wxEvtHandler;
+ 
  // lua registry table
  const char wxLuaReferences[]  = "wxLuaReferences";
***************
*** 1070,1076 ****
  lua_State * LUACALL getDerivedMethod(void *pObject, const char *method, lua_State *L)
  {
!     wxLuaState lS(L);
!     wxCHECK_MSG(lS.Ok(), NULL, wxT("Invalid wxLuaState"));
!     return lS.getDerivedMethod(pObject, method);
  
  /*
--- 1061,1069 ----
  lua_State * LUACALL getDerivedMethod(void *pObject, const char *method, lua_State *L)
  {
!     wxLuaState wxlState(wxLuaState::getDerivedMethod(pObject, method));
!     if (!wxlState.Ok())
!         return NULL;
! 
!     return wxlState.GetLuaState();
  
  /*
***************
*** 1145,1149 ****
          else
          {
!             if (wxlState.getDerivedMethod(pObject, cpIndex, L) != NULL)
              {
                  fFound = true;
--- 1138,1142 ----
          else
          {
!             if (wxlState.getDerivedMethod(pObject, cpIndex, L).Ok())
              {
                  fFound = true;
***************
*** 1294,1298 ****
      int nParams = lua_gettop(L);
  
!     wxEvtHandler *evtHandler = (wxEvtHandler *)wxlState.getuserdatatype(1, s_wxEvtHandler);
  
      switch (nParams)
--- 1287,1291 ----
      int nParams = lua_gettop(L);
  
!     wxEvtHandler *evtHandler = (wxEvtHandler *)wxlState.getuserdatatype(1, s_wxluatag_wxEvtHandler);
  
      switch (nParams)
***************
*** 1421,1425 ****
  #include "../art/help.xpm"
  
!     wxCHECK_MSG(s_wxBitmap != -1, 1, wxT("wxBitmap is not wrapped by wxLua"));
  
      wxLuaState wxlState(L);
--- 1414,1418 ----
  #include "../art/help.xpm"
  
!     wxCHECK_MSG(s_wxluatag_wxBitmap != -1, 1, wxT("wxBitmap is not wrapped by wxLua"));
  
      wxLuaState wxlState(L);
***************
*** 1430,1469 ****
      returns = new wxBitmap(new_xpm);
      wxlState.addToTrackedMemoryList(returns);
!     wxlState.pushuserdatatype(s_wxBitmap, returns );
      lua_setglobal(L, "newBitmap");
  
      returns = new wxBitmap(open_xpm);
      wxlState.addToTrackedMemoryList(returns);
!     wxlState.pushuserdatatype(s_wxBitmap, returns );
      lua_setglobal(L, "openBitmap");
  
      returns = new wxBitmap(save_xpm);
      wxlState.addToTrackedMemoryList(returns);
!     wxlState.pushuserdatatype(s_wxBitmap, returns );
      lua_setglobal(L, "saveBitmap");
  
      returns = new wxBitmap(saveall_xpm);
      wxlState.addToTrackedMemoryList(returns);
!     wxlState.pushuserdatatype(s_wxBitmap, returns );
      lua_setglobal(L, "saveAllBitmap");
  
      returns = new wxBitmap(cut_xpm);
      wxlState.addToTrackedMemoryList(returns);
!     wxlState.pushuserdatatype(s_wxBitmap, returns );
      lua_setglobal(L, "cutBitmap");
  
      returns = new wxBitmap(copy_xpm);
      wxlState.addToTrackedMemoryList(returns);
!     wxlState.pushuserdatatype(s_wxBitmap, returns );
      lua_setglobal(L, "copyBitmap");
  
      returns = new wxBitmap(paste_xpm);
      wxlState.addToTrackedMemoryList(returns);
!     wxlState.pushuserdatatype(s_wxBitmap, returns );
      lua_setglobal(L, "pasteBitmap");
  
      returns = new wxBitmap(help_xpm);
      wxlState.addToTrackedMemoryList(returns);
!     wxlState.pushuserdatatype(s_wxBitmap, returns );
      lua_setglobal(L, "helpBitmap");
  
--- 1423,1462 ----
      returns = new wxBitmap(new_xpm);
      wxlState.addToTrackedMemoryList(returns);
!     wxlState.pushuserdatatype(s_wxluatag_wxBitmap, returns );
      lua_setglobal(L, "newBitmap");
  
      returns = new wxBitmap(open_xpm);
      wxlState.addToTrackedMemoryList(returns);
!     wxlState.pushuserdatatype(s_wxluatag_wxBitmap, returns );
      lua_setglobal(L, "openBitmap");
  
      returns = new wxBitmap(save_xpm);
      wxlState.addToTrackedMemoryList(returns);
!     wxlState.pushuserdatatype(s_wxluatag_wxBitmap, returns );
      lua_setglobal(L, "saveBitmap");
  
      returns = new wxBitmap(saveall_xpm);
      wxlState.addToTrackedMemoryList(returns);
!     wxlState.pushuserdatatype(s_wxluatag_wxBitmap, returns );
      lua_setglobal(L, "saveAllBitmap");
  
      returns = new wxBitmap(cut_xpm);
      wxlState.addToTrackedMemoryList(returns);
!     wxlState.pushuserdatatype(s_wxluatag_wxBitmap, returns );
      lua_setglobal(L, "cutBitmap");
  
      returns = new wxBitmap(copy_xpm);
      wxlState.addToTrackedMemoryList(returns);
!     wxlState.pushuserdatatype(s_wxluatag_wxBitmap, returns );
      lua_setglobal(L, "copyBitmap");
  
      returns = new wxBitmap(paste_xpm);
      wxlState.addToTrackedMemoryList(returns);
!     wxlState.pushuserdatatype(s_wxluatag_wxBitmap, returns );
      lua_setglobal(L, "pasteBitmap");
  
      returns = new wxBitmap(help_xpm);
      wxlState.addToTrackedMemoryList(returns);
!     wxlState.pushuserdatatype(s_wxluatag_wxBitmap, returns );
      lua_setglobal(L, "helpBitmap");
  

Index: wxlstate.cpp
===================================================================
RCS file: /cvsroot/wxlua/wxLua/modules/wxlua/src/wxlstate.cpp,v
retrieving revision 1.8
retrieving revision 1.9
diff -C2 -d -r1.8 -r1.9
*** wxlstate.cpp	28 Nov 2005 06:05:08 -0000	1.8
--- wxlstate.cpp	29 Nov 2005 05:45:09 -0000	1.9
***************
*** 42,47 ****
  #include "wxlua/include/wxlstate.h"
  #include "wxlua/include/wxlcallb.h"
! #include "wxbind/include/wxbind.h"
  #include "wxlua/include/wxlintrp.h"
  
  extern int wxLuaEventListCompareFn(const void *p1, const void *p2);    // wxlbind.cpp
--- 42,48 ----
  #include "wxlua/include/wxlstate.h"
  #include "wxlua/include/wxlcallb.h"
! //#include "wxbind/include/wxbind.h"
  #include "wxlua/include/wxlintrp.h"
+ #include "wxlua/include/internal.h"
  
  extern int wxLuaEventListCompareFn(const void *p1, const void *p2);    // wxlbind.cpp
***************
*** 50,53 ****
--- 51,58 ----
  const char *wxLuaNull;       // in internal.cpp
  
+ extern int s_wxluatag_wxWindow;
+ 
+ wxLuaState wxNullLuaState;
+ 
  // ----------------------------------------------------------------------------
  // wxFindWindowByPointer - find a window by it's pointer
***************
*** 206,211 ****
  
      // always add wxWidgets binding
!     m_bindings.Append(new wx_Binding());
!     m_bindings.DeleteContents(true);
  }
  
--- 211,225 ----
  
      // always add wxWidgets binding
!     //m_bindings.Append(new wx_Binding()); // FIXME remove this
!     //m_bindings.DeleteContents(true);
! 
!     m_bindings.DeleteContents(false);
! 
!     wxLuaBindingList::Node *node;
!     for (node = wxLuaBinding::GetBindingsList()->GetFirst(); node; node = node->GetNext() )
!     {
!         wxLuaBinding* binding = node->GetData();
!         m_bindings.Append(binding);
!     }
  }
  
***************
*** 1113,1117 ****
      {
          // if the object we are referencing is derived from wxWindow
!         if (IsDerivedClass(iTag, s_wxWindow))
          {
              wxWindow *win = wxDynamicCast(data, wxWindow);
--- 1127,1131 ----
      {
          // if the object we are referencing is derived from wxWindow
!         if (IsDerivedClass(iTag, s_wxluatag_wxWindow))
          {
              wxWindow *win = wxDynamicCast(data, wxWindow);
***************
*** 1492,1496 ****
  // If the method can be found, push it on to the Lua stack and return 1
  // otherwise return 0 and nothing is pushed.
! lua_State* wxLuaState::getDerivedMethod(void *pObject, const char *method, lua_State *L)
  {
      if (L)
--- 1506,1510 ----
  // If the method can be found, push it on to the Lua stack and return 1
  // otherwise return 0 and nothing is pushed.
! wxLuaState wxLuaState::getDerivedMethod(void *pObject, const char *method, lua_State *L)
  {
      if (L)
***************
*** 1504,1508 ****
                  wxLuaObject *pLuaObject = (wxLuaObject *) pHashTable->Get(lua2wx(method));
                  if ((pLuaObject != NULL) && pLuaObject->GetObject())
!                     return pLuaObject->GetLuaState();
              }
          }
--- 1518,1522 ----
                  wxLuaObject *pLuaObject = (wxLuaObject *) pHashTable->Get(lua2wx(method));
                  if ((pLuaObject != NULL) && pLuaObject->GetObject())
!                     return pLuaObject->GetwxLuaState();
              }
          }
***************
*** 1522,1526 ****
                      wxLuaObject *pLuaObject = (wxLuaObject *) pHashTable->Get(lua2wx(method));
                      if ((pLuaObject != NULL) && pLuaObject->GetObject())
!                         return pLuaObject->GetLuaState();
                  }
              }
--- 1536,1540 ----
                      wxLuaObject *pLuaObject = (wxLuaObject *) pHashTable->Get(lua2wx(method));
                      if ((pLuaObject != NULL) && pLuaObject->GetObject())
!                         return pLuaObject->GetwxLuaState();
                  }
              }
***************
*** 1528,1532 ****
      }
  
!     return NULL;
  }
  
--- 1542,1547 ----
      }
  
!     wxLuaState wxlState;
!     return wxlState;
  }
  

Index: wxlbind.cpp
===================================================================
RCS file: /cvsroot/wxlua/wxLua/modules/wxlua/src/wxlbind.cpp,v
retrieving revision 1.4
retrieving revision 1.5
diff -C2 -d -r1.4 -r1.5
*** wxlbind.cpp	28 Nov 2005 06:05:08 -0000	1.4
--- wxlbind.cpp	29 Nov 2005 05:45:09 -0000	1.5
***************
*** 49,53 ****
  // ----------------------------------------------------------------------------
  
! IMPLEMENT_CLASS(wxLuaBinding, wxObject)
  
  wxLuaBinding::wxLuaBinding() : wxObject(),
--- 49,55 ----
  // ----------------------------------------------------------------------------
  
! IMPLEMENT_DYNAMIC_CLASS(wxLuaBinding, wxObject)
! 
! wxLuaBindingList wxLuaBinding::sm_bindings;
  
  wxLuaBinding::wxLuaBinding() : wxObject(),

Index: wxlintrp.cpp
===================================================================
RCS file: /cvsroot/wxlua/wxLua/modules/wxlua/src/wxlintrp.cpp,v
retrieving revision 1.4
retrieving revision 1.5
diff -C2 -d -r1.4 -r1.5
*** wxlintrp.cpp	28 Nov 2005 06:05:08 -0000	1.4
--- wxlintrp.cpp	29 Nov 2005 05:45:09 -0000	1.5
***************
*** 30,34 ****
  #include "wxlua/include/internal.h"
  
- extern int s_wxLuaInterpreter;
  extern bool wxLuaCleanupWindows(wxList *list, bool only_check); // in wxlstate.cpp
  
--- 30,33 ----

Index: wxlcallb.cpp
===================================================================
RCS file: /cvsroot/wxlua/wxLua/modules/wxlua/src/wxlcallb.cpp,v
retrieving revision 1.5
retrieving revision 1.6
diff -C2 -d -r1.5 -r1.6
*** wxlcallb.cpp	28 Nov 2005 06:05:08 -0000	1.5
--- wxlcallb.cpp	29 Nov 2005 05:45:09 -0000	1.6
***************
*** 26,30 ****
  #include "wxlua/include/wxlcallb.h"
  
! extern int s_wxEvent;
  
  //-----------------------------------------------------------------------------
--- 26,30 ----
  #include "wxlua/include/wxlcallb.h"
  
! extern int s_wxluatag_wxEvent;
  
  //-----------------------------------------------------------------------------
***************
*** 32,36 ****
  //-----------------------------------------------------------------------------
  
! IMPLEMENT_CLASS(wxLuaCallback, wxEvtHandler);
  
  // Encapsulate a lua function reference for use by a event callback
--- 32,36 ----
  //-----------------------------------------------------------------------------
  
! IMPLEMENT_ABSTRACT_CLASS(wxLuaCallback, wxEvtHandler);
  
  // Encapsulate a lua function reference for use by a event callback
***************
*** 133,137 ****
          return;
  
!     int eventClassTag = s_wxEvent;
  
      const WXLUAEVENT *pLuaEvent = m_wxlState.GetLuaEvent(pEvent);
--- 133,137 ----
          return;
  
!     int eventClassTag = s_wxluatag_wxEvent;
  
      const WXLUAEVENT *pLuaEvent = m_wxlState.GetLuaEvent(pEvent);
***************
*** 162,166 ****
  // ----------------------------------------------------------------------------
  
! IMPLEMENT_CLASS(wxLuaDestroyCallback, wxEvtHandler);
  
  wxLuaDestroyCallback::wxLuaDestroyCallback(const wxLuaState& state, int id,
--- 162,166 ----
  // ----------------------------------------------------------------------------
  
! IMPLEMENT_ABSTRACT_CLASS(wxLuaDestroyCallback, wxEvtHandler);
  
  wxLuaDestroyCallback::wxLuaDestroyCallback(const wxLuaState& state, int id,

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

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

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

Modified Files:
	splttree.cpp staktree.cpp wxldebug.cpp 
Log Message:
Makefile - lib order is important
cleanup in lconsole, wxlua app
all static int s_wxXXX lua tags now s_wxluatag_wxXXX to make them easier to find
functions to get the structs with the bindings are prepended with wxLuaXXX
DECLARE/IMPLEMENT_CLASS replaced with either XXX_ABSTRACT/DYNAMIC_CLASS
window ids for the stacktree now ID_WXLUA_XXX


Index: splttree.cpp
===================================================================
RCS file: /cvsroot/wxlua/wxLua/modules/wxluadebug/src/splttree.cpp,v
retrieving revision 1.5
retrieving revision 1.6
diff -C2 -d -r1.5 -r1.6
*** splttree.cpp	25 Nov 2005 22:00:36 -0000	1.5
--- splttree.cpp	29 Nov 2005 05:45:10 -0000	1.6
***************
*** 52,58 ****
  
  #if USE_GENERIC_TREECTRL
! IMPLEMENT_CLASS(wxRemotelyScrolledTreeCtrl, wxGenericTreeCtrl)
  #else
! IMPLEMENT_CLASS(wxRemotelyScrolledTreeCtrl, wxTreeCtrl)
  #endif
  
--- 52,58 ----
  
  #if USE_GENERIC_TREECTRL
! IMPLEMENT_ABSTRACT_CLASS(wxRemotelyScrolledTreeCtrl, wxGenericTreeCtrl)
  #else
! IMPLEMENT_ABSTRACT_CLASS(wxRemotelyScrolledTreeCtrl, wxTreeCtrl)
  #endif
  
***************
*** 143,147 ****
          UNREFERENCED_PARAMETER(yPos);
          UNREFERENCED_PARAMETER(noRefresh);
! # endif    
  #endif
  }
--- 143,147 ----
          UNREFERENCED_PARAMETER(yPos);
          UNREFERENCED_PARAMETER(noRefresh);
! # endif
  #endif
  }
***************
*** 165,169 ****
  # ifdef UNREFERENCED_PARAMETER
      UNREFERENCED_PARAMETER(orient);
! # endif    
  #endif
      return 0;
--- 165,169 ----
  # ifdef UNREFERENCED_PARAMETER
      UNREFERENCED_PARAMETER(orient);
! # endif
  #endif
      return 0;
***************
*** 223,227 ****
  # ifdef UNREFERENCED_PARAMETER
      UNREFERENCED_PARAMETER(dc);
! # endif  
  #endif
  }
--- 223,227 ----
  # ifdef UNREFERENCED_PARAMETER
      UNREFERENCED_PARAMETER(dc);
! # endif
  #endif
  }
***************
*** 500,504 ****
   */
  
! IMPLEMENT_CLASS(wxTreeCompanionWindow, wxWindow)
  
  BEGIN_EVENT_TABLE(wxTreeCompanionWindow, wxWindow)
--- 500,504 ----
   */
  
! IMPLEMENT_ABSTRACT_CLASS(wxTreeCompanionWindow, wxWindow)
  
  BEGIN_EVENT_TABLE(wxTreeCompanionWindow, wxWindow)
***************
*** 632,636 ****
   */
  
! IMPLEMENT_CLASS(wxThinSplitterWindow, wxSplitterWindow)
  
  BEGIN_EVENT_TABLE(wxThinSplitterWindow, wxSplitterWindow)
--- 632,636 ----
   */
  
! IMPLEMENT_ABSTRACT_CLASS(wxThinSplitterWindow, wxSplitterWindow)
  
  BEGIN_EVENT_TABLE(wxThinSplitterWindow, wxSplitterWindow)
***************
*** 717,721 ****
   */
  
! IMPLEMENT_CLASS(wxSplitterScrolledWindow, wxScrolledWindow)
  
  BEGIN_EVENT_TABLE(wxSplitterScrolledWindow, wxScrolledWindow)
--- 717,721 ----
   */
  
! IMPLEMENT_ABSTRACT_CLASS(wxSplitterScrolledWindow, wxScrolledWindow)
  
  BEGIN_EVENT_TABLE(wxSplitterScrolledWindow, wxScrolledWindow)

Index: wxldebug.cpp
===================================================================
RCS file: /cvsroot/wxlua/wxLua/modules/wxluadebug/src/wxldebug.cpp,v
retrieving revision 1.3
retrieving revision 1.4
diff -C2 -d -r1.3 -r1.4
*** wxldebug.cpp	26 Nov 2005 08:46:58 -0000	1.3
--- wxldebug.cpp	29 Nov 2005 05:45:10 -0000	1.4
***************
*** 44,48 ****
  // ----------------------------------------------------------------------------
  
! IMPLEMENT_CLASS(wxLuaBuffer, wxObject)
  
  // ----------------------------------------------------------------------------
--- 44,48 ----
  // ----------------------------------------------------------------------------
  
! IMPLEMENT_ABSTRACT_CLASS(wxLuaBuffer, wxObject)
  
  // ----------------------------------------------------------------------------
***************
*** 50,54 ****
  // ----------------------------------------------------------------------------
  
! IMPLEMENT_CLASS(wxLuaDebuggerBase, wxEvtHandler)
  
  // ----------------------------------------------------------------------------
--- 50,54 ----
  // ----------------------------------------------------------------------------
  
! IMPLEMENT_ABSTRACT_CLASS(wxLuaDebuggerBase, wxEvtHandler)
  
  // ----------------------------------------------------------------------------

Index: staktree.cpp
===================================================================
RCS file: /cvsroot/wxlua/wxLua/modules/wxluadebug/src/staktree.cpp,v
retrieving revision 1.7
retrieving revision 1.8
diff -C2 -d -r1.7 -r1.8
*** staktree.cpp	26 Nov 2005 08:46:58 -0000	1.7
--- staktree.cpp	29 Nov 2005 05:45:10 -0000	1.8
***************
*** 102,105 ****
--- 102,113 ----
  // wxLuaStackFrame
  // ----------------------------------------------------------------------------
+ IMPLEMENT_ABSTRACT_CLASS(wxLuaStackFrame, wxDialog)
+ 
+ BEGIN_EVENT_TABLE(wxLuaStackFrame, wxDialog)
+     EVT_SIZE(wxLuaStackFrame::OnSizeWindow)
+     EVT_COMBOBOX(ID_WXLUA_STACKFRAME_COMBO, wxLuaStackFrame::OnSelectStack)
+     EVT_TREE_ITEM_EXPANDING(ID_WXLUA_STACKFRAME_STACKTREE, wxLuaStackFrame::OnItemExpanding)
+     EVT_BUTTON(ID_WXLUA_STACKFRAME_DISMISS_BUTTON, wxLuaStackFrame::OnCloseDialog)
+ END_EVENT_TABLE()
  
  wxLuaStackFrame::wxLuaStackFrame( wxWindow *parent,
***************
*** 108,112 ****
                                    const wxSize     &size,
                                    wxLuaDebugServer *pServer)
!                 : wxDialog(parent, idSTACK_FRAME, title, pos, size,
                    wxCAPTION | wxSYSTEM_MENU | wxDIALOG_MODAL | wxRESIZE_BORDER),
           m_luaInterface(NULL),
--- 116,120 ----
                                    const wxSize     &size,
                                    wxLuaDebugServer *pServer)
!                 : wxDialog(parent, ID_WXLUA_STACKFRAME, title, pos, size,
                    wxCAPTION | wxSYSTEM_MENU | wxDIALOG_MODAL | wxRESIZE_BORDER),
           m_luaInterface(NULL),
***************
*** 121,125 ****
                                    const wxSize     &size,
                                    wxLuaInterface   *luaInterface)
!                 : wxDialog(parent, idSTACK_FRAME, title, pos, size,
                    wxCAPTION | wxSYSTEM_MENU | wxDIALOG_MODAL | wxRESIZE_BORDER),
                    m_luaInterface(luaInterface),
--- 129,133 ----
                                    const wxSize     &size,
                                    wxLuaInterface   *luaInterface)
!                 : wxDialog(parent, ID_WXLUA_STACKFRAME, title, pos, size,
                    wxCAPTION | wxSYSTEM_MENU | wxDIALOG_MODAL | wxRESIZE_BORDER),
                    m_luaInterface(luaInterface),
***************
*** 151,155 ****
  
      m_stackComboBox = new wxComboBox( this,
!                                       idSTACK_COMBOBOX,
                                        wxEmptyString,
                                        wxPoint(0, 0),
--- 159,163 ----
  
      m_stackComboBox = new wxComboBox( this,
!                                       ID_WXLUA_STACKFRAME_COMBO,
                                        wxEmptyString,
                                        wxPoint(0, 0),
***************
*** 160,164 ****
  
      m_scrolledWindow = new wxSplitterScrolledWindow(this,
!                                                     idSCROLLED_WINDOW,
                                                      wxDefaultPosition,
                                                      wxDefaultSize,
--- 168,172 ----
  
      m_scrolledWindow = new wxSplitterScrolledWindow(this,
!                                                     ID_WXLUA_STACKFRAME_SCRWIN,
                                                      wxDefaultPosition,
                                                      wxDefaultSize,
***************
*** 168,172 ****
  #if wxCHECK_VERSION(2, 3, 0)
      m_dismissButton = new wxButton(this,
!                                    idDISMISS_BUTTON,
                                     _("Cancel"),
                                     wxDefaultPosition,
--- 176,180 ----
  #if wxCHECK_VERSION(2, 3, 0)
      m_dismissButton = new wxButton(this,
!                                    ID_WXLUA_STACKFRAME_DISMISS_BUTTON,
                                     _("Cancel"),
                                     wxDefaultPosition,
***************
*** 175,179 ****
  #else
      m_dismissButton = new wxButton(this,
!                                    idDISMISS_BUTTON,
                                     _("Cancel"),
                                     wxDefaultPosition,
--- 183,187 ----
  #else
      m_dismissButton = new wxButton(this,
!                                    ID_WXLUA_STACKFRAME_DISMISS_BUTTON,
                                     _("Cancel"),
                                     wxDefaultPosition,
***************
*** 182,186 ****
      m_dismissButton->SetDefault();
      m_treeSplitter = new wxThinSplitterWindow(m_scrolledWindow,
!                                               idSPLITTER_WINDOW,
                                                wxDefaultPosition,
                                                wxDefaultSize,
--- 190,194 ----
      m_dismissButton->SetDefault();
      m_treeSplitter = new wxThinSplitterWindow(m_scrolledWindow,
!                                               ID_WXLUA_STACKFRAME_SPLITWIN,
                                                wxDefaultPosition,
                                                wxDefaultSize,
***************
*** 191,195 ****
  #if wxCHECK_VERSION(2, 3, 0)
      m_treeControl = new wxLuaStackTree(m_treeSplitter,
!                                   idSTACKTREE_CTRL,
                                    wxDefaultPosition,
                                    wxDefaultSize,
--- 199,203 ----
  #if wxCHECK_VERSION(2, 3, 0)
      m_treeControl = new wxLuaStackTree(m_treeSplitter,
!                                   ID_WXLUA_STACKFRAME_STACKTREE,
                                    wxDefaultPosition,
                                    wxDefaultSize,
***************
*** 197,201 ****
  #else
      m_treeControl = new wxLuaStackTree(m_treeSplitter,
!                                   idSTACKTREE_CTRL,
                                    wxDefaultPosition,
                                    wxDefaultSize,
--- 205,209 ----
  #else
      m_treeControl = new wxLuaStackTree(m_treeSplitter,
!                                   ID_WXLUA_STACKFRAME_STACKTREE,
                                    wxDefaultPosition,
                                    wxDefaultSize,
***************
*** 203,207 ****
  #endif
      m_valueSplitter = new wxThinSplitterWindow(m_treeSplitter,
!                                                idVALUE_SPLITTER_WINDOW,
                                                 wxDefaultPosition,
                                                 wxDefaultSize,
--- 211,215 ----
  #endif
      m_valueSplitter = new wxThinSplitterWindow(m_treeSplitter,
!                                                ID_WXLUA_STACKFRAME_VALUE_SPLITWIN,
                                                 wxDefaultPosition,
                                                 wxDefaultSize,
***************
*** 210,219 ****
  
      m_firstValueWindow = new wxLuaStackDataWindow(m_valueSplitter,
!                                              idFIRST_VALUE_WINDOW,
                                               wxDefaultPosition,
                                               wxDefaultSize,
                                               wxNO_BORDER);
      m_secondValueWindow = new wxLuaStackDataWindow(m_valueSplitter,
!                                              idSECOND_VALUE_WINDOW,
                                               wxDefaultPosition,
                                               wxDefaultSize,
--- 218,227 ----
  
      m_firstValueWindow = new wxLuaStackDataWindow(m_valueSplitter,
!                                              ID_WXLUA_STACKFRAME_VALUE_WIN1,
                                               wxDefaultPosition,
                                               wxDefaultSize,
                                               wxNO_BORDER);
      m_secondValueWindow = new wxLuaStackDataWindow(m_valueSplitter,
!                                              ID_WXLUA_STACKFRAME_VALUE_WIN2,
                                               wxDefaultPosition,
                                               wxDefaultSize,
***************
*** 282,292 ****
  }
  
- BEGIN_EVENT_TABLE(wxLuaStackFrame, wxDialog)
-     EVT_SIZE(wxLuaStackFrame::OnSizeWindow)
-     EVT_COMBOBOX(idSTACK_COMBOBOX, wxLuaStackFrame::OnSelectStack)
-     EVT_TREE_ITEM_EXPANDING(idSTACKTREE_CTRL, wxLuaStackFrame::OnItemExpanding)
-     EVT_BUTTON(idDISMISS_BUTTON, wxLuaStackFrame::OnCloseDialog)
- END_EVENT_TABLE()
- 
  void wxLuaStackFrame::OnSizeWindow(wxSizeEvent &event)
  {
--- 290,293 ----
***************
*** 462,469 ****
      else
      {
!         size_t count;
!         for (count = 0; count < pSortedList->Count(); ++count)
          {
!             const wxLuaDebugDataItem *item = pSortedList->Item(count);
  
              int nOffset = 1;
--- 463,470 ----
      else
      {
!         size_t n, count = pSortedList->Count();
!         for (n = 0; n < count; ++n)
          {
!             const wxLuaDebugDataItem *item = pSortedList->Item(n);
  
              int nOffset = 1;
***************
*** 491,494 ****
--- 492,499 ----
  // wxLuaStackTree
  // ----------------------------------------------------------------------------
+ IMPLEMENT_ABSTRACT_CLASS(wxLuaStackTree, wxRemotelyScrolledTreeCtrl)
+ 
+ BEGIN_EVENT_TABLE(wxLuaStackTree, wxRemotelyScrolledTreeCtrl)
+ END_EVENT_TABLE()
  
  wxLuaStackTree::wxLuaStackTree( wxWindow    *parent,
***************
*** 512,520 ****
  }
  
- IMPLEMENT_CLASS(wxLuaStackTree, wxRemotelyScrolledTreeCtrl)
- 
- BEGIN_EVENT_TABLE(wxLuaStackTree, wxRemotelyScrolledTreeCtrl)
- END_EVENT_TABLE()
- 
  wxLuaStackTree::~wxLuaStackTree()
  {
--- 517,520 ----
***************
*** 526,529 ****
--- 526,531 ----
  // wxLuaStackDataWindow
  // ----------------------------------------------------------------------------
+ IMPLEMENT_ABSTRACT_CLASS(wxLuaStackDataWindow, wxTreeCompanionWindow)
+ 
  BEGIN_EVENT_TABLE(wxLuaStackDataWindow, wxTreeCompanionWindow)
  END_EVENT_TABLE()