wxlua-commit — CVS commits of wxLua

[Wxlua-commit] wxLua/modules/wxluadebug/src wxldebug.cpp, 1.41, 1.42

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

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

Modified Files:
	wxldebug.cpp 
Log Message:
Simplify the wxLuaWinDestroyCallback to reuse the table of objects instead of it's own
and have windows push into Lua the same as other objects.


Index: wxldebug.cpp
===================================================================
RCS file: /cvsroot/wxlua/wxLua/modules/wxluadebug/src/wxldebug.cpp,v
retrieving revision 1.41
retrieving revision 1.42
diff -C2 -d -r1.41 -r1.42
*** wxldebug.cpp	2 Aug 2007 23:08:58 -0000	1.41
--- wxldebug.cpp	3 Aug 2007 22:17:17 -0000	1.42
***************
*** 447,472 ****
      wxString s = wxString::Format(wxT("%p"), lua_touserdata(L, index));
  
!     void* udata = lua_touserdata(L, index);
! 
!     // Convert our known keys to something more readable
!     if (udata == &wxlua_lreg_references_key)
!         s += wxT(" - wxLua References");
!     else if (udata == &wxlua_lreg_classes_key)
!         s += wxT(" - wxLuaBindClasses");
!     else if (udata == &wxlua_lreg_derivedmethods_key)
!         s += wxT(" - wxLua Derived Class Methods");
!     else if (udata == &wxlua_lreg_wxluastaterefdata_key)
!         s += wxT(" - wxLuaStateRefData");
!     else if (udata == &wxlua_lreg_objects_key)
!         s += wxT(" - wxLua Pushed Userdata");
!     else if (udata == &wxlua_lreg_callbaseclassfunc_key)
!         s += wxT(" - CallBaseClassFunc");
  
!     else if (udata == &wxlua_lreg_metatable_tag_key)
!         s += wxT(" - wxLua Metatable Class Tag");
!     else if (udata == &wxlua_lreg_metatable_class_key)
!         s += wxT(" - wxLua Metatable wxLuaBindClass");
  
