wxlua-commit — CVS commits of wxLua

[Wxlua-commit] wxLua/apps/wxluacan/src genwxbind.bat,1.2,1.3

[Klaas H. <ti...@us...>]

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

Modified Files:
	genwxbind.bat 
Log Message:
point to wxlua-lua exe in vcd_lib

Index: genwxbind.bat
===================================================================
RCS file: /cvsroot/wxlua/wxLua/apps/wxluacan/src/genwxbind.bat,v
retrieving revision 1.2
retrieving revision 1.3
diff -C2 -d -r1.2 -r1.3
*** genwxbind.bat	11 Feb 2006 20:16:08 -0000	1.2
--- genwxbind.bat	13 Dec 2006 21:46:58 -0000	1.3
***************
*** 4,8 ****
  
  echo Generating wxWidgets Binding
! %WXLUA%\bin\lua.exe -e"rulesFilename=\"wxluacan_rules.lua\"" %WXLUA%\bindings\genwxbind.lua 
  echo Done wxluacan wraps
  
--- 4,8 ----
  
  echo Generating wxWidgets Binding
! %WXLUA%\bin\vcd_lib\wxlua-lua.exe -e"rulesFilename=\"wxluacan_rules.lua\"" %WXLUA%\bindings\genwxbind.lua 
  echo Done wxluacan wraps
  

[Wxlua-commit] wxLua/modules/wxluasocket/src wxldserv.cpp, 1.35, 1.36

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

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

Modified Files:
	wxldserv.cpp 
Log Message:
remove statement with no effect


Index: wxldserv.cpp
===================================================================
RCS file: /cvsroot/wxlua/wxLua/modules/wxluasocket/src/wxldserv.cpp,v
retrieving revision 1.35
retrieving revision 1.36
diff -C2 -d -r1.35 -r1.36
*** wxldserv.cpp	13 Dec 2006 06:57:50 -0000	1.35
--- wxldserv.cpp	13 Dec 2006 07:02:10 -0000	1.36
***************
*** 696,701 ****
          if (m_debuggeeProcessID < 1)
              KillDebuggee();
- 
-         m_debuggeeProcessID;
      }
  
--- 696,699 ----

[Wxlua-commit] wxLua/modules/wxluasocket/include wxldserv.h, 1.28, 1.29 wxluasocket_bind.h, 1.8, 1.9

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

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

Modified Files:
	wxldserv.h wxluasocket_bind.h 
Log Message:
cleanup genwxbind.lua, better var names, builtin -> number or function
cleanup wxlprint, wxlhtmlwin


Index: wxldserv.h
===================================================================
RCS file: /cvsroot/wxlua/wxLua/modules/wxluasocket/include/wxldserv.h,v
retrieving revision 1.28
retrieving revision 1.29
diff -C2 -d -r1.28 -r1.29
*** wxldserv.h	12 Dec 2006 01:23:40 -0000	1.28
--- wxldserv.h	13 Dec 2006 06:57:50 -0000	1.29
***************
*** 98,105 ****
  {
  public:
!     wxLuaDebuggerStackDialog(wxWindow* parent, wxWindowID id,
!                              const wxString& title,
!                              const wxPoint& pos, const wxSize& size,
!                              wxLuaDebuggerBase* luaDebugger);
  
      virtual ~wxLuaDebuggerStackDialog();
--- 98,106 ----
  {
  public:
!     wxLuaDebuggerStackDialog(wxLuaDebuggerBase* luaDebugger,
!                              wxWindow* parent, wxWindowID id = wxID_ANY,
!                              const wxString& title = wxT("wxLua Stack"),
!                              const wxPoint& pos = wxDefaultPosition,
!                              const wxSize& size = wxSize(500, 300));
  
      virtual ~wxLuaDebuggerStackDialog();
***************
*** 284,289 ****
      // Stop the debugger server, returns success
      bool StopServer();
!     // Start a debuggee client to be debugged by this, returns success
!     bool StartClient();
  
      virtual wxLuaSocketBase* GetSocketBase() { return m_acceptedSocket; }
--- 285,291 ----
      // Stop the debugger server, returns success
      bool StopServer();
!     // Start a debuggee client to be debugged by this, returns process ID
!     //   is > 0 on success.
!     long StartClient();
  
      virtual wxLuaSocketBase* GetSocketBase() { return m_acceptedSocket; }
***************
*** 327,331 ****
      bool StopServer();
      // Start a debuggee client to be debugged by this, returns success
!     bool StartClient();
  
      virtual wxLuaSocketBase* GetSocketBase() { return m_acceptedSocket; }
--- 329,333 ----
      bool StopServer();
      // Start a debuggee client to be debugged by this, returns success
!     long StartClient();
  
      virtual wxLuaSocketBase* GetSocketBase() { return m_acceptedSocket; }

Index: wxluasocket_bind.h
===================================================================
RCS file: /cvsroot/wxlua/wxLua/modules/wxluasocket/include/wxluasocket_bind.h,v
retrieving revision 1.8
retrieving revision 1.9
diff -C2 -d -r1.8 -r1.9
*** wxluasocket_bind.h	13 Dec 2006 00:27:57 -0000	1.8
--- wxluasocket_bind.h	13 Dec 2006 06:57:50 -0000	1.9
***************
*** 23,29 ****
  #include "wxlua/include/wxlbind.h"
  
! #if WXLUA_BINDING_VERSION > 1
  #   error "The WXLUA_BINDING_VERSION in the bindings is too old, regenerate bindings."
! #endif //WXLUA_BINDING_VERSION > 1
  
  // binding class
--- 23,29 ----
  #include "wxlua/include/wxlbind.h"
  
! #if WXLUA_BINDING_VERSION > 2
  #   error "The WXLUA_BINDING_VERSION in the bindings is too old, regenerate bindings."
! #endif //WXLUA_BINDING_VERSION > 2
  
  // binding class

[Wxlua-commit] wxLua/modules/wxluasocket/src wxldserv.cpp, 1.34, 1.35 wxluasocket.cpp, 1.9, 1.10

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

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

Modified Files:
	wxldserv.cpp wxluasocket.cpp 
Log Message:
cleanup genwxbind.lua, better var names, builtin -> number or function
cleanup wxlprint, wxlhtmlwin


Index: wxldserv.cpp
===================================================================
RCS file: /cvsroot/wxlua/wxLua/modules/wxluasocket/src/wxldserv.cpp,v
retrieving revision 1.34
retrieving revision 1.35
diff -C2 -d -r1.34 -r1.35
*** wxldserv.cpp	12 Dec 2006 01:23:40 -0000	1.34
--- wxldserv.cpp	13 Dec 2006 06:57:50 -0000	1.35
***************
*** 90,102 ****
  IMPLEMENT_ABSTRACT_CLASS(wxLuaDebuggerStackDialog, wxLuaStackDialog)
  
! wxLuaDebuggerStackDialog::wxLuaDebuggerStackDialog(wxWindow* parent, wxWindowID id,
                                                     const wxString& title,
!                                                    const wxPoint& pos, const wxSize& size,
!                                                    wxLuaDebuggerBase* luaDebugger)
                           :wxLuaStackDialog(), m_luaDebugger(luaDebugger)
  {
      wxCHECK_RET(m_luaDebugger != NULL, wxT("Invalid wxLuaDebuggerBase in wxLuaDebuggerStackDialog"));
      // use delayed creation to allow our virtual functions to work
!     Create(parent, id, title, pos, size, wxNullLuaState);
  }
  
--- 90,102 ----
  IMPLEMENT_ABSTRACT_CLASS(wxLuaDebuggerStackDialog, wxLuaStackDialog)
  
! wxLuaDebuggerStackDialog::wxLuaDebuggerStackDialog(wxLuaDebuggerBase* luaDebugger,
!                                                    wxWindow* parent, wxWindowID id,
                                                     const wxString& title,
!                                                    const wxPoint& pos, const wxSize& size)
                           :wxLuaStackDialog(), m_luaDebugger(luaDebugger)
  {
      wxCHECK_RET(m_luaDebugger != NULL, wxT("Invalid wxLuaDebuggerBase in wxLuaDebuggerStackDialog"));
      // use delayed creation to allow our virtual functions to work
!     Create(wxNullLuaState, parent, id, title, pos, size);
  }
  
***************
*** 142,147 ****
  {
      // If this is being deleted from the destructor of wxLuaDebuggerBase
!     //   it has already been NULLed so don't send event or delete this.
!     if (m_debugger->m_debuggeeProcess)
      {
          // we don't use the event handler, but this is good enough.
--- 142,147 ----
  {
      // If this is being deleted from the destructor of wxLuaDebuggerBase
!     //   it has already been NULLed so don't send event.
!     if (m_debugger && m_debugger->m_debuggeeProcess)
      {
          // we don't use the event handler, but this is good enough.
***************
*** 151,156 ****
          m_debugger->m_debuggeeProcess = NULL;
          m_debugger->m_debuggeeProcessID = -1;
-         delete this;
      }
  }
  
--- 151,157 ----
          m_debugger->m_debuggeeProcess = NULL;
          m_debugger->m_debuggeeProcessID = -1;
      }
+ 
+     delete this;
  }
  
***************
*** 194,203 ****
  wxLuaDebuggerBase::~wxLuaDebuggerBase()
  {
!     if ((m_debuggeeProcess != NULL)) // && (m_debuggeeProcessID > 0))
      {
-         // NULL the process before deleting so it won't try to delete it again
-         wxLuaDebuggerProcess *p = m_debuggeeProcess;
          m_debuggeeProcess = NULL;
!         delete p;
      }
  }
--- 195,205 ----
  wxLuaDebuggerBase::~wxLuaDebuggerBase()
  {
!     // we don't delete the the process, we kill it and it's OnTerminate deletes it
!     if ((m_debuggeeProcess != NULL) && (m_debuggeeProcessID > 0))
      {
          m_debuggeeProcess = NULL;
!         wxProcess::Kill(m_debuggeeProcessID, wxSIGTERM, wxKILL_CHILDREN);
! 
!         wxPrintf(wxT("Deleting the m_debuggeeProcess %d\n"), m_debuggeeProcessID);
      }
  }
***************
*** 542,548 ****
      wxCHECK_MSG(m_stackDialog == NULL, false, wxT("Stack dialog already shown"));
  
!     m_stackDialog = new wxLuaDebuggerStackDialog(parent, id, _("wxLua Stack frame"),
!                                                  wxDefaultPosition, wxSize(500, 250),
!                                                  this);
      m_stackDialog->ShowModal();
      m_stackDialog->Destroy();
--- 544,548 ----
      wxCHECK_MSG(m_stackDialog == NULL, false, wxT("Stack dialog already shown"));
  
!     m_stackDialog = new wxLuaDebuggerStackDialog(this, parent, id);
      m_stackDialog->ShowModal();
      m_stackDialog->Destroy();
***************
*** 596,611 ****
      if ((m_debuggeeProcess != NULL) && (m_debuggeeProcessID > 0))
      {
!         if (m_debuggeeProcess->Exists(m_debuggeeProcessID))
!             m_debuggeeProcess->Kill(m_debuggeeProcessID, wxSIGKILL);
!     }
  
!     if (m_debuggeeProcess != NULL)
      {
          wxLuaDebuggerProcess* p = m_debuggeeProcess;
          m_debuggeeProcess = NULL;
          delete p;
-         m_debuggeeProcessID = -1;
      }
  
      return true;
  }
--- 596,615 ----
      if ((m_debuggeeProcess != NULL) && (m_debuggeeProcessID > 0))
      {
!         m_debuggeeProcess->m_debugger = NULL;
!         m_debuggeeProcess = NULL;
  
!         //if (p->Exists(m_debuggeeProcessID)) should exist since OnTerminate hasn't been called
!             wxProcess::Kill(m_debuggeeProcessID, wxSIGTERM, wxKILL_CHILDREN);
!     }
!     else if (m_debuggeeProcess != NULL) // error starting process?
      {
          wxLuaDebuggerProcess* p = m_debuggeeProcess;
+         m_debuggeeProcess->m_debugger = NULL;
          m_debuggeeProcess = NULL;
          delete p;
      }
  
+     m_debuggeeProcessID = -1;
+ 
      return true;
  }
