wxlua-commit — CVS commits of wxLua

[Wxlua-commit] wxLua/samples dialog.wx.lua, 1.13, 1.14 scribble.wx.lua, 1.22, 1.23 validator.wx.lua, 1.4, 1.5

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

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

Modified Files:
	dialog.wx.lua scribble.wx.lua validator.wx.lua 
Log Message:
Add parameter to wxLuaState::RemoveTrackedObject to select how we untrack it
Fixes removing derived methods for the %ungc binding tag


Index: validator.wx.lua
===================================================================
RCS file: /cvsroot/wxlua/wxLua/samples/validator.wx.lua,v
retrieving revision 1.4
retrieving revision 1.5
diff -C2 -d -r1.4 -r1.5
*** validator.wx.lua	16 Jul 2007 19:35:32 -0000	1.4
--- validator.wx.lua	22 Jul 2007 04:38:31 -0000	1.5
***************
*** 148,158 ****
  
                  local s = ""
!                 s = s.."wxCheckBox  : '"..tostring(checkObj:GetObject()).."', Initial value : '"..tostring(check_val).."'\n\n"
!                 s = s.."wxComboBox  : '"..tostring(comboObj:GetObject()).."', Initial value : '"..tostring(combo_val).."'\n\n"
!                 s = s.."wxTextCtrl  : '"..tostring(textObj:GetObject()).."', Initial value : '"..tostring(text_val).."'\n\n"
!                 s = s.."wxScrollBar : '"..tostring(scrollObj:GetObject()).."', Initial value : '"..tostring(scroll_val).."'\n\n"
!                 s = s.."wxCheckListBox : '"..table.concat(checklObj:GetObject(), ", ").."', Initial value : '"..table.concat(checkl_val, ", ").."'\n\n"
  
!                 s = s.."wxTextCtrl alpha chars only: '"..tostring(textAlphaObj:GetObject()).."', Initial value : '"..tostring(text_alpha_val).."'\n\n"
  
                  frameText:SetValue(s)
--- 148,158 ----
  
                  local s = ""
!                 s = s.."wxCheckBox  : '"..tostring(checkObj:GetObject()).."'\nInitial value : '"..tostring(check_val).."'\n\n"
!                 s = s.."wxComboBox  : '"..tostring(comboObj:GetObject()).."'\nInitial value : '"..tostring(combo_val).."'\n\n"
!                 s = s.."wxTextCtrl  : '"..tostring(textObj:GetObject()).."'\nInitial value : '"..tostring(text_val).."'\n\n"
!                 s = s.."wxScrollBar : '"..tostring(scrollObj:GetObject()).."'\nInitial value : '"..tostring(scroll_val).."'\n\n"
!                 s = s.."wxCheckListBox : '"..table.concat(checklObj:GetObject(), ", ").."'\nInitial value : '"..table.concat(checkl_val, ", ").."'\n\n"
  
!                 s = s.."wxTextCtrl alpha chars only: '"..tostring(textAlphaObj:GetObject()).."'\nInitial value : '"..tostring(text_alpha_val).."'\n\n"
  
                  frameText:SetValue(s)

Index: dialog.wx.lua
===================================================================
RCS file: /cvsroot/wxlua/wxLua/samples/dialog.wx.lua,v
retrieving revision 1.13
retrieving revision 1.14
diff -C2 -d -r1.13 -r1.14
*** dialog.wx.lua	16 Jul 2007 19:35:31 -0000	1.13
--- dialog.wx.lua	22 Jul 2007 04:38:30 -0000	1.14
***************
*** 21,25 ****
  ID_CLOSE_BUTTON        = 10
  
! -- Create the dialog
  dialog = wx.wxDialog(wx.NULL, wx.wxID_ANY, "wxLua Temperature Converter",
                       wx.wxDefaultPosition, wx.wxDefaultSize)
--- 21,28 ----
  ID_CLOSE_BUTTON        = 10
  
! ID__MAX                = 11 -- max of our window ids
! 
! -- Create the dialog, there's no reason why we couldn't use a wxFrame and
! -- a frame would probably be a better choice.
  dialog = wx.wxDialog(wx.NULL, wx.wxID_ANY, "wxLua Temperature Converter",
                       wx.wxDefaultPosition, wx.wxDefaultSize)
***************
*** 42,46 ****
  function AddConverterControl(name_string, button_text, textCtrlID, buttonID)
      local staticText = wx.wxStaticText( panel, wx.wxID_ANY, name_string)
!     local textCtrl   = wx.wxTextCtrl( panel, textCtrlID, "000000.00000", wx.wxDefaultPosition, wx.wxSize(-1,-1), wx.wxTE_PROCESS_ENTER )
      local button     = wx.wxButton( panel, buttonID, button_text)
      flexGridSizer:Add( staticText, 0, wx.wxALIGN_CENTER_VERTICAL+wx.wxALL, 5 )
--- 45,49 ----
  function AddConverterControl(name_string, button_text, textCtrlID, buttonID)
      local staticText = wx.wxStaticText( panel, wx.wxID_ANY, name_string)
!     local textCtrl   = wx.wxTextCtrl( panel, textCtrlID, "000000.00000", wx.wxDefaultPosition, wx.wxDefaultSize, wx.wxTE_PROCESS_ENTER )
      local button     = wx.wxButton( panel, buttonID, button_text)
      flexGridSizer:Add( staticText, 0, wx.wxALIGN_CENTER_VERTICAL+wx.wxALL, 5 )
***************
*** 117,120 ****
--- 120,130 ----
  dialog:Connect(wx.wxID_ANY, wx.wxEVT_COMMAND_BUTTON_CLICKED,
      function(event)
+         -- NOTE: A wxID_CANCEL event is sent when the close button on the
+         -- dialog is pressed.
+         if event:GetId() >= ID__MAX then
+             event:Skip()
+             return
+         end
+ 
          -- We know that the textctrl window ids are +1 from the button ids
          local T = tonumber(dialog:FindWindow(event:GetId()+1):DynamicCast("wxTextCtrl"):GetValue())

Index: scribble.wx.lua
===================================================================
RCS file: /cvsroot/wxlua/wxLua/samples/scribble.wx.lua,v
retrieving revision 1.22
retrieving revision 1.23
diff -C2 -d -r1.22 -r1.23
*** scribble.wx.lua	16 Jul 2007 19:35:32 -0000	1.22
--- scribble.wx.lua	22 Jul 2007 04:38:30 -0000	1.23
***************
*** 130,133 ****
--- 130,142 ----
  end
  
+ function GetBitmap()
+     local w, h = panel:GetClientSizeWH()
+     local bmp = wx.wxBitmap(w, h)
+     lastDrawn = 0 -- force redrawing all points
+     DrawBitmap(bmp)
+     lastDrawn = 0 -- force redrawing all points
+     return bmp
+ end
+ 
  -- ---------------------------------------------------------------------------
  -- Mouse functions
***************
*** 317,320 ****
--- 326,331 ----
      --editMenu:Append(ID_PENSTYLE,  "Set &Style\tCtrl+Y", "Set style of the pen to draw with")
      editMenu:AppendSeparator()
+     editMenu:Append(wx.wxID_COPY,  "Copy to clipboard\tCtrl-C", "Copy current image to the clipboard")
+     editMenu:AppendSeparator()
      editMenu:Append(wx.wxID_UNDO,  "&Undo\tCtrl-Z", "Undo last drawn segment")
  
***************
*** 338,341 ****
--- 349,354 ----
      toolBar:AddTool(wx.wxID_SAVEAS, "Save as", wx.wxArtProvider.GetBitmap(wx.wxART_NEW_DIR, wx.wxART_MENU, toolBmpSize),     "Save the current scribble to a new file")
      toolBar:AddSeparator()
+     toolBar:AddTool(wx.wxID_COPY, "Copy", wx.wxArtProvider.GetBitmap(wx.wxART_COPY, wx.wxART_MENU, toolBmpSize), "Copy image to clipboard")
+     toolBar:AddSeparator()
      toolBar:AddTool(wx.wxID_UNDO, "Undo", wx.wxArtProvider.GetBitmap(wx.wxART_UNDO, wx.wxART_MENU, toolBmpSize), "Undo last line drawn")
      toolBar:AddSeparator()
***************
*** 510,519 ****
                                         wx.wxSAVE + wx.wxOVERWRITE_PROMPT)
                  if fileDialog:ShowModal() == wx.wxID_OK then
!                     local w, h = panel:GetClientSizeWH()
!                     local bmp = wx.wxBitmap(w, h)
!                     lastDrawn = 0 -- force redrawing all points
!                     DrawBitmap(bmp)
!                     lastDrawn = 0 -- force redrawing all points
! 
                      local img = bmp:ConvertToImage()
                      if not img:SaveFile(fileDialog:GetPath()) then
--- 523,527 ----
                                         wx.wxSAVE + wx.wxOVERWRITE_PROMPT)
                  if fileDialog:ShowModal() == wx.wxID_OK then
!                     local bmp = GetBitmap()
                      local img = bmp:ConvertToImage()
                      if not img:SaveFile(fileDialog:GetPath()) then
***************
*** 578,581 ****
--- 586,601 ----
              end )
  
+     frame:Connect(wx.wxID_COPY, wx.wxEVT_COMMAND_MENU_SELECTED,
+             function (event)
+                 local clipBoard = wx.wxClipboard.Get()
+                 if clipBoard and clipBoard:Open() then
+                     local bmp = GetBitmap()
+                     clipBoard:SetData(wx.wxBitmapDataObject(bmp))
+                     bmp:delete()
+ 
+                     clipBoard:Close()
+                 end
+             end)
+ 
      frame:Connect(wx.wxID_UNDO, wx.wxEVT_COMMAND_MENU_SELECTED,
              function (event)

[Wxlua-commit] wxLua/modules/wxlua/src wxlbind.cpp, 1.85, 1.86 wxlstate.cpp, 1.122, 1.123 wxlua.cpp, 1.2, 1.3

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

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

Modified Files:
	wxlbind.cpp wxlstate.cpp wxlua.cpp 
Log Message:
Add parameter to wxLuaState::RemoveTrackedObject to select how we untrack it
Fixes removing derived methods for the %ungc binding tag


Index: wxlua.cpp
===================================================================
RCS file: /cvsroot/wxlua/wxLua/modules/wxlua/src/wxlua.cpp,v
retrieving revision 1.2
retrieving revision 1.3
diff -C2 -d -r1.2 -r1.3
*** wxlua.cpp	14 Jun 2007 23:59:48 -0000	1.2
--- wxlua.cpp	22 Jul 2007 04:38:30 -0000	1.3
***************
*** 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))
      {
          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_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))
      {
          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);

Index: wxlstate.cpp
===================================================================
RCS file: /cvsroot/wxlua/wxLua/modules/wxlua/src/wxlstate.cpp,v
retrieving revision 1.122
retrieving revision 1.123
diff -C2 -d -r1.122 -r1.123
*** wxlstate.cpp	19 Jul 2007 03:09:46 -0000	1.122
--- wxlstate.cpp	22 Jul 2007 04:38:29 -0000	1.123
***************
*** 398,401 ****
--- 398,411 ----
  }
  
+ void LUACALL wxlua_tuntrackuserdata(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_pushnil(L);      // t["lightuserdata ptr"] = nil to remove it
+     lua_rawset(L, -3);
+     lua_pop(L, 1);       // pop objects table
+ }
+ 
  int LUACALL wxlua_ttag(lua_State *L, int stack_idx)
  {
***************
*** 2249,2253 ****
  }
  
! bool wxLuaState::RemoveTrackedObject(void *pObject, bool fDelete)
  {
      wxCHECK_MSG(Ok() && pObject, false, wxT("Invalid wxLuaState or object"));
--- 2259,2263 ----
  }
  
! bool wxLuaState::RemoveTrackedObject(void *pObject, int flags)
  {
      wxCHECK_MSG(Ok() && pObject, false, wxT("Invalid wxLuaState or object"));
***************
*** 2256,2268 ****
  
      // No derived methods anymore
!     wxlua_removederivedmethod(L, pObject);
  
!     // Nor are we tracking it within Lua
!     wxlua_pushkey_wxLuaObjects(L);
!     lua_rawget(L, LUA_REGISTRYINDEX); // pop key, push result (the object table)
!     lua_pushlightuserdata(L, (void*)pObject);
!     lua_pushnil(L);      // t["lightuserdata ptr"] = nil to remove it
!     lua_rawset(L, -3);
!     lua_pop(L, 1);
  
      wxLongToLongHashMap::iterator it = M_WXLSTATEDATA->m_wxlStateData->m_trackedObjects.find((long) pObject);
--- 2266,2275 ----
  
      // No derived methods anymore
!     if (WXLUA_HASBIT(flags, CLEAR_DERIVED_METHODS))
!         wxlua_removederivedmethod(L, pObject);
  
!     // Nor are we tracking it within the Lua reg table
!     if (WXLUA_HASBIT(flags, CLEAR_LUA_TRACKED))
!         wxlua_tuntrackuserdata(L, pObject);
  
      wxLongToLongHashMap::iterator it = M_WXLSTATEDATA->m_wxlStateData->m_trackedObjects.find((long) pObject);
***************
*** 2274,2278 ****
          // always delete the object for the case where it's encapsulated
          wxObject *pDeleteObject = (wxObject*)it->second;
!         if (fDelete && (pDeleteObject != NULL))
              delete pDeleteObject;
  
--- 2281,2285 ----
          // always delete the object for the case where it's encapsulated
          wxObject *pDeleteObject = (wxObject*)it->second;
!         if (WXLUA_HASBIT(flags, DELETE_OBJECT) && (pDeleteObject != NULL))
              delete pDeleteObject;
  

Index: wxlbind.cpp
===================================================================
RCS file: /cvsroot/wxlua/wxLua/modules/wxlua/src/wxlbind.cpp,v
retrieving revision 1.85
retrieving revision 1.86
diff -C2 -d -r1.85 -r1.86
*** wxlbind.cpp	19 Jul 2007 03:09:46 -0000	1.85
--- wxlbind.cpp	22 Jul 2007 04:38:29 -0000	1.86
***************
*** 255,259 ****
  
          // clean up the rest of this, this won't error if the key doesn't exist
!         wxlState.RemoveTrackedObject(key, true);
      }
  
--- 255,259 ----
  
          // 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);
      }
  

[Wxlua-commit] wxLua/modules/wxlua/include wxldefs.h, 1.29, 1.30 wxlstate.h, 1.86, 1.87 wxlua_bind.h, 1.3, 1.4

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

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

Modified Files:
	wxldefs.h wxlstate.h wxlua_bind.h 
Log Message:
Add parameter to wxLuaState::RemoveTrackedObject to select how we untrack it
Fixes removing derived methods for the %ungc binding tag


Index: wxldefs.h
===================================================================
RCS file: /cvsroot/wxlua/wxLua/modules/wxlua/include/wxldefs.h,v
retrieving revision 1.29
retrieving revision 1.30
diff -C2 -d -r1.29 -r1.30
*** wxldefs.h	16 Jul 2007 19:35:30 -0000	1.29
--- wxldefs.h	22 Jul 2007 04:38:29 -0000	1.30
***************
*** 67,71 ****
  //-----------------------------------------------------------------------------
  
! #define WXLUA_BINDING_VERSION 15
  
  // ----------------------------------------------------------------------------
--- 67,71 ----
  //-----------------------------------------------------------------------------
  
! #define WXLUA_BINDING_VERSION 16
  
  // ----------------------------------------------------------------------------

Index: wxlstate.h
===================================================================
RCS file: /cvsroot/wxlua/wxLua/modules/wxlua/include/wxlstate.h,v
retrieving revision 1.86
retrieving revision 1.87
diff -C2 -d -r1.86 -r1.87
*** wxlstate.h	19 Jul 2007 03:09:46 -0000	1.86
--- wxlstate.h	22 Jul 2007 04:38:29 -0000	1.87
***************
*** 170,175 ****
  // Push the object u onto the top of the stack wrapped in a newuserdata
  //   with it's metatable set to the table from tget(tag). Returns true if the
! //   tag is known and the metatable was set.
  WXDLLIMPEXP_WXLUA bool LUACALL wxlua_tpushusertag(lua_State* L, const void* u, int tag, bool track);
  // 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"
--- 170,182 ----
  // Push the object u onto the top of the stack wrapped in a newuserdata
  //   with it's metatable set to the table from tget(tag). Returns true if the
! //   tag is known and the metatable was set. If track=true then push the
! //   object as a lightuser data key into the wxlua_pushkey_wxLuaObjects table of
! //   the Lua registry so that if we need to push it again we just push the full
! //   userdata value.
  WXDLLIMPEXP_WXLUA bool LUACALL wxlua_tpushusertag(lua_State* L, const void* u, int tag, bool track);
+ // If an object was pushed into Lua using wxlua_tpushusertag with track=true
+ //   then this function will remove the object from being tracked in the
+ //   wxlua_pushkey_wxLuaObjects Lua registry table.
+ WXDLLIMPEXP_WXLUA void LUACALL wxlua_tuntrackuserdata(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"
***************
*** 612,615 ****
--- 619,630 ----
      // memory tracking functions (internal use)
  
+     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
+     };
+ 
      // Track this object and delete it when lua calls the gc method for it
      void AddTrackedObject(wxObject *pObject);
***************
*** 618,623 ****
      //   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 if fDelete, delete it too.
!     bool RemoveTrackedObject(void *pObject, bool fDelete = true);
      // Is this object currently tracked?
      bool IsTrackedObject(void *pObject) const;
--- 633,639 ----
      //   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);
      // Is this object currently tracked?
      bool IsTrackedObject(void *pObject) const;

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

[Wxlua-commit] wxLua/apps/wxluaedit/src wxluaedit.cpp,1.37,1.38

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

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

Modified Files:
	wxluaedit.cpp 
Log Message:
Use wxlua.wxLUA_VERSION_STRING for dialog


Index: wxluaedit.cpp
===================================================================
RCS file: /cvsroot/wxlua/wxLua/apps/wxluaedit/src/wxluaedit.cpp,v
retrieving revision 1.37
retrieving revision 1.38
diff -C2 -d -r1.37 -r1.38
*** wxluaedit.cpp	16 Jul 2007 19:34:13 -0000	1.37
--- wxluaedit.cpp	20 Jul 2007 01:39:05 -0000	1.38
***************
*** 500,504 ****
  {
      // since the dialog is modal, it's ok that the interpreter is created on the stack
!     wxLuaState wxlState(NULL, wxID_ANY);
  
      // Create a script to run
--- 500,504 ----
  {
      // since the dialog is modal, it's ok that the interpreter is created on the stack
!     wxLuaState wxlState(this, wxID_ANY);
  
      // Create a script to run
***************
*** 508,512 ****
  
      wxString script;
!     script += wxT("local msg = \"Welcome to wxLuaEditor using \"..wx.wxLUA_VERSION_STRING..\"\\n\"");
      script += wxT("msg = msg..\"and compiled with \"..wx.wxVERSION_STRING..\"\\n\"");
      script += wxT("msg = msg..\"Written by John Labenski\\n\\n\"");
--- 508,512 ----
  
      wxString script;
!     script += wxT("local msg = \"Welcome to wxLuaEditor using \"..wxlua.wxLUA_VERSION_STRING..\"\\n\"");
      script += wxT("msg = msg..\"and compiled with \"..wx.wxVERSION_STRING..\"\\n\"");
      script += wxT("msg = msg..\"Written by John Labenski\\n\\n\"");

[Wxlua-commit] wxLua/apps/wxlua/src lconsole.cpp,1.17,1.18

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

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

Modified Files:
	lconsole.cpp 
Log Message:
Use wxlua.wxLUA_VERSION_STRING for dialog


Index: lconsole.cpp
===================================================================
RCS file: /cvsroot/wxlua/wxLua/apps/wxlua/src/lconsole.cpp,v
retrieving revision 1.17
retrieving revision 1.18
diff -C2 -d -r1.17 -r1.18
*** lconsole.cpp	15 Dec 2006 19:04:47 -0000	1.17
--- lconsole.cpp	20 Jul 2007 01:39:05 -0000	1.18
***************
*** 28,31 ****
--- 28,32 ----
  #include "lconsole.h"
  
+ // Only include this for the wxlua app, wxluaedit includes this whole file.
  #ifndef WXLUAEDITOR_APP
      #include "wxlua.h"

[Wxlua-commit] wxLua/modules/wxluadebug/src wxldebug.cpp, 1.38, 1.39 wxlstack.cpp, 1.11, 1.12

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

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

Modified Files:
	wxldebug.cpp wxlstack.cpp 
Log Message:
Implement a better fix for the gc of duplicate pointers
Don't track wxLuaFunctions, should be much faster now
Make wxLuaState::RemoveTrackedMemory also clear the rest of the "tracking" info


Index: wxlstack.cpp
===================================================================
RCS file: /cvsroot/wxlua/wxLua/modules/wxluadebug/src/wxlstack.cpp,v
retrieving revision 1.11
retrieving revision 1.12
diff -C2 -d -r1.11 -r1.12
*** wxlstack.cpp	30 Jun 2007 00:12:26 -0000	1.11
--- wxlstack.cpp	19 Jul 2007 03:09:47 -0000	1.12
***************
*** 356,360 ****
          const wxLuaDebugItem *item = debugData.Item(n);
          m_stackEntries.Add(item->GetIndex());
! 		m_stackChoice->Append(item->GetName());
      }
  
--- 356,362 ----
          const wxLuaDebugItem *item = debugData.Item(n);
          m_stackEntries.Add(item->GetIndex());
!         wxString name(item->GetName());
!         if (n == count - 1) name += wxT(" (Globals)");
! 		m_stackChoice->Append(name);
      }
  