!     if (full)
      {
          int nTag = wxlua_ttag(L, index);
--- 447,474 ----
      wxString s = wxString::Format(wxT("%p"), lua_touserdata(L, index));
  
!     if (!full)
!     {
!         void* udata = lua_touserdata(L, index);
  
!         // Convert our known keys to something more readable
!         if (udata == &wxlua_lreg_references_key)
!             s += wxT(" - wxLua References");
!         else if (udata == &wxlua_lreg_classes_key)
!             s += wxT(" - wxLuaBindClasses");
!         else if (udata == &wxlua_lreg_derivedmethods_key)
!             s += wxT(" - wxLua Derived Class Methods");
!         else if (udata == &wxlua_lreg_wxluastaterefdata_key)
!             s += wxT(" - wxLuaStateRefData");
!         else if (udata == &wxlua_lreg_objects_key)
!             s += wxT(" - wxLua Pushed Userdata");
!         else if (udata == &wxlua_lreg_callbaseclassfunc_key)
!             s += wxT(" - CallBaseClassFunc");
  
!         else if (udata == &wxlua_lreg_metatable_tag_key)
!             s += wxT(" - wxLua Metatable Class Tag");
!         else if (udata == &wxlua_lreg_metatable_class_key)
!             s += wxT(" - wxLua Metatable wxLuaBindClass");
!     }
!     else // is full userdata
      {
          int nTag = wxlua_ttag(L, index);

[Wxlua-commit] wxLua/modules/wxlua/include wxlbind.h, 1.57, 1.58 wxlcallb.h, 1.18, 1.19 wxlstate.h, 1.89, 1.90

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

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

Modified Files:
	wxlbind.h wxlcallb.h wxlstate.h 
Log Message:
Simplify the wxLuaWinDestroyCallback to reuse the table of objects instead of it's own
and have windows push into Lua the same as other objects.


Index: wxlcallb.h
===================================================================
RCS file: /cvsroot/wxlua/wxLua/modules/wxlua/include/wxlcallb.h,v
retrieving revision 1.18
retrieving revision 1.19
diff -C2 -d -r1.18 -r1.19
*** wxlcallb.h	26 Jul 2007 18:56:38 -0000	1.18
--- wxlcallb.h	3 Aug 2007 22:17:16 -0000	1.19
***************
*** 28,31 ****
--- 28,34 ----
  // ----------------------------------------------------------------------------
  
+ #define WXLUACALLBACK_NOROUTINE 1000000 // use this for the lua_func_stack_idx
+                                         // param of the constructor for no Lua routine
+ 
  class WXDLLIMPEXP_WXLUA wxLuaCallback : public wxObject
  {
***************
*** 73,77 ****
  // wxLuaWinDestroyCallback - Handle the wxEVT_DESTROY event from wxWindows.
  //
! // Removes the reference to the window so lua won't delete it.
  //
  // Do NOT delete this, the wxEvtHandler deletes the callback user data itself.
--- 76,82 ----
  // wxLuaWinDestroyCallback - Handle the wxEVT_DESTROY event from wxWindows.
  //
! // Clears the metatable for the wxWindow userdata so that after a call to
! // win:Destroy() calling a function on win won't crash wxLua, but will generate
! // an error in Lua.
  //
  // Do NOT delete this, the wxEvtHandler deletes the callback user data itself.
***************
*** 81,87 ****
  {
  public:
!     wxLuaWinDestroyCallback(const wxLuaState& state,
!                             wxWindowID id, wxEvtHandler *evtHandler,
!                             int iTag);
  
      virtual ~wxLuaWinDestroyCallback();
--- 86,90 ----
  {
  public:
!     wxLuaWinDestroyCallback(const wxLuaState& state, wxWindow *win, int iTag);
  
      virtual ~wxLuaWinDestroyCallback();
***************
*** 89,95 ****
      void ClearwxLuaState() { m_wxlState.UnRef(); }
  
!     wxLuaState GetwxLuaState() const    { return m_wxlState; }
!     int GetId() const                   { return m_id; }
!     wxEvtHandler* GetEvtHandler() const { return m_evtHandler; }
  
      // Central event handler that calls OnDestroy() for the actual
--- 92,97 ----
      void ClearwxLuaState() { m_wxlState.UnRef(); }
  
!     wxLuaState GetwxLuaState() const { return m_wxlState; }
!     wxWindow* GetWindow() const      { return m_window; }
  
      // Central event handler that calls OnDestroy() for the actual
***************
*** 101,107 ****
  
  protected:
!     wxLuaState    m_wxlState;   // store it since we're added to a list of it's callbacks.
!     wxEvtHandler* m_evtHandler;
!     int           m_id;
  
  private:
--- 103,108 ----
  
  protected:
!     wxLuaState    m_wxlState; // store it since we're added to a list of it's callbacks.
!     wxWindow*     m_window;
  
  private:

Index: wxlbind.h
===================================================================
RCS file: /cvsroot/wxlua/wxLua/modules/wxlua/include/wxlbind.h,v
retrieving revision 1.57
retrieving revision 1.58
diff -C2 -d -r1.57 -r1.58
*** wxlbind.h	26 Jul 2007 18:56:38 -0000	1.57
--- wxlbind.h	3 Aug 2007 22:17:16 -0000	1.58
***************
*** 75,79 ****
  // copies of wxlua arg tags for binding types that are used very often
  extern WXDLLIMPEXP_DATA_WXLUA(int) g_wxluatag_wxLuaFunction;     // The lua tag for wxLuaFunctions.
- extern WXDLLIMPEXP_DATA_WXLUA(int) g_wxluatag_wxWinDestroyTable; // The lua tag for the wxWindow destroy tracking table
  extern WXDLLIMPEXP_DATA_WXLUA(int) g_wxluatag_NULL;              // The lua tag for NULL pointer
  extern WXDLLIMPEXP_DATA_WXLUA(int) g_wxluatag_wxEvent;           // The lua tag for wxEvents
--- 75,78 ----

Index: wxlstate.h
===================================================================
RCS file: /cvsroot/wxlua/wxLua/modules/wxlua/include/wxlstate.h,v
retrieving revision 1.89
retrieving revision 1.90
diff -C2 -d -r1.89 -r1.90
*** wxlstate.h	1 Aug 2007 19:15:37 -0000	1.89
--- wxlstate.h	3 Aug 2007 22:17:16 -0000	1.90
***************
*** 82,87 ****
  #define WXLUA_LREG_OBJECTS           5
  #define WXLUA_LREG_CALLBASECLASSFUNC 6
! #define WXLUA_METATABLE_TAG          7
! #define WXLUA_METATABLE_CLASS        8
  
  // Light user data used as keys in the lua registry table for wxLua items.
--- 82,87 ----
  #define WXLUA_LREG_OBJECTS           5
  #define WXLUA_LREG_CALLBASECLASSFUNC 6
! #define WXLUA_METATABLE_TAG          8
! #define WXLUA_METATABLE_CLASS        9
  
  // Light user data used as keys in the lua registry table for wxLua items.
***************
*** 104,108 ****
  #define wxlua_pushkey_wxLuaReferences(L) lua_pushlightuserdata(L, &wxlua_lreg_references_key)
  // Push a key that is an index in the LUA_REGISTRYINDEX table that is a table
! // t[wxLuaBindClass.name] = wxLuaBindClass, where the wxLuaBindClass is a lightuserdata.
  #define wxlua_pushkey_wxLuaClasses(L) lua_pushlightuserdata(L, &wxlua_lreg_classes_key)
  // Push a key that is an index in the LUA_REGISTRYINDEX table that is a table
--- 104,108 ----
  #define wxlua_pushkey_wxLuaReferences(L) lua_pushlightuserdata(L, &wxlua_lreg_references_key)
  // Push a key that is an index in the LUA_REGISTRYINDEX table that is a table
! // t[wxLuaBindClass.name] = wxLuaBindClass, where the wxLuaBindClass struct is a lightuserdata.
  #define wxlua_pushkey_wxLuaClasses(L) lua_pushlightuserdata(L, &wxlua_lreg_classes_key)
  // Push a key that is an index in the LUA_REGISTRYINDEX table that is a table
***************
*** 162,165 ****
--- 162,169 ----
  //   wxlua_pushkey_wxLuaObjects Lua registry table.
  WXDLLIMPEXP_WXLUA void LUACALL wxlua_tuntrackuserdata(lua_State* L, const void* u);
+ // If an object was pushed into Lua using wxlua_tpushusertag with track=true
+ //   then this function will remove the metable of the object being tracked in the
+ //   wxlua_pushkey_wxLuaObjects Lua registry table.
+ WXDLLIMPEXP_WXLUA void LUACALL wxlua_tcleartrackedmetatable(lua_State* L, const void* u);
  // Get the numeric tag of the object at the stack index using the metatable's "tag" key.
  //   returns WXLUA_NOTAG if the metatable of the object doesn't have a "tag"

[Wxlua-commit] wxLua/modules/wxlua/src wxlbind.cpp, 1.90, 1.91 wxlcallb.cpp, 1.37, 1.38 wxlstate.cpp, 1.127, 1.128

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

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

Modified Files:
	wxlbind.cpp wxlcallb.cpp wxlstate.cpp 
Log Message:
Simplify the wxLuaWinDestroyCallback to reuse the table of objects instead of it's own
and have windows push into Lua the same as other objects.


Index: wxlstate.cpp
===================================================================
RCS file: /cvsroot/wxlua/wxLua/modules/wxlua/src/wxlstate.cpp,v
retrieving revision 1.127
retrieving revision 1.128
diff -C2 -d -r1.127 -r1.128
*** wxlstate.cpp	2 Aug 2007 23:08:57 -0000	1.127
--- wxlstate.cpp	3 Aug 2007 22:17:16 -0000	1.128
***************
*** 399,402 ****
--- 399,417 ----
  }
  
+ void LUACALL wxlua_tcleartrackedmetatable(lua_State *L, const void *u)
+ {
+     wxlua_pushkey_wxLuaObjects(L);
+     lua_rawget(L, LUA_REGISTRYINDEX); // pop key, push result (the object table)
+     lua_pushlightuserdata(L, (void*)u);
+     lua_rawget(L, -2);
+     if (lua_isuserdata(L, -1))
+     {
+         lua_pushnil(L);
+         lua_setmetatable(L, -2); // set nil to metatable
+     }
+ 
+     lua_pop(L, 2); // pop object table and [userdata or nil]
+ }
+ 
  int LUACALL wxlua_ttag(lua_State *L, int stack_idx)
  {
***************
*** 1983,1987 ****
      lua_rawset( L, LUA_REGISTRYINDEX ); // set the value
  
!     // Create a table for all userdata that we've pushed into lua
      // Use weak values so the gc works on them
      wxlua_pushkey_wxLuaObjects(L);
--- 1998,2002 ----
      lua_rawset( L, LUA_REGISTRYINDEX ); // set the value
  
!     // Create a table for the userdata that we've pushed into lua
      // Use weak values so the gc works on them
      wxlua_pushkey_wxLuaObjects(L);
***************
*** 2090,2097 ****
      // register our 'function' object handlers
      if (registerTypes)
-     {
          g_wxluatag_wxLuaFunction = tnewtag();
-         g_wxluatag_wxWinDestroyTable = tnewweaktag(false, true);
-     }
  
      tsettagmethod(g_wxluatag_wxLuaFunction, "__gc",   wxlua__gc_wxLuaFunction);
--- 2105,2109 ----
***************
*** 2356,2360 ****
      {
          M_WXLSTATEDATA->m_wxlStateData->m_windowList.Append(win);
!         new wxLuaCallback(*this, 3, win->GetId(), wxID_ANY, wxEVT_DESTROY, win->GetEventHandler());
          return true;
      }
--- 2368,2372 ----
      {
          M_WXLSTATEDATA->m_wxlStateData->m_windowList.Append(win);
!         new wxLuaCallback(*this, WXLUACALLBACK_NOROUTINE, win->GetId(), wxID_ANY, wxEVT_DESTROY, win->GetEventHandler());
          return true;
      }
***************
*** 2524,2530 ****
          wxString name(wxT("Unknown Tracked Window Type"));
  
!         wxObject* obj = (wxObject*)wxlDestroyCallBack->GetEvtHandler();
!         if (obj && obj->GetClassInfo() && obj->GetClassInfo()->GetClassName())
!             name = obj->GetClassInfo()->GetClassName();
  
          names.Add(name);
--- 2536,2542 ----
          wxString name(wxT("Unknown Tracked Window Type"));
  
!         wxWindow* win = wxlDestroyCallBack->GetWindow();
!         if (win && win->GetClassInfo() && win->GetClassInfo()->GetClassName())
!             name = win->GetClassInfo()->GetClassName();
  
          names.Add(name);
***************
*** 2693,2698 ****
      if (data != NULL)
      {
-         bool handled = false;
- 
          // if the object we are referencing is derived from wxWindow
          if (wxlua_isderivedclass(L, tag, g_wxluatag_wxWindow) >= 0)
--- 2705,2708 ----
***************
*** 2702,2714 ****
              {
                  // check to make sure that we're not trying to attach another destroy callback
!                 bool already_handled = false;
                  wxList::compatibility_iterator node = M_WXLSTATEDATA->m_wxlStateData->m_winDestroyCallbackList.GetFirst();
                  while (node)
                  {
                      wxLuaWinDestroyCallback *pCallback = (wxLuaWinDestroyCallback *)node->GetData();
!                     wxCHECK_RET(pCallback, wxT("Invalid wxLuaWinDestroyCallback"));
!                     if (pCallback->GetEvtHandler() == win)
                      {
!                         already_handled = true;
                          break;
                      }
--- 2712,2724 ----
              {
                  // check to make sure that we're not trying to attach another destroy callback
!                 bool destroy_handled = false;
                  wxList::compatibility_iterator node = M_WXLSTATEDATA->m_wxlStateData->m_winDestroyCallbackList.GetFirst();
                  while (node)
                  {
                      wxLuaWinDestroyCallback *pCallback = (wxLuaWinDestroyCallback *)node->GetData();
! 
!                     if (pCallback->GetWindow() == win)
                      {
!                         destroy_handled = true;
                          break;
                      }
***************
*** 2719,2739 ****
                  // Connect an object to the destroy event and this will also set the
                  // metatable for the object as tpushusertag does.
!                 if (!already_handled)
                  {
-                     handled = true;
                      wxLuaWinDestroyCallback *pCallback =
!                             new wxLuaWinDestroyCallback(*this, win->GetId(),
!                                                         (wxEvtHandler*)win, tag);
                      if (pCallback == NULL)
-                     {
                          terror("wxLua: Out of memory creating wxLuaWinDestroyCallback.");
-                     }
                  }
              }
          }
  
!         // Otherwise handle normally
!         if (!handled)
!             wxlua_tpushusertag(L, data, tag, true);
      }
      else
--- 2729,2746 ----
                  // Connect an object to the destroy event and this will also set the
                  // metatable for the object as tpushusertag does.
!                 if (!destroy_handled)
                  {
                      wxLuaWinDestroyCallback *pCallback =
!                             new wxLuaWinDestroyCallback(*this, win, tag);
! 
                      if (pCallback == NULL)
                          terror("wxLua: Out of memory creating wxLuaWinDestroyCallback.");
                  }
              }
          }
  
!         // push the object into lua by wrapping it with a Lua userdata
!         // or if it's already wrapped, return a copy of the userdata
!         wxlua_tpushusertag(L, data, tag, true);
      }
      else

Index: wxlbind.cpp
===================================================================
RCS file: /cvsroot/wxlua/wxLua/modules/wxlua/src/wxlbind.cpp,v
retrieving revision 1.90
retrieving revision 1.91
diff -C2 -d -r1.90 -r1.91
*** wxlbind.cpp	1 Aug 2007 19:15:37 -0000	1.90
--- wxlbind.cpp	3 Aug 2007 22:17:16 -0000	1.91
***************
*** 41,45 ****
  
  int g_wxluatag_wxLuaFunction = 0;
- int g_wxluatag_wxWinDestroyTable = 0;
  int g_wxluatag_NULL = 0;
  int g_wxluatag_wxEvent = 0;
--- 41,44 ----

Index: wxlcallb.cpp
===================================================================
RCS file: /cvsroot/wxlua/wxLua/modules/wxlua/src/wxlcallb.cpp,v
retrieving revision 1.37
retrieving revision 1.38
diff -C2 -d -r1.37 -r1.38
*** wxlcallb.cpp	3 Aug 2007 02:34:05 -0000	1.37
--- wxlcallb.cpp	3 Aug 2007 22:17:16 -0000	1.38
***************
*** 29,33 ****
                               wxWindowID winId, wxWindowID lastId,
                               wxEventType eventType, wxEvtHandler *evtHandler)
!               : wxObject(), m_wxlState(wxlState),
                  m_evtHandler(evtHandler), m_id(winId), m_lastId(lastId),
                  m_wxlBindEvent(NULL)
--- 29,33 ----
                               wxWindowID winId, wxWindowID lastId,
                               wxEventType eventType, wxEvtHandler *evtHandler)
!               : wxObject(), m_routine(0), m_wxlState(wxlState),
                  m_evtHandler(evtHandler), m_id(winId), m_lastId(lastId),
                  m_wxlBindEvent(NULL)
***************
*** 49,53 ****
  
      // create a reference to the lua event handler function
!     m_routine = m_wxlState.tinsert(lua_func_stack_idx);
  
      m_evtHandler->Connect(winId, lastId, eventType,
--- 49,54 ----
  
      // create a reference to the lua event handler function
!     if (lua_func_stack_idx != WXLUACALLBACK_NOROUTINE)
!         m_routine = m_wxlState.tinsert(lua_func_stack_idx);
  
      m_evtHandler->Connect(winId, lastId, eventType,
***************
*** 82,89 ****
  
      // If this is a wxWindow being destroyed, clear out all callbacks to it for safety
!     if (event.GetEventType() == wxEVT_DESTROY)
      {
          event.Skip();
-         wxlState.RemoveTrackedWindow((wxWindow*)event.GetEventObject());
          // delete the reference to this handler since we're clearing it
          wxlState.RemoveTrackedCallback(theCallback);
--- 83,89 ----
  
      // If this is a wxWindow being destroyed, clear out all callbacks to it for safety
!     if ((theCallback->m_routine == 0) && (event.GetEventType() == wxEVT_DESTROY))
      {
          event.Skip();
          // delete the reference to this handler since we're clearing it
          wxlState.RemoveTrackedCallback(theCallback);
***************
*** 119,122 ****
--- 119,126 ----
          theCallback->CallFunction(&event);
  
+     // we want to get this too or let it pass to someone else
+     if (event.GetEventType() == wxEVT_DESTROY)
+         event.Skip();
+ 
      wxlState.SetInEventType(wxEVT_NULL);
  }
***************
*** 169,216 ****
  
  wxLuaWinDestroyCallback::wxLuaWinDestroyCallback(const wxLuaState& wxlState,
!                                                  wxWindowID id, wxEvtHandler *evtHandler,
!                                                  int iTag)
!                         :wxObject(), m_wxlState(wxlState),
!                          m_evtHandler(evtHandler), m_id(id)
  {
      wxCHECK_RET(m_wxlState.Ok(), wxT("Invalid wxLuaState"));
  
!     // allocate a LUA proxy for the object
!     const void **ptr = (const void **)m_wxlState.lua_NewUserdata(sizeof(void *));
! 
!     if (ptr != NULL)
!     {
!         // save the address of the object in the proxy
!         *ptr = evtHandler;
! 
!         // and set the metatable of the proxy to the wxLuaReferences registry table
!         if (m_wxlState.tget(iTag))
!         {
!             if (m_wxlState.lua_SetMetatable(-2) == 0)
!                 m_wxlState.terror("wxLua: Unable to set metatable of proxy in wxLuaWinDestroyCallback.");
!         }
! 
!         // get a reference to the destroy handler table
!         if (m_wxlState.tget(g_wxluatag_wxWinDestroyTable))
!         {
!             // create a reference to object
!             m_wxlState.lua_PushLightUserdata(evtHandler); // key
!             m_wxlState.lua_PushValue(-3);                 // value
!             // save it in the destroy handler table
!             m_wxlState.lua_RawSet(-3);
!             m_wxlState.lua_Pop(1); // pop the table from GetLuaWinDestroyTableTag()
!         }
! 
!         m_wxlState.AddTrackedWinDestroyCallback(this);
  
!         // connect the event handler
!         m_evtHandler->Connect(id, wxEVT_DESTROY,
!                               (wxObjectEventFunction)&wxLuaWinDestroyCallback::EventHandler,
!                               this);
!     }
!     else
!     {
!         m_wxlState.terror("wxLua: Out of memory trying to create wxLuaWinDestroyCallback.");
!     }
  }
  
--- 173,187 ----
  
  wxLuaWinDestroyCallback::wxLuaWinDestroyCallback(const wxLuaState& wxlState,
!                                                  wxWindow* win, int iTag)
!                         :wxObject(), m_wxlState(wxlState), m_window(win)
  {
      wxCHECK_RET(m_wxlState.Ok(), wxT("Invalid wxLuaState"));
  
!     m_wxlState.AddTrackedWinDestroyCallback(this);
  
!     // connect the event handler
!     m_window->Connect(m_window->GetId(), wxEVT_DESTROY,
!                       (wxObjectEventFunction)&wxLuaWinDestroyCallback::EventHandler,
!                       this);
  }
  
***************
*** 218,222 ****
--- 189,196 ----
  {
      if (m_wxlState.Ok())
+     {
          m_wxlState.RemoveTrackedWinDestroyCallback(this);
+         m_wxlState.RemoveTrackedWindow(m_window);
+     }
  }
  
***************
*** 224,228 ****
  {
      wxLuaWinDestroyCallback *theCallback = (wxLuaWinDestroyCallback *)event.m_callbackUserData;
!     if (theCallback && (((wxEvtHandler*)event.GetEventObject()) == theCallback->m_evtHandler))
      {
          theCallback->OnDestroy(event);
--- 198,202 ----
  {
      wxLuaWinDestroyCallback *theCallback = (wxLuaWinDestroyCallback *)event.m_callbackUserData;
!     if (theCallback && (((wxWindow*)event.GetEventObject()) == theCallback->m_window))
      {
          theCallback->OnDestroy(event);
***************
*** 238,254 ****
      // FIXME - Is it an error to receive an event after you've deleted lua?
      //  probably not if lua is getting shutdown
-     if (!m_wxlState.Ok())
-         return;
- 
      // Note: do not remove from wxLuaState's destroyHandlerList here, wait 'till destructor
! 
!     if (m_wxlState.tget(g_wxluatag_wxWinDestroyTable))
      {
!         // clear the metatable reference in the lua proxy.
!         m_wxlState.lua_PushLightUserdata(m_evtHandler);
!         m_wxlState.lua_RawGet(-2);
!         m_wxlState.lua_PushNil();
!         m_wxlState.lua_SetMetatable(-2);
!         m_wxlState.lua_Pop(2);
      }
  }
--- 212,220 ----
      // FIXME - Is it an error to receive an event after you've deleted lua?
      //  probably not if lua is getting shutdown
      // Note: do not remove from wxLuaState's destroyHandlerList here, wait 'till destructor
!     if (m_wxlState.Ok())
      {
!         wxlua_tcleartrackedmetatable(m_wxlState.GetLuaState(), m_window);
!         m_wxlState.RemoveTrackedWindow(m_window);
      }
  }

[Wxlua-commit] wxLua/docs wxlua.html,1.32,1.33

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

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

Modified Files:
	wxlua.html 
Log Message:
Add note about ... vararg function inputs


Index: wxlua.html
===================================================================
RCS file: /cvsroot/wxlua/wxLua/docs/wxlua.html,v
retrieving revision 1.32
retrieving revision 1.33
diff -C2 -d -r1.32 -r1.33
*** wxlua.html	1 Aug 2007 18:24:13 -0000	1.32
--- wxlua.html	3 Aug 2007 14:29:09 -0000	1.33
***************
*** 1,6 ****
  <!DOCTYPE html PUBLIC "-//W3C//DTD HTML 4.01 Transitional//EN">
  <html><head>
! <meta content="text/html; charset=ISO-8859-1" http-equiv="content-type"><title>wxLua Documentation</title> <meta content="John Labenski" name="author"></head>
! 
  <body><h2><u>wxLua
  Documentation</u></h2>
--- 1,6 ----
  <!DOCTYPE html PUBLIC "-//W3C//DTD HTML 4.01 Transitional//EN">
  <html><head>
! <meta content="text/html; charset=ISO-8859-1" http-equiv="content-type"><title>wxLua Documentation</title>
! <meta content="John Labenski" name="author"></head>
  <body><h2><u>wxLua
  Documentation</u></h2>
***************
*** 279,310 ****
  printHi() do return end; print("hi") end</i> which can be useful
  for debugging functions.</li> </ul>
! </ul><blockquote> <pre>do<br> -- create a new local scope<br> local a = 2<br>end<br></pre>
! </blockquote><ul> <li><b>if
  (bool) then ...
  elseif (bool) then ... else ...
  end</b></li>
! </ul><blockquote> <pre>local a, b, c = 1, 2, 3 -- can assign multiple values<br>a = 1; b = 2; c = 3 -- use ; for multiple lines of code on single line<br>a, b, c = 1, 2, 3 -- this works too<br>if (a == 1) and ((b &lt;= 2) or (c ~= 3)) then <br> print(a+b/c) <br>elseif a == 2 then -- no parentheses necessary<br> print(a)<br>else<br> print(b)<br>end</pre>
! </blockquote><ul> <ul> <li>There
  is no case
  statement, but a table[value] =
  function() ... end may be used to simulate one.</li> <blockquote>
! <pre>mycase = {}<br>mycase[1] = function() print("Hello #1") end<br>mycase[2] = function() print("Hello #2") end<br>...<br>if mycase[value] then<br> mycase[value]()<br>else<br> print("Unknown case value")<br>end</pre>
! </blockquote> </ul> <li><b>while
  (bool) ...
  end</b></li> <ul> <li>Note : there is no <i>continue</i>
  keyword
  only <i>break</i></li> </ul>
! </ul><blockquote> <pre>function CheckA(val) if val == 5 then return true end end<br>local a = 1<br>while a &lt; 10 do<br> print(a)<br> a = a + 1 -- no increment operator<br> if CheckA(a) then break end<br>end</pre>
! </blockquote><ul> <ul> <li>You
  can make a
  "fake" continue by adding a while loop (doesn't
  print # 5). <br></li> </ul>
! </ul><blockquote><pre>local a = 1<br>while a &lt; 10 do while true do<br> a = a + 1 -- no increment operator<br> if CheckA(a) then <br> break <br> else<br> print(a)<br> end<br>break end end</pre>
! </blockquote><ul> <li><b>repeat
  ... until
  (bool)</b></li> <ul> <li>Note : there is no
  continue keyword only break</li> </ul>
! </ul><blockquote> <pre>local a = 1<br>repeat<br> local temp = a * 2<br> print(temp, type(temp))<br> a = a + 1 -- no increment operator<br>until a &gt; 10</pre>
! </blockquote><ul> <li><b>for
  var = init_value,
  end_value [, increment] do
--- 279,310 ----
  printHi() do return end; print("hi") end</i> which can be useful
  for debugging functions.</li> </ul>
! </ul><blockquote> <pre>do<br> -- create a new local scope<br> local a = 2<br>end<br></pre></blockquote><ul>
! <li><b>if
  (bool) then ...
  elseif (bool) then ... else ...
  end</b></li>
! </ul><blockquote> <pre>local a, b, c = 1, 2, 3 -- can assign multiple values<br>a = 1; b = 2; c = 3 -- use ; for multiple lines of code on single line<br>a, b, c = 1, 2, 3 -- this works too<br>if (a == 1) and ((b &lt;= 2) or (c ~= 3)) then <br> print(a+b/c) <br>elseif a == 2 then -- no parentheses necessary<br> print(a)<br>else<br> print(b)<br>end</pre></blockquote><ul>
! <ul> <li>There
  is no case
  statement, but a table[value] =
  function() ... end may be used to simulate one.</li> <blockquote>
! <pre>mycase = {}<br>mycase[1] = function() print("Hello #1") end<br>mycase[2] = function() print("Hello #2") end<br>...<br>if mycase[value] then<br> mycase[value]()<br>else<br> print("Unknown case value")<br>end</pre></blockquote>
! </ul> <li><b>while
  (bool) ...
  end</b></li> <ul> <li>Note : there is no <i>continue</i>
  keyword
  only <i>break</i></li> </ul>
! </ul><blockquote> <pre>function CheckA(val) if val == 5 then return true end end<br>local a = 1<br>while a &lt; 10 do<br> print(a)<br> a = a + 1 -- no increment operator<br> if CheckA(a) then break end<br>end</pre></blockquote><ul>
! <ul> <li>You
  can make a
  "fake" continue by adding a while loop (doesn't
  print # 5). <br></li> </ul>
! </ul><blockquote><pre>local a = 1<br>while a &lt; 10 do while true do<br> a = a + 1 -- no increment operator<br> if CheckA(a) then <br> break <br> else<br> print(a)<br> end<br>break end end</pre></blockquote><ul>
! <li><b>repeat
  ... until
  (bool)</b></li> <ul> <li>Note : there is no
  continue keyword only break</li> </ul>
! </ul><blockquote> <pre>local a = 1<br>repeat<br> local temp = a * 2<br> print(temp, type(temp))<br> a = a + 1 -- no increment operator<br>until a &gt; 10</pre></blockquote><ul>
! <li><b>for
  var = init_value,
  end_value [, increment] do
***************
*** 317,322 ****
  it did before the loop. Copy the loop counter variable to a separate
  variable if you need to save it when breaking for example.</li> </ul>
! </ul><blockquote> <pre>local a = "hello"<br>for a = 1, 10 --[[, increment]] do -- optional increment value, else 1<br> local temp = a * 2<br> print(temp)<br>end<br>print(a) -- a == "hello" since loop counter variable is local to the loop<br></pre>
! </blockquote><ul> <li><b>functions</b></li>
  <ul> <li>Input any number of values by value, tables are
  passed by
--- 317,322 ----
  it did before the loop. Copy the loop counter variable to a separate
  variable if you need to save it when breaking for example.</li> </ul>
! </ul><blockquote> <pre>local a = "hello"<br>for a = 1, 10 --[[, increment]] do -- optional increment value, else 1<br> local temp = a * 2<br> print(temp)<br>end<br>print(a) -- a == "hello" since loop counter variable is local to the loop<br></pre></blockquote><ul>
! <li><b>functions</b></li>
  <ul> <li>Input any number of values by value, tables are
  passed by
***************
*** 324,338 ****
  the value nil, extra inputs are discarded.</li> <li>Return
  values using the "return" keyword</li> <li>Not all return
! values need to be used and extra ones will be discarded. The symbol "_"
  is a valid variable name and is often used as a dummy variable to
! receive return values that you do not want (e.g. if you only want the
! second return value, use _ for the first). You may use the select(n,
! ...) function to choose return values to use.</li><li>Tables
  can be used as containers for input values to functions using the
  unpack(table, [i, [, j]]) function. This is useful for creating complex
  inputs to a function or storing them for resuse.</li><ul><li><span style="font-style: italic;">print(string.find(unpack({"Hello",
! "ll", 1, 1})))</span> -&gt; prints "3 4"</li></ul>
! </ul>
! </ul><blockquote> <pre>function DoStuff(a, b, c)<br> a = b*c -- does not change global and/or input number a<br> local function Calc(a)<br> return a*2<br> end<br>	<br> return Calc(a)*b*c -- or for multiple values "return a*b*c, a*b"<br>end<br>-- call function<br>a = 10<br>result = DoStuff(a, 1, 2)<br>-- can also put function into a table<br>stuff = {}<br>stuff.DoStuff = DoStuff<br>result = stuff.DoStuff(1, 2, 3)<br>print(a, result) -- "10, 72" since a is not changed</pre>
  </blockquote><h2 style="text-decoration: underline;"><a name="Bit_Library"></a>Bit
  Library</h2>
--- 324,349 ----
  the value nil, extra inputs are discarded.</li> <li>Return
  values using the "return" keyword</li> <li>Not all return
! values need to be used and extra ones will be discarded.&nbsp;</li><ul><li>The symbol "_"
  is a valid variable name and is often used as a dummy variable to
! receive return values that you do not want.</li><ul style="font-style: italic;"><li>function GetNums() return 3, 4 end; &nbsp;local _, num2 = GetNums()</li></ul><li>You may also use the <span style="font-style: italic;">select(n,
! ...)</span> function to choose return values to use.</li></ul><li>Tables
  can be used as containers for input values to functions using the
  unpack(table, [i, [, j]]) function. This is useful for creating complex
  inputs to a function or storing them for resuse.</li><ul><li><span style="font-style: italic;">print(string.find(unpack({"Hello",
! "ll", 1, 1})))</span> -&gt; prints "3 4"</li></ul><li>Vararg
! inputs are written as <span style="font-style: italic;">function
! dostuff( ... )</span></li><ul><li>The number of
! args is found using: <span style="font-style: italic;">local
! n = select("#", ...)</span></li><li>The args can be
! converted into table using: <span style="font-style: italic;">local
! args = { ... }</span></li><li>A particular arg can be
! chosen using: <span style="font-style: italic;">local
! arg3 = select(3, ...)</span> </li><ul><li>Note
! <span style="font-style: italic;">select(n, ...)</span> returns
! all args after <span style="font-style: italic;">n</span>,
! but if the left hand side is a single variable the others are
! discarded. See above about using <span style="font-style: italic;">select()</span>
! to pick return values of a function as well.</li></ul></ul>
! </ul></ul><blockquote> <pre>function DoStuff(a, b, c)<br> a = b*c -- does not change global and/or input number a<br> local function Calc(a)<br> return a*2<br> end<br>	<br> return Calc(a)*b*c -- or for multiple values "return a*b*c, a*b"<br>end<br>-- call function<br>a = 10<br>result = DoStuff(a, 1, 2)<br>-- can also put function into a table<br>stuff = {}<br>stuff.DoStuff = DoStuff<br>result = stuff.DoStuff(1, 2, 3)<br>print(a, result) -- "10, 72" since a is not changed</pre>
  </blockquote><h2 style="text-decoration: underline;"><a name="Bit_Library"></a>Bit
  Library</h2>
***************
*** 887,892 ****
  that creates a new wxRect, sets your extra functions
  for it, and returns it for use.</li> <ul> </ul> </ul>
! </ul> </ul>
! </ul><h2><a name="wxLua_Samples"></a><u><u>wxLua
  Samples and How to Run Them</u></u></h2>
  There are a number of sample programs in the <i style="font-style: italic;">wxLua/samples</i>
--- 898,902 ----
  that creates a new wxRect, sets your extra functions
  for it, and returns it for use.</li> <ul> </ul> </ul>
! </ul> </ul></ul><h2><a name="wxLua_Samples"></a><u><u>wxLua
  Samples and How to Run Them</u></u></h2>
  There are a number of sample programs in the <i style="font-style: italic;">wxLua/samples</i>
***************
*** 935,940 ****
  directory so you may have to specify a different path depending on
  where you are running lua.exe from. For more information see <a href="#wrapmodule.wx.lua">wrapmodule.wx.lua</a>. </li>
! </ul>
! </ul><h3><a name="Provided_samples"></a>Provided
  Samples</h3>
  <ul> <li><b>bindings.wx.lua</b></li> <ul>
--- 945,949 ----
  directory so you may have to specify a different path depending on
  where you are running lua.exe from. For more information see <a href="#wrapmodule.wx.lua">wrapmodule.wx.lua</a>. </li>
! </ul></ul><h3><a name="Provided_samples"></a>Provided
  Samples</h3>
  <ul> <li><b>bindings.wx.lua</b></li> <ul>
***************
*** 1222,1227 ****
  =
  ";;../lib/?.so;../lib/vc_dll/?.dll;../lib/bcc_dll/?.dll;../lib/mingw_dll/?.dll;"</li>
! </ul> </ul>
! </ul><h2><a name="wxLua_Sourcecode_Modules"></a><u>wxLua
  Sourcecode Modules</u></h2>
  wxLua is broken up into "modules" that are compiled into libraries so
--- 1231,1235 ----
  =
  ";;../lib/?.so;../lib/vc_dll/?.dll;../lib/bcc_dll/?.dll;../lib/mingw_dll/?.dll;"</li>
! </ul> </ul></ul><h2><a name="wxLua_Sourcecode_Modules"></a><u>wxLua
  Sourcecode Modules</u></h2>
  wxLua is broken up into "modules" that are compiled into libraries so
***************
*** 1409,1413 ****
  wxlua_pushkey_wxLuaReferences(L)</i> for example, to push the
  value of index to use.<br>
! <ul> <li>wxLuaReferences</li> <ul> <li>Tables indexed
  on the numeric "tags" that are used as metatables for the
  userdata pushed into Lua.</li> <ul> <li>The
--- 1417,1422 ----
  wxlua_pushkey_wxLuaReferences(L)</i> for example, to push the
  value of index to use.<br>
! <ul> <li>wxLuaReferences</li> <ul> <li>Tables
! indexed
  on the numeric "tags" that are used as metatables for the
  userdata pushed into Lua.</li> <ul> <li>The

[Wxlua-commit] wxLua/modules/wxlua/src wxlcallb.cpp,1.36,1.37

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

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

Modified Files:
	wxlcallb.cpp 
Log Message:
Don't track the event wxLuaCallback::CallFunction() event since we didn't create it
and the memory may be reused before the __gc clears it from the object table in 
Lua's registry


Index: wxlcallb.cpp
===================================================================
RCS file: /cvsroot/wxlua/wxLua/modules/wxlua/src/wxlcallb.cpp,v
retrieving revision 1.36
retrieving revision 1.37
diff -C2 -d -r1.36 -r1.37
*** wxlcallb.cpp	2 Aug 2007 23:08:57 -0000	1.36
--- wxlcallb.cpp	3 Aug 2007 02:34:05 -0000	1.37
***************
*** 149,153 ****
          if (wxlState.lua_SetFenv(-2) != 0)
          {
!             wxlState.tpushusertag(event, event_tag, true);
              wxlState.LuaPCall(1, 0);
          }
--- 149,155 ----
          if (wxlState.lua_SetFenv(-2) != 0)
          {
!             // don't track this since we didn't create it
!             // Tracking this causes clashes in the object registry table
!             wxlState.tpushusertag(event, event_tag, false);
              wxlState.LuaPCall(1, 0);
          }

[Wxlua-commit] wxLua/modules/wxluadebug/src wxldebug.cpp, 1.40, 1.41

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

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

Modified Files:
	wxldebug.cpp 
Log Message:
Fix for wxLuaFunctions in wxlua_tpushusertag, don't try to reuse the userdata since
   wxLuaFunctions are one shot only.
   If in an event handler and wx.wxPostEvent(win, wx.wxCommandEvent(..)) was called
   and ALSO handled by the window the memory from the temp event could be reused by
   the wxLuaFunction and wxlua_tpushusertag would return the old userdata at the
   reused address which was wrong.
Clear things in wxlcallb.cpp for deleted windows 
Don't use 0x%p since gcc adds 0x for us, however MSVC6 doesn't


Index: wxldebug.cpp
===================================================================
RCS file: /cvsroot/wxlua/wxLua/modules/wxluadebug/src/wxldebug.cpp,v
retrieving revision 1.40
retrieving revision 1.41
diff -C2 -d -r1.40 -r1.41
*** wxldebug.cpp	26 Jul 2007 18:56:39 -0000	1.40
--- wxldebug.cpp	2 Aug 2007 23:08:58 -0000	1.41
***************
*** 283,291 ****
              int nTop = lua_gettop(L);
  
-             wxlua_pushkey_wxLuaObjects(L);
-             lua_rawget(L, LUA_REGISTRYINDEX);       // pop key, push result (the obj table)
-             bool is_lreg_objTable = (lua_equal(L, -1, -2) != 0);
-             lua_pop(L, 1);
- 
              // start iterating
              lua_pushnil(L);
--- 283,286 ----
***************
*** 414,418 ****
      long num = (long) dnum;
      if ((double) num == dnum)
!         return wxString::Format(wxT("%ld (0x%lx)"), num, num);
  
      return wxString::Format(wxT("%g"), dnum);
--- 409,413 ----
      long num = (long) dnum;
      if ((double) num == dnum)
!         return wxString::Format(wxT("%ld (0x%lx)"), num, (unsigned long)num);
  
      return wxString::Format(wxT("%g"), dnum);
***************
*** 433,437 ****
      const void *pItem  = lua_topointer(L, index);
  
!     wxString s = wxString::Format(wxT("0x%p"), pItem);
  
      if (nItems > 0)
--- 428,432 ----
      const void *pItem  = lua_topointer(L, index);
  
!     wxString s = wxString::Format(wxT("%p"), pItem);
  
      if (nItems > 0)
***************
*** 450,454 ****
      lua_State* L = wxlState.GetLuaState();
  
!     wxString s = wxString::Format(wxT("0x%p"), lua_touserdata(L, index));
  
      void* udata = lua_touserdata(L, index);
--- 445,449 ----
      lua_State* L = wxlState.GetLuaState();
  
!     wxString s = wxString::Format(wxT("%p"), lua_touserdata(L, index));
  
      void* udata = lua_touserdata(L, index);

[Wxlua-commit] wxLua/modules/wxlua/src wxlcallb.cpp, 1.35, 1.36 wxlstate.cpp, 1.126, 1.127

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

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

Modified Files:
	wxlcallb.cpp wxlstate.cpp 
Log Message:
Fix for wxLuaFunctions in wxlua_tpushusertag, don't try to reuse the userdata since
   wxLuaFunctions are one shot only.
   If in an event handler and wx.wxPostEvent(win, wx.wxCommandEvent(..)) was called
   and ALSO handled by the window the memory from the temp event could be reused by
   the wxLuaFunction and wxlua_tpushusertag would return the old userdata at the
   reused address which was wrong.
Clear things in wxlcallb.cpp for deleted windows 
Don't use 0x%p since gcc adds 0x for us, however MSVC6 doesn't


Index: wxlstate.cpp
===================================================================
RCS file: /cvsroot/wxlua/wxLua/modules/wxlua/src/wxlstate.cpp,v
retrieving revision 1.126
retrieving revision 1.127
diff -C2 -d -r1.126 -r1.127
*** wxlstate.cpp	1 Aug 2007 19:15:38 -0000	1.126
--- wxlstate.cpp	2 Aug 2007 23:08:57 -0000	1.127
***************
*** 334,350 ****
      // When il2 gets gc it will delete il even though il may still be valid and used by the notebook.
  
!     wxlua_pushkey_wxLuaObjects(L);
!     lua_rawget(L, LUA_REGISTRYINDEX); // pop key, push result (the obj table)
!     lua_pushlightuserdata(L, (void*)u); // key on Lua's userdata
!     lua_rawget(L, -2);
! 
!     if (wxlua_iswxuserdata(L, -1))
      {
!         lua_remove(L, -2); // remove the obj table
!         return true;
!     }
  
!     // pop the table and the nil.
!     lua_pop(L, 2);
  
      // Wrap the void* pointer in a newuserdata
--- 334,354 ----
      // When il2 gets gc it will delete il even though il may still be valid and used by the notebook.
  
!     // we don't track the wxLuaFunctions for speed
!     if (tag != g_wxluatag_wxLuaFunction)
      {
!         wxlua_pushkey_wxLuaObjects(L);
!         lua_rawget(L, LUA_REGISTRYINDEX); // pop key, push result (the obj table)
!         lua_pushlightuserdata(L, (void*)u); // key on Lua's userdata
!         lua_rawget(L, -2);
  
!         if (wxlua_iswxuserdata(L, -1))
!         {
!             lua_remove(L, -2); // remove the obj table
!             return true;
!         }
! 
!         // pop the table and the nil.
!         lua_pop(L, 2);
!     }
  
      // Wrap the void* pointer in a newuserdata
***************
*** 364,368 ****
                      lua_rawget(L, LUA_REGISTRYINDEX); // pop key, push result (the obj table)
  
!                     lua_pushlightuserdata(L, (void*)u); // key on Lua's userdata
                      lua_pushvalue(L, -3); // push the lua userdata as the value (note: weak valued table)
  
--- 368,372 ----
                      lua_rawget(L, LUA_REGISTRYINDEX); // pop key, push result (the obj table)
  
!                     lua_pushlightuserdata(L, (void*)u); // key on the object since we can reuse the userdata
                      lua_pushvalue(L, -3); // push the lua userdata as the value (note: weak valued table)
  
***************
*** 376,379 ****
--- 380,385 ----
                  wxlua_terror(L, "wxLua: Unable to set metatable in tpushusertag.");
          }
+         else
+             wxlua_terror(L, "wxLua: Unable to get metatable in tpushusertag.");
      }
      else

Index: wxlcallb.cpp
===================================================================
RCS file: /cvsroot/wxlua/wxLua/modules/wxlua/src/wxlcallb.cpp,v
retrieving revision 1.35
retrieving revision 1.36
diff -C2 -d -r1.35 -r1.36
*** wxlcallb.cpp	26 Jul 2007 18:56:39 -0000	1.35
--- wxlcallb.cpp	2 Aug 2007 23:08:57 -0000	1.36
***************
*** 88,91 ****
--- 88,93 ----
          // delete the reference to this handler since we're clearing it
          wxlState.RemoveTrackedCallback(theCallback);
+         // remove tracking or derived methods for it
+         wxlState.RemoveTrackedObject(event.GetEventObject(), wxLuaState::CLEAR_TRACKED_OBJECT|wxLuaState::CLEAR_DERIVED_METHODS);
  
          // Disconnect all callbacks associated with this window's evthandler
***************
*** 106,109 ****
--- 108,113 ----
                  wxlState.GetTrackedCallbackList()->Erase(pc_node);
  
+                 // remove the ref to the routine since we're clearing the wxLuaState
+                 wxlState.tremove(wxlCallback->m_routine);
                  wxlCallback->ClearwxLuaState();
              }

[Wxlua-commit] wxLua/modules/wxbind/include wxbinddefs.h,1.7,1.8

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

Update of /cvsroot/wxlua/wxLua/modules/wxbind/include
In directory sc8-pr-cvs9.sourceforge.net:/tmp/cvs-serv3896/wxLua/modules/wxbind/include

Modified Files:
	wxbinddefs.h 
Log Message:
Add modules/wxbind/include/wxbinddefs.h so you can edit it
Cleanup wxbinddefs.h 


Index: wxbinddefs.h
===================================================================
RCS file: /cvsroot/wxlua/wxLua/modules/wxbind/include/wxbinddefs.h,v
retrieving revision 1.7
retrieving revision 1.8
diff -C2 -d -r1.7 -r1.8
*** wxbinddefs.h	31 Jul 2007 20:51:21 -0000	1.7
--- wxbinddefs.h	2 Aug 2007 18:25:42 -0000	1.8
***************
*** 184,293 ****
  // ----------------------------------------------------------------------------
  
! #define WXLUA_DECLARE_BIND_WXLUA extern WXDLLIMPEXP_WXLUA bool wxLuaBinding_wxlua_init(); // modules/wxlua
  #define WXLUA_DECLARE_BIND_WXLUASOCKET extern WXDLLIMPEXP_WXLUASOCKET bool wxLuaBinding_wxluasocket_init(); // modules/wxluasocket
  
! #define WXLUA_DECLARE_BIND_WXBASE extern WXDLLIMPEXP_BINDWXBASE bool wxLuaBinding_wxbase_init(); // modules/wxbind
! #define WXLUA_DECLARE_BIND_WXCORE extern WXDLLIMPEXP_BINDWXCORE bool wxLuaBinding_wxcore_init(); // modules/wxbind
! #define WXLUA_DECLARE_BIND_WXADV extern WXDLLIMPEXP_BINDWXADV bool wxLuaBinding_wxadv_init(); // modules/wxbind
! #define WXLUA_DECLARE_BIND_WXNET extern WXDLLIMPEXP_BINDWXNET bool wxLuaBinding_wxnet_init(); // modules/wxbind
! 
! #if wxUSE_XML
!     #define WXLUA_DECLARE_BIND_WXXML extern WXDLLIMPEXP_BINDWXXML bool wxLuaBinding_wxxml_init(); // modules/wxbind
! #else
!     #define WXLUA_DECLARE_BIND_WXXML
!     //#warning "WXLUA_DECLARE_BIND_WXXML is not used since wxUSE_XML=0"
! #endif //wxUSE_XML
! 
! #if wxUSE_XRC
!     #define WXLUA_DECLARE_BIND_WXXRC extern WXDLLIMPEXP_BINDWXXRC bool wxLuaBinding_wxxrc_init(); // modules/wxbind
! #else
!     #define WXLUA_DECLARE_BIND_WXXRC
!     //#warning "WXLUA_DECLARE_BIND_WXXRC is not used since wxUSE_XRC=0"
! #endif //wxUSE_XRC
! 
! #if wxUSE_HTML
!     #define WXLUA_DECLARE_BIND_WXHTML extern WXDLLIMPEXP_BINDWXHTML bool wxLuaBinding_wxhtml_init(); // modules/wxbind
! #else
!     #define WXLUA_DECLARE_BIND_WXHTML
!     //#warning "WXLUA_DECLARE_BIND_WXHTML is not used since wxUSE_HTML=0"
! #endif //wxUSE_HTML
! 
! #if wxUSE_AUI
!     #define WXLUA_DECLARE_BIND_WXAUI extern WXDLLIMPEXP_BINDWXAUI bool wxLuaBinding_wxaui_init(); // modules/wxbind
! #else
!     #define WXLUA_DECLARE_BIND_WXAUI
!     //#warning "WXLUA_DECLARE_BIND_WXAUI is not used since wxUSE_AUI=0"
! #endif //wxUSE_AUI
! 
! #if wxUSE_MEDIACTRL
!     #define WXLUA_DECLARE_BIND_WXMEDIA extern WXDLLIMPEXP_BINDWXMEDIA bool wxLuaBinding_wxmedia_init(); // modules/wxbind
! #else
!     #define WXLUA_DECLARE_BIND_WXMEDIA
!     // warning "WXLUA_DECLARE_BIND_WXMEDIA is not used since wxUSE_MEDIACTRL=0"
! #endif //wxUSE_MEDIACTRL
! 
! #if wxUSE_GLCANVAS
!     #define WXLUA_DECLARE_BIND_WXGL extern WXDLLIMPEXP_BINDWXGL bool wxLuaBinding_wxgl_init(); // modules/wxbind
! #else
!     #define WXLUA_DECLARE_BIND_WXGL
!     // warning "WXLUA_DECLARE_BIND_WXGL is not used since wxUSE_GLCANVAS=0"
! #endif //wxUSE_GLCANVAS
! 
! // Unfortunately there's no checks for this
! #define WXLUA_DECLARE_BIND_WXSTC extern WXDLLIMPEXP_BINDWXSTC bool wxLuaBinding_wxstc_init(); // modules/wxbind
  
- // ----------------------------------------------------------------------------
  
! #define WXLUA_IMPLEMENT_BIND_WXLUA wxLuaBinding_wxlua_init();
! #define WXLUA_IMPLEMENT_BIND_WXLUASOCKET wxLuaBinding_wxluasocket_init();
  
  #define WXLUA_IMPLEMENT_BIND_WXBASE wxLuaBinding_wxbase_init();
  #define WXLUA_IMPLEMENT_BIND_WXCORE wxLuaBinding_wxcore_init();
! #define WXLUA_IMPLEMENT_BIND_WXADV wxLuaBinding_wxadv_init();
! #define WXLUA_IMPLEMENT_BIND_WXNET wxLuaBinding_wxnet_init();
  
  #if wxUSE_XML
      #define WXLUA_IMPLEMENT_BIND_WXXML wxLuaBinding_wxxml_init();
  #else
      #define WXLUA_IMPLEMENT_BIND_WXXML
!     //#warning "WXLUA_IMPLEMENT_BIND_WXXML is not used since wxUSE_XML=0"
  #endif //wxUSE_XML
  
  #if wxUSE_XRC
      #define WXLUA_IMPLEMENT_BIND_WXXRC wxLuaBinding_wxxrc_init();
  #else
      #define WXLUA_IMPLEMENT_BIND_WXXRC
!     //#warning "WXLUA_IMPLEMENT_BIND_WXXRC is not used since wxUSE_XRC=0"
  #endif //wxUSE_XRC
  
  #if wxUSE_HTML
      #define WXLUA_IMPLEMENT_BIND_WXHTML wxLuaBinding_wxhtml_init();
  #else
      #define WXLUA_IMPLEMENT_BIND_WXHTML
!     //#warning "WXLUA_IMPLEMENT_BIND_WXHTML is not used since wxUSE_HTML=0"
  #endif //wxUSE_HTML
  
  #if wxUSE_AUI
      #define WXLUA_IMPLEMENT_BIND_WXAUI wxLuaBinding_wxaui_init();
  #else
      #define WXLUA_IMPLEMENT_BIND_WXAUI
!     //#warning "WXLUA_IMPLEMENT_BIND_WXAUI is not used since wxUSE_AUI=0"
  #endif //wxUSE_AUI
  
  #if wxUSE_MEDIACTRL
      #define WXLUA_IMPLEMENT_BIND_WXMEDIA wxLuaBinding_wxmedia_init();
  #else
      #define WXLUA_IMPLEMENT_BIND_WXMEDIA
!     //#warning "WXLUA_IMPLEMENT_BIND_WXMEDIA is not used since wxUSE_MEDIACTRL=0"
  #endif //wxUSE_MEDIACTRL
  
  #if wxUSE_GLCANVAS
      #define WXLUA_IMPLEMENT_BIND_WXGL wxLuaBinding_wxgl_init();
  #else
      #define WXLUA_IMPLEMENT_BIND_WXGL
!     //#warning "WXLUA_IMPLEMENT_BIND_WXGL is not used since wxUSE_GLCANVAS=0"
  #endif //wxUSE_GLCANVAS
  
  // Unfortunately there's no checks for this
  #define WXLUA_IMPLEMENT_BIND_WXSTC wxLuaBinding_wxstc_init();
  
--- 184,261 ----
  // ----------------------------------------------------------------------------
  
! #define WXLUA_DECLARE_BIND_WXLUA       extern WXDLLIMPEXP_WXLUA       bool wxLuaBinding_wxlua_init(); // modules/wxlua
  #define WXLUA_DECLARE_BIND_WXLUASOCKET extern WXDLLIMPEXP_WXLUASOCKET bool wxLuaBinding_wxluasocket_init(); // modules/wxluasocket
  
! #define WXLUA_IMPLEMENT_BIND_WXLUA       wxLuaBinding_wxlua_init();
! #define WXLUA_IMPLEMENT_BIND_WXLUASOCKET wxLuaBinding_wxluasocket_init();
  
  
! #define WXLUA_DECLARE_BIND_WXBASE extern WXDLLIMPEXP_BINDWXBASE bool wxLuaBinding_wxbase_init(); // modules/wxbind
! #define WXLUA_DECLARE_BIND_WXCORE extern WXDLLIMPEXP_BINDWXCORE bool wxLuaBinding_wxcore_init(); // modules/wxbind
! #define WXLUA_DECLARE_BIND_WXADV  extern WXDLLIMPEXP_BINDWXADV  bool wxLuaBinding_wxadv_init(); // modules/wxbind
! #define WXLUA_DECLARE_BIND_WXNET  extern WXDLLIMPEXP_BINDWXNET  bool wxLuaBinding_wxnet_init(); // modules/wxbind
  
  #define WXLUA_IMPLEMENT_BIND_WXBASE wxLuaBinding_wxbase_init();
  #define WXLUA_IMPLEMENT_BIND_WXCORE wxLuaBinding_wxcore_init();
! #define WXLUA_IMPLEMENT_BIND_WXADV  wxLuaBinding_wxadv_init();
! #define WXLUA_IMPLEMENT_BIND_WXNET  wxLuaBinding_wxnet_init();
! 
  
  #if wxUSE_XML
+     #define WXLUA_DECLARE_BIND_WXXML extern WXDLLIMPEXP_BINDWXXML bool wxLuaBinding_wxxml_init(); // modules/wxbind
      #define WXLUA_IMPLEMENT_BIND_WXXML wxLuaBinding_wxxml_init();
  #else
+     #define WXLUA_DECLARE_BIND_WXXML
      #define WXLUA_IMPLEMENT_BIND_WXXML
!     //#warning "WXLUA_DECLARE/IMPLEMENT_BIND_WXXML is not used since wxUSE_XML=0"
  #endif //wxUSE_XML
  
  #if wxUSE_XRC
+     #define WXLUA_DECLARE_BIND_WXXRC extern WXDLLIMPEXP_BINDWXXRC bool wxLuaBinding_wxxrc_init(); // modules/wxbind
      #define WXLUA_IMPLEMENT_BIND_WXXRC wxLuaBinding_wxxrc_init();
  #else
+     #define WXLUA_DECLARE_BIND_WXXRC
      #define WXLUA_IMPLEMENT_BIND_WXXRC
!     //#warning "WXLUA_DECLARE/IMPLEMENT_BIND_WXXRC is not used since wxUSE_XRC=0"
  #endif //wxUSE_XRC
  
  #if wxUSE_HTML
+     #define WXLUA_DECLARE_BIND_WXHTML extern WXDLLIMPEXP_BINDWXHTML bool wxLuaBinding_wxhtml_init(); // modules/wxbind
      #define WXLUA_IMPLEMENT_BIND_WXHTML wxLuaBinding_wxhtml_init();
  #else
+     #define WXLUA_DECLARE_BIND_WXHTML
      #define WXLUA_IMPLEMENT_BIND_WXHTML
!     //#warning "WXLUA_DECLARE/IMPLEMENT_BIND_WXHTML is not used since wxUSE_HTML=0"
  #endif //wxUSE_HTML
  
  #if wxUSE_AUI
+     #define WXLUA_DECLARE_BIND_WXAUI extern WXDLLIMPEXP_BINDWXAUI bool wxLuaBinding_wxaui_init(); // modules/wxbind
      #define WXLUA_IMPLEMENT_BIND_WXAUI wxLuaBinding_wxaui_init();
  #else
+     #define WXLUA_DECLARE_BIND_WXAUI
      #define WXLUA_IMPLEMENT_BIND_WXAUI
!     //#warning "WXLUA_DECLARE/IMPLEMENT_BIND_WXAUI is not used since wxUSE_AUI=0"
  #endif //wxUSE_AUI
  
  #if wxUSE_MEDIACTRL
+     #define WXLUA_DECLARE_BIND_WXMEDIA extern WXDLLIMPEXP_BINDWXMEDIA bool wxLuaBinding_wxmedia_init(); // modules/wxbind
      #define WXLUA_IMPLEMENT_BIND_WXMEDIA wxLuaBinding_wxmedia_init();
  #else
+     #define WXLUA_DECLARE_BIND_WXMEDIA
      #define WXLUA_IMPLEMENT_BIND_WXMEDIA
!     // warning "WXLUA_DECLARE/IMPLEMENT_BIND_WXMEDIA is not used since wxUSE_MEDIACTRL=0"
  #endif //wxUSE_MEDIACTRL
  
  #if wxUSE_GLCANVAS
+     #define WXLUA_DECLARE_BIND_WXGL extern WXDLLIMPEXP_BINDWXGL bool wxLuaBinding_wxgl_init(); // modules/wxbind
      #define WXLUA_IMPLEMENT_BIND_WXGL wxLuaBinding_wxgl_init();
  #else
+     #define WXLUA_DECLARE_BIND_WXGL
      #define WXLUA_IMPLEMENT_BIND_WXGL
!     // warning "WXLUA_DECLARE/IMPLEMENT_BIND_WXGL is not used since wxUSE_GLCANVAS=0"
  #endif //wxUSE_GLCANVAS
  
  // Unfortunately there's no checks for this
+ #define WXLUA_DECLARE_BIND_WXSTC extern WXDLLIMPEXP_BINDWXSTC bool wxLuaBinding_wxstc_init(); // modules/wxbind
  #define WXLUA_IMPLEMENT_BIND_WXSTC wxLuaBinding_wxstc_init();
  

[Wxlua-commit] wxLua/modules/build/bakefiles common.bkl,1.15,1.16

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

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

Modified Files:
	common.bkl 
Log Message:
Add modules/wxbind/include/wxbinddefs.h so you can edit it
Cleanup wxbinddefs.h 


Index: common.bkl
===================================================================
RCS file: /cvsroot/wxlua/wxLua/modules/build/bakefiles/common.bkl,v
retrieving revision 1.15
retrieving revision 1.16
diff -C2 -d -r1.15 -r1.16
*** common.bkl	1 Aug 2007 10:08:23 -0000	1.15
--- common.bkl	2 Aug 2007 18:25:42 -0000	1.16
***************
*** 52,56 ****
  
      <set var="WXBINDBASE_SRC">$(fileList('wxbind/src/wxbase_*.cpp')) wxbind/src/dummy.cpp</set>
!     <set var="WXBINDBASE_HDR">$(fileList('wxbind/include/wxbase_*.h'))</set>
  
      <set var="WXBINDCORE_SRC">$(fileList('wxbind/src/wxcore_*.cpp')) wxbind/src/dummy.cpp</set>
--- 52,56 ----
  
      <set var="WXBINDBASE_SRC">$(fileList('wxbind/src/wxbase_*.cpp')) wxbind/src/dummy.cpp</set>
!     <set var="WXBINDBASE_HDR">$(fileList('wxbind/include/wxbase_*.h')) wxbind/include/wxbinddefs.h</set>
  
      <set var="WXBINDCORE_SRC">$(fileList('wxbind/src/wxcore_*.cpp')) wxbind/src/dummy.cpp</set>

[Wxlua-commit] wxLua/docs binding.html,1.24,1.25

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

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

Modified Files:
	binding.html 
Log Message:
Fix some typos


Index: binding.html
===================================================================
RCS file: /cvsroot/wxlua/wxLua/docs/binding.html,v
retrieving revision 1.24
retrieving revision 1.25
diff -C2 -d -r1.24 -r1.25
*** binding.html	30 Jun 2007 00:12:20 -0000	1.24
--- binding.html	1 Aug 2007 22:16:16 -0000	1.25
***************
*** 1,34 ****
  <!DOCTYPE html PUBLIC "-//W3C//DTD HTML 4.01 Transitional//EN">
! <html>
! <head>
! 
!   <meta content="text/html; charset=ISO-8859-1" http-equiv="content-type">
!   <title>wxLua Binding HowTo</title>
! 
! 
!   <meta content="John Labenski" name="author">
! 
[...2456 lines suppressed...]
  %__WXMOTIF20__<br>
  %__WXMAC__<br>
  %__WXMAC_CLASSIC__<br>
  %__WXMAC_CARBON__<br>
  %__WXMAC_OSX__<br>
  %__WXMGL__<br>
  %__WXMSW__<br>
  %__WXOS2__<br>
  %__WXOSX__<br>
  %__WXPALMOS__<br>
  %__WXPM__<br>
  %__WXSTUBS__<br>
  %__WXXT__<br>
  %__WXX11__<br>
  %__WXWINE__<br>
  %__WXUNIVERSAL__<br>
  %__X__<br>
  %__WXWINCE__<br>
! <br></body></html>
\ No newline at end of file

[Wxlua-commit] wxLua/modules/wxbind/include wxadv_bind.h, 1.3, 1.4 wxaui_bind.h, 1.3, 1.4 wxbase_bind.h, 1.3, 1.4 wxcore_bind.h, 1.3, 1.4 wxgl_bind.h, 1.3, 1.4 wxhtml_bind.h, 1.3, 1.4 wxmedia_bind.h, 1.3, 1.4 wxnet_bind.h, 1.3, 1.4 wxrichtext_bind.h, 1.3, 1.4 wxstc_bind.h, 1.3, 1.4 wxxml_bind.h, 1.3, 1.4 wxxrc_bind.h, 1.3, 1.4

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

Update of /cvsroot/wxlua/wxLua/modules/wxbind/include
In directory sc8-pr-cvs9.sourceforge.net:/tmp/cvs-serv2271/wxLua/modules/wxbind/include

Modified Files:
	wxadv_bind.h wxaui_bind.h wxbase_bind.h wxcore_bind.h 
	wxgl_bind.h wxhtml_bind.h wxmedia_bind.h wxnet_bind.h 
	wxrichtext_bind.h wxstc_bind.h wxxml_bind.h wxxrc_bind.h 
Log Message:
Add ored enum DELETE_CLEAR_OBJECT for wxLuaState::RemoveTrackedObject to simplify
Apply patch to lparser.c "Too many variables in an assignment may cause a C stack overflow"


Index: wxadv_bind.h
===================================================================
RCS file: /cvsroot/wxlua/wxLua/modules/wxbind/include/wxadv_bind.h,v
retrieving revision 1.3
retrieving revision 1.4
diff -C2 -d -r1.3 -r1.4
*** wxadv_bind.h	22 Jul 2007 04:38:28 -0000	1.3
--- wxadv_bind.h	1 Aug 2007 19:15:31 -0000	1.4
***************
*** 21,27 ****
  //   the current version of the bindings.
  //   See 'bindings/genwxbind.lua' and 'modules/wxlua/include/wxldefs.h'
! #if WXLUA_BINDING_VERSION > 16
  #   error "The WXLUA_BINDING_VERSION in the bindings is too old, regenerate bindings."
! #endif //WXLUA_BINDING_VERSION > 16
  // ---------------------------------------------------------------------------
  
--- 21,27 ----
  //   the current version of the bindings.
  //   See 'bindings/genwxbind.lua' and 'modules/wxlua/include/wxldefs.h'
! #if WXLUA_BINDING_VERSION > 17
  #   error "The WXLUA_BINDING_VERSION in the bindings is too old, regenerate bindings."
! #endif //WXLUA_BINDING_VERSION > 17
  // ---------------------------------------------------------------------------
  

Index: wxcore_bind.h
===================================================================
RCS file: /cvsroot/wxlua/wxLua/modules/wxbind/include/wxcore_bind.h,v
retrieving revision 1.3
retrieving revision 1.4
diff -C2 -d -r1.3 -r1.4
*** wxcore_bind.h	22 Jul 2007 04:38:28 -0000	1.3
--- wxcore_bind.h	1 Aug 2007 19:15:34 -0000	1.4
***************
*** 38,44 ****
  //   the current version of the bindings.
  //   See 'bindings/genwxbind.lua' and 'modules/wxlua/include/wxldefs.h'
! #if WXLUA_BINDING_VERSION > 16
  #   error "The WXLUA_BINDING_VERSION in the bindings is too old, regenerate bindings."
! #endif //WXLUA_BINDING_VERSION > 16
  // ---------------------------------------------------------------------------
  
--- 38,44 ----
  //   the current version of the bindings.
  //   See 'bindings/genwxbind.lua' and 'modules/wxlua/include/wxldefs.h'
! #if WXLUA_BINDING_VERSION > 17
  #   error "The WXLUA_BINDING_VERSION in the bindings is too old, regenerate bindings."
! #endif //WXLUA_BINDING_VERSION > 17
  // ---------------------------------------------------------------------------
  

Index: wxrichtext_bind.h
===================================================================
RCS file: /cvsroot/wxlua/wxLua/modules/wxbind/include/wxrichtext_bind.h,v
retrieving revision 1.3
retrieving revision 1.4
diff -C2 -d -r1.3 -r1.4
*** wxrichtext_bind.h	22 Jul 2007 04:38:28 -0000	1.3
--- wxrichtext_bind.h	1 Aug 2007 19:15:34 -0000	1.4
***************
*** 21,27 ****
  //   the current version of the bindings.
  //   See 'bindings/genwxbind.lua' and 'modules/wxlua/include/wxldefs.h'
! #if WXLUA_BINDING_VERSION > 16
  #   error "The WXLUA_BINDING_VERSION in the bindings is too old, regenerate bindings."
! #endif //WXLUA_BINDING_VERSION > 16
  // ---------------------------------------------------------------------------
  
--- 21,27 ----
  //   the current version of the bindings.
  //   See 'bindings/genwxbind.lua' and 'modules/wxlua/include/wxldefs.h'
! #if WXLUA_BINDING_VERSION > 17
  #   error "The WXLUA_BINDING_VERSION in the bindings is too old, regenerate bindings."
! #endif //WXLUA_BINDING_VERSION > 17
  // ---------------------------------------------------------------------------
  

Index: wxxrc_bind.h
===================================================================
RCS file: /cvsroot/wxlua/wxLua/modules/wxbind/include/wxxrc_bind.h,v
retrieving revision 1.3
retrieving revision 1.4
diff -C2 -d -r1.3 -r1.4
*** wxxrc_bind.h	22 Jul 2007 04:38:28 -0000	1.3
--- wxxrc_bind.h	1 Aug 2007 19:15:35 -0000	1.4
***************
*** 21,27 ****
  //   the current version of the bindings.
  //   See 'bindings/genwxbind.lua' and 'modules/wxlua/include/wxldefs.h'
! #if WXLUA_BINDING_VERSION > 16
  #   error "The WXLUA_BINDING_VERSION in the bindings is too old, regenerate bindings."
! #endif //WXLUA_BINDING_VERSION > 16
  // ---------------------------------------------------------------------------
  
--- 21,27 ----
  //   the current version of the bindings.
  //   See 'bindings/genwxbind.lua' and 'modules/wxlua/include/wxldefs.h'
! #if WXLUA_BINDING_VERSION > 17
  #   error "The WXLUA_BINDING_VERSION in the bindings is too old, regenerate bindings."
! #endif //WXLUA_BINDING_VERSION > 17
  // ---------------------------------------------------------------------------
  

Index: wxnet_bind.h
===================================================================
RCS file: /cvsroot/wxlua/wxLua/modules/wxbind/include/wxnet_bind.h,v
retrieving revision 1.3
retrieving revision 1.4
diff -C2 -d -r1.3 -r1.4
*** wxnet_bind.h	22 Jul 2007 04:38:28 -0000	1.3
--- wxnet_bind.h	1 Aug 2007 19:15:34 -0000	1.4
***************
*** 21,27 ****
  //   the current version of the bindings.
  //   See 'bindings/genwxbind.lua' and 'modules/wxlua/include/wxldefs.h'
! #if WXLUA_BINDING_VERSION > 16
  #   error "The WXLUA_BINDING_VERSION in the bindings is too old, regenerate bindings."
! #endif //WXLUA_BINDING_VERSION > 16
  // ---------------------------------------------------------------------------
  
--- 21,27 ----
  //   the current version of the bindings.
  //   See 'bindings/genwxbind.lua' and 'modules/wxlua/include/wxldefs.h'
! #if WXLUA_BINDING_VERSION > 17
  #   error "The WXLUA_BINDING_VERSION in the bindings is too old, regenerate bindings."
! #endif //WXLUA_BINDING_VERSION > 17
  // ---------------------------------------------------------------------------
  

Index: wxbase_bind.h
===================================================================
RCS file: /cvsroot/wxlua/wxLua/modules/wxbind/include/wxbase_bind.h,v
retrieving revision 1.3
retrieving revision 1.4
diff -C2 -d -r1.3 -r1.4
*** wxbase_bind.h	22 Jul 2007 04:38:28 -0000	1.3
--- wxbase_bind.h	1 Aug 2007 19:15:34 -0000	1.4
***************
*** 20,26 ****
  //   the current version of the bindings.
  //   See 'bindings/genwxbind.lua' and 'modules/wxlua/include/wxldefs.h'
! #if WXLUA_BINDING_VERSION > 16
  #   error "The WXLUA_BINDING_VERSION in the bindings is too old, regenerate bindings."
! #endif //WXLUA_BINDING_VERSION > 16
  // ---------------------------------------------------------------------------
  
--- 20,26 ----
  //   the current version of the bindings.
  //   See 'bindings/genwxbind.lua' and 'modules/wxlua/include/wxldefs.h'
! #if WXLUA_BINDING_VERSION > 17
  #   error "The WXLUA_BINDING_VERSION in the bindings is too old, regenerate bindings."
! #endif //WXLUA_BINDING_VERSION > 17
  // ---------------------------------------------------------------------------
  

Index: wxmedia_bind.h
===================================================================
RCS file: /cvsroot/wxlua/wxLua/modules/wxbind/include/wxmedia_bind.h,v
retrieving revision 1.3
retrieving revision 1.4
diff -C2 -d -r1.3 -r1.4
*** wxmedia_bind.h	22 Jul 2007 04:38:28 -0000	1.3
--- wxmedia_bind.h	1 Aug 2007 19:15:34 -0000	1.4
***************
*** 22,28 ****
  //   the current version of the bindings.
  //   See 'bindings/genwxbind.lua' and 'modules/wxlua/include/wxldefs.h'
! #if WXLUA_BINDING_VERSION > 16
  #   error "The WXLUA_BINDING_VERSION in the bindings is too old, regenerate bindings."
! #endif //WXLUA_BINDING_VERSION > 16
  // ---------------------------------------------------------------------------
  
--- 22,28 ----
  //   the current version of the bindings.
  //   See 'bindings/genwxbind.lua' and 'modules/wxlua/include/wxldefs.h'
! #if WXLUA_BINDING_VERSION > 17
  #   error "The WXLUA_BINDING_VERSION in the bindings is too old, regenerate bindings."
! #endif //WXLUA_BINDING_VERSION > 17
  // ---------------------------------------------------------------------------
  

Index: wxgl_bind.h
===================================================================
RCS file: /cvsroot/wxlua/wxLua/modules/wxbind/include/wxgl_bind.h,v
retrieving revision 1.3
retrieving revision 1.4
diff -C2 -d -r1.3 -r1.4
*** wxgl_bind.h	22 Jul 2007 04:38:28 -0000	1.3
--- wxgl_bind.h	1 Aug 2007 19:15:34 -0000	1.4
***************
*** 21,27 ****
  //   the current version of the bindings.
  //   See 'bindings/genwxbind.lua' and 'modules/wxlua/include/wxldefs.h'
! #if WXLUA_BINDING_VERSION > 16
  #   error "The WXLUA_BINDING_VERSION in the bindings is too old, regenerate bindings."
! #endif //WXLUA_BINDING_VERSION > 16
  // ---------------------------------------------------------------------------
  
--- 21,27 ----
  //   the current version of the bindings.
  //   See 'bindings/genwxbind.lua' and 'modules/wxlua/include/wxldefs.h'
! #if WXLUA_BINDING_VERSION > 17
  #   error "The WXLUA_BINDING_VERSION in the bindings is too old, regenerate bindings."
! #endif //WXLUA_BINDING_VERSION > 17
  // ---------------------------------------------------------------------------
  

Index: wxstc_bind.h
===================================================================
RCS file: /cvsroot/wxlua/wxLua/modules/wxbind/include/wxstc_bind.h,v
retrieving revision 1.3
retrieving revision 1.4
diff -C2 -d -r1.3 -r1.4
*** wxstc_bind.h	22 Jul 2007 04:38:28 -0000	1.3
--- wxstc_bind.h	1 Aug 2007 19:15:34 -0000	1.4
***************
*** 21,27 ****
  //   the current version of the bindings.
  //   See 'bindings/genwxbind.lua' and 'modules/wxlua/include/wxldefs.h'
! #if WXLUA_BINDING_VERSION > 16
  #   error "The WXLUA_BINDING_VERSION in the bindings is too old, regenerate bindings."
! #endif //WXLUA_BINDING_VERSION > 16
  // ---------------------------------------------------------------------------
  
--- 21,27 ----
  //   the current version of the bindings.
  //   See 'bindings/genwxbind.lua' and 'modules/wxlua/include/wxldefs.h'
! #if WXLUA_BINDING_VERSION > 17
  #   error "The WXLUA_BINDING_VERSION in the bindings is too old, regenerate bindings."
! #endif //WXLUA_BINDING_VERSION > 17
  // ---------------------------------------------------------------------------
  

Index: wxaui_bind.h
===================================================================
RCS file: /cvsroot/wxlua/wxLua/modules/wxbind/include/wxaui_bind.h,v
retrieving revision 1.3
retrieving revision 1.4
diff -C2 -d -r1.3 -r1.4
*** wxaui_bind.h	22 Jul 2007 04:38:28 -0000	1.3
--- wxaui_bind.h	1 Aug 2007 19:15:31 -0000	1.4
***************
*** 21,27 ****
  //   the current version of the bindings.
  //   See 'bindings/genwxbind.lua' and 'modules/wxlua/include/wxldefs.h'
! #if WXLUA_BINDING_VERSION > 16
  #   error "The WXLUA_BINDING_VERSION in the bindings is too old, regenerate bindings."
! #endif //WXLUA_BINDING_VERSION > 16
  // ---------------------------------------------------------------------------
  
--- 21,27 ----
  //   the current version of the bindings.
  //   See 'bindings/genwxbind.lua' and 'modules/wxlua/include/wxldefs.h'
! #if WXLUA_BINDING_VERSION > 17
  #   error "The WXLUA_BINDING_VERSION in the bindings is too old, regenerate bindings."
! #endif //WXLUA_BINDING_VERSION > 17
  // ---------------------------------------------------------------------------
  

Index: wxhtml_bind.h
===================================================================
RCS file: /cvsroot/wxlua/wxLua/modules/wxbind/include/wxhtml_bind.h,v
retrieving revision 1.3
retrieving revision 1.4
diff -C2 -d -r1.3 -r1.4
*** wxhtml_bind.h	22 Jul 2007 04:38:28 -0000	1.3
--- wxhtml_bind.h	1 Aug 2007 19:15:34 -0000	1.4
***************
*** 21,27 ****
  //   the current version of the bindings.
  //   See 'bindings/genwxbind.lua' and 'modules/wxlua/include/wxldefs.h'
! #if WXLUA_BINDING_VERSION > 16
  #   error "The WXLUA_BINDING_VERSION in the bindings is too old, regenerate bindings."
! #endif //WXLUA_BINDING_VERSION > 16
  // ---------------------------------------------------------------------------
  
--- 21,27 ----
  //   the current version of the bindings.
  //   See 'bindings/genwxbind.lua' and 'modules/wxlua/include/wxldefs.h'
! #if WXLUA_BINDING_VERSION > 17
  #   error "The WXLUA_BINDING_VERSION in the bindings is too old, regenerate bindings."
! #endif //WXLUA_BINDING_VERSION > 17
  // ---------------------------------------------------------------------------
  

Index: wxxml_bind.h
===================================================================
RCS file: /cvsroot/wxlua/wxLua/modules/wxbind/include/wxxml_bind.h,v
retrieving revision 1.3
retrieving revision 1.4
diff -C2 -d -r1.3 -r1.4
*** wxxml_bind.h	22 Jul 2007 04:38:28 -0000	1.3
--- wxxml_bind.h	1 Aug 2007 19:15:34 -0000	1.4
***************
*** 21,27 ****
  //   the current version of the bindings.
  //   See 'bindings/genwxbind.lua' and 'modules/wxlua/include/wxldefs.h'
! #if WXLUA_BINDING_VERSION > 16
  #   error "The WXLUA_BINDING_VERSION in the bindings is too old, regenerate bindings."
! #endif //WXLUA_BINDING_VERSION > 16
  // ---------------------------------------------------------------------------
  
--- 21,27 ----
  //   the current version of the bindings.
  //   See 'bindings/genwxbind.lua' and 'modules/wxlua/include/wxldefs.h'
! #if WXLUA_BINDING_VERSION > 17
  #   error "The WXLUA_BINDING_VERSION in the bindings is too old, regenerate bindings."
! #endif //WXLUA_BINDING_VERSION > 17
  // ---------------------------------------------------------------------------
  

[Wxlua-commit] wxLua/bindings genwxbind.lua,1.145,1.146

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

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

Modified Files:
	genwxbind.lua 
Log Message:
Add ored enum DELETE_CLEAR_OBJECT for wxLuaState::RemoveTrackedObject to simplify
Apply patch to lparser.c "Too many variables in an assignment may cause a C stack overflow"


Index: genwxbind.lua
===================================================================
RCS file: /cvsroot/wxlua/wxLua/bindings/genwxbind.lua,v
retrieving revision 1.145
retrieving revision 1.146
diff -C2 -d -r1.145 -r1.146
*** genwxbind.lua	22 Jul 2007 04:38:27 -0000	1.145
--- genwxbind.lua	1 Aug 2007 19:15:30 -0000	1.146
***************
*** 18,22 ****
  -- ---------------------------------------------------------------------------
  
! WXLUA_BINDING_VERSION = 16 -- Used to verify that the bindings are updated
                             -- This must match modules/wxlua/include/wxldefs.h
                             -- otherwise a compile time error will be generated.
--- 18,22 ----
  -- ---------------------------------------------------------------------------
  
! WXLUA_BINDING_VERSION = 17 -- Used to verify that the bindings are updated
                             -- This must match modules/wxlua/include/wxldefs.h
                             -- otherwise a compile time error will be generated.
***************
*** 3246,3250 ****
                                  end
                              elseif param.UnGC then
!                                 table.insert(gcList, "    if (wxlState.IsTrackedObject("..argName..")) wxlState.RemoveTrackedObject("..argName..", wxLuaState::UNDELETE);\n")
                              end
  
--- 3246,3250 ----
                                  end
                              elseif param.UnGC then
!                                 table.insert(gcList, "    if (wxlState.IsTrackedObject("..argName..")) wxlState.RemoveTrackedObject("..argName..", wxLuaState::UNDELETE_OBJECT);\n")
                              end
  
***************
*** 3585,3589 ****
  
                          if parseObject.UnGCThis then
!                             table.insert(codeList, "    wxlState.RemoveTrackedObject(self, wxLuaState::UNDELETE);\n")
                          elseif parseObject.GCThis then
                              if parseObject.Encapsulate then
--- 3585,3589 ----
  
                          if parseObject.UnGCThis then
!                             table.insert(codeList, "    wxlState.RemoveTrackedObject(self, wxLuaState::UNDELETE_OBJECT);\n")
                          elseif parseObject.GCThis then
                              if parseObject.Encapsulate then
***************
*** 3665,3669 ****
                                  end
                              elseif member.UnGC then
!                                 table.insert(codeList, "    if (wxlState.IsTrackedObject(returns)) wxlState.RemoveTrackedObject(returns, wxLuaState::UNDELETE);\n")
                              end
  
--- 3665,3669 ----
                                  end
                              elseif member.UnGC then
!                                 table.insert(codeList, "    if (wxlState.IsTrackedObject(returns)) wxlState.RemoveTrackedObject(returns, wxLuaState::UNDELETE_OBJECT);\n")
                              end
  
***************
*** 3836,3840 ****
                  table.insert(codeList, "    "..parseObject.Name.." * self = ("..parseObject.Name.." *)wxlState.GetUserDataType(1, s_wxluatag_"..MakeClassVar(parseObject.Name)..");\n")
                  CommentBindingTable(codeList, "    // if removed from tracked mem list, reset the tag so that gc() is not called on this object.\n")
!                 table.insert(codeList, "    if ((self != NULL) && wxlState.RemoveTrackedObject(self, wxLuaState::DELETE_OBJECT|wxLuaState::CLEAR_LUA_TRACKED|wxLuaState::CLEAR_DERIVED_METHODS))\n")
                  table.insert(codeList, "    {\n")
                  table.insert(codeList, "        lua_pushnil(L);\n")
--- 3836,3840 ----
                  table.insert(codeList, "    "..parseObject.Name.." * self = ("..parseObject.Name.." *)wxlState.GetUserDataType(1, s_wxluatag_"..MakeClassVar(parseObject.Name)..");\n")
                  CommentBindingTable(codeList, "    // if removed from tracked mem list, reset the tag so that gc() is not called on this object.\n")
!                 table.insert(codeList, "    if ((self != NULL) && wxlState.RemoveTrackedObject(self, wxLuaState::DELETE_CLEAR_OBJECT))\n")
                  table.insert(codeList, "    {\n")
                  table.insert(codeList, "        lua_pushnil(L);\n")

[Wxlua-commit] wxLua/bindings/wxwidgets wxbase_override.hpp, 1.3, 1.4 wxcore_override.hpp, 1.3, 1.4

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

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

Modified Files:
	wxbase_override.hpp wxcore_override.hpp 
Log Message:
Add ored enum DELETE_CLEAR_OBJECT for wxLuaState::RemoveTrackedObject to simplify
Apply patch to lparser.c "Too many variables in an assignment may cause a C stack overflow"


Index: wxbase_override.hpp
===================================================================
RCS file: /cvsroot/wxlua/wxLua/bindings/wxwidgets/wxbase_override.hpp,v
retrieving revision 1.3
retrieving revision 1.4
diff -C2 -d -r1.3 -r1.4
*** wxbase_override.hpp	31 Jul 2007 20:54:02 -0000	1.3
--- wxbase_override.hpp	1 Aug 2007 19:15:31 -0000	1.4
***************
*** 180,184 ****
  
      // we may not be tracked, but delete us anyway
!     if (!wxlState.RemoveTrackedObject(self, wxLuaState::DELETE_OBJECT|wxLuaState::CLEAR_LUA_TRACKED|wxLuaState::CLEAR_DERIVED_METHODS))
          delete self;
  
--- 180,184 ----
  
      // we may not be tracked, but delete us anyway
!     if (!wxlState.RemoveTrackedObject(self, wxLuaState::DELETE_CLEAR_OBJECT))
          delete self;
  

Index: wxcore_override.hpp
===================================================================
RCS file: /cvsroot/wxlua/wxLua/bindings/wxwidgets/wxcore_override.hpp,v
retrieving revision 1.3
retrieving revision 1.4
diff -C2 -d -r1.3 -r1.4
*** wxcore_override.hpp	1 Aug 2007 03:21:23 -0000	1.3
--- wxcore_override.hpp	1 Aug 2007 19:15:31 -0000	1.4
***************
*** 2465,2470 ****
      // we must disconnect them from our tracking list
      if (printoutForPrinting != NULL)
!         wxlState.RemoveTrackedObject(printoutForPrinting, wxLuaState::UNDELETE);
!     wxlState.RemoveTrackedObject(printout, wxLuaState::UNDELETE);
  
      // call constructor
--- 2465,2470 ----
      // we must disconnect them from our tracking list
      if (printoutForPrinting != NULL)
!         wxlState.RemoveTrackedObject(printoutForPrinting, wxLuaState::UNDELETE_OBJECT);
!     wxlState.RemoveTrackedObject(printout, wxLuaState::UNDELETE_OBJECT);
  
      // call constructor

[Wxlua-commit] wxLua/docs changelog.txt,1.43,1.44

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

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

Modified Files:
	changelog.txt 
Log Message:
Add ored enum DELETE_CLEAR_OBJECT for wxLuaState::RemoveTrackedObject to simplify
Apply patch to lparser.c "Too many variables in an assignment may cause a C stack overflow"


Index: changelog.txt
===================================================================
RCS file: /cvsroot/wxlua/wxLua/docs/changelog.txt,v
retrieving revision 1.43
retrieving revision 1.44
diff -C2 -d -r1.43 -r1.44
*** changelog.txt	17 Jul 2007 14:45:21 -0000	1.43
--- changelog.txt	1 Aug 2007 19:15:31 -0000	1.44
***************
*** 13,16 ****
--- 13,18 ----
     of a pointer to the Lua userdata that wraps the data.
   - Moved wxLUA_VERSION... bindings into the 'wxlua' table.
+  - Applied patch to lparser.c 
+    "Too many variables in an assignment may cause a C stack overflow"
  
   version 2.8.4.1

[Wxlua-commit] wxLua/modules/lua/src lparser.c,1.4,1.5

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

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

Modified Files:
	lparser.c 
Log Message:
Add ored enum DELETE_CLEAR_OBJECT for wxLuaState::RemoveTrackedObject to simplify
Apply patch to lparser.c "Too many variables in an assignment may cause a C stack overflow"


Index: lparser.c
===================================================================
RCS file: /cvsroot/wxlua/wxLua/modules/lua/src/lparser.c,v
retrieving revision 1.4
retrieving revision 1.5
diff -C2 -d -r1.4 -r1.5
*** lparser.c	22 Sep 2006 19:39:59 -0000	1.4
--- lparser.c	1 Aug 2007 19:15:31 -0000	1.5
***************
*** 939,942 ****
--- 939,944 ----
      if (nv.v.k == VLOCAL)
        check_conflict(ls, lh, &nv.v);
+     luaY_checklimit(ls->fs, nvars, LUAI_MAXCCALLS - ls->L->nCcalls,
+                     "variable names");
      assignment(ls, &nv, nvars+1);
    }

[Wxlua-commit] wxLua/apps/wxluacan/src wxluacan.h,1.33,1.34

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

Update of /cvsroot/wxlua/wxLua/apps/wxluacan/src
In directory sc8-pr-cvs9.sourceforge.net:/tmp/cvs-serv2271/wxLua/apps/wxluacan/src

Modified Files:
	wxluacan.h 
Log Message:
Add ored enum DELETE_CLEAR_OBJECT for wxLuaState::RemoveTrackedObject to simplify
Apply patch to lparser.c "Too many variables in an assignment may cause a C stack overflow"


Index: wxluacan.h
===================================================================
RCS file: /cvsroot/wxlua/wxLua/apps/wxluacan/src/wxluacan.h,v
retrieving revision 1.33
retrieving revision 1.34
diff -C2 -d -r1.33 -r1.34
*** wxluacan.h	22 Jul 2007 04:38:27 -0000	1.33
--- wxluacan.h	1 Aug 2007 19:15:30 -0000	1.34
***************
*** 18,24 ****
  //   the current version of the bindings.
  //   See 'bindings/genwxbind.lua' and 'modules/wxlua/include/wxldefs.h'
! #if WXLUA_BINDING_VERSION > 16
  #   error "The WXLUA_BINDING_VERSION in the bindings is too old, regenerate bindings."
! #endif //WXLUA_BINDING_VERSION > 16
  // ---------------------------------------------------------------------------
  
--- 18,24 ----
  //   the current version of the bindings.
  //   See 'bindings/genwxbind.lua' and 'modules/wxlua/include/wxldefs.h'
! #if WXLUA_BINDING_VERSION > 17
  #   error "The WXLUA_BINDING_VERSION in the bindings is too old, regenerate bindings."
! #endif //WXLUA_BINDING_VERSION > 17
  // ---------------------------------------------------------------------------
  

[Wxlua-commit] wxLua/modules/wxbind/src wxadv_adv.cpp, 1.2, 1.3 wxadv_grid.cpp, 1.2, 1.3 wxaui_aui.cpp, 1.2, 1.3 wxbase_base.cpp, 1.2, 1.3 wxbase_config.cpp, 1.2, 1.3 wxbase_data.cpp, 1.3, 1.4 wxbase_datetime.cpp, 1.2, 1.3 wxbase_file.cpp, 1.2, 1.3 wxcore_clipdrag.cpp, 1.2, 1.3 wxcore_controls.cpp, 1.2, 1.3 wxcore_core.cpp, 1.2, 1.3 wxcore_defsutils.cpp, 1.2, 1.3 wxcore_dialogs.cpp, 1.2, 1.3 wxcore_event.cpp, 1.2, 1.3 wxcore_gdi.cpp, 1.2, 1.3 wxcore_geometry.cpp, 1.2, 1.3 wxcore_help.cpp, 1.2, 1.3 wxcore_image.cpp, 1.2, 1.3 wxcore_mdi.cpp, 1.2, 1.3 wxcore_menutool.cpp, 1.2, 1.3 wxcore_picker.cpp, 1.2, 1.3 wxcore_print.cpp, 1.2, 1.3 wxcore_sizer.cpp, 1.3, 1.4 wxcore_windows.cpp, 1.3, 1.4 wxhtml_html.cpp, 1.2, 1.3 wxmedia_media.cpp, 1.2, 1.3 wxnet_net.cpp, 1.2, 1.3 wxstc_stc.cpp, 1.2, 1.3 wxxml_xml.cpp, 1.2, 1.3 wxxrc_xrc.cpp, 1.2, 1.3

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

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

Modified Files:
	wxadv_adv.cpp wxadv_grid.cpp wxaui_aui.cpp wxbase_base.cpp 
	wxbase_config.cpp wxbase_data.cpp wxbase_datetime.cpp 
	wxbase_file.cpp wxcore_clipdrag.cpp wxcore_controls.cpp 
	wxcore_core.cpp wxcore_defsutils.cpp wxcore_dialogs.cpp 
	wxcore_event.cpp wxcore_gdi.cpp wxcore_geometry.cpp 
	wxcore_help.cpp wxcore_image.cpp wxcore_mdi.cpp 
	wxcore_menutool.cpp wxcore_picker.cpp wxcore_print.cpp 
	wxcore_sizer.cpp wxcore_windows.cpp wxhtml_html.cpp 
	wxmedia_media.cpp wxnet_net.cpp wxstc_stc.cpp wxxml_xml.cpp 
	wxxrc_xrc.cpp 
Log Message:
Add ored enum DELETE_CLEAR_OBJECT for wxLuaState::RemoveTrackedObject to simplify
Apply patch to lparser.c "Too many variables in an assignment may cause a C stack overflow"


Index: wxnet_net.cpp
===================================================================
RCS file: /cvsroot/wxlua/wxLua/modules/wxbind/src/wxnet_net.cpp,v
retrieving revision 1.2
retrieving revision 1.3
diff -C2 -d -r1.2 -r1.3
*** wxnet_net.cpp	22 Jul 2007 04:38:29 -0000	1.2
--- wxnet_net.cpp	1 Aug 2007 19:15:37 -0000	1.3
***************
*** 787,791 ****
      wxSocketClient * self = (wxSocketClient *)wxlState.GetUserDataType(1, s_wxluatag_wxSocketClient);
      // if removed from tracked mem list, reset the tag so that gc() is not called on this object.
!     if ((self != NULL) && wxlState.RemoveTrackedObject(self, wxLuaState::DELETE_OBJECT|wxLuaState::CLEAR_LUA_TRACKED|wxLuaState::CLEAR_DERIVED_METHODS))
      {
          lua_pushnil(L);
--- 787,791 ----
      wxSocketClient * self = (wxSocketClient *)wxlState.GetUserDataType(1, s_wxluatag_wxSocketClient);
      // if removed from tracked mem list, reset the tag so that gc() is not called on this object.
!     if ((self != NULL) && wxlState.RemoveTrackedObject(self, wxLuaState::DELETE_CLEAR_OBJECT))
      {
          lua_pushnil(L);
***************
*** 922,926 ****
      wxSocketServer * self = (wxSocketServer *)wxlState.GetUserDataType(1, s_wxluatag_wxSocketServer);
      // if removed from tracked mem list, reset the tag so that gc() is not called on this object.
!     if ((self != NULL) && wxlState.RemoveTrackedObject(self, wxLuaState::DELETE_OBJECT|wxLuaState::CLEAR_LUA_TRACKED|wxLuaState::CLEAR_DERIVED_METHODS))
      {
          lua_pushnil(L);
--- 922,926 ----
      wxSocketServer * self = (wxSocketServer *)wxlState.GetUserDataType(1, s_wxluatag_wxSocketServer);
      // if removed from tracked mem list, reset the tag so that gc() is not called on this object.
!     if ((self != NULL) && wxlState.RemoveTrackedObject(self, wxLuaState::DELETE_CLEAR_OBJECT))
      {
          lua_pushnil(L);
***************
*** 1044,1048 ****
      wxSocketEvent * self = (wxSocketEvent *)wxlState.GetUserDataType(1, s_wxluatag_wxSocketEvent);
      // if removed from tracked mem list, reset the tag so that gc() is not called on this object.
!     if ((self != NULL) && wxlState.RemoveTrackedObject(self, wxLuaState::DELETE_OBJECT|wxLuaState::CLEAR_LUA_TRACKED|wxLuaState::CLEAR_DERIVED_METHODS))
      {
          lua_pushnil(L);
--- 1044,1048 ----
      wxSocketEvent * self = (wxSocketEvent *)wxlState.GetUserDataType(1, s_wxluatag_wxSocketEvent);
      // if removed from tracked mem list, reset the tag so that gc() is not called on this object.
!     if ((self != NULL) && wxlState.RemoveTrackedObject(self, wxLuaState::DELETE_CLEAR_OBJECT))
      {
          lua_pushnil(L);
***************
*** 1316,1320 ****
      wxIPaddress * self = (wxIPaddress *)wxlState.GetUserDataType(1, s_wxluatag_wxIPaddress);
      // if removed from tracked mem list, reset the tag so that gc() is not called on this object.
!     if ((self != NULL) && wxlState.RemoveTrackedObject(self, wxLuaState::DELETE_OBJECT|wxLuaState::CLEAR_LUA_TRACKED|wxLuaState::CLEAR_DERIVED_METHODS))
      {
          lua_pushnil(L);
--- 1316,1320 ----
      wxIPaddress * self = (wxIPaddress *)wxlState.GetUserDataType(1, s_wxluatag_wxIPaddress);
      // if removed from tracked mem list, reset the tag so that gc() is not called on this object.
!     if ((self != NULL) && wxlState.RemoveTrackedObject(self, wxLuaState::DELETE_CLEAR_OBJECT))
      {
          lua_pushnil(L);
***************
*** 1427,1431 ****
      wxIPV4address * self = (wxIPV4address *)wxlState.GetUserDataType(1, s_wxluatag_wxIPV4address);
      // if removed from tracked mem list, reset the tag so that gc() is not called on this object.
!     if ((self != NULL) && wxlState.RemoveTrackedObject(self, wxLuaState::DELETE_OBJECT|wxLuaState::CLEAR_LUA_TRACKED|wxLuaState::CLEAR_DERIVED_METHODS))
      {
          lua_pushnil(L);
--- 1427,1431 ----
      wxIPV4address * self = (wxIPV4address *)wxlState.GetUserDataType(1, s_wxluatag_wxIPV4address);
      // if removed from tracked mem list, reset the tag so that gc() is not called on this object.
!     if ((self != NULL) && wxlState.RemoveTrackedObject(self, wxLuaState::DELETE_CLEAR_OBJECT))
      {
          lua_pushnil(L);
***************
*** 1660,1664 ****
      wxProtocol * self = (wxProtocol *)wxlState.GetUserDataType(1, s_wxluatag_wxProtocol);
      // if removed from tracked mem list, reset the tag so that gc() is not called on this object.
!     if ((self != NULL) && wxlState.RemoveTrackedObject(self, wxLuaState::DELETE_OBJECT|wxLuaState::CLEAR_LUA_TRACKED|wxLuaState::CLEAR_DERIVED_METHODS))
      {
          lua_pushnil(L);
--- 1660,1664 ----
      wxProtocol * self = (wxProtocol *)wxlState.GetUserDataType(1, s_wxluatag_wxProtocol);
      // if removed from tracked mem list, reset the tag so that gc() is not called on this object.
!     if ((self != NULL) && wxlState.RemoveTrackedObject(self, wxLuaState::DELETE_CLEAR_OBJECT))
      {
          lua_pushnil(L);
***************
*** 1767,1771 ****
      wxHTTP * self = (wxHTTP *)wxlState.GetUserDataType(1, s_wxluatag_wxHTTP);
      // if removed from tracked mem list, reset the tag so that gc() is not called on this object.
!     if ((self != NULL) && wxlState.RemoveTrackedObject(self, wxLuaState::DELETE_OBJECT|wxLuaState::CLEAR_LUA_TRACKED|wxLuaState::CLEAR_DERIVED_METHODS))
      {
          lua_pushnil(L);
--- 1767,1771 ----
      wxHTTP * self = (wxHTTP *)wxlState.GetUserDataType(1, s_wxluatag_wxHTTP);
      // if removed from tracked mem list, reset the tag so that gc() is not called on this object.
!     if ((self != NULL) && wxlState.RemoveTrackedObject(self, wxLuaState::DELETE_CLEAR_OBJECT))
      {
          lua_pushnil(L);
***************
*** 2201,2205 ****
      wxFTP * self = (wxFTP *)wxlState.GetUserDataType(1, s_wxluatag_wxFTP);
      // if removed from tracked mem list, reset the tag so that gc() is not called on this object.
!     if ((self != NULL) && wxlState.RemoveTrackedObject(self, wxLuaState::DELETE_OBJECT|wxLuaState::CLEAR_LUA_TRACKED|wxLuaState::CLEAR_DERIVED_METHODS))
      {
          lua_pushnil(L);
--- 2201,2205 ----
      wxFTP * self = (wxFTP *)wxlState.GetUserDataType(1, s_wxluatag_wxFTP);
      // if removed from tracked mem list, reset the tag so that gc() is not called on this object.
!     if ((self != NULL) && wxlState.RemoveTrackedObject(self, wxLuaState::DELETE_CLEAR_OBJECT))
      {
          lua_pushnil(L);
***************
*** 2718,2722 ****
      wxURI * self = (wxURI *)wxlState.GetUserDataType(1, s_wxluatag_wxURI);
      // if removed from tracked mem list, reset the tag so that gc() is not called on this object.
!     if ((self != NULL) && wxlState.RemoveTrackedObject(self, wxLuaState::DELETE_OBJECT|wxLuaState::CLEAR_LUA_TRACKED|wxLuaState::CLEAR_DERIVED_METHODS))
      {
          lua_pushnil(L);
--- 2718,2722 ----
      wxURI * self = (wxURI *)wxlState.GetUserDataType(1, s_wxluatag_wxURI);
      // if removed from tracked mem list, reset the tag so that gc() is not called on this object.
!     if ((self != NULL) && wxlState.RemoveTrackedObject(self, wxLuaState::DELETE_CLEAR_OBJECT))
      {
          lua_pushnil(L);
***************
*** 3023,3027 ****
      wxURL * self = (wxURL *)wxlState.GetUserDataType(1, s_wxluatag_wxURL);
      // if removed from tracked mem list, reset the tag so that gc() is not called on this object.
!     if ((self != NULL) && wxlState.RemoveTrackedObject(self, wxLuaState::DELETE_OBJECT|wxLuaState::CLEAR_LUA_TRACKED|wxLuaState::CLEAR_DERIVED_METHODS))
      {
          lua_pushnil(L);
--- 3023,3027 ----
      wxURL * self = (wxURL *)wxlState.GetUserDataType(1, s_wxluatag_wxURL);
      // if removed from tracked mem list, reset the tag so that gc() is not called on this object.
!     if ((self != NULL) && wxlState.RemoveTrackedObject(self, wxLuaState::DELETE_CLEAR_OBJECT))
      {
          lua_pushnil(L);

Index: wxstc_stc.cpp
===================================================================
RCS file: /cvsroot/wxlua/wxLua/modules/wxbind/src/wxstc_stc.cpp,v
retrieving revision 1.2
retrieving revision 1.3
diff -C2 -d -r1.2 -r1.3
*** wxstc_stc.cpp	22 Jul 2007 04:38:29 -0000	1.2
--- wxstc_stc.cpp	1 Aug 2007 19:15:37 -0000	1.3
***************
*** 9335,9339 ****
      wxStyledTextEvent * self = (wxStyledTextEvent *)wxlState.GetUserDataType(1, s_wxluatag_wxStyledTextEvent);
      // if removed from tracked mem list, reset the tag so that gc() is not called on this object.
!     if ((self != NULL) && wxlState.RemoveTrackedObject(self, wxLuaState::DELETE_OBJECT|wxLuaState::CLEAR_LUA_TRACKED|wxLuaState::CLEAR_DERIVED_METHODS))
      {
          lua_pushnil(L);
--- 9335,9339 ----
      wxStyledTextEvent * self = (wxStyledTextEvent *)wxlState.GetUserDataType(1, s_wxluatag_wxStyledTextEvent);
      // if removed from tracked mem list, reset the tag so that gc() is not called on this object.
!     if ((self != NULL) && wxlState.RemoveTrackedObject(self, wxLuaState::DELETE_CLEAR_OBJECT))
      {
          lua_pushnil(L);

Index: wxxrc_xrc.cpp
===================================================================
RCS file: /cvsroot/wxlua/wxLua/modules/wxbind/src/wxxrc_xrc.cpp,v
retrieving revision 1.2
retrieving revision 1.3
diff -C2 -d -r1.2 -r1.3
*** wxxrc_xrc.cpp	22 Jul 2007 04:38:29 -0000	1.2
--- wxxrc_xrc.cpp	1 Aug 2007 19:15:37 -0000	1.3
***************
*** 480,484 ****
      // wxXmlResource res
      wxXmlResource * res = (wxXmlResource *)wxlState.GetUserDataType(1, s_wxluatag_wxXmlResource);
!     if (wxlState.IsTrackedObject(res)) wxlState.RemoveTrackedObject(res, wxLuaState::UNDELETE);
      // call Set
      returns = (wxXmlResource *)wxXmlResource::Set(res);
--- 480,484 ----
      // wxXmlResource res
      wxXmlResource * res = (wxXmlResource *)wxlState.GetUserDataType(1, s_wxluatag_wxXmlResource);
!     if (wxlState.IsTrackedObject(res)) wxlState.RemoveTrackedObject(res, wxLuaState::UNDELETE_OBJECT);
      // call Set
      returns = (wxXmlResource *)wxXmlResource::Set(res);
***************
*** 552,556 ****
      wxXmlResource * self = (wxXmlResource *)wxlState.GetUserDataType(1, s_wxluatag_wxXmlResource);
      // if removed from tracked mem list, reset the tag so that gc() is not called on this object.
!     if ((self != NULL) && wxlState.RemoveTrackedObject(self, wxLuaState::DELETE_OBJECT|wxLuaState::CLEAR_LUA_TRACKED|wxLuaState::CLEAR_DERIVED_METHODS))
      {
          lua_pushnil(L);
--- 552,556 ----
      wxXmlResource * self = (wxXmlResource *)wxlState.GetUserDataType(1, s_wxluatag_wxXmlResource);
      // if removed from tracked mem list, reset the tag so that gc() is not called on this object.
!     if ((self != NULL) && wxlState.RemoveTrackedObject(self, wxLuaState::DELETE_CLEAR_OBJECT))
      {
          lua_pushnil(L);

Index: wxcore_core.cpp
===================================================================
RCS file: /cvsroot/wxlua/wxLua/modules/wxbind/src/wxcore_core.cpp,v
retrieving revision 1.2
retrieving revision 1.3
diff -C2 -d -r1.2 -r1.3
*** wxcore_core.cpp	22 Jul 2007 04:38:29 -0000	1.2
--- wxcore_core.cpp	1 Aug 2007 19:15:35 -0000	1.3
***************
*** 43,47 ****
      wxLogGui * self = (wxLogGui *)wxlState.GetUserDataType(1, s_wxluatag_wxLogGui);
      // if removed from tracked mem list, reset the tag so that gc() is not called on this object.
!     if ((self != NULL) && wxlState.RemoveTrackedObject(self, wxLuaState::DELETE_OBJECT|wxLuaState::CLEAR_LUA_TRACKED|wxLuaState::CLEAR_DERIVED_METHODS))
      {
          lua_pushnil(L);
--- 43,47 ----
      wxLogGui * self = (wxLogGui *)wxlState.GetUserDataType(1, s_wxluatag_wxLogGui);
      // if removed from tracked mem list, reset the tag so that gc() is not called on this object.
!     if ((self != NULL) && wxlState.RemoveTrackedObject(self, wxLuaState::DELETE_CLEAR_OBJECT))
      {
          lua_pushnil(L);
***************
*** 101,105 ****
      wxLogTextCtrl * self = (wxLogTextCtrl *)wxlState.GetUserDataType(1, s_wxluatag_wxLogTextCtrl);
      // if removed from tracked mem list, reset the tag so that gc() is not called on this object.
!     if ((self != NULL) && wxlState.RemoveTrackedObject(self, wxLuaState::DELETE_OBJECT|wxLuaState::CLEAR_LUA_TRACKED|wxLuaState::CLEAR_DERIVED_METHODS))
      {
          lua_pushnil(L);
--- 101,105 ----
      wxLogTextCtrl * self = (wxLogTextCtrl *)wxlState.GetUserDataType(1, s_wxluatag_wxLogTextCtrl);
      // if removed from tracked mem list, reset the tag so that gc() is not called on this object.
!     if ((self != NULL) && wxlState.RemoveTrackedObject(self, wxLuaState::DELETE_CLEAR_OBJECT))
      {
          lua_pushnil(L);
***************
*** 208,212 ****
      wxLogWindow * self = (wxLogWindow *)wxlState.GetUserDataType(1, s_wxluatag_wxLogWindow);
      // if removed from tracked mem list, reset the tag so that gc() is not called on this object.
!     if ((self != NULL) && wxlState.RemoveTrackedObject(self, wxLuaState::DELETE_OBJECT|wxLuaState::CLEAR_LUA_TRACKED|wxLuaState::CLEAR_DERIVED_METHODS))
      {
          lua_pushnil(L);
--- 208,212 ----
      wxLogWindow * self = (wxLogWindow *)wxlState.GetUserDataType(1, s_wxluatag_wxLogWindow);
      // if removed from tracked mem list, reset the tag so that gc() is not called on this object.
!     if ((self != NULL) && wxlState.RemoveTrackedObject(self, wxLuaState::DELETE_CLEAR_OBJECT))
      {
          lua_pushnil(L);
***************
*** 693,697 ****
      wxTextValidator * self = (wxTextValidator *)wxlState.GetUserDataType(1, s_wxluatag_wxTextValidator);
      // if removed from tracked mem list, reset the tag so that gc() is not called on this object.
!     if ((self != NULL) && wxlState.RemoveTrackedObject(self, wxLuaState::DELETE_OBJECT|wxLuaState::CLEAR_LUA_TRACKED|wxLuaState::CLEAR_DERIVED_METHODS))
      {
          lua_pushnil(L);
--- 693,697 ----
      wxTextValidator * self = (wxTextValidator *)wxlState.GetUserDataType(1, s_wxluatag_wxTextValidator);
      // if removed from tracked mem list, reset the tag so that gc() is not called on this object.
!     if ((self != NULL) && wxlState.RemoveTrackedObject(self, wxLuaState::DELETE_CLEAR_OBJECT))
      {
          lua_pushnil(L);
***************
*** 777,781 ****
      wxGenericValidator * self = (wxGenericValidator *)wxlState.GetUserDataType(1, s_wxluatag_wxGenericValidator);
      // if removed from tracked mem list, reset the tag so that gc() is not called on this object.
!     if ((self != NULL) && wxlState.RemoveTrackedObject(self, wxLuaState::DELETE_OBJECT|wxLuaState::CLEAR_LUA_TRACKED|wxLuaState::CLEAR_DERIVED_METHODS))
      {
          lua_pushnil(L);
--- 777,781 ----
      wxGenericValidator * self = (wxGenericValidator *)wxlState.GetUserDataType(1, s_wxluatag_wxGenericValidator);
      // if removed from tracked mem list, reset the tag so that gc() is not called on this object.
!     if ((self != NULL) && wxlState.RemoveTrackedObject(self, wxLuaState::DELETE_CLEAR_OBJECT))
      {
          lua_pushnil(L);

Index: wxcore_clipdrag.cpp
===================================================================
RCS file: /cvsroot/wxlua/wxLua/modules/wxbind/src/wxcore_clipdrag.cpp,v
retrieving revision 1.2
retrieving revision 1.3
diff -C2 -d -r1.2 -r1.3
*** wxcore_clipdrag.cpp	22 Jul 2007 04:38:29 -0000	1.2
--- wxcore_clipdrag.cpp	1 Aug 2007 19:15:35 -0000	1.3
***************
*** 46,50 ****
      // wxDataObject data
      wxDataObject * data = (wxDataObject *)wxlState.GetUserDataType(2, s_wxluatag_wxDataObject);
!     if (wxlState.IsTrackedObject(data)) wxlState.RemoveTrackedObject(data, wxLuaState::UNDELETE);
      // get this
      wxClipboard * self = (wxClipboard *)wxlState.GetUserDataType(1, s_wxluatag_wxClipboard);
--- 46,50 ----
      // wxDataObject data
      wxDataObject * data = (wxDataObject *)wxlState.GetUserDataType(2, s_wxluatag_wxDataObject);
!     if (wxlState.IsTrackedObject(data)) wxlState.RemoveTrackedObject(data, wxLuaState::UNDELETE_OBJECT);
      // get this
      wxClipboard * self = (wxClipboard *)wxlState.GetUserDataType(1, s_wxluatag_wxClipboard);
***************
*** 221,225 ****
      // wxDataObject data
      wxDataObject * data = (wxDataObject *)wxlState.GetUserDataType(2, s_wxluatag_wxDataObject);
!     if (wxlState.IsTrackedObject(data)) wxlState.RemoveTrackedObject(data, wxLuaState::UNDELETE);
      // get this
      wxClipboard * self = (wxClipboard *)wxlState.GetUserDataType(1, s_wxluatag_wxClipboard);
--- 221,225 ----
      // wxDataObject data
      wxDataObject * data = (wxDataObject *)wxlState.GetUserDataType(2, s_wxluatag_wxDataObject);
!     if (wxlState.IsTrackedObject(data)) wxlState.RemoveTrackedObject(data, wxLuaState::UNDELETE_OBJECT);
      // get this
      wxClipboard * self = (wxClipboard *)wxlState.GetUserDataType(1, s_wxluatag_wxClipboard);
***************
*** 312,316 ****
      wxClipboardTextEvent * self = (wxClipboardTextEvent *)wxlState.GetUserDataType(1, s_wxluatag_wxClipboardTextEvent);
      // if removed from tracked mem list, reset the tag so that gc() is not called on this object.
!     if ((self != NULL) && wxlState.RemoveTrackedObject(self, wxLuaState::DELETE_OBJECT|wxLuaState::CLEAR_LUA_TRACKED|wxLuaState::CLEAR_DERIVED_METHODS))
      {
          lua_pushnil(L);
--- 312,316 ----
      wxClipboardTextEvent * self = (wxClipboardTextEvent *)wxlState.GetUserDataType(1, s_wxluatag_wxClipboardTextEvent);
      // if removed from tracked mem list, reset the tag so that gc() is not called on this object.
!     if ((self != NULL) && wxlState.RemoveTrackedObject(self, wxLuaState::DELETE_CLEAR_OBJECT))
      {
          lua_pushnil(L);
***************
*** 447,451 ****
      wxDataFormat * self = (wxDataFormat *)wxlState.GetUserDataType(1, s_wxluatag_wxDataFormat);
      // if removed from tracked mem list, reset the tag so that gc() is not called on this object.
!     if ((self != NULL) && wxlState.RemoveTrackedObject(self, wxLuaState::DELETE_OBJECT|wxLuaState::CLEAR_LUA_TRACKED|wxLuaState::CLEAR_DERIVED_METHODS))
      {
          lua_pushnil(L);
--- 447,451 ----
      wxDataFormat * self = (wxDataFormat *)wxlState.GetUserDataType(1, s_wxluatag_wxDataFormat);
      // if removed from tracked mem list, reset the tag so that gc() is not called on this object.
!     if ((self != NULL) && wxlState.RemoveTrackedObject(self, wxLuaState::DELETE_CLEAR_OBJECT))
      {
          lua_pushnil(L);
***************
*** 899,903 ****
      wxDataObjectSimple * self = (wxDataObjectSimple *)wxlState.GetUserDataType(1, s_wxluatag_wxDataObjectSimple);
      // if removed from tracked mem list, reset the tag so that gc() is not called on this object.
!     if ((self != NULL) && wxlState.RemoveTrackedObject(self, wxLuaState::DELETE_OBJECT|wxLuaState::CLEAR_LUA_TRACKED|wxLuaState::CLEAR_DERIVED_METHODS))
      {
          lua_pushnil(L);
--- 899,903 ----
      wxDataObjectSimple * self = (wxDataObjectSimple *)wxlState.GetUserDataType(1, s_wxluatag_wxDataObjectSimple);
      // if removed from tracked mem list, reset the tag so that gc() is not called on this object.
!     if ((self != NULL) && wxlState.RemoveTrackedObject(self, wxLuaState::DELETE_CLEAR_OBJECT))
      {
          lua_pushnil(L);
***************
*** 972,976 ****
      // wxDataObjectSimple dataObject
      wxDataObjectSimple * dataObject = (wxDataObjectSimple *)wxlState.GetUserDataType(2, s_wxluatag_wxDataObjectSimple);
!     if (wxlState.IsTrackedObject(dataObject)) wxlState.RemoveTrackedObject(dataObject, wxLuaState::UNDELETE);
      // get this
      wxDataObjectComposite * self = (wxDataObjectComposite *)wxlState.GetUserDataType(1, s_wxluatag_wxDataObjectComposite);
--- 972,976 ----
      // wxDataObjectSimple dataObject
      wxDataObjectSimple * dataObject = (wxDataObjectSimple *)wxlState.GetUserDataType(2, s_wxluatag_wxDataObjectSimple);
!     if (wxlState.IsTrackedObject(dataObject)) wxlState.RemoveTrackedObject(dataObject, wxLuaState::UNDELETE_OBJECT);
      // get this
      wxDataObjectComposite * self = (wxDataObjectComposite *)wxlState.GetUserDataType(1, s_wxluatag_wxDataObjectComposite);
***************
*** 1014,1018 ****
      wxDataObjectComposite * self = (wxDataObjectComposite *)wxlState.GetUserDataType(1, s_wxluatag_wxDataObjectComposite);
      // if removed from tracked mem list, reset the tag so that gc() is not called on this object.
!     if ((self != NULL) && wxlState.RemoveTrackedObject(self, wxLuaState::DELETE_OBJECT|wxLuaState::CLEAR_LUA_TRACKED|wxLuaState::CLEAR_DERIVED_METHODS))
      {
          lua_pushnil(L);
--- 1014,1018 ----
      wxDataObjectComposite * self = (wxDataObjectComposite *)wxlState.GetUserDataType(1, s_wxluatag_wxDataObjectComposite);
      // if removed from tracked mem list, reset the tag so that gc() is not called on this object.
!     if ((self != NULL) && wxlState.RemoveTrackedObject(self, wxLuaState::DELETE_CLEAR_OBJECT))
      {
          lua_pushnil(L);
***************
*** 1120,1124 ****
      wxFileDataObject * self = (wxFileDataObject *)wxlState.GetUserDataType(1, s_wxluatag_wxFileDataObject);
      // if removed from tracked mem list, reset the tag so that gc() is not called on this object.
!     if ((self != NULL) && wxlState.RemoveTrackedObject(self, wxLuaState::DELETE_OBJECT|wxLuaState::CLEAR_LUA_TRACKED|wxLuaState::CLEAR_DERIVED_METHODS))
      {
          lua_pushnil(L);
--- 1120,1124 ----
      wxFileDataObject * self = (wxFileDataObject *)wxlState.GetUserDataType(1, s_wxluatag_wxFileDataObject);
      // if removed from tracked mem list, reset the tag so that gc() is not called on this object.
!     if ((self != NULL) && wxlState.RemoveTrackedObject(self, wxLuaState::DELETE_CLEAR_OBJECT))
      {
          lua_pushnil(L);
***************
*** 1237,1241 ****
      wxTextDataObject * self = (wxTextDataObject *)wxlState.GetUserDataType(1, s_wxluatag_wxTextDataObject);
      // if removed from tracked mem list, reset the tag so that gc() is not called on this object.
!     if ((self != NULL) && wxlState.RemoveTrackedObject(self, wxLuaState::DELETE_OBJECT|wxLuaState::CLEAR_LUA_TRACKED|wxLuaState::CLEAR_DERIVED_METHODS))
      {
          lua_pushnil(L);
--- 1237,1241 ----
      wxTextDataObject * self = (wxTextDataObject *)wxlState.GetUserDataType(1, s_wxluatag_wxTextDataObject);
      // if removed from tracked mem list, reset the tag so that gc() is not called on this object.
!     if ((self != NULL) && wxlState.RemoveTrackedObject(self, wxLuaState::DELETE_CLEAR_OBJECT))
      {
          lua_pushnil(L);
***************
*** 1344,1348 ****
      wxBitmapDataObject * self = (wxBitmapDataObject *)wxlState.GetUserDataType(1, s_wxluatag_wxBitmapDataObject);
      // if removed from tracked mem list, reset the tag so that gc() is not called on this object.
!     if ((self != NULL) && wxlState.RemoveTrackedObject(self, wxLuaState::DELETE_OBJECT|wxLuaState::CLEAR_LUA_TRACKED|wxLuaState::CLEAR_DERIVED_METHODS))
      {
          lua_pushnil(L);
--- 1344,1348 ----
      wxBitmapDataObject * self = (wxBitmapDataObject *)wxlState.GetUserDataType(1, s_wxluatag_wxBitmapDataObject);
      // if removed from tracked mem list, reset the tag so that gc() is not called on this object.
!     if ((self != NULL) && wxlState.RemoveTrackedObject(self, wxLuaState::DELETE_CLEAR_OBJECT))
      {
          lua_pushnil(L);
***************
*** 1453,1457 ****
      wxURLDataObject * self = (wxURLDataObject *)wxlState.GetUserDataType(1, s_wxluatag_wxURLDataObject);
      // if removed from tracked mem list, reset the tag so that gc() is not called on this object.
!     if ((self != NULL) && wxlState.RemoveTrackedObject(self, wxLuaState::DELETE_OBJECT|wxLuaState::CLEAR_LUA_TRACKED|wxLuaState::CLEAR_DERIVED_METHODS))
      {
          lua_pushnil(L);
--- 1453,1457 ----
      wxURLDataObject * self = (wxURLDataObject *)wxlState.GetUserDataType(1, s_wxluatag_wxURLDataObject);
      // if removed from tracked mem list, reset the tag so that gc() is not called on this object.
!     if ((self != NULL) && wxlState.RemoveTrackedObject(self, wxLuaState::DELETE_CLEAR_OBJECT))
      {
          lua_pushnil(L);
***************
*** 1643,1647 ****
      wxDropSource * self = (wxDropSource *)wxlState.GetUserDataType(1, s_wxluatag_wxDropSource);
      // if removed from tracked mem list, reset the tag so that gc() is not called on this object.
!     if ((self != NULL) && wxlState.RemoveTrackedObject(self, wxLuaState::DELETE_OBJECT|wxLuaState::CLEAR_LUA_TRACKED|wxLuaState::CLEAR_DERIVED_METHODS))
      {
          lua_pushnil(L);
--- 1643,1647 ----
      wxDropSource * self = (wxDropSource *)wxlState.GetUserDataType(1, s_wxluatag_wxDropSource);
      // if removed from tracked mem list, reset the tag so that gc() is not called on this object.
!     if ((self != NULL) && wxlState.RemoveTrackedObject(self, wxLuaState::DELETE_CLEAR_OBJECT))
      {
          lua_pushnil(L);
***************
*** 1936,1940 ****
      wxDropFilesEvent * self = (wxDropFilesEvent *)wxlState.GetUserDataType(1, s_wxluatag_wxDropFilesEvent);
      // if removed from tracked mem list, reset the tag so that gc() is not called on this object.
!     if ((self != NULL) && wxlState.RemoveTrackedObject(self, wxLuaState::DELETE_OBJECT|wxLuaState::CLEAR_LUA_TRACKED|wxLuaState::CLEAR_DERIVED_METHODS))
      {
          lua_pushnil(L);
--- 1936,1940 ----
      wxDropFilesEvent * self = (wxDropFilesEvent *)wxlState.GetUserDataType(1, s_wxluatag_wxDropFilesEvent);
      // if removed from tracked mem list, reset the tag so that gc() is not called on this object.
!     if ((self != NULL) && wxlState.RemoveTrackedObject(self, wxLuaState::DELETE_CLEAR_OBJECT))
      {
          lua_pushnil(L);
***************
*** 2048,2052 ****
      wxMetafile * self = (wxMetafile *)wxlState.GetUserDataType(1, s_wxluatag_wxMetafile);
      // if removed from tracked mem list, reset the tag so that gc() is not called on this object.
!     if ((self != NULL) && wxlState.RemoveTrackedObject(self, wxLuaState::DELETE_OBJECT|wxLuaState::CLEAR_LUA_TRACKED|wxLuaState::CLEAR_DERIVED_METHODS))
      {
          lua_pushnil(L);
--- 2048,2052 ----
      wxMetafile * self = (wxMetafile *)wxlState.GetUserDataType(1, s_wxluatag_wxMetafile);
      // if removed from tracked mem list, reset the tag so that gc() is not called on this object.
!     if ((self != NULL) && wxlState.RemoveTrackedObject(self, wxLuaState::DELETE_CLEAR_OBJECT))
      {
          lua_pushnil(L);
***************
*** 2140,2144 ****
      wxMetafileDC * self = (wxMetafileDC *)wxlState.GetUserDataType(1, s_wxluatag_wxMetafileDC);
      // if removed from tracked mem list, reset the tag so that gc() is not called on this object.
!     if ((self != NULL) && wxlState.RemoveTrackedObject(self, wxLuaState::DELETE_OBJECT|wxLuaState::CLEAR_LUA_TRACKED|wxLuaState::CLEAR_DERIVED_METHODS))
      {
          lua_pushnil(L);
--- 2140,2144 ----
      wxMetafileDC * self = (wxMetafileDC *)wxlState.GetUserDataType(1, s_wxluatag_wxMetafileDC);
      // if removed from tracked mem list, reset the tag so that gc() is not called on this object.
!     if ((self != NULL) && wxlState.RemoveTrackedObject(self, wxLuaState::DELETE_CLEAR_OBJECT))
      {
          lua_pushnil(L);

Index: wxcore_help.cpp
===================================================================
RCS file: /cvsroot/wxlua/wxLua/modules/wxbind/src/wxcore_help.cpp,v
retrieving revision 1.2
retrieving revision 1.3
diff -C2 -d -r1.2 -r1.3
*** wxcore_help.cpp	22 Jul 2007 04:38:29 -0000	1.2
--- wxcore_help.cpp	1 Aug 2007 19:15:35 -0000	1.3
***************
*** 81,85 ****
      wxContextHelp * self = (wxContextHelp *)wxlState.GetUserDataType(1, s_wxluatag_wxContextHelp);
      // if removed from tracked mem list, reset the tag so that gc() is not called on this object.
!     if ((self != NULL) && wxlState.RemoveTrackedObject(self, wxLuaState::DELETE_OBJECT|wxLuaState::CLEAR_LUA_TRACKED|wxLuaState::CLEAR_DERIVED_METHODS))
      {
          lua_pushnil(L);
--- 81,85 ----
      wxContextHelp * self = (wxContextHelp *)wxlState.GetUserDataType(1, s_wxluatag_wxContextHelp);
      // if removed from tracked mem list, reset the tag so that gc() is not called on this object.
!     if ((self != NULL) && wxlState.RemoveTrackedObject(self, wxLuaState::DELETE_CLEAR_OBJECT))
      {
          lua_pushnil(L);
***************
*** 279,283 ****
      // wxHelpProvider helpProvider
      wxHelpProvider * helpProvider = (wxHelpProvider *)wxlState.GetUserDataType(1, s_wxluatag_wxHelpProvider);
!     if (wxlState.IsTrackedObject(helpProvider)) wxlState.RemoveTrackedObject(helpProvider, wxLuaState::UNDELETE);
      // call Set
      returns = (wxHelpProvider *)wxHelpProvider::Set(helpProvider);
--- 279,283 ----
      // wxHelpProvider helpProvider
      wxHelpProvider * helpProvider = (wxHelpProvider *)wxlState.GetUserDataType(1, s_wxluatag_wxHelpProvider);
!     if (wxlState.IsTrackedObject(helpProvider)) wxlState.RemoveTrackedObject(helpProvider, wxLuaState::UNDELETE_OBJECT);
      // call Set
      returns = (wxHelpProvider *)wxHelpProvider::Set(helpProvider);
***************
*** 345,349 ****
      wxHelpProvider * self = (wxHelpProvider *)wxlState.GetUserDataType(1, s_wxluatag_wxHelpProvider);
      // if removed from tracked mem list, reset the tag so that gc() is not called on this object.
!     if ((self != NULL) && wxlState.RemoveTrackedObject(self, wxLuaState::DELETE_OBJECT|wxLuaState::CLEAR_LUA_TRACKED|wxLuaState::CLEAR_DERIVED_METHODS))
      {
          lua_pushnil(L);
--- 345,349 ----
      wxHelpProvider * self = (wxHelpProvider *)wxlState.GetUserDataType(1, s_wxluatag_wxHelpProvider);
      // if removed from tracked mem list, reset the tag so that gc() is not called on this object.
!     if ((self != NULL) && wxlState.RemoveTrackedObject(self, wxLuaState::DELETE_CLEAR_OBJECT))
      {
          lua_pushnil(L);
***************
*** 395,399 ****
      wxSimpleHelpProvider * self = (wxSimpleHelpProvider *)wxlState.GetUserDataType(1, s_wxluatag_wxSimpleHelpProvider);
      // if removed from tracked mem list, reset the tag so that gc() is not called on this object.
!     if ((self != NULL) && wxlState.RemoveTrackedObject(self, wxLuaState::DELETE_OBJECT|wxLuaState::CLEAR_LUA_TRACKED|wxLuaState::CLEAR_DERIVED_METHODS))
      {
          lua_pushnil(L);
--- 395,399 ----
      wxSimpleHelpProvider * self = (wxSimpleHelpProvider *)wxlState.GetUserDataType(1, s_wxluatag_wxSimpleHelpProvider);
      // if removed from tracked mem list, reset the tag so that gc() is not called on this object.
!     if ((self != NULL) && wxlState.RemoveTrackedObject(self, wxLuaState::DELETE_CLEAR_OBJECT))
      {
          lua_pushnil(L);
***************
*** 488,492 ****
      wxHelpControllerHelpProvider * self = (wxHelpControllerHelpProvider *)wxlState.GetUserDataType(1, s_wxluatag_wxHelpControllerHelpProvider);
      // if removed from tracked mem list, reset the tag so that gc() is not called on this object.
!     if ((self != NULL) && wxlState.RemoveTrackedObject(self, wxLuaState::DELETE_OBJECT|wxLuaState::CLEAR_LUA_TRACKED|wxLuaState::CLEAR_DERIVED_METHODS))
      {
          lua_pushnil(L);
--- 488,492 ----
      wxHelpControllerHelpProvider * self = (wxHelpControllerHelpProvider *)wxlState.GetUserDataType(1, s_wxluatag_wxHelpControllerHelpProvider);
      // if removed from tracked mem list, reset the tag so that gc() is not called on this object.
!     if ((self != NULL) && wxlState.RemoveTrackedObject(self, wxLuaState::DELETE_CLEAR_OBJECT))
      {
          lua_pushnil(L);
***************
*** 878,882 ****
      wxHelpControllerBase * self = (wxHelpControllerBase *)wxlState.GetUserDataType(1, s_wxluatag_wxHelpControllerBase);
      // if removed from tracked mem list, reset the tag so that gc() is not called on this object.
!     if ((self != NULL) && wxlState.RemoveTrackedObject(self, wxLuaState::DELETE_OBJECT|wxLuaState::CLEAR_LUA_TRACKED|wxLuaState::CLEAR_DERIVED_METHODS))
      {
          lua_pushnil(L);
--- 878,882 ----
      wxHelpControllerBase * self = (wxHelpControllerBase *)wxlState.GetUserDataType(1, s_wxluatag_wxHelpControllerBase);
      // if removed from tracked mem list, reset the tag so that gc() is not called on this object.
!     if ((self != NULL) && wxlState.RemoveTrackedObject(self, wxLuaState::DELETE_CLEAR_OBJECT))
      {
          lua_pushnil(L);
***************
*** 971,975 ****
      wxHelpController * self = (wxHelpController *)wxlState.GetUserDataType(1, s_wxluatag_wxHelpController);
      // if removed from tracked mem list, reset the tag so that gc() is not called on this object.
!     if ((self != NULL) && wxlState.RemoveTrackedObject(self, wxLuaState::DELETE_OBJECT|wxLuaState::CLEAR_LUA_TRACKED|wxLuaState::CLEAR_DERIVED_METHODS))
      {
          lua_pushnil(L);
--- 971,975 ----
      wxHelpController * self = (wxHelpController *)wxlState.GetUserDataType(1, s_wxluatag_wxHelpController);
      // if removed from tracked mem list, reset the tag so that gc() is not called on this object.
!     if ((self != NULL) && wxlState.RemoveTrackedObject(self, wxLuaState::DELETE_CLEAR_OBJECT))
      {
          lua_pushnil(L);
***************
*** 1029,1033 ****
      wxWinHelpController * self = (wxWinHelpController *)wxlState.GetUserDataType(1, s_wxluatag_wxWinHelpController);
      // if removed from tracked mem list, reset the tag so that gc() is not called on this object.
!     if ((self != NULL) && wxlState.RemoveTrackedObject(self, wxLuaState::DELETE_OBJECT|wxLuaState::CLEAR_LUA_TRACKED|wxLuaState::CLEAR_DERIVED_METHODS))
      {
          lua_pushnil(L);
--- 1029,1033 ----
      wxWinHelpController * self = (wxWinHelpController *)wxlState.GetUserDataType(1, s_wxluatag_wxWinHelpController);
      // if removed from tracked mem list, reset the tag so that gc() is not called on this object.
!     if ((self != NULL) && wxlState.RemoveTrackedObject(self, wxLuaState::DELETE_CLEAR_OBJECT))
      {
          lua_pushnil(L);
***************
*** 1087,1091 ****
      wxBestHelpController * self = (wxBestHelpController *)wxlState.GetUserDataType(1, s_wxluatag_wxBestHelpController);
      // if removed from tracked mem list, reset the tag so that gc() is not called on this object.
!     if ((self != NULL) && wxlState.RemoveTrackedObject(self, wxLuaState::DELETE_OBJECT|wxLuaState::CLEAR_LUA_TRACKED|wxLuaState::CLEAR_DERIVED_METHODS))
      {
          lua_pushnil(L);
--- 1087,1091 ----
      wxBestHelpController * self = (wxBestHelpController *)wxlState.GetUserDataType(1, s_wxluatag_wxBestHelpController);
      // if removed from tracked mem list, reset the tag so that gc() is not called on this object.
!     if ((self != NULL) && wxlState.RemoveTrackedObject(self, wxLuaState::DELETE_CLEAR_OBJECT))
      {
          lua_pushnil(L);
***************
*** 1152,1156 ****
      wxExtHelpController * self = (wxExtHelpController *)wxlState.GetUserDataType(1, s_wxluatag_wxExtHelpController);
      // if removed from tracked mem list, reset the tag so that gc() is not called on this object.
!     if ((self != NULL) && wxlState.RemoveTrackedObject(self, wxLuaState::DELETE_OBJECT|wxLuaState::CLEAR_LUA_TRACKED|wxLuaState::CLEAR_DERIVED_METHODS))
      {
          lua_pushnil(L);
--- 1152,1156 ----
      wxExtHelpController * self = (wxExtHelpController *)wxlState.GetUserDataType(1, s_wxluatag_wxExtHelpController);
      // if removed from tracked mem list, reset the tag so that gc() is not called on this object.
!     if ((self != NULL) && wxlState.RemoveTrackedObject(self, wxLuaState::DELETE_CLEAR_OBJECT))
      {
          lua_pushnil(L);

Index: wxcore_gdi.cpp
===================================================================
RCS file: /cvsroot/wxlua/wxLua/modules/wxbind/src/wxcore_gdi.cpp,v
retrieving revision 1.2
retrieving revision 1.3
diff -C2 -d -r1.2 -r1.3
*** wxcore_gdi.cpp	22 Jul 2007 04:38:29 -0000	1.2
--- wxcore_gdi.cpp	1 Aug 2007 19:15:35 -0000	1.3
***************
*** 144,148 ****
      wxPoint * self = (wxPoint *)wxlState.GetUserDataType(1, s_wxluatag_wxPoint);
      // if removed from tracked mem list, reset the tag so that gc() is not called on this object.
!     if ((self != NULL) && wxlState.RemoveTrackedObject(self, wxLuaState::DELETE_OBJECT|wxLuaState::CLEAR_LUA_TRACKED|wxLuaState::CLEAR_DERIVED_METHODS))
      {
          lua_pushnil(L);
--- 144,148 ----
      wxPoint * self = (wxPoint *)wxlState.GetUserDataType(1, s_wxluatag_wxPoint);
      // if removed from tracked mem list, reset the tag so that gc() is not called on this object.
!     if ((self != NULL) && wxlState.RemoveTrackedObject(self, wxLuaState::DELETE_CLEAR_OBJECT))
      {
          lua_pushnil(L);
***************
*** 835,839 ****
      wxSize * self = (wxSize *)wxlState.GetUserDataType(1, s_wxluatag_wxSize);
      // if removed from tracked mem list, reset the tag so that gc() is not called on this object.
!     if ((self != NULL) && wxlState.RemoveTrackedObject(self, wxLuaState::DELETE_OBJECT|wxLuaState::CLEAR_LUA_TRACKED|wxLuaState::CLEAR_DERIVED_METHODS))
      {
          lua_pushnil(L);
--- 835,839 ----
      wxSize * self = (wxSize *)wxlState.GetUserDataType(1, s_wxluatag_wxSize);
      // if removed from tracked mem list, reset the tag so that gc() is not called on this object.
!     if ((self != NULL) && wxlState.RemoveTrackedObject(self, wxLuaState::DELETE_CLEAR_OBJECT))
      {
          lua_pushnil(L);
***************
*** 1973,1977 ****
      wxRect * self = (wxRect *)wxlState.GetUserDataType(1, s_wxluatag_wxRect);
      // if removed from tracked mem list, reset the tag so that gc() is not called on this object.
!     if ((self != NULL) && wxlState.RemoveTrackedObject(self, wxLuaState::DELETE_OBJECT|wxLuaState::CLEAR_LUA_TRACKED|wxLuaState::CLEAR_DERIVED_METHODS))
      {
          lua_pushnil(L);
--- 1973,1977 ----
      wxRect * self = (wxRect *)wxlState.GetUserDataType(1, s_wxluatag_wxRect);
      // if removed from tracked mem list, reset the tag so that gc() is not called on this object.
!     if ((self != NULL) && wxlState.RemoveTrackedObject(self, wxLuaState::DELETE_CLEAR_OBJECT))
      {
          lua_pushnil(L);
***************
*** 2353,2357 ****
      wxGDIObject * self = (wxGDIObject *)wxlState.GetUserDataType(1, s_wxluatag_wxGDIObject);
      // if removed from tracked mem list, reset the tag so that gc() is not called on this object.
!     if ((self != NULL) && wxlState.RemoveTrackedObject(self, wxLuaState::DELETE_OBJECT|wxLuaState::CLEAR_LUA_TRACKED|wxLuaState::CLEAR_DERIVED_METHODS))
      {
          lua_pushnil(L);
--- 2353,2357 ----
      wxGDIObject * self = (wxGDIObject *)wxlState.GetUserDataType(1, s_wxluatag_wxGDIObject);
      // if removed from tracked mem list, reset the tag so that gc() is not called on this object.
!     if ((self != NULL) && wxlState.RemoveTrackedObject(self, wxLuaState::DELETE_CLEAR_OBJECT))
      {
          lua_pushnil(L);
***************
*** 3072,3076 ****
      wxRegion * self = (wxRegion *)wxlState.GetUserDataType(1, s_wxluatag_wxRegion);
      // if removed from tracked mem list, reset the tag so that gc() is not called on this object.
!     if ((self != NULL) && wxlState.RemoveTrackedObject(self, wxLuaState::DELETE_OBJECT|wxLuaState::CLEAR_LUA_TRACKED|wxLuaState::CLEAR_DERIVED_METHODS))
      {
          lua_pushnil(L);
--- 3072,3076 ----
      wxRegion * self = (wxRegion *)wxlState.GetUserDataType(1, s_wxluatag_wxRegion);
      // if removed from tracked mem list, reset the tag so that gc() is not called on this object.
!     if ((self != NULL) && wxlState.RemoveTrackedObject(self, wxLuaState::DELETE_CLEAR_OBJECT))
      {
          lua_pushnil(L);
***************
*** 3611,3615 ****
      wxRegionIterator * self = (wxRegionIterator *)wxlState.GetUserDataType(1, s_wxluatag_wxRegionIterator);
      // if removed from tracked mem list, reset the tag so that gc() is not called on this object.
!     if ((self != NULL) && wxlState.RemoveTrackedObject(self, wxLuaState::DELETE_OBJECT|wxLuaState::CLEAR_LUA_TRACKED|wxLuaState::CLEAR_DERIVED_METHODS))
      {
          lua_pushnil(L);
--- 3611,3615 ----
      wxRegionIterator * self = (wxRegionIterator *)wxlState.GetUserDataType(1, s_wxluatag_wxRegionIterator);
      // if removed from tracked mem list, reset the tag so that gc() is not called on this object.
!     if ((self != NULL) && wxlState.RemoveTrackedObject(self, wxLuaState::DELETE_CLEAR_OBJECT))
      {
          lua_pushnil(L);
***************
*** 4207,4211 ****
      wxFont * self = (wxFont *)wxlState.GetUserDataType(1, s_wxluatag_wxFont);
      // if removed from tracked mem list, reset the tag so that gc() is not called on this object.
!     if ((self != NULL) && wxlState.RemoveTrackedObject(self, wxLuaState::DELETE_OBJECT|wxLuaState::CLEAR_LUA_TRACKED|wxLuaState::CLEAR_DERIVED_METHODS))
      {
          lua_pushnil(L);
--- 4207,4211 ----
      wxFont * self = (wxFont *)wxlState.GetUserDataType(1, s_wxluatag_wxFont);
      // if removed from tracked mem list, reset the tag so that gc() is not called on this object.
!     if ((self != NULL) && wxlState.RemoveTrackedObject(self, wxLuaState::DELETE_CLEAR_OBJECT))
      {
          lua_pushnil(L);
***************
*** 4873,4877 ****
      wxNativeFontInfo * self = (wxNativeFontInfo *)wxlState.GetUserDataType(1, s_wxluatag_wxNativeFontInfo);
      // if removed from tracked mem list, reset the tag so that gc() is not called on this object.
!     if ((self != NULL) && wxlState.RemoveTrackedObject(self, wxLuaState::DELETE_OBJECT|wxLuaState::CLEAR_LUA_TRACKED|wxLuaState::CLEAR_DERIVED_METHODS))
      {
          lua_pushnil(L);
--- 4873,4877 ----
      wxNativeFontInfo * self = (wxNativeFontInfo *)wxlState.GetUserDataType(1, s_wxluatag_wxNativeFontInfo);
      // if removed from tracked mem list, reset the tag so that gc() is not called on this object.
!     if ((self != NULL) && wxlState.RemoveTrackedObject(self, wxLuaState::DELETE_CLEAR_OBJECT))
      {
          lua_pushnil(L);
***************
*** 5190,5194 ****
      wxFontEnumerator * self = (wxFontEnumerator *)wxlState.GetUserDataType(1, s_wxluatag_wxFontEnumerator);
      // if removed from tracked mem list, reset the tag so that gc() is not called on this object.
!     if ((self != NULL) && wxlState.RemoveTrackedObject(self, wxLuaState::DELETE_OBJECT|wxLuaState::CLEAR_LUA_TRACKED|wxLuaState::CLEAR_DERIVED_METHODS))
      {
          lua_pushnil(L);
--- 5190,5194 ----
      wxFontEnumerator * self = (wxFontEnumerator *)wxlState.GetUserDataType(1, s_wxluatag_wxFontEnumerator);
      // if removed from tracked mem list, reset the tag so that gc() is not called on this object.
!     if ((self != NULL) && wxlState.RemoveTrackedObject(self, wxLuaState::DELETE_CLEAR_OBJECT))
      {
          lua_pushnil(L);
***************
*** 5960,5964 ****
      wxColour * self = (wxColour *)wxlState.GetUserDataType(1, s_wxluatag_wxColour);
      // if removed from tracked mem list, reset the tag so that gc() is not called on this object.
!     if ((self != NULL) && wxlState.RemoveTrackedObject(self, wxLuaState::DELETE_OBJECT|wxLuaState::CLEAR_LUA_TRACKED|wxLuaState::CLEAR_DERIVED_METHODS))
      {
          lua_pushnil(L);
--- 5960,5964 ----
      wxColour * self = (wxColour *)wxlState.GetUserDataType(1, s_wxluatag_wxColour);
      // if removed from tracked mem list, reset the tag so that gc() is not called on this object.
!     if ((self != NULL) && wxlState.RemoveTrackedObject(self, wxLuaState::DELETE_CLEAR_OBJECT))
      {
          lua_pushnil(L);
***************
*** 6294,6298 ****
      wxColourDatabase * self = (wxColourDatabase *)wxlState.GetUserDataType(1, s_wxluatag_wxColourDatabase);
      // if removed from tracked mem list, reset the tag so that gc() is not called on this object.
!     if ((self != NULL) && wxlState.RemoveTrackedObject(self, wxLuaState::DELETE_OBJECT|wxLuaState::CLEAR_LUA_TRACKED|wxLuaState::CLEAR_DERIVED_METHODS))
      {
          lua_pushnil(L);
--- 6294,6298 ----
      wxColourDatabase * self = (wxColourDatabase *)wxlState.GetUserDataType(1, s_wxluatag_wxColourDatabase);
      // if removed from tracked mem list, reset the tag so that gc() is not called on this object.
!     if ((self != NULL) && wxlState.RemoveTrackedObject(self, wxLuaState::DELETE_CLEAR_OBJECT))
      {
          lua_pushnil(L);
***************
*** 6629,6633 ****
      wxPen * self = (wxPen *)wxlState.GetUserDataType(1, s_wxluatag_wxPen);
      // if removed from tracked mem list, reset the tag so that gc() is not called on this object.
!     if ((self != NULL) && wxlState.RemoveTrackedObject(self, wxLuaState::DELETE_OBJECT|wxLuaState::CLEAR_LUA_TRACKED|wxLuaState::CLEAR_DERIVED_METHODS))
      {
          lua_pushnil(L);
--- 6629,6633 ----
      wxPen * self = (wxPen *)wxlState.GetUserDataType(1, s_wxluatag_wxPen);
      // if removed from tracked mem list, reset the tag so that gc() is not called on this object.
!     if ((self != NULL) && wxlState.RemoveTrackedObject(self, wxLuaState::DELETE_CLEAR_OBJECT))
      {
          lua_pushnil(L);
***************
*** 7144,7148 ****
      wxBrush * self = (wxBrush *)wxlState.GetUserDataType(1, s_wxluatag_wxBrush);
      // if removed from tracked mem list, reset the tag so that gc() is not called on this object.
!     if ((self != NULL) && wxlState.RemoveTrackedObject(self, wxLuaState::DELETE_OBJECT|wxLuaState::CLEAR_LUA_TRACKED|wxLuaState::CLEAR_DERIVED_METHODS))
      {
          lua_pushnil(L);
--- 7144,7148 ----
      wxBrush * self = (wxBrush *)wxlState.GetUserDataType(1, s_wxluatag_wxBrush);
      // if removed from tracked mem list, reset the tag so that gc() is not called on this object.
!     if ((self != NULL) && wxlState.RemoveTrackedObject(self, wxLuaState::DELETE_CLEAR_OBJECT))
      {
          lua_pushnil(L);
***************
*** 7776,7780 ****
      wxPalette * self = (wxPalette *)wxlState.GetUserDataType(1, s_wxluatag_wxPalette);
      // if removed from tracked mem list, reset the tag so that gc() is not called on this object.
!     if ((self != NULL) && wxlState.RemoveTrackedObject(self, wxLuaState::DELETE_OBJECT|wxLuaState::CLEAR_LUA_TRACKED|wxLuaState::CLEAR_DERIVED_METHODS))
      {
          lua_pushnil(L);
--- 7776,7780 ----
      wxPalette * self = (wxPalette *)wxlState.GetUserDataType(1, s_wxluatag_wxPalette);
      // if removed from tracked mem list, reset the tag so that gc() is not called on this object.
!     if ((self != NULL) && wxlState.RemoveTrackedObject(self, wxLuaState::DELETE_CLEAR_OBJECT))
      {
          lua_pushnil(L);
***************
*** 8048,8052 ****
      wxIcon * self = (wxIcon *)wxlState.GetUserDataType(1, s_wxluatag_wxIcon);
      // if removed from tracked mem list, reset the tag so that gc() is not called on this object.
!     if ((self != NULL) && wxlState.RemoveTrackedObject(self, wxLuaState::DELETE_OBJECT|wxLuaState::CLEAR_LUA_TRACKED|wxLuaState::CLEAR_DERIVED_METHODS))
      {
          lua_pushnil(L);
--- 8048,8052 ----
      wxIcon * self = (wxIcon *)wxlState.GetUserDataType(1, s_wxluatag_wxIcon);
      // if removed from tracked mem list, reset the tag so that gc() is not called on this object.
!     if ((self != NULL) && wxlState.RemoveTrackedObject(self, wxLuaState::DELETE_CLEAR_OBJECT))
      {
          lua_pushnil(L);
***************
*** 8274,8278 ****
      wxIconBundle * self = (wxIconBundle *)wxlState.GetUserDataType(1, s_wxluatag_wxIconBundle);
      // if removed from tracked mem list, reset the tag so that gc() is not called on this object.
!     if ((self != NULL) && wxlState.RemoveTrackedObject(self, wxLuaState::DELETE_OBJECT|wxLuaState::CLEAR_LUA_TRACKED|wxLuaState::CLEAR_DERIVED_METHODS))
      {
          lua_pushnil(L);
--- 8274,8278 ----
      wxIconBundle * self = (wxIconBundle *)wxlState.GetUserDataType(1, s_wxluatag_wxIconBundle);
      // if removed from tracked mem list, reset the tag so that gc() is not called on this object.
!     if ((self != NULL) && wxlState.RemoveTrackedObject(self, wxLuaState::DELETE_CLEAR_OBJECT))
      {
          lua_pushnil(L);
***************
*** 8802,8806 ****
      // wxMask mask
      wxMask * mask = (wxMask *)wxlState.GetUserDataType(2, s_wxluatag_wxMask);
!     if (wxlState.IsTrackedObject(mask)) wxlState.RemoveTrackedObject(mask, wxLuaState::UNDELETE);
      // get this
      wxBitmap * self = (wxBitmap *)wxlState.GetUserDataType(1, s_wxluatag_wxBitmap);
--- 8802,8806 ----
      // wxMask mask
      wxMask * mask = (wxMask *)wxlState.GetUserDataType(2, s_wxluatag_wxMask);
!     if (wxlState.IsTrackedObject(mask)) wxlState.RemoveTrackedObject(mask, wxLuaState::UNDELETE_OBJECT);
      // get this
      wxBitmap * self = (wxBitmap *)wxlState.GetUserDataType(1, s_wxluatag_wxBitmap);
***************
*** 8858,8862 ****
      wxBitmap * self = (wxBitmap *)wxlState.GetUserDataType(1, s_wxluatag_wxBitmap);
      // if removed from tracked mem list, reset the tag so that gc() is not called on this object.
!     if ((self != NULL) && wxlState.RemoveTrackedObject(self, wxLuaState::DELETE_OBJECT|wxLuaState::CLEAR_LUA_TRACKED|wxLuaState::CLEAR_DERIVED_METHODS))
      {
          lua_pushnil(L);
--- 8858,8862 ----
      wxBitmap * self = (wxBitmap *)wxlState.GetUserDataType(1, s_wxluatag_wxBitmap);
      // if removed from tracked mem list, reset the tag so that gc() is not called on this object.
!     if ((self != NULL) && wxlState.RemoveTrackedObject(self, wxLuaState::DELETE_CLEAR_OBJECT))
      {
          lua_pushnil(L);
***************
*** 9270,9274 ****
      wxCursor * self = (wxCursor *)wxlState.GetUserDataType(1, s_wxluatag_wxCursor);
      // if removed from tracked mem list, reset the tag so that gc() is not called on this object.
!     if ((self != NULL) && wxlState.RemoveTrackedObject(self, wxLuaState::DELETE_OBJECT|wxLuaState::CLEAR_LUA_TRACKED|wxLuaState::CLEAR_DERIVED_METHODS))
      {
          lua_pushnil(L);
--- 9270,9274 ----
      wxCursor * self = (wxCursor *)wxlState.GetUserDataType(1, s_wxluatag_wxCursor);
      // if removed from tracked mem list, reset the tag so that gc() is not called on this object.
!     if ((self != NULL) && wxlState.RemoveTrackedObject(self, wxLuaState::DELETE_CLEAR_OBJECT))
      {
          lua_pushnil(L);
***************
*** 9539,9543 ****
      wxMask * self = (wxMask *)wxlState.GetUserDataType(1, s_wxluatag_wxMask);
      // if removed from tracked mem list, reset the tag so that gc() is not called on this object.
!     if ((self != NULL) && wxlState.RemoveTrackedObject(self, wxLuaState::DELETE_OBJECT|wxLuaState::CLEAR_LUA_TRACKED|wxLuaState::CLEAR_DERIVED_METHODS))
      {
          lua_pushnil(L);
--- 9539,9543 ----
      wxMask * self = (wxMask *)wxlState.GetUserDataType(1, s_wxluatag_wxMask);
      // if removed from tracked mem list, reset the tag so that gc() is not called on this object.
!     if ((self != NULL) && wxlState.RemoveTrackedObject(self, wxLuaState::DELETE_CLEAR_OBJECT))
      {
          lua_pushnil(L);
***************
*** 10062,10066 ****
      wxImageList * self = (wxImageList *)wxlState.GetUserDataType(1, s_wxluatag_wxImageList);
      // if removed from tracked mem list, reset the tag so that gc() is not called on this object.
!     if ((self != NULL) && wxlState.RemoveTrackedObject(self, wxLuaState::DELETE_OBJECT|wxLuaState::CLEAR_LUA_TRACKED|wxLuaState::CLEAR_DERIVED_METHODS))
      {
          lua_pushnil(L);
--- 10062,10066 ----
      wxImageList * self = (wxImageList *)wxlState.GetUserDataType(1, s_wxluatag_wxImageList);
      // if removed from tracked mem list, reset the tag so that gc() is not called on this object.
!     if ((self != NULL) && wxlState.RemoveTrackedObject(self, wxLuaState::DELETE_CLEAR_OBJECT))
      {
          lua_pushnil(L);
***************
*** 11986,11990 ****
      wxDC * self = (wxDC *)wxlState.GetUserDataType(1, s_wxluatag_wxDC);
      // if removed from tracked mem list, reset the tag so that gc() is not called on this object.
!     if ((self != NULL) && wxlState.RemoveTrackedObject(self, wxLuaState::DELETE_OBJECT|wxLuaState::CLEAR_LUA_TRACKED|wxLuaState::CLEAR_DERIVED_METHODS))
      {
          lua_pushnil(L);
--- 11986,11990 ----
      wxDC * self = (wxDC *)wxlState.GetUserDataType(1, s_wxluatag_wxDC);
      // if removed from tracked mem list, reset the tag so that gc() is not called on this object.
!     if ((self != NULL) && wxlState.RemoveTrackedObject(self, wxLuaState::DELETE_CLEAR_OBJECT))
      {
          lua_pushnil(L);
***************
*** 12314,12318 ****
      wxMemoryDC * self = (wxMemoryDC *)wxlState.GetUserDataType(1, s_wxluatag_wxMemoryDC);
      // if removed from tracked mem list, reset the tag so that gc() is not called on this object.
!     if ((self != NULL) && wxlState.RemoveTrackedObject(self, wxLuaState::DELETE_OBJECT|wxLuaState::CLEAR_LUA_TRACKED|wxLuaState::CLEAR_DERIVED_METHODS))
      {
          lua_pushnil(L);
--- 12314,12318 ----
      wxMemoryDC * self = (wxMemoryDC *)wxlState.GetUserDataType(1, s_wxluatag_wxMemoryDC);
      // if removed from tracked mem list, reset the tag so that gc() is not called on this object.
!     if ((self != NULL) && wxlState.RemoveTrackedObject(self, wxLuaState::DELETE_CLEAR_OBJECT))
      {
          lua_pushnil(L);
***************
*** 12380,12384 ****
      wxWindowDC * self = (wxWindowDC *)wxlState.GetUserDataType(1, s_wxluatag_wxWindowDC);
      // if removed from tracked mem list, reset the tag so that gc() is not called on this object.
!     if ((self != NULL) && wxlState.RemoveTrackedObject(self, wxLuaState::DELETE_OBJECT|wxLuaState::CLEAR_LUA_TRACKED|wxLuaState::CLEAR_DERIVED_METHODS))
      {
          lua_pushnil(L);
--- 12380,12384 ----
      wxWindowDC * self = (wxWindowDC *)wxlState.GetUserDataType(1, s_wxluatag_wxWindowDC);
      // if removed from tracked mem list, reset the tag so that gc() is not called on this object.
!     if ((self != NULL) && wxlState.RemoveTrackedObject(self, wxLuaState::DELETE_CLEAR_OBJECT))
      {
          lua_pushnil(L);
***************
*** 12441,12445 ****
      wxClientDC * self = (wxClientDC *)wxlState.GetUserDataType(1, s_wxluatag_wxClientDC);
      // if removed from tracked mem list, reset the tag so that gc() is not called on this object.
!     if ((self != NULL) && wxlState.RemoveTrackedObject(self, wxLuaState::DELETE_OBJECT|wxLuaState::CLEAR_LUA_TRACKED|wxLuaState::CLEAR_DERIVED_METHODS))
      {
          lua_pushnil(L);
--- 12441,12445 ----
      wxClientDC * self = (wxClientDC *)wxlState.GetUserDataType(1, s_wxluatag_wxClientDC);
      // if removed from tracked mem list, reset the tag so that gc() is not called on this object.
!     if ((self != NULL) && wxlState.RemoveTrackedObject(self, wxLuaState::DELETE_CLEAR_OBJECT))
      {
          lua_pushnil(L);
***************
*** 12502,12506 ****
      wxPaintDC * self = (wxPaintDC *)wxlState.GetUserDataType(1, s_wxluatag_wxPaintDC);
      // if removed from tracked mem list, reset the tag so that gc() is not called on this object.
!     if ((self != NULL) && wxlState.RemoveTrackedObject(self, wxLuaState::DELETE_OBJECT|wxLuaState::CLEAR_LUA_TRACKED|wxLuaState::CLEAR_DERIVED_METHODS))
      {
          lua_pushnil(L);
--- 12502,12506 ----
      wxPaintDC * self = (wxPaintDC *)wxlState.GetUserDataType(1, s_wxluatag_wxPaintDC);
      // if removed from tracked mem list, reset the tag so that gc() is not called on this object.
!     if ((self != NULL) && wxlState.RemoveTrackedObject(self, wxLuaState::DELETE_CLEAR_OBJECT))
      {
          lua_pushnil(L);
***************
*** 12619,12623 ****
      wxScreenDC * self = (wxScreenDC *)wxlState.GetUserDataType(1, s_wxluatag_wxScreenDC);
      // if removed from tracked mem list, reset the tag so that gc() is not called on this object.
!     if ((self != NULL) && wxlState.RemoveTrackedObject(self, wxLuaState::DELETE_OBJECT|wxLuaState::CLEAR_LUA_TRACKED|wxLuaState::CLEAR_DERIVED_METHODS))
      {
          lua_pushnil(L);
--- 12619,12623 ----
      wxScreenDC * self = (wxScreenDC *)wxlState.GetUserDataType(1, s_wxluatag_wxScreenDC);
      // if removed from tracked mem list, reset the tag so that gc() is not called on this object.
!     if ((self != NULL) && wxlState.RemoveTrackedObject(self, wxLuaState::DELETE_CLEAR_OBJECT))
      {
          lua_pushnil(L);
***************
*** 12758,12762 ****
      wxBufferedDC * self = (wxBufferedDC *)wxlState.GetUserDataType(1, s_wxluatag_wxBufferedDC);
      // if removed from tracked mem list, reset the tag so that gc() is not called on this object.
!     if ((self != NULL) && wxlState.RemoveTrackedObject(self, wxLuaState::DELETE_OBJECT|wxLuaState::CLEAR_LUA_TRACKED|wxLuaState::CLEAR_DERIVED_METHODS))
      {
          lua_pushnil(L);
--- 12758,12762 ----
      wxBufferedDC * self = (wxBufferedDC *)wxlState.GetUserDataType(1, s_wxluatag_wxBufferedDC);
      // if removed from tracked mem list, reset the tag so that gc() is not called on this object.
!     if ((self != NULL) && wxlState.RemoveTrackedObject(self, wxLuaState::DELETE_CLEAR_OBJECT))
      {
          lua_pushnil(L);
***************
*** 12937,12941 ****
      wxBufferedPaintDC * self = (wxBufferedPaintDC *)wxlState.GetUserDataType(1, s_wxluatag_wxBufferedPaintDC);
      // if removed from tracked mem list, reset the tag so that gc() is not called on this object.
!     if ((self != NULL) && wxlState.RemoveTrackedObject(self, wxLuaState::DELETE_OBJECT|wxLuaState::CLEAR_LUA_TRACKED|wxLuaState::CLEAR_DERIVED_METHODS))
      {
          lua_pushnil(L);
--- 12937,12941 ----
      wxBufferedPaintDC * self = (wxBufferedPaintDC *)wxlState.GetUserDataType(1, s_wxluatag_wxBufferedPaintDC);
      // if removed from tracked mem list, reset the tag so that gc() is not called on this object.
!     if ((self != NULL) && wxlState.RemoveTrackedObject(self, wxLuaState::DELETE_CLEAR_OBJECT))
      {
          lua_pushnil(L);
***************
*** 13059,13063 ****
      wxAutoBufferedPaintDC * self = (wxAutoBufferedPaintDC *)wxlState.GetUserDataType(1, s_wxluatag_wxAutoBufferedPaintDC);
      // if removed from tracked mem list, reset the tag so that gc() is not called on this object.
!     if ((self != NULL) && wxlState.RemoveTrackedObject(self, wxLuaState::DELETE_OBJECT|wxLuaState::CLEAR_LUA_TRACKED|wxLuaState::CLEAR_DERIVED_METHODS))
      {
          lua_pushnil(L);
--- 13059,13063 ----
      wxAutoBufferedPaintDC * self = (wxAutoBufferedPaintDC *)wxlState.GetUserDataType(1, s_wxluatag_wxAutoBufferedPaintDC);
      // if removed from tracked mem list, reset the tag so that gc() is not called on this object.
!     if ((self != NULL) && wxlState.RemoveTrackedObject(self, wxLuaState::DELETE_CLEAR_OBJECT))
      {
          lua_pushnil(L);
***************
*** 13120,13124 ****
      wxMirrorDC * self = (wxMirrorDC *)wxlState.GetUserDataType(1, s_wxluatag_wxMirrorDC);
      // if removed from tracked mem list, reset the tag so that gc() is not called on this object.
!     if ((self != NULL) && wxlState.RemoveTrackedObject(self, wxLuaState::DELETE_OBJECT|wxLuaState::CLEAR_LUA_TRACKED|wxLuaState::CLEAR_DERIVED_METHODS))
      {
          lua_pushnil(L);
--- 13120,13124 ----
      wxMirrorDC * self = (wxMirrorDC *)wxlState.GetUserDataType(1, s_wxluatag_wxMirrorDC);
      // if removed from tracked mem list, reset the tag so that gc() is not called on this object.
!     if ((self != NULL) && wxlState.RemoveTrackedObject(self, wxLuaState::DELETE_CLEAR_OBJECT))
      {
          lua_pushnil(L);
***************
*** 13183,13187 ****
      wxDCClipper * self = (wxDCClipper *)wxlState.GetUserDataType(1, s_wxluatag_wxDCClipper);
      // if removed from tracked mem list, reset the tag so that gc() is not called on this object.
!     if ((self != NULL) && wxlState.RemoveTrackedObject(self, wxLuaState::DELETE_OBJECT|wxLuaState::CLEAR_LUA_TRACKED|wxLuaState::CLEAR_DERIVED_METHODS))
      {
          lua_pushnil(L);
--- 13183,13187 ----
      wxDCClipper * self = (wxDCClipper *)wxlState.GetUserDataType(1, s_wxluatag_wxDCClipper);
      // if removed from tracked mem list, reset th...
 
[truncated message content]

[Wxlua-commit] wxLua/modules/wxlua/src wxlbind.cpp, 1.89, 1.90 wxlstate.cpp, 1.125, 1.126 wxlua.cpp, 1.3, 1.4

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

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

Modified Files:
	wxlbind.cpp wxlstate.cpp wxlua.cpp 
Log Message:
Add ored enum DELETE_CLEAR_OBJECT for wxLuaState::RemoveTrackedObject to simplify
Apply patch to lparser.c "Too many variables in an assignment may cause a C stack overflow"


Index: wxlua.cpp
===================================================================
RCS file: /cvsroot/wxlua/wxLua/modules/wxlua/src/wxlua.cpp,v
retrieving revision 1.3
retrieving revision 1.4
diff -C2 -d -r1.3 -r1.4
*** wxlua.cpp	22 Jul 2007 04:38:30 -0000	1.3
--- wxlua.cpp	1 Aug 2007 19:15:38 -0000	1.4
***************
*** 41,45 ****
      wxLuaState * self = (wxLuaState *)wxlState.GetUserDataType(1, s_wxluatag_wxLuaState);
      // if removed from tracked mem list, reset the tag so that gc() is not called on this object.
!     if ((self != NULL) && wxlState.RemoveTrackedObject(self, wxLuaState::DELETE_OBJECT|wxLuaState::CLEAR_LUA_TRACKED|wxLuaState::CLEAR_DERIVED_METHODS))
      {
          lua_pushnil(L);
--- 41,45 ----
      wxLuaState * self = (wxLuaState *)wxlState.GetUserDataType(1, s_wxluatag_wxLuaState);
      // if removed from tracked mem list, reset the tag so that gc() is not called on this object.
!     if ((self != NULL) && wxlState.RemoveTrackedObject(self, wxLuaState::DELETE_CLEAR_OBJECT))
      {
          lua_pushnil(L);
***************
*** 128,132 ****
      wxLuaObject * self = (wxLuaObject *)wxlState.GetUserDataType(1, s_wxluatag_wxLuaObject);
      // if removed from tracked mem list, reset the tag so that gc() is not called on this object.
!     if ((self != NULL) && wxlState.RemoveTrackedObject(self, wxLuaState::DELETE_OBJECT|wxLuaState::CLEAR_LUA_TRACKED|wxLuaState::CLEAR_DERIVED_METHODS))
      {
          lua_pushnil(L);
--- 128,132 ----
      wxLuaObject * self = (wxLuaObject *)wxlState.GetUserDataType(1, s_wxluatag_wxLuaObject);
      // if removed from tracked mem list, reset the tag so that gc() is not called on this object.
!     if ((self != NULL) && wxlState.RemoveTrackedObject(self, wxLuaState::DELETE_CLEAR_OBJECT))
      {
          lua_pushnil(L);

Index: wxlstate.cpp
===================================================================
RCS file: /cvsroot/wxlua/wxLua/modules/wxlua/src/wxlstate.cpp,v
retrieving revision 1.125
retrieving revision 1.126
diff -C2 -d -r1.125 -r1.126
*** wxlstate.cpp	1 Aug 2007 03:21:24 -0000	1.125
--- wxlstate.cpp	1 Aug 2007 19:15:38 -0000	1.126
***************
*** 2255,2259 ****
  
      // Nor are we tracking it within the Lua reg table
!     if (WXLUA_HASBIT(flags, CLEAR_LUA_TRACKED))
          wxlua_tuntrackuserdata(L, pObject);
  
--- 2255,2259 ----
  
      // Nor are we tracking it within the Lua reg table
!     if (WXLUA_HASBIT(flags, CLEAR_TRACKED_OBJECT))
          wxlua_tuntrackuserdata(L, pObject);
  
***************
*** 2274,2279 ****
          M_WXLSTATEDATA->m_wxlStateData->m_trackedObjects.erase(it);
  
-         //wxPrintf(wxT("RemoveTRACKED %ld %d\n"), long(pObject), int(fDelete));
- 
          return true;
      }
--- 2274,2277 ----

Index: wxlbind.cpp
===================================================================
RCS file: /cvsroot/wxlua/wxLua/modules/wxlua/src/wxlbind.cpp,v
retrieving revision 1.89
retrieving revision 1.90
diff -C2 -d -r1.89 -r1.90
*** wxlbind.cpp	1 Aug 2007 03:21:24 -0000	1.89
--- wxlbind.cpp	1 Aug 2007 19:15:37 -0000	1.90
***************
*** 254,258 ****
  
          // clean up the rest of this, this won't error if the key doesn't exist
!         wxlState.RemoveTrackedObject(key, wxLuaState::DELETE_OBJECT|wxLuaState::CLEAR_LUA_TRACKED|wxLuaState::CLEAR_DERIVED_METHODS);
      }
  
--- 254,258 ----
  
          // clean up the rest of this, this won't error if the key doesn't exist
!         wxlState.RemoveTrackedObject(key, wxLuaState::DELETE_CLEAR_OBJECT);
      }
  

[Wxlua-commit] wxLua/modules/wxluasocket/src wxluasocket.cpp, 1.30, 1.31

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

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

Modified Files:
	wxluasocket.cpp 
Log Message:
Add ored enum DELETE_CLEAR_OBJECT for wxLuaState::RemoveTrackedObject to simplify
Apply patch to lparser.c "Too many variables in an assignment may cause a C stack overflow"


Index: wxluasocket.cpp
===================================================================
RCS file: /cvsroot/wxlua/wxLua/modules/wxluasocket/src/wxluasocket.cpp,v
retrieving revision 1.30
retrieving revision 1.31
diff -C2 -d -r1.30 -r1.31
*** wxluasocket.cpp	22 Jul 2007 04:38:30 -0000	1.30
--- wxluasocket.cpp	1 Aug 2007 19:15:38 -0000	1.31
***************
*** 390,394 ****
      wxLuaDebuggerServer * self = (wxLuaDebuggerServer *)wxlState.GetUserDataType(1, s_wxluatag_wxLuaDebuggerServer);
      // if removed from tracked mem list, reset the tag so that gc() is not called on this object.
!     if ((self != NULL) && wxlState.RemoveTrackedObject(self, wxLuaState::DELETE_OBJECT|wxLuaState::CLEAR_LUA_TRACKED|wxLuaState::CLEAR_DERIVED_METHODS))
      {
          lua_pushnil(L);
--- 390,394 ----
      wxLuaDebuggerServer * self = (wxLuaDebuggerServer *)wxlState.GetUserDataType(1, s_wxluatag_wxLuaDebuggerServer);
      // if removed from tracked mem list, reset the tag so that gc() is not called on this object.
!     if ((self != NULL) && wxlState.RemoveTrackedObject(self, wxLuaState::DELETE_CLEAR_OBJECT))
      {
          lua_pushnil(L);
***************
*** 537,541 ****
      wxLuaDebuggerEvent * self = (wxLuaDebuggerEvent *)wxlState.GetUserDataType(1, s_wxluatag_wxLuaDebuggerEvent);
      // if removed from tracked mem list, reset the tag so that gc() is not called on this object.
!     if ((self != NULL) && wxlState.RemoveTrackedObject(self, wxLuaState::DELETE_OBJECT|wxLuaState::CLEAR_LUA_TRACKED|wxLuaState::CLEAR_DERIVED_METHODS))
      {
          lua_pushnil(L);
--- 537,541 ----
      wxLuaDebuggerEvent * self = (wxLuaDebuggerEvent *)wxlState.GetUserDataType(1, s_wxluatag_wxLuaDebuggerEvent);
      // if removed from tracked mem list, reset the tag so that gc() is not called on this object.
!     if ((self != NULL) && wxlState.RemoveTrackedObject(self, wxLuaState::DELETE_CLEAR_OBJECT))
      {
          lua_pushnil(L);

[Wxlua-commit] wxLua/modules/wxluasocket/include wxluasocket_bind.h, 1.25, 1.26

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

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

Modified Files:
	wxluasocket_bind.h 
Log Message:
Add ored enum DELETE_CLEAR_OBJECT for wxLuaState::RemoveTrackedObject to simplify
Apply patch to lparser.c "Too many variables in an assignment may cause a C stack overflow"


Index: wxluasocket_bind.h
===================================================================
RCS file: /cvsroot/wxlua/wxLua/modules/wxluasocket/include/wxluasocket_bind.h,v
retrieving revision 1.25
retrieving revision 1.26
diff -C2 -d -r1.25 -r1.26
*** wxluasocket_bind.h	22 Jul 2007 04:38:30 -0000	1.25
--- wxluasocket_bind.h	1 Aug 2007 19:15:38 -0000	1.26
***************
*** 21,27 ****
  //   the current version of the bindings.
  //   See 'bindings/genwxbind.lua' and 'modules/wxlua/include/wxldefs.h'
! #if WXLUA_BINDING_VERSION > 16
  #   error "The WXLUA_BINDING_VERSION in the bindings is too old, regenerate bindings."
! #endif //WXLUA_BINDING_VERSION > 16
  // ---------------------------------------------------------------------------
  
--- 21,27 ----
  //   the current version of the bindings.
  //   See 'bindings/genwxbind.lua' and 'modules/wxlua/include/wxldefs.h'
! #if WXLUA_BINDING_VERSION > 17
  #   error "The WXLUA_BINDING_VERSION in the bindings is too old, regenerate bindings."
! #endif //WXLUA_BINDING_VERSION > 17
  // ---------------------------------------------------------------------------
  

[Wxlua-commit] wxLua/modules/wxlua/include wxldefs.h, 1.31, 1.32 wxlstate.h, 1.88, 1.89 wxlua_bind.h, 1.4, 1.5

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

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

Modified Files:
	wxldefs.h wxlstate.h wxlua_bind.h 
Log Message:
Add ored enum DELETE_CLEAR_OBJECT for wxLuaState::RemoveTrackedObject to simplify
Apply patch to lparser.c "Too many variables in an assignment may cause a C stack overflow"


Index: wxldefs.h
===================================================================
RCS file: /cvsroot/wxlua/wxLua/modules/wxlua/include/wxldefs.h,v
retrieving revision 1.31
retrieving revision 1.32
diff -C2 -d -r1.31 -r1.32
*** wxldefs.h	1 Aug 2007 18:24:46 -0000	1.31
--- wxldefs.h	1 Aug 2007 19:15:37 -0000	1.32
***************
*** 67,71 ****
  //-----------------------------------------------------------------------------
  
! #define WXLUA_BINDING_VERSION 16
  
  // ----------------------------------------------------------------------------
--- 67,71 ----
  //-----------------------------------------------------------------------------
  
! #define WXLUA_BINDING_VERSION 17
  
  // ----------------------------------------------------------------------------

Index: wxlstate.h
===================================================================
RCS file: /cvsroot/wxlua/wxLua/modules/wxlua/include/wxlstate.h,v
retrieving revision 1.88
retrieving revision 1.89
diff -C2 -d -r1.88 -r1.89
*** wxlstate.h	26 Jul 2007 18:56:38 -0000	1.88
--- wxlstate.h	1 Aug 2007 19:15:37 -0000	1.89
***************
*** 604,611 ****
      enum RemoveTrackedObject_flags
      {
!         UNDELETE              = 0,      // stop tracking for deletion (someone else owns this)
          DELETE_OBJECT         = 0x0001, // delete the object
!         CLEAR_LUA_TRACKED     = 0x0002, // clear tracking the object in lua reg table
!         CLEAR_DERIVED_METHODS = 0x0004  // clear any derived methods in the lua reg table
      };
  
--- 604,612 ----
      enum RemoveTrackedObject_flags
      {
!         UNDELETE_OBJECT       = 0,      // stop tracking for deletion (someone else owns this)
          DELETE_OBJECT         = 0x0001, // delete the object
!         CLEAR_TRACKED_OBJECT  = 0x0002, // clear tracking the object in lua reg table
!         CLEAR_DERIVED_METHODS = 0x0004, // clear any derived methods in lua reg table
!         DELETE_CLEAR_OBJECT   = DELETE_OBJECT|CLEAR_TRACKED_OBJECT|CLEAR_DERIVED_METHODS
      };
  
***************
*** 616,620 ****
      //   This is used for encapsulated classes that are wrapped in a wxObject.
      void AddTrackedObject(long obj_ptr, wxObject *pObject);
!     // Remove the object from the tracked memory.
      //   flags are ored values of enum RemoveTrackedObject_flags
      bool RemoveTrackedObject(void *pObject, int flags);
--- 617,621 ----
      //   This is used for encapsulated classes that are wrapped in a wxObject.
      void AddTrackedObject(long obj_ptr, wxObject *pObject);
!     // Remove the object from the tracked memory and optionally delete it.
      //   flags are ored values of enum RemoveTrackedObject_flags
      bool RemoveTrackedObject(void *pObject, int flags);

Index: wxlua_bind.h
===================================================================
RCS file: /cvsroot/wxlua/wxLua/modules/wxlua/include/wxlua_bind.h,v
retrieving revision 1.4
retrieving revision 1.5
diff -C2 -d -r1.4 -r1.5
*** wxlua_bind.h	22 Jul 2007 04:38:29 -0000	1.4
--- wxlua_bind.h	1 Aug 2007 19:15:37 -0000	1.5
***************
*** 17,23 ****
  //   the current version of the bindings.
  //   See 'bindings/genwxbind.lua' and 'modules/wxlua/include/wxldefs.h'
! #if WXLUA_BINDING_VERSION > 16
  #   error "The WXLUA_BINDING_VERSION in the bindings is too old, regenerate bindings."
! #endif //WXLUA_BINDING_VERSION > 16
  // ---------------------------------------------------------------------------
  
--- 17,23 ----
  //   the current version of the bindings.
  //   See 'bindings/genwxbind.lua' and 'modules/wxlua/include/wxldefs.h'
! #if WXLUA_BINDING_VERSION > 17
  #   error "The WXLUA_BINDING_VERSION in the bindings is too old, regenerate bindings."
! #endif //WXLUA_BINDING_VERSION > 17
  // ---------------------------------------------------------------------------
  

[Wxlua-commit] wxLua/modules/wxlua/include wxldefs.h,1.30,1.31

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

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

Modified Files:
	wxldefs.h 
Log Message:
Bump version to 2.8.4.2


Index: wxldefs.h
===================================================================
RCS file: /cvsroot/wxlua/wxLua/modules/wxlua/include/wxldefs.h,v
retrieving revision 1.30
retrieving revision 1.31
diff -C2 -d -r1.30 -r1.31
*** wxldefs.h	22 Jul 2007 04:38:29 -0000	1.30
--- wxldefs.h	1 Aug 2007 18:24:46 -0000	1.31
***************
*** 39,44 ****
  #define wxLUA_MINOR_VERSION       8
  #define wxLUA_RELEASE_NUMBER      4
! #define wxLUA_SUBRELEASE_NUMBER   1
! #define wxLUA_VERSION_STRING      wxT("wxLua 2.8.4.1")
  
  // For non-Unix systems (i.e. when building without a configure script),
--- 39,44 ----
  #define wxLUA_MINOR_VERSION       8
  #define wxLUA_RELEASE_NUMBER      4
! #define wxLUA_SUBRELEASE_NUMBER   2
! #define wxLUA_VERSION_STRING      wxT("wxLua 2.8.4.2")
  
  // For non-Unix systems (i.e. when building without a configure script),

[Wxlua-commit] wxLua/docs wxlua.html,1.31,1.32

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

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

Modified Files:
	wxlua.html 
Log Message:
Some cleanup


Index: wxlua.html
===================================================================
RCS file: /cvsroot/wxlua/wxLua/docs/wxlua.html,v
retrieving revision 1.31
retrieving revision 1.32
diff -C2 -d -r1.31 -r1.32
*** wxlua.html	17 Jul 2007 03:30:22 -0000	1.31
--- wxlua.html	1 Aug 2007 18:24:13 -0000	1.32
***************
*** 1,20 ****
  <!DOCTYPE html PUBLIC "-//W3C//DTD HTML 4.01 Transitional//EN">
! <html>
! <head>
! 
!   <meta content="text/html; charset=ISO-8859-1" http-equiv="content-type">
!   <title>wxLua Documentation</title>
! 
! 
!   <meta content="John Labenski" name="author">
! 
[...4353 lines suppressed...]
  the script as a string with the given name. The name
  is only used if Lua errors out and then the debug message will contain
! that name. </li> <li>Returns Lua's error code LUA_ERRXXX
! or 0 on success</li> </ul> <li>int
  LuaDoBuffer(const
  char *buffer, size_t len, const char
! *name)</li> <ul> <li>Run a buffer, perhaps from
  bin2lua.lua, that you've
! compiled with your program.</li> <li>Returns Lua's error
! code LUA_ERRXXX or 0 on success</li> </ul> <li>int
! LuaDoFile(const wxString &amp;filename)</li> <ul> <li>Run
! a Lua file from disk.</li> <li>Returns Lua's error code
! LUA_ERRXXX or 0 on success</li> </ul> <li>int
! LuaPCall(int narg, int nresults)</li> <ul> <li>Uses
  lua_call to run a chunk on the stack, but sets
! things up for wxLua first.</li> <li>Returns Lua's error
! code LUA_ERRXXX or 0 on success</li> </ul> <li>The
  other functions are documented in <span style="font-style: italic;">wxLua/modules/wxlua/include/wxlstate.h</span>.</li>
! </ul></body></html>
\ No newline at end of file

[Wxlua-commit] wxLua Makefile.in,1.28,1.29 configure,1.57,1.58

[Francesco M. <fr...@us...>]

Update of /cvsroot/wxlua/wxLua
In directory sc8-pr-cvs9.sourceforge.net:/tmp/cvs-serv7207

Modified Files:
	Makefile.in configure 
Log Message:
fixed configure script about the new USE_BINDxxx options; also fixed the inter-module dependencies

Index: Makefile.in
===================================================================
RCS file: /cvsroot/wxlua/wxLua/Makefile.in,v
retrieving revision 1.28
retrieving revision 1.29
diff -C2 -d -r1.28 -r1.29
*** Makefile.in	4 Jul 2007 05:39:09 -0000	1.28
--- Makefile.in	1 Aug 2007 10:08:22 -0000	1.29
***************
*** 79,83 ****
  samples: 
  	@mkdir -p $(DESTDIR)$(datadir)/wxlua/samples
! 	@for f in samples/validator.wx.lua samples/calculator.wx.lua samples/choices.wx.lua samples/coroutine.wx.lua samples/media.wx.lua samples/dialog.wx.lua samples/editor.wx.lua samples/grid.wx.lua samples/htmlwin.wx.lua samples/luamodule.wx.lua samples/mdi.wx.lua samples/minimal.wx.lua samples/printing.wx.lua samples/scribble.wx.lua samples/sizer.wx.lua samples/tree.wx.lua samples/unittest.wx.lua samples/veryminimal.wx.lua samples/wxluasudoku.wx.lua samples/bindings.wx.lua samples/settings.wx.lua samples/controls.wx.lua samples/picker.wx.lua samples/calculator.xrc; do \
  	if test ! -f $(DESTDIR)$(datadir)/wxlua/samples/$$f -a ! -d $(DESTDIR)$(datadir)/wxlua/samples/$$f ; \
  	then x=yep ; \
--- 79,83 ----
  samples: 
  	@mkdir -p $(DESTDIR)$(datadir)/wxlua/samples
! 	@for f in samples/grid.wx.lua samples/htmlwin.wx.lua samples/dialog.wx.lua samples/validator.wx.lua samples/luamodule.wx.lua samples/calculator.wx.lua samples/settings.wx.lua samples/picker.wx.lua samples/choices.wx.lua samples/media.wx.lua samples/coroutine.wx.lua samples/editor.wx.lua samples/controls.wx.lua samples/veryminimal.wx.lua samples/scribble.wx.lua samples/minimal.wx.lua samples/mdi.wx.lua samples/unittest.wx.lua samples/printing.wx.lua samples/tree.wx.lua samples/sizer.wx.lua samples/wxluasudoku.wx.lua samples/bindings.wx.lua samples/calculator.xrc; do \
  	if test ! -f $(DESTDIR)$(datadir)/wxlua/samples/$$f -a ! -d $(DESTDIR)$(datadir)/wxlua/samples/$$f ; \
  	then x=yep ; \

Index: configure
===================================================================
RCS file: /cvsroot/wxlua/wxLua/configure,v
retrieving revision 1.57
retrieving revision 1.58
diff -C2 -d -r1.57 -r1.58
*** configure	28 Jul 2007 21:21:41 -0000	1.57
--- configure	1 Aug 2007 10:08:22 -0000	1.58
***************
*** 1417,1421 ****
    --enable-wxluafreeze-app
                            Compiles the wxLuaFreeze app (default is yes)
!   --enable-wxbindstc      Compiles the wxLua bindings for STC (default is yes)
    --enable-wxluadebug     Compiles the wxLua debug support (default is yes)
    --enable-wxluasocket    Compiles the wxLua socket support (default is yes)
--- 1417,1444 ----
    --enable-wxluafreeze-app
                            Compiles the wxLuaFreeze app (default is yes)
!   --enable-wxbindadv      Compiles the wxLua bindings for wxAdvanced lib
!                           (default is yes)
!   --enable-wxbindaui      Compiles the wxLua bindings for wxAUI lib (default
!                           is yes)
!   --enable-wxbindbase     Compiles the wxLua bindings for wxBase lib (default
!                           is yes)
!   --enable-wxbindcore     Compiles the wxLua bindings for wxCore lib (default
!                           is yes)
!   --enable-wxbindgl       Compiles the wxLua bindings for wxGl lib (default is
!                           yes)
!   --enable-wxbindhtml     Compiles the wxLua bindings for wxHTML lib (default
!                           is yes)
!   --enable-wxbindmedia    Compiles the wxLua bindings for wxMedia lib (default
!                           is yes)
!   --enable-wxbindnet      Compiles the wxLua bindings for wxNet lib (default
!                           is yes)
!   --enable-wxbindrichtext Compiles the wxLua bindings for wxRichText lib
!                           (default is yes)
!   --enable-wxbindstc      Compiles the wxLua bindings for wxSTC lib (default
!                           is yes)
!   --enable-wxbindxml      Compiles the wxLua bindings for wxXml lib (default
!                           is yes)
!   --enable-wxbindxrc      Compiles the wxLua bindings for wxXRC lib (default
!                           is yes)
    --enable-wxluadebug     Compiles the wxLua debug support (default is yes)
    --enable-wxluasocket    Compiles the wxLua socket support (default is yes)
***************
*** 2277,2287 ****
  
  # Options for the MODULES section
! # Check whether --enable-wxbindstc was given.
! if test "${enable_wxbindstc+set}" = set; then
!   enableval=$enable_wxbindstc;
  else
!   enable_wxbindstc=yes
  fi
  
  # Check whether --enable-wxluadebug was given.
  if test "${enable_wxluadebug+set}" = set; then
--- 2300,2418 ----
  
  # Options for the MODULES section
! # NOTE: AC_BINDLIB_ENABLE saves us from some copy&paste
! 
! 
! 
!             # Check whether --enable-adv was given.
! if test "${enable_adv+set}" = set; then
!   enableval=$enable_adv;
  else
!   enable_wxbindadv=yes; wxbind_list="$wxbind_list,adv"
! fi
! 
! 
! 
!             # Check whether --enable-aui was given.
! if test "${enable_aui+set}" = set; then
!   enableval=$enable_aui;
! else
!   enable_wxbindaui=yes; wxbind_list="$wxbind_list,aui"
! fi
! 
! 
! 
!             # Check whether --enable-base was given.
! if test "${enable_base+set}" = set; then
!   enableval=$enable_base;
! else
!   enable_wxbindbase=yes; wxbind_list="$wxbind_list,base"
! fi
! 
! 
! 
!             # Check whether --enable-core was given.
! if test "${enable_core+set}" = set; then
!   enableval=$enable_core;
! else
!   enable_wxbindcore=yes; wxbind_list="$wxbind_list,core"
! fi
! 
! 
! 
!             # Check whether --enable-gl was given.
! if test "${enable_gl+set}" = set; then
!   enableval=$enable_gl;
! else
!   enable_wxbindgl=yes; wxbind_list="$wxbind_list,gl"
! fi
! 
! 
! 
!             # Check whether --enable-html was given.
! if test "${enable_html+set}" = set; then
!   enableval=$enable_html;
! else
!   enable_wxbindhtml=yes; wxbind_list="$wxbind_list,html"
! fi
! 
! 
! 
!             # Check whether --enable-media was given.
! if test "${enable_media+set}" = set; then
!   enableval=$enable_media;
! else
!   enable_wxbindmedia=yes; wxbind_list="$wxbind_list,media"
! fi
! 
! 
! 
!             # Check whether --enable-net was given.
! if test "${enable_net+set}" = set; then
!   enableval=$enable_net;
! else
!   enable_wxbindnet=yes; wxbind_list="$wxbind_list,net"
! fi
! 
! 
! 
!             # Check whether --enable-richtext was given.
! if test "${enable_richtext+set}" = set; then
!   enableval=$enable_richtext;
! else
!   enable_wxbindrichtext=yes; wxbind_list="$wxbind_list,richtext"
! fi
! 
! 
! 
!             # Check whether --enable-stc was given.
! if test "${enable_stc+set}" = set; then
!   enableval=$enable_stc;
! else
!   enable_wxbindstc=yes; wxbind_list="$wxbind_list,stc"
! fi
! 
! 
! 
!             # Check whether --enable-xml was given.
! if test "${enable_xml+set}" = set; then
!   enableval=$enable_xml;
! else
!   enable_wxbindxml=yes; wxbind_list="$wxbind_list,xml"
! fi
! 
! 
! 
!             # Check whether --enable-xrc was given.
! if test "${enable_xrc+set}" = set; then
!   enableval=$enable_xrc;
! else
!   enable_wxbindxrc=yes; wxbind_list="$wxbind_list,xrc"
  fi
  
+ 
+ 
+ # remove initial comma:
+ wxbind_list=${wxbind_list:1}
+ 
  # Check whether --enable-wxluadebug was given.
  if test "${enable_wxluadebug+set}" = set; then
***************
*** 2376,2379 ****
--- 2507,2627 ----
  
  
+         { echo "$as_me:$LINENO: checking for the --enable-wxbindadv option" >&5
+ echo $ECHO_N "checking for the --enable-wxbindadv option... $ECHO_C" >&6; }
+         if [ "x$enable_wxbindadv" = "xyes" ]; then
+             { echo "$as_me:$LINENO: result: yes" >&5
+ echo "${ECHO_T}yes" >&6; }
+             USE_WXBINDADV=1
+         else
+             { echo "$as_me:$LINENO: result: no" >&5
+ echo "${ECHO_T}no" >&6; }
+             USE_WXBINDADV=0
+         fi
+ 
+ 
+         { echo "$as_me:$LINENO: checking for the --enable-wxbindaui option" >&5
+ echo $ECHO_N "checking for the --enable-wxbindaui option... $ECHO_C" >&6; }
+         if [ "x$enable_wxbindaui" = "xyes" ]; then
+             { echo "$as_me:$LINENO: result: yes" >&5
+ echo "${ECHO_T}yes" >&6; }
+             USE_WXBINDAUI=1
+         else
+             { echo "$as_me:$LINENO: result: no" >&5
+ echo "${ECHO_T}no" >&6; }
+             USE_WXBINDAUI=0
+         fi
+ 
+ 
+         { echo "$as_me:$LINENO: checking for the --enable-wxbindbase option" >&5
+ echo $ECHO_N "checking for the --enable-wxbindbase option... $ECHO_C" >&6; }
+         if [ "x$enable_wxbindbase" = "xyes" ]; then
+             { echo "$as_me:$LINENO: result: yes" >&5
+ echo "${ECHO_T}yes" >&6; }
+             USE_WXBINDBASE=1
+         else
+             { echo "$as_me:$LINENO: result: no" >&5
+ echo "${ECHO_T}no" >&6; }
+             USE_WXBINDBASE=0
+         fi
+ 
+ 
+         { echo "$as_me:$LINENO: checking for the --enable-wxbindcore option" >&5
+ echo $ECHO_N "checking for the --enable-wxbindcore option... $ECHO_C" >&6; }
+         if [ "x$enable_wxbindcore" = "xyes" ]; then
+             { echo "$as_me:$LINENO: result: yes" >&5
+ echo "${ECHO_T}yes" >&6; }
+             USE_WXBINDCORE=1
+         else
+             { echo "$as_me:$LINENO: result: no" >&5
+ echo "${ECHO_T}no" >&6; }
+             USE_WXBINDCORE=0
+         fi
+ 
+ 
+         { echo "$as_me:$LINENO: checking for the --enable-wxbindgl option" >&5
+ echo $ECHO_N "checking for the --enable-wxbindgl option... $ECHO_C" >&6; }
+         if [ "x$enable_wxbindgl" = "xyes" ]; then
+             { echo "$as_me:$LINENO: result: yes" >&5
+ echo "${ECHO_T}yes" >&6; }
+             USE_WXBINDGL=1
+         else
+             { echo "$as_me:$LINENO: result: no" >&5
+ echo "${ECHO_T}no" >&6; }
+             USE_WXBINDGL=0
+         fi
+ 
+ 
+         { echo "$as_me:$LINENO: checking for the --enable-wxbindhtml option" >&5
+ echo $ECHO_N "checking for the --enable-wxbindhtml option... $ECHO_C" >&6; }
+         if [ "x$enable_wxbindhtml" = "xyes" ]; then
+             { echo "$as_me:$LINENO: result: yes" >&5
+ echo "${ECHO_T}yes" >&6; }
+             USE_WXBINDHTML=1
+         else
+             { echo "$as_me:$LINENO: result: no" >&5
+ echo "${ECHO_T}no" >&6; }
+             USE_WXBINDHTML=0
+         fi
+ 
+ 
+         { echo "$as_me:$LINENO: checking for the --enable-wxbindmedia option" >&5
+ echo $ECHO_N "checking for the --enable-wxbindmedia option... $ECHO_C" >&6; }
+         if [ "x$enable_wxbindmedia" = "xyes" ]; then
+             { echo "$as_me:$LINENO: result: yes" >&5
+ echo "${ECHO_T}yes" >&6; }
+             USE_WXBINDMEDIA=1
+         else
+             { echo "$as_me:$LINENO: result: no" >&5
+ echo "${ECHO_T}no" >&6; }
+             USE_WXBINDMEDIA=0
+         fi
+ 
+ 
+         { echo "$as_me:$LINENO: checking for the --enable-wxbindnet option" >&5
+ echo $ECHO_N "checking for the --enable-wxbindnet option... $ECHO_C" >&6; }
+         if [ "x$enable_wxbindnet" = "xyes" ]; then
+             { echo "$as_me:$LINENO: result: yes" >&5
+ echo "${ECHO_T}yes" >&6; }
+             USE_WXBINDNET=1
+         else
+             { echo "$as_me:$LINENO: result: no" >&5
+ echo "${ECHO_T}no" >&6; }
+             USE_WXBINDNET=0
+         fi
+ 
+ 
+         { echo "$as_me:$LINENO: checking for the --enable-wxbindrichtext option" >&5
+ echo $ECHO_N "checking for the --enable-wxbindrichtext option... $ECHO_C" >&6; }
+         if [ "x$enable_wxbindrichtext" = "xyes" ]; then
+             { echo "$as_me:$LINENO: result: yes" >&5
+ echo "${ECHO_T}yes" >&6; }
+             USE_WXBINDRICHTEXT=1
+         else
+             { echo "$as_me:$LINENO: result: no" >&5
+ echo "${ECHO_T}no" >&6; }
+             USE_WXBINDRICHTEXT=0
+         fi
+ 
+ 
          { echo "$as_me:$LINENO: checking for the --enable-wxbindstc option" >&5
  echo $ECHO_N "checking for the --enable-wxbindstc option... $ECHO_C" >&6; }
***************
*** 2389,2392 ****
--- 2637,2667 ----
  
  
+         { echo "$as_me:$LINENO: checking for the --enable-wxbindxml option" >&5
+ echo $ECHO_N "checking for the --enable-wxbindxml option... $ECHO_C" >&6; }
+         if [ "x$enable_wxbindxml" = "xyes" ]; then
+             { echo "$as_me:$LINENO: result: yes" >&5
+ echo "${ECHO_T}yes" >&6; }
+             USE_WXBINDXML=1
+         else
+             { echo "$as_me:$LINENO: result: no" >&5
+ echo "${ECHO_T}no" >&6; }
+             USE_WXBINDXML=0
+         fi
+ 
+ 
+         { echo "$as_me:$LINENO: checking for the --enable-wxbindxrc option" >&5
+ echo $ECHO_N "checking for the --enable-wxbindxrc option... $ECHO_C" >&6; }
+         if [ "x$enable_wxbindxrc" = "xyes" ]; then
+             { echo "$as_me:$LINENO: result: yes" >&5
+ echo "${ECHO_T}yes" >&6; }
+             USE_WXBINDXRC=1
+         else
+             { echo "$as_me:$LINENO: result: no" >&5
+ echo "${ECHO_T}no" >&6; }
+             USE_WXBINDXRC=0
+         fi
+ 
+ 
+ 
          { echo "$as_me:$LINENO: checking for the --enable-wxluadebug option" >&5
  echo $ECHO_N "checking for the --enable-wxluadebug option... $ECHO_C" >&6; }
***************
*** 3893,3897 ****
  
  
! WXLIBS_REQUIRED="xrc,html,adv,net,xml,core,base"
  
  
--- 4168,4172 ----
  
  
! WXLIBS_REQUIRED="aui,xrc,html,adv,net,xml,core,base"
  
  
***************
*** 6218,6223 ****
  
  
!                 WXLUA_MODNAMES="$WXLUA_MODNAMES wxluasocket"
!         TMP="wxlua_$WX_PORT""$WXLIBPOSTFIX""_wxluasocket""-$WX_VERSION_MAJOR"".$WX_VERSION_MINOR"
  
                  WXLUA_LIBNAMES="$WXLUA_LIBNAMES $TMP"
--- 6493,6498 ----
  
  
!                 WXLUA_MODNAMES="$WXLUA_MODNAMES wxbindadv"
!         TMP="wxlua_$WX_PORT""$WXLIBPOSTFIX""_wxbindadv""-$WX_VERSION_MAJOR"".$WX_VERSION_MINOR"
  
                  WXLUA_LIBNAMES="$WXLUA_LIBNAMES $TMP"
***************
*** 6226,6231 ****
  
  
!                 WXLUA_MODNAMES="$WXLUA_MODNAMES wxluadebug"
!         TMP="wxlua_$WX_PORT""$WXLIBPOSTFIX""_wxluadebug""-$WX_VERSION_MAJOR"".$WX_VERSION_MINOR"
  
                  WXLUA_LIBNAMES="$WXLUA_LIBNAMES $TMP"
--- 6501,6506 ----
  
  
!                 WXLUA_MODNAMES="$WXLUA_MODNAMES wxbindaui"
!         TMP="wxlua_$WX_PORT""$WXLIBPOSTFIX""_wxbindaui""-$WX_VERSION_MAJOR"".$WX_VERSION_MINOR"
  
                  WXLUA_LIBNAMES="$WXLUA_LIBNAMES $TMP"
***************
*** 6234,6239 ****
  
  
!                 WXLUA_MODNAMES="$WXLUA_MODNAMES wxlua"
!         TMP="wxlua_$WX_PORT""$WXLIBPOSTFIX""_wxlua""-$WX_VERSION_MAJOR"".$WX_VERSION_MINOR"
  
                  WXLUA_LIBNAMES="$WXLUA_LIBNAMES $TMP"
--- 6509,6514 ----
  
  
!                 WXLUA_MODNAMES="$WXLUA_MODNAMES wxbindbase"
!         TMP="wxlua_$WX_PORT""$WXLIBPOSTFIX""_wxbindbase""-$WX_VERSION_MAJOR"".$WX_VERSION_MINOR"
  
                  WXLUA_LIBNAMES="$WXLUA_LIBNAMES $TMP"
***************
*** 6242,6247 ****
  
  
!                 WXLUA_MODNAMES="$WXLUA_MODNAMES wxbind"
!         TMP="wxlua_$WX_PORT""$WXLIBPOSTFIX""_wxbind""-$WX_VERSION_MAJOR"".$WX_VERSION_MINOR"
  
                  WXLUA_LIBNAMES="$WXLUA_LIBNAMES $TMP"
--- 6517,6562 ----
  
  
!                 WXLUA_MODNAMES="$WXLUA_MODNAMES wxbindcore"
!         TMP="wxlua_$WX_PORT""$WXLIBPOSTFIX""_wxbindcore""-$WX_VERSION_MAJOR"".$WX_VERSION_MINOR"
! 
!                 WXLUA_LIBNAMES="$WXLUA_LIBNAMES $TMP"
! 
!                 WXLUA_LDFLAGS="$WXLUA_LDFLAGS -l$TMP"
! 
! 
!                 WXLUA_MODNAMES="$WXLUA_MODNAMES wxbindgl"
!         TMP="wxlua_$WX_PORT""$WXLIBPOSTFIX""_wxbindgl""-$WX_VERSION_MAJOR"".$WX_VERSION_MINOR"
! 
!                 WXLUA_LIBNAMES="$WXLUA_LIBNAMES $TMP"
! 
!                 WXLUA_LDFLAGS="$WXLUA_LDFLAGS -l$TMP"
! 
! 
!                 WXLUA_MODNAMES="$WXLUA_MODNAMES wxbindhtml"
!         TMP="wxlua_$WX_PORT""$WXLIBPOSTFIX""_wxbindhtml""-$WX_VERSION_MAJOR"".$WX_VERSION_MINOR"
! 
!                 WXLUA_LIBNAMES="$WXLUA_LIBNAMES $TMP"
! 
!                 WXLUA_LDFLAGS="$WXLUA_LDFLAGS -l$TMP"
! 
! 
!                 WXLUA_MODNAMES="$WXLUA_MODNAMES wxbindmedia"
!         TMP="wxlua_$WX_PORT""$WXLIBPOSTFIX""_wxbindmedia""-$WX_VERSION_MAJOR"".$WX_VERSION_MINOR"
! 
!                 WXLUA_LIBNAMES="$WXLUA_LIBNAMES $TMP"
! 
!                 WXLUA_LDFLAGS="$WXLUA_LDFLAGS -l$TMP"
! 
! 
!                 WXLUA_MODNAMES="$WXLUA_MODNAMES wxbindnet"
!         TMP="wxlua_$WX_PORT""$WXLIBPOSTFIX""_wxbindnet""-$WX_VERSION_MAJOR"".$WX_VERSION_MINOR"
! 
!                 WXLUA_LIBNAMES="$WXLUA_LIBNAMES $TMP"
! 
!                 WXLUA_LDFLAGS="$WXLUA_LDFLAGS -l$TMP"
! 
! 
!                 WXLUA_MODNAMES="$WXLUA_MODNAMES wxbindrichtext"
!         TMP="wxlua_$WX_PORT""$WXLIBPOSTFIX""_wxbindrichtext""-$WX_VERSION_MAJOR"".$WX_VERSION_MINOR"
  
                  WXLUA_LIBNAMES="$WXLUA_LIBNAMES $TMP"
***************
*** 6258,6261 ****
--- 6573,6617 ----
  
  
+                 WXLUA_MODNAMES="$WXLUA_MODNAMES wxbindxml"
+         TMP="wxlua_$WX_PORT""$WXLIBPOSTFIX""_wxbindxml""-$WX_VERSION_MAJOR"".$WX_VERSION_MINOR"
+ 
+                 WXLUA_LIBNAMES="$WXLUA_LIBNAMES $TMP"
+ 
+                 WXLUA_LDFLAGS="$WXLUA_LDFLAGS -l$TMP"
+ 
+ 
+                 WXLUA_MODNAMES="$WXLUA_MODNAMES wxbindxrc"
+         TMP="wxlua_$WX_PORT""$WXLIBPOSTFIX""_wxbindxrc""-$WX_VERSION_MAJOR"".$WX_VERSION_MINOR"
+ 
+                 WXLUA_LIBNAMES="$WXLUA_LIBNAMES $TMP"
+ 
+                 WXLUA_LDFLAGS="$WXLUA_LDFLAGS -l$TMP"
+ 
+ 
+ 
+                 WXLUA_MODNAMES="$WXLUA_MODNAMES wxluasocket"
+         TMP="wxlua_$WX_PORT""$WXLIBPOSTFIX""_wxluasocket""-$WX_VERSION_MAJOR"".$WX_VERSION_MINOR"
+ 
+                 WXLUA_LIBNAMES="$WXLUA_LIBNAMES $TMP"
+ 
+                 WXLUA_LDFLAGS="$WXLUA_LDFLAGS -l$TMP"
+ 
+ 
+                 WXLUA_MODNAMES="$WXLUA_MODNAMES wxluadebug"
+         TMP="wxlua_$WX_PORT""$WXLIBPOSTFIX""_wxluadebug""-$WX_VERSION_MAJOR"".$WX_VERSION_MINOR"
+ 
+                 WXLUA_LIBNAMES="$WXLUA_LIBNAMES $TMP"
+ 
+                 WXLUA_LDFLAGS="$WXLUA_LDFLAGS -l$TMP"
+ 
+ 
+                 WXLUA_MODNAMES="$WXLUA_MODNAMES wxlua"
+         TMP="wxlua_$WX_PORT""$WXLIBPOSTFIX""_wxlua""-$WX_VERSION_MAJOR"".$WX_VERSION_MINOR"
+ 
+                 WXLUA_LIBNAMES="$WXLUA_LIBNAMES $TMP"
+ 
+                 WXLUA_LDFLAGS="$WXLUA_LDFLAGS -l$TMP"
+ 
+ 
  WXLUA_LIBNAMES="$WXLUA_LIBNAMES lua5.1"
  WXLUA_LDFLAGS="$WXLUA_LDFLAGS -llua5.1"
***************
*** 10177,10181 ****
  #       declared as:
  #        <exe id="app_wxlua" template="wxluaapp" cond="USE_WXLUAAPP=='1' and USE_WXBINDSTC=='1' and USE_WXLUADEBUG=='1'">
! #       and thus the AM_3BOOLOPT_SUMMARY([USE_WXLUAAPP], [USE_WXBINDSTC], [USE_WXLUADEBUG], ...) macro must be used !
  
  
--- 10533,10538 ----
  #       declared as:
  #        <exe id="app_wxlua" template="wxluaapp" cond="USE_WXLUAAPP=='1' and USE_WXBINDSTC=='1' and USE_WXLUADEBUG=='1'">
! #       and thus the AM_3BOOLOPT_SUMMARY([USE_WXLUAAPP], [USE_WXBINDSTC], [USE_WXLUADEBUG], ...)
! #       macro must be used !
  
  
***************
*** 10272,10275 ****
--- 10629,10669 ----
  
  
+         if [ "x$USE_WXBINDSTC" = "x1" ]; then
+             echo "  - wxBindSTC module:               yes"
+         elif [ "x$USE_WXBINDSTC" = "x0" ]; then
+             echo "  - wxBindSTC module:               no"
+         else
+             echo "USE_WXBINDSTC is $USE_WXBINDSTC"
+         fi
+ 
+ 
+         if [ "x$USE_WXBINDSTC" = "x1" ]; then
+             echo "  - wxBindSTC module:               yes"
+         elif [ "x$USE_WXBINDSTC" = "x0" ]; then
+             echo "  - wxBindSTC module:               no"
+         else
+             echo "USE_WXBINDSTC is $USE_WXBINDSTC"
+         fi
+ 
+ 
+         if [ "x$USE_WXBINDSTC" = "x1" ]; then
+             echo "  - wxBindSTC module:               yes"
+         elif [ "x$USE_WXBINDSTC" = "x0" ]; then
+             echo "  - wxBindSTC module:               no"
+         else
+             echo "USE_WXBINDSTC is $USE_WXBINDSTC"
+         fi
+ 
+ 
+         if [ "x$USE_WXBINDSTC" = "x1" ]; then
+             echo "  - wxBindSTC module:               yes"
+         elif [ "x$USE_WXBINDSTC" = "x0" ]; then
+             echo "  - wxBindSTC module:               no"
+         else
+             echo "USE_WXBINDSTC is $USE_WXBINDSTC"
+         fi
+ 
+ 
+ 
          if [ "x$USE_WXLUADEBUG" = "x1" ]; then
              echo "  - wxLuaDebug module:              yes"
***************
*** 10311,10314 ****
--- 10705,10711 ----
  
  
+ echo "  - wxBind modules activated: "
+ echo "     $wxbind_list"
+ 
  
  

[Wxlua-commit] wxLua/apps/build/msw makefile.bcc, 1.71, 1.72 makefile.gcc, 1.71, 1.72 makefile.vc, 1.71, 1.72 makefile.wat, 1.72, 1.73

[Francesco M. <fr...@us...>]

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

Modified Files:
	makefile.bcc makefile.gcc makefile.vc makefile.wat 
Log Message:
fixed configure script about the new USE_BINDxxx options; also fixed the inter-module dependencies

Index: makefile.vc
===================================================================
RCS file: /cvsroot/wxlua/wxLua/apps/build/msw/makefile.vc,v
retrieving revision 1.71
retrieving revision 1.72
diff -C2 -d -r1.71 -r1.72
*** makefile.vc	1 Aug 2007 03:21:22 -0000	1.71
--- makefile.vc	1 Aug 2007 10:08:22 -0000	1.72
***************
*** 123,128 ****
  	$(CPPFLAGS) $(CXXFLAGS)
  APP_WXLUA_OBJECTS =  \
- 	vcmsw$(WXLIBPOSTFIX)$(_BUILDDIR_SHARED_SUFFIX)\app_wxlua_lconsole.obj \
  	vcmsw$(WXLIBPOSTFIX)$(_BUILDDIR_SHARED_SUFFIX)\app_wxlua_wxlua.obj \
  	vcmsw$(WXLIBPOSTFIX)$(_BUILDDIR_SHARED_SUFFIX)\app_wxlua_wxlua.res
  APP_WXLUAEDIT_CXXFLAGS = /M$(__RUNTIME_LIBS_54)$(____app_21) /DWIN32 \
--- 123,128 ----
  	$(CPPFLAGS) $(CXXFLAGS)
  APP_WXLUA_OBJECTS =  \
  	vcmsw$(WXLIBPOSTFIX)$(_BUILDDIR_SHARED_SUFFIX)\app_wxlua_wxlua.obj \
+ 	vcmsw$(WXLIBPOSTFIX)$(_BUILDDIR_SHARED_SUFFIX)\app_wxlua_lconsole.obj \
  	vcmsw$(WXLIBPOSTFIX)$(_BUILDDIR_SHARED_SUFFIX)\app_wxlua_wxlua.res
  APP_WXLUAEDIT_CXXFLAGS = /M$(__RUNTIME_LIBS_54)$(____app_21) /DWIN32 \
***************
*** 144,152 ****
  	/I..\..\..\modules\wxbind\setup /GR /EHsc $(CPPFLAGS) $(CXXFLAGS)
  APP_WXLUACAN_OBJECTS =  \
- 	vcmsw$(WXLIBPOSTFIX)$(_BUILDDIR_SHARED_SUFFIX)\app_wxluacan_cancom.obj \
- 	vcmsw$(WXLIBPOSTFIX)$(_BUILDDIR_SHARED_SUFFIX)\app_wxluacan_canlua.obj \
- 	vcmsw$(WXLIBPOSTFIX)$(_BUILDDIR_SHARED_SUFFIX)\app_wxluacan_cansim.obj \
  	vcmsw$(WXLIBPOSTFIX)$(_BUILDDIR_SHARED_SUFFIX)\app_wxluacan_wxluacan.obj \
  	vcmsw$(WXLIBPOSTFIX)$(_BUILDDIR_SHARED_SUFFIX)\app_wxluacan_wxluacan_bind.obj \
  	vcmsw$(WXLIBPOSTFIX)$(_BUILDDIR_SHARED_SUFFIX)\app_wxluacan_cansim.res
  APP_WXLUAFREEZE_CXXFLAGS = /M$(__RUNTIME_LIBS_82)$(____app_21) /DWIN32 \
--- 144,152 ----
  	/I..\..\..\modules\wxbind\setup /GR /EHsc $(CPPFLAGS) $(CXXFLAGS)
  APP_WXLUACAN_OBJECTS =  \
  	vcmsw$(WXLIBPOSTFIX)$(_BUILDDIR_SHARED_SUFFIX)\app_wxluacan_wxluacan.obj \
+ 	vcmsw$(WXLIBPOSTFIX)$(_BUILDDIR_SHARED_SUFFIX)\app_wxluacan_cancom.obj \
  	vcmsw$(WXLIBPOSTFIX)$(_BUILDDIR_SHARED_SUFFIX)\app_wxluacan_wxluacan_bind.obj \
+ 	vcmsw$(WXLIBPOSTFIX)$(_BUILDDIR_SHARED_SUFFIX)\app_wxluacan_cansim.obj \
+ 	vcmsw$(WXLIBPOSTFIX)$(_BUILDDIR_SHARED_SUFFIX)\app_wxluacan_canlua.obj \
  	vcmsw$(WXLIBPOSTFIX)$(_BUILDDIR_SHARED_SUFFIX)\app_wxluacan_cansim.res
  APP_WXLUAFREEZE_CXXFLAGS = /M$(__RUNTIME_LIBS_82)$(____app_21) /DWIN32 \
***************
*** 565,572 ****
  	$(CC) /c /nologo /TC /Fo$@ $(APP_LUAC_CFLAGS) $**
  
! vcmsw$(WXLIBPOSTFIX)$(_BUILDDIR_SHARED_SUFFIX)\app_wxlua_lconsole.obj: ..\..\wxlua\src\lconsole.cpp
  	$(CXX) /c /nologo /TP /Fo$@ $(APP_WXLUA_CXXFLAGS) $**
  
! vcmsw$(WXLIBPOSTFIX)$(_BUILDDIR_SHARED_SUFFIX)\app_wxlua_wxlua.obj: ..\..\wxlua\src\wxlua.cpp
  	$(CXX) /c /nologo /TP /Fo$@ $(APP_WXLUA_CXXFLAGS) $**
  
--- 565,572 ----
  	$(CC) /c /nologo /TC /Fo$@ $(APP_LUAC_CFLAGS) $**
  
! vcmsw$(WXLIBPOSTFIX)$(_BUILDDIR_SHARED_SUFFIX)\app_wxlua_wxlua.obj: ..\..\wxlua\src\wxlua.cpp
  	$(CXX) /c /nologo /TP /Fo$@ $(APP_WXLUA_CXXFLAGS) $**
  
! vcmsw$(WXLIBPOSTFIX)$(_BUILDDIR_SHARED_SUFFIX)\app_wxlua_lconsole.obj: ..\..\wxlua\src\lconsole.cpp
  	$(CXX) /c /nologo /TP /Fo$@ $(APP_WXLUA_CXXFLAGS) $**
  
***************
*** 583,599 ****
  	rc /fo$@  /d WIN32 $(____WX_SHARED_2) $(__WXUNICODE_DEFINE_p_1) $(__WXDEBUG_DEFINE_p_1) /d __WXMSW__ /i $(WX_DIR)$(WXLIBPATH)\msw$(WXLIBPOSTFIX) /i $(WX_DIR)\include $(______app_wxlua) /i ..\..\..\modules /i .\..\..\.. /i $(LUA_DIR)\include /d _WINDOWS /i $(WXSTEDIT_DIR)\include /i $(WX_DIR)\contrib\include $**
  
! vcmsw$(WXLIBPOSTFIX)$(_BUILDDIR_SHARED_SUFFIX)\app_wxluacan_cancom.obj: ..\..\wxluacan\src\cancom.cpp
  	$(CXX) /c /nologo /TP /Fo$@ $(APP_WXLUACAN_CXXFLAGS) $**
  
! vcmsw$(WXLIBPOSTFIX)$(_BUILDDIR_SHARED_SUFFIX)\app_wxluacan_canlua.obj: ..\..\wxluacan\src\canlua.cpp
  	$(CXX) /c /nologo /TP /Fo$@ $(APP_WXLUACAN_CXXFLAGS) $**
  
! vcmsw$(WXLIBPOSTFIX)$(_BUILDDIR_SHARED_SUFFIX)\app_wxluacan_cansim.obj: ..\..\wxluacan\src\cansim.cpp
  	$(CXX) /c /nologo /TP /Fo$@ $(APP_WXLUACAN_CXXFLAGS) $**
  
! vcmsw$(WXLIBPOSTFIX)$(_BUILDDIR_SHARED_SUFFIX)\app_wxluacan_wxluacan.obj: ..\..\wxluacan\src\wxluacan.cpp
  	$(CXX) /c /nologo /TP /Fo$@ $(APP_WXLUACAN_CXXFLAGS) $**
  
! vcmsw$(WXLIBPOSTFIX)$(_BUILDDIR_SHARED_SUFFIX)\app_wxluacan_wxluacan_bind.obj: ..\..\wxluacan\src\wxluacan_bind.cpp
  	$(CXX) /c /nologo /TP /Fo$@ $(APP_WXLUACAN_CXXFLAGS) $**
  
--- 583,599 ----
  	rc /fo$@  /d WIN32 $(____WX_SHARED_2) $(__WXUNICODE_DEFINE_p_1) $(__WXDEBUG_DEFINE_p_1) /d __WXMSW__ /i $(WX_DIR)$(WXLIBPATH)\msw$(WXLIBPOSTFIX) /i $(WX_DIR)\include $(______app_wxlua) /i ..\..\..\modules /i .\..\..\.. /i $(LUA_DIR)\include /d _WINDOWS /i $(WXSTEDIT_DIR)\include /i $(WX_DIR)\contrib\include $**
  
! vcmsw$(WXLIBPOSTFIX)$(_BUILDDIR_SHARED_SUFFIX)\app_wxluacan_wxluacan.obj: ..\..\wxluacan\src\wxluacan.cpp
  	$(CXX) /c /nologo /TP /Fo$@ $(APP_WXLUACAN_CXXFLAGS) $**
  
! vcmsw$(WXLIBPOSTFIX)$(_BUILDDIR_SHARED_SUFFIX)\app_wxluacan_cancom.obj: ..\..\wxluacan\src\cancom.cpp
  	$(CXX) /c /nologo /TP /Fo$@ $(APP_WXLUACAN_CXXFLAGS) $**
  
! vcmsw$(WXLIBPOSTFIX)$(_BUILDDIR_SHARED_SUFFIX)\app_wxluacan_wxluacan_bind.obj: ..\..\wxluacan\src\wxluacan_bind.cpp
  	$(CXX) /c /nologo /TP /Fo$@ $(APP_WXLUACAN_CXXFLAGS) $**
  
! vcmsw$(WXLIBPOSTFIX)$(_BUILDDIR_SHARED_SUFFIX)\app_wxluacan_cansim.obj: ..\..\wxluacan\src\cansim.cpp
  	$(CXX) /c /nologo /TP /Fo$@ $(APP_WXLUACAN_CXXFLAGS) $**
  
! vcmsw$(WXLIBPOSTFIX)$(_BUILDDIR_SHARED_SUFFIX)\app_wxluacan_canlua.obj: ..\..\wxluacan\src\canlua.cpp
  	$(CXX) /c /nologo /TP /Fo$@ $(APP_WXLUACAN_CXXFLAGS) $**
  

Index: makefile.bcc
===================================================================
RCS file: /cvsroot/wxlua/wxLua/apps/build/msw/makefile.bcc,v
retrieving revision 1.71
retrieving revision 1.72
diff -C2 -d -r1.71 -r1.72
*** makefile.bcc	1 Aug 2007 03:21:22 -0000	1.71
--- makefile.bcc	1 Aug 2007 10:08:22 -0000	1.72
***************
*** 169,174 ****
  	-I$(LUA_DIR)\include $(CPPFLAGS) $(CXXFLAGS)
  APP_WXLUA_OBJECTS =  \
! 	bccmsw$(WXLIBPOSTFIX)$(_BUILDDIR_SHARED_SUFFIX)\app_wxlua_lconsole.obj \
! 	bccmsw$(WXLIBPOSTFIX)$(_BUILDDIR_SHARED_SUFFIX)\app_wxlua_wxlua.obj
  APP_WXLUAEDIT_CXXFLAGS = $(__RUNTIME_LIBS) -I$(BCCDIR)\include \
  	$(____WX_SHARED) $(__WXUNICODE_DEFINE_p) $(__WXDEBUG_DEFINE_p) -D__WXMSW__ \
--- 169,174 ----
  	-I$(LUA_DIR)\include $(CPPFLAGS) $(CXXFLAGS)
  APP_WXLUA_OBJECTS =  \
! 	bccmsw$(WXLIBPOSTFIX)$(_BUILDDIR_SHARED_SUFFIX)\app_wxlua_wxlua.obj \
! 	bccmsw$(WXLIBPOSTFIX)$(_BUILDDIR_SHARED_SUFFIX)\app_wxlua_lconsole.obj
  APP_WXLUAEDIT_CXXFLAGS = $(__RUNTIME_LIBS) -I$(BCCDIR)\include \
  	$(____WX_SHARED) $(__WXUNICODE_DEFINE_p) $(__WXDEBUG_DEFINE_p) -D__WXMSW__ \
***************
*** 187,195 ****
  	$(CXXFLAGS)
  APP_WXLUACAN_OBJECTS =  \
  	bccmsw$(WXLIBPOSTFIX)$(_BUILDDIR_SHARED_SUFFIX)\app_wxluacan_cancom.obj \
! 	bccmsw$(WXLIBPOSTFIX)$(_BUILDDIR_SHARED_SUFFIX)\app_wxluacan_canlua.obj \
  	bccmsw$(WXLIBPOSTFIX)$(_BUILDDIR_SHARED_SUFFIX)\app_wxluacan_cansim.obj \
! 	bccmsw$(WXLIBPOSTFIX)$(_BUILDDIR_SHARED_SUFFIX)\app_wxluacan_wxluacan.obj \
! 	bccmsw$(WXLIBPOSTFIX)$(_BUILDDIR_SHARED_SUFFIX)\app_wxluacan_wxluacan_bind.obj
  APP_WXLUAFREEZE_CXXFLAGS = $(__RUNTIME_LIBS) -I$(BCCDIR)\include \
  	$(____WX_SHARED) $(__WXUNICODE_DEFINE_p) $(__WXDEBUG_DEFINE_p) -D__WXMSW__ \
--- 187,195 ----
  	$(CXXFLAGS)
  APP_WXLUACAN_OBJECTS =  \
+ 	bccmsw$(WXLIBPOSTFIX)$(_BUILDDIR_SHARED_SUFFIX)\app_wxluacan_wxluacan.obj \
  	bccmsw$(WXLIBPOSTFIX)$(_BUILDDIR_SHARED_SUFFIX)\app_wxluacan_cancom.obj \
! 	bccmsw$(WXLIBPOSTFIX)$(_BUILDDIR_SHARED_SUFFIX)\app_wxluacan_wxluacan_bind.obj \
  	bccmsw$(WXLIBPOSTFIX)$(_BUILDDIR_SHARED_SUFFIX)\app_wxluacan_cansim.obj \
! 	bccmsw$(WXLIBPOSTFIX)$(_BUILDDIR_SHARED_SUFFIX)\app_wxluacan_canlua.obj
  APP_WXLUAFREEZE_CXXFLAGS = $(__RUNTIME_LIBS) -I$(BCCDIR)\include \
  	$(____WX_SHARED) $(__WXUNICODE_DEFINE_p) $(__WXDEBUG_DEFINE_p) -D__WXMSW__ \
***************
*** 581,588 ****
  	$(CC) -q -c -P- -o$@ $(APP_LUAC_CFLAGS) $**
  
! bccmsw$(WXLIBPOSTFIX)$(_BUILDDIR_SHARED_SUFFIX)\app_wxlua_lconsole.obj: ..\..\wxlua\src\lconsole.cpp
  	$(CXX) -q -c -P -o$@ $(APP_WXLUA_CXXFLAGS) $**
  
! bccmsw$(WXLIBPOSTFIX)$(_BUILDDIR_SHARED_SUFFIX)\app_wxlua_wxlua.obj: ..\..\wxlua\src\wxlua.cpp
  	$(CXX) -q -c -P -o$@ $(APP_WXLUA_CXXFLAGS) $**
  
--- 581,588 ----
  	$(CC) -q -c -P- -o$@ $(APP_LUAC_CFLAGS) $**
  
! bccmsw$(WXLIBPOSTFIX)$(_BUILDDIR_SHARED_SUFFIX)\app_wxlua_wxlua.obj: ..\..\wxlua\src\wxlua.cpp
  	$(CXX) -q -c -P -o$@ $(APP_WXLUA_CXXFLAGS) $**
  
! bccmsw$(WXLIBPOSTFIX)$(_BUILDDIR_SHARED_SUFFIX)\app_wxlua_lconsole.obj: ..\..\wxlua\src\lconsole.cpp
  	$(CXX) -q -c -P -o$@ $(APP_WXLUA_CXXFLAGS) $**
  
***************
*** 599,615 ****
  	brcc32 -32 -r -fo$@ -i$(BCCDIR)\include  $(____WX_SHARED_2) $(__WXUNICODE_DEFINE_p_1) $(__WXDEBUG_DEFINE_p_1) -d__WXMSW__ -i$(WX_DIR)$(WXLIBPATH)\msw$(WXLIBPOSTFIX) -i$(WX_DIR)\include -i..\..\..\modules -i.\..\..\.. -i$(LUA_DIR)\include -i$(WXSTEDIT_DIR)\include -i$(WX_DIR)\contrib\include $**
  
! bccmsw$(WXLIBPOSTFIX)$(_BUILDDIR_SHARED_SUFFIX)\app_wxluacan_cancom.obj: ..\..\wxluacan\src\cancom.cpp
  	$(CXX) -q -c -P -o$@ $(APP_WXLUACAN_CXXFLAGS) $**
  
! bccmsw$(WXLIBPOSTFIX)$(_BUILDDIR_SHARED_SUFFIX)\app_wxluacan_canlua.obj: ..\..\wxluacan\src\canlua.cpp
  	$(CXX) -q -c -P -o$@ $(APP_WXLUACAN_CXXFLAGS) $**
  
! bccmsw$(WXLIBPOSTFIX)$(_BUILDDIR_SHARED_SUFFIX)\app_wxluacan_cansim.obj: ..\..\wxluacan\src\cansim.cpp
  	$(CXX) -q -c -P -o$@ $(APP_WXLUACAN_CXXFLAGS) $**
  
! bccmsw$(WXLIBPOSTFIX)$(_BUILDDIR_SHARED_SUFFIX)\app_wxluacan_wxluacan.obj: ..\..\wxluacan\src\wxluacan.cpp
  	$(CXX) -q -c -P -o$@ $(APP_WXLUACAN_CXXFLAGS) $**
  
! bccmsw$(WXLIBPOSTFIX)$(_BUILDDIR_SHARED_SUFFIX)\app_wxluacan_wxluacan_bind.obj: ..\..\wxluacan\src\wxluacan_bind.cpp
  	$(CXX) -q -c -P -o$@ $(APP_WXLUACAN_CXXFLAGS) $**
  
--- 599,615 ----
  	brcc32 -32 -r -fo$@ -i$(BCCDIR)\include  $(____WX_SHARED_2) $(__WXUNICODE_DEFINE_p_1) $(__WXDEBUG_DEFINE_p_1) -d__WXMSW__ -i$(WX_DIR)$(WXLIBPATH)\msw$(WXLIBPOSTFIX) -i$(WX_DIR)\include -i..\..\..\modules -i.\..\..\.. -i$(LUA_DIR)\include -i$(WXSTEDIT_DIR)\include -i$(WX_DIR)\contrib\include $**
  
! bccmsw$(WXLIBPOSTFIX)$(_BUILDDIR_SHARED_SUFFIX)\app_wxluacan_wxluacan.obj: ..\..\wxluacan\src\wxluacan.cpp
  	$(CXX) -q -c -P -o$@ $(APP_WXLUACAN_CXXFLAGS) $**
  
! bccmsw$(WXLIBPOSTFIX)$(_BUILDDIR_SHARED_SUFFIX)\app_wxluacan_cancom.obj: ..\..\wxluacan\src\cancom.cpp
  	$(CXX) -q -c -P -o$@ $(APP_WXLUACAN_CXXFLAGS) $**
  
! bccmsw$(WXLIBPOSTFIX)$(_BUILDDIR_SHARED_SUFFIX)\app_wxluacan_wxluacan_bind.obj: ..\..\wxluacan\src\wxluacan_bind.cpp
  	$(CXX) -q -c -P -o$@ $(APP_WXLUACAN_CXXFLAGS) $**
  
! bccmsw$(WXLIBPOSTFIX)$(_BUILDDIR_SHARED_SUFFIX)\app_wxluacan_cansim.obj: ..\..\wxluacan\src\cansim.cpp
  	$(CXX) -q -c -P -o$@ $(APP_WXLUACAN_CXXFLAGS) $**
  
! bccmsw$(WXLIBPOSTFIX)$(_BUILDDIR_SHARED_SUFFIX)\app_wxluacan_canlua.obj: ..\..\wxluacan\src\canlua.cpp
  	$(CXX) -q -c -P -o$@ $(APP_WXLUACAN_CXXFLAGS) $**
  

Index: makefile.wat
===================================================================
RCS file: /cvsroot/wxlua/wxLua/apps/build/msw/makefile.wat,v
retrieving revision 1.72
retrieving revision 1.73
diff -C2 -d -r1.72 -r1.73
*** makefile.wat	1 Aug 2007 03:21:22 -0000	1.72
--- makefile.wat	1 Aug 2007 10:08:22 -0000	1.73
***************
*** 589,594 ****
  	$(CXXFLAGS)
  APP_WXLUA_OBJECTS =  &
! 	watmsw$(WXLIBPOSTFIX)$(_BUILDDIR_SHARED_SUFFIX)\app_wxlua_lconsole.obj &
! 	watmsw$(WXLIBPOSTFIX)$(_BUILDDIR_SHARED_SUFFIX)\app_wxlua_wxlua.obj
  APP_WXLUAEDIT_CXXFLAGS = $(____WX_SHARED) $(__WXUNICODE_DEFINE_p) &
  	$(__WXDEBUG_DEFINE_p) -d__WXMSW__ &
--- 589,594 ----
  	$(CXXFLAGS)
  APP_WXLUA_OBJECTS =  &
! 	watmsw$(WXLIBPOSTFIX)$(_BUILDDIR_SHARED_SUFFIX)\app_wxlua_wxlua.obj &
! 	watmsw$(WXLIBPOSTFIX)$(_BUILDDIR_SHARED_SUFFIX)\app_wxlua_lconsole.obj
  APP_WXLUAEDIT_CXXFLAGS = $(____WX_SHARED) $(__WXUNICODE_DEFINE_p) &
  	$(__WXDEBUG_DEFINE_p) -d__WXMSW__ &
***************
*** 608,616 ****
  	-i=..\..\..\modules\wxbind\setup $(CPPFLAGS) $(CXXFLAGS)
  APP_WXLUACAN_OBJECTS =  &
  	watmsw$(WXLIBPOSTFIX)$(_BUILDDIR_SHARED_SUFFIX)\app_wxluacan_cancom.obj &
! 	watmsw$(WXLIBPOSTFIX)$(_BUILDDIR_SHARED_SUFFIX)\app_wxluacan_canlua.obj &
  	watmsw$(WXLIBPOSTFIX)$(_BUILDDIR_SHARED_SUFFIX)\app_wxluacan_cansim.obj &
! 	watmsw$(WXLIBPOSTFIX)$(_BUILDDIR_SHARED_SUFFIX)\app_wxluacan_wxluacan.obj &
! 	watmsw$(WXLIBPOSTFIX)$(_BUILDDIR_SHARED_SUFFIX)\app_wxluacan_wxluacan_bind.obj
  APP_WXLUAFREEZE_CXXFLAGS = $(____WX_SHARED) $(__WXUNICODE_DEFINE_p) &
  	$(__WXDEBUG_DEFINE_p) -d__WXMSW__ &
--- 608,616 ----
  	-i=..\..\..\modules\wxbind\setup $(CPPFLAGS) $(CXXFLAGS)
  APP_WXLUACAN_OBJECTS =  &
+ 	watmsw$(WXLIBPOSTFIX)$(_BUILDDIR_SHARED_SUFFIX)\app_wxluacan_wxluacan.obj &
  	watmsw$(WXLIBPOSTFIX)$(_BUILDDIR_SHARED_SUFFIX)\app_wxluacan_cancom.obj &
! 	watmsw$(WXLIBPOSTFIX)$(_BUILDDIR_SHARED_SUFFIX)\app_wxluacan_wxluacan_bind.obj &
  	watmsw$(WXLIBPOSTFIX)$(_BUILDDIR_SHARED_SUFFIX)\app_wxluacan_cansim.obj &
! 	watmsw$(WXLIBPOSTFIX)$(_BUILDDIR_SHARED_SUFFIX)\app_wxluacan_canlua.obj
  APP_WXLUAFREEZE_CXXFLAGS = $(____WX_SHARED) $(__WXUNICODE_DEFINE_p) &
  	$(__WXDEBUG_DEFINE_p) -d__WXMSW__ &
***************
*** 771,778 ****
  	$(CC) -bt=nt -zq -fo=$^@ $(APP_LUAC_CFLAGS) $<
  
! watmsw$(WXLIBPOSTFIX)$(_BUILDDIR_SHARED_SUFFIX)\app_wxlua_lconsole.obj :  .AUTODEPEND ..\..\wxlua\src\lconsole.cpp
  	$(CXX) -bt=nt -zq -fo=$^@ $(APP_WXLUA_CXXFLAGS) $<
  
! watmsw$(WXLIBPOSTFIX)$(_BUILDDIR_SHARED_SUFFIX)\app_wxlua_wxlua.obj :  .AUTODEPEND ..\..\wxlua\src\wxlua.cpp
  	$(CXX) -bt=nt -zq -fo=$^@ $(APP_WXLUA_CXXFLAGS) $<
  
--- 771,778 ----
  	$(CC) -bt=nt -zq -fo=$^@ $(APP_LUAC_CFLAGS) $<
  
! watmsw$(WXLIBPOSTFIX)$(_BUILDDIR_SHARED_SUFFIX)\app_wxlua_wxlua.obj :  .AUTODEPEND ..\..\wxlua\src\wxlua.cpp
  	$(CXX) -bt=nt -zq -fo=$^@ $(APP_WXLUA_CXXFLAGS) $<
  
! watmsw$(WXLIBPOSTFIX)$(_BUILDDIR_SHARED_SUFFIX)\app_wxlua_lconsole.obj :  .AUTODEPEND ..\..\wxlua\src\lconsole.cpp
  	$(CXX) -bt=nt -zq -fo=$^@ $(APP_WXLUA_CXXFLAGS) $<
  
***************
*** 789,805 ****
  	wrc -q -ad -bt=nt -r -fo=$^@  $(____WX_SHARED) $(__WXUNICODE_DEFINE_p) $(__WXDEBUG_DEFINE_p) -d__WXMSW__ -i=$(WX_DIR)$(WXLIBPATH)\msw$(WXLIBPOSTFIX) -i=$(WX_DIR)\include -i=..\..\..\modules -i=.\..\..\.. -i=$(LUA_DIR)\include -i=$(WXSTEDIT_DIR)\include -i=$(WX_DIR)\contrib\include $<
  
! watmsw$(WXLIBPOSTFIX)$(_BUILDDIR_SHARED_SUFFIX)\app_wxluacan_cancom.obj :  .AUTODEPEND ..\..\wxluacan\src\cancom.cpp
  	$(CXX) -bt=nt -zq -fo=$^@ $(APP_WXLUACAN_CXXFLAGS) $<
  
! watmsw$(WXLIBPOSTFIX)$(_BUILDDIR_SHARED_SUFFIX)\app_wxluacan_canlua.obj :  .AUTODEPEND ..\..\wxluacan\src\canlua.cpp
  	$(CXX) -bt=nt -zq -fo=$^@ $(APP_WXLUACAN_CXXFLAGS) $<
  
! watmsw$(WXLIBPOSTFIX)$(_BUILDDIR_SHARED_SUFFIX)\app_wxluacan_cansim.obj :  .AUTODEPEND ..\..\wxluacan\src\cansim.cpp
  	$(CXX) -bt=nt -zq -fo=$^@ $(APP_WXLUACAN_CXXFLAGS) $<
  
! watmsw$(WXLIBPOSTFIX)$(_BUILDDIR_SHARED_SUFFIX)\app_wxluacan_wxluacan.obj :  .AUTODEPEND ..\..\wxluacan\src\wxluacan.cpp
  	$(CXX) -bt=nt -zq -fo=$^@ $(APP_WXLUACAN_CXXFLAGS) $<
  
! watmsw$(WXLIBPOSTFIX)$(_BUILDDIR_SHARED_SUFFIX)\app_wxluacan_wxluacan_bind.obj :  .AUTODEPEND ..\..\wxluacan\src\wxluacan_bind.cpp
  	$(CXX) -bt=nt -zq -fo=$^@ $(APP_WXLUACAN_CXXFLAGS) $<
  
--- 789,805 ----
  	wrc -q -ad -bt=nt -r -fo=$^@  $(____WX_SHARED) $(__WXUNICODE_DEFINE_p) $(__WXDEBUG_DEFINE_p) -d__WXMSW__ -i=$(WX_DIR)$(WXLIBPATH)\msw$(WXLIBPOSTFIX) -i=$(WX_DIR)\include -i=..\..\..\modules -i=.\..\..\.. -i=$(LUA_DIR)\include -i=$(WXSTEDIT_DIR)\include -i=$(WX_DIR)\contrib\include $<
  
! watmsw$(WXLIBPOSTFIX)$(_BUILDDIR_SHARED_SUFFIX)\app_wxluacan_wxluacan.obj :  .AUTODEPEND ..\..\wxluacan\src\wxluacan.cpp
  	$(CXX) -bt=nt -zq -fo=$^@ $(APP_WXLUACAN_CXXFLAGS) $<
  
! watmsw$(WXLIBPOSTFIX)$(_BUILDDIR_SHARED_SUFFIX)\app_wxluacan_cancom.obj :  .AUTODEPEND ..\..\wxluacan\src\cancom.cpp
  	$(CXX) -bt=nt -zq -fo=$^@ $(APP_WXLUACAN_CXXFLAGS) $<
  
! watmsw$(WXLIBPOSTFIX)$(_BUILDDIR_SHARED_SUFFIX)\app_wxluacan_wxluacan_bind.obj :  .AUTODEPEND ..\..\wxluacan\src\wxluacan_bind.cpp
  	$(CXX) -bt=nt -zq -fo=$^@ $(APP_WXLUACAN_CXXFLAGS) $<
  
! watmsw$(WXLIBPOSTFIX)$(_BUILDDIR_SHARED_SUFFIX)\app_wxluacan_cansim.obj :  .AUTODEPEND ..\..\wxluacan\src\cansim.cpp
  	$(CXX) -bt=nt -zq -fo=$^@ $(APP_WXLUACAN_CXXFLAGS) $<
  
! watmsw$(WXLIBPOSTFIX)$(_BUILDDIR_SHARED_SUFFIX)\app_wxluacan_canlua.obj :  .AUTODEPEND ..\..\wxluacan\src\canlua.cpp
  	$(CXX) -bt=nt -zq -fo=$^@ $(APP_WXLUACAN_CXXFLAGS) $<
  

Index: makefile.gcc
===================================================================
RCS file: /cvsroot/wxlua/wxLua/apps/build/msw/makefile.gcc,v
retrieving revision 1.71
retrieving revision 1.72
diff -C2 -d -r1.71 -r1.72
*** makefile.gcc	1 Aug 2007 03:21:22 -0000	1.71
--- makefile.gcc	1 Aug 2007 10:08:22 -0000	1.72
***************
*** 109,114 ****
  	-I$(LUA_DIR)\include $(CPPFLAGS) $(CXXFLAGS)
  APP_WXLUA_OBJECTS =  \
- 	gccmsw$(WXLIBPOSTFIX)$(_BUILDDIR_SHARED_SUFFIX)\app_wxlua_lconsole.o \
  	gccmsw$(WXLIBPOSTFIX)$(_BUILDDIR_SHARED_SUFFIX)\app_wxlua_wxlua.o \
  	gccmsw$(WXLIBPOSTFIX)$(_BUILDDIR_SHARED_SUFFIX)\app_wxlua_wxlua_rc.o
  APP_WXLUAEDIT_CXXFLAGS = -DHAVE_W32API_H $(____WX_SHARED) \
--- 109,114 ----
  	-I$(LUA_DIR)\include $(CPPFLAGS) $(CXXFLAGS)
  APP_WXLUA_OBJECTS =  \
  	gccmsw$(WXLIBPOSTFIX)$(_BUILDDIR_SHARED_SUFFIX)\app_wxlua_wxlua.o \
+ 	gccmsw$(WXLIBPOSTFIX)$(_BUILDDIR_SHARED_SUFFIX)\app_wxlua_lconsole.o \
  	gccmsw$(WXLIBPOSTFIX)$(_BUILDDIR_SHARED_SUFFIX)\app_wxlua_wxlua_rc.o
  APP_WXLUAEDIT_CXXFLAGS = -DHAVE_W32API_H $(____WX_SHARED) \
***************
*** 129,137 ****
  	$(CXXFLAGS)
  APP_WXLUACAN_OBJECTS =  \
- 	gccmsw$(WXLIBPOSTFIX)$(_BUILDDIR_SHARED_SUFFIX)\app_wxluacan_cancom.o \
- 	gccmsw$(WXLIBPOSTFIX)$(_BUILDDIR_SHARED_SUFFIX)\app_wxluacan_canlua.o \
- 	gccmsw$(WXLIBPOSTFIX)$(_BUILDDIR_SHARED_SUFFIX)\app_wxluacan_cansim.o \
  	gccmsw$(WXLIBPOSTFIX)$(_BUILDDIR_SHARED_SUFFIX)\app_wxluacan_wxluacan.o \
  	gccmsw$(WXLIBPOSTFIX)$(_BUILDDIR_SHARED_SUFFIX)\app_wxluacan_wxluacan_bind.o \
  	gccmsw$(WXLIBPOSTFIX)$(_BUILDDIR_SHARED_SUFFIX)\app_wxluacan_cansim_rc.o
  APP_WXLUAFREEZE_CXXFLAGS = -DHAVE_W32API_H $(____WX_SHARED) \
--- 129,137 ----
  	$(CXXFLAGS)
  APP_WXLUACAN_OBJECTS =  \
  	gccmsw$(WXLIBPOSTFIX)$(_BUILDDIR_SHARED_SUFFIX)\app_wxluacan_wxluacan.o \
+ 	gccmsw$(WXLIBPOSTFIX)$(_BUILDDIR_SHARED_SUFFIX)\app_wxluacan_cancom.o \
  	gccmsw$(WXLIBPOSTFIX)$(_BUILDDIR_SHARED_SUFFIX)\app_wxluacan_wxluacan_bind.o \
+ 	gccmsw$(WXLIBPOSTFIX)$(_BUILDDIR_SHARED_SUFFIX)\app_wxluacan_cansim.o \
+ 	gccmsw$(WXLIBPOSTFIX)$(_BUILDDIR_SHARED_SUFFIX)\app_wxluacan_canlua.o \
  	gccmsw$(WXLIBPOSTFIX)$(_BUILDDIR_SHARED_SUFFIX)\app_wxluacan_cansim_rc.o
  APP_WXLUAFREEZE_CXXFLAGS = -DHAVE_W32API_H $(____WX_SHARED) \
***************
*** 658,665 ****
  	$(CC) -c -o $@ $(APP_LUAC_CFLAGS) $(CPPDEPS) $<
  
! gccmsw$(WXLIBPOSTFIX)$(_BUILDDIR_SHARED_SUFFIX)\app_wxlua_lconsole.o: ../../wxlua/src/lconsole.cpp
  	$(CXX) -c -o $@ $(APP_WXLUA_CXXFLAGS) $(CPPDEPS) $<
  
! gccmsw$(WXLIBPOSTFIX)$(_BUILDDIR_SHARED_SUFFIX)\app_wxlua_wxlua.o: ../../wxlua/src/wxlua.cpp
  	$(CXX) -c -o $@ $(APP_WXLUA_CXXFLAGS) $(CPPDEPS) $<
  
--- 658,665 ----
  	$(CC) -c -o $@ $(APP_LUAC_CFLAGS) $(CPPDEPS) $<
  
! gccmsw$(WXLIBPOSTFIX)$(_BUILDDIR_SHARED_SUFFIX)\app_wxlua_wxlua.o: ../../wxlua/src/wxlua.cpp
  	$(CXX) -c -o $@ $(APP_WXLUA_CXXFLAGS) $(CPPDEPS) $<
  
! gccmsw$(WXLIBPOSTFIX)$(_BUILDDIR_SHARED_SUFFIX)\app_wxlua_lconsole.o: ../../wxlua/src/lconsole.cpp
  	$(CXX) -c -o $@ $(APP_WXLUA_CXXFLAGS) $(CPPDEPS) $<
  
***************
*** 676,692 ****
  	windres --use-temp-file -i$< -o$@  --define HAVE_W32API_H $(____WX_SHARED_2) $(__WXUNICODE_DEFINE_p_1) $(__WXDEBUG_DEFINE_p_1) --define __WXMSW__ --include-dir $(WX_DIR)$(WXLIBPATH)\msw$(WXLIBPOSTFIX) --include-dir $(WX_DIR)/include --include-dir ../../../modules --include-dir ./../../.. --include-dir $(LUA_DIR)/include --include-dir $(WXSTEDIT_DIR)/include --include-dir $(WX_DIR)/contrib/include
  
! gccmsw$(WXLIBPOSTFIX)$(_BUILDDIR_SHARED_SUFFIX)\app_wxluacan_cancom.o: ../../wxluacan/src/cancom.cpp
  	$(CXX) -c -o $@ $(APP_WXLUACAN_CXXFLAGS) $(CPPDEPS) $<
  
! gccmsw$(WXLIBPOSTFIX)$(_BUILDDIR_SHARED_SUFFIX)\app_wxluacan_canlua.o: ../../wxluacan/src/canlua.cpp
  	$(CXX) -c -o $@ $(APP_WXLUACAN_CXXFLAGS) $(CPPDEPS) $<
  
! gccmsw$(WXLIBPOSTFIX)$(_BUILDDIR_SHARED_SUFFIX)\app_wxluacan_cansim.o: ../../wxluacan/src/cansim.cpp
  	$(CXX) -c -o $@ $(APP_WXLUACAN_CXXFLAGS) $(CPPDEPS) $<
  
! gccmsw$(WXLIBPOSTFIX)$(_BUILDDIR_SHARED_SUFFIX)\app_wxluacan_wxluacan.o: ../../wxluacan/src/wxluacan.cpp
  	$(CXX) -c -o $@ $(APP_WXLUACAN_CXXFLAGS) $(CPPDEPS) $<
  
! gccmsw$(WXLIBPOSTFIX)$(_BUILDDIR_SHARED_SUFFIX)\app_wxluacan_wxluacan_bind.o: ../../wxluacan/src/wxluacan_bind.cpp
  	$(CXX) -c -o $@ $(APP_WXLUACAN_CXXFLAGS) $(CPPDEPS) $<
  
--- 676,692 ----
  	windres --use-temp-file -i$< -o$@  --define HAVE_W32API_H $(____WX_SHARED_2) $(__WXUNICODE_DEFINE_p_1) $(__WXDEBUG_DEFINE_p_1) --define __WXMSW__ --include-dir $(WX_DIR)$(WXLIBPATH)\msw$(WXLIBPOSTFIX) --include-dir $(WX_DIR)/include --include-dir ../../../modules --include-dir ./../../.. --include-dir $(LUA_DIR)/include --include-dir $(WXSTEDIT_DIR)/include --include-dir $(WX_DIR)/contrib/include
  
! gccmsw$(WXLIBPOSTFIX)$(_BUILDDIR_SHARED_SUFFIX)\app_wxluacan_wxluacan.o: ../../wxluacan/src/wxluacan.cpp
  	$(CXX) -c -o $@ $(APP_WXLUACAN_CXXFLAGS) $(CPPDEPS) $<
  
! gccmsw$(WXLIBPOSTFIX)$(_BUILDDIR_SHARED_SUFFIX)\app_wxluacan_cancom.o: ../../wxluacan/src/cancom.cpp
  	$(CXX) -c -o $@ $(APP_WXLUACAN_CXXFLAGS) $(CPPDEPS) $<
  
! gccmsw$(WXLIBPOSTFIX)$(_BUILDDIR_SHARED_SUFFIX)\app_wxluacan_wxluacan_bind.o: ../../wxluacan/src/wxluacan_bind.cpp
  	$(CXX) -c -o $@ $(APP_WXLUACAN_CXXFLAGS) $(CPPDEPS) $<
  
! gccmsw$(WXLIBPOSTFIX)$(_BUILDDIR_SHARED_SUFFIX)\app_wxluacan_cansim.o: ../../wxluacan/src/cansim.cpp
  	$(CXX) -c -o $@ $(APP_WXLUACAN_CXXFLAGS) $(CPPDEPS) $<
  
! gccmsw$(WXLIBPOSTFIX)$(_BUILDDIR_SHARED_SUFFIX)\app_wxluacan_canlua.o: ../../wxluacan/src/canlua.cpp
  	$(CXX) -c -o $@ $(APP_WXLUACAN_CXXFLAGS) $(CPPDEPS) $<