***************
*** 675,679 ****
  }
  
! bool wxLuaDebuggerServer::StartClient()
  {
      wxCHECK_MSG(m_serverSocket, false, wxT("Debugger server not started"));
--- 679,683 ----
  }
  
! long wxLuaDebuggerServer::StartClient()
  {
      wxCHECK_MSG(m_serverSocket, false, wxT("Debugger server not started"));
***************
*** 688,700 ****
                                              m_port_number);
  
!         m_debuggeeProcessID = wxExecute(command, wxEXEC_ASYNC, m_debuggeeProcess);
  
          if (m_debuggeeProcessID < 1)
              KillDebuggee();
  
!         return (m_debuggeeProcessID > 0);
      }
  
!     return false;
  }
  
--- 692,704 ----
                                              m_port_number);
  
!         m_debuggeeProcessID = wxExecute(command, wxEXEC_ASYNC|wxEXEC_MAKE_GROUP_LEADER, m_debuggeeProcess);
  
          if (m_debuggeeProcessID < 1)
              KillDebuggee();
  
!         m_debuggeeProcessID;
      }
  
!     return m_debuggeeProcessID;
  }
  
***************
*** 902,906 ****
  }
  
! bool wxLuaDebuggerwxSocketServer::StartClient()
  {
      if (m_debuggeeProcess == NULL)
--- 906,910 ----
  }
  
! long wxLuaDebuggerwxSocketServer::StartClient()
  {
      if (m_debuggeeProcess == NULL)
***************
*** 913,920 ****
  
          m_debuggeeProcessID = wxExecute(command, wxEXEC_ASYNC, m_debuggeeProcess);
- 
-         return (m_debuggeeProcessID > 0);
      }
!     return false;
  }
  
--- 917,923 ----
  
          m_debuggeeProcessID = wxExecute(command, wxEXEC_ASYNC, m_debuggeeProcess);
      }
! 
!     return m_debuggeeProcessID;
  }
  

Index: wxluasocket.cpp
===================================================================
RCS file: /cvsroot/wxlua/wxLua/modules/wxluasocket/src/wxluasocket.cpp,v
retrieving revision 1.9
retrieving revision 1.10
diff -C2 -d -r1.9 -r1.10
*** wxluasocket.cpp	12 Dec 2006 07:09:42 -0000	1.9
--- wxluasocket.cpp	13 Dec 2006 06:57:50 -0000	1.10
***************
*** 74,88 ****
  }
  
! //     bool StartClient()
  static int LUACALL wxLua_wxLuaDebuggerServer_StartClient(lua_State *L)
  {
      wxLuaState wxlState(L);
!     bool returns;
      // get this
      wxLuaDebuggerServer * self = (wxLuaDebuggerServer *)wxlState.GetUserDataType(1, s_wxluatag_wxLuaDebuggerServer);
      // call StartClient
      returns = self->StartClient();
!     // push the result flag
!     lua_pushboolean(L, returns);
  
      return 1;
--- 74,88 ----
  }
  
! //     long StartClient()
  static int LUACALL wxLua_wxLuaDebuggerServer_StartClient(lua_State *L)
  {
      wxLuaState wxlState(L);
!     long returns;
      // get this
      wxLuaDebuggerServer * self = (wxLuaDebuggerServer *)wxlState.GetUserDataType(1, s_wxluatag_wxLuaDebuggerServer);
      // call StartClient
      returns = self->StartClient();
!     // push the result number
!     lua_pushnumber(L, returns);
  
      return 1;

[Wxlua-commit] wxLua/modules/wxluadebug/src staktree.cpp, 1.33, 1.34

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

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

Modified Files:
	staktree.cpp 
Log Message:
cleanup genwxbind.lua, better var names, builtin -> number or function
cleanup wxlprint, wxlhtmlwin


Index: staktree.cpp
===================================================================
RCS file: /cvsroot/wxlua/wxLua/modules/wxluadebug/src/staktree.cpp,v
retrieving revision 1.33
retrieving revision 1.34
diff -C2 -d -r1.33 -r1.34
*** staktree.cpp	12 Dec 2006 01:23:40 -0000	1.33
--- staktree.cpp	13 Dec 2006 06:57:50 -0000	1.34
***************
*** 35,40 ****
  
  BEGIN_EVENT_TABLE(wxLuaStackDialog, wxDialog)
!     EVT_COMBOBOX(           ID_WXLUA_STACKDIALOG_COMBO,          wxLuaStackDialog::OnSelectStack)
!     EVT_TREE_ITEM_EXPANDING(ID_WXLUA_STACKDIALOG_STACKTREE,      wxLuaStackDialog::OnItemExpanding)
  END_EVENT_TABLE()
  
--- 35,40 ----
  
  BEGIN_EVENT_TABLE(wxLuaStackDialog, wxDialog)
!     EVT_COMBOBOX(           ID_WXLUA_STACKDIALOG_COMBO,     wxLuaStackDialog::OnSelectStack)
!     EVT_TREE_ITEM_EXPANDING(ID_WXLUA_STACKDIALOG_STACKTREE, wxLuaStackDialog::OnItemExpanding)
  END_EVENT_TABLE()
  
***************
*** 54,61 ****
  }
  
! bool wxLuaStackDialog::Create(wxWindow* parent, wxWindowID id,
                                const wxString& title,
!                               const wxPoint& pos, const wxSize& size,
!                               const wxLuaState& wxlState)
  {
      m_wxlState = wxlState;
--- 54,61 ----
  }
  