Index: wxldebug.cpp
===================================================================
RCS file: /cvsroot/wxlua/wxLua/modules/wxluadebug/src/wxldebug.cpp,v
retrieving revision 1.38
retrieving revision 1.39
diff -C2 -d -r1.38 -r1.39
*** wxldebug.cpp	28 Jun 2007 22:45:57 -0000	1.38
--- wxldebug.cpp	19 Jul 2007 03:09:47 -0000	1.39
***************
*** 287,291 ****
              bool is_lreg_objTable = (lua_equal(L, -1, -2) != 0);
              lua_pop(L, 1);
!             
              // start iterating
              lua_pushnil(L);
--- 287,291 ----
              bool is_lreg_objTable = (lua_equal(L, -1, -2) != 0);
              lua_pop(L, 1);
! 
              // start iterating
              lua_pushnil(L);
***************
*** 297,307 ****
                  GetTypeValue(wxlState, -1, type, value, &flag_type);
  
-                 if (is_lreg_objTable)
-                 {
-                     long tag = -1;
-                     if (value.BeforeFirst(wxT(' ')).ToLong(&tag))
-                         value = value.BeforeFirst(wxT(' ')) + wxT(" (") + wxlState.GetLuaTagName(tag) + wxT(")");
-                 }
- 
                  //wxPrintf(wxT("wxLuaDebugData::EnumerateTable %d type='%s' key='%s' val='%s'\n"), count, type.c_str(), name.c_str(), value.c_str());
  
--- 297,300 ----
***************
*** 465,471 ****
          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");
--- 458,464 ----
          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");

[Wxlua-commit] wxLua/modules/wxlua/src wxlbind.cpp, 1.84, 1.85 wxlcallb.cpp, 1.32, 1.33 wxlstate.cpp, 1.121, 1.122 wxlua_bind.cpp, 1.7, 1.8

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

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

Modified Files:
	wxlbind.cpp wxlcallb.cpp wxlstate.cpp wxlua_bind.cpp 
Log Message:
Implement a better fix for the gc of duplicate pointers
Don't track wxLuaFunctions, should be much faster now
Make wxLuaState::RemoveTrackedMemory also clear the rest of the "tracking" info


Index: wxlstate.cpp
===================================================================
RCS file: /cvsroot/wxlua/wxLua/modules/wxlua/src/wxlstate.cpp,v
retrieving revision 1.121
retrieving revision 1.122
diff -C2 -d -r1.121 -r1.122
*** wxlstate.cpp	17 Jul 2007 03:30:23 -0000	1.121
--- wxlstate.cpp	19 Jul 2007 03:09:46 -0000	1.122
***************
*** 341,346 ****
  }
  
! bool LUACALL wxlua_tpushusertag(lua_State *L, const void *u, int tag)
  {
      // Wrap the void* pointer in a newuserdata
      const void **ptr = (const void **)lua_newuserdata(L, sizeof(void *));
--- 341,366 ----
  }
  
! bool LUACALL wxlua_tpushusertag(lua_State *L, const void *u, int tag, bool track)
  {
+     // First check to see if we've already pushed this object into Lua.
+     // This avoids the problem of the gc deleting a returned pointer to a permanent object.
+     // Test code is this:
+     // il = wx.wxImageList(16,16); ... noteBook:SetImageList(il); ... local il2 = noteBook:GetImageList()
+     // 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
      const void **ptr = (const void **)lua_newuserdata(L, sizeof(void *));
***************
*** 354,364 ****
              if (lua_setmetatable(L, -2) != 0)
              {
!                 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_pushnumber(L, tag); // t["lightuserdata ptr"] = tag
!                 lua_rawset(L, -3);
!                 lua_pop(L, 1);
  
                  return true;
--- 374,388 ----
              if (lua_setmetatable(L, -2) != 0)
              {
!                 if (track)
!                 {
!                     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_pushvalue(L, -3); // push the lua userdata as the value (note: weak valued table)
! 
!                     lua_rawset(L, -3);
!                     lua_pop(L, 1); // pop obj table
!                 }
  
                  return true;
***************
*** 425,428 ****
--- 449,454 ----
      lua_newtable(L);    // metatable
  
+     lua_pushlstring(L, "__mode", 6);
+ 
      // for metatable.__weak = k for weak keys, v for weak values
      if (weak_keys)
***************
*** 441,445 ****
      }
  
-     lua_pushlstring(L, "__mode", 6);
      lua_rawset(L, -3);                  // set mode of main table
      lua_setmetatable(L, -2);            // via the metatable
--- 467,470 ----
***************
*** 1958,1963 ****
  
      // Create a table for all userdata that we've pushed into lua
      wxlua_pushkey_wxLuaObjects(L);
!     lua_newtable(L);
      lua_rawset( L, LUA_REGISTRYINDEX ); // set the value
  
--- 1983,1994 ----
  
      // 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);
!     lua_newtable(L);    // main table
!     lua_newtable(L);    // metatable
!     lua_pushlstring(L, "__mode", 6);
!     lua_pushlstring(L, "v", 1);
!     lua_rawset(L, -3);                  // set mode of main table
!     lua_setmetatable(L, -2);            // via the metatable
      lua_rawset( L, LUA_REGISTRYINDEX ); // set the value
  
***************
*** 2222,2225 ****
--- 2253,2269 ----
      wxCHECK_MSG(Ok() && pObject, false, wxT("Invalid wxLuaState or object"));
  
+     lua_State* L = M_WXLSTATEDATA->m_lua_State;
+ 
+     // No derived methods anymore
+     wxlua_removederivedmethod(L, pObject);
+ 
+     // Nor are we tracking it within Lua
+     wxlua_pushkey_wxLuaObjects(L);
+     lua_rawget(L, LUA_REGISTRYINDEX); // pop key, push result (the object table)
+     lua_pushlightuserdata(L, (void*)pObject);
+     lua_pushnil(L);      // t["lightuserdata ptr"] = nil to remove it
+     lua_rawset(L, -3);
+     lua_pop(L, 1);
+ 
      wxLongToLongHashMap::iterator it = M_WXLSTATEDATA->m_wxlStateData->m_trackedObjects.find((long) pObject);
  
***************
*** 2529,2536 ****
  }
  
! bool wxLuaState::tpushusertag(const void *u, int tag)
  {
      wxCHECK_MSG(Ok(), false, wxT("Invalid wxLuaState"));
!     return wxlua_tpushusertag(M_WXLSTATEDATA->m_lua_State, u, tag);
  }
  
--- 2573,2580 ----
  }
  
! bool wxLuaState::tpushusertag(const void *u, int tag, bool track)
  {
      wxCHECK_MSG(Ok(), false, wxT("Invalid wxLuaState"));
!     return wxlua_tpushusertag(M_WXLSTATEDATA->m_lua_State, u, tag, track);
  }
  
***************
*** 2695,2699 ****
          // Otherwise handle normally
          if (!handled)
!             wxlua_tpushusertag(L, data, tag);
      }
      else
--- 2739,2743 ----
          // Otherwise handle normally
          if (!handled)
!             wxlua_tpushusertag(L, data, tag, true);
      }
      else

Index: wxlbind.cpp
===================================================================
RCS file: /cvsroot/wxlua/wxLua/modules/wxlua/src/wxlbind.cpp,v
retrieving revision 1.84
retrieving revision 1.85
diff -C2 -d -r1.84 -r1.85
*** wxlbind.cpp	17 Jul 2007 03:30:22 -0000	1.84
--- wxlbind.cpp	19 Jul 2007 03:09:46 -0000	1.85
***************
*** 249,267 ****
          wxCHECK_MSG(wxlState.Ok(), 0, wxT("Invalid wxLuaState"));
  
!         void* key = lua_touserdata(L, 1);
!         wxlua_ttouserdata(L, 1, true);
! 
! 
!         wxCHECK_MSG(key != 0, 0, wxT("NULL user data in wxluabind_gc_wxLuaBindClass"));
  
!         wxlua_pushkey_wxLuaObjects(L);
!         lua_rawget(L, LUA_REGISTRYINDEX);       // pop key, push result (the classes table)
!         lua_pushlightuserdata(L, (void*)key);
!         lua_pushnil(L);      // t["lightuserdata ptr"] = nil to remove it
!         lua_rawset(L, -3);
!         lua_pop(L, 1);
  
          wxlState.RemoveTrackedObject(key, true);
-         wxlua_removederivedmethod(L, key);
      }
  
--- 249,259 ----
          wxCHECK_MSG(wxlState.Ok(), 0, wxT("Invalid wxLuaState"));
  
!         void* key = wxlua_ttouserdata(L, 1, true);
  
!         //wxPrintf(wxT("__gcClass '%s' %p\n"), wxlState.GetLuaTagName(*wxlClass->class_tag).c_str(), key);
!         //wxCHECK_MSG(key != 0, 0, wxT("NULL user data in wxluabind_gc_wxLuaBindClass"));
  
+         // clean up the rest of this, this won't error if the key doesn't exist
          wxlState.RemoveTrackedObject(key, true);
      }
  
***************
*** 331,335 ****
                      result = 1;
                      wxLuaFunction *wxlFunc = new wxLuaFunction(wxlMethod, pObject);
!                     wxlua_tpushusertag(L, wxlFunc, g_wxluatag_wxLuaFunction);
                  }
              }
--- 323,328 ----
                      result = 1;
                      wxLuaFunction *wxlFunc = new wxLuaFunction(wxlMethod, pObject);
!                     // Don't track the wxLuaFunction for speed
!                     wxlua_tpushusertag(L, wxlFunc, g_wxluatag_wxLuaFunction, false);
                  }
              }
***************
*** 913,919 ****
  
          if (wxlObject->objPtr != 0)
!             wxlState.tpushusertag(wxlObject->objPtr, *wxlObject->class_tag);
          else
!             wxlState.tpushusertag(*wxlObject->pObjPtr, *wxlObject->class_tag);
  
          lua_rawset(L, tableOffset);
--- 906,912 ----
  
          if (wxlObject->objPtr != 0)
!             wxlState.tpushusertag(wxlObject->objPtr, *wxlObject->class_tag, true);
          else
!             wxlState.tpushusertag(*wxlObject->pObjPtr, *wxlObject->class_tag, true);
  
          lua_rawset(L, tableOffset);

Index: wxlcallb.cpp
===================================================================
RCS file: /cvsroot/wxlua/wxLua/modules/wxlua/src/wxlcallb.cpp,v
retrieving revision 1.32
retrieving revision 1.33
diff -C2 -d -r1.32 -r1.33
*** wxlcallb.cpp	14 Jun 2007 23:59:48 -0000	1.32
--- wxlcallb.cpp	19 Jul 2007 03:09:46 -0000	1.33
***************
*** 42,46 ****
          // Do not install this invalid or unknown event type since we won't know
          // what wxEvent type class to use and someone probably made a mistake.
!         wxString msg = wxString::Format(wxT("Invalid or unknown wxEventType : %d, winIds %d %d."), 
                                          (int)eventType, winId, lastId);
          m_wxlState.terror(msg);
--- 42,46 ----
          // Do not install this invalid or unknown event type since we won't know
          // what wxEvent type class to use and someone probably made a mistake.
!         wxString msg = wxString::Format(wxT("Invalid or unknown wxEventType : %d, winIds %d %d."),
                                          (int)eventType, winId, lastId);
          m_wxlState.terror(msg);
***************
*** 132,136 ****
      int event_tag = 0;
  
!     // If !m_wxlBindEvent, we would have errored in the constructor, but... 
      if (m_wxlBindEvent != NULL)
          event_tag = *m_wxlBindEvent->class_tag;
--- 132,136 ----
      int event_tag = 0;
  
!     // If !m_wxlBindEvent, we would have errored in the constructor, but...
      if (m_wxlBindEvent != NULL)
          event_tag = *m_wxlBindEvent->class_tag;
***************
*** 145,149 ****
          if (wxlState.lua_SetFenv(-2) != 0)
          {
!             wxlState.tpushusertag(event, event_tag);
              wxlState.LuaPCall(1, 0);
          }
--- 145,149 ----
          if (wxlState.lua_SetFenv(-2) != 0)
          {
!             wxlState.tpushusertag(event, event_tag, true);
              wxlState.LuaPCall(1, 0);
          }
***************
*** 154,158 ****
          wxlState.terror("wxLua: wxEvtHandler::Connect in wxLuaCallback::CallFunction: function has been garbage collected.");
  
!     wxlState.lua_SetTop(oldTop); // pop function from the stack (if it's there) 
  }
  
--- 154,158 ----
          wxlState.terror("wxLua: wxEvtHandler::Connect in wxLuaCallback::CallFunction: function has been garbage collected.");
  
!     wxlState.lua_SetTop(oldTop); // pop function from the stack (if it's there)
  }
  

Index: wxlua_bind.cpp
===================================================================
RCS file: /cvsroot/wxlua/wxLua/modules/wxlua/src/wxlua_bind.cpp,v
retrieving revision 1.7
retrieving revision 1.8
diff -C2 -d -r1.7 -r1.8
*** wxlua_bind.cpp	16 Jul 2007 19:35:30 -0000	1.7
--- wxlua_bind.cpp	19 Jul 2007 03:09:47 -0000	1.8
***************
*** 718,724 ****
                  lua_pushstring(L, "object");
                  if (wxlObject->objPtr != 0)
!                     wxlState.tpushusertag(wxlObject->objPtr, *wxlObject->class_tag);
                  else
!                     wxlState.tpushusertag(*wxlObject->pObjPtr, *wxlObject->class_tag);
                  lua_rawset(L, -3);
  
--- 718,724 ----
                  lua_pushstring(L, "object");
                  if (wxlObject->objPtr != 0)
!                     wxlState.tpushusertag(wxlObject->objPtr, *wxlObject->class_tag, false);
                  else
!                     wxlState.tpushusertag(*wxlObject->pObjPtr, *wxlObject->class_tag, false);
                  lua_rawset(L, -3);
  

[Wxlua-commit] wxLua/modules/wxbind/src wxbase_bind.cpp, 1.1, 1.2 wxcore_bind.cpp, 1.1, 1.2 wxcore_wxlprint.cpp, 1.1, 1.2 wxhtml_wxlhtmlwin.cpp, 1.1, 1.2

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

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

Modified Files:
	wxbase_bind.cpp wxcore_bind.cpp wxcore_wxlprint.cpp 
	wxhtml_wxlhtmlwin.cpp 
Log Message:
Implement a better fix for the gc of duplicate pointers
Don't track wxLuaFunctions, should be much faster now
Make wxLuaState::RemoveTrackedMemory also clear the rest of the "tracking" info


Index: wxcore_bind.cpp
===================================================================
RCS file: /cvsroot/wxlua/wxLua/modules/wxbind/src/wxcore_bind.cpp,v
retrieving revision 1.1
retrieving revision 1.2
diff -C2 -d -r1.1 -r1.2
*** wxcore_bind.cpp	16 Jul 2007 19:35:17 -0000	1.1
--- wxcore_bind.cpp	19 Jul 2007 03:09:46 -0000	1.2
***************
*** 5187,5202 ****
      }
  }
! void wxLuaBinding_wxcore::PostRegister(const wxLuaState& wxlState, bool registerTypes, int luaTable)
  {
-     wxLuaState wxLS(wxlState);
-     wxCHECK_RET(wxLS.Ok(), wxT("Invalid wxLuaState"));
-     lua_State* L = wxLS.GetLuaState();
- 
-     if (registerTypes)
-         g_wxluatag_NULL = wxLS.tnewtag();
- 
-     lua_pushlstring(L, "NULL", 4);
-     wxLS.tpushusertag(NULL, g_wxluatag_NULL);
-     lua_rawset(L, luaTable);
  }
  
--- 5187,5192 ----
      }
  }
! void wxLuaBinding_wxcore::PostRegister(const wxLuaState& , bool , int )
  {
  }
  