! bool wxLuaStackDialog::Create(const wxLuaState& wxlState,
!                               wxWindow* parent, wxWindowID id,
                                const wxString& title,
!                               const wxPoint& pos, const wxSize& size)
  {
      m_wxlState = wxlState;

[Wxlua-commit] wxLua/samples editor.wx.lua,1.39,1.40

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

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

Modified Files:
	editor.wx.lua 
Log Message:
cleanup genwxbind.lua, better var names, builtin -> number or function
cleanup wxlprint, wxlhtmlwin


Index: editor.wx.lua
===================================================================
RCS file: /cvsroot/wxlua/wxLua/samples/editor.wx.lua,v
retrieving revision 1.39
retrieving revision 1.40
diff -C2 -d -r1.39 -r1.40
*** editor.wx.lua	11 Dec 2006 07:03:30 -0000	1.39
--- editor.wx.lua	13 Dec 2006 06:57:50 -0000	1.40
***************
*** 1810,1824 ****
              end
  
!             local ok = false
              debuggerServer = CreateDebuggerServer()
              if debuggerServer then
!                 ok = debuggerServer:StartClient()
              end
  
!             if debuggerServer and ok then
                  SetAllEditorsReadOnly(true)
                  DisplayOutput("Waiting for client connection.\n")
              else
!                 DisplayOutput("Unable to start debuggee.\n")
                  if debuggerServer then
                      debuggerServer:Delete()
--- 1810,1824 ----
              end
  
!             local pid = -1
              debuggerServer = CreateDebuggerServer()
              if debuggerServer then
!                 pid = debuggerServer:StartClient()
              end
  
!             if debuggerServer and (pid > 0) then
                  SetAllEditorsReadOnly(true)
                  DisplayOutput("Waiting for client connection.\n")
              else
!                 DisplayOutput("Unable to start debuggee process.\n")
                  if debuggerServer then
                      debuggerServer:Delete()

[Wxlua-commit] wxLua/modules/wxbind/src socket.cpp, 1.19, 1.20 wxlhtmlwin.cpp, 1.12, 1.13 wxlprint.cpp, 1.11, 1.12

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

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

Modified Files:
	socket.cpp wxlhtmlwin.cpp wxlprint.cpp 
Log Message:
cleanup genwxbind.lua, better var names, builtin -> number or function
cleanup wxlprint, wxlhtmlwin


Index: wxlprint.cpp
===================================================================
RCS file: /cvsroot/wxlua/wxLua/modules/wxbind/src/wxlprint.cpp,v
retrieving revision 1.11
retrieving revision 1.12
diff -C2 -d -r1.11 -r1.12
*** wxlprint.cpp	12 Dec 2006 01:23:40 -0000	1.11
--- wxlprint.cpp	13 Dec 2006 06:57:50 -0000	1.12
***************
*** 31,35 ****
  // ----------------------------------------------------------------------------
  
! IMPLEMENT_CLASS(wxLuaPrintout, wxPrintout)
  
  wxLuaPrintout::wxLuaPrintout(const wxLuaState& wxlState,
--- 31,35 ----
  // ----------------------------------------------------------------------------
  
! IMPLEMENT_ABSTRACT_CLASS(wxLuaPrintout, wxPrintout)
  
  wxLuaPrintout::wxLuaPrintout(const wxLuaState& wxlState,

Index: socket.cpp
===================================================================
RCS file: /cvsroot/wxlua/wxLua/modules/wxbind/src/socket.cpp,v
retrieving revision 1.19
retrieving revision 1.20
diff -C2 -d -r1.19 -r1.20
*** socket.cpp	12 Dec 2006 07:09:39 -0000	1.19
--- socket.cpp	13 Dec 2006 06:57:49 -0000	1.20
***************
*** 365,369 ****
      wxLuaState wxlState(L);
      // wxSocketEventFlags flags
!     wxSocketEventFlags flags = (wxSocketEventFlags)wxlState.GetNumberType(2);
      // get this
      wxSocketBase * self = (wxSocketBase *)wxlState.GetUserDataType(1, s_wxluatag_wxSocketBase);
--- 365,369 ----
      wxLuaState wxlState(L);
      // wxSocketEventFlags flags
!     wxSocketEventFlags flags = (wxSocketEventFlags)wxlState.GetEnumerationType(2);
      // get this
      wxSocketBase * self = (wxSocketBase *)wxlState.GetUserDataType(1, s_wxluatag_wxSocketBase);
***************
*** 637,641 ****
      { LuaMethod, "SetEventHandler", wxLua_wxSocketBase_SetEventHandler, 2, 1, { &s_wxluatag_wxEvtHandler, &s_wxluaarg_Number, 0 } },
      { LuaMethod, "SetFlags", wxLua_wxSocketBase_SetFlags, 1, 1, { &s_wxluaarg_Enumeration, 0 } },
!     { LuaMethod, "SetNotify", wxLua_wxSocketBase_SetNotify, 1, 1, { &s_wxluaarg_Number, 0 } },
      { LuaMethod, "SetTimeout", wxLua_wxSocketBase_SetTimeout, 1, 1, { &s_wxluaarg_Number, 0 } },
      { LuaMethod, "Peek", wxLua_wxSocketBase_Peek, 2, 2, { &s_wxluaarg_LightUserData, &s_wxluaarg_Number, 0 } },
--- 637,641 ----
      { LuaMethod, "SetEventHandler", wxLua_wxSocketBase_SetEventHandler, 2, 1, { &s_wxluatag_wxEvtHandler, &s_wxluaarg_Number, 0 } },
      { LuaMethod, "SetFlags", wxLua_wxSocketBase_SetFlags, 1, 1, { &s_wxluaarg_Enumeration, 0 } },
!     { LuaMethod, "SetNotify", wxLua_wxSocketBase_SetNotify, 1, 1, { &s_wxluaarg_Enumeration, 0 } },
      { LuaMethod, "SetTimeout", wxLua_wxSocketBase_SetTimeout, 1, 1, { &s_wxluaarg_Number, 0 } },
      { LuaMethod, "Peek", wxLua_wxSocketBase_Peek, 2, 2, { &s_wxluaarg_LightUserData, &s_wxluaarg_Number, 0 } },

Index: wxlhtmlwin.cpp
===================================================================
RCS file: /cvsroot/wxlua/wxLua/modules/wxbind/src/wxlhtmlwin.cpp,v
retrieving revision 1.12
retrieving revision 1.13
diff -C2 -d -r1.12 -r1.13
*** wxlhtmlwin.cpp	12 Dec 2006 01:23:40 -0000	1.12
--- wxlhtmlwin.cpp	13 Dec 2006 06:57:50 -0000	1.13
***************
*** 21,26 ****
  
  #include "wxbind/include/wxlhtmlwin.h"
! #include "wxlua/include/wxlstate.h"
! #include "wxlua/include/wxlcallb.h"
  
  #if wxLUA_USE_wxHTML
--- 21,25 ----
  
  #include "wxbind/include/wxlhtmlwin.h"
! //#include "wxlua/include/wxlcallb.h"
  
  #if wxLUA_USE_wxHTML
***************
*** 37,53 ****
  // wxLuaHtmlWindow
  // ----------------------------------------------------------------------------
! 
! IMPLEMENT_CLASS(wxLuaHtmlWindow, wxHtmlWindow)
! 
! BEGIN_EVENT_TABLE(wxLuaHtmlWindow, wxHtmlWindow)
! END_EVENT_TABLE()
! 
! wxLuaHtmlWindow::wxLuaHtmlWindow() : wxHtmlWindow()
! {
! }
! 
! wxLuaHtmlWindow::~wxLuaHtmlWindow()
! {
! }
  
  wxLuaHtmlWindow::wxLuaHtmlWindow(const wxLuaState& wxlState,
--- 36,40 ----
  // wxLuaHtmlWindow
  // ----------------------------------------------------------------------------
! IMPLEMENT_ABSTRACT_CLASS(wxLuaHtmlWindow, wxHtmlWindow)
  
  wxLuaHtmlWindow::wxLuaHtmlWindow(const wxLuaState& wxlState,
***************
*** 71,74 ****
--- 58,62 ----
      bool ret = false;
  #endif
+ 
      if (m_wxlState.Ok() && !m_wxlState.GetCallBaseClassFunction() &&
          m_wxlState.HasDerivedMethod(this, "OnCellClicked"))
***************
*** 88,101 ****
--- 76,93 ----
  
          if (fResult)
+         {
  #if wxCHECK_VERSION(2,7,0)
              ret =
  #endif
                  wxHtmlWindow::OnCellClicked(cell, x, y, event);
+         }
      }
      else
+     {
  #if wxCHECK_VERSION(2,7,0)
          ret =
  #endif
              wxHtmlWindow::OnCellClicked(cell, x, y, event);
+     }
  
      m_wxlState.SetCallBaseClassFunction(false); // clear flag always
***************
*** 173,179 ****
      wxLuaHtmlWinTagHandler() {}
  
!     wxString GetSupportedTags() { return wxString(wxT("LUA")); }
  
!     bool HandleTag(const wxHtmlTag& tag)
      {
          wxLuaHtmlWinTagEvent htmlEvent(wxEVT_HTML_TAG_HANDLER);
--- 165,171 ----
      wxLuaHtmlWinTagHandler() {}
  
!     virtual wxString GetSupportedTags() { return wxT("LUA"); }
  
!     virtual bool HandleTag(const wxHtmlTag& tag)
      {
          wxLuaHtmlWinTagEvent htmlEvent(wxEVT_HTML_TAG_HANDLER);
***************
*** 183,187 ****
              return htmlEvent.GetParseInnerCalled();
  
!         return FALSE;
      }
  };
--- 175,179 ----
              return htmlEvent.GetParseInnerCalled();
  
!         return false;
      }
  };
***************
*** 191,195 ****
      DECLARE_DYNAMIC_CLASS(wxLuaHtmlTagsModule)
  public:
!     void FillHandlersTable(wxHtmlWinParser *parser)
      {
          parser->AddTagHandler(new wxLuaHtmlWinTagHandler);
--- 183,187 ----
      DECLARE_DYNAMIC_CLASS(wxLuaHtmlTagsModule)
  public:
!     virtual void FillHandlersTable(wxHtmlWinParser *parser)
      {
          parser->AddTagHandler(new wxLuaHtmlWinTagHandler);
***************
*** 205,222 ****
  IMPLEMENT_DYNAMIC_CLASS(wxLuaHtmlWinTagEvent, wxEvent)
  
! wxLuaHtmlWinTagEvent::wxLuaHtmlWinTagEvent()
!                      :m_pHtmlTag(NULL), m_pHtmlParser(NULL),
!                       m_fParseInnerCalled(false)
! {
! }
! 
! wxLuaHtmlWinTagEvent::wxLuaHtmlWinTagEvent(int eventType)
!                      :m_pHtmlTag(NULL), m_pHtmlParser(NULL),
!                       m_fParseInnerCalled(false)
  {
-     SetEventType(eventType);
  }
  
! wxLuaHtmlWinTagEvent::~wxLuaHtmlWinTagEvent()
  {
  }
--- 197,210 ----
  IMPLEMENT_DYNAMIC_CLASS(wxLuaHtmlWinTagEvent, wxEvent)
  
! wxLuaHtmlWinTagEvent::wxLuaHtmlWinTagEvent(wxEventType eventType)
!                      :wxEvent(wxID_ANY, eventType), m_pHtmlTag(NULL),
!                       m_pHtmlParser(NULL), m_fParseInnerCalled(false)
  {
  }
  
! wxLuaHtmlWinTagEvent::wxLuaHtmlWinTagEvent(const wxLuaHtmlWinTagEvent& event)
!                      :wxEvent(event), m_pHtmlTag(event.m_pHtmlTag),
!                       m_pHtmlParser(event.m_pHtmlParser),
!                       m_fParseInnerCalled(event.m_fParseInnerCalled)
  {
  }
***************
*** 229,263 ****
  }
  
- wxEvent* wxLuaHtmlWinTagEvent::Clone() const
- {
-     wxLuaHtmlWinTagEvent *pEvent = new wxLuaHtmlWinTagEvent(GetEventType());
-     if (pEvent != NULL)
-     {
-         pEvent->m_pHtmlTag          = m_pHtmlTag;
-         pEvent->m_pHtmlParser       = m_pHtmlParser;
-         pEvent->m_fParseInnerCalled = m_fParseInnerCalled;
-     }
-     return pEvent;
- }
- 
- const wxHtmlTag *wxLuaHtmlWinTagEvent::GetHtmlTag() const
- {
-     return m_pHtmlTag;
- }
- 
- wxHtmlWinParser *wxLuaHtmlWinTagEvent::GetHtmlParser() const
- {
-     return m_pHtmlParser;
- }
- 
- bool wxLuaHtmlWinTagEvent::GetParseInnerCalled() const
- {
-     return m_fParseInnerCalled;
- }
- 
- void wxLuaHtmlWinTagEvent::SetParseInnerCalled(bool fParseInnerCalled)
- {
-     m_fParseInnerCalled = fParseInnerCalled;
- }
- 
  #endif //wxLUA_USE_wxHTML
--- 217,219 ----

[Wxlua-commit] wxLua/modules/wxbindstc/include wxbind.h,1.14,1.15

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

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

Modified Files:
	wxbind.h 
Log Message:
cleanup genwxbind.lua, better var names, builtin -> number or function
cleanup wxlprint, wxlhtmlwin


Index: wxbind.h
===================================================================
RCS file: /cvsroot/wxlua/wxLua/modules/wxbindstc/include/wxbind.h,v
retrieving revision 1.14
retrieving revision 1.15
diff -C2 -d -r1.14 -r1.15
*** wxbind.h	13 Dec 2006 00:27:57 -0000	1.14
--- wxbind.h	13 Dec 2006 06:57:50 -0000	1.15
***************
*** 22,28 ****
  #include "wxlua/include/wxlbind.h"
  
! #if WXLUA_BINDING_VERSION > 1
  #   error "The WXLUA_BINDING_VERSION in the bindings is too old, regenerate bindings."
! #endif //WXLUA_BINDING_VERSION > 1
  
  // binding class
--- 22,28 ----
  #include "wxlua/include/wxlbind.h"
  
! #if WXLUA_BINDING_VERSION > 2
  #   error "The WXLUA_BINDING_VERSION in the bindings is too old, regenerate bindings."
! #endif //WXLUA_BINDING_VERSION > 2
  
  // binding class

[Wxlua-commit] wxLua/modules/wxluadebug/include staktree.h, 1.15, 1.16

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

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

Modified Files:
	staktree.h 
Log Message:
cleanup genwxbind.lua, better var names, builtin -> number or function
cleanup wxlprint, wxlhtmlwin


Index: staktree.h
===================================================================
RCS file: /cvsroot/wxlua/wxLua/modules/wxluadebug/include/staktree.h,v
retrieving revision 1.15
retrieving revision 1.16
diff -C2 -d -r1.15 -r1.16
*** staktree.h	12 Dec 2006 01:23:40 -0000	1.15
--- staktree.h	13 Dec 2006 06:57:50 -0000	1.16
***************
*** 43,61 ****
      wxLuaStackDialog() : wxDialog() { Init(); }
  
!     wxLuaStackDialog(wxWindow* parent, wxWindowID id,
!                      const wxString& title,
!                      const wxPoint& pos, const wxSize& size,
!                      const wxLuaState& wxlState) : wxDialog()
      {
          Init();
!         Create(parent, id, title, pos, size, wxlState);
      }
  
      virtual ~wxLuaStackDialog();
  
!     bool Create(wxWindow* parent, wxWindowID id,
!                 const wxString& title,
!                 const wxPoint& pos, const wxSize& size,
!                 const wxLuaState& wxlState);
  
      // Override these functions if you need to provide an alternate way to get
--- 43,63 ----
      wxLuaStackDialog() : wxDialog() { Init(); }
  
!     wxLuaStackDialog(const wxLuaState& wxlState,
!                      wxWindow* parent, wxWindowID id = wxID_ANY,
!                      const wxString& title = wxT("wxLua Stack"),
!                      const wxPoint& pos = wxDefaultPosition,
!                      const wxSize& size = wxSize(500, 300)) : wxDialog()
      {
          Init();
!         Create(wxlState, parent, id, title, pos, size);
      }
  
      virtual ~wxLuaStackDialog();
  
!     bool Create(const wxLuaState& wxlState,
!                 wxWindow* parent, wxWindowID id = wxID_ANY,
!                 const wxString& title = wxT("wxLua Stack"),
!                 const wxPoint& pos = wxDefaultPosition,
!                 const wxSize& size = wxDefaultSize);
  
      // Override these functions if you need to provide an alternate way to get

[Wxlua-commit] wxLua/modules/wxbind/include wxbind.h, 1.45, 1.46 wxlhtmlwin.h, 1.6, 1.7 wxlprint.h, 1.7, 1.8

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

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

Modified Files:
	wxbind.h wxlhtmlwin.h wxlprint.h 
Log Message:
cleanup genwxbind.lua, better var names, builtin -> number or function
cleanup wxlprint, wxlhtmlwin


Index: wxlhtmlwin.h
===================================================================
RCS file: /cvsroot/wxlua/wxLua/modules/wxbind/include/wxlhtmlwin.h,v
retrieving revision 1.6
retrieving revision 1.7
diff -C2 -d -r1.6 -r1.7
*** wxlhtmlwin.h	12 Dec 2006 01:23:40 -0000	1.6
--- wxlhtmlwin.h	13 Dec 2006 06:57:49 -0000	1.7
***************
*** 10,19 ****
  #define WX_LUA_HTML_WINDOW_H
  
  #include "wxlua/include/wxldefs.h"
  #include "wxlua/include/wxlstate.h"
  #include "wxbind/include/wxbinddefs.h"
- #include "wx/print.h"
- #include "wx/html/htmlwin.h"
- #include "wx/html/htmlcell.h"
  #include "wxluasetup.h"
  
--- 10,19 ----
  #define WX_LUA_HTML_WINDOW_H
  
+ #include "wx/html/htmlwin.h"
+ #include "wx/html/htmlcell.h"
+ 
  #include "wxlua/include/wxldefs.h"
  #include "wxlua/include/wxlstate.h"
  #include "wxbind/include/wxbinddefs.h"
  #include "wxluasetup.h"
  
***************
*** 27,37 ****
  {
  public:
- 
-     wxLuaHtmlWindow();
-     virtual ~wxLuaHtmlWindow();
- 
      wxLuaHtmlWindow(const wxLuaState& wxlState,
!                     wxWindow *parent,
!                     wxWindowID id = -1,
                      const wxPoint& pos = wxDefaultPosition,
                      const wxSize& size = wxDefaultSize,
--- 27,32 ----
  {
  public:
      wxLuaHtmlWindow(const wxLuaState& wxlState,
!                     wxWindow *parent, wxWindowID id = wxID_ANY,
                      const wxPoint& pos = wxDefaultPosition,
                      const wxSize& size = wxDefaultSize,
***************
*** 39,42 ****
--- 34,39 ----
                      const wxString& name = wxT("wxLuaHtmlWindow"));
  
+     virtual ~wxLuaHtmlWindow() {}
+ 
  #if wxCHECK_VERSION(2, 7, 0)
      virtual bool
***************
*** 52,57 ****
      wxLuaState m_wxlState;
  
!     DECLARE_EVENT_TABLE()
!     DECLARE_CLASS (wxLuaHtmlWindow)
  };
  
--- 49,53 ----
      wxLuaState m_wxlState;
  
!     DECLARE_ABSTRACT_CLASS(wxLuaHtmlWindow)
  };
  
***************
*** 63,79 ****
  {
  public:
!     wxLuaHtmlWinTagEvent();
!     wxLuaHtmlWinTagEvent(int eventType);
!     virtual ~wxLuaHtmlWinTagEvent();
  
      void SetTagInfo(const wxHtmlTag *pHtmlTag, wxHtmlWinParser *pParser);
  
!     const wxHtmlTag *GetHtmlTag() const;
!     wxHtmlWinParser *GetHtmlParser() const;
!     void             SetParseInnerCalled(bool fParseInnerCalled);
!     bool             GetParseInnerCalled() const;
  
  protected:
!     virtual wxEvent* Clone() const;
  
  private:
--- 59,77 ----
  {
  public:
!     wxLuaHtmlWinTagEvent(wxEventType eventType = wxEVT_NULL);
!     wxLuaHtmlWinTagEvent(const wxLuaHtmlWinTagEvent& event);
! 
!     virtual ~wxLuaHtmlWinTagEvent() {}
  
      void SetTagInfo(const wxHtmlTag *pHtmlTag, wxHtmlWinParser *pParser);
  
!     const wxHtmlTag* GetHtmlTag() const { return m_pHtmlTag; }
!     wxHtmlWinParser* GetHtmlParser() const { return m_pHtmlParser; }
! 
!     bool GetParseInnerCalled() const { return m_fParseInnerCalled; }
!     void SetParseInnerCalled(bool fParseInnerCalled) { m_fParseInnerCalled = fParseInnerCalled; }
  
  protected:
!     virtual wxEvent* Clone() const { return new wxLuaHtmlWinTagEvent(*this); }
  
  private:
***************
*** 90,94 ****
  END_DECLARE_EVENT_TYPES()
  
! #define EVT_HTML_TAG_HANDLER(id, fn) DECLARE_EVENT_TABLE_ENTRY(wxEVT_HTML_TAG_HANDLER, id, -1, (wxObjectEventFunction) (wxEventFunction) (wxLuaHtmlWinTagEventFunction) & fn, (wxObject *) NULL),
  
  #endif // wxLUA_USE_wxHTML
--- 88,92 ----
  END_DECLARE_EVENT_TYPES()
  
! #define EVT_HTML_TAG_HANDLER(id, fn) DECLARE_EVENT_TABLE_ENTRY(wxEVT_HTML_TAG_HANDLER, id, wxID_ANY, (wxObjectEventFunction) (wxEventFunction) (wxLuaHtmlWinTagEventFunction) & fn, (wxObject *) NULL),
  
  #endif // wxLUA_USE_wxHTML

Index: wxbind.h
===================================================================
RCS file: /cvsroot/wxlua/wxLua/modules/wxbind/include/wxbind.h,v
retrieving revision 1.45
retrieving revision 1.46
diff -C2 -d -r1.45 -r1.46
*** wxbind.h	13 Dec 2006 00:27:56 -0000	1.45
--- wxbind.h	13 Dec 2006 06:57:49 -0000	1.46
***************
*** 39,45 ****
  #include "wxlua/include/wxlbind.h"
  
! #if WXLUA_BINDING_VERSION > 1
  #   error "The WXLUA_BINDING_VERSION in the bindings is too old, regenerate bindings."
! #endif //WXLUA_BINDING_VERSION > 1
  
  // binding class
--- 39,45 ----
  #include "wxlua/include/wxlbind.h"
  
! #if WXLUA_BINDING_VERSION > 2
  #   error "The WXLUA_BINDING_VERSION in the bindings is too old, regenerate bindings."
! #endif //WXLUA_BINDING_VERSION > 2
  
  // binding class

Index: wxlprint.h
===================================================================
RCS file: /cvsroot/wxlua/wxLua/modules/wxbind/include/wxlprint.h,v
retrieving revision 1.7
retrieving revision 1.8
diff -C2 -d -r1.7 -r1.8
*** wxlprint.h	12 Dec 2006 01:23:40 -0000	1.7
--- wxlprint.h	13 Dec 2006 06:57:49 -0000	1.8
***************
*** 28,36 ****
  public:
      wxLuaPrintout(const wxLuaState& wxlState,
!                   const wxString& title = _("Printout"),
                    wxLuaObject *pObject = NULL);
  
      // added function so you don't have to override GetPageInfo
      void SetPageInfo(int minPage, int maxPage, int pageFrom, int pageTo);
      // overrides
      virtual void GetPageInfo(int *minPage, int *maxPage, int *pageFrom, int *pageTo);
--- 28,37 ----
  public:
      wxLuaPrintout(const wxLuaState& wxlState,
!                   const wxString& title = wxT("Printout"),
                    wxLuaObject *pObject = NULL);
  
      // added function so you don't have to override GetPageInfo
      void SetPageInfo(int minPage, int maxPage, int pageFrom, int pageTo);
+ 
      // overrides
      virtual void GetPageInfo(int *minPage, int *maxPage, int *pageFrom, int *pageTo);
***************
*** 52,56 ****
      int          m_pageFrom;
      int          m_pageTo;
!     DECLARE_DYNAMIC_CLASS(wxLuaPrintout)
  };
  
--- 53,57 ----
      int          m_pageFrom;
      int          m_pageTo;
!     DECLARE_ABSTRACT_CLASS(wxLuaPrintout)
  };
  

[Wxlua-commit] wxLua/bindings/wxstc wxstc_datatypes.lua,1.36,1.37

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

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

Modified Files:
	wxstc_datatypes.lua 
Log Message:
cleanup genwxbind.lua, better var names, builtin -> number or function
cleanup wxlprint, wxlhtmlwin


Index: wxstc_datatypes.lua
===================================================================
RCS file: /cvsroot/wxlua/wxLua/bindings/wxstc/wxstc_datatypes.lua,v
retrieving revision 1.36
retrieving revision 1.37
diff -C2 -d -r1.36 -r1.37
*** wxstc_datatypes.lua	7 Dec 2006 06:32:42 -0000	1.36
--- wxstc_datatypes.lua	13 Dec 2006 06:57:49 -0000	1.37
***************
*** 28,163 ****
  {
    BOOL = {
!     DefType = "builtin",
!     Intrinsic = true,
      Name = "BOOL",
    },
    DWORD = {
!     DefType = "builtin",
!     Intrinsic = true,
      Name = "DWORD",
[...6333 lines suppressed...]
    },
--- 3245,3249 ----
      Condition = "wxLUA_USE_wxXMLResource",
      DefType = "enum",
!     IsNumber = true,
      Name = "wxXmlResourceFlags",
    },
***************
*** 3236,3240 ****
      Condition = "wxLUA_USE_wxXMLResource",
      DefType = "class",
!     Intrinsic = false,
      Name = "wxXmlResourceHandler",
    },
--- 3252,3256 ----
      Condition = "wxLUA_USE_wxXMLResource",
      DefType = "class",
!     IsNumber = false,
      Name = "wxXmlResourceHandler",
    },

[Wxlua-commit] wxLua/bindings/wxwidgets wx_datatypes.lua, 1.41, 1.42

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

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

Modified Files:
	wx_datatypes.lua 
Log Message:
cleanup genwxbind.lua, better var names, builtin -> number or function
cleanup wxlprint, wxlhtmlwin


Index: wx_datatypes.lua
===================================================================
RCS file: /cvsroot/wxlua/wxLua/bindings/wxwidgets/wx_datatypes.lua,v
retrieving revision 1.41
retrieving revision 1.42
diff -C2 -d -r1.41 -r1.42
*** wx_datatypes.lua	7 Dec 2006 06:32:42 -0000	1.41
--- wx_datatypes.lua	13 Dec 2006 06:57:49 -0000	1.42
***************
*** 28,163 ****
  {
    BOOL = {
!     DefType = "builtin",
!     Intrinsic = true,
      Name = "BOOL",
    },
    DWORD = {
!     DefType = "builtin",
!     Intrinsic = true,
      Name = "DWORD",
[...6308 lines suppressed...]
    },
--- 3233,3237 ----
      Condition = "wxLUA_USE_wxXMLResource",
      DefType = "enum",
!     IsNumber = true,
      Name = "wxXmlResourceFlags",
    },
***************
*** 3225,3229 ****
      Condition = "wxLUA_USE_wxXMLResource",
      DefType = "class",
!     Intrinsic = false,
      Name = "wxXmlResourceHandler",
    },
--- 3240,3244 ----
      Condition = "wxLUA_USE_wxXMLResource",
      DefType = "class",
!     IsNumber = false,
      Name = "wxXmlResourceHandler",
    },

[Wxlua-commit] wxLua/modules/wxlua/include wxldefs.h,1.9,1.10

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

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

Modified Files:
	wxldefs.h 
Log Message:
cleanup genwxbind.lua, better var names, builtin -> number or function
cleanup wxlprint, wxlhtmlwin


Index: wxldefs.h
===================================================================
RCS file: /cvsroot/wxlua/wxLua/modules/wxlua/include/wxldefs.h,v
retrieving revision 1.9
retrieving revision 1.10
diff -C2 -d -r1.9 -r1.10
*** wxldefs.h	13 Dec 2006 00:27:57 -0000	1.9
--- wxldefs.h	13 Dec 2006 06:57:50 -0000	1.10
***************
*** 49,53 ****
  //-----------------------------------------------------------------------------
  
! #define WXLUA_BINDING_VERSION 1
  
  // ----------------------------------------------------------------------------
--- 49,53 ----
  //-----------------------------------------------------------------------------
  
! #define WXLUA_BINDING_VERSION 2
  
  // ----------------------------------------------------------------------------

[Wxlua-commit] wxLua/bindings/wxluasocket wxluasocket.i,1.8,1.9

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

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

Modified Files:
	wxluasocket.i 
Log Message:
cleanup genwxbind.lua, better var names, builtin -> number or function
cleanup wxlprint, wxlhtmlwin