Index: wxcore_wxlprint.cpp
===================================================================
RCS file: /cvsroot/wxlua/wxLua/modules/wxbind/src/wxcore_wxlprint.cpp,v
retrieving revision 1.1
retrieving revision 1.2
diff -C2 -d -r1.1 -r1.2
*** wxcore_wxlprint.cpp	16 Jul 2007 19:35:21 -0000	1.1
--- wxcore_wxlprint.cpp	19 Jul 2007 03:09:46 -0000	1.2
***************
*** 56,60 ****
      {
          int nOldTop = m_wxlState.lua_GetTop();
!         m_wxlState.tpushusertag(this, s_wxluatag_wxLuaPrintout);
  
          m_wxlState.LuaPCall(1, 4);
--- 56,60 ----
      {
          int nOldTop = m_wxlState.lua_GetTop();
!         m_wxlState.tpushusertag(this, s_wxluatag_wxLuaPrintout, true);
  
          m_wxlState.LuaPCall(1, 4);
***************
*** 86,90 ****
      {
          int nOldTop = m_wxlState.lua_GetTop();
!         m_wxlState.tpushusertag(this, s_wxluatag_wxLuaPrintout);
          m_wxlState.lua_PushNumber(pageNum);
  
--- 86,90 ----
      {
          int nOldTop = m_wxlState.lua_GetTop();
!         m_wxlState.tpushusertag(this, s_wxluatag_wxLuaPrintout, true);
          m_wxlState.lua_PushNumber(pageNum);
  
***************
*** 135,139 ****
      {
          int nOldTop = m_wxlState.lua_GetTop();
!         m_wxlState.tpushusertag(this, s_wxluatag_wxLuaPrintout);
          m_wxlState.lua_PushNumber(startPage);
          m_wxlState.lua_PushNumber(endPage);
--- 135,139 ----
      {
          int nOldTop = m_wxlState.lua_GetTop();
!         m_wxlState.tpushusertag(this, s_wxluatag_wxLuaPrintout, true);
          m_wxlState.lua_PushNumber(startPage);
          m_wxlState.lua_PushNumber(endPage);
***************
*** 164,168 ****
      {
          int nOldTop = m_wxlState.lua_GetTop();
!         m_wxlState.tpushusertag(this, s_wxluatag_wxLuaPrintout);
          m_wxlState.LuaPCall(1, 0);
          m_wxlState.lua_SetTop(nOldTop);
--- 164,168 ----
      {
          int nOldTop = m_wxlState.lua_GetTop();
!         m_wxlState.tpushusertag(this, s_wxluatag_wxLuaPrintout, true);
          m_wxlState.LuaPCall(1, 0);
          m_wxlState.lua_SetTop(nOldTop);
***************
*** 180,184 ****
      {
          int nOldTop = m_wxlState.lua_GetTop();
!         m_wxlState.tpushusertag(this, s_wxluatag_wxLuaPrintout);
          m_wxlState.LuaPCall(1, 0);
          m_wxlState.lua_SetTop(nOldTop);
--- 180,184 ----
      {
          int nOldTop = m_wxlState.lua_GetTop();
!         m_wxlState.tpushusertag(this, s_wxluatag_wxLuaPrintout, true);
          m_wxlState.LuaPCall(1, 0);
          m_wxlState.lua_SetTop(nOldTop);
***************
*** 196,200 ****
      {
          int nOldTop = m_wxlState.lua_GetTop();
!         m_wxlState.tpushusertag(this, s_wxluatag_wxLuaPrintout);
          m_wxlState.LuaPCall(1, 0);
          m_wxlState.lua_SetTop(nOldTop);
--- 196,200 ----
      {
          int nOldTop = m_wxlState.lua_GetTop();
!         m_wxlState.tpushusertag(this, s_wxluatag_wxLuaPrintout, true);
          m_wxlState.LuaPCall(1, 0);
          m_wxlState.lua_SetTop(nOldTop);
***************
*** 212,216 ****
      {
          int nOldTop = m_wxlState.lua_GetTop();
!         m_wxlState.tpushusertag(this, s_wxluatag_wxLuaPrintout);
          m_wxlState.LuaPCall(1, 0);
          m_wxlState.lua_SetTop(nOldTop);
--- 212,216 ----
      {
          int nOldTop = m_wxlState.lua_GetTop();
!         m_wxlState.tpushusertag(this, s_wxluatag_wxLuaPrintout, true);
          m_wxlState.LuaPCall(1, 0);
          m_wxlState.lua_SetTop(nOldTop);
***************
*** 230,234 ****
      {
          int nOldTop = m_wxlState.lua_GetTop();
!         m_wxlState.tpushusertag(this, s_wxluatag_wxLuaPrintout);
          m_wxlState.lua_PushNumber(pageNum);
  
--- 230,234 ----
      {
          int nOldTop = m_wxlState.lua_GetTop();
!         m_wxlState.tpushusertag(this, s_wxluatag_wxLuaPrintout, true);
          m_wxlState.lua_PushNumber(pageNum);
  
***************
*** 252,256 ****
      {
          int nOldTop = m_wxlState.lua_GetTop();
!         m_wxlState.tpushusertag(this, s_wxluatag_wxLuaPrintout);
          m_wxlState.lua_PushString(val);
  
--- 252,256 ----
      {
          int nOldTop = m_wxlState.lua_GetTop();
!         m_wxlState.tpushusertag(this, s_wxluatag_wxLuaPrintout, true);
          m_wxlState.lua_PushString(val);
  

Index: wxbase_bind.cpp
===================================================================
RCS file: /cvsroot/wxlua/wxLua/modules/wxbind/src/wxbase_bind.cpp,v
retrieving revision 1.1
retrieving revision 1.2
diff -C2 -d -r1.1 -r1.2
*** wxbase_bind.cpp	16 Jul 2007 19:35:17 -0000	1.1
--- wxbase_bind.cpp	19 Jul 2007 03:09:46 -0000	1.2
***************
*** 2500,2504 ****
  
      lua_pushlstring(L, "NULL", 4);
!     wxLS.tpushusertag(NULL, g_wxluatag_NULL);
      lua_rawset(L, luaTable);
  }
--- 2500,2504 ----
  
      lua_pushlstring(L, "NULL", 4);
!     wxLS.tpushusertag(NULL, g_wxluatag_NULL, true);
      lua_rawset(L, luaTable);
  }

Index: wxhtml_wxlhtmlwin.cpp
===================================================================
RCS file: /cvsroot/wxlua/wxLua/modules/wxbind/src/wxhtml_wxlhtmlwin.cpp,v
retrieving revision 1.1
retrieving revision 1.2
diff -C2 -d -r1.1 -r1.2
*** wxhtml_wxlhtmlwin.cpp	16 Jul 2007 19:35:22 -0000	1.1
--- wxhtml_wxlhtmlwin.cpp	19 Jul 2007 03:09:46 -0000	1.2
***************
*** 64,72 ****
          lua_State *L = m_wxlState.GetLuaState();
          int nOldTop = lua_gettop(L);
!         m_wxlState.tpushusertag(this, s_wxluatag_wxLuaHtmlWindow);
!         m_wxlState.tpushusertag(cell, s_wxluatag_wxHtmlCell);
          lua_pushnumber(L, x);
          lua_pushnumber(L, y);
!         m_wxlState.tpushusertag((void *) &event, s_wxluatag_wxMouseEvent);
  
          m_wxlState.LuaPCall(5, 1);
--- 64,72 ----
          lua_State *L = m_wxlState.GetLuaState();
          int nOldTop = lua_gettop(L);
!         m_wxlState.tpushusertag(this, s_wxluatag_wxLuaHtmlWindow, true);
!         m_wxlState.tpushusertag(cell, s_wxluatag_wxHtmlCell, true);
          lua_pushnumber(L, x);
          lua_pushnumber(L, y);
!         m_wxlState.tpushusertag((void *) &event, s_wxluatag_wxMouseEvent, true);
  
          m_wxlState.LuaPCall(5, 1);
***************
*** 103,108 ****
          lua_State *L = m_wxlState.GetLuaState();
          int nOldTop = lua_gettop(L);
!         m_wxlState.tpushusertag(this, s_wxluatag_wxLuaHtmlWindow);
!         m_wxlState.tpushusertag(cell, s_wxluatag_wxHtmlCell);
          lua_pushnumber(L, x);
          lua_pushnumber(L, y);
--- 103,108 ----
          lua_State *L = m_wxlState.GetLuaState();
          int nOldTop = lua_gettop(L);
!         m_wxlState.tpushusertag(this, s_wxluatag_wxLuaHtmlWindow, true);
!         m_wxlState.tpushusertag(cell, s_wxluatag_wxHtmlCell, true);
          lua_pushnumber(L, x);
          lua_pushnumber(L, y);
***************
*** 124,129 ****
          lua_State *L = m_wxlState.GetLuaState();
          int nOldTop = lua_gettop(L);
!         m_wxlState.tpushusertag(this, s_wxluatag_wxLuaHtmlWindow);
!         m_wxlState.tpushusertag((void *) &link, s_wxluatag_wxHtmlLinkInfo);
  
          m_wxlState.LuaPCall(2, 0);
--- 124,129 ----
          lua_State *L = m_wxlState.GetLuaState();
          int nOldTop = lua_gettop(L);
!         m_wxlState.tpushusertag(this, s_wxluatag_wxLuaHtmlWindow, true);
!         m_wxlState.tpushusertag((void *) &link, s_wxluatag_wxHtmlLinkInfo, true);
  
          m_wxlState.LuaPCall(2, 0);
***************
*** 143,147 ****
          lua_State *L = m_wxlState.GetLuaState();
          int nOldTop = lua_gettop(L);
!         m_wxlState.tpushusertag(this, s_wxluatag_wxLuaHtmlWindow);
          m_wxlState.lua_PushString(title);
  
--- 143,147 ----
          lua_State *L = m_wxlState.GetLuaState();
          int nOldTop = lua_gettop(L);
!         m_wxlState.tpushusertag(this, s_wxluatag_wxLuaHtmlWindow, true);
          m_wxlState.lua_PushString(title);
  

[Wxlua-commit] wxLua/modules/wxlua/include wxlstate.h,1.85,1.86

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

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

Modified Files:
	wxlstate.h 
Log Message:
Implement a better fix for the gc of duplicate pointers
Don't track wxLuaFunctions, should be much faster now
Make wxLuaState::RemoveTrackedMemory also clear the rest of the "tracking" info


Index: wxlstate.h
===================================================================
RCS file: /cvsroot/wxlua/wxLua/modules/wxlua/include/wxlstate.h,v
retrieving revision 1.85
retrieving revision 1.86
diff -C2 -d -r1.85 -r1.86
*** wxlstate.h	28 Jun 2007 22:45:57 -0000	1.85
--- wxlstate.h	19 Jul 2007 03:09:46 -0000	1.86
***************
*** 171,175 ****
  //   with it's metatable set to the table from tget(tag). Returns true if the
  //   tag is known and the metatable was set.
! WXDLLIMPEXP_WXLUA bool LUACALL wxlua_tpushusertag(lua_State* L, const void* u, int tag);
  // 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"
--- 171,175 ----
  //   with it's metatable set to the table from tget(tag). Returns true if the
  //   tag is known and the metatable was set.
! WXDLLIMPEXP_WXLUA bool LUACALL wxlua_tpushusertag(lua_State* L, const void* u, int tag, bool track);
  // 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"
***************
*** 677,681 ****
      //   with it's metatable set to the table from tget(tag). Returns true if the
      //   tag is known and the metatable was set.
!     bool tpushusertag(const void *u, int tag);
      // 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"
--- 677,681 ----
      //   with it's metatable set to the table from tget(tag). Returns true if the
      //   tag is known and the metatable was set.
!     bool tpushusertag(const void *u, int tag, bool track);
      // 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/bindings/wxwidgets wxbase_rules.lua, 1.2, 1.3 wxcore_rules.lua, 1.2, 1.3

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

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

Modified Files:
	wxbase_rules.lua wxcore_rules.lua 
Log Message:
Implement a better fix for the gc of duplicate pointers
Don't track wxLuaFunctions, should be much faster now
Make wxLuaState::RemoveTrackedMemory also clear the rest of the "tracking" info


Index: wxcore_rules.lua
===================================================================
RCS file: /cvsroot/wxlua/wxLua/bindings/wxwidgets/wxcore_rules.lua,v
retrieving revision 1.2
retrieving revision 1.3
diff -C2 -d -r1.2 -r1.3
*** wxcore_rules.lua	17 Jul 2007 03:30:20 -0000	1.2
--- wxcore_rules.lua	19 Jul 2007 03:09:46 -0000	1.3
***************
*** 270,286 ****
  --   hook_cpp_binding_classname. You can load any other custom bindings here.
  --   Typically this is not necessary and you can rem this out.
! wxLuaBinding_PostRegister =
! [[
!     wxLuaState wxLS(wxlState);
!     wxCHECK_RET(wxLS.Ok(), wxT("Invalid wxLuaState"));
!     lua_State* L = wxLS.GetLuaState();
! 
!     if (registerTypes)
!         g_wxluatag_NULL = wxLS.tnewtag();
! 
!     lua_pushlstring(L, "NULL", 4);
!     wxLS.tpushusertag(NULL, g_wxluatag_NULL);
!     lua_rawset(L, luaTable);
! ]]
  
  --=============================================================================
--- 270,274 ----
  --   hook_cpp_binding_classname. You can load any other custom bindings here.
  --   Typically this is not necessary and you can rem this out.
! -- wxLuaBinding_PostRegister = nothing to do here
  
  --=============================================================================

Index: wxbase_rules.lua
===================================================================
RCS file: /cvsroot/wxlua/wxLua/bindings/wxwidgets/wxbase_rules.lua,v
retrieving revision 1.2
retrieving revision 1.3
diff -C2 -d -r1.2 -r1.3
*** wxbase_rules.lua	17 Jul 2007 03:30:20 -0000	1.2
--- wxbase_rules.lua	19 Jul 2007 03:09:46 -0000	1.3
***************
*** 142,146 ****
  
      lua_pushlstring(L, "NULL", 4);
!     wxLS.tpushusertag(NULL, g_wxluatag_NULL);
      lua_rawset(L, luaTable);
  ]]
--- 142,146 ----
  
      lua_pushlstring(L, "NULL", 4);
!     wxLS.tpushusertag(NULL, g_wxluatag_NULL, true);
      lua_rawset(L, luaTable);
  ]]

[Wxlua-commit] wxLua/bindings/wxlua override.hpp,1.6,1.7

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

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

Modified Files:
	override.hpp 
Log Message:
Implement a better fix for the gc of duplicate pointers
Don't track wxLuaFunctions, should be much faster now
Make wxLuaState::RemoveTrackedMemory also clear the rest of the "tracking" info


Index: override.hpp
===================================================================
RCS file: /cvsroot/wxlua/wxLua/bindings/wxlua/override.hpp,v
retrieving revision 1.6
retrieving revision 1.7
diff -C2 -d -r1.6 -r1.7
*** override.hpp	16 Jul 2007 19:34:15 -0000	1.6
--- override.hpp	19 Jul 2007 03:09:45 -0000	1.7
***************
*** 735,741 ****
                  lua_pushstring(L, "object");
                  if (wxlObject->objPtr != 0)
!                     wxlState.tpushusertag(wxlObject->objPtr, *wxlObject->class_tag);
                  else
!                     wxlState.tpushusertag(*wxlObject->pObjPtr, *wxlObject->class_tag);
                  lua_rawset(L, -3);
  
--- 735,741 ----
                  lua_pushstring(L, "object");
                  if (wxlObject->objPtr != 0)
!                     wxlState.tpushusertag(wxlObject->objPtr, *wxlObject->class_tag, false);
                  else
!                     wxlState.tpushusertag(*wxlObject->pObjPtr, *wxlObject->class_tag, false);
                  lua_rawset(L, -3);
  

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

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

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

Modified Files:
	luamodule.cpp 
Log Message:
Fix controls sample for separated wxWidgets bindings
Check for MainLoop already running in luamodule


Index: luamodule.cpp
===================================================================
RCS file: /cvsroot/wxlua/wxLua/modules/luamodule/src/luamodule.cpp,v
retrieving revision 1.5
retrieving revision 1.6
diff -C2 -d -r1.5 -r1.6
*** luamodule.cpp	4 May 2007 16:12:24 -0000	1.5
--- luamodule.cpp	18 Jul 2007 02:41:33 -0000	1.6
***************
*** 21,26 ****
  // Declare the binding initialization functions as extern so we don't have to
  //  #include the binding header for simplicity.
! extern bool wxLuaBinding_wx_init();
! extern bool wxLuaBinding_wxstc_init();
  
  // ----------------------------------------------------------------------------
--- 21,26 ----
  // Declare the binding initialization functions as extern so we don't have to
  //  #include the binding header for simplicity.
! #include "wxbind/include/wxbinddefs.h"
! WXLUA_DECLARE_BIND_ALL
  
  // ----------------------------------------------------------------------------
***************
*** 77,81 ****
      int retval = 0;
      bool initialized = (wxTopLevelWindows.GetCount() != 0);
!     if (initialized)
          retval = wxApp::MainLoop();
      return retval;
--- 77,81 ----
      int retval = 0;
      bool initialized = (wxTopLevelWindows.GetCount() != 0);
!     if (initialized && !IsMainLoopRunning())
          retval = wxApp::MainLoop();
      return retval;
***************
*** 124,128 ****
          wxInitAllImageHandlers();
  
!         wxLuaBinding_wx_init();
          s_wxlState.Create(L, WXLUASTATE_SETSTATE);
          s_wxlState.SetEventHandler((wxEvtHandler*)wxTheApp);
--- 124,128 ----
          wxInitAllImageHandlers();
  
!         WXLUA_IMPLEMENT_BIND_ALL
          s_wxlState.Create(L, WXLUASTATE_SETSTATE);
          s_wxlState.SetEventHandler((wxEvtHandler*)wxTheApp);

[Wxlua-commit] wxLua/samples controls.wx.lua,1.12,1.13

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

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

Modified Files:
	controls.wx.lua 
Log Message:
Fix controls sample for separated wxWidgets bindings
Check for MainLoop already running in luamodule


Index: controls.wx.lua
===================================================================
RCS file: /cvsroot/wxlua/wxLua/samples/controls.wx.lua,v
retrieving revision 1.12
retrieving revision 1.13
diff -C2 -d -r1.12 -r1.13
*** controls.wx.lua	16 Jul 2007 19:35:31 -0000	1.12
--- controls.wx.lua	18 Jul 2007 02:41:33 -0000	1.13
***************
*** 31,34 ****
--- 31,35 ----
  listImageList:Add(wx.wxArtProvider.GetBitmap(wx.wxART_ERROR, wx.wxART_TOOLBAR, wx.wxSize(16, 16)))
  
+ bindingList = wxlua.GetBindings() -- Table of {wxLuaBinding functions}
  
  controlTable   = {} -- Table of { win_id = "win name" }
***************
*** 103,108 ****
  
  -- Turn the array from the binding into a lookup table by event type
  wxEVT_List  = {}
- wxEVT_Array = wxLuaBinding_wx.GetEventArray
  wxEVT_TableByType = {}
  for i = 1, #wxEVT_Array do
--- 104,116 ----
  
  -- Turn the array from the binding into a lookup table by event type
+ wxEVT_Array = bindingList[1].GetEventArray
+ for i = 2, #bindingList do
+     local evtArr = bindingList[i].GetEventArray
+     for j = 1, #evtArr do
+         table.insert(wxEVT_Array, evtArr[j])
+     end
+ end
+ 
  wxEVT_List  = {}
  wxEVT_TableByType = {}
  for i = 1, #wxEVT_Array do
***************
*** 113,117 ****
  
  -- Turn the array from the binding into a lookup table by class name
! wxCLASS_Array = wxLuaBinding_wx.GetClassArray
  wxCLASS_TableByName = {}
  for i = 1, #wxCLASS_Array do
--- 121,132 ----
  
  -- Turn the array from the binding into a lookup table by class name
! wxCLASS_Array = bindingList[1].GetClassArray
! for i = 2, #bindingList do
!     local classArr = bindingList[i].GetClassArray
!     for j = 1, #classArr do
!         table.insert(wxCLASS_Array, classArr[j])
!     end
! end
! 
  wxCLASS_TableByName = {}
  for i = 1, #wxCLASS_Array do

[Wxlua-commit] wxLua/modules/wxbind/include wxbinddefs.h, 1.5, 1.6 wxcore_wxlprint.h, 1.1, 1.2 wxhtml_wxlhtmlwin.h, 1.1, 1.2

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

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

Modified Files:
	wxbinddefs.h wxcore_wxlprint.h wxhtml_wxlhtmlwin.h 
Log Message:
Fixes for the separation of wxlibs for MSW


Index: wxhtml_wxlhtmlwin.h
===================================================================
RCS file: /cvsroot/wxlua/wxLua/modules/wxbind/include/wxhtml_wxlhtmlwin.h,v
retrieving revision 1.1
retrieving revision 1.2
diff -C2 -d -r1.1 -r1.2
*** wxhtml_wxlhtmlwin.h	16 Jul 2007 19:34:43 -0000	1.1
--- wxhtml_wxlhtmlwin.h	17 Jul 2007 23:09:17 -0000	1.2
***************
*** 14,17 ****
--- 14,18 ----
  
  #include "wxbind/include/wxbinddefs.h"
+ #include "wxluasetup.h"
  
  #if wxLUA_USE_wxHTML

Index: wxcore_wxlprint.h
===================================================================
RCS file: /cvsroot/wxlua/wxLua/modules/wxbind/include/wxcore_wxlprint.h,v
retrieving revision 1.1
retrieving revision 1.2
diff -C2 -d -r1.1 -r1.2
*** wxcore_wxlprint.h	16 Jul 2007 19:34:42 -0000	1.1
--- wxcore_wxlprint.h	17 Jul 2007 23:09:17 -0000	1.2
***************
*** 11,15 ****
--- 11,17 ----
  
  #include "wx/print.h"
+ 
  #include "wxbind/include/wxbinddefs.h"
+ #include "wxluasetup.h"
  
  #if wxLUA_USE_wxLuaPrintout

Index: wxbinddefs.h
===================================================================
RCS file: /cvsroot/wxlua/wxLua/modules/wxbind/include/wxbinddefs.h,v
retrieving revision 1.5
retrieving revision 1.6
diff -C2 -d -r1.5 -r1.6
*** wxbinddefs.h	16 Jul 2007 23:06:52 -0000	1.5
--- wxbinddefs.h	17 Jul 2007 23:09:17 -0000	1.6
***************
*** 150,153 ****
--- 150,170 ----
  #endif
  
+ 
+ // Declare this here to avoid having to include the socket headers when
+ // using WXLUA_DECLARE_BIND_ALL
+ 
+ #ifndef WXDLLIMPEXP_WXLUASOCKET
+     #ifdef WXMAKINGDLL_WXLUASOCKET
+         #define WXDLLIMPEXP_WXLUASOCKET WXEXPORT
+         #define WXDLLIMPEXP_DATA_WXLUASOCKET(type) WXEXPORT type
+     #elif defined(WXUSINGDLL)
+         #define WXDLLIMPEXP_WXLUASOCKET WXIMPORT
+         #define WXDLLIMPEXP_DATA_WXLUASOCKET(type) WXIMPORT type
+     #else // not making nor using DLL
+         #define WXDLLIMPEXP_WXLUASOCKET
+         #define WXDLLIMPEXP_DATA_WXLUASOCKET(type) type
+     #endif
+ #endif // WXDLLIMPEXP_WXLUASOCKET
+ 
  // ----------------------------------------------------------------------------
  // Macros to initialize the wxWidgets bindings taking the wxUSE_XXX conditions
***************
*** 179,183 ****
  #else
      #define WXLUA_DECLARE_BIND_WXXML
!     #warning "WXLUA_DECLARE_BIND_WXXML is not used since wxUSE_XML=0"
  #endif //wxUSE_XML
  
--- 196,200 ----
  #else
      #define WXLUA_DECLARE_BIND_WXXML
!     //#warning "WXLUA_DECLARE_BIND_WXXML is not used since wxUSE_XML=0"
  #endif //wxUSE_XML
  
***************
*** 186,190 ****
  #else
      #define WXLUA_DECLARE_BIND_WXXRC
!     #warning "WXLUA_DECLARE_BIND_WXXRC is not used since wxUSE_XRC=0"
  #endif //wxUSE_XRC
  
--- 203,207 ----
  #else
      #define WXLUA_DECLARE_BIND_WXXRC
!     //#warning "WXLUA_DECLARE_BIND_WXXRC is not used since wxUSE_XRC=0"
  #endif //wxUSE_XRC
  
***************
*** 193,197 ****
  #else
      #define WXLUA_DECLARE_BIND_WXHTML
!     #warning "WXLUA_DECLARE_BIND_WXHTML is not used since wxUSE_HTML=0"
  #endif //wxUSE_HTML
  
--- 210,214 ----
  #else
      #define WXLUA_DECLARE_BIND_WXHTML
!     //#warning "WXLUA_DECLARE_BIND_WXHTML is not used since wxUSE_HTML=0"
  #endif //wxUSE_HTML
  
***************
*** 200,204 ****
  #else
      #define WXLUA_DECLARE_BIND_WXAUI
!     #warning "WXLUA_DECLARE_BIND_WXAUI is not used since wxUSE_AUI=0"
  #endif //wxUSE_AUI
  
--- 217,221 ----
  #else
      #define WXLUA_DECLARE_BIND_WXAUI
!     //#warning "WXLUA_DECLARE_BIND_WXAUI is not used since wxUSE_AUI=0"
  #endif //wxUSE_AUI
  
***************
*** 234,238 ****
  #else
      #define WXLUA_IMPLEMENT_BIND_WXXML
!     #warning "WXLUA_IMPLEMENT_BIND_WXXML is not used since wxUSE_XML=0"
  #endif //wxUSE_XML
  
--- 251,255 ----
  #else
      #define WXLUA_IMPLEMENT_BIND_WXXML
!     //#warning "WXLUA_IMPLEMENT_BIND_WXXML is not used since wxUSE_XML=0"
  #endif //wxUSE_XML
  
***************
*** 241,245 ****
  #else
      #define WXLUA_IMPLEMENT_BIND_WXXRC
!     #warning "WXLUA_IMPLEMENT_BIND_WXXRC is not used since wxUSE_XRC=0"
  #endif //wxUSE_XRC
  
--- 258,262 ----
  #else
      #define WXLUA_IMPLEMENT_BIND_WXXRC
!     //#warning "WXLUA_IMPLEMENT_BIND_WXXRC is not used since wxUSE_XRC=0"
  #endif //wxUSE_XRC
  
***************
*** 248,252 ****
  #else
      #define WXLUA_IMPLEMENT_BIND_WXHTML
!     #warning "WXLUA_IMPLEMENT_BIND_WXHTML is not used since wxUSE_HTML=0"
  #endif //wxUSE_HTML
  
--- 265,269 ----
  #else
      #define WXLUA_IMPLEMENT_BIND_WXHTML
!     //#warning "WXLUA_IMPLEMENT_BIND_WXHTML is not used since wxUSE_HTML=0"
  #endif //wxUSE_HTML
  
***************
*** 255,259 ****
  #else
      #define WXLUA_IMPLEMENT_BIND_WXAUI
!     #warning "WXLUA_IMPLEMENT_BIND_WXAUI is not used since wxUSE_AUI=0"
  #endif //wxUSE_AUI
  
--- 272,276 ----
  #else
      #define WXLUA_IMPLEMENT_BIND_WXAUI
!     //#warning "WXLUA_IMPLEMENT_BIND_WXAUI is not used since wxUSE_AUI=0"
  #endif //wxUSE_AUI
  

[Wxlua-commit] wxLua/apps/wxluafreeze/src wxluafreeze.cpp, 1.12, 1.13

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

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

Modified Files:
	wxluafreeze.cpp 
Log Message:
Fixes for the separation of wxlibs for MSW


Index: wxluafreeze.cpp
===================================================================
RCS file: /cvsroot/wxlua/wxLua/apps/wxluafreeze/src/wxluafreeze.cpp,v
retrieving revision 1.12
retrieving revision 1.13
diff -C2 -d -r1.12 -r1.13
*** wxluafreeze.cpp	16 Jul 2007 19:34:13 -0000	1.12
--- wxluafreeze.cpp	17 Jul 2007 23:09:16 -0000	1.13
***************
*** 27,30 ****
--- 27,31 ----
  
  //#include "wx/cmdline.h"
+ #include "wx/app.h"
  #include "wx/image.h"
  #include "wx/file.h"
***************
*** 41,46 ****
  
  #include "wxbind/include/wxbinddefs.h"
! WXLUA_DECLARE_BIND_ALL
! 
  
  // unique identifier to return for missing script
--- 42,58 ----
  
  #include "wxbind/include/wxbinddefs.h"
!     WXLUA_DECLARE_BIND_WXLUA 
! //    WXLUA_DECLARE_BIND_WXLUASOCKET 
!     WXLUA_DECLARE_BIND_WXBASE 
!     WXLUA_DECLARE_BIND_WXCORE 
!     WXLUA_DECLARE_BIND_WXADV 
!     WXLUA_DECLARE_BIND_WXNET 
!     WXLUA_DECLARE_BIND_WXXML 
!     WXLUA_DECLARE_BIND_WXXRC 
!     WXLUA_DECLARE_BIND_WXHTML 
!     WXLUA_DECLARE_BIND_WXAUI 
!     WXLUA_DECLARE_BIND_WXMEDIA 
!     WXLUA_DECLARE_BIND_WXGL 
! //    WXLUA_DECLARE_BIND_WXSTC
  
  // unique identifier to return for missing script
***************
*** 108,112 ****
      // Initialize the wxLua bindings we want to use.
      // See notes for WXLUA_DECLARE_BIND_ALL above.
!     WXLUA_IMPLEMENT_BIND_ALL
  
      m_fileName = argv[0]; // the filename of 'this' program
--- 120,139 ----
      // Initialize the wxLua bindings we want to use.
      // See notes for WXLUA_DECLARE_BIND_ALL above.
!     //WXLUA_IMPLEMENT_BIND_ALL
! 
!     WXLUA_IMPLEMENT_BIND_WXLUA 
!     //WXLUA_IMPLEMENT_BIND_WXLUASOCKET 
!     WXLUA_IMPLEMENT_BIND_WXBASE 
!     WXLUA_IMPLEMENT_BIND_WXCORE 
!     WXLUA_IMPLEMENT_BIND_WXADV 
!     WXLUA_IMPLEMENT_BIND_WXNET 
!     WXLUA_IMPLEMENT_BIND_WXXML 
!     WXLUA_IMPLEMENT_BIND_WXXRC 
!     WXLUA_IMPLEMENT_BIND_WXHTML 
!     WXLUA_IMPLEMENT_BIND_WXAUI 
!     WXLUA_IMPLEMENT_BIND_WXMEDIA 
!     WXLUA_IMPLEMENT_BIND_WXGL 
!     //WXLUA_IMPLEMENT_BIND_WXSTC
! 
  
      m_fileName = argv[0]; // the filename of 'this' program

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

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

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

Modified Files:
	changelog.txt 
Log Message:
Update for new bindings


Index: changelog.txt
===================================================================
RCS file: /cvsroot/wxlua/wxLua/docs/changelog.txt,v
retrieving revision 1.42
retrieving revision 1.43
diff -C2 -d -r1.42 -r1.43
*** changelog.txt	17 Jul 2007 03:30:22 -0000	1.42
--- changelog.txt	17 Jul 2007 14:45:21 -0000	1.43
***************
*** 12,15 ****
--- 12,16 ----
     The userdata was previously keyed on the pointer to the data instead 
     of a pointer to the Lua userdata that wraps the data.
+  - Moved wxLUA_VERSION... bindings into the 'wxlua' table.
  
   version 2.8.4.1

[Wxlua-commit] wxLua/apps/wxlua/src editor.h,1.40,1.41

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

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

Modified Files:
	editor.h 
Log Message:
Update for new bindings


Index: editor.h
===================================================================
RCS file: /cvsroot/wxlua/wxLua/apps/wxlua/src/editor.h,v
retrieving revision 1.40
retrieving revision 1.41
diff -C2 -d -r1.40 -r1.41
*** editor.h	16 Jun 2007 06:21:41 -0000	1.40
--- editor.h	17 Jul 2007 14:45:14 -0000	1.41
***************
*** 10,15 ****
  extern const unsigned char wxLuaEditor[];
  
! const size_t wxLuaEditor_len = 90592;
! const unsigned char wxLuaEditor[90593] = {
   45, 45, 45, 45, 45, 45, 45, 45, 45, 45, 45, 45, 45, 45, 45, 45, 45, 45, 45, 45, 45, 45, 45, 45, 45, 45, 45, 45, 45, 45, 45, 45, 45, 45, 45, 45, 45, 45, 45, 45, 45, 45, 45, 45, 45, 45, 45, 45, 45, 45, 45, 45, 45, 45, 45, 45, 45, 45, 45, 45, 45, 45, 45, 45, 45, 45, 45, 45, 45, 45, 45, 45, 45, 61, 45, 45, 45, 10,
   45, 45, 32, 78, 97,109,101, 58, 32, 32, 32, 32, 32, 32, 32, 32, 69,100,105,116,111,114, 46,119,120, 46,108,117, 97, 10,
--- 10,15 ----
  extern const unsigned char wxLuaEditor[];
  
! const size_t wxLuaEditor_len = 90595;
! const unsigned char wxLuaEditor[90596] = {
   45, 45, 45, 45, 45, 45, 45, 45, 45, 45, 45, 45, 45, 45, 45, 45, 45, 45, 45, 45, 45, 45, 45, 45, 45, 45, 45, 45, 45, 45, 45, 45, 45, 45, 45, 45, 45, 45, 45, 45, 45, 45, 45, 45, 45, 45, 45, 45, 45, 45, 45, 45, 45, 45, 45, 45, 45, 45, 45, 45, 45, 45, 45, 45, 45, 45, 45, 45, 45, 45, 45, 45, 45, 61, 45, 45, 45, 10,
   45, 45, 32, 78, 97,109,101, 58, 32, 32, 32, 32, 32, 32, 32, 32, 69,100,105,116,111,114, 46,119,120, 46,108,117, 97, 10,
***************
*** 2252,2256 ****
   32, 32, 32, 32, 32, 32, 32, 32, 32, 32, 32, 32, 60, 99,101,110,116,101,114, 62, 10,
   32, 32, 32, 32, 32, 32, 32, 32, 32, 32, 32, 32, 32, 32, 32, 32, 60,102,111,110,116, 32,115,105,122,101, 32, 61, 32, 43, 50, 32, 99,111,108,111,114, 32, 61, 32, 34, 35, 70, 70, 70, 70, 70, 70, 34, 62, 60, 98,114, 62, 60, 98, 62, 93, 93, 46, 46, 10,
!  32, 32, 32, 32, 32, 32, 32, 32, 32, 32, 32, 32, 32, 32, 32, 32, 32, 32, 32, 32,119,120, 46,119,120, 76, 85, 65, 95, 86, 69, 82, 83, 73, 79, 78, 95, 83, 84, 82, 73, 78, 71, 46, 46, 91, 91, 60, 47, 98, 62, 60, 47,102,111,110,116, 62, 60, 98,114, 62, 10,
   32, 32, 32, 32, 32, 32, 32, 32, 32, 32, 32, 32, 32, 32, 32, 32, 60,102,111,110,116, 32,115,105,122,101, 32, 61, 32, 43, 49, 32, 99,111,108,111,114, 32, 61, 32, 34, 35, 70, 70, 70, 70, 70, 70, 34, 62, 98,117,105,108,116, 32,119,105,116,104, 60, 47,102,111,110,116, 62, 60, 98,114, 62, 10,
   32, 32, 32, 32, 32, 32, 32, 32, 32, 32, 32, 32, 32, 32, 32, 32, 60,102,111,110,116, 32,115,105,122,101, 32, 61, 32, 43, 50, 32, 99,111,108,111,114, 32, 61, 32, 34, 35, 70, 70, 70, 70, 70, 70, 34, 62, 60, 98, 62, 93, 93, 46, 46, 10,
--- 2252,2256 ----
   32, 32, 32, 32, 32, 32, 32, 32, 32, 32, 32, 32, 60, 99,101,110,116,101,114, 62, 10,
   32, 32, 32, 32, 32, 32, 32, 32, 32, 32, 32, 32, 32, 32, 32, 32, 60,102,111,110,116, 32,115,105,122,101, 32, 61, 32, 43, 50, 32, 99,111,108,111,114, 32, 61, 32, 34, 35, 70, 70, 70, 70, 70, 70, 34, 62, 60, 98,114, 62, 60, 98, 62, 93, 93, 46, 46, 10,
!  32, 32, 32, 32, 32, 32, 32, 32, 32, 32, 32, 32, 32, 32, 32, 32, 32, 32, 32, 32,119,120,108,117, 97, 46,119,120, 76, 85, 65, 95, 86, 69, 82, 83, 73, 79, 78, 95, 83, 84, 82, 73, 78, 71, 46, 46, 91, 91, 60, 47, 98, 62, 60, 47,102,111,110,116, 62, 60, 98,114, 62, 10,
   32, 32, 32, 32, 32, 32, 32, 32, 32, 32, 32, 32, 32, 32, 32, 32, 60,102,111,110,116, 32,115,105,122,101, 32, 61, 32, 43, 49, 32, 99,111,108,111,114, 32, 61, 32, 34, 35, 70, 70, 70, 70, 70, 70, 34, 62, 98,117,105,108,116, 32,119,105,116,104, 60, 47,102,111,110,116, 62, 60, 98,114, 62, 10,
   32, 32, 32, 32, 32, 32, 32, 32, 32, 32, 32, 32, 32, 32, 32, 32, 60,102,111,110,116, 32,115,105,122,101, 32, 61, 32, 43, 50, 32, 99,111,108,111,114, 32, 61, 32, 34, 35, 70, 70, 70, 70, 70, 70, 34, 62, 60, 98, 62, 93, 93, 46, 46, 10,

[Wxlua-commit] wxLua/samples bindings.wx.lua,1.16,1.17

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

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

Modified Files:
	bindings.wx.lua 
Log Message:
Update for new bindings


Index: bindings.wx.lua
===================================================================
RCS file: /cvsroot/wxlua/wxLua/samples/bindings.wx.lua,v
retrieving revision 1.16
retrieving revision 1.17
diff -C2 -d -r1.16 -r1.17
*** bindings.wx.lua	16 Jul 2007 19:35:31 -0000	1.16
--- bindings.wx.lua	17 Jul 2007 14:45:21 -0000	1.17
***************
*** 1228,1236 ****
          function (event)
              local LocalVar1_InEventFn = 1
!             local LocalVar2_InEventFn = "Two"
  
              local function LocalFunction(var)
                  local LocalVar1_InLocalFuncInEventFn = 3
!                 local LocalVar2_InLocalFuncInInEventFn = "Four"
  
                  wxlua.LuaStackDialog()
--- 1228,1236 ----
          function (event)
              local LocalVar1_InEventFn = 1
!             local LocalVar2_InEventFn = "local to the event handler function"
  
              local function LocalFunction(var)
                  local LocalVar1_InLocalFuncInEventFn = 3
!                 local LocalVar2_InLocalFuncInEventFn = "local to a local function in the event handler function"
  
                  wxlua.LuaStackDialog()

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

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

Update of /cvsroot/wxlua/wxLua/modules/wxbind/include
In directory sc8-pr-cvs9.sourceforge.net:/tmp/cvs-serv13320/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:
Include wxluasetup.h from within the bindings rather than from
  modules/wxbind/wxbinddefs.h so other's don't have to include it.
Fix collecting userdata prematurely, track the userdata on the pointer
  Lua creates instead of the data itself.


Index: wxadv_bind.h
===================================================================
RCS file: /cvsroot/wxlua/wxLua/modules/wxbind/include/wxadv_bind.h,v
retrieving revision 1.1
retrieving revision 1.2
diff -C2 -d -r1.1 -r1.2
*** wxadv_bind.h	16 Jul 2007 19:34:40 -0000	1.1
--- wxadv_bind.h	17 Jul 2007 03:30:22 -0000	1.2
***************
*** 10,13 ****
--- 10,14 ----
  
  #include "wxbind/include/wxbinddefs.h"
+ #include "wxluasetup.h"
  #include "wxbind/include/wxcore_bind.h"
  #include "wxbind/include/wxadv_bind.h"

Index: wxcore_bind.h
===================================================================
RCS file: /cvsroot/wxlua/wxLua/modules/wxbind/include/wxcore_bind.h,v
retrieving revision 1.1
retrieving revision 1.2
diff -C2 -d -r1.1 -r1.2
*** wxcore_bind.h	16 Jul 2007 19:34:42 -0000	1.1
--- wxcore_bind.h	17 Jul 2007 03:30:22 -0000	1.2
***************
*** 10,13 ****
--- 10,14 ----
  
  #include "wxbind/include/wxbinddefs.h"
+ #include "wxluasetup.h"
  #include "wxbind/include/wxbase_bind.h"
  #include "wxbind/include/wxcore_bind.h"

Index: wxrichtext_bind.h
===================================================================
RCS file: /cvsroot/wxlua/wxLua/modules/wxbind/include/wxrichtext_bind.h,v
retrieving revision 1.1
retrieving revision 1.2
diff -C2 -d -r1.1 -r1.2
*** wxrichtext_bind.h	16 Jul 2007 19:34:43 -0000	1.1
--- wxrichtext_bind.h	17 Jul 2007 03:30:22 -0000	1.2
***************
*** 10,13 ****
--- 10,14 ----
  
  #include "wxbind/include/wxbinddefs.h"
+ #include "wxluasetup.h"
  #include "wxbind/include/wxcore_bind.h"
  #include "wxbind/include/wxrichtext_bind.h"

Index: wxxrc_bind.h
===================================================================
RCS file: /cvsroot/wxlua/wxLua/modules/wxbind/include/wxxrc_bind.h,v
retrieving revision 1.1
retrieving revision 1.2
diff -C2 -d -r1.1 -r1.2
*** wxxrc_bind.h	16 Jul 2007 19:34:43 -0000	1.1
--- wxxrc_bind.h	17 Jul 2007 03:30:22 -0000	1.2
***************
*** 10,13 ****
--- 10,14 ----
  
  #include "wxbind/include/wxbinddefs.h"
+ #include "wxluasetup.h"
  #include "wxbind/include/wxcore_bind.h"
  #include "wxbind/include/wxxrc_bind.h"

Index: wxnet_bind.h
===================================================================
RCS file: /cvsroot/wxlua/wxLua/modules/wxbind/include/wxnet_bind.h,v
retrieving revision 1.1
retrieving revision 1.2
diff -C2 -d -r1.1 -r1.2
*** wxnet_bind.h	16 Jul 2007 19:34:43 -0000	1.1
--- wxnet_bind.h	17 Jul 2007 03:30:22 -0000	1.2
***************
*** 10,13 ****
--- 10,14 ----
  
  #include "wxbind/include/wxbinddefs.h"
+ #include "wxluasetup.h"
  #include "wxbind/include/wxcore_bind.h"
  #include "wxbind/include/wxnet_bind.h"

Index: wxbase_bind.h
===================================================================
RCS file: /cvsroot/wxlua/wxLua/modules/wxbind/include/wxbase_bind.h,v
retrieving revision 1.1
retrieving revision 1.2
diff -C2 -d -r1.1 -r1.2
*** wxbase_bind.h	16 Jul 2007 19:34:41 -0000	1.1
--- wxbase_bind.h	17 Jul 2007 03:30:22 -0000	1.2
***************
*** 10,13 ****
--- 10,14 ----
  
  #include "wxbind/include/wxbinddefs.h"
+ #include "wxluasetup.h"
  #include "wxbind/include/wxbase_bind.h"
  

Index: wxmedia_bind.h
===================================================================
RCS file: /cvsroot/wxlua/wxLua/modules/wxbind/include/wxmedia_bind.h,v
retrieving revision 1.1
retrieving revision 1.2
diff -C2 -d -r1.1 -r1.2
*** wxmedia_bind.h	16 Jul 2007 19:34:43 -0000	1.1
--- wxmedia_bind.h	17 Jul 2007 03:30:22 -0000	1.2
***************
*** 10,13 ****
--- 10,14 ----
  
  #include "wxbind/include/wxbinddefs.h"
+ #include "wxluasetup.h"
  #include "wxbind/include/wxcore_bind.h"
  #include "wxbind/include/wxnet_bind.h"

Index: wxgl_bind.h
===================================================================
RCS file: /cvsroot/wxlua/wxLua/modules/wxbind/include/wxgl_bind.h,v
retrieving revision 1.1
retrieving revision 1.2
diff -C2 -d -r1.1 -r1.2
*** wxgl_bind.h	16 Jul 2007 19:34:43 -0000	1.1
--- wxgl_bind.h	17 Jul 2007 03:30:22 -0000	1.2
***************
*** 10,13 ****
--- 10,14 ----
  
  #include "wxbind/include/wxbinddefs.h"
+ #include "wxluasetup.h"
  #include "wxbind/include/wxcore_bind.h"
  #include "wxbind/include/wxgl_bind.h"

Index: wxstc_bind.h
===================================================================
RCS file: /cvsroot/wxlua/wxLua/modules/wxbind/include/wxstc_bind.h,v
retrieving revision 1.1
retrieving revision 1.2
diff -C2 -d -r1.1 -r1.2
*** wxstc_bind.h	16 Jul 2007 19:34:43 -0000	1.1
--- wxstc_bind.h	17 Jul 2007 03:30:22 -0000	1.2
***************
*** 10,13 ****
--- 10,14 ----
  
  #include "wxbind/include/wxbinddefs.h"
+ #include "wxluasetup.h"
  #include "wxbind/include/wxcore_bind.h"
  #include "wxbind/include/wxstc_bind.h"

Index: wxaui_bind.h
===================================================================
RCS file: /cvsroot/wxlua/wxLua/modules/wxbind/include/wxaui_bind.h,v
retrieving revision 1.1
retrieving revision 1.2
diff -C2 -d -r1.1 -r1.2
*** wxaui_bind.h	16 Jul 2007 19:34:41 -0000	1.1
--- wxaui_bind.h	17 Jul 2007 03:30:22 -0000	1.2
***************
*** 10,13 ****
--- 10,14 ----
  
  #include "wxbind/include/wxbinddefs.h"
+ #include "wxluasetup.h"
  #include "wxbind/include/wxcore_bind.h"
  #include "wxbind/include/wxaui_bind.h"

Index: wxhtml_bind.h
===================================================================
RCS file: /cvsroot/wxlua/wxLua/modules/wxbind/include/wxhtml_bind.h,v
retrieving revision 1.1
retrieving revision 1.2
diff -C2 -d -r1.1 -r1.2
*** wxhtml_bind.h	16 Jul 2007 19:34:43 -0000	1.1
--- wxhtml_bind.h	17 Jul 2007 03:30:22 -0000	1.2
***************
*** 10,13 ****
--- 10,14 ----
  
  #include "wxbind/include/wxbinddefs.h"
+ #include "wxluasetup.h"
  #include "wxbind/include/wxcore_bind.h"
  #include "wxbind/include/wxhtml_bind.h"

Index: wxxml_bind.h
===================================================================
RCS file: /cvsroot/wxlua/wxLua/modules/wxbind/include/wxxml_bind.h,v
retrieving revision 1.1
retrieving revision 1.2
diff -C2 -d -r1.1 -r1.2
*** wxxml_bind.h	16 Jul 2007 19:34:43 -0000	1.1
--- wxxml_bind.h	17 Jul 2007 03:30:22 -0000	1.2
***************
*** 10,13 ****
--- 10,14 ----
  
  #include "wxbind/include/wxbinddefs.h"
+ #include "wxluasetup.h"
  #include "wxbind/include/wxbase_bind.h"
  #include "wxbind/include/wxxml_bind.h"

[Wxlua-commit] wxLua/bindings/wxwidgets wxadv_rules.lua, 1.1, 1.2 wxaui_rules.lua, 1.1, 1.2 wxbase_rules.lua, 1.1, 1.2 wxcore_rules.lua, 1.1, 1.2 wxgl_rules.lua, 1.1, 1.2 wxhtml_rules.lua, 1.1, 1.2 wxmedia_rules.lua, 1.1, 1.2 wxnet_rules.lua, 1.1, 1.2 wxrichtext_rules.lua, 1.1, 1.2 wxstc_rules.lua, 1.1, 1.2 wxxml_rules.lua, 1.1, 1.2 wxxrc_rules.lua, 1.1, 1.2

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

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

Modified Files:
	wxadv_rules.lua wxaui_rules.lua wxbase_rules.lua 
	wxcore_rules.lua wxgl_rules.lua wxhtml_rules.lua 
	wxmedia_rules.lua wxnet_rules.lua wxrichtext_rules.lua 
	wxstc_rules.lua wxxml_rules.lua wxxrc_rules.lua 
Log Message:
Include wxluasetup.h from within the bindings rather than from
  modules/wxbind/wxbinddefs.h so other's don't have to include it.
Fix collecting userdata prematurely, track the userdata on the pointer
  Lua creates instead of the data itself.


Index: wxrichtext_rules.lua
===================================================================
RCS file: /cvsroot/wxlua/wxLua/bindings/wxwidgets/wxrichtext_rules.lua,v
retrieving revision 1.1
retrieving revision 1.2
diff -C2 -d -r1.1 -r1.2
*** wxrichtext_rules.lua	16 Jul 2007 19:34:26 -0000	1.1
--- wxrichtext_rules.lua	17 Jul 2007 03:30:20 -0000	1.2
***************
*** 70,73 ****
--- 70,74 ----
  hook_cpp_binding_header_includes =
      "#include \"wxbind/include/wxbinddefs.h\"\n"..
+     "#include \"wxluasetup.h\"\n"..
      "#include \"wxbind/include/wxcore_bind.h\"\n"..
      "#include \""..hook_cpp_header_filename.."\"\n"

Index: wxadv_rules.lua
===================================================================
RCS file: /cvsroot/wxlua/wxLua/bindings/wxwidgets/wxadv_rules.lua,v
retrieving revision 1.1
retrieving revision 1.2
diff -C2 -d -r1.1 -r1.2
*** wxadv_rules.lua	16 Jul 2007 19:34:23 -0000	1.1
--- wxadv_rules.lua	17 Jul 2007 03:30:20 -0000	1.2
***************
*** 70,73 ****
--- 70,74 ----
  hook_cpp_binding_header_includes =
      "#include \"wxbind/include/wxbinddefs.h\"\n"..
+     "#include \"wxluasetup.h\"\n"..
      "#include \"wxbind/include/wxcore_bind.h\"\n"..
      "#include \""..hook_cpp_header_filename.."\"\n"

Index: wxbase_rules.lua
===================================================================
RCS file: /cvsroot/wxlua/wxLua/bindings/wxwidgets/wxbase_rules.lua,v
retrieving revision 1.1
retrieving revision 1.2
diff -C2 -d -r1.1 -r1.2
*** wxbase_rules.lua	16 Jul 2007 19:34:24 -0000	1.1
--- wxbase_rules.lua	17 Jul 2007 03:30:20 -0000	1.2
***************
*** 74,77 ****
--- 74,78 ----
  hook_cpp_binding_header_includes =
      "#include \"wxbind/include/wxbinddefs.h\"\n"..
+     "#include \"wxluasetup.h\"\n"..
      "#include \""..hook_cpp_header_filename.."\"\n"
  

Index: wxgl_rules.lua
===================================================================
RCS file: /cvsroot/wxlua/wxLua/bindings/wxwidgets/wxgl_rules.lua,v
retrieving revision 1.1
retrieving revision 1.2
diff -C2 -d -r1.1 -r1.2
*** wxgl_rules.lua	16 Jul 2007 19:34:25 -0000	1.1
--- wxgl_rules.lua	17 Jul 2007 03:30:20 -0000	1.2
***************
*** 70,73 ****
--- 70,74 ----
  hook_cpp_binding_header_includes =
      "#include \"wxbind/include/wxbinddefs.h\"\n"..
+     "#include \"wxluasetup.h\"\n"..
      "#include \"wxbind/include/wxcore_bind.h\"\n"..
      "#include \""..hook_cpp_header_filename.."\"\n"

Index: wxstc_rules.lua
===================================================================
RCS file: /cvsroot/wxlua/wxLua/bindings/wxwidgets/wxstc_rules.lua,v
retrieving revision 1.1
retrieving revision 1.2
diff -C2 -d -r1.1 -r1.2
*** wxstc_rules.lua	16 Jul 2007 19:34:26 -0000	1.1
--- wxstc_rules.lua	17 Jul 2007 03:30:20 -0000	1.2
***************
*** 70,73 ****
--- 70,74 ----
  hook_cpp_binding_header_includes =
      "#include \"wxbind/include/wxbinddefs.h\"\n"..
+     "#include \"wxluasetup.h\"\n"..
      "#include \"wxbind/include/wxcore_bind.h\"\n"..
      "#include \""..hook_cpp_header_filename.."\"\n"

Index: wxaui_rules.lua
===================================================================
RCS file: /cvsroot/wxlua/wxLua/bindings/wxwidgets/wxaui_rules.lua,v
retrieving revision 1.1
retrieving revision 1.2
diff -C2 -d -r1.1 -r1.2
*** wxaui_rules.lua	16 Jul 2007 19:34:23 -0000	1.1
--- wxaui_rules.lua	17 Jul 2007 03:30:20 -0000	1.2
***************
*** 70,73 ****
--- 70,74 ----
  hook_cpp_binding_header_includes =
      "#include \"wxbind/include/wxbinddefs.h\"\n"..
+     "#include \"wxluasetup.h\"\n"..
      "#include \"wxbind/include/wxcore_bind.h\"\n"..
      "#include \""..hook_cpp_header_filename.."\"\n"

Index: wxnet_rules.lua
===================================================================
RCS file: /cvsroot/wxlua/wxLua/bindings/wxwidgets/wxnet_rules.lua,v
retrieving revision 1.1
retrieving revision 1.2
diff -C2 -d -r1.1 -r1.2
*** wxnet_rules.lua	16 Jul 2007 19:34:26 -0000	1.1
--- wxnet_rules.lua	17 Jul 2007 03:30:20 -0000	1.2
***************
*** 70,73 ****
--- 70,74 ----
  hook_cpp_binding_header_includes =
      "#include \"wxbind/include/wxbinddefs.h\"\n"..
+     "#include \"wxluasetup.h\"\n"..
      "#include \"wxbind/include/wxcore_bind.h\"\n"..
      "#include \""..hook_cpp_header_filename.."\"\n"

Index: wxmedia_rules.lua
===================================================================
RCS file: /cvsroot/wxlua/wxLua/bindings/wxwidgets/wxmedia_rules.lua,v
retrieving revision 1.1
retrieving revision 1.2
diff -C2 -d -r1.1 -r1.2
*** wxmedia_rules.lua	16 Jul 2007 19:34:26 -0000	1.1
--- wxmedia_rules.lua	17 Jul 2007 03:30:20 -0000	1.2
***************
*** 70,73 ****
--- 70,74 ----
  hook_cpp_binding_header_includes =
      "#include \"wxbind/include/wxbinddefs.h\"\n"..
+     "#include \"wxluasetup.h\"\n"..
      "#include \"wxbind/include/wxcore_bind.h\"\n"..
      "#include \"wxbind/include/wxnet_bind.h\"\n"..

Index: wxcore_rules.lua
===================================================================
RCS file: /cvsroot/wxlua/wxLua/bindings/wxwidgets/wxcore_rules.lua,v
retrieving revision 1.1
retrieving revision 1.2
diff -C2 -d -r1.1 -r1.2
*** wxcore_rules.lua	16 Jul 2007 19:34:25 -0000	1.1
--- wxcore_rules.lua	17 Jul 2007 03:30:20 -0000	1.2
***************
*** 74,77 ****
--- 74,78 ----
  hook_cpp_binding_header_includes =
      "#include \"wxbind/include/wxbinddefs.h\"\n"..
+     "#include \"wxluasetup.h\"\n"..
      "#include \"wxbind/include/wxbase_bind.h\"\n"..
      "#include \""..hook_cpp_header_filename.."\"\n"..

Index: wxhtml_rules.lua
===================================================================
RCS file: /cvsroot/wxlua/wxLua/bindings/wxwidgets/wxhtml_rules.lua,v
retrieving revision 1.1
retrieving revision 1.2
diff -C2 -d -r1.1 -r1.2
*** wxhtml_rules.lua	16 Jul 2007 19:34:26 -0000	1.1
--- wxhtml_rules.lua	17 Jul 2007 03:30:20 -0000	1.2
***************
*** 70,73 ****
--- 70,74 ----
  hook_cpp_binding_header_includes =
      "#include \"wxbind/include/wxbinddefs.h\"\n"..
+     "#include \"wxluasetup.h\"\n"..
      "#include \"wxbind/include/wxcore_bind.h\"\n"..
      "#include \""..hook_cpp_header_filename.."\"\n"

Index: wxxml_rules.lua
===================================================================
RCS file: /cvsroot/wxlua/wxLua/bindings/wxwidgets/wxxml_rules.lua,v
retrieving revision 1.1
retrieving revision 1.2
diff -C2 -d -r1.1 -r1.2
*** wxxml_rules.lua	16 Jul 2007 19:34:27 -0000	1.1
--- wxxml_rules.lua	17 Jul 2007 03:30:21 -0000	1.2
***************
*** 70,73 ****
--- 70,74 ----
  hook_cpp_binding_header_includes =
      "#include \"wxbind/include/wxbinddefs.h\"\n"..
+     "#include \"wxluasetup.h\"\n"..
      "#include \"wxbind/include/wxbase_bind.h\"\n"..
      "#include \""..hook_cpp_header_filename.."\"\n"

Index: wxxrc_rules.lua
===================================================================
RCS file: /cvsroot/wxlua/wxLua/bindings/wxwidgets/wxxrc_rules.lua,v
retrieving revision 1.1
retrieving revision 1.2
diff -C2 -d -r1.1 -r1.2
*** wxxrc_rules.lua	16 Jul 2007 19:34:28 -0000	1.1
--- wxxrc_rules.lua	17 Jul 2007 03:30:21 -0000	1.2
***************
*** 70,73 ****
--- 70,74 ----
  hook_cpp_binding_header_includes =
      "#include \"wxbind/include/wxbinddefs.h\"\n"..
+     "#include \"wxluasetup.h\"\n"..
      "#include \"wxbind/include/wxcore_bind.h\"\n"..
      "#include \""..hook_cpp_header_filename.."\"\n"

[Wxlua-commit] wxLua/docs changelog.txt, 1.41, 1.42 wxlua.html, 1.30, 1.31

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

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

Modified Files:
	changelog.txt wxlua.html 
Log Message:
Include wxluasetup.h from within the bindings rather than from
  modules/wxbind/wxbinddefs.h so other's don't have to include it.
Fix collecting userdata prematurely, track the userdata on the pointer
  Lua creates instead of the data itself.


Index: wxlua.html
===================================================================
RCS file: /cvsroot/wxlua/wxLua/docs/wxlua.html,v
retrieving revision 1.30
retrieving revision 1.31
diff -C2 -d -r1.30 -r1.31
*** wxlua.html	16 Jul 2007 19:34:29 -0000	1.30
--- wxlua.html	17 Jul 2007 03:30:22 -0000	1.31
***************
*** 3,26 ****
  <head>
  
- 
- 
- 
-   
-   
-   
    <meta content="text/html; charset=ISO-8859-1" http-equiv="content-type">
  
[...8617 lines suppressed...]
  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>

Index: changelog.txt
===================================================================
RCS file: /cvsroot/wxlua/wxLua/docs/changelog.txt,v
retrieving revision 1.41
retrieving revision 1.42
diff -C2 -d -r1.41 -r1.42
*** changelog.txt	16 Jul 2007 19:34:29 -0000	1.41
--- changelog.txt	17 Jul 2007 03:30:22 -0000	1.42
***************
*** 9,12 ****
--- 9,15 ----
  
   - Allow bool = 1/0 and 1/0 = bool in wxlua_getboolean/integer/number.
+  - Fix bug in prematurely garbage collecting userdata. 
+    The userdata was previously keyed on the pointer to the data instead 
+    of a pointer to the Lua userdata that wraps the data.
  
   version 2.8.4.1

[Wxlua-commit] wxLua/modules/wxlua/src wxlbind.cpp, 1.83, 1.84 wxlstate.cpp, 1.120, 1.121

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

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

Modified Files:
	wxlbind.cpp wxlstate.cpp 
Log Message:
Include wxluasetup.h from within the bindings rather than from
  modules/wxbind/wxbinddefs.h so other's don't have to include it.
Fix collecting userdata prematurely, track the userdata on the pointer
  Lua creates instead of the data itself.


Index: wxlstate.cpp
===================================================================
RCS file: /cvsroot/wxlua/wxLua/modules/wxlua/src/wxlstate.cpp,v
retrieving revision 1.120
retrieving revision 1.121
diff -C2 -d -r1.120 -r1.121
*** wxlstate.cpp	16 Jul 2007 19:35:30 -0000	1.120
--- wxlstate.cpp	17 Jul 2007 03:30:23 -0000	1.121
***************
*** 355,362 ****
              {
                  wxlua_pushkey_wxLuaObjects(L);
!                 lua_rawget(L, LUA_REGISTRYINDEX);       // pop key, push result (the obj table)
  
!                 lua_pushlightuserdata(L, (void*)u);
!                 lua_pushnumber(L, tag);      // t["lightuserdata ptr"] = tag
                  lua_rawset(L, -3);
                  lua_pop(L, 1);
--- 355,362 ----
              {
                  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_pushnumber(L, tag); // t["lightuserdata ptr"] = tag
                  lua_rawset(L, -3);
                  lua_pop(L, 1);

Index: wxlbind.cpp
===================================================================
RCS file: /cvsroot/wxlua/wxLua/modules/wxlua/src/wxlbind.cpp,v
retrieving revision 1.83
retrieving revision 1.84
diff -C2 -d -r1.83 -r1.84
*** wxlbind.cpp	28 Jun 2007 22:45:57 -0000	1.83
--- wxlbind.cpp	17 Jul 2007 03:30:22 -0000	1.84
***************
*** 249,253 ****
          wxCHECK_MSG(wxlState.Ok(), 0, wxT("Invalid wxLuaState"));
  
!         void* key = wxlua_ttouserdata(L, 1, true);
  
          wxCHECK_MSG(key != 0, 0, wxT("NULL user data in wxluabind_gc_wxLuaBindClass"));
--- 249,255 ----
          wxCHECK_MSG(wxlState.Ok(), 0, wxT("Invalid wxLuaState"));
  
!         void* key = lua_touserdata(L, 1);
!         wxlua_ttouserdata(L, 1, true);
! 
  
          wxCHECK_MSG(key != 0, 0, wxT("NULL user data in wxluabind_gc_wxLuaBindClass"));

[Wxlua-commit] wxLua/modules/wxbind/include wxbinddefs.h,1.4,1.5

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

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

Modified Files:
	wxbinddefs.h 
Log Message:
MSVC6 doesn't have #warning? Rem it out for now


Index: wxbinddefs.h
===================================================================
RCS file: /cvsroot/wxlua/wxLua/modules/wxbind/include/wxbinddefs.h,v
retrieving revision 1.4
retrieving revision 1.5
diff -C2 -d -r1.4 -r1.5
*** wxbinddefs.h	16 Jul 2007 19:34:42 -0000	1.4
--- wxbinddefs.h	16 Jul 2007 23:06:52 -0000	1.5
***************
*** 1,5 ****
  //----------------------------------------------------------------------------
  // Purpose:     Defines for the wxWidgets binding of wxLua
! // Author:      John Labenski
  // Created:     04/02/2006
  // RCS-ID:
--- 1,5 ----
  //----------------------------------------------------------------------------
  // Purpose:     Defines for the wxWidgets binding of wxLua
! // Author:      John Labenski, Francesco Montorsi
  // Created:     04/02/2006
  // RCS-ID:
***************
*** 13,17 ****
  #include "wx/defs.h"
  #include "wxlua/include/wxlstate.h"
- #include "wxluasetup.h"
  
  // ----------------------------------------------------------------------------
--- 13,16 ----
***************
*** 208,212 ****
  #else
      #define WXLUA_DECLARE_BIND_WXMEDIA
!     #warning "WXLUA_DECLARE_BIND_WXMEDIA is not used since wxUSE_MEDIACTRL=0"
  #endif //wxUSE_MEDIACTRL
  
--- 207,211 ----
  #else
      #define WXLUA_DECLARE_BIND_WXMEDIA
!     // warning "WXLUA_DECLARE_BIND_WXMEDIA is not used since wxUSE_MEDIACTRL=0"
  #endif //wxUSE_MEDIACTRL
  
***************
*** 215,219 ****
  #else
      #define WXLUA_DECLARE_BIND_WXGL
!     #warning "WXLUA_DECLARE_BIND_WXGL is not used since wxUSE_GLCANVAS=0"
  #endif //wxUSE_GLCANVAS
  
--- 214,218 ----
  #else
      #define WXLUA_DECLARE_BIND_WXGL
!     // warning "WXLUA_DECLARE_BIND_WXGL is not used since wxUSE_GLCANVAS=0"
  #endif //wxUSE_GLCANVAS
  
***************
*** 263,267 ****
  #else
      #define WXLUA_IMPLEMENT_BIND_WXMEDIA
!     #warning "WXLUA_IMPLEMENT_BIND_WXMEDIA is not used since wxUSE_MEDIACTRL=0"
  #endif //wxUSE_MEDIACTRL
  
--- 262,266 ----
  #else
      #define WXLUA_IMPLEMENT_BIND_WXMEDIA
!     //#warning "WXLUA_IMPLEMENT_BIND_WXMEDIA is not used since wxUSE_MEDIACTRL=0"
  #endif //wxUSE_MEDIACTRL
  
***************
*** 270,274 ****
  #else
      #define WXLUA_IMPLEMENT_BIND_WXGL
!     #warning "WXLUA_IMPLEMENT_BIND_WXGL is not used since wxUSE_GLCANVAS=0"
  #endif //wxUSE_GLCANVAS
  
--- 269,273 ----
  #else
      #define WXLUA_IMPLEMENT_BIND_WXGL
!     //#warning "WXLUA_IMPLEMENT_BIND_WXGL is not used since wxUSE_GLCANVAS=0"
  #endif //wxUSE_GLCANVAS
  

[Wxlua-commit] wxLua/modules/build/msvc8 modules_mod_wxbindadv.vcproj, 1.2, 1.3 modules_mod_wxbindaui.vcproj, 1.3, 1.4 modules_mod_wxbindbase.vcproj, 1.2, 1.3 modules_mod_wxbindcore.vcproj, 1.2, 1.3 modules_mod_wxbindgl.vcproj, 1.2, 1.3 modules_mod_wxbindhtml.vcproj, 1.2, 1.3 modules_mod_wxbindmedia.vcproj, 1.2, 1.3 modules_mod_wxbindnet.vcproj, 1.2, 1.3 modules_mod_wxbindrichtext.vcproj, 1.2, 1.3 modules_mod_wxbindstc.vcproj, 1.6, 1.7 modules_mod_wxbindxml.vcproj, 1.2, 1.3 modules_mod_wxbindxrc.vcproj, 1.2, 1.3

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

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

Modified Files:
	modules_mod_wxbindadv.vcproj modules_mod_wxbindaui.vcproj 
	modules_mod_wxbindbase.vcproj modules_mod_wxbindcore.vcproj 
	modules_mod_wxbindgl.vcproj modules_mod_wxbindhtml.vcproj 
	modules_mod_wxbindmedia.vcproj modules_mod_wxbindnet.vcproj 
	modules_mod_wxbindrichtext.vcproj modules_mod_wxbindstc.vcproj 
	modules_mod_wxbindxml.vcproj modules_mod_wxbindxrc.vcproj 
Log Message:
Get dummy.cpp working for single wxbind directory


Index: modules_mod_wxbindgl.vcproj
===================================================================
RCS file: /cvsroot/wxlua/wxLua/modules/build/msvc8/modules_mod_wxbindgl.vcproj,v
retrieving revision 1.2
retrieving revision 1.3
diff -C2 -d -r1.2 -r1.3
*** modules_mod_wxbindgl.vcproj	16 Jul 2007 20:29:53 -0000	1.2
--- modules_mod_wxbindgl.vcproj	16 Jul 2007 22:53:31 -0000	1.3
***************
*** 293,297 ****
  	<Files>
  		<Filter Name="WXBINDGL sources" UniqueIdentifier="{28D9984E-30D5-5C5E-B59B-75D94EF83FD9}">
! 			<File RelativePath="..\..\wxbind\src\dummy.cpp"/>
  			<File RelativePath="..\..\wxbind\src\wxgl_bind.cpp"/>
  			<File RelativePath="..\..\wxbind\src\wxgl_gl.cpp"/>
--- 293,346 ----
  	<Files>
  		<Filter Name="WXBINDGL sources" UniqueIdentifier="{28D9984E-30D5-5C5E-B59B-75D94EF83FD9}">
! 			<File RelativePath="..\..\wxbind\src\dummy.cpp">
! 				<FileConfiguration Name="Release Unicode DLL Monolithic|Win32">
! 					<Tool Name="VCCLCompilerTool" UsePrecompiledHeader="1"/>
! 				</FileConfiguration>
! 				<FileConfiguration Name="Release Unicode DLL Multilib|Win32">
! 					<Tool Name="VCCLCompilerTool" UsePrecompiledHeader="1"/>
! 				</FileConfiguration>
! 				<FileConfiguration Name="Release Unicode Monolithic|Win32">
! 					<Tool Name="VCCLCompilerTool" UsePrecompiledHeader="1"/>
! 				</FileConfiguration>
! 				<FileConfiguration Name="Release Unicode Multilib|Win32">
! 					<Tool Name="VCCLCompilerTool" UsePrecompiledHeader="1"/>
! 				</FileConfiguration>
! 				<FileConfiguration Name="Release DLL Monolithic|Win32">
! 					<Tool Name="VCCLCompilerTool" UsePrecompiledHeader="1"/>
! 				</FileConfiguration>
! 				<FileConfiguration Name="Release DLL Multilib|Win32">
! 					<Tool Name="VCCLCompilerTool" UsePrecompiledHeader="1"/>
! 				</FileConfiguration>
! 				<FileConfiguration Name="Release Monolithic|Win32">
! 					<Tool Name="VCCLCompilerTool" UsePrecompiledHeader="1"/>
! 				</FileConfiguration>
! 				<FileConfiguration Name="Release Multilib|Win32">
! 					<Tool Name="VCCLCompilerTool" UsePrecompiledHeader="1"/>
! 				</FileConfiguration>
! 				<FileConfiguration Name="Debug Unicode DLL Monolithic|Win32">
! 					<Tool Name="VCCLCompilerTool" UsePrecompiledHeader="1"/>
! 				</FileConfiguration>
! 				<FileConfiguration Name="Debug Unicode DLL Multilib|Win32">
! 					<Tool Name="VCCLCompilerTool" UsePrecompiledHeader="1"/>
! 				</FileConfiguration>
! 				<FileConfiguration Name="Debug Unicode Monolithic|Win32">
! 					<Tool Name="VCCLCompilerTool" UsePrecompiledHeader="1"/>
! 				</FileConfiguration>
! 				<FileConfiguration Name="Debug Unicode Multilib|Win32">
! 					<Tool Name="VCCLCompilerTool" UsePrecompiledHeader="1"/>
! 				</FileConfiguration>
! 				<FileConfiguration Name="Debug DLL Monolithic|Win32">
! 					<Tool Name="VCCLCompilerTool" UsePrecompiledHeader="1"/>
! 				</FileConfiguration>
! 				<FileConfiguration Name="Debug DLL Multilib|Win32">
! 					<Tool Name="VCCLCompilerTool" UsePrecompiledHeader="1"/>
! 				</FileConfiguration>
! 				<FileConfiguration Name="Debug Monolithic|Win32">
! 					<Tool Name="VCCLCompilerTool" UsePrecompiledHeader="1"/>
! 				</FileConfiguration>
! 				<FileConfiguration Name="Debug Multilib|Win32">
! 					<Tool Name="VCCLCompilerTool" UsePrecompiledHeader="1"/>
! 				</FileConfiguration>
! 			</File>
  			<File RelativePath="..\..\wxbind\src\wxgl_bind.cpp"/>
  			<File RelativePath="..\..\wxbind\src\wxgl_gl.cpp"/>

Index: modules_mod_wxbindnet.vcproj
===================================================================
RCS file: /cvsroot/wxlua/wxLua/modules/build/msvc8/modules_mod_wxbindnet.vcproj,v
retrieving revision 1.2
retrieving revision 1.3
diff -C2 -d -r1.2 -r1.3
*** modules_mod_wxbindnet.vcproj	16 Jul 2007 20:29:53 -0000	1.2
--- modules_mod_wxbindnet.vcproj	16 Jul 2007 22:53:31 -0000	1.3
***************
*** 293,297 ****
  	<Files>
  		<Filter Name="WXBINDNET sources" UniqueIdentifier="{20291691-ABCC-525E-AF49-74AE0E35651B}">
! 			<File RelativePath="..\..\wxbind\src\dummy.cpp"/>
  			<File RelativePath="..\..\wxbind\src\wxnet_bind.cpp"/>
  			<File RelativePath="..\..\wxbind\src\wxnet_net.cpp"/>
--- 293,346 ----
  	<Files>
  		<Filter Name="WXBINDNET sources" UniqueIdentifier="{20291691-ABCC-525E-AF49-74AE0E35651B}">
! 			<File RelativePath="..\..\wxbind\src\dummy.cpp">
! 				<FileConfiguration Name="Release Unicode DLL Monolithic|Win32">
! 					<Tool Name="VCCLCompilerTool" UsePrecompiledHeader="1"/>
! 				</FileConfiguration>
! 				<FileConfiguration Name="Release Unicode DLL Multilib|Win32">
! 					<Tool Name="VCCLCompilerTool" UsePrecompiledHeader="1"/>
! 				</FileConfiguration>
! 				<FileConfiguration Name="Release Unicode Monolithic|Win32">
! 					<Tool Name="VCCLCompilerTool" UsePrecompiledHeader="1"/>
! 				</FileConfiguration>
! 				<FileConfiguration Name="Release Unicode Multilib|Win32">
! 					<Tool Name="VCCLCompilerTool" UsePrecompiledHeader="1"/>
! 				</FileConfiguration>
! 				<FileConfiguration Name="Release DLL Monolithic|Win32">
! 					<Tool Name="VCCLCompilerTool" UsePrecompiledHeader="1"/>
! 				</FileConfiguration>
! 				<FileConfiguration Name="Release DLL Multilib|Win32">
! 					<Tool Name="VCCLCompilerTool" UsePrecompiledHeader="1"/>
! 				</FileConfiguration>
! 				<FileConfiguration Name="Release Monolithic|Win32">
! 					<Tool Name="VCCLCompilerTool" UsePrecompiledHeader="1"/>
! 				</FileConfiguration>
! 				<FileConfiguration Name="Release Multilib|Win32">
! 					<Tool Name="VCCLCompilerTool" UsePrecompiledHeader="1"/>
! 				</FileConfiguration>
! 				<FileConfiguration Name="Debug Unicode DLL Monolithic|Win32">
! 					<Tool Name="VCCLCompilerTool" UsePrecompiledHeader="1"/>
! 				</FileConfiguration>
! 				<FileConfiguration Name="Debug Unicode DLL Multilib|Win32">
! 					<Tool Name="VCCLCompilerTool" UsePrecompiledHeader="1"/>
! 				</FileConfiguration>
! 				<FileConfiguration Name="Debug Unicode Monolithic|Win32">
! 					<Tool Name="VCCLCompilerTool" UsePrecompiledHeader="1"/>
! 				</FileConfiguration>
! 				<FileConfiguration Name="Debug Unicode Multilib|Win32">
! 					<Tool Name="VCCLCompilerTool" UsePrecompiledHeader="1"/>
! 				</FileConfiguration>
! 				<FileConfiguration Name="Debug DLL Monolithic|Win32">
! 					<Tool Name="VCCLCompilerTool" UsePrecompiledHeader="1"/>
! 				</FileConfiguration>
! 				<FileConfiguration Name="Debug DLL Multilib|Win32">
! 					<Tool Name="VCCLCompilerTool" UsePrecompiledHeader="1"/>
! 				</FileConfiguration>
! 				<FileConfiguration Name="Debug Monolithic|Win32">
! 					<Tool Name="VCCLCompilerTool" UsePrecompiledHeader="1"/>
! 				</FileConfiguration>
! 				<FileConfiguration Name="Debug Multilib|Win32">
! 					<Tool Name="VCCLCompilerTool" UsePrecompiledHeader="1"/>
! 				</FileConfiguration>
! 			</File>
  			<File RelativePath="..\..\wxbind\src\wxnet_bind.cpp"/>
  			<File RelativePath="..\..\wxbind\src\wxnet_net.cpp"/>

Index: modules_mod_wxbindrichtext.vcproj
===================================================================
RCS file: /cvsroot/wxlua/wxLua/modules/build/msvc8/modules_mod_wxbindrichtext.vcproj,v
retrieving revision 1.2
retrieving revision 1.3
diff -C2 -d -r1.2 -r1.3
*** modules_mod_wxbindrichtext.vcproj	16 Jul 2007 20:29:53 -0000	1.2
--- modules_mod_wxbindrichtext.vcproj	16 Jul 2007 22:53:32 -0000	1.3
***************
*** 293,297 ****
  	<Files>
  		<Filter Name="WXBINDRICHTEXT sources" UniqueIdentifier="{470638AC-1A01-5D37-8950-27106E6EFED1}">
! 			<File RelativePath="..\..\wxbind\src\dummy.cpp"/>
  			<File RelativePath="..\..\wxbind\src\wxrichtext_bind.cpp"/>
  			<File RelativePath="..\..\wxbind\src\wxrichtext_richtext.cpp"/>
--- 293,346 ----
  	<Files>
  		<Filter Name="WXBINDRICHTEXT sources" UniqueIdentifier="{470638AC-1A01-5D37-8950-27106E6EFED1}">
! 			<File RelativePath="..\..\wxbind\src\dummy.cpp">
! 				<FileConfiguration Name="Release Unicode DLL Monolithic|Win32">
! 					<Tool Name="VCCLCompilerTool" UsePrecompiledHeader="1"/>
! 				</FileConfiguration>
! 				<FileConfiguration Name="Release Unicode DLL Multilib|Win32">
! 					<Tool Name="VCCLCompilerTool" UsePrecompiledHeader="1"/>
! 				</FileConfiguration>
! 				<FileConfiguration Name="Release Unicode Monolithic|Win32">
! 					<Tool Name="VCCLCompilerTool" UsePrecompiledHeader="1"/>
! 				</FileConfiguration>
! 				<FileConfiguration Name="Release Unicode Multilib|Win32">
! 					<Tool Name="VCCLCompilerTool" UsePrecompiledHeader="1"/>
! 				</FileConfiguration>
! 				<FileConfiguration Name="Release DLL Monolithic|Win32">
! 					<Tool Name="VCCLCompilerTool" UsePrecompiledHeader="1"/>
! 				</FileConfiguration>
! 				<FileConfiguration Name="Release DLL Multilib|Win32">
! 					<Tool Name="VCCLCompilerTool" UsePrecompiledHeader="1"/>
! 				</FileConfiguration>
! 				<FileConfiguration Name="Release Monolithic|Win32">
! 					<Tool Name="VCCLCompilerTool" UsePrecompiledHeader="1"/>
! 				</FileConfiguration>
! 				<FileConfiguration Name="Release Multilib|Win32">
! 					<Tool Name="VCCLCompilerTool" UsePrecompiledHeader="1"/>
! 				</FileConfiguration>
! 				<FileConfiguration Name="Debug Unicode DLL Monolithic|Win32">
! 					<Tool Name="VCCLCompilerTool" UsePrecompiledHeader="1"/>
! 				</FileConfiguration>
! 				<FileConfiguration Name="Debug Unicode DLL Multilib|Win32">
! 					<Tool Name="VCCLCompilerTool" UsePrecompiledHeader="1"/>
! 				</FileConfiguration>
! 				<FileConfiguration Name="Debug Unicode Monolithic|Win32">
! 					<Tool Name="VCCLCompilerTool" UsePrecompiledHeader="1"/>
! 				</FileConfiguration>
! 				<FileConfiguration Name="Debug Unicode Multilib|Win32">
! 					<Tool Name="VCCLCompilerTool" UsePrecompiledHeader="1"/>
! 				</FileConfiguration>
! 				<FileConfiguration Name="Debug DLL Monolithic|Win32">
! 					<Tool Name="VCCLCompilerTool" UsePrecompiledHeader="1"/>
! 				</FileConfiguration>
! 				<FileConfiguration Name="Debug DLL Multilib|Win32">
! 					<Tool Name="VCCLCompilerTool" UsePrecompiledHeader="1"/>
! 				</FileConfiguration>
! 				<FileConfiguration Name="Debug Monolithic|Win32">
! 					<Tool Name="VCCLCompilerTool" UsePrecompiledHeader="1"/>
! 				</FileConfiguration>
! 				<FileConfiguration Name="Debug Multilib|Win32">
! 					<Tool Name="VCCLCompilerTool" UsePrecompiledHeader="1"/>
! 				</FileConfiguration>
! 			</File>
  			<File RelativePath="..\..\wxbind\src\wxrichtext_bind.cpp"/>
  			<File RelativePath="..\..\wxbind\src\wxrichtext_richtext.cpp"/>

Index: modules_mod_wxbindcore.vcproj
===================================================================
RCS file: /cvsroot/wxlua/wxLua/modules/build/msvc8/modules_mod_wxbindcore.vcproj,v
retrieving revision 1.2
retrieving revision 1.3
diff -C2 -d -r1.2 -r1.3
*** modules_mod_wxbindcore.vcproj	16 Jul 2007 20:29:53 -0000	1.2
--- modules_mod_wxbindcore.vcproj	16 Jul 2007 22:53:31 -0000	1.3
***************
*** 293,297 ****
  	<Files>
  		<Filter Name="WXBINDCORE sources" UniqueIdentifier="{EB046516-B4FC-5E7B-851A-91E5247D95CC}">
! 			<File RelativePath="..\..\wxbind\src\dummy.cpp"/>
  			<File RelativePath="..\..\wxbind\src\wxcore_appframe.cpp"/>
  			<File RelativePath="..\..\wxbind\src\wxcore_bind.cpp"/>
--- 293,346 ----
  	<Files>
  		<Filter Name="WXBINDCORE sources" UniqueIdentifier="{EB046516-B4FC-5E7B-851A-91E5247D95CC}">
! 			<File RelativePath="..\..\wxbind\src\dummy.cpp">
! 				<FileConfiguration Name="Release Unicode DLL Monolithic|Win32">
! 					<Tool Name="VCCLCompilerTool" UsePrecompiledHeader="1"/>
! 				</FileConfiguration>
! 				<FileConfiguration Name="Release Unicode DLL Multilib|Win32">
! 					<Tool Name="VCCLCompilerTool" UsePrecompiledHeader="1"/>
! 				</FileConfiguration>
! 				<FileConfiguration Name="Release Unicode Monolithic|Win32">
! 					<Tool Name="VCCLCompilerTool" UsePrecompiledHeader="1"/>
! 				</FileConfiguration>
! 				<FileConfiguration Name="Release Unicode Multilib|Win32">
! 					<Tool Name="VCCLCompilerTool" UsePrecompiledHeader="1"/>
! 				</FileConfiguration>
! 				<FileConfiguration Name="Release DLL Monolithic|Win32">
! 					<Tool Name="VCCLCompilerTool" UsePrecompiledHeader="1"/>
! 				</FileConfiguration>
! 				<FileConfiguration Name="Release DLL Multilib|Win32">
! 					<Tool Name="VCCLCompilerTool" UsePrecompiledHeader="1"/>
! 				</FileConfiguration>
! 				<FileConfiguration Name="Release Monolithic|Win32">
! 					<Tool Name="VCCLCompilerTool" UsePrecompiledHeader="1"/>
! 				</FileConfiguration>
! 				<FileConfiguration Name="Release Multilib|Win32">
! 					<Tool Name="VCCLCompilerTool" UsePrecompiledHeader="1"/>
! 				</FileConfiguration>
! 				<FileConfiguration Name="Debug Unicode DLL Monolithic|Win32">
! 					<Tool Name="VCCLCompilerTool" UsePrecompiledHeader="1"/>
! 				</FileConfiguration>
! 				<FileConfiguration Name="Debug Unicode DLL Multilib|Win32">
! 					<Tool Name="VCCLCompilerTool" UsePrecompiledHeader="1"/>
! 				</FileConfiguration>
! 				<FileConfiguration Name="Debug Unicode Monolithic|Win32">
! 					<Tool Name="VCCLCompilerTool" UsePrecompiledHeader="1"/>
! 				</FileConfiguration>
! 				<FileConfiguration Name="Debug Unicode Multilib|Win32">
! 					<Tool Name="VCCLCompilerTool" UsePrecompiledHeader="1"/>
! 				</FileConfiguration>
! 				<FileConfiguration Name="Debug DLL Monolithic|Win32">
! 					<Tool Name="VCCLCompilerTool" UsePrecompiledHeader="1"/>
! 				</FileConfiguration>
! 				<FileConfiguration Name="Debug DLL Multilib|Win32">
! 					<Tool Name="VCCLCompilerTool" UsePrecompiledHeader="1"/>
! 				</FileConfiguration>
! 				<FileConfiguration Name="Debug Monolithic|Win32">
! 					<Tool Name="VCCLCompilerTool" UsePrecompiledHeader="1"/>
! 				</FileConfiguration>
! 				<FileConfiguration Name="Debug Multilib|Win32">
! 					<Tool Name="VCCLCompilerTool" UsePrecompiledHeader="1"/>
! 				</FileConfiguration>
! 			</File>
  			<File RelativePath="..\..\wxbind\src\wxcore_appframe.cpp"/>
  			<File RelativePath="..\..\wxbind\src\wxcore_bind.cpp"/>

Index: modules_mod_wxbindxrc.vcproj
===================================================================
RCS file: /cvsroot/wxlua/wxLua/modules/build/msvc8/modules_mod_wxbindxrc.vcproj,v
retrieving revision 1.2
retrieving revision 1.3
diff -C2 -d -r1.2 -r1.3
*** modules_mod_wxbindxrc.vcproj	16 Jul 2007 20:29:53 -0000	1.2
--- modules_mod_wxbindxrc.vcproj	16 Jul 2007 22:53:32 -0000	1.3
***************
*** 293,297 ****
  	<Files>
  		<Filter Name="WXBINDXRC sources" UniqueIdentifier="{4F7C5846-929D-5F78-AA95-54B2793D81FD}">
! 			<File RelativePath="..\..\wxbind\src\dummy.cpp"/>
  			<File RelativePath="..\..\wxbind\src\wxxrc_bind.cpp"/>
  			<File RelativePath="..\..\wxbind\src\wxxrc_xrc.cpp"/>
--- 293,346 ----
  	<Files>
  		<Filter Name="WXBINDXRC sources" UniqueIdentifier="{4F7C5846-929D-5F78-AA95-54B2793D81FD}">
! 			<File RelativePath="..\..\wxbind\src\dummy.cpp">
! 				<FileConfiguration Name="Release Unicode DLL Monolithic|Win32">
! 					<Tool Name="VCCLCompilerTool" UsePrecompiledHeader="1"/>
! 				</FileConfiguration>
! 				<FileConfiguration Name="Release Unicode DLL Multilib|Win32">
! 					<Tool Name="VCCLCompilerTool" UsePrecompiledHeader="1"/>
! 				</FileConfiguration>
! 				<FileConfiguration Name="Release Unicode Monolithic|Win32">
! 					<Tool Name="VCCLCompilerTool" UsePrecompiledHeader="1"/>
! 				</FileConfiguration>
! 				<FileConfiguration Name="Release Unicode Multilib|Win32">
! 					<Tool Name="VCCLCompilerTool" UsePrecompiledHeader="1"/>
! 				</FileConfiguration>
! 				<FileConfiguration Name="Release DLL Monolithic|Win32">
! 					<Tool Name="VCCLCompilerTool" UsePrecompiledHeader="1"/>
! 				</FileConfiguration>
! 				<FileConfiguration Name="Release DLL Multilib|Win32">
! 					<Tool Name="VCCLCompilerTool" UsePrecompiledHeader="1"/>
! 				</FileConfiguration>
! 				<FileConfiguration Name="Release Monolithic|Win32">
! 					<Tool Name="VCCLCompilerTool" UsePrecompiledHeader="1"/>
! 				</FileConfiguration>
! 				<FileConfiguration Name="Release Multilib|Win32">
! 					<Tool Name="VCCLCompilerTool" UsePrecompiledHeader="1"/>
! 				</FileConfiguration>
! 				<FileConfiguration Name="Debug Unicode DLL Monolithic|Win32">
! 					<Tool Name="VCCLCompilerTool" UsePrecompiledHeader="1"/>
! 				</FileConfiguration>
! 				<FileConfiguration Name="Debug Unicode DLL Multilib|Win32">
! 					<Tool Name="VCCLCompilerTool" UsePrecompiledHeader="1"/>
! 				</FileConfiguration>
! 				<FileConfiguration Name="Debug Unicode Monolithic|Win32">
! 					<Tool Name="VCCLCompilerTool" UsePrecompiledHeader="1"/>
! 				</FileConfiguration>
! 				<FileConfiguration Name="Debug Unicode Multilib|Win32">
! 					<Tool Name="VCCLCompilerTool" UsePrecompiledHeader="1"/>
! 				</FileConfiguration>
! 				<FileConfiguration Name="Debug DLL Monolithic|Win32">
! 					<Tool Name="VCCLCompilerTool" UsePrecompiledHeader="1"/>
! 				</FileConfiguration>
! 				<FileConfiguration Name="Debug DLL Multilib|Win32">
! 					<Tool Name="VCCLCompilerTool" UsePrecompiledHeader="1"/>
! 				</FileConfiguration>
! 				<FileConfiguration Name="Debug Monolithic|Win32">
! 					<Tool Name="VCCLCompilerTool" UsePrecompiledHeader="1"/>
! 				</FileConfiguration>
! 				<FileConfiguration Name="Debug Multilib|Win32">
! 					<Tool Name="VCCLCompilerTool" UsePrecompiledHeader="1"/>
! 				</FileConfiguration>
! 			</File>
  			<File RelativePath="..\..\wxbind\src\wxxrc_bind.cpp"/>
  			<File RelativePath="..\..\wxbind\src\wxxrc_xrc.cpp"/>

Index: modules_mod_wxbindmedia.vcproj
===================================================================
RCS file: /cvsroot/wxlua/wxLua/modules/build/msvc8/modules_mod_wxbindmedia.vcproj,v
retrieving revision 1.2
retrieving revision 1.3
diff -C2 -d -r1.2 -r1.3
*** modules_mod_wxbindmedia.vcproj	16 Jul 2007 20:29:53 -0000	1.2
--- modules_mod_wxbindmedia.vcproj	16 Jul 2007 22:53:31 -0000	1.3
***************
*** 293,297 ****
  	<Files>
  		<Filter Name="WXBINDMEDIA sources" UniqueIdentifier="{4FED960C-5148-5D38-94CA-5857969AF8C8}">
! 			<File RelativePath="..\..\wxbind\src\dummy.cpp"/>
  			<File RelativePath="..\..\wxbind\src\wxmedia_bind.cpp"/>
  			<File RelativePath="..\..\wxbind\src\wxmedia_media.cpp"/>
--- 293,346 ----
  	<Files>
  		<Filter Name="WXBINDMEDIA sources" UniqueIdentifier="{4FED960C-5148-5D38-94CA-5857969AF8C8}">
! 			<File RelativePath="..\..\wxbind\src\dummy.cpp">
! 				<FileConfiguration Name="Release Unicode DLL Monolithic|Win32">
! 					<Tool Name="VCCLCompilerTool" UsePrecompiledHeader="1"/>
! 				</FileConfiguration>
! 				<FileConfiguration Name="Release Unicode DLL Multilib|Win32">
! 					<Tool Name="VCCLCompilerTool" UsePrecompiledHeader="1"/>
! 				</FileConfiguration>
! 				<FileConfiguration Name="Release Unicode Monolithic|Win32">
! 					<Tool Name="VCCLCompilerTool" UsePrecompiledHeader="1"/>
! 				</FileConfiguration>
! 				<FileConfiguration Name="Release Unicode Multilib|Win32">
! 					<Tool Name="VCCLCompilerTool" UsePrecompiledHeader="1"/>
! 				</FileConfiguration>
! 				<FileConfiguration Name="Release DLL Monolithic|Win32">
! 					<Tool Name="VCCLCompilerTool" UsePrecompiledHeader="1"/>
! 				</FileConfiguration>
! 				<FileConfiguration Name="Release DLL Multilib|Win32">
! 					<Tool Name="VCCLCompilerTool" UsePrecompiledHeader="1"/>
! 				</FileConfiguration>
! 				<FileConfiguration Name="Release Monolithic|Win32">
! 					<Tool Name="VCCLCompilerTool" UsePrecompiledHeader="1"/>
! 				</FileConfiguration>
! 				<FileConfiguration Name="Release Multilib|Win32">
! 					<Tool Name="VCCLCompilerTool" UsePrecompiledHeader="1"/>
! 				</FileConfiguration>
! 				<FileConfiguration Name="Debug Unicode DLL Monolithic|Win32">
! 					<Tool Name="VCCLCompilerTool" UsePrecompiledHeader="1"/>
! 				</FileConfiguration>
! 				<FileConfiguration Name="Debug Unicode DLL Multilib|Win32">
! 					<Tool Name="VCCLCompilerTool" UsePrecompiledHeader="1"/>
! 				</FileConfiguration>
! 				<FileConfiguration Name="Debug Unicode Monolithic|Win32">
! 					<Tool Name="VCCLCompilerTool" UsePrecompiledHeader="1"/>
! 				</FileConfiguration>
! 				<FileConfiguration Name="Debug Unicode Multilib|Win32">
! 					<Tool Name="VCCLCompilerTool" UsePrecompiledHeader="1"/>
! 				</FileConfiguration>
! 				<FileConfiguration Name="Debug DLL Monolithic|Win32">
! 					<Tool Name="VCCLCompilerTool" UsePrecompiledHeader="1"/>
! 				</FileConfiguration>
! 				<FileConfiguration Name="Debug DLL Multilib|Win32">
! 					<Tool Name="VCCLCompilerTool" UsePrecompiledHeader="1"/>
! 				</FileConfiguration>
! 				<FileConfiguration Name="Debug Monolithic|Win32">
! 					<Tool Name="VCCLCompilerTool" UsePrecompiledHeader="1"/>
! 				</FileConfiguration>
! 				<FileConfiguration Name="Debug Multilib|Win32">
! 					<Tool Name="VCCLCompilerTool" UsePrecompiledHeader="1"/>
! 				</FileConfiguration>
! 			</File>
  			<File RelativePath="..\..\wxbind\src\wxmedia_bind.cpp"/>
  			<File RelativePath="..\..\wxbind\src\wxmedia_media.cpp"/>

Index: modules_mod_wxbindbase.vcproj
===================================================================
RCS file: /cvsroot/wxlua/wxLua/modules/build/msvc8/modules_mod_wxbindbase.vcproj,v
retrieving revision 1.2
retrieving revision 1.3
diff -C2 -d -r1.2 -r1.3
*** modules_mod_wxbindbase.vcproj	16 Jul 2007 20:29:53 -0000	1.2
--- modules_mod_wxbindbase.vcproj	16 Jul 2007 22:53:31 -0000	1.3
***************
*** 293,297 ****
  	<Files>
  		<Filter Name="WXBINDBASE sources" UniqueIdentifier="{B693C954-9F77-5EA1-BC66-785E3510A5C1}">
! 			<File RelativePath="..\..\wxbind\src\dummy.cpp"/>
  			<File RelativePath="..\..\wxbind\src\wxbase_base.cpp"/>
  			<File RelativePath="..\..\wxbind\src\wxbase_bind.cpp"/>
--- 293,346 ----
  	<Files>
  		<Filter Name="WXBINDBASE sources" UniqueIdentifier="{B693C954-9F77-5EA1-BC66-785E3510A5C1}">
! 			<File RelativePath="..\..\wxbind\src\dummy.cpp">
! 				<FileConfiguration Name="Release Unicode DLL Monolithic|Win32">
! 					<Tool Name="VCCLCompilerTool" UsePrecompiledHeader="1"/>
! 				</FileConfiguration>
! 				<FileConfiguration Name="Release Unicode DLL Multilib|Win32">
! 					<Tool Name="VCCLCompilerTool" UsePrecompiledHeader="1"/>
! 				</FileConfiguration>
! 				<FileConfiguration Name="Release Unicode Monolithic|Win32">
! 					<Tool Name="VCCLCompilerTool" UsePrecompiledHeader="1"/>
! 				</FileConfiguration>
! 				<FileConfiguration Name="Release Unicode Multilib|Win32">
! 					<Tool Name="VCCLCompilerTool" UsePrecompiledHeader="1"/>
! 				</FileConfiguration>
! 				<FileConfiguration Name="Release DLL Monolithic|Win32">
! 					<Tool Name="VCCLCompilerTool" UsePrecompiledHeader="1"/>
! 				</FileConfiguration>
! 				<FileConfiguration Name="Release DLL Multilib|Win32">
! 					<Tool Name="VCCLCompilerTool" UsePrecompiledHeader="1"/>
! 				</FileConfiguration>
! 				<FileConfiguration Name="Release Monolithic|Win32">
! 					<Tool Name="VCCLCompilerTool" UsePrecompiledHeader="1"/>
! 				</FileConfiguration>
! 				<FileConfiguration Name="Release Multilib|Win32">
! 					<Tool Name="VCCLCompilerTool" UsePrecompiledHeader="1"/>
! 				</FileConfiguration>
! 				<FileConfiguration Name="Debug Unicode DLL Monolithic|Win32">
! 					<Tool Name="VCCLCompilerTool" UsePrecompiledHeader="1"/>
! 				</FileConfiguration>
! 				<FileConfiguration Name="Debug Unicode DLL Multilib|Win32">
! 					<Tool Name="VCCLCompilerTool" UsePrecompiledHeader="1"/>
! 				</FileConfiguration>
! 				<FileConfiguration Name="Debug Unicode Monolithic|Win32">
! 					<Tool Name="VCCLCompilerTool" UsePrecompiledHeader="1"/>
! 				</FileConfiguration>
! 				<FileConfiguration Name="Debug Unicode Multilib|Win32">
! 					<Tool Name="VCCLCompilerTool" UsePrecompiledHeader="1"/>
! 				</FileConfiguration>
! 				<FileConfiguration Name="Debug DLL Monolithic|Win32">
! 					<Tool Name="VCCLCompilerTool" UsePrecompiledHeader="1"/>
! 				</FileConfiguration>
! 				<FileConfiguration Name="Debug DLL Multilib|Win32">
! 					<Tool Name="VCCLCompilerTool" UsePrecompiledHeader="1"/>
! 				</FileConfiguration>
! 				<FileConfiguration Name="Debug Monolithic|Win32">
! 					<Tool Name="VCCLCompilerTool" UsePrecompiledHeader="1"/>
! 				</FileConfiguration>
! 				<FileConfiguration Name="Debug Multilib|Win32">
! 					<Tool Name="VCCLCompilerTool" UsePrecompiledHeader="1"/>
! 				</FileConfiguration>
! 			</File>
  			<File RelativePath="..\..\wxbind\src\wxbase_base.cpp"/>
  			<File RelativePath="..\..\wxbind\src\wxbase_bind.cpp"/>

Index: modules_mod_wxbindadv.vcproj
===================================================================
RCS file: /cvsroot/wxlua/wxLua/modules/build/msvc8/modules_mod_wxbindadv.vcproj,v
retrieving revision 1.2
retrieving revision 1.3
diff -C2 -d -r1.2 -r1.3
*** modules_mod_wxbindadv.vcproj	16 Jul 2007 20:29:53 -0000	1.2
--- modules_mod_wxbindadv.vcproj	16 Jul 2007 22:53:31 -0000	1.3
***************
*** 293,297 ****
  	<Files>
  		<Filter Name="WXBINDADV sources" UniqueIdentifier="{9AAEB978-5A18-53BC-BD0A-9E21FF58F9D8}">
! 			<File RelativePath="..\..\wxbind\src\dummy.cpp"/>
  			<File RelativePath="..\..\wxbind\src\wxadv_adv.cpp"/>
  			<File RelativePath="..\..\wxbind\src\wxadv_bind.cpp"/>
--- 293,346 ----
  	<Files>
  		<Filter Name="WXBINDADV sources" UniqueIdentifier="{9AAEB978-5A18-53BC-BD0A-9E21FF58F9D8}">
! 			<File RelativePath="..\..\wxbind\src\dummy.cpp">
! 				<FileConfiguration Name="Release Unicode DLL Monolithic|Win32">
! 					<Tool Name="VCCLCompilerTool" UsePrecompiledHeader="1"/>
! 				</FileConfiguration>
! 				<FileConfiguration Name="Release Unicode DLL Multilib|Win32">
! 					<Tool Name="VCCLCompilerTool" UsePrecompiledHeader="1"/>
! 				</FileConfiguration>
! 				<FileConfiguration Name="Release Unicode Monolithic|Win32">
! 					<Tool Name="VCCLCompilerTool" UsePrecompiledHeader="1"/>
! 				</FileConfiguration>
! 				<FileConfiguration Name="Release Unicode Multilib|Win32">
! 					<Tool Name="VCCLCompilerTool" UsePrecompiledHeader="1"/>
! 				</FileConfiguration>
! 				<FileConfiguration Name="Release DLL Monolithic|Win32">
! 					<Tool Name="VCCLCompilerTool" UsePrecompiledHeader="1"/>
! 				</FileConfiguration>
! 				<FileConfiguration Name="Release DLL Multilib|Win32">
! 					<Tool Name="VCCLCompilerTool" UsePrecompiledHeader="1"/>
! 				</FileConfiguration>
! 				<FileConfiguration Name="Release Monolithic|Win32">
! 					<Tool Name="VCCLCompilerTool" UsePrecompiledHeader="1"/>
! 				</FileConfiguration>
! 				<FileConfiguration Name="Release Multilib|Win32">
! 					<Tool Name="VCCLCompilerTool" UsePrecompiledHeader="1"/>
! 				</FileConfiguration>
! 				<FileConfiguration Name="Debug Unicode DLL Monolithic|Win32">
! 					<Tool Name="VCCLCompilerTool" UsePrecompiledHeader="1"/>
! 				</FileConfiguration>
! 				<FileConfiguration Name="Debug Unicode DLL Multilib|Win32">
! 					<Tool Name="VCCLCompilerTool" UsePrecompiledHeader="1"/>
! 				</FileConfiguration>
! 				<FileConfiguration Name="Debug Unicode Monolithic|Win32">
! 					<Tool Name="VCCLCompilerTool" UsePrecompiledHeader="1"/>
! 				</FileConfiguration>
! 				<FileConfiguration Name="Debug Unicode Multilib|Win32">
! 					<Tool Name="VCCLCompilerTool" UsePrecompiledHeader="1"/>
! 				</FileConfiguration>
! 				<FileConfiguration Name="Debug DLL Monolithic|Win32">
! 					<Tool Name="VCCLCompilerTool" UsePrecompiledHeader="1"/>
! 				</FileConfiguration>
! 				<FileConfiguration Name="Debug DLL Multilib|Win32">
! 					<Tool Name="VCCLCompilerTool" UsePrecompiledHeader="1"/>
! 				</FileConfiguration>
! 				<FileConfiguration Name="Debug Monolithic|Win32">
! 					<Tool Name="VCCLCompilerTool" UsePrecompiledHeader="1"/>
! 				</FileConfiguration>
! 				<FileConfiguration Name="Debug Multilib|Win32">
! 					<Tool Name="VCCLCompilerTool" UsePrecompiledHeader="1"/>
! 				</FileConfiguration>
! 			</File>
  			<File RelativePath="..\..\wxbind\src\wxadv_adv.cpp"/>
  			<File RelativePath="..\..\wxbind\src\wxadv_bind.cpp"/>

Index: modules_mod_wxbindxml.vcproj
===================================================================
RCS file: /cvsroot/wxlua/wxLua/modules/build/msvc8/modules_mod_wxbindxml.vcproj,v
retrieving revision 1.2
retrieving revision 1.3
diff -C2 -d -r1.2 -r1.3
*** modules_mod_wxbindxml.vcproj	16 Jul 2007 20:29:53 -0000	1.2
--- modules_mod_wxbindxml.vcproj	16 Jul 2007 22:53:32 -0000	1.3
***************
*** 293,297 ****
  	<Files>
  		<Filter Name="WXBINDXML sources" UniqueIdentifier="{4796E532-CD19-5F8D-8903-6CD8E2B0DA2A}">
! 			<File RelativePath="..\..\wxbind\src\dummy.cpp"/>
  			<File RelativePath="..\..\wxbind\src\wxxml_bind.cpp"/>
  			<File RelativePath="..\..\wxbind\src\wxxml_xml.cpp"/>
--- 293,346 ----
  	<Files>
  		<Filter Name="WXBINDXML sources" UniqueIdentifier="{4796E532-CD19-5F8D-8903-6CD8E2B0DA2A}">
! 			<File RelativePath="..\..\wxbind\src\dummy.cpp">
! 				<FileConfiguration Name="Release Unicode DLL Monolithic|Win32">
! 					<Tool Name="VCCLCompilerTool" UsePrecompiledHeader="1"/>
! 				</FileConfiguration>
! 				<FileConfiguration Name="Release Unicode DLL Multilib|Win32">
! 					<Tool Name="VCCLCompilerTool" UsePrecompiledHeader="1"/>
! 				</FileConfiguration>
! 				<FileConfiguration Name="Release Unicode Monolithic|Win32">
! 					<Tool Name="VCCLCompilerTool" UsePrecompiledHeader="1"/>
! 				</FileConfiguration>
! 				<FileConfiguration Name="Release Unicode Multilib|Win32">
! 					<Tool Name="VCCLCompilerTool" UsePrecompiledHeader="1"/>
! 				</FileConfiguration>
! 				<FileConfiguration Name="Release DLL Monolithic|Win32">
! 					<Tool Name="VCCLCompilerTool" UsePrecompiledHeader="1"/>
! 				</FileConfiguration>
! 				<FileConfiguration Name="Release DLL Multilib|Win32">
! 					<Tool Name="VCCLCompilerTool" UsePrecompiledHeader="1"/>
! 				</FileConfiguration>
! 				<FileConfiguration Name="Release Monolithic|Win32">
! 					<Tool Name="VCCLCompilerTool" UsePrecompiledHeader="1"/>
! 				</FileConfiguration>
! 				<FileConfiguration Name="Release Multilib|Win32">
! 					<Tool Name="VCCLCompilerTool" UsePrecompiledHeader="1"/>
! 				</FileConfiguration>
! 				<FileConfiguration Name="Debug Unicode DLL Monolithic|Win32">
! 					<Tool Name="VCCLCompilerTool" UsePrecompiledHeader="1"/>
! 				</FileConfiguration>
! 				<FileConfiguration Name="Debug Unicode DLL Multilib|Win32">
! 					<Tool Name="VCCLCompilerTool" UsePrecompiledHeader="1"/>
! 				</FileConfiguration>
! 				<FileConfiguration Name="Debug Unicode Monolithic|Win32">
! 					<Tool Name="VCCLCompilerTool" UsePrecompiledHeader="1"/>
! 				</FileConfiguration>
! 				<FileConfiguration Name="Debug Unicode Multilib|Win32">
! 					<Tool Name="VCCLCompilerTool" UsePrecompiledHeader="1"/>
! 				</FileConfiguration>
! 				<FileConfiguration Name="Debug DLL Monolithic|Win32">
! 					<Tool Name="VCCLCompilerTool" UsePrecompiledHeader="1"/>
! 				</FileConfiguration>
! 				<FileConfiguration Name="Debug DLL Multilib|Win32">
! 					<Tool Name="VCCLCompilerTool" UsePrecompiledHeader="1"/>
! 				</FileConfiguration>
! 				<FileConfiguration Name="Debug Monolithic|Win32">
! 					<Tool Name="VCCLCompilerTool" UsePrecompiledHeader="1"/>
! 				</FileConfiguration>
! 				<FileConfiguration Name="Debug Multilib|Win32">
! 					<Tool Name="VCCLCompilerTool" UsePrecompiledHeader="1"/>
! 				</FileConfiguration>
! 			</File>
  			<File RelativePath="..\..\wxbind\src\wxxml_bind.cpp"/>
  			<File RelativePath="..\..\wxbind\src\wxxml_xml.cpp"/>

Index: modules_mod_wxbindstc.vcproj
===================================================================
RCS file: /cvsroot/wxlua/wxLua/modules/build/msvc8/modules_mod_wxbindstc.vcproj,v
retrieving revision 1.6
retrieving revision 1.7
diff -C2 -d -r1.6 -r1.7
*** modules_mod_wxbindstc.vcproj	16 Jul 2007 20:29:53 -0000	1.6
--- modules_mod_wxbindstc.vcproj	16 Jul 2007 22:53:32 -0000	1.7
***************
*** 293,297 ****
  	<Files>
  		<Filter Name="WXBINDSTC sources" UniqueIdentifier="{ADF8AD3E-3BDF-5A9F-A4FF-0AFCEE334AD4}">
! 			<File RelativePath="..\..\wxbind\src\dummy.cpp"/>
  			<File RelativePath="..\..\wxbind\src\wxstc_bind.cpp"/>
  			<File RelativePath="..\..\wxbind\src\wxstc_stc.cpp"/>
--- 293,346 ----
  	<Files>
  		<Filter Name="WXBINDSTC sources" UniqueIdentifier="{ADF8AD3E-3BDF-5A9F-A4FF-0AFCEE334AD4}">
! 			<File RelativePath="..\..\wxbind\src\dummy.cpp">
! 				<FileConfiguration Name="Release Unicode DLL Monolithic|Win32">
! 					<Tool Name="VCCLCompilerTool" UsePrecompiledHeader="1"/>
! 				</FileConfiguration>
! 				<FileConfiguration Name="Release Unicode DLL Multilib|Win32">
! 					<Tool Name="VCCLCompilerTool" UsePrecompiledHeader="1"/>
! 				</FileConfiguration>
! 				<FileConfiguration Name="Release Unicode Monolithic|Win32">
! 					<Tool Name="VCCLCompilerTool" UsePrecompiledHeader="1"/>
! 				</FileConfiguration>
! 				<FileConfiguration Name="Release Unicode Multilib|Win32">
! 					<Tool Name="VCCLCompilerTool" UsePrecompiledHeader="1"/>
! 				</FileConfiguration>
! 				<FileConfiguration Name="Release DLL Monolithic|Win32">
! 					<Tool Name="VCCLCompilerTool" UsePrecompiledHeader="1"/>
! 				</FileConfiguration>
! 				<FileConfiguration Name="Release DLL Multilib|Win32">
! 					<Tool Name="VCCLCompilerTool" UsePrecompiledHeader="1"/>
! 				</FileConfiguration>
! 				<FileConfiguration Name="Release Monolithic|Win32">
! 					<Tool Name="VCCLCompilerTool" UsePrecompiledHeader="1"/>
! 				</FileConfiguration>
! 				<FileConfiguration Name="Release Multilib|Win32">
! 					<Tool Name="VCCLCompilerTool" UsePrecompiledHeader="1"/>
! 				</FileConfiguration>
! 				<FileConfiguration Name="Debug Unicode DLL Monolithic|Win32">
! 					<Tool Name="VCCLCompilerTool" UsePrecompiledHeader="1"/>
! 				</FileConfiguration>
! 				<FileConfiguration Name="Debug Unicode DLL Multilib|Win32">
! 					<Tool Name="VCCLCompilerTool" UsePrecompiledHeader="1"/>
! 				</FileConfiguration>
! 				<FileConfiguration Name="Debug Unicode Monolithic|Win32">
! 					<Tool Name="VCCLCompilerTool" UsePrecompiledHeader="1"/>
! 				</FileConfiguration>
! 				<FileConfiguration Name="Debug Unicode Multilib|Win32">
! 					<Tool Name="VCCLCompilerTool" UsePrecompiledHeader="1"/>
! 				</FileConfiguration>
! 				<FileConfiguration Name="Debug DLL Monolithic|Win32">
! 					<Tool Name="VCCLCompilerTool" UsePrecompiledHeader="1"/>
! 				</FileConfiguration>
! 				<FileConfiguration Name="Debug DLL Multilib|Win32">
! 					<Tool Name="VCCLCompilerTool" UsePrecompiledHeader="1"/>
! 				</FileConfiguration>
! 				<FileConfiguration Name="Debug Monolithic|Win32">
! 					<Tool Name="VCCLCompilerTool" UsePrecompiledHeader="1"/>
! 				</FileConfiguration>
! 				<FileConfiguration Name="Debug Multilib|Win32">
! 					<Tool Name="VCCLCompilerTool" UsePrecompiledHeader="1"/>
! 				</FileConfiguration>
! 			</File>
  			<File RelativePath="..\..\wxbind\src\wxstc_bind.cpp"/>
  			<File RelativePath="..\..\wxbind\src\wxstc_stc.cpp"/>

Index: modules_mod_wxbindhtml.vcproj
===================================================================
RCS file: /cvsroot/wxlua/wxLua/modules/build/msvc8/modules_mod_wxbindhtml.vcproj,v
retrieving revision 1.2
retrieving revision 1.3
diff -C2 -d -r1.2 -r1.3
*** modules_mod_wxbindhtml.vcproj	16 Jul 2007 20:29:53 -0000	1.2
--- modules_mod_wxbindhtml.vcproj	16 Jul 2007 22:53:31 -0000	1.3
***************
*** 293,297 ****
  	<Files>
  		<Filter Name="WXBINDHTML sources" UniqueIdentifier="{F896945F-943A-5F83-965F-6E905A5295F4}">
! 			<File RelativePath="..\..\wxbind\src\dummy.cpp"/>
  			<File RelativePath="..\..\wxbind\src\wxhtml_bind.cpp"/>
  			<File RelativePath="..\..\wxbind\src\wxhtml_html.cpp"/>
--- 293,346 ----
  	<Files>
  		<Filter Name="WXBINDHTML sources" UniqueIdentifier="{F896945F-943A-5F83-965F-6E905A5295F4}">
! 			<File RelativePath="..\..\wxbind\src\dummy.cpp">
! 				<FileConfiguration Name="Release Unicode DLL Monolithic|Win32">
! 					<Tool Name="VCCLCompilerTool" UsePrecompiledHeader="1"/>
! 				</FileConfiguration>
! 				<FileConfiguration Name="Release Unicode DLL Multilib|Win32">
! 					<Tool Name="VCCLCompilerTool" UsePrecompiledHeader="1"/>
! 				</FileConfiguration>
! 				<FileConfiguration Name="Release Unicode Monolithic|Win32">
! 					<Tool Name="VCCLCompilerTool" UsePrecompiledHeader="1"/>
! 				</FileConfiguration>
! 				<FileConfiguration Name="Release Unicode Multilib|Win32">
! 					<Tool Name="VCCLCompilerTool" UsePrecompiledHeader="1"/>
! 				</FileConfiguration>
! 				<FileConfiguration Name="Release DLL Monolithic|Win32">
! 					<Tool Name="VCCLCompilerTool" UsePrecompiledHeader="1"/>
! 				</FileConfiguration>
! 				<FileConfiguration Name="Release DLL Multilib|Win32">
! 					<Tool Name="VCCLCompilerTool" UsePrecompiledHeader="1"/>
! 				</FileConfiguration>
! 				<FileConfiguration Name="Release Monolithic|Win32">
! 					<Tool Name="VCCLCompilerTool" UsePrecompiledHeader="1"/>
! 				</FileConfiguration>
! 				<FileConfiguration Name="Release Multilib|Win32">
! 					<Tool Name="VCCLCompilerTool" UsePrecompiledHeader="1"/>
! 				</FileConfiguration>
! 				<FileConfiguration Name="Debug Unicode DLL Monolithic|Win32">
! 					<Tool Name="VCCLCompilerTool" UsePrecompiledHeader="1"/>
! 				</FileConfiguration>
! 				<FileConfiguration Name="Debug Unicode DLL Multilib|Win32">
! 					<Tool Name="VCCLCompilerTool" UsePrecompiledHeader="1"/>
! 				</FileConfiguration>
! 				<FileConfiguration Name="Debug Unicode Monolithic|Win32">
! 					<Tool Name="VCCLCompilerTool" UsePrecompiledHeader="1"/>
! 				</FileConfiguration>
! 				<FileConfiguration Name="Debug Unicode Multilib|Win32">
! 					<Tool Name="VCCLCompilerTool" UsePrecompiledHeader="1"/>
! 				</FileConfiguration>
! 				<FileConfiguration Name="Debug DLL Monolithic|Win32">
! 					<Tool Name="VCCLCompilerTool" UsePrecompiledHeader="1"/>
! 				</FileConfiguration>
! 				<FileConfiguration Name="Debug DLL Multilib|Win32">
! 					<Tool Name="VCCLCompilerTool" UsePrecompiledHeader="1"/>
! 				</FileConfiguration>
! 				<FileConfiguration Name="Debug Monolithic|Win32">
! 					<Tool Name="VCCLCompilerTool" UsePrecompiledHeader="1"/>
! 				</FileConfiguration>
! 				<FileConfiguration Name="Debug Multilib|Win32">
! 					<Tool Name="VCCLCompilerTool" UsePrecompiledHeader="1"/>
! 				</FileConfiguration>
! 			</File>
  			<File RelativePath="..\..\wxbind\src\wxhtml_bind.cpp"/>
  			<File RelativePath="..\..\wxbind\src\wxhtml_html.cpp"/>

Index: modules_mod_wxbindaui.vcproj
===================================================================
RCS file: /cvsroot/wxlua/wxLua/modules/build/msvc8/modules_mod_wxbindaui.vcproj,v
retrieving revision 1.3
retrieving revision 1.4
diff -C2 -d -r1.3 -r1.4
*** modules_mod_wxbindaui.vcproj	16 Jul 2007 20:29:53 -0000	1.3
--- modules_mod_wxbindaui.vcproj	16 Jul 2007 22:53:31 -0000	1.4
***************
*** 293,297 ****
  	<Files>
  		<Filter Name="WXBINDAUI sources" UniqueIdentifier="{07A5CC61-F4A5-50A7-8BBA-6DF1DE55ED1B}">
! 			<File RelativePath="..\..\wxbind\src\dummy.cpp"/>
  			<File RelativePath="..\..\wxbind\src\wxaui_aui.cpp"/>
  			<File RelativePath="..\..\wxbind\src\wxaui_bind.cpp"/>
--- 293,346 ----
  	<Files>
  		<Filter Name="WXBINDAUI sources" UniqueIdentifier="{07A5CC61-F4A5-50A7-8BBA-6DF1DE55ED1B}">
! 			<File RelativePath="..\..\wxbind\src\dummy.cpp">
! 				<FileConfiguration Name="Release Unicode DLL Monolithic|Win32">
! 					<Tool Name="VCCLCompilerTool" UsePrecompiledHeader="1"/>
! 				</FileConfiguration>
! 				<FileConfiguration Name="Release Unicode DLL Multilib|Win32">
! 					<Tool Name="VCCLCompilerTool" UsePrecompiledHeader="1"/>
! 				</FileConfiguration>
! 				<FileConfiguration Name="Release Unicode Monolithic|Win32">
! 					<Tool Name="VCCLCompilerTool" UsePrecompiledHeader="1"/>
! 				</FileConfiguration>
! 				<FileConfiguration Name="Release Unicode Multilib|Win32">
! 					<Tool Name="VCCLCompilerTool" UsePrecompiledHeader="1"/>
! 				</FileConfiguration>
! 				<FileConfiguration Name="Release DLL Monolithic|Win32">
! 					<Tool Name="VCCLCompilerTool" UsePrecompiledHeader="1"/>
! 				</FileConfiguration>
! 				<FileConfiguration Name="Release DLL Multilib|Win32">
! 					<Tool Name="VCCLCompilerTool" UsePrecompiledHeader="1"/>
! 				</FileConfiguration>
! 				<FileConfiguration Name="Release Monolithic|Win32">
! 					<Tool Name="VCCLCompilerTool" UsePrecompiledHeader="1"/>
! 				</FileConfiguration>
! 				<FileConfiguration Name="Release Multilib|Win32">
! 					<Tool Name="VCCLCompilerTool" UsePrecompiledHeader="1"/>
! 				</FileConfiguration>
! 				<FileConfiguration Name="Debug Unicode DLL Monolithic|Win32">
! 					<Tool Name="VCCLCompilerTool" UsePrecompiledHeader="1"/>
! 				</FileConfiguration>
! 				<FileConfiguration Name="Debug Unicode DLL Multilib|Win32">
! 					<Tool Name="VCCLCompilerTool" UsePrecompiledHeader="1"/>
! 				</FileConfiguration>
! 				<FileConfiguration Name="Debug Unicode Monolithic|Win32">
! 					<Tool Name="VCCLCompilerTool" UsePrecompiledHeader="1"/>
! 				</FileConfiguration>
! 				<FileConfiguration Name="Debug Unicode Multilib|Win32">
! 					<Tool Name="VCCLCompilerTool" UsePrecompiledHeader="1"/>
! 				</FileConfiguration>
! 				<FileConfiguration Name="Debug DLL Monolithic|Win32">
! 					<Tool Name="VCCLCompilerTool" UsePrecompiledHeader="1"/>
! 				</FileConfiguration>
! 				<FileConfiguration Name="Debug DLL Multilib|Win32">
! 					<Tool Name="VCCLCompilerTool" UsePrecompiledHeader="1"/>
! 				</FileConfiguration>
! 				<FileConfiguration Name="Debug Monolithic|Win32">
! 					<Tool Name="VCCLCompilerTool" UsePrecompiledHeader="1"/>
! 				</FileConfiguration>
! 				<FileConfiguration Name="Debug Multilib|Win32">
! 					<Tool Name="VCCLCompilerTool" UsePrecompiledHeader="1"/>
! 				</FileConfiguration>
! 			</File>
  			<File RelativePath="..\..\wxbind\src\wxaui_aui.cpp"/>
  			<File RelativePath="..\..\wxbind\src\wxaui_bind.cpp"/>

[Wxlua-commit] wxLua/modules/build/msvc6 modules_mod_wxbindadv.dsp, 1.2, 1.3 modules_mod_wxbindaui.dsp, 1.3, 1.4 modules_mod_wxbindbase.dsp, 1.2, 1.3 modules_mod_wxbindcore.dsp, 1.2, 1.3 modules_mod_wxbindgl.dsp, 1.2, 1.3 modules_mod_wxbindhtml.dsp, 1.2, 1.3 modules_mod_wxbindmedia.dsp, 1.2, 1.3 modules_mod_wxbindnet.dsp, 1.2, 1.3 modules_mod_wxbindrichtext.dsp, 1.2, 1.3 modules_mod_wxbindstc.dsp, 1.6, 1.7 modules_mod_wxbindxml.dsp, 1.2, 1.3 modules_mod_wxbindxrc.dsp, 1.2, 1.3

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

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

Modified Files:
	modules_mod_wxbindadv.dsp modules_mod_wxbindaui.dsp 
	modules_mod_wxbindbase.dsp modules_mod_wxbindcore.dsp 
	modules_mod_wxbindgl.dsp modules_mod_wxbindhtml.dsp 
	modules_mod_wxbindmedia.dsp modules_mod_wxbindnet.dsp 
	modules_mod_wxbindrichtext.dsp modules_mod_wxbindstc.dsp 
	modules_mod_wxbindxml.dsp modules_mod_wxbindxrc.dsp 
Log Message:
Get dummy.cpp working for single wxbind directory


Index: modules_mod_wxbindgl.dsp
===================================================================
RCS file: /cvsroot/wxlua/wxLua/modules/build/msvc6/modules_mod_wxbindgl.dsp,v
retrieving revision 1.2
retrieving revision 1.3
diff -C2 -d -r1.2 -r1.3
*** modules_mod_wxbindgl.dsp	16 Jul 2007 20:29:52 -0000	1.2
--- modules_mod_wxbindgl.dsp	16 Jul 2007 22:53:31 -0000	1.3
***************
*** 454,457 ****
--- 454,459 ----
  
  SOURCE=..\..\wxbind\src\dummy.cpp
+ # ADD BASE CPP /Yc"wx/wxprec.h"
+ # ADD CPP /Yc"wx/wxprec.h"
  # End Source File
  # Begin Source File

Index: modules_mod_wxbindxrc.dsp
===================================================================
RCS file: /cvsroot/wxlua/wxLua/modules/build/msvc6/modules_mod_wxbindxrc.dsp,v
retrieving revision 1.2
retrieving revision 1.3
diff -C2 -d -r1.2 -r1.3
*** modules_mod_wxbindxrc.dsp	16 Jul 2007 20:29:52 -0000	1.2
--- modules_mod_wxbindxrc.dsp	16 Jul 2007 22:53:31 -0000	1.3
***************
*** 454,457 ****
--- 454,459 ----
  
  SOURCE=..\..\wxbind\src\dummy.cpp
+ # ADD BASE CPP /Yc"wx/wxprec.h"
+ # ADD CPP /Yc"wx/wxprec.h"
  # End Source File
  # Begin Source File

Index: modules_mod_wxbindadv.dsp
===================================================================
RCS file: /cvsroot/wxlua/wxLua/modules/build/msvc6/modules_mod_wxbindadv.dsp,v
retrieving revision 1.2
retrieving revision 1.3
diff -C2 -d -r1.2 -r1.3
*** modules_mod_wxbindadv.dsp	16 Jul 2007 20:29:52 -0000	1.2
--- modules_mod_wxbindadv.dsp	16 Jul 2007 22:53:31 -0000	1.3
***************
*** 454,457 ****
--- 454,459 ----
  
  SOURCE=..\..\wxbind\src\dummy.cpp
+ # ADD BASE CPP /Yc"wx/wxprec.h"
+ # ADD CPP /Yc"wx/wxprec.h"
  # End Source File
  # Begin Source File

Index: modules_mod_wxbindbase.dsp
===================================================================
RCS file: /cvsroot/wxlua/wxLua/modules/build/msvc6/modules_mod_wxbindbase.dsp,v
retrieving revision 1.2
retrieving revision 1.3
diff -C2 -d -r1.2 -r1.3
*** modules_mod_wxbindbase.dsp	16 Jul 2007 20:29:52 -0000	1.2
--- modules_mod_wxbindbase.dsp	16 Jul 2007 22:53:31 -0000	1.3
***************
*** 454,457 ****
--- 454,459 ----
  
  SOURCE=..\..\wxbind\src\dummy.cpp
+ # ADD BASE CPP /Yc"wx/wxprec.h"
+ # ADD CPP /Yc"wx/wxprec.h"
  # End Source File
  # Begin Source File

Index: modules_mod_wxbindnet.dsp
===================================================================
RCS file: /cvsroot/wxlua/wxLua/modules/build/msvc6/modules_mod_wxbindnet.dsp,v
retrieving revision 1.2
retrieving revision 1.3
diff -C2 -d -r1.2 -r1.3
*** modules_mod_wxbindnet.dsp	16 Jul 2007 20:29:52 -0000	1.2
--- modules_mod_wxbindnet.dsp	16 Jul 2007 22:53:31 -0000	1.3
***************
*** 454,457 ****
--- 454,459 ----
  
  SOURCE=..\..\wxbind\src\dummy.cpp
+ # ADD BASE CPP /Yc"wx/wxprec.h"
+ # ADD CPP /Yc"wx/wxprec.h"
  # End Source File
  # Begin Source File

Index: modules_mod_wxbindmedia.dsp
===================================================================
RCS file: /cvsroot/wxlua/wxLua/modules/build/msvc6/modules_mod_wxbindmedia.dsp,v
retrieving revision 1.2
retrieving revision 1.3
diff -C2 -d -r1.2 -r1.3
*** modules_mod_wxbindmedia.dsp	16 Jul 2007 20:29:52 -0000	1.2
--- modules_mod_wxbindmedia.dsp	16 Jul 2007 22:53:31 -0000	1.3
***************
*** 454,457 ****
--- 454,459 ----
  
  SOURCE=..\..\wxbind\src\dummy.cpp
+ # ADD BASE CPP /Yc"wx/wxprec.h"
+ # ADD CPP /Yc"wx/wxprec.h"
  # End Source File
  # Begin Source File

Index: modules_mod_wxbindaui.dsp
===================================================================
RCS file: /cvsroot/wxlua/wxLua/modules/build/msvc6/modules_mod_wxbindaui.dsp,v
retrieving revision 1.3
retrieving revision 1.4
diff -C2 -d -r1.3 -r1.4
*** modules_mod_wxbindaui.dsp	16 Jul 2007 20:29:52 -0000	1.3
--- modules_mod_wxbindaui.dsp	16 Jul 2007 22:53:31 -0000	1.4
***************
*** 454,457 ****
--- 454,459 ----
  
  SOURCE=..\..\wxbind\src\dummy.cpp
+ # ADD BASE CPP /Yc"wx/wxprec.h"
+ # ADD CPP /Yc"wx/wxprec.h"
  # End Source File
  # Begin Source File

Index: modules_mod_wxbindhtml.dsp
===================================================================
RCS file: /cvsroot/wxlua/wxLua/modules/build/msvc6/modules_mod_wxbindhtml.dsp,v
retrieving revision 1.2
retrieving revision 1.3
diff -C2 -d -r1.2 -r1.3
*** modules_mod_wxbindhtml.dsp	16 Jul 2007 20:29:52 -0000	1.2
--- modules_mod_wxbindhtml.dsp	16 Jul 2007 22:53:31 -0000	1.3
***************
*** 454,457 ****
--- 454,459 ----
  
  SOURCE=..\..\wxbind\src\dummy.cpp
+ # ADD BASE CPP /Yc"wx/wxprec.h"
+ # ADD CPP /Yc"wx/wxprec.h"
  # End Source File
  # Begin Source File

Index: modules_mod_wxbindxml.dsp
===================================================================
RCS file: /cvsroot/wxlua/wxLua/modules/build/msvc6/modules_mod_wxbindxml.dsp,v
retrieving revision 1.2
retrieving revision 1.3
diff -C2 -d -r1.2 -r1.3
*** modules_mod_wxbindxml.dsp	16 Jul 2007 20:29:52 -0000	1.2
--- modules_mod_wxbindxml.dsp	16 Jul 2007 22:53:31 -0000	1.3
***************
*** 454,457 ****
--- 454,459 ----
  
  SOURCE=..\..\wxbind\src\dummy.cpp
+ # ADD BASE CPP /Yc"wx/wxprec.h"
+ # ADD CPP /Yc"wx/wxprec.h"
  # End Source File
  # Begin Source File

Index: modules_mod_wxbindrichtext.dsp
===================================================================
RCS file: /cvsroot/wxlua/wxLua/modules/build/msvc6/modules_mod_wxbindrichtext.dsp,v
retrieving revision 1.2
retrieving revision 1.3
diff -C2 -d -r1.2 -r1.3
*** modules_mod_wxbindrichtext.dsp	16 Jul 2007 20:29:52 -0000	1.2
--- modules_mod_wxbindrichtext.dsp	16 Jul 2007 22:53:31 -0000	1.3
***************
*** 454,457 ****
--- 454,459 ----
  
  SOURCE=..\..\wxbind\src\dummy.cpp
+ # ADD BASE CPP /Yc"wx/wxprec.h"
+ # ADD CPP /Yc"wx/wxprec.h"
  # End Source File
  # Begin Source File

Index: modules_mod_wxbindcore.dsp
===================================================================
RCS file: /cvsroot/wxlua/wxLua/modules/build/msvc6/modules_mod_wxbindcore.dsp,v
retrieving revision 1.2
retrieving revision 1.3
diff -C2 -d -r1.2 -r1.3
*** modules_mod_wxbindcore.dsp	16 Jul 2007 20:29:52 -0000	1.2
--- modules_mod_wxbindcore.dsp	16 Jul 2007 22:53:31 -0000	1.3
***************
*** 454,457 ****
--- 454,459 ----
  
  SOURCE=..\..\wxbind\src\dummy.cpp
+ # ADD BASE CPP /Yc"wx/wxprec.h"
+ # ADD CPP /Yc"wx/wxprec.h"
  # End Source File
  # Begin Source File

Index: modules_mod_wxbindstc.dsp
===================================================================
RCS file: /cvsroot/wxlua/wxLua/modules/build/msvc6/modules_mod_wxbindstc.dsp,v
retrieving revision 1.6
retrieving revision 1.7
diff -C2 -d -r1.6 -r1.7
*** modules_mod_wxbindstc.dsp	16 Jul 2007 20:29:52 -0000	1.6
--- modules_mod_wxbindstc.dsp	16 Jul 2007 22:53:31 -0000	1.7
***************
*** 454,457 ****
--- 454,459 ----
  
  SOURCE=..\..\wxbind\src\dummy.cpp
+ # ADD BASE CPP /Yc"wx/wxprec.h"
+ # ADD CPP /Yc"wx/wxprec.h"
  # End Source File
  # Begin Source File