Index: wxluasocket.i
===================================================================
RCS file: /cvsroot/wxlua/wxLua/bindings/wxluasocket/wxluasocket.i,v
retrieving revision 1.8
retrieving revision 1.9
diff -C2 -d -r1.8 -r1.9
*** wxluasocket.i	11 Dec 2006 07:03:30 -0000	1.8
--- wxluasocket.i	13 Dec 2006 06:57:49 -0000	1.9
***************
*** 24,28 ****
      bool StartServer()
      bool StopServer()
!     bool StartClient()
  
      bool AddBreakPoint(const wxString &fileName, int lineNumber)
--- 24,28 ----
      bool StartServer()
      bool StopServer()
!     long StartClient()
  
      bool AddBreakPoint(const wxString &fileName, int lineNumber)

[Wxlua-commit] wxLua/bindings genwxbind.lua,1.88,1.89

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

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

Modified Files:
	genwxbind.lua 
Log Message:
cleanup genwxbind.lua, better var names, builtin -> number or function
cleanup wxlprint, wxlhtmlwin


Index: genwxbind.lua
===================================================================
RCS file: /cvsroot/wxlua/wxLua/bindings/genwxbind.lua,v
retrieving revision 1.88
retrieving revision 1.89
diff -C2 -d -r1.88 -r1.89
*** genwxbind.lua	13 Dec 2006 00:27:56 -0000	1.88
--- genwxbind.lua	13 Dec 2006 06:57:48 -0000	1.89
***************
*** 24,28 ****
  -- ---------------------------------------------------------------------------
  
! WXLUA_BINDING_VERSION = 1 -- Used to verify that the bindings are updated
                            -- see modules/wxlua/include/wxldefs.h
  
--- 24,28 ----
  -- ---------------------------------------------------------------------------
  
! WXLUA_BINDING_VERSION = 2 -- Used to verify that the bindings are updated
                            -- see modules/wxlua/include/wxldefs.h
[...1538 lines suppressed...]
              table.insert(fileData, "WXLUAMETHOD "..MakeClassVar(ObjectName).."_methods[] = {\n")
--- 4726,4730 ----
  
              -- Output Method Map Table
!             CommentBindingTable(fileData, "// Map Lua Class Methods to C Binding Functions\n")
  
              table.insert(fileData, "WXLUAMETHOD "..MakeClassVar(ObjectName).."_methods[] = {\n")
***************
*** 4811,4815 ****
                      end
  
!                     local bindCount = table.getn(BindTableList)
                      for i=1,bindCount do
                          if BindTableList[i].Map then
--- 4736,4740 ----
                      end
  
!                     local bindCount = #BindTableList
                      for i=1,bindCount do
                          if BindTableList[i].Map then

[Wxlua-commit] wxLua/apps/wxluaedit/src wxledit.cpp,1.26,1.27

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

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

Modified Files:
	wxledit.cpp 
Log Message:
cleanup genwxbind.lua, better var names, builtin -> number or function
cleanup wxlprint, wxlhtmlwin


Index: wxledit.cpp
===================================================================
RCS file: /cvsroot/wxlua/wxLua/apps/wxluaedit/src/wxledit.cpp,v
retrieving revision 1.26
retrieving revision 1.27
diff -C2 -d -r1.26 -r1.27
*** wxledit.cpp	12 Dec 2006 01:23:40 -0000	1.26
--- wxledit.cpp	13 Dec 2006 06:57:48 -0000	1.27
***************
*** 770,776 ****
          if (m_show_stack)
          {
!             wxLuaStackDialog StackDialog(this, wxID_ANY, wxT("wxLua stack frame"),
!                                          wxDefaultPosition, wxSize(500, 250),
!                                          event.GetwxLuaState());
              StackDialog.ShowModal();
              m_show_stack = false;
--- 770,774 ----
          if (m_show_stack)
          {
!             wxLuaStackDialog StackDialog(event.GetwxLuaState(), this);
              StackDialog.ShowModal();
              m_show_stack = false;

[Wxlua-commit] wxLua/apps/wxluacan/src wxluacan.h,1.16,1.17

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

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

Modified Files:
	wxluacan.h 
Log Message:
cleanup genwxbind.lua, better var names, builtin -> number or function
cleanup wxlprint, wxlhtmlwin


Index: wxluacan.h
===================================================================
RCS file: /cvsroot/wxlua/wxLua/apps/wxluacan/src/wxluacan.h,v
retrieving revision 1.16
retrieving revision 1.17
diff -C2 -d -r1.16 -r1.17
*** wxluacan.h	13 Dec 2006 00:27:55 -0000	1.16
--- wxluacan.h	13 Dec 2006 06:57:48 -0000	1.17
***************
*** 14,20 ****
  #include "wxlua/include/wxlbind.h"
  
! #if WXLUA_BINDING_VERSION > 1
  #   error "The WXLUA_BINDING_VERSION in the bindings is too old, regenerate bindings."
! #endif //WXLUA_BINDING_VERSION > 1
  
  // binding class
--- 14,20 ----
  #include "wxlua/include/wxlbind.h"
  
! #if WXLUA_BINDING_VERSION > 2
  #   error "The WXLUA_BINDING_VERSION in the bindings is too old, regenerate bindings."
! #endif //WXLUA_BINDING_VERSION > 2
  
  // binding class

[Wxlua-commit] wxLua/modules/wxbindstc/include wxbind.h,1.13,1.14

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

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

Modified Files:
	wxbind.h 
Log Message:
Add version #define for bindings to tell people to regenerate them


Index: wxbind.h
===================================================================
RCS file: /cvsroot/wxlua/wxLua/modules/wxbindstc/include/wxbind.h,v
retrieving revision 1.13
retrieving revision 1.14
diff -C2 -d -r1.13 -r1.14
*** wxbind.h	12 Dec 2006 07:09:41 -0000	1.13
--- wxbind.h	13 Dec 2006 00:27:57 -0000	1.14
***************
*** 21,24 ****
--- 21,29 ----
  #include "wxlua/include/wxlstate.h"
  #include "wxlua/include/wxlbind.h"
+ 
+ #if WXLUA_BINDING_VERSION > 1
+ #   error "The WXLUA_BINDING_VERSION in the bindings is too old, regenerate bindings."
+ #endif //WXLUA_BINDING_VERSION > 1
+ 
  // binding class
  class wxLuaBinding_wxstc : public wxLuaBinding

[Wxlua-commit] wxLua/modules/wxlua/include wxldefs.h,1.8,1.9

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

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

Modified Files:
	wxldefs.h 
Log Message:
Add version #define for bindings to tell people to regenerate them


Index: wxldefs.h
===================================================================
RCS file: /cvsroot/wxlua/wxLua/modules/wxlua/include/wxldefs.h,v
retrieving revision 1.8
retrieving revision 1.9
diff -C2 -d -r1.8 -r1.9
*** wxldefs.h	7 Dec 2006 06:32:44 -0000	1.8
--- wxldefs.h	13 Dec 2006 00:27:57 -0000	1.9
***************
*** 40,43 ****
--- 40,54 ----
      (WXLUA_MAJOR_VERSION == (major) && WXLUA_MINOR_VERSION == (minor) && WXLUA_RELEASE_VERSION >= (release)))
  
+ //-----------------------------------------------------------------------------
+ // This is an internal use binding generator version whos number is
+ //   incremented every time something changes that requires a regeneration
+ //   of the bindings. The check is written into the generated bindings to
+ //   give a compile time error.
+ // If this number is incremented the variable by the same name must be updated
+ //   in genwxbind.lua must be updated as well.
+ //-----------------------------------------------------------------------------
+ 
+ #define WXLUA_BINDING_VERSION 1
+ 
  // ----------------------------------------------------------------------------
  // If you're using stdcall in Lua, then override this with

[Wxlua-commit] wxLua/apps/wxluacan/src wxluacan.cpp, 1.15, 1.16 wxluacan.h, 1.15, 1.16 wxluacan_bind.cpp, 1.9, 1.10

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

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

Modified Files:
	wxluacan.cpp wxluacan.h wxluacan_bind.cpp 
Log Message:
Add version #define for bindings to tell people to regenerate them


Index: wxluacan.cpp
===================================================================
RCS file: /cvsroot/wxlua/wxLua/apps/wxluacan/src/wxluacan.cpp,v
retrieving revision 1.15
retrieving revision 1.16
diff -C2 -d -r1.15 -r1.16
*** wxluacan.cpp	28 Aug 2006 05:26:19 -0000	1.15
--- wxluacan.cpp	13 Dec 2006 00:27:55 -0000	1.16
***************
*** 164,168 ****
  
  // Map Lua Class Methods to C Binding Functions
! static WXLUAMETHOD s_wxlCanObj_methods[] = {
      { LuaConstructor, "wxlCanObj", wxLua_wxlCanObj_constructor, 2, 0, { &s_wxluaarg_Number, &s_wxluaarg_Number, 0 } },
      { LuaMethod, "SetPos", wxLua_wxlCanObj_SetPos, 2, 2, { &s_wxluaarg_Number, &s_wxluaarg_Number, 0 } },
--- 164,168 ----
  
  // Map Lua Class Methods to C Binding Functions
! WXLUAMETHOD wxlCanObj_methods[] = {
      { LuaConstructor, "wxlCanObj", wxLua_wxlCanObj_constructor, 2, 0, { &s_wxluaarg_Number, &s_wxluaarg_Number, 0 } },
      { LuaMethod, "SetPos", wxLua_wxlCanObj_SetPos, 2, 2, { &s_wxluaarg_Number, &s_wxluaarg_Number, 0 } },
***************
*** 180,186 ****
  };
  
! // Extern accessor to class method map
! WXLUAMETHOD* wxlCanObj_methods = s_wxlCanObj_methods;
! int wxlCanObj_methodCount = sizeof(s_wxlCanObj_methods)/sizeof(s_wxlCanObj_methods[0]);
  
  // -------------------------------------------------------------------------------------------------
--- 180,184 ----
  };
  
! int wxlCanObj_methodCount = sizeof(wxlCanObj_methods)/sizeof(wxlCanObj_methods[0]);
  
  // -------------------------------------------------------------------------------------------------
***************
*** 222,233 ****
  
  // Map Lua Class Methods to C Binding Functions
! static WXLUAMETHOD s_wxlCanObjRect_methods[] = {
      { LuaConstructor, "wxlCanObjRect", wxLua_wxlCanObjRect_constructor, 4, 4, { &s_wxluaarg_Number, &s_wxluaarg_Number, &s_wxluaarg_Number, &s_wxluaarg_Number, 0 } },
      { LuaDelete, "wxlCanObjRect", wxLua_wxlCanObjRect_destructor, 0, 0, {0} },
  };
  
! // Extern accessor to class method map
! WXLUAMETHOD* wxlCanObjRect_methods = s_wxlCanObjRect_methods;
! int wxlCanObjRect_methodCount = sizeof(s_wxlCanObjRect_methods)/sizeof(s_wxlCanObjRect_methods[0]);
  
  // -------------------------------------------------------------------------------------------------
--- 220,229 ----
  
  // Map Lua Class Methods to C Binding Functions
! WXLUAMETHOD wxlCanObjRect_methods[] = {
      { LuaConstructor, "wxlCanObjRect", wxLua_wxlCanObjRect_constructor, 4, 4, { &s_wxluaarg_Number, &s_wxluaarg_Number, &s_wxluaarg_Number, &s_wxluaarg_Number, 0 } },
      { LuaDelete, "wxlCanObjRect", wxLua_wxlCanObjRect_destructor, 0, 0, {0} },
  };
  
! int wxlCanObjRect_methodCount = sizeof(wxlCanObjRect_methods)/sizeof(wxlCanObjRect_methods[0]);
  
  // -------------------------------------------------------------------------------------------------
***************
*** 267,278 ****
  
  // Map Lua Class Methods to C Binding Functions
! static WXLUAMETHOD s_wxlCanObjCircle_methods[] = {
      { LuaConstructor, "wxlCanObjCircle", wxLua_wxlCanObjCircle_constructor, 3, 3, { &s_wxluaarg_Number, &s_wxluaarg_Number, &s_wxluaarg_Number, 0 } },
      { LuaDelete, "wxlCanObjCircle", wxLua_wxlCanObjCircle_destructor, 0, 0, {0} },
  };
  
! // Extern accessor to class method map
! WXLUAMETHOD* wxlCanObjCircle_methods = s_wxlCanObjCircle_methods;
! int wxlCanObjCircle_methodCount = sizeof(s_wxlCanObjCircle_methods)/sizeof(s_wxlCanObjCircle_methods[0]);
  
  // -------------------------------------------------------------------------------------------------
--- 263,272 ----
  
  // Map Lua Class Methods to C Binding Functions
! WXLUAMETHOD wxlCanObjCircle_methods[] = {
      { LuaConstructor, "wxlCanObjCircle", wxLua_wxlCanObjCircle_constructor, 3, 3, { &s_wxluaarg_Number, &s_wxluaarg_Number, &s_wxluaarg_Number, 0 } },
      { LuaDelete, "wxlCanObjCircle", wxLua_wxlCanObjCircle_destructor, 0, 0, {0} },
  };
  
! int wxlCanObjCircle_methodCount = sizeof(wxlCanObjCircle_methods)/sizeof(wxlCanObjCircle_methods[0]);
  
  // -------------------------------------------------------------------------------------------------
***************
*** 312,323 ****
  
  // Map Lua Class Methods to C Binding Functions
! static WXLUAMETHOD s_wxlCanObjScript_methods[] = {
      { LuaConstructor, "wxlCanObjScript", wxLua_wxlCanObjScript_constructor, 3, 3, { &s_wxluaarg_Number, &s_wxluaarg_Number, &s_wxluaarg_String, 0 } },
      { LuaDelete, "wxlCanObjScript", wxLua_wxlCanObjScript_destructor, 0, 0, {0} },
  };
  
! // Extern accessor to class method map
! WXLUAMETHOD* wxlCanObjScript_methods = s_wxlCanObjScript_methods;
! int wxlCanObjScript_methodCount = sizeof(s_wxlCanObjScript_methods)/sizeof(s_wxlCanObjScript_methods[0]);
  
  // -------------------------------------------------------------------------------------------------
--- 306,315 ----
  
  // Map Lua Class Methods to C Binding Functions
! WXLUAMETHOD wxlCanObjScript_methods[] = {
      { LuaConstructor, "wxlCanObjScript", wxLua_wxlCanObjScript_constructor, 3, 3, { &s_wxluaarg_Number, &s_wxluaarg_Number, &s_wxluaarg_String, 0 } },
      { LuaDelete, "wxlCanObjScript", wxLua_wxlCanObjScript_destructor, 0, 0, {0} },
  };
  
! int wxlCanObjScript_methodCount = sizeof(wxlCanObjScript_methods)/sizeof(wxlCanObjScript_methods[0]);
  
  // -------------------------------------------------------------------------------------------------
***************
*** 371,375 ****
  
  // Map Lua Class Methods to C Binding Functions
! static WXLUAMETHOD s_wxlCanObjAddScript_methods[] = {
      { LuaConstructor, "wxlCanObjAddScript", wxLua_wxlCanObjAddScript_constructor, 3, 3, { &s_wxluaarg_Number, &s_wxluaarg_Number, &s_wxluaarg_String, 0 } },
      { LuaMethod, "SetScript", wxLua_wxlCanObjAddScript_SetScript, 1, 1, { &s_wxluaarg_String, 0 } },
--- 363,367 ----
  
  // Map Lua Class Methods to C Binding Functions
! WXLUAMETHOD wxlCanObjAddScript_methods[] = {
      { LuaConstructor, "wxlCanObjAddScript", wxLua_wxlCanObjAddScript_constructor, 3, 3, { &s_wxluaarg_Number, &s_wxluaarg_Number, &s_wxluaarg_String, 0 } },
      { LuaMethod, "SetScript", wxLua_wxlCanObjAddScript_SetScript, 1, 1, { &s_wxluaarg_String, 0 } },
***************
*** 377,383 ****
  };
  
! // Extern accessor to class method map
! WXLUAMETHOD* wxlCanObjAddScript_methods = s_wxlCanObjAddScript_methods;
! int wxlCanObjAddScript_methodCount = sizeof(s_wxlCanObjAddScript_methods)/sizeof(s_wxlCanObjAddScript_methods[0]);
  
  // -------------------------------------------------------------------------------------------------
--- 369,373 ----
  };
  
! int wxlCanObjAddScript_methodCount = sizeof(wxlCanObjAddScript_methods)/sizeof(wxlCanObjAddScript_methods[0]);
  
  // -------------------------------------------------------------------------------------------------
***************
*** 469,473 ****
  
  // Map Lua Class Methods to C Binding Functions
! static WXLUAMETHOD s_wxlCan_methods[] = {
      { LuaMethod, "AddObject", wxLua_wxlCan_AddObject, 1, 1, { &s_wxluatag_wxlCanObj, 0 } },
      { LuaMethod, "GetYaxis", wxLua_wxlCan_GetYaxis, 0, 0, { 0 } },
--- 459,463 ----
  
  // Map Lua Class Methods to C Binding Functions
! WXLUAMETHOD wxlCan_methods[] = {
      { LuaMethod, "AddObject", wxLua_wxlCan_AddObject, 1, 1, { &s_wxluatag_wxlCanObj, 0 } },
      { LuaMethod, "GetYaxis", wxLua_wxlCan_GetYaxis, 0, 0, { 0 } },
***************
*** 481,487 ****
  };
  
! // Extern accessor to class method map
! WXLUAMETHOD* wxlCan_methods = s_wxlCan_methods;
! int wxlCan_methodCount = sizeof(s_wxlCan_methods)/sizeof(s_wxlCan_methods[0]);
  
  // -------------------------------------------------------------------------------------------------
--- 471,475 ----
  };
  
! int wxlCan_methodCount = sizeof(wxlCan_methods)/sizeof(wxlCan_methods[0]);
  
  // -------------------------------------------------------------------------------------------------
***************
*** 539,543 ****
  
  // Map Lua Class Methods to C Binding Functions
! static WXLUAMETHOD s_wxlLuaCanCmd_methods[] = {
      { LuaConstructor, "wxlLuaCanCmd", wxLua_wxlLuaCanCmd_constructor, 2, 1, { &s_wxluatag_wxlCan, &s_wxluaarg_Number, 0 } },
      { LuaMethod, "MoveObject", wxLua_wxlLuaCanCmd_MoveObject, 3, 3, { &s_wxluaarg_Number, &s_wxluaarg_Number, &s_wxluaarg_Number, 0 } },
--- 527,531 ----
  
  // Map Lua Class Methods to C Binding Functions
! WXLUAMETHOD wxlLuaCanCmd_methods[] = {
      { LuaConstructor, "wxlLuaCanCmd", wxLua_wxlLuaCanCmd_constructor, 2, 1, { &s_wxluatag_wxlCan, &s_wxluaarg_Number, 0 } },
      { LuaMethod, "MoveObject", wxLua_wxlLuaCanCmd_MoveObject, 3, 3, { &s_wxluaarg_Number, &s_wxluaarg_Number, &s_wxluaarg_Number, 0 } },
***************
*** 545,550 ****
  };
  
! // Extern accessor to class method map
! WXLUAMETHOD* wxlLuaCanCmd_methods = s_wxlLuaCanCmd_methods;
! int wxlLuaCanCmd_methodCount = sizeof(s_wxlLuaCanCmd_methods)/sizeof(s_wxlLuaCanCmd_methods[0]);
  
--- 533,536 ----
  };
  
! int wxlLuaCanCmd_methodCount = sizeof(wxlLuaCanCmd_methods)/sizeof(wxlLuaCanCmd_methods[0]);
  

Index: wxluacan_bind.cpp
===================================================================
RCS file: /cvsroot/wxlua/wxLua/apps/wxluacan/src/wxluacan_bind.cpp,v
retrieving revision 1.9
retrieving revision 1.10
diff -C2 -d -r1.9 -r1.10
*** wxluacan_bind.cpp	1 Dec 2006 06:25:45 -0000	1.9
--- wxluacan_bind.cpp	13 Dec 2006 00:27:55 -0000	1.10
***************
*** 198,206 ****
  
  // bind wxLuaBinding_wxluacan to a single wxLuaState
- extern bool wxLuaBinding_wxluacan_bind(const wxLuaState& wxlState);
- // initialize wxLuaBinding_wxluacan for all wxLuaStates
- extern bool wxLuaBinding_wxluacan_init();
- 
- // bind wxLuaBinding_wxluacan to a single wxLuaState
  bool wxLuaBinding_wxluacan_bind(const wxLuaState& wxlState_)
  {
--- 198,201 ----
***************
*** 208,212 ****
      wxCHECK_MSG(wxlState.Ok(), false, wxT("Invalid wxLuaState"));
  
!     wxASSERT(!wxlState.GetLuaStateData()->m_typesRegistered);
      wxASSERT(!wxlState.GetLuaBinding(wxT("wxluacan")));
  
--- 203,207 ----
      wxCHECK_MSG(wxlState.Ok(), false, wxT("Invalid wxLuaState"));
  
!     wxASSERT(!wxlState.GetLuaStateData()->m_bindings_registered);
      wxASSERT(!wxlState.GetLuaBinding(wxT("wxluacan")));
  
***************
*** 215,219 ****
          return false;
  
!     wxlState.GetLuaStateData()->m_bindings.Append(new wxLuaBinding_wxluacan());
  
      return true;
--- 210,214 ----
          return false;
  
!     wxlState.GetLuaStateData()->m_bindingList.Append(new wxLuaBinding_wxluacan());
  
      return true;

Index: wxluacan.h
===================================================================
RCS file: /cvsroot/wxlua/wxLua/apps/wxluacan/src/wxluacan.h,v
retrieving revision 1.15
retrieving revision 1.16
diff -C2 -d -r1.15 -r1.16
*** wxluacan.h	28 Aug 2006 05:26:19 -0000	1.15
--- wxluacan.h	13 Dec 2006 00:27:55 -0000	1.16
***************
*** 13,16 ****
--- 13,21 ----
  #include "wxlua/include/wxlstate.h"
  #include "wxlua/include/wxlbind.h"
+ 
+ #if WXLUA_BINDING_VERSION > 1
+ #   error "The WXLUA_BINDING_VERSION in the bindings is too old, regenerate bindings."
+ #endif //WXLUA_BINDING_VERSION > 1
+ 
  // binding class
  class wxLuaBinding_wxluacan : public wxLuaBinding
***************
*** 61,77 ****
  // ----------------------------------------------------------------------------
  
! extern WXLUA_NO_DLLIMPEXP WXLUAMETHOD* wxlCan_methods;
  extern WXLUA_NO_DLLIMPEXP_DATA(int) wxlCan_methodCount;
! extern WXLUA_NO_DLLIMPEXP WXLUAMETHOD* wxlCanObj_methods;
  extern WXLUA_NO_DLLIMPEXP_DATA(int) wxlCanObj_methodCount;
! extern WXLUA_NO_DLLIMPEXP WXLUAMETHOD* wxlCanObjAddScript_methods;
  extern WXLUA_NO_DLLIMPEXP_DATA(int) wxlCanObjAddScript_methodCount;
! extern WXLUA_NO_DLLIMPEXP WXLUAMETHOD* wxlCanObjCircle_methods;
  extern WXLUA_NO_DLLIMPEXP_DATA(int) wxlCanObjCircle_methodCount;
! extern WXLUA_NO_DLLIMPEXP WXLUAMETHOD* wxlCanObjRect_methods;
  extern WXLUA_NO_DLLIMPEXP_DATA(int) wxlCanObjRect_methodCount;
! extern WXLUA_NO_DLLIMPEXP WXLUAMETHOD* wxlCanObjScript_methods;
  extern WXLUA_NO_DLLIMPEXP_DATA(int) wxlCanObjScript_methodCount;
! extern WXLUA_NO_DLLIMPEXP WXLUAMETHOD* wxlLuaCanCmd_methods;
  extern WXLUA_NO_DLLIMPEXP_DATA(int) wxlLuaCanCmd_methodCount;
  
--- 66,82 ----
  // ----------------------------------------------------------------------------
  
! extern WXLUA_NO_DLLIMPEXP WXLUAMETHOD wxlCan_methods[];
  extern WXLUA_NO_DLLIMPEXP_DATA(int) wxlCan_methodCount;
! extern WXLUA_NO_DLLIMPEXP WXLUAMETHOD wxlCanObj_methods[];
  extern WXLUA_NO_DLLIMPEXP_DATA(int) wxlCanObj_methodCount;
! extern WXLUA_NO_DLLIMPEXP WXLUAMETHOD wxlCanObjAddScript_methods[];
  extern WXLUA_NO_DLLIMPEXP_DATA(int) wxlCanObjAddScript_methodCount;
! extern WXLUA_NO_DLLIMPEXP WXLUAMETHOD wxlCanObjCircle_methods[];
  extern WXLUA_NO_DLLIMPEXP_DATA(int) wxlCanObjCircle_methodCount;
! extern WXLUA_NO_DLLIMPEXP WXLUAMETHOD wxlCanObjRect_methods[];
  extern WXLUA_NO_DLLIMPEXP_DATA(int) wxlCanObjRect_methodCount;
! extern WXLUA_NO_DLLIMPEXP WXLUAMETHOD wxlCanObjScript_methods[];
  extern WXLUA_NO_DLLIMPEXP_DATA(int) wxlCanObjScript_methodCount;
! extern WXLUA_NO_DLLIMPEXP WXLUAMETHOD wxlLuaCanCmd_methods[];
  extern WXLUA_NO_DLLIMPEXP_DATA(int) wxlLuaCanCmd_methodCount;
  

[Wxlua-commit] wxLua/modules/wxbind/include wxbind.h,1.44,1.45

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

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

Modified Files:
	wxbind.h 
Log Message:
Add version #define for bindings to tell people to regenerate them


Index: wxbind.h
===================================================================
RCS file: /cvsroot/wxlua/wxLua/modules/wxbind/include/wxbind.h,v
retrieving revision 1.44
retrieving revision 1.45
diff -C2 -d -r1.44 -r1.45
*** wxbind.h	12 Dec 2006 07:09:39 -0000	1.44
--- wxbind.h	13 Dec 2006 00:27:56 -0000	1.45
***************
*** 38,41 ****
--- 38,46 ----
  #include "wxlua/include/wxlstate.h"
  #include "wxlua/include/wxlbind.h"
+ 
+ #if WXLUA_BINDING_VERSION > 1
+ #   error "The WXLUA_BINDING_VERSION in the bindings is too old, regenerate bindings."
+ #endif //WXLUA_BINDING_VERSION > 1
+ 
  // binding class
  class wxLuaBinding_wx : public wxLuaBinding

[Wxlua-commit] wxLua/modules/wxluasocket/include wxluasocket_bind.h, 1.7, 1.8

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

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

Modified Files:
	wxluasocket_bind.h 
Log Message:
Add version #define for bindings to tell people to regenerate them


Index: wxluasocket_bind.h
===================================================================
RCS file: /cvsroot/wxlua/wxLua/modules/wxluasocket/include/wxluasocket_bind.h,v
retrieving revision 1.7
retrieving revision 1.8
diff -C2 -d -r1.7 -r1.8
*** wxluasocket_bind.h	12 Dec 2006 07:09:41 -0000	1.7
--- wxluasocket_bind.h	13 Dec 2006 00:27:57 -0000	1.8
***************
*** 22,25 ****
--- 22,30 ----
  #include "wxlua/include/wxlstate.h"
  #include "wxlua/include/wxlbind.h"
+ 
+ #if WXLUA_BINDING_VERSION > 1
+ #   error "The WXLUA_BINDING_VERSION in the bindings is too old, regenerate bindings."
+ #endif //WXLUA_BINDING_VERSION > 1
+ 
  // binding class
  class wxLuaBinding_wxluasocket : public wxLuaBinding

[Wxlua-commit] wxLua/bindings/wxwidgets wave.i,1.10,1.11

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

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

Modified Files:
	wave.i 
Log Message:
Add version #define for bindings to tell people to regenerate them


Index: wave.i
===================================================================
RCS file: /cvsroot/wxlua/wxLua/bindings/wxwidgets/wave.i,v
retrieving revision 1.10
retrieving revision 1.11
diff -C2 -d -r1.10 -r1.11
*** wave.i	7 Dec 2006 06:32:42 -0000	1.10
--- wave.i	13 Dec 2006 00:27:56 -0000	1.11
***************
*** 153,157 ****
      int GetNumberAxes() const
      int GetNumberButtons() const
!     int GetNumberJoysticks() const
      int GetPollingMax() const
      int GetPollingMin() const
--- 153,157 ----
      int GetNumberAxes() const
      int GetNumberButtons() const
!     %static int GetNumberJoysticks() const
      int GetPollingMax() const
      int GetPollingMin() const

[Wxlua-commit] wxLua/bindings genwxbind.bat, 1.7, 1.8 genwxbind.lua, 1.87, 1.88

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

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

Modified Files:
	genwxbind.bat genwxbind.lua 
Log Message:
Add version #define for bindings to tell people to regenerate them


Index: genwxbind.bat
===================================================================
RCS file: /cvsroot/wxlua/wxLua/bindings/genwxbind.bat,v
retrieving revision 1.7
retrieving revision 1.8
diff -C2 -d -r1.7 -r1.8
*** genwxbind.bat	24 May 2006 15:45:52 -0000	1.7
--- genwxbind.bat	13 Dec 2006 00:27:56 -0000	1.8
***************
*** 5,12 ****
--- 5,41 ----
  SET LUA=..\bin\wxlua-lua.exe
  
+ REM Find a suitable wxlua-lua.exe to run
+ IF EXIST ..\bin\gccud_lib\wxlua-lua.exe SET LUA=..\bin\gccud_lib\wxlua-lua.exe
+ IF EXIST ..\bin\gccud_dll\wxlua-lua.exe SET LUA=..\bin\gccud_dll\wxlua-lua.exe
+ IF EXIST ..\bin\gccu_lib\wxlua-lua.exe SET LUA=..\bin\gccu_lib\wxlua-lua.exe
+ IF EXIST ..\bin\gccu_dll\wxlua-lua.exe SET LUA=..\bin\gccu_dll\wxlua-lua.exe
+ IF EXIST ..\bin\gccd_lib\wxlua-lua.exe SET LUA=..\bin\gccd_lib\wxlua-lua.exe
+ IF EXIST ..\bin\gccd_dll\wxlua-lua.exe SET LUA=..\bin\gccd_dll\wxlua-lua.exe
+ IF EXIST ..\bin\gcc_lib\wxlua-lua.exe SET LUA=..\bin\gcc_lib\wxlua-lua.exe
+ IF EXIST ..\bin\gcc_dll\wxlua-lua.exe SET LUA=..\bin\gcc_dll\wxlua-lua.exe
+ 
+ IF EXIST ..\bin\vcud_lib\wxlua-lua.exe SET LUA=..\bin\vcud_lib\wxlua-lua.exe
+ IF EXIST ..\bin\vcud_dll\wxlua-lua.exe SET LUA=..\bin\vcud_dll\wxlua-lua.exe
+ IF EXIST ..\bin\vcu_lib\wxlua-lua.exe SET LUA=..\bin\vcu_lib\wxlua-lua.exe
+ IF EXIST ..\bin\vcu_dll\wxlua-lua.exe SET LUA=..\bin\vcu_dll\wxlua-lua.exe
+ IF EXIST ..\bin\vcd_lib\wxlua-lua.exe SET LUA=..\bin\vcd_lib\wxlua-lua.exe
+ IF EXIST ..\bin\vcd_dll\wxlua-lua.exe SET LUA=..\bin\vcd_dll\wxlua-lua.exe
+ IF EXIST ..\bin\vc_lib\wxlua-lua.exe SET LUA=..\bin\vc_lib\wxlua-lua.exe
+ IF EXIST ..\bin\vc_dll\wxlua-lua.exe SET LUA=..\bin\vc_dll\wxlua-lua.exe
+ 
  echo Generating wxWidgets Binding
  %LUA% -e"rulesFilename=\"wxwidgets/wx_rules.lua\"" genwxbind.lua > wxwidgets\error.txt
+ 
+ echo Generating wxStyledTextCtrl Binding
  %LUA% -e"rulesFilename=\"wxstc/wxstc_rules.lua\"" genwxbind.lua > wxstc\error.txt
+ 
+ echo Generating wxLuaDebugger Binding
  %LUA% -e"rulesFilename=\"wxluasocket/wxluasocket_rules.lua\"" genwxbind.lua > wxluasocket\error.txt
+ 
+ echo Generating wxLuaCan app Binding
+ cd ..\apps\wxluacan\src
+ ..\..\..\bindings\%LUA% -e"rulesFilename=\"wxluacan_rules.lua\"" ../../../bindings/genwxbind.lua > error.txt
+ cd ..\..\..\bindings
+ 
  echo Done.
  

Index: genwxbind.lua
===================================================================
RCS file: /cvsroot/wxlua/wxLua/bindings/genwxbind.lua,v
retrieving revision 1.87
retrieving revision 1.88
diff -C2 -d -r1.87 -r1.88
*** genwxbind.lua	12 Dec 2006 07:09:38 -0000	1.87
--- genwxbind.lua	13 Dec 2006 00:27:56 -0000	1.88
***************
*** 24,27 ****
--- 24,30 ----
  -- ---------------------------------------------------------------------------
  
+ WXLUA_BINDING_VERSION = 1 -- Used to verify that the bindings are updated
+                           -- see modules/wxlua/include/wxldefs.h
+ 
  keywords           = {}   -- Keyword table
  conditions         = {}   -- Preprocessor conditions
***************
*** 4013,4017 ****
  
      table.insert(fileData, "#include \"wxlua/include/wxlstate.h\"\n")
!     table.insert(fileData, "#include \"wxlua/include/wxlbind.h\"\n")
  
      if hook_bind_condition then
--- 4016,4024 ----
  
      table.insert(fileData, "#include \"wxlua/include/wxlstate.h\"\n")
!     table.insert(fileData, "#include \"wxlua/include/wxlbind.h\"\n\n")
! 
!     table.insert(fileData, "#if WXLUA_BINDING_VERSION > "..WXLUA_BINDING_VERSION.."\n")
!     table.insert(fileData, "#   error \"The WXLUA_BINDING_VERSION in the bindings is too old, regenerate bindings.\"\n")
!     table.insert(fileData, "#endif //WXLUA_BINDING_VERSION > "..WXLUA_BINDING_VERSION.."\n\n")
  
      if hook_bind_condition then

[Wxlua-commit] wxLua/modules/wxbind/src wave.cpp, 1.17, 1.18 wx_bind.cpp, 1.67, 1.68

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

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

Modified Files:
	wave.cpp wx_bind.cpp 
Log Message:
Add version #define for bindings to tell people to regenerate them


Index: wx_bind.cpp
===================================================================
RCS file: /cvsroot/wxlua/wxLua/modules/wxbind/src/wx_bind.cpp,v
retrieving revision 1.67
retrieving revision 1.68
diff -C2 -d -r1.67 -r1.68
*** wx_bind.cpp	12 Dec 2006 07:09:40 -0000	1.67
--- wx_bind.cpp	13 Dec 2006 00:27:56 -0000	1.68
***************
*** 4577,4580 ****
--- 4577,4597 ----
  #endif // wxLUA_USE_wxFrame
  
+ #if wxLUA_USE_wxJoystick || wxUSE_JOYSTICK
+ 
+ //     %static int GetNumberJoysticks() const
+ static int LUACALL wxLua_wxJoystick_GetNumberJoysticks(lua_State *L)
+ {
+     wxLuaState wxlState(L);
+     int returns;
+     // call GetNumberJoysticks
+     returns = wxJoystick::GetNumberJoysticks();
+     // push the result number
+     lua_pushnumber(L, returns);
+ 
+     return 1;
+ }
+ 
+ #endif // wxLUA_USE_wxJoystick || wxUSE_JOYSTICK
+ 
  #if wxLUA_USE_wxObject
  
***************
*** 5203,5206 ****
--- 5220,5228 ----
  
  
+ #if wxLUA_USE_wxJoystick || wxUSE_JOYSTICK
+         { LuaGlobal, "wxJoystick_GetNumberJoysticks", wxLua_wxJoystick_GetNumberJoysticks, 0, 0, { 0 } },
+ #endif // wxLUA_USE_wxJoystick || wxUSE_JOYSTICK
+ 
+ 
  #if wxLUA_USE_wxObject
          { LuaGlobal, "wxCreateDynamicObject", wxLua_function_wxCreateDynamicObject, 1, 1, { &s_wxluaarg_String, 0 } },

Index: wave.cpp
===================================================================
RCS file: /cvsroot/wxlua/wxLua/modules/wxbind/src/wave.cpp,v
retrieving revision 1.17
retrieving revision 1.18
diff -C2 -d -r1.17 -r1.18
*** wave.cpp	12 Dec 2006 07:09:39 -0000	1.17
--- wave.cpp	13 Dec 2006 00:27:56 -0000	1.18
***************
*** 937,949 ****
  }
  
! //     int GetNumberJoysticks() const
  static int LUACALL wxLua_wxJoystick_GetNumberJoysticks(lua_State *L)
  {
      wxLuaState wxlState(L);
      int returns;
-     // get this
-     wxJoystick * self = (wxJoystick *)wxlState.GetUserDataType(1, s_wxluatag_wxJoystick);
      // call GetNumberJoysticks
!     returns = self->GetNumberJoysticks();
      // push the result number
      lua_pushnumber(L, returns);
--- 937,947 ----
  }
  
! //     %static int GetNumberJoysticks() const
  static int LUACALL wxLua_wxJoystick_GetNumberJoysticks(lua_State *L)
  {
      wxLuaState wxlState(L);
      int returns;
      // call GetNumberJoysticks
!     returns = wxJoystick::GetNumberJoysticks();
      // push the result number
      lua_pushnumber(L, returns);