wxlua-commit — CVS commits of wxLua

[Wxlua-commit] wxLua/modules/build/bakefiles common.bkl, 1.5, 1.6 modules.bkl, 1.37, 1.38

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

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

Modified Files:
	common.bkl modules.bkl 
Log Message:
Switched to latest patched bakefile (which only differs for option renaming feature).
Removed customized build of LUA interpreter: we now use vanilla lua.
Now BUILDDIR is set differently for shared and static builds to avoid clashes.


Index: common.bkl
===================================================================
RCS file: /cvsroot/wxlua/wxLua/modules/build/bakefiles/common.bkl,v
retrieving revision 1.5
retrieving revision 1.6
diff -C2 -d -r1.5 -r1.6
*** common.bkl	20 May 2006 13:12:34 -0000	1.5
--- common.bkl	8 Dec 2006 13:19:59 -0000	1.6
***************
*** 21,39 ****
      <!-- ================================================================== -->
  
-     <!-- All the source files & header files linked above are relative to our MODULE dir. -->
-     <set var="FILELISTDIR">../..</set>
      <if cond="FORMAT!='autoconf'">
          <set var="WXLUA_BASEDIR">../../..</set>
          <set var="WXLUA_MODULEDIR">../..</set>
-         <set var="SRCDIR">$(WXLUA_MODULEDIR)</set>
  
-         <set var="WXLUA_SOURCEDIR">$(WXLUA_MODULEDIR)</set>
          <set var="WXLUA_LIBOUTPUT_PATH">$(WXLUA_BASEDIR)/$(WXLUA_LIBOUTPUT_FOLDER)</set>
          <set var="WXLUA_DLLOUTPUT_PATH">$(WXLUA_BASEDIR)/$(WXLUA_DLLOUTPUT_FOLDER)</set>
          <set var="WXLUA_BINOUTPUT_PATH">$(WXLUA_BASEDIR)/bin</set>
      </if>
      <if cond="FORMAT=='autoconf'">
-         <set var="SRCDIR">.</set>
- 
          <!-- In this way we support makefiles created from folders != root folder;
               i.e. with this trick you can do:
--- 21,35 ----
      <!-- ================================================================== -->
  
      <if cond="FORMAT!='autoconf'">
          <set var="WXLUA_BASEDIR">../../..</set>
          <set var="WXLUA_MODULEDIR">../..</set>
  
          <set var="WXLUA_LIBOUTPUT_PATH">$(WXLUA_BASEDIR)/$(WXLUA_LIBOUTPUT_FOLDER)</set>
          <set var="WXLUA_DLLOUTPUT_PATH">$(WXLUA_BASEDIR)/$(WXLUA_DLLOUTPUT_FOLDER)</set>
          <set var="WXLUA_BINOUTPUT_PATH">$(WXLUA_BASEDIR)/bin</set>
+ 
+         <set-srcdir>../..</set-srcdir>
      </if>
      <if cond="FORMAT=='autoconf'">
          <!-- In this way we support makefiles created from folders != root folder;
               i.e. with this trick you can do:
***************
*** 41,50 ****
          -->
          <set var="WXLUA_BASEDIR">$(top_srcdir)</set>
!         <set var="WXLUA_SOURCEDIR">$(top_srcdir)/modules</set>
  
          <!-- top_builddir already ends with '/' -->
!         <set var="WXLUA_LIBOUTPUT_PATH">$(top_builddir)$(WXLUA_LIBOUTPUT_FOLDER)</set>
!         <set var="WXLUA_DLLOUTPUT_PATH">$(top_builddir)$(WXLUA_DLLOUTPUT_FOLDER)</set>
!         <set var="WXLUA_BINOUTPUT_PATH">$(top_builddir)bin</set>
      </if>
  
--- 37,46 ----
          -->
          <set var="WXLUA_BASEDIR">$(top_srcdir)</set>
! <!--         <set var="WXLUA_SOURCEDIR">$(top_srcdir)/modules</set> -->
  
          <!-- top_builddir already ends with '/' -->
!         <set var="WXLUA_LIBOUTPUT_PATH">$(top_builddir)/$(WXLUA_LIBOUTPUT_FOLDER)</set>
!         <set var="WXLUA_DLLOUTPUT_PATH">$(top_builddir)/$(WXLUA_DLLOUTPUT_FOLDER)</set>
!         <set var="WXLUA_BINOUTPUT_PATH">$(top_builddir)/bin</set>
      </if>
  
***************
*** 89,96 ****
      <define-rule name="wxlua_lib" extends="lib">
          <template>
-             <srcdir>$(WXLUA_SOURCEDIR)</srcdir>
              <dirname>$(WXLUA_LIBOUTPUT_PATH)</dirname>
-             <install-to>$(LIBDIR)</install-to>
-             <headers-install-to>$(INCLUDEDIR)</headers-install-to>
  
              <set var="__modname"/>
--- 85,89 ----
***************
*** 116,119 ****
--- 109,115 ----
              <msvc-file-group>$(__modname) sources:*.cpp</msvc-file-group>
              <msvc-file-group>$(__modname) headers:*.h</msvc-file-group>
+ 
+             <install-to>$(LIBDIR)</install-to>
+             <install-headers-to>$(INCLUDEDIR)</install-headers-to>
          </define-tag>
      </define-rule>
***************
*** 121,128 ****
      <define-rule name="wxlua_dll" extends="dll">
          <template>
-             <srcdir>$(WXLUA_SOURCEDIR)</srcdir>
              <dirname>$(WXLUA_DLLOUTPUT_PATH)</dirname>
-             <install-to>$(LIBDIR)</install-to>
-             <headers-install-to>$(INCLUDEDIR)</headers-install-to>
  
              <!-- The DLL version -->
--- 117,121 ----
***************
*** 160,163 ****
--- 153,159 ----
              <msvc-file-group>$(__modname) headers:*.h</msvc-file-group>
  
+             <install-to>$(LIBDIR)</install-to>
+             <install-headers-to>$(INCLUDEDIR)</install-headers-to>
+ 
              <define>WXMAKINGDLL_$(value)</define>
          </define-tag>

Index: modules.bkl
===================================================================
RCS file: /cvsroot/wxlua/wxLua/modules/build/bakefiles/modules.bkl,v
retrieving revision 1.37
retrieving revision 1.38
diff -C2 -d -r1.37 -r1.38
*** modules.bkl	24 May 2006 17:20:56 -0000	1.37
--- modules.bkl	8 Dec 2006 13:19:59 -0000	1.38
***************
*** 54,58 ****
      <wxlua_stdlib id="verbatimlua_lib" cond="SHARED=='0'">
          <module-name>LUA</module-name>
-         <!-- WE WANT THE VERBATIM VERSION: don't enable <define>WXLUA_LUA_NEWTHREAD</define> -->
          <libname>lua5.1</libname>
  
--- 54,57 ----
***************
*** 63,67 ****
      <wxlua_stddll id="verbatimlua_dll" cond="SHARED=='1'">
          <module-name>LUA</module-name>
-         <!-- WE WANT THE VERBATIM VERSION: don't enable <define>WXLUA_LUA_NEWTHREAD</define> -->
          <libname>lua5.1</libname>
          <dllname>lua5.1</dllname>
--- 62,65 ----
***************
*** 76,112 ****
      </wxlua_stddll>
  
- 
- 
-     <!-- the lua lib & dll compiled with WXLUA_LUA_NEWTHREAD flag -->
-     <wxlua_stdlib id="lua_lib" cond="SHARED=='0'">
-         <module-name>LUA</module-name>
-         <define>WXLUA_LUA_NEWTHREAD</define>
- 
-         <!-- see options.bkl for these -->
-         <cflags>$(LUA_PLATFORM_SPECIFIC_CFLAGS)</cflags>
-         <ldflags>$(LUA_PLATFORM_SPECIFIC_LDFLAGS)</ldflags>
-     </wxlua_stdlib>
-     <wxlua_stddll id="lua_dll" cond="SHARED=='1'">
-         <module-name>LUA</module-name>
-         <define>WXLUA_LUA_NEWTHREAD</define>
- 
-         <if cond="TARGETING_WIN32=='1'">
-             <define>LUA_BUILD_AS_DLL</define>
-         </if>
- 
-         <!-- see options.bkl for these -->
-         <cflags>$(LUA_PLATFORM_SPECIFIC_CFLAGS)</cflags>
-         <ldflags>$(LUA_PLATFORM_SPECIFIC_LDFLAGS)</ldflags>
-     </wxlua_stddll>
- 
      <!-- the wxLua lib & dll -->
      <wxlua_stdlib id="wxlua_lib" cond="SHARED=='0'">
          <module-name>WXLUA</module-name>
-         <define>WXLUA_LUA_NEWTHREAD</define>
      </wxlua_stdlib>
      <wxlua_stddll id="wxlua_dll" cond="SHARED=='1'">
          <module-name>WXLUA</module-name>
          <wxlua-lib>lua</wxlua-lib>
-         <define>WXLUA_LUA_NEWTHREAD</define>
      </wxlua_stddll>
  
--- 74,84 ----
***************
*** 157,161 ****
      <!-- the luamodule: for lots of reasons it can be built only when SHARED==1 -->
      <module id="mod_luamodule" template="wxlua" cond="SHARED=='1' and USE_LUAMODULE=='1'">
-         <srcdir>$(WXLUA_SOURCEDIR)</srcdir>
          <dirname>$(WXLUA_DLLOUTPUT_PATH)</dirname>
  
--- 129,132 ----

[Wxlua-commit] wxLua/apps/wxlua/src editor.h, 1.28, 1.29 wxlua.cpp, 1.41, 1.42

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

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

Modified Files:
	editor.h wxlua.cpp 
Log Message:
subclass the wxProcess in the debugger so we don't have to send an event
fixes crashes when an error occurs in the debugger's lua program
test compile lua programs before running or debugging to catch syntax errors


Index: wxlua.cpp
===================================================================
RCS file: /cvsroot/wxlua/wxLua/apps/wxlua/src/wxlua.cpp,v
retrieving revision 1.41
retrieving revision 1.42
diff -C2 -d -r1.41 -r1.42
*** wxlua.cpp	7 Dec 2006 22:05:52 -0000	1.41
--- wxlua.cpp	8 Dec 2006 06:16:17 -0000	1.42
***************
*** 82,88 ****
  
  // Find the index into the argv that matches name starting at arg start_n
! // This is necessary since the wxCmdLineParser drops -- and all -X 
  //  params so we use this to make sure that the lua program is at 0.
! int FindFirstCmdParam(int start_n, const wxString& name, 
                        int argc, wxChar** argv)
  {
--- 82,88 ----
  
  // Find the index into the argv that matches name starting at arg start_n
! // This is necessary since the wxCmdLineParser drops -- and all -X
  //  params so we use this to make sure that the lua program is at 0.
! int FindFirstCmdParam(int start_n, const wxString& name,
                        int argc, wxChar** argv)
  {
***************
*** 108,112 ****
  
  bool wxLuaStandaloneApp::OnInit()
! {    
      m_programName  = argv[0];  // The name of this program
      m_luaConsole   = NULL;
--- 108,112 ----
  
  bool wxLuaStandaloneApp::OnInit()
! {
      m_programName  = argv[0];  // The name of this program
      m_luaConsole   = NULL;
***************
*** 179,183 ****
                  arg_count++; // remove -c arg
                  m_want_console = true;
!                 // Note: The m_luaConsole will be nulled when it closes in 
                  //       wxLuaConsole::OnCloseWindow.
                  m_luaConsole = new wxLuaConsole(NULL, ID_WXLUA_CONSOLE);
--- 179,183 ----
                  arg_count++; // remove -c arg
                  m_want_console = true;
!                 // Note: The m_luaConsole will be nulled when it closes in
                  //       wxLuaConsole::OnCloseWindow.
                  m_luaConsole = new wxLuaConsole(NULL, ID_WXLUA_CONSOLE);
***************
*** 204,208 ****
              if (parser.Found(wxT("d"), &debugString))
              {
!                 // Note: wxLuaDebuggerServer::StartClient() runs 
                  //       wxExecute(m_programName -d[host]:[port], ...)
  
--- 204,208 ----
              if (parser.Found(wxT("d"), &debugString))
              {
!                 // Note: wxLuaDebuggerServer::StartClient() runs
                  //       wxExecute(m_programName -d[host]:[port], ...)
  
***************
*** 220,224 ****
                          m_pDebugTarget = new wxLuaDebugTarget(m_wxlState, serverName, (int)portNumber);
                          if (m_pDebugTarget != NULL)
!                             return m_pDebugTarget->Run();
                          else
                              DisplayMessage(_("The wxLua debug target cannot start.\n"), true);
--- 220,228 ----
                          m_pDebugTarget = new wxLuaDebugTarget(m_wxlState, serverName, (int)portNumber);
                          if (m_pDebugTarget != NULL)
!                         {
!                             bool ok = m_pDebugTarget->Run();
!                             //wxSafeShowMessage(wxT("Target"), wxString::Format(wxT("PID %ld TIME %s ok %d"), (long)wxGetProcessId(), wxT(__TIME__), int(ok)));
!                             return ok;
!                         }
                          else
                              DisplayMessage(_("The wxLua debug target cannot start.\n"), true);
***************
*** 239,243 ****
  
              if (open_file || (parser.GetParamCount() == 0))
!             {                
                  if (openFileName.IsEmpty() && (parser.GetParamCount() > 0u))
                      openFileName = parser.GetParam(0);
--- 243,247 ----
  
              if (open_file || (parser.GetParamCount() == 0))
!             {
                  if (openFileName.IsEmpty() && (parser.GetParamCount() > 0u))
                      openFileName = parser.GetParam(0);

Index: editor.h
===================================================================
RCS file: /cvsroot/wxlua/wxLua/apps/wxlua/src/editor.h,v
retrieving revision 1.28
retrieving revision 1.29
diff -C2 -d -r1.28 -r1.29
*** editor.h	7 Dec 2006 06:34:24 -0000	1.28
--- editor.h	8 Dec 2006 06:16:17 -0000	1.29
***************
*** 9,14 ****
  extern const unsigned char wxLuaEditor[];
  
! const size_t wxLuaEditor_len = 74827;
! const unsigned char wxLuaEditor[74828] = {
   45, 45, 45, 45, 45, 45, 45, 45, 45, 45, 45, 45, 45, 45, 45, 45, 45, 45, 45, 45, 45, 45, 45, 45, 45, 45, 45, 45, 45, 45, 45, 45, 45, 45, 45, 45, 45, 45, 45, 45, 45, 45, 45, 45, 45, 45, 45, 45, 45, 45, 45, 45, 45, 45, 45, 45, 45, 45, 45, 45, 45, 45, 45, 45, 45, 45, 45, 45, 45, 45, 45, 45, 45, 61, 45, 45, 45, 10,
   45, 45, 32, 78, 97,109,101, 58, 32, 32, 32, 32, 32, 32, 32, 32, 69,100,105,116,111,114, 46,119,120, 46,108,117, 97, 10,
--- 9,14 ----
  extern const unsigned char wxLuaEditor[];
  
! const size_t wxLuaEditor_len = 75835;
[...976 lines suppressed...]
!  32, 32, 32, 32, 32, 32, 32, 32,100,101, 98,117,103,103,101,114, 83,101,114,118,101,114, 32, 61, 32,110,105,108, 10,
   32, 32, 32, 32,101,110,100, 10,
!  32, 32, 32, 32,100,101, 98,117,103,103,101,101, 95,114,117,110,110,105,110,103, 32, 61, 32,102, 97,108,115,101, 10,
   32, 32, 32, 32, 83, 97,118,101, 79,110, 69,120,105,116, 40, 41, 10,
   32, 32, 32, 32, 67,111,110,102,105,103, 83, 97,118,101, 70,114, 97,109,101, 80,111,115,105,116,105,111,110, 40,102,114, 97,109,101, 44, 32, 34, 77, 97,105,110, 70,114, 97,109,101, 34, 41, 10,
***************
*** 2011,2015 ****
   32, 32, 32, 32,102,111,114, 32,105,110,100,101,120, 32, 61, 32, 49, 44, 32, 35, 97,114,103, 32,100,111, 10,
   32, 32, 32, 32, 32, 32, 32, 32,102,105,108,101, 78, 97,109,101, 32, 61, 32, 97,114,103, 91,105,110,100,101,120, 93, 10,
!  32, 32, 32, 32, 32, 32, 32, 32, 76,111, 97,100, 70,105,108,101, 40,102,105,108,101, 78, 97,109,101, 44, 32,102,105,108,101, 78, 97,109,101, 41, 10,
   32, 32, 32, 32,101,110,100, 10,
   10,
--- 2032,2038 ----
   32, 32, 32, 32,102,111,114, 32,105,110,100,101,120, 32, 61, 32, 49, 44, 32, 35, 97,114,103, 32,100,111, 10,
   32, 32, 32, 32, 32, 32, 32, 32,102,105,108,101, 78, 97,109,101, 32, 61, 32, 97,114,103, 91,105,110,100,101,120, 93, 10,
!  32, 32, 32, 32, 32, 32, 32, 32,105,102, 32,102,105,108,101, 78, 97,109,101, 32,126, 61, 32, 34, 45, 45, 34, 32,116,104,101,110, 10,
!  32, 32, 32, 32, 32, 32, 32, 32, 32, 32, 32, 32, 76,111, 97,100, 70,105,108,101, 40,102,105,108,101, 78, 97,109,101, 44, 32,119,120, 46,119,120, 70,105,108,101, 78, 97,109,101, 40,102,105,108,101, 78, 97,109,101, 41, 58, 71,101,116, 70,117,108,108, 78, 97,109,101, 40, 41, 41, 10,
!  32, 32, 32, 32, 32, 32, 32, 32,101,110,100, 10,
   32, 32, 32, 32,101,110,100, 10,
   10,

[Wxlua-commit] wxLua/samples editor.wx.lua,1.36,1.37

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

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

Modified Files:
	editor.wx.lua 
Log Message:
subclass the wxProcess in the debugger so we don't have to send an event
fixes crashes when an error occurs in the debugger's lua program
test compile lua programs before running or debugging to catch syntax errors


Index: editor.wx.lua
===================================================================
RCS file: /cvsroot/wxlua/wxLua/samples/editor.wx.lua,v
retrieving revision 1.36
retrieving revision 1.37
diff -C2 -d -r1.36 -r1.37
*** editor.wx.lua	8 Dec 2006 01:12:35 -0000	1.36
--- editor.wx.lua	8 Dec 2006 06:16:18 -0000	1.37
***************
*** 77,87 ****
  programName      = nil    -- the name of the wxLua program to be used when starting debugger
  findData         = nil    -- wxFindData object
! fHaveFound       = false  -- true when string has been found
  editorApp        = wx.wxGetApp()
  
! debugServer      = nil    -- wxLuaDebuggerServer object when debugging
! fIsRunning       = false  -- true when the debuggee is running
! fIsConnected     = false  -- true when a client has connected
! portNumber       = 1551   -- the port # to use for debugging
  
  -- wxWindow variables
--- 77,87 ----
  programName      = nil    -- the name of the wxLua program to be used when starting debugger
  findData         = nil    -- wxFindData object
! found_string     = false  -- true when string has been found in editor
  editorApp        = wx.wxGetApp()
  
! debuggerServer     = nil    -- wxLuaDebuggerServer object when debugging, else nil
! debuggee_running   = false  -- true when the debuggee is running
! debugger_connected = false  -- true when a client has connected
! debuggerPortNumber = 1551   -- the port # to use for debugging
  
  -- wxWindow variables
***************
*** 259,263 ****
  -- Update the statusbar text of the frame using the given editor
  function UpdateStatusText(editor)
!     if editor then
          local pos  = editor:GetCurrentPos()
          local line = editor:LineFromPosition(pos)
--- 259,263 ----
  -- Update the statusbar text of the frame using the given editor
  function UpdateStatusText(editor)
!     if editor and frame then
          local pos  = editor:GetCurrentPos()
          local line = editor:LineFromPosition(pos)
***************
*** 590,597 ****
  
  function ProcessWatches()
!     if watchListCtrl and debugServer then
          for idx = 0, watchListCtrl:GetItemCount() - 1 do
              local expression = watchListCtrl:GetItemText(idx)
!             debugServer:EvaluateExpr(idx, expression)
          end
      end
--- 590,597 ----
  
  function ProcessWatches()
!     if watchListCtrl and debuggerServer then
          for idx = 0, watchListCtrl:GetItemCount() - 1 do
              local expression = watchListCtrl:GetItemText(idx)
!             debuggerServer:EvaluateExpr(idx, expression)
          end
      end
***************
*** 797,814 ****
  frame:Connect(ID_OPEN, wx.wxEVT_COMMAND_MENU_SELECTED, OpenFile)
  
  function SaveFile(editor, filePath)
!     if filePath then
          local backPath = filePath..".bak"
          os.remove(backPath)
          os.rename(filePath, backPath)
!     end
!     local handle = io.open(filePath, "wb")
!     if handle then
!         local st = editor:GetText()
!         handle:write(st)
!         handle:close()
!         editor:EmptyUndoBuffer()
!         SetDocumentModified(editor:GetId(), false, true)
!         return true
      end
  
--- 797,822 ----
  frame:Connect(ID_OPEN, wx.wxEVT_COMMAND_MENU_SELECTED, OpenFile)
  
+ -- save the file to filePath or if filePath is nil then call SaveFileAs
  function SaveFile(editor, filePath)
!     if not filePath then
!         return SaveFileAs(editor)
!     else
          local backPath = filePath..".bak"
          os.remove(backPath)
          os.rename(filePath, backPath)
! 
!         local handle = io.open(filePath, "wb")
!         if handle then
!             local st = editor:GetText()
!             handle:write(st)
!             handle:close()
!             editor:EmptyUndoBuffer()
!             SetDocumentModified(editor:GetId(), false, true)
!             return true
!         else
!             wx.wxMessageBox("Unable to save file '"..fileName.."'.",
!                             "wxLua Error Saving",
!                             wx.wxOK + wx.wxCENTRE, frame)
!         end
      end
  
***************
*** 821,829 ****
              local id       = editor:GetId()
              local filePath = openDocuments[id].filePath
!             if not filePath then
!                 SaveFileAs(editor)
!             else
!                 SaveFile(editor, filePath)
!             end
          end)
  
--- 829,833 ----
              local id       = editor:GetId()
              local filePath = openDocuments[id].filePath
!             SaveFile(editor, filePath)
          end)
  
***************
*** 886,892 ****
  
          if document.isModified then
!             if not filePath then
!                 SaveFileAs(editor)
!             elseif SaveFile(editor, filePath) then
                  SetDocumentModified(editor:GetId(), false, false)
              end
--- 890,894 ----
  
          if document.isModified then
!             if SaveFile(editor, filePath) then
                  SetDocumentModified(editor:GetId(), false, false)
              end
***************
*** 965,973 ****
                  dialog:Destroy()
                  if result == wx.wxID_YES then
!                     if not filePath then
!                         saved = SaveFileAs(editor)
!                     else
!                         saved = SaveFile(editor, filePath)
!                     end
                  end
              end
--- 967,971 ----
                  dialog:Destroy()
                  if result == wx.wxID_YES then
!                     saved = SaveFile(editor, filePath)
                  end
              end
***************
*** 980,984 ****
          function (event)
              local editor = GetEditor()
!             event:Enable((editor ~= nil) and (debugServer == nil))
          end)
  
--- 978,982 ----
          function (event)
              local editor = GetEditor()
!             event:Enable((editor ~= nil) and (debuggerServer == nil))
          end)
  
***************
*** 1001,1010 ****
              dialog:Destroy()
              if result == wx.wxID_YES then
!                 local filePath = document.filePath
!                 if not filePath then
!                     SaveFileAs(editor)
!                 else
!                     SaveFile(editor, filePath)
!                 end
              end
          end
--- 999,1003 ----
              dialog:Destroy()
              if result == wx.wxID_YES then
!                 SaveFile(editor, document.filePath)
              end
          end
***************
*** 1201,1209 ****
      end
      if posFind == -1 then
!         fHaveFound = false
  
         frame:SetStatusText("Find text not found.")
      else
!         fHaveFound = true
          local start  = editor:GetTargetStart()
          local finish = editor:GetTargetEnd()
--- 1194,1202 ----
      end
      if posFind == -1 then
!         found_string = false
  
         frame:SetStatusText("Find text not found.")
      else
!         found_string = true
          local start  = editor:GetTargetStart()
          local finish = editor:GetTargetEnd()
***************
*** 1251,1255 ****
          end
      else
!         if fHaveFound then
              local replaceLen = string.len(strReplace)
              local start  = editor:GetSelectionStart()
--- 1244,1248 ----
          end
      else
!         if found_string then
              local replaceLen = string.len(strReplace)
              local start  = editor:GetSelectionStart()
***************
*** 1259,1263 ****
              editor:ReplaceTarget(strReplace)
              editor:SetSelection(start + replaceLen, finish)
!             fHaveFound = false
          end
  
--- 1252,1256 ----
              editor:ReplaceTarget(strReplace)
              editor:SetSelection(start + replaceLen, finish)
!             found_string = false
          end
  
***************
*** 1447,1457 ****
      if markers >= BREAKPOINT_MARKER_VALUE then
          editor:MarkerDelete(line, BREAKPOINT_MARKER)
!         if debugServer then
!             debugServer:RemoveBreakPoint(filePath, line)
          end
      else
          editor:MarkerAdd(line, BREAKPOINT_MARKER)
!         if debugServer then
!             debugServer:AddBreakPoint(filePath, line)
          end
      end
--- 1440,1450 ----
      if markers >= BREAKPOINT_MARKER_VALUE then
          editor:MarkerDelete(line, BREAKPOINT_MARKER)
!         if debuggerServer then
!             debuggerServer:RemoveBreakPoint(filePath, line)
          end
      else
          editor:MarkerAdd(line, BREAKPOINT_MARKER)
!         if debuggerServer then
!             debuggerServer:AddBreakPoint(filePath, line)
          end
      end
***************
*** 1466,1469 ****
--- 1459,1463 ----
      errorLog:AddText(message)
      errorLog:SetReadOnly(true)
+     errorLog:GotoPos(errorLog:GetLength())
  end
  
***************
*** 1476,1492 ****
  frame:Connect(ID_TOGGLEBREAKPOINT, wx.wxEVT_UPDATE_UI, OnUpdateUIEditMenu)
  
  frame:Connect(ID_COMPILE, wx.wxEVT_COMMAND_MENU_SELECTED,
          function (event)
!             local editor     = GetEditor()
!             local editorText = editor:GetText()
!             local id         = editor:GetId()
!             local filePath   = MakeDebugFileName(editor, openDocuments[id].filePath)
!             local ret, errMsg, line_num = wx.CompileLuaScript(editorText, filePath)
! 
!             if line_num > -1 then
!                 DisplayOutput("Compliation error on line number :"..tostring(line_num).."\n")
!                 editor:GotoLine(line_num-1)
!             end
!             DisplayOutput(errMsg.."\n")
          end)
  frame:Connect(ID_COMPILE, wx.wxEVT_UPDATE_UI, OnUpdateUIEditMenu)
--- 1470,1493 ----
  frame:Connect(ID_TOGGLEBREAKPOINT, wx.wxEVT_UPDATE_UI, OnUpdateUIEditMenu)
  
+ function CompileProgram(editor)
+     local editorText = editor:GetText()
+     local id         = editor:GetId()
+     local filePath   = MakeDebugFileName(editor, openDocuments[id].filePath)
+     local ret, errMsg, line_num = wx.CompileLuaScript(editorText, filePath)
+ 
+     if line_num > -1 then
+         DisplayOutput("Compliation error on line number :"..tostring(line_num).."\n")
+         editor:GotoLine(line_num-1)
+     end
+ 
+     DisplayOutput(errMsg.."\n")
+ 
+     return line_num == -1 -- return true it it compiles ok
+ end
+ 
  frame:Connect(ID_COMPILE, wx.wxEVT_COMMAND_MENU_SELECTED,
          function (event)
!             local editor = GetEditor()
!             CompileProgram(editor)
          end)
  frame:Connect(ID_COMPILE, wx.wxEVT_UPDATE_UI, OnUpdateUIEditMenu)
***************
*** 1508,1511 ****
--- 1509,1517 ----
  ]]
              local editor = GetEditor();
+             -- test compile it before we run it
+             if not CompileProgram(editor) then
+                 return
+             end
+ 
              local id = editor:GetId();
              if openDocuments[id].isModified then
***************
*** 1543,1547 ****
          function (event)
              local editor = GetEditor()
!             event:Enable((debugServer == nil) and (editor ~= nil))
          end)
  
--- 1549,1553 ----
          function (event)
              local editor = GetEditor()
!             event:Enable((debuggerServer == nil) and (editor ~= nil))
          end)
  
***************
*** 1549,1576 ****
          function (event)
              local ok = false
!             debugServer = wx.wxLuaDebuggerServer(portNumber)
!             if debugServer then
!                 ok = debugServer:StartServer()
              end
              if ok then
!                 DisplayOutput("Waiting for client connect. Start client with wxLua -d"..wx.wxGetHostName()..":"..portNumber.."\n")
              else
                  DisplayOutput("Unable to create debugger server.\n")
              end
!             portNumber = portNumber + 1
          end)
  frame:Connect(ID_ATTACH_DEBUG, wx.wxEVT_UPDATE_UI,
          function (event)
              local editor = GetEditor()
!             event:Enable((debugServer == nil) and (editor ~= nil))
          end)
  
! function CreateDebugServer()
!     debugServer = wx.wxLuaDebuggerServer(portNumber)
  
!     local ok = debugServer:StartServer()
      if not ok then
!         debugServer:Delete()
!         debugServer = nil
          DisplayOutput("Error starting the debug server.\n")
          return nil
--- 1555,1582 ----
          function (event)
              local ok = false
!             debuggerServer = wx.wxLuaDebuggerServer(debuggerPortNumber)
!             if debuggerServer then
!                 ok = debuggerServer:StartServer()
              end
              if ok then
!                 DisplayOutput("Waiting for client connect. Start client with wxLua -d"..wx.wxGetHostName()..":"..debuggerPortNumber.."\n")
              else
                  DisplayOutput("Unable to create debugger server.\n")
              end
!             debuggerPortNumber = debuggerPortNumber + 1
          end)
  frame:Connect(ID_ATTACH_DEBUG, wx.wxEVT_UPDATE_UI,
          function (event)
              local editor = GetEditor()
!             event:Enable((debuggerServer == nil) and (editor ~= nil))
          end)
  
! function CreateDebuggerServer()
!     debuggerServer = wx.wxLuaDebuggerServer(debuggerPortNumber)
  
!     local ok = debuggerServer:StartServer()
      if not ok then
!         debuggerServer:Delete()
!         debuggerServer = nil
          DisplayOutput("Error starting the debug server.\n")
          return nil
***************
*** 1580,1609 ****
          local nextLine = editor:MarkerNext(0, BREAKPOINT_MARKER_VALUE)
          while nextLine ~= -1 do
!             debugServer:AddBreakPoint(fileName, nextLine)
              nextLine = editor:MarkerNext(nextLine + 1, BREAKPOINT_MARKER_VALUE)
          end
      end
  
!     debugServer:Connect(wx.wxID_ANY, wx.wxEVT_WXLUA_DEBUGGER_DEBUGGEE_CONNECTED,
          function (event)
              local ok = false
!             if debugServer then
                  for id, document in pairs(openDocuments) do
                      local editor     = document.editor
                      local editorText = editor:GetText()
                      local filePath   = MakeDebugFileName(editor, document.filePath)
!                     ok = debugServer:Run(filePath, editorText)
                      DownloadBreakpoints(editor, filePath)
                  end
                  if ok then
!                     ok = debugServer:Step()
                  end
!                 fIsConnected = ok
!                 fIsRunning = ok
  
                  UpdateUIMenuItems()
              end
  
!             if debugServer and ok then
                  DisplayOutput("Client connected ok.\n")
              else
--- 1586,1615 ----
          local nextLine = editor:MarkerNext(0, BREAKPOINT_MARKER_VALUE)
          while nextLine ~= -1 do
!             debuggerServer:AddBreakPoint(fileName, nextLine)
              nextLine = editor:MarkerNext(nextLine + 1, BREAKPOINT_MARKER_VALUE)
          end
      end
  
!     debuggerServer:Connect(wx.wxID_ANY, wx.wxEVT_WXLUA_DEBUGGER_DEBUGGEE_CONNECTED,
          function (event)
              local ok = false
!             if debuggerServer then
                  for id, document in pairs(openDocuments) do
                      local editor     = document.editor
                      local editorText = editor:GetText()
                      local filePath   = MakeDebugFileName(editor, document.filePath)
!                     ok = debuggerServer:Run(filePath, editorText)
                      DownloadBreakpoints(editor, filePath)
                  end
                  if ok then
!                     ok = debuggerServer:Step()
                  end
!                 debugger_connected = ok
!                 debuggee_running = ok
  
                  UpdateUIMenuItems()
              end
  
!             if debuggerServer and ok then
                  DisplayOutput("Client connected ok.\n")
              else
***************
*** 1612,1621 ****
          end)
  
!     debugServer:Connect(wx.wxID_ANY, wx.wxEVT_WXLUA_DEBUGGER_DEBUGGEE_DISCONNECTED,
          function (event)
              DisplayOutput(event:GetMessage().."\n")
              DisplayOutput("Debug server disconnected.\n")
!             debugServer:Delete()
!             debugServer = nil
          end)
  
--- 1618,1627 ----
          end)
  
!     debuggerServer:Connect(wx.wxID_ANY, wx.wxEVT_WXLUA_DEBUGGER_DEBUGGEE_DISCONNECTED,
          function (event)
              DisplayOutput(event:GetMessage().."\n")
              DisplayOutput("Debug server disconnected.\n")
!             debuggerServer:Delete()
!             debuggerServer = nil
          end)
  
***************
*** 1630,1634 ****
      end
  
!     debugServer:Connect(wx.wxID_ANY, wx.wxEVT_WXLUA_DEBUGGER_BREAK,
          function (event)
              if exitingProgram then return end
--- 1636,1640 ----
      end
  
!     debuggerServer:Connect(wx.wxID_ANY, wx.wxEVT_WXLUA_DEBUGGER_BREAK,
          function (event)
              if exitingProgram then return end
***************
*** 1687,1709 ****
  
              if fileFound then
!                 fIsRunning = false
                  ProcessWatches()
!             elseif debugServer then
!                 debugServer:Continue()
!                 fIsRunning = true
              end
          end)
  
!     debugServer:Connect(wx.wxID_ANY, wx.wxEVT_WXLUA_DEBUGGER_PRINT,
          function (event)
              DisplayOutput(event:GetMessage().."\n")
          end)
  
!     debugServer:Connect(wx.wxID_ANY, wx.wxEVT_WXLUA_DEBUGGER_ERROR,
          function (event)
!             DisplayOutput("wxLua ERROR: "..event:GetMessage().."\n")
          end)
  
!     debugServer:Connect(wx.wxID_ANY, wx.wxEVT_WXLUA_DEBUGGER_EXIT,
          function (event)
              DisplayOutput("\nDebugger Client finished.\n\n")
--- 1693,1715 ----
  
              if fileFound then
!                 debuggee_running = false
                  ProcessWatches()
!             elseif debuggerServer then
!                 debuggerServer:Continue()
!                 debuggee_running = true
              end
          end)
  
!     debuggerServer:Connect(wx.wxID_ANY, wx.wxEVT_WXLUA_DEBUGGER_PRINT,
          function (event)
              DisplayOutput(event:GetMessage().."\n")
          end)
  
!     debuggerServer:Connect(wx.wxID_ANY, wx.wxEVT_WXLUA_DEBUGGER_ERROR,
          function (event)
!             DisplayOutput("wxLua ERROR: "..event:GetMessage().."\n\n")
          end)
  
!     debuggerServer:Connect(wx.wxID_ANY, wx.wxEVT_WXLUA_DEBUGGER_EXIT,
          function (event)
              DisplayOutput("\nDebugger Client finished.\n\n")
***************
*** 1713,1721 ****
                  editor:MarkerDeleteAll(CURRENT_LINE_MARKER)
              end
!             fIsConnected = false
!             if debugServer then
!                 debugServer:Delete()
!                 debugServer = nil
!                 fIsRunning = false
              end
              SetAllEditorsReadOnly(false)
--- 1719,1727 ----
                  editor:MarkerDeleteAll(CURRENT_LINE_MARKER)
              end
!             debugger_connected = false
!             if debuggerServer then
!                 debuggerServer:Delete()
!                 debuggerServer = nil
!                 debuggee_running = false
              end
              SetAllEditorsReadOnly(false)
***************
*** 1723,1727 ****
          end)
  
!     debugServer:Connect(wx.wxID_ANY, wx.wxEVT_WXLUA_DEBUGGER_EVALUATE_EXPR,
          function (event)
              if watchListCtrl then
--- 1729,1733 ----
          end)
  
!     debuggerServer:Connect(wx.wxID_ANY, wx.wxEVT_WXLUA_DEBUGGER_EVALUATE_EXPR,
          function (event)
              if watchListCtrl then
***************
*** 1732,1763 ****
          end)
  
!     return debugServer
  end
  
  frame:Connect(ID_START_DEBUG, wx.wxEVT_COMMAND_MENU_SELECTED,
          function (event)
              local ok = false
!             debugServer = CreateDebugServer()
!             if debugServer then
!                 ok = debugServer:StartClient()
              end
  
!             if debugServer and ok then
                  SetAllEditorsReadOnly(true)
                  DisplayOutput("Waiting for client connection.\n")
              else
!                 DisplayOutput("Unable to create debugger server.\n"..tostring(debugServer)..tostring(ok))
!                 if debugServer then
!                     debugServer:Delete()
!                     debugServer = nil
                  end
              end
  
!             portNumber = portNumber + 1
          end)
  frame:Connect(ID_START_DEBUG, wx.wxEVT_UPDATE_UI,
          function (event)
              local editor = GetEditor()
!             event:Enable((debugServer == nil) and (editor ~= nil))
          end)
  
--- 1738,1775 ----
          end)
  
!     return debuggerServer
  end
  
  frame:Connect(ID_START_DEBUG, wx.wxEVT_COMMAND_MENU_SELECTED,
          function (event)
+             local editor = GetEditor()
+             -- test compile it before we run it
+             if not CompileProgram(editor) then
+                 return
+             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()
!                     debuggerServer = nil
                  end
              end
  
!             debuggerPortNumber = debuggerPortNumber + 1
          end)
  frame:Connect(ID_START_DEBUG, wx.wxEVT_UPDATE_UI,
          function (event)
              local editor = GetEditor()
!             event:Enable((debuggerServer == nil) and (editor ~= nil))
          end)
  
***************
*** 1768,1775 ****
                  editor:MarkerDeleteAll(CURRENT_LINE_MARKER)
              end
!             fIsConnected = false
!             if debugServer then
!                 local ds = debugServer
!                 debugServer = nil
                  ds:Reset()
                  ds:StopServer()
--- 1780,1787 ----
                  editor:MarkerDeleteAll(CURRENT_LINE_MARKER)
              end
!             debugger_connected = false
!             if debuggerServer then
!                 local ds = debuggerServer
!                 debuggerServer = nil
                  ds:Reset()
                  ds:StopServer()
***************
*** 1778,1788 ****
              SetAllEditorsReadOnly(false)
              ignoredFilesList = {}
!             fIsRunning = false
!             DisplayOutput("\nDebuggee client stopped.\n")
          end)
  frame:Connect(ID_STOP_DEBUG, wx.wxEVT_UPDATE_UI,
          function (event)
              local editor = GetEditor()
!             event:Enable((debugServer ~= nil) and (editor ~= nil))
          end)
  
--- 1790,1800 ----
              SetAllEditorsReadOnly(false)
              ignoredFilesList = {}
!             debuggee_running = false
!             DisplayOutput("\nDebuggee client stopped.\n\n")
          end)
  frame:Connect(ID_STOP_DEBUG, wx.wxEVT_UPDATE_UI,
          function (event)
              local editor = GetEditor()
!             event:Enable((debuggerServer ~= nil) and (editor ~= nil))
          end)
  
***************
*** 1793,1799 ****
                  editor:MarkerDeleteAll(CURRENT_LINE_MARKER)
              end
!             if debugServer then
!                 debugServer:Step()
!                 fIsRunning = true
              end
          end)
--- 1805,1811 ----
                  editor:MarkerDeleteAll(CURRENT_LINE_MARKER)
              end
!             if debuggerServer then
!                 debuggerServer:Step()
!                 debuggee_running = true
              end
          end)
***************
*** 1801,1805 ****
          function (event)
              local editor = GetEditor()
!             event:Enable((debugServer ~= nil) and (not fIsRunning) and (editor ~= nil))
          end)
  
--- 1813,1817 ----
          function (event)
              local editor = GetEditor()
!             event:Enable((debuggerServer ~= nil) and (not debuggee_running) and (editor ~= nil))
          end)
  
***************
*** 1810,1816 ****
                  editor:MarkerDeleteAll(CURRENT_LINE_MARKER)
              end
!             if debugServer then
!                 debugServer:StepOver()
!                 fIsRunning = true
              end
          end)
--- 1822,1828 ----
                  editor:MarkerDeleteAll(CURRENT_LINE_MARKER)
              end
!             if debuggerServer then
!                 debuggerServer:StepOver()
!                 debuggee_running = true
              end
          end)
***************
*** 1818,1822 ****
          function (event)
              local editor = GetEditor()
!             event:Enable((debugServer ~= nil) and (not fIsRunning) and (editor ~= nil))
          end)
  
--- 1830,1834 ----
          function (event)
              local editor = GetEditor()
!             event:Enable((debuggerServer ~= nil) and (not debuggee_running) and (editor ~= nil))
          end)
  
***************
*** 1827,1838 ****
                  editor:MarkerDeleteAll(CURRENT_LINE_MARKER)
              end
!             if debugServer then
!                 debugServer:StepOut()
!                 fIsRunning = true
              end
          end)
  frame:Connect(ID_STEP_OUT, wx.wxEVT_UPDATE_UI,
          function (event)
!             event:Enable((debugServer ~= nil) and (not fIsRunning))
          end)
  
--- 1839,1850 ----
                  editor:MarkerDeleteAll(CURRENT_LINE_MARKER)
              end
!             if debuggerServer then
!                 debuggerServer:StepOut()
!                 debuggee_running = true
              end
          end)
  frame:Connect(ID_STEP_OUT, wx.wxEVT_UPDATE_UI,
          function (event)
!             event:Enable((debuggerServer ~= nil) and (not debuggee_running))
          end)
  
***************
*** 1843,1876 ****
                  editor:MarkerDeleteAll(CURRENT_LINE_MARKER)
              end
!             if debugServer then
!                 debugServer:Continue()
!                 fIsRunning = true
              end
          end)
  frame:Connect(ID_CONTINUE, wx.wxEVT_UPDATE_UI,
          function (event)
!             event:Enable((debugServer ~= nil) and (not fIsRunning))
          end)
  
  frame:Connect(ID_BREAK, wx.wxEVT_COMMAND_MENU_SELECTED,
          function (event)
!             if debugServer then
!                 debugServer:Break()
              end
          end)
  frame:Connect(ID_BREAK, wx.wxEVT_UPDATE_UI,
          function (event)
!             event:Enable((debugServer ~= nil) and fIsRunning)
          end)
  
  frame:Connect(ID_VIEWCALLSTACK, wx.wxEVT_COMMAND_MENU_SELECTED,
          function (event)
!             if debugServer then
!                 debugServer:DisplayStackDialog(frame)
              end
          end)
  frame:Connect(ID_VIEWCALLSTACK, wx.wxEVT_UPDATE_UI,
          function (event)
!             event:Enable((debugServer ~= nil) and (not fIsRunning))
          end)
  
--- 1855,1888 ----
                  editor:MarkerDeleteAll(CURRENT_LINE_MARKER)
              end
!             if debuggerServer then
!                 debuggerServer:Continue()
!                 debuggee_running = true
              end
          end)
  frame:Connect(ID_CONTINUE, wx.wxEVT_UPDATE_UI,
          function (event)
!             event:Enable((debuggerServer ~= nil) and (not debuggee_running))
          end)
  
  frame:Connect(ID_BREAK, wx.wxEVT_COMMAND_MENU_SELECTED,
          function (event)
!             if debuggerServer then
!                 debuggerServer:Break()
              end
          end)
  frame:Connect(ID_BREAK, wx.wxEVT_UPDATE_UI,
          function (event)
!             event:Enable((debuggerServer ~= nil) and debuggee_running)
          end)
  
  frame:Connect(ID_VIEWCALLSTACK, wx.wxEVT_COMMAND_MENU_SELECTED,
          function (event)
!             if debuggerServer then
!                 debuggerServer:DisplayStackDialog(frame)
              end
          end)
  frame:Connect(ID_VIEWCALLSTACK, wx.wxEVT_UPDATE_UI,
          function (event)
!             event:Enable((debuggerServer ~= nil) and (not debuggee_running))
          end)
  
***************
*** 1883,1887 ****
  frame:Connect(ID_VIEWWATCHWINDOW, wx.wxEVT_UPDATE_UI,
          function (event)
!             event:Enable((debugServer ~= nil) and (not fIsRunning))
          end)
  
--- 1895,1899 ----
  frame:Connect(ID_VIEWWATCHWINDOW, wx.wxEVT_UPDATE_UI,
          function (event)
!             event:Enable((debuggerServer ~= nil) and (not debuggee_running))
          end)
  
***************
*** 1970,1980 ****
  function CloseWindow(event)
      exitingProgram = true
!     fIsConnected = false
!     if debugServer then
!         debugServer:Reset()
!         debugServer:Delete()
!         debugServer = nil
      end
!     fIsRunning = false
      SaveOnExit()
      ConfigSaveFramePosition(frame, "MainFrame")
--- 1982,1992 ----
  function CloseWindow(event)
      exitingProgram = true
!     debugger_connected = false
!     if debuggerServer then
!         debuggerServer:Reset()
!         debuggerServer:Delete()
!         debuggerServer = nil
      end
!     debuggee_running = false
      SaveOnExit()
      ConfigSaveFramePosition(frame, "MainFrame")

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

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

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

Modified Files:
	wxldserv.cpp wxldtarg.cpp 
Log Message:
subclass the wxProcess in the debugger so we don't have to send an event
fixes crashes when an error occurs in the debugger's lua program
test compile lua programs before running or debugging to catch syntax errors


Index: wxldtarg.cpp
===================================================================
RCS file: /cvsroot/wxlua/wxLua/modules/wxluasocket/src/wxldtarg.cpp,v
retrieving revision 1.30
retrieving revision 1.31
diff -C2 -d -r1.30 -r1.31
*** wxldtarg.cpp	5 Oct 2006 05:10:47 -0000	1.30
--- wxldtarg.cpp	8 Dec 2006 06:16:17 -0000	1.31
***************
*** 143,147 ****
                  {
                      NotifyError(errorMsg);
-                     m_bufferArray.Clear();
                      break;
                  }
--- 143,146 ----
***************
*** 166,170 ****
          m_clientSocket.Close();
      }
!     m_pThread->Wait();
  }
  
--- 165,171 ----
          m_clientSocket.Close();
      }
! 
!     if (m_pThread)
!         m_pThread->Wait();
  }
  

Index: wxldserv.cpp
===================================================================
RCS file: /cvsroot/wxlua/wxLua/modules/wxluasocket/src/wxldserv.cpp,v
retrieving revision 1.31
retrieving revision 1.32
diff -C2 -d -r1.31 -r1.32
*** wxldserv.cpp	1 Dec 2006 23:40:27 -0000	1.31
--- wxldserv.cpp	8 Dec 2006 06:16:17 -0000	1.32
***************
*** 140,143 ****
--- 140,163 ----
  
  // ----------------------------------------------------------------------------
+ // wxLuaDebuggerProcess
+ // ----------------------------------------------------------------------------
+ 
+ void wxLuaDebuggerProcess::OnTerminate(int pid, int status)
+ {
+     // 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.
+         wxProcessEvent event(m_id, pid, status);
+         m_debugger->OnEndDebugeeProcess(event);
+ 
+         m_debugger->m_debuggeeProcess = NULL;
+         m_debugger->m_debuggeeProcessID = -1;
+         delete this;
+     }
+ }
+ 
+ // ----------------------------------------------------------------------------
  // wxLuaDebuggerBase
  // ----------------------------------------------------------------------------
***************
*** 153,157 ****
      EVT_WXLUA_DEBUGGER_TABLE_ENUM(       wxID_ANY, wxLuaDebuggerBase::OnDebugTableEnum)
  
!     EVT_END_PROCESS(ID_WXLUASOCKET_DEBUGGEE_PROCESS, wxLuaDebuggerBase::OnEndDebugeeProcess)
  END_EVENT_TABLE()
  
--- 173,177 ----
      EVT_WXLUA_DEBUGGER_TABLE_ENUM(       wxID_ANY, wxLuaDebuggerBase::OnDebugTableEnum)
  
!     //EVT_END_PROCESS(ID_WXLUASOCKET_DEBUGGEE_PROCESS, wxLuaDebuggerBase::OnEndDebugeeProcess)
  END_EVENT_TABLE()
  
***************
*** 180,188 ****
      if ((m_debuggeeProcess != NULL) && (m_debuggeeProcessID > 0))
      {
!         // disconnect our event handler
!         if (m_debuggeeProcess->GetNextHandler() == this)
!             m_debuggeeProcess->SetNextHandler(NULL);
! 
!         m_debuggeeProcess->Kill(m_debuggeeProcessID, wxSIGKILL);
      }
  }
--- 200,208 ----
      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;
!         if (p->Exists(m_debuggeeProcessID))
!             p->Kill(m_debuggeeProcessID, wxSIGKILL);
      }
  }
***************
*** 646,650 ****
      if ((m_debuggeeProcess == NULL) && !m_fShutdown)
      {
!         m_debuggeeProcess = new wxProcess(this, ID_WXLUASOCKET_DEBUGGEE_PROCESS);
          wxString command = wxString::Format(wxT("%s -d%s:%u"),
                                              GetProgramName().c_str(),
--- 666,670 ----
      if ((m_debuggeeProcess == NULL) && !m_fShutdown)
      {
!         m_debuggeeProcess = new wxLuaDebuggerProcess(this, ID_WXLUASOCKET_DEBUGGEE_PROCESS);
          wxString command = wxString::Format(wxT("%s -d%s:%u"),
                                              GetProgramName().c_str(),

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

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

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

Modified Files:
	wxldserv.h 
Log Message:
subclass the wxProcess in the debugger so we don't have to send an event
fixes crashes when an error occurs in the debugger's lua program
test compile lua programs before running or debugging to catch syntax errors


Index: wxldserv.h
===================================================================
RCS file: /cvsroot/wxlua/wxLua/modules/wxluasocket/include/wxldserv.h,v
retrieving revision 1.25
retrieving revision 1.26
diff -C2 -d -r1.25 -r1.26
*** wxldserv.h	1 Dec 2006 23:40:27 -0000	1.25
--- wxldserv.h	8 Dec 2006 06:16:17 -0000	1.26
***************
*** 126,129 ****
--- 126,147 ----
  
  // ----------------------------------------------------------------------------
+ // wxLuaDebuggerProcess - handle OnTerminate gracefully
+ // ----------------------------------------------------------------------------
+ 
+ class wxLuaDebuggerProcess : public wxProcess
+ {
+ public:
+     // Don't use the debugger as the event handler since we don't want
+     //   problems when this may exist when the debugger is being deleted.
+     wxLuaDebuggerProcess(wxLuaDebuggerBase* debugger, wxWindowID id)
+         : wxProcess(NULL, id), m_debugger(debugger) {}
+ 
+     // don't send event, but delete this and NULL debugger's pointer to this
+     virtual void OnTerminate(int pid, int status);
+ 
+     wxLuaDebuggerBase* m_debugger;
+ };
+ 
+ // ----------------------------------------------------------------------------
  // wxLuaDebuggerBase - Socket debugger interface base class.
  //  This base class sends wxLUASOCKET_DEBUGGER_CMD_XXX commands through the
***************
*** 215,226 ****
  
  protected:
!     int               m_port_number;       // the socket port to listen to
!     wxLuaStackDialog *m_stackDialog;       // the stack dialog to
!     wxProcess        *m_debuggeeProcess;   // wxProcess of the debuggee
!     long              m_debuggeeProcessID; // id of the debuggee wxProcess
  
      static wxString sm_programName; // name of the program to run for debuggee
      static wxString sm_networkName; // name of the network to use for the debuggee
  
  private:
      DECLARE_EVENT_TABLE();
--- 233,246 ----
  
  protected:
!     int                   m_port_number;       // the socket port to listen to
!     wxLuaStackDialog     *m_stackDialog;       // the stack dialog to
!     wxLuaDebuggerProcess *m_debuggeeProcess;   // wxProcess of the debuggee
!     long                  m_debuggeeProcessID; // id of the debuggee wxProcess
  
      static wxString sm_programName; // name of the program to run for debuggee
      static wxString sm_networkName; // name of the network to use for the debuggee
  
+     friend class wxLuaDebuggerProcess;
+ 
  private:
      DECLARE_EVENT_TABLE();

[Wxlua-commit] wxLua/modules/wxlua/src wxlstate.cpp,1.80,1.81

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

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

Modified Files:
	wxlstate.cpp 
Log Message:
subclass the wxProcess in the debugger so we don't have to send an event
fixes crashes when an error occurs in the debugger's lua program
test compile lua programs before running or debugging to catch syntax errors


Index: wxlstate.cpp
===================================================================
RCS file: /cvsroot/wxlua/wxLua/modules/wxlua/src/wxlstate.cpp,v
retrieving revision 1.80
retrieving revision 1.81
diff -C2 -d -r1.80 -r1.81
*** wxlstate.cpp	7 Dec 2006 01:22:02 -0000	1.80
--- wxlstate.cpp	8 Dec 2006 06:16:17 -0000	1.81
***************
*** 1141,1145 ****
          if ( (top == lua_gettop(L)) || !lua_islightuserdata(L, -1) )
          {
-             wxPrintf(wxT("wxLuaStateRefData::GetLuaStateRefData FAILED!\n"));
              lua_settop( L, top );
              return NULL;
--- 1141,1144 ----

[Wxlua-commit] wxLua/samples editor.wx.lua,1.35,1.36

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

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

Modified Files:
	editor.wx.lua 
Log Message:
be sure to nil debugServer and display error messages on failure


Index: editor.wx.lua
===================================================================
RCS file: /cvsroot/wxlua/wxLua/samples/editor.wx.lua,v
retrieving revision 1.35
retrieving revision 1.36
diff -C2 -d -r1.35 -r1.36
*** editor.wx.lua	7 Dec 2006 22:05:53 -0000	1.35
--- editor.wx.lua	8 Dec 2006 01:12:35 -0000	1.36
***************
*** 1572,1575 ****
--- 1572,1577 ----
      if not ok then
          debugServer:Delete()
+         debugServer = nil
+         DisplayOutput("Error starting the debug server.\n")
          return nil
      end
***************
*** 1613,1616 ****
--- 1615,1619 ----
          function (event)
              DisplayOutput(event:GetMessage().."\n")
+             DisplayOutput("Debug server disconnected.\n")
              debugServer:Delete()
              debugServer = nil
***************
*** 1704,1707 ****
--- 1707,1712 ----
      debugServer:Connect(wx.wxID_ANY, wx.wxEVT_WXLUA_DEBUGGER_EXIT,
          function (event)
+             DisplayOutput("\nDebugger Client finished.\n\n")
+ 
              for id, document in pairs(openDocuments) do
                  local editor = document.editor
***************
*** 1711,1720 ****
              if debugServer then
                  debugServer:Delete()
-                 fIsRunning = false
                  debugServer = nil
              end
              SetAllEditorsReadOnly(false)
              ignoredFilesList = {}
-             DisplayOutput("\nDebugger Client finished\n\n")
          end)
  
--- 1716,1724 ----
              if debugServer then
                  debugServer:Delete()
                  debugServer = nil
+                 fIsRunning = false
              end
              SetAllEditorsReadOnly(false)
              ignoredFilesList = {}
          end)
  
***************
*** 1737,1747 ****
              if debugServer then
                  ok = debugServer:StartClient()
-                 SetAllEditorsReadOnly(true)
              end
  
              if debugServer and ok then
                  DisplayOutput("Waiting for client connection.\n")
              else
                  DisplayOutput("Unable to create debugger server.\n"..tostring(debugServer)..tostring(ok))
              end
  
--- 1741,1755 ----
              if debugServer then
                  ok = debugServer:StartClient()
              end
  
              if debugServer and ok then
+                 SetAllEditorsReadOnly(true)
                  DisplayOutput("Waiting for client connection.\n")
              else
                  DisplayOutput("Unable to create debugger server.\n"..tostring(debugServer)..tostring(ok))
+                 if debugServer then
+                     debugServer:Delete()
+                     debugServer = nil
+                 end
              end
  

[Wxlua-commit] wxLua/apps/wxlua/src lconsole.cpp, 1.13, 1.14 lconsole.h, 1.8, 1.9 wxlua.cpp, 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-serv11065/wxLua/apps/wxlua/src

Modified Files:
	lconsole.cpp lconsole.h wxlua.cpp 
Log Message:
cleanup arg processing for wxLua program to match the lua program


Index: wxlua.cpp
===================================================================
RCS file: /cvsroot/wxlua/wxLua/apps/wxlua/src/wxlua.cpp,v
retrieving revision 1.40
retrieving revision 1.41
diff -C2 -d -r1.40 -r1.41
*** wxlua.cpp	7 Dec 2006 01:22:02 -0000	1.40
--- wxlua.cpp	7 Dec 2006 22:05:52 -0000	1.41
***************
*** 54,76 ****
  static const wxCmdLineEntryDesc cmdLineDesc[] =
  {
!     { wxCMD_LINE_SWITCH, wxT("h"), wxT("help"),   wxT("help on command line switches"),
          wxCMD_LINE_VAL_NONE, wxCMD_LINE_PARAM_OPTIONAL|wxCMD_LINE_OPTION_HELP },
  
!     { wxCMD_LINE_SWITCH, wxT("c"), wxT("console"), wxT("show message console for print statements"),
          wxCMD_LINE_VAL_NONE, wxCMD_LINE_PARAM_OPTIONAL },
  
!     { wxCMD_LINE_OPTION, wxT("d"), wxT("debuggee"), wxT("run as debuggee, -d[host]:[port]"),
          wxCMD_LINE_VAL_STRING, wxCMD_LINE_PARAM_OPTIONAL },
  
!     { wxCMD_LINE_OPTION, wxT("e"), wxT("edit"), wxT("open file(s) to edit"),
!         wxCMD_LINE_VAL_STRING, wxCMD_LINE_PARAM_OPTIONAL|wxCMD_LINE_PARAM_MULTIPLE|wxCMD_LINE_NEEDS_SEPARATOR },
  
!     { wxCMD_LINE_OPTION, wxT("r"), wxT("run"), wxT("run wxLua program w/ command line args"),
!         wxCMD_LINE_VAL_STRING, wxCMD_LINE_PARAM_OPTIONAL|wxCMD_LINE_NEEDS_SEPARATOR },
  
!     { wxCMD_LINE_SWITCH, wxT("q"), wxT("quit"), wxT("Do not exit even if there are no top level windows open."),
!         wxCMD_LINE_VAL_NONE, wxCMD_LINE_PARAM_OPTIONAL },
  
!     { wxCMD_LINE_PARAM,  wxT(""),  wxT(""),    wxT("run wxLua program w/ command line args"),
          wxCMD_LINE_VAL_STRING, wxCMD_LINE_PARAM_OPTIONAL|wxCMD_LINE_PARAM_MULTIPLE },
  
--- 54,79 ----
  static const wxCmdLineEntryDesc cmdLineDesc[] =
  {
!     { wxCMD_LINE_SWITCH, wxT("h"), wxT("help"),   wxT("Help on command line switches."),
          wxCMD_LINE_VAL_NONE, wxCMD_LINE_PARAM_OPTIONAL|wxCMD_LINE_OPTION_HELP },
  
!     { wxCMD_LINE_SWITCH, wxT("c"), wxT("console"), wxT("Show message console for print statements."),
          wxCMD_LINE_VAL_NONE, wxCMD_LINE_PARAM_OPTIONAL },
  
!     { wxCMD_LINE_SWITCH, wxT("q"), wxT("quit"), wxT("Do not exit even if there are no top level windows open."),
!         wxCMD_LINE_VAL_NONE, wxCMD_LINE_PARAM_OPTIONAL },
! 
!     { wxCMD_LINE_OPTION, wxT("e"), wxT("stat"), wxT("Execute lua string 'stat'."),
          wxCMD_LINE_VAL_STRING, wxCMD_LINE_PARAM_OPTIONAL },
  
!     { wxCMD_LINE_OPTION, wxT("d"), wxT("debuggee"), wxT("Run as debuggee -d[host]:[port]"),
!         wxCMD_LINE_VAL_STRING, wxCMD_LINE_PARAM_OPTIONAL },
  
!     { wxCMD_LINE_OPTION, wxT("o"), wxT("open"), wxT("Open file(s) to edit."),
!         wxCMD_LINE_VAL_STRING, wxCMD_LINE_PARAM_OPTIONAL|wxCMD_LINE_PARAM_MULTIPLE },
  
!     { wxCMD_LINE_OPTION, wxT("r"), wxT("run"), wxT("Run lua program with command line args."),
!         wxCMD_LINE_VAL_STRING, wxCMD_LINE_PARAM_OPTIONAL|wxCMD_LINE_PARAM_MULTIPLE},
  
!     { wxCMD_LINE_PARAM,  wxT(""),  wxT(""),    wxT("Run lua program with command line args."),
          wxCMD_LINE_VAL_STRING, wxCMD_LINE_PARAM_OPTIONAL|wxCMD_LINE_PARAM_MULTIPLE },
  
***************
*** 78,81 ****
--- 81,99 ----
  };
  
+ // Find the index into the argv that matches name starting at arg start_n
+ // This is necessary since the wxCmdLineParser drops -- and all -X 
+ //  params so we use this to make sure that the lua program is at 0.
+ int FindFirstCmdParam(int start_n, const wxString& name, 
+                       int argc, wxChar** argv)
+ {
+     for (int arg_n = start_n; arg_n < argc; arg_n++)
+     {
+         if (argv[arg_n] == name)
+             return arg_n - 1;
+     }
+ 
+     return start_n; //oops? just return what was given.
+ }
+ 
  // ---------------------------------------------------------------------------
  // wxLuaStandaloneApp
***************
*** 134,137 ****
--- 152,160 ----
  
      wxCmdLineParser parser(cmdLineDesc, argc, argv);
+     parser.SetLogo(wxString::Format(wxT("Welcome to %s\n")
+                                     wxT("The editor is opened if no parameters are given.\n")
+                                     wxT("Note: specify the parameters in the order shown and -d, -o, -r are exclusive.\n")
+                                     wxT("To stop this program from processing command line args use '--'.\n"),
+                                     WXLUA_VERSION_STRING));
  
      switch ( parser.Parse() )
***************
*** 139,169 ****
          case -1 :
          {
!             // help should be given by the wxCmdLineParser, exit program
              return false;
          }
          case 0:
          {
!             wxString value;
! 
!             // don't quit the program for no top level windows
              if (parser.Found(wxT("q")))
                  dont_quit = true;
  
              // Check if we are to display the console
              if (parser.Found(wxT("c")))
              {
!                 arg_count++;
                  m_want_console = true;
                  m_luaConsole = new wxLuaConsole(NULL, ID_WXLUA_CONSOLE);
                  m_luaConsole->Show(true);
              }
  
!             // set up for debugging
!             if (parser.Found(wxT("d"), &value))
              {
                  // Note: wxLuaDebuggerServer::StartClient() runs 
                  //       wxExecute(m_programName -d[host]:[port], ...)
  
!                 wxString serverName(value.BeforeFirst(wxT(':')));
  
                  if (serverName.IsEmpty())
--- 162,211 ----
          case -1 :
          {
!             // Help should be given by the wxCmdLineParser, exit program
              return false;
          }
          case 0:
          {
!             // Don't quit the program even if no top level windows open
              if (parser.Found(wxT("q")))
+             {
+                 arg_count++; // remove -q arg
                  dont_quit = true;
+             }
  
              // Check if we are to display the console
              if (parser.Found(wxT("c")))
              {
!                 arg_count++; // remove -c arg
                  m_want_console = true;
+                 // Note: The m_luaConsole will be nulled when it closes in 
+                 //       wxLuaConsole::OnCloseWindow.
                  m_luaConsole = new wxLuaConsole(NULL, ID_WXLUA_CONSOLE);
                  m_luaConsole->Show(true);
              }
  
!             // Check if we are to run some lua code stat
!             wxString luaCode;
!             if (parser.Found(wxT("e"), &luaCode))
!             {
!                 arg_count++; // remove -e arg
!                 int rc = m_wxlState.RunString(luaCode, wxT("=(command line)"));
!                 wxString errorStr;
!                 run_ok = wxLuaState::CheckRunError(rc, &errorStr);
!                 if (!run_ok)
!                 {
!                     DisplayMessage(errorStr, true, m_wxlState);
!                     break;
!                 }
!             }
! 
!             // Set up for debugging
!             wxString debugString;
!             if (parser.Found(wxT("d"), &debugString))
              {
                  // Note: wxLuaDebuggerServer::StartClient() runs 
                  //       wxExecute(m_programName -d[host]:[port], ...)
  
!                 wxString serverName(debugString.BeforeFirst(wxT(':')));
  
                  if (serverName.IsEmpty())
***************
*** 174,178 ****
                  {
                      long portNumber = 0;
!                     if (value.AfterFirst(wxT(':')).ToLong(&portNumber))
                      {
                          m_pDebugTarget = new wxLuaDebugTarget(m_wxlState, serverName, (int)portNumber);
--- 216,220 ----
                  {
                      long portNumber = 0;
!                     if (debugString.AfterFirst(wxT(':')).ToLong(&portNumber))
                      {
                          m_pDebugTarget = new wxLuaDebugTarget(m_wxlState, serverName, (int)portNumber);
***************
*** 189,198 ****
              }
  
!             // See if a file has been specified to edit or just start editor
!             bool run_editor = parser.Found(wxT("e"), &value);
!             if (run_editor || (parser.GetParamCount() == 0))
!             {
!                 // remove -e arg, but push the args in any case
!                 if (run_editor) arg_count++; 
                  PushArgs(argv, argc, arg_count);
  
--- 231,248 ----
              }
  
! 
!             // See if a file has been specified to open or just start editor
!             // if there are no parameters.
!             wxString openFileName;
!             bool open_file = parser.Found(wxT("o"), &openFileName);
!             if (open_file) arg_count++; // remove -o arg
! 
!             if (open_file || (parser.GetParamCount() == 0))
!             {                
!                 if (openFileName.IsEmpty() && (parser.GetParamCount() > 0u))
!                     openFileName = parser.GetParam(0);
!                 if (!openFileName.IsEmpty())
!                     arg_count = FindFirstCmdParam(arg_count, openFileName, argc, argv);
! 
                  PushArgs(argv, argc, arg_count);
  
***************
*** 212,220 ****
              //if (parser.Found(wxT("r"), &value))
              {
                  arg_count++; // skip the program we're running
-                 wxString fileName = parser.GetParam(0); // already handled 0 params
                  PushArgs(argv, argc, arg_count);
  
!                 int rc = m_wxlState.RunFile(fileName);
                  wxString errorStr;
                  run_ok = wxLuaState::CheckRunError(rc, &errorStr);
--- 262,275 ----
              //if (parser.Found(wxT("r"), &value))
              {
+                 wxString runFileName;
+                 if (!parser.Found(wxT("r"), &runFileName) && (parser.GetParamCount() > 0u))
+                     runFileName = parser.GetParam(0);
+                 if (!runFileName.IsEmpty())
+                     arg_count = FindFirstCmdParam(arg_count, runFileName, argc, argv);
+ 
                  arg_count++; // skip the program we're running
                  PushArgs(argv, argc, arg_count);
  
!                 int rc = m_wxlState.RunFile(runFileName);
                  wxString errorStr;
                  run_ok = wxLuaState::CheckRunError(rc, &errorStr);
***************
*** 259,263 ****
      m_want_console = false; // no more messages
  
!     if (m_luaConsole)
      {
          m_luaConsole->Destroy();
--- 314,318 ----
      m_want_console = false; // no more messages
  
!     if (m_luaConsole && !m_luaConsole->IsBeingDeleted())
      {
          m_luaConsole->Destroy();
***************
*** 299,304 ****
              wxMessageBox(msg, wxT("wxLua Print"));
  #else
!             fprintf(stderr, wx2lua(msg + wxT("\n")));
!             //wxPrintf(msg + wxT("\n"));
  #endif // __WXMSW__
          }
--- 354,359 ----
              wxMessageBox(msg, wxT("wxLua Print"));
  #else
!             //fprintf(stderr, wx2lua(msg + wxT("\n")));
!             wxPrintf(msg + wxT("\n"));
  #endif // __WXMSW__
          }
***************
*** 312,316 ****
              m_luaConsole->DisplayText(msg);
              m_luaConsole->SetExitOnError(is_error);
!             m_luaConsole->DisplayStack(wxlState);
          }
          else
--- 367,372 ----
              m_luaConsole->DisplayText(msg);
              m_luaConsole->SetExitOnError(is_error);
!             if (wxlState.Ok())
!                 m_luaConsole->DisplayStack(wxlState);
          }
          else
***************
*** 319,323 ****
              wxMessageBox(msg, wxT("wxLua Error"));
  #else
!             fprintf(stderr, wx2lua(msg + wxT("\n")));
  #endif // __WXMSW__
          }
--- 375,380 ----
              wxMessageBox(msg, wxT("wxLua Error"));
  #else
!             //fprintf(stderr, wx2lua(msg + wxT("\n")));
!             wxPrintf(msg + wxT("\n"));
  #endif // __WXMSW__
          }
***************
*** 346,350 ****
          // no real args, just stick in the name of this program
          lua_newtable(L);
!         lua_pushstring(L, wx2lua(m_programName));
          lua_rawseti(L, -2, 0);
          lua_setglobal(L, "arg");
--- 403,407 ----
          // no real args, just stick in the name of this program
          lua_newtable(L);
!         lua_pushstring(L, wx2lua(argv[0]));
          lua_rawseti(L, -2, 0);
          lua_setglobal(L, "arg");

Index: lconsole.h
===================================================================
RCS file: /cvsroot/wxlua/wxLua/apps/wxlua/src/lconsole.h,v
retrieving revision 1.8
retrieving revision 1.9
diff -C2 -d -r1.8 -r1.9
*** lconsole.h	7 Dec 2006 01:22:02 -0000	1.8
--- lconsole.h	7 Dec 2006 22:05:52 -0000	1.9
***************
*** 17,20 ****
--- 17,24 ----
  #include "wxlua/include/wxlua.h"
  
+ class WXDLLEXPORT wxSplitterWindow;
+ class WXDLLEXPORT wxTextCtrl;
+ class WXDLLEXPORT wxListBox;
+ 
  // ----------------------------------------------------------------------------
  // wxLuaConsole - define a console class to display print statements

Index: lconsole.cpp
===================================================================
RCS file: /cvsroot/wxlua/wxLua/apps/wxlua/src/lconsole.cpp,v
retrieving revision 1.13
retrieving revision 1.14
diff -C2 -d -r1.13 -r1.14
*** lconsole.cpp	7 Dec 2006 01:22:02 -0000	1.13
--- lconsole.cpp	7 Dec 2006 22:05:52 -0000	1.14
***************
*** 65,68 ****
--- 65,71 ----
  void wxLuaConsole::OnCloseWindow(wxCloseEvent&)
  {
+     // Must NULL the console in the app so it won't be used.
+     // Using EVT_DESTROY in the app causes a segfault if this is deleted
+     // in wxApp::OnExit and through this is ugly, it works.
      if (wxGetApp().m_luaConsole == this)
          wxGetApp().m_luaConsole = NULL;

[Wxlua-commit] wxLua/samples editor.wx.lua, 1.34, 1.35 unittest.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-serv11065/wxLua/samples

Modified Files:
	editor.wx.lua unittest.wx.lua 
Log Message:
cleanup arg processing for wxLua program to match the lua program


Index: editor.wx.lua
===================================================================
RCS file: /cvsroot/wxlua/wxLua/samples/editor.wx.lua,v
retrieving revision 1.34
retrieving revision 1.35
diff -C2 -d -r1.34 -r1.35
*** editor.wx.lua	7 Dec 2006 06:32:44 -0000	1.34
--- editor.wx.lua	7 Dec 2006 22:05:53 -0000	1.35
***************
*** 45,49 ****
  local ID_ATTACH_DEBUG     = NewID()
  local ID_START_DEBUG      = NewID()
! local ID_RESET            = NewID()
  local ID_STEP             = NewID()
  local ID_STEP_OVER        = NewID()
--- 45,49 ----
  local ID_ATTACH_DEBUG     = NewID()
  local ID_START_DEBUG      = NewID()
! local ID_STOP_DEBUG       = NewID()
  local ID_STEP             = NewID()
  local ID_STEP_OVER        = NewID()
***************
*** 755,759 ****
  
  function LoadFile(filePath, fileName, editor)
-     local result = nil
      if not editor then
          editor = FindDocumentToReuse()
--- 755,758 ----
***************
*** 762,784 ****
          editor = CreateEditor(fileName)
      end
      local handle = io.open(filePath, "rb")
      if handle then
!         local st = handle:read("*a")
          handle:close()
-         editor:Clear()
-         editor:ClearAll()
-         editor:MarkerDeleteAll(BREAKPOINT_MARKER)
-         editor:MarkerDeleteAll(CURRENT_LINE_MARKER)
-         editor:AppendText(st)
-         SetupKeywords(editor, IsLuaFile(filePath))
-         editor:EmptyUndoBuffer()
-         local id = editor:GetId()
-         openDocuments[id].filePath = filePath
-         openDocuments[id].fileName = fileName
-         SetDocumentModified(id, false, true)
-         result = editor
      end
  
!     return result
  end
  
--- 761,785 ----
          editor = CreateEditor(fileName)
      end
+ 
+     local file_text = ""
      local handle = io.open(filePath, "rb")
      if handle then
!         file_text = handle:read("*a")
          handle:close()
      end
  
!     editor:Clear()
!     editor:ClearAll()
!     editor:MarkerDeleteAll(BREAKPOINT_MARKER)
!     editor:MarkerDeleteAll(CURRENT_LINE_MARKER)
!     editor:AppendText(file_text)
!     SetupKeywords(editor, IsLuaFile(filePath))
!     editor:EmptyUndoBuffer()
!     local id = editor:GetId()
!     openDocuments[id].filePath = filePath
!     openDocuments[id].fileName = fileName
!     SetDocumentModified(id, false, true)
! 
!     return editor
  end
  
***************
*** 1410,1416 ****
          { ID_RUN,              "Run\tF6",               "Execute the current file" },
          { ID_ATTACH_DEBUG,     "Attach\tShift-F6",      "Allow a client to start a debugging session" },
!         { ID_START_DEBUG,      "Start Debug\tShift-F5", "Start a debugging session" },
          { },
!         { ID_RESET,            "Reset\tShift-F12",      "Reset and end the debugging session" },
          { ID_STEP,             "Step\tF11",             "Step into the next line" },
          { ID_STEP_OVER,        "Step Over\tShift-F11",  "Step over the next line" },
--- 1411,1417 ----
          { ID_RUN,              "Run\tF6",               "Execute the current file" },
          { ID_ATTACH_DEBUG,     "Attach\tShift-F6",      "Allow a client to start a debugging session" },
!         { ID_START_DEBUG,      "Start Debugging\tShift-F5", "Start a debugging session" },
          { },
!         { ID_STOP_DEBUG,       "Stop Debugging\tShift-F12", "Stop and end the debugging session" },
          { ID_STEP,             "Step\tF11",             "Step into the next line" },
          { ID_STEP_OVER,        "Step Over\tShift-F11",  "Step over the next line" },
***************
*** 1753,1757 ****
          end)
  
! frame:Connect(ID_RESET, wx.wxEVT_COMMAND_MENU_SELECTED,
          function (event)
              for id, document in pairs(openDocuments) do
--- 1754,1758 ----
          end)
  
! frame:Connect(ID_STOP_DEBUG, wx.wxEVT_COMMAND_MENU_SELECTED,
          function (event)
              for id, document in pairs(openDocuments) do
***************
*** 1770,1776 ****
              ignoredFilesList = {}
              fIsRunning = false
!             DisplayOutput("\nClient reset\n")
          end)
! frame:Connect(ID_RESET, wx.wxEVT_UPDATE_UI,
          function (event)
              local editor = GetEditor()
--- 1771,1777 ----
              ignoredFilesList = {}
              fIsRunning = false
!             DisplayOutput("\nDebuggee client stopped.\n")
          end)
! frame:Connect(ID_STOP_DEBUG, wx.wxEVT_UPDATE_UI,
          function (event)
              local editor = GetEditor()
***************
*** 1999,2003 ****
      for index = 1, #arg do
          fileName = arg[index]
!         LoadFile(fileName, fileName)
      end
  
--- 2000,2006 ----
      for index = 1, #arg do
          fileName = arg[index]
!         if fileName ~= "--" then
!             LoadFile(fileName, wx.wxFileName(fileName):GetFullName())
!         end
      end
  

Index: unittest.wx.lua
===================================================================
RCS file: /cvsroot/wxlua/wxLua/samples/unittest.wx.lua,v
retrieving revision 1.4
retrieving revision 1.5
diff -C2 -d -r1.4 -r1.5
*** unittest.wx.lua	15 May 2006 04:48:38 -0000	1.4
--- unittest.wx.lua	7 Dec 2006 22:05:53 -0000	1.5
***************
*** 28,32 ****
  
      print(string.format("Program arg count %d", #arg))
!     for n = start_n, 10000 do
          if arg[n] then
              print(string.format("Program arg #%2d of %2d '%s'", n, #arg, arg[n]))
--- 28,32 ----
  
      print(string.format("Program arg count %d", #arg))
!     for n = start_n, #arg do
          if arg[n] then
              print(string.format("Program arg #%2d of %2d '%s'", n, #arg, arg[n]))

[Wxlua-commit] wxLua/docs wxlua.html,1.8,1.9

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

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

Modified Files:
	wxlua.html 
Log Message:
cleanup arg processing for wxLua program to match the lua program


Index: wxlua.html
===================================================================
RCS file: /cvsroot/wxlua/wxLua/docs/wxlua.html,v
retrieving revision 1.8
retrieving revision 1.9
diff -C2 -d -r1.8 -r1.9
*** wxlua.html	17 Nov 2006 20:54:02 -0000	1.8
--- wxlua.html	7 Dec 2006 22:05:53 -0000	1.9
***************
*** 1130,1141 ****
  start the debuggee process by hand by running another wxLua process as
  "wxLua -dHOSTNAME:PORT program.lua" using the appropriate values for
! HOSTNAME:PORT as shown in the status window after selecting <i>Attach</i>.
  You can abort the debugging by selecting <i>Reset</i>.</li>
  
!       <li><i>Start Debug</i> - Start debugging the
  current program where
  you can then <i>Step, Step Over, Continue, Break</i>.</li>
  
!       <li><i>Reset</i> - Stop debugging and close the
  debuggee process.</li>
  
--- 1130,1143 ----
  start the debuggee process by hand by running another wxLua process as
  "wxLua -dHOSTNAME:PORT program.lua" using the appropriate values for
! HOSTNAME:PORT as shown in the wxLua status window after selecting <i>Attach</i>.
  You can abort the debugging by selecting <i>Reset</i>.</li>
  
!       <li><i>Start Debugging</i> - Start debugging
! the
  current program where
  you can then <i>Step, Step Over, Continue, Break</i>.</li>
  
!       <li><i>Stop Debugging</i> - Stop debugging and
! close the
  debuggee process.</li>
  
***************
*** 1150,1153 ****
--- 1152,1226 ----
      </ul>
  
+     <li>This program can also run lua or wxLua programs on the
+ command line just like the lua executable.</li>
+ 
+     <ul>
+ 
+       <li>The command line switches can be displayed by running
+ wxLua -h.</li>
+ 
+       <li>The editor is run if no parameters are given.</li>
+ 
+       <li>Note that the switches -c, -q, -e must be specified
+ before -d, -o, -r</li>
+ 
+       <li>The switches -d (run as debuggee), -o (open files to
+ edit), and -r (run file) are exclusive and you can only use one.</li>
+ 
+       <li>If -d, -o, or -r are not given but there is at
+ least one parameter on the command line, it is interpreted to be a
+ program name and wxLua will try to run it, any parameters after the
+ program name are pushed into the lua as a table named 'arg'.</li>
+ 
+       <li>If you want to run a program or provide arguments to
+ your lua program that use -X or /X semantics you need to use
+ -- to stop the wxLua program from interpreting the args.</li>
+ 
+       <ul>
+ 
+         <li>In the example below, we don't want wxLua to
+ interpret the second -c or give an error for the -g arg, but
+ rather pass the args to myprogram.lua.</li>
+ 
+         <li><i>wxLua -c -e "a = 12; b = 3" -- myprogram.lua
+ -c 12 -g</i><br>
+ 
+         </li>
+ 
+         <ul>
+ 
+           <li>The wxLua program will display a console window to
+ display print statements, run the string "a = 12; b = 3", then
+ run myprogram.lua and push into lua a table named 'arg' with the
+ indicies </li>
+ 
+           <li>[-5] = 'd:\wxLua\bin\wxlua.exe', [-4] = '-c', [-3]
+ = '-e', [-2] = 'a = 12; b = 3', [-1] = '--', [0]
+ = '../samples/unittest.wx.lua'</li>
+ 
+           <li>[1] = '-c', [2] = '12', [3]
+ = '-g'</li>
+ 
+           <li>This is the same table the lua executable
+ creates, where 0 = the name of the lua program run and positive indices
+ are args to the lua program and the most negative index is the name of
+ the executable.</li>
+ 
+         </ul>
+ 
+         <li>wxLua -c -e "a = 12; b = 3" -r myprogram.lua -- -c 12
+ -g</li>
+ 
+         <ul>
+ 
+           <li>Gives the same results, but the lua arg
+ table starts with [1] = '--' which should probably be ignored.</li>
+ 
+         </ul>
+ 
+       </ul>
+ 
+     </ul>
+ 
    </ul>
  

[Wxlua-commit] wxLua/docs wxluaref.html,1.10,1.11

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

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

Modified Files:
	wxluaref.html 
Log Message:
update docs


Index: wxluaref.html
===================================================================
RCS file: /cvsroot/wxlua/wxLua/docs/wxluaref.html,v
retrieving revision 1.10
retrieving revision 1.11
diff -C2 -d -r1.10 -r1.11
*** wxluaref.html	2 Nov 2006 23:38:08 -0000	1.10
--- wxluaref.html	7 Dec 2006 06:37:11 -0000	1.11
***************
*** 10,13 ****
--- 10,14 ----
  <h2>wxWidgets Classes</h2>
  <a href="#wxANIHandler">wxANIHandler</a> - (Not in wxWidgets reference manual)<br>
+ <a href="#wxAboutDialogInfo">wxAboutDialogInfo</a> - (Not in wxWidgets reference manual)<br>
  <a href="#wxAcceleratorEntry">wxAcceleratorEntry</a><br>
  <a href="#wxAcceleratorTable">wxAcceleratorTable</a><br>
***************
*** 287,291 ****
  <a href="#wxListbookEvent">wxListbookEvent</a> - (Not in wxWidgets reference manual)<br>
  wxLocale - (Not wrapped)<br>
[...2959 lines suppressed...]
  <i>%include</i> "wx/xrc/xmlres.h"<br>
--- 13085,13089 ----
  <i>%if</i> wxLUA_USE_wxXMLResource<br>
  <br>
! !<i>%wxchkver25</i> <i>%include</i> "wx/xrc/xml.h"<br>
  <i>%wxchkver25</i> <i>%include</i> "wx/xml/xml.h"<br>
  <i>%include</i> "wx/xrc/xmlres.h"<br>
***************
*** 13185,13189 ****
  </blockquote><font color=#AA0000><i>%endclass</i></font><br>
  <br>
! <i>%endif</i> wxLUA_USE_wxXMLResource<br>
  <HR>
  <h2>../wxstc/stc.i</h2>
--- 13248,13252 ----
  </blockquote><font color=#AA0000><i>%endclass</i></font><br>
  <br>
! <i>%endif</i> //wxLUA_USE_wxXMLResource<br>
  <HR>
  <h2>../wxstc/stc.i</h2>

[Wxlua-commit] wxLua/apps/wxlua/src editor.h,1.27,1.28

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

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

Modified Files:
	editor.h 
Log Message:
update editor for not using wxPlatformXXX


Index: editor.h
===================================================================
RCS file: /cvsroot/wxlua/wxLua/apps/wxlua/src/editor.h,v
retrieving revision 1.27
retrieving revision 1.28
diff -C2 -d -r1.27 -r1.28
*** editor.h	5 Dec 2006 23:38:28 -0000	1.27
--- editor.h	7 Dec 2006 06:34:24 -0000	1.28
***************
*** 5,2029 ****
  #include <stdio.h>   /* for size_t */
  
! /* Original filename: '../../..//samples/editor.wx.lua' */
  extern const size_t wxLuaEditor_len;
  extern const unsigned char wxLuaEditor[];
  
! const size_t wxLuaEditor_len = 76850;
! const unsigned char wxLuaEditor[76851] = {
!  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, 13, 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, 13, 10,
[...4021 lines suppressed...]
!  10,
!  32, 32, 32, 32,102,111,114, 32,105,110,100,101,120, 32, 61, 32, 49, 44, 32, 35, 97,114,103, 32,100,111, 10,
!  32, 32, 32, 32, 32, 32, 32, 32,102,105,108,101, 78, 97,109,101, 32, 61, 32, 97,114,103, 91,105,110,100,101,120, 93, 10,
!  32, 32, 32, 32, 32, 32, 32, 32, 76,111, 97,100, 70,105,108,101, 40,102,105,108,101, 78, 97,109,101, 44, 32,102,105,108,101, 78, 97,109,101, 41, 10,
!  32, 32, 32, 32,101,110,100, 10,
!  10,
!  32, 32, 32, 32,105,102, 32,110,111,116,101, 98,111,111,107, 58, 71,101,116, 80, 97,103,101, 67,111,117,110,116, 40, 41, 32, 62, 32, 48, 32,116,104,101,110, 10,
!  32, 32, 32, 32, 32, 32, 32, 32,110,111,116,101, 98,111,111,107, 58, 83,101,116, 83,101,108,101, 99,116,105,111,110, 40, 48, 41, 10,
!  32, 32, 32, 32,101,108,115,101, 10,
!  32, 32, 32, 32, 32, 32, 32,108,111, 99, 97,108, 32,101,100,105,116,111,114, 32, 61, 32, 67,114,101, 97,116,101, 69,100,105,116,111,114, 40, 34, 85,110,116,105,116,108,101,100, 34, 41, 10,
!  32, 32, 32, 32, 32, 32, 32, 83,101,116,117,112, 75,101,121,119,111,114,100,115, 40,101,100,105,116,111,114, 44, 32,116,114,117,101, 41, 10,
!  32, 32, 32, 32,101,110,100, 10,
! 101,108,115,101, 10,
!  32, 32, 32, 32,108,111, 99, 97,108, 32,101,100,105,116,111,114, 32, 61, 32, 67,114,101, 97,116,101, 69,100,105,116,111,114, 40, 34, 85,110,116,105,116,108,101,100, 34, 41, 10,
!  32, 32, 32, 32, 83,101,116,117,112, 75,101,121,119,111,114,100,115, 40,101,100,105,116,111,114, 44, 32,116,114,117,101, 41, 10,
! 101,110,100, 10,
!  10,
!  45, 45,102,114, 97,109,101, 58, 83,101,116, 73, 99,111,110, 40,119,120, 76,117, 97, 69,100,105,116,111,114, 73, 99,111,110, 41, 32, 45, 45, 70, 73, 88, 77, 69, 32, 97,100,100, 32,116,104,105,115, 32, 98, 97, 99,107, 10,
   0 };
  

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

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

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

Modified Files:
	wxstc_datatypes.lua 
Log Message:
update bindings, better docs, add wxAboutBox for 2.8
fix /* */ in genwxbind.lua
Remove wxPlatformXXX just use __WXMSW__ or whatever


Index: wxstc_datatypes.lua
===================================================================
RCS file: /cvsroot/wxlua/wxLua/bindings/wxstc/wxstc_datatypes.lua,v
retrieving revision 1.35
retrieving revision 1.36
diff -C2 -d -r1.35 -r1.36
*** wxstc_datatypes.lua	1 Dec 2006 06:25:46 -0000	1.35
--- wxstc_datatypes.lua	7 Dec 2006 06:32:42 -0000	1.36
***************
*** 169,172 ****
--- 169,178 ----
      Name = "wxANIHandler",
    },
+   wxAboutDialogInfo = {
+     Condition = "wxCHECK_VERSION(2,8,0) && wxUSE_ABOUTDLG && wxLUA_USE_wxAboutDialog",
+     DefType = "class",
+     Intrinsic = false,
+     Name = "wxAboutDialogInfo",
+   },
    wxAcceleratorEntry = {
      Condition = "wxLUA_USE_wxAcceleratorTable",
***************
*** 307,311 ****
    },
    wxBorder = {
-     Condition = "wxCHECK_VERSION(2,3,0)",
      DefType = "enum",
      Intrinsic = true,
--- 313,316 ----
***************
*** 444,448 ****
    wxCheckListBox = {
      BaseClass = "wxListBox",
!     Condition = "(wxLUA_USE_wxCheckListBox) && (wxLUA_USE_wxListBox)",
      DefType = "class",
      Intrinsic = false,
--- 449,453 ----
    wxCheckListBox = {
      BaseClass = "wxListBox",
!     Condition = "(wxUSE_CHECKLISTBOX && wxLUA_USE_wxCheckListBox) && (wxUSE_LISTBOX && wxLUA_USE_wxListBox)",
      DefType = "class",
      Intrinsic = false,
***************
*** 516,520 ****
    wxColourData = {
      BaseClass = "wxObject",
!     Condition = "wxLUA_USE_wxColourDialog",
      DefType = "class",
      Intrinsic = false,
--- 521,525 ----
    wxColourData = {
      BaseClass = "wxObject",
!     Condition = "wxUSE_COLOURDLG && wxLUA_USE_wxColourDialog",
      DefType = "class",
      Intrinsic = false,
***************
*** 529,533 ****
    wxColourDialog = {
      BaseClass = "wxDialog",
!     Condition = "wxLUA_USE_wxColourDialog",
      DefType = "class",
      Intrinsic = false,
--- 534,538 ----
    wxColourDialog = {
      BaseClass = "wxDialog",
!     Condition = "wxUSE_COLOURDLG && wxLUA_USE_wxColourDialog",
      DefType = "class",
      Intrinsic = false,
***************
*** 536,540 ****
    wxComboBox = {
      BaseClass = "wxControlWithItems",
!     Condition = "wxLUA_USE_wxComboBox",
      DefType = "class",
      Intrinsic = false,
--- 541,545 ----
    wxComboBox = {
      BaseClass = "wxControlWithItems",
!     Condition = "wxUSE_COMBOBOX && wxLUA_USE_wxComboBox",
      DefType = "class",
      Intrinsic = false,
***************
*** 973,977 ****
    wxFindDialogEvent = {
      BaseClass = "wxCommandEvent",
!     Condition = "wxLUA_USE_wxFindReplaceDialog",
      DefType = "class",
      Intrinsic = false,
--- 978,982 ----
    wxFindDialogEvent = {
      BaseClass = "wxCommandEvent",
!     Condition = "wxUSE_FINDREPLDLG && wxLUA_USE_wxFindReplaceDialog",
      DefType = "class",
      Intrinsic = false,
***************
*** 979,983 ****
    },
    wxFindReplaceData = {
!     Condition = "wxLUA_USE_wxFindReplaceDialog",
      DefType = "class",
      Intrinsic = false,
--- 984,988 ----
    },
    wxFindReplaceData = {
!     Condition = "wxUSE_FINDREPLDLG && wxLUA_USE_wxFindReplaceDialog",
      DefType = "class",
      Intrinsic = false,
***************
*** 986,990 ****
    wxFindReplaceDialog = {
      BaseClass = "wxDialog",
!     Condition = "wxLUA_USE_wxFindReplaceDialog",
      DefType = "class",
      Intrinsic = false,
--- 991,995 ----
    wxFindReplaceDialog = {
      BaseClass = "wxDialog",
!     Condition = "wxUSE_FINDREPLDLG && wxLUA_USE_wxFindReplaceDialog",
      DefType = "class",
      Intrinsic = false,
***************
*** 992,996 ****
    },
    wxFindReplaceDialogStyles = {
!     Condition = "wxLUA_USE_wxFindReplaceDialog",
      DefType = "enum",
      Intrinsic = true,
--- 997,1001 ----
    },
    wxFindReplaceDialogStyles = {
!     Condition = "wxUSE_FINDREPLDLG && wxLUA_USE_wxFindReplaceDialog",
      DefType = "enum",
      Intrinsic = true,
***************
*** 998,1002 ****
    },
    wxFindReplaceFlags = {
!     Condition = "wxLUA_USE_wxFindReplaceDialog",
      DefType = "enum",
      Intrinsic = true,
--- 1003,1007 ----
    },
    wxFindReplaceFlags = {
!     Condition = "wxUSE_FINDREPLDLG && wxLUA_USE_wxFindReplaceDialog",
      DefType = "enum",
      Intrinsic = true,
***************
*** 1040,1044 ****
    },
    wxFontData = {
!     Condition = "wxLUA_USE_wxFontDialog",
      DefType = "class",
      Intrinsic = false,
--- 1045,1049 ----
    },
    wxFontData = {
!     Condition = "wxUSE_FONTDLG && wxLUA_USE_wxFontDialog",
      DefType = "class",
      Intrinsic = false,
***************
*** 1047,1051 ****
    wxFontDialog = {
      BaseClass = "wxDialog",
!     Condition = "wxLUA_USE_wxFontDialog",
      DefType = "class",
      Intrinsic = false,
--- 1052,1056 ----
    wxFontDialog = {
      BaseClass = "wxDialog",
!     Condition = "wxUSE_FONTDLG && wxLUA_USE_wxFontDialog",
      DefType = "class",
      Intrinsic = false,
***************
*** 1162,1166 ****
    wxGauge = {
      BaseClass = "wxControl",
!     Condition = "wxLUA_USE_wxGauge",
      DefType = "class",
      Intrinsic = false,
--- 1167,1171 ----
    wxGauge = {
      BaseClass = "wxControl",
!     Condition = "wxUSE_GAUGE && wxLUA_USE_wxGauge",
      DefType = "class",
      Intrinsic = false,
***************
*** 1348,1352 ****
    wxGridEditorCreatedEvent = {
      BaseClass = "wxCommandEvent",
!     Condition = "(wxCHECK_VERSION(2,3,0)) && (wxLUA_USE_wxGrid)",
      DefType = "class",
      Intrinsic = false,
--- 1353,1357 ----
    wxGridEditorCreatedEvent = {
      BaseClass = "wxCommandEvent",
!     Condition = "wxLUA_USE_wxGrid",
      DefType = "class",
      Intrinsic = false,
***************
*** 1423,1427 ****
    wxHelpEvent = {
      BaseClass = "wxCommandEvent",
-     Condition = "wxCHECK_VERSION(2,3,0)",
      DefType = "class",
      Intrinsic = false,
--- 1428,1431 ----
***************
*** 1737,1741 ****
    wxListBox = {
      BaseClass = "wxControlWithItems",
!     Condition = "wxLUA_USE_wxListBox",
      DefType = "class",
      Intrinsic = false,
--- 1741,1745 ----
    wxListBox = {
      BaseClass = "wxControlWithItems",
!     Condition = "wxUSE_LISTBOX && wxLUA_USE_wxListBox",
      DefType = "class",
      Intrinsic = false,
***************
*** 1743,1747 ****
    },
    wxListColumnFormat = {
!     Condition = "wxLUA_USE_wxListCtrl",
      DefType = "enum",
      Intrinsic = true,
--- 1747,1751 ----
    },
    wxListColumnFormat = {
!     Condition = "wxUSE_LISTCTRL && wxLUA_USE_wxListCtrl",
      DefType = "enum",
      Intrinsic = true,
***************
*** 1750,1754 ****
    wxListCtrl = {
      BaseClass = "wxControl",
!     Condition = "wxLUA_USE_wxListCtrl",
      DefType = "class",
      Intrinsic = false,
--- 1754,1758 ----
    wxListCtrl = {
      BaseClass = "wxControl",
!     Condition = "wxUSE_LISTCTRL && wxLUA_USE_wxListCtrl",
      DefType = "class",
      Intrinsic = false,
***************
*** 1757,1761 ****
    wxListEvent = {
      BaseClass = "wxNotifyEvent",
!     Condition = "wxLUA_USE_wxListCtrl",
      DefType = "class",
      Intrinsic = false,
--- 1761,1765 ----
    wxListEvent = {
      BaseClass = "wxNotifyEvent",
!     Condition = "wxUSE_LISTCTRL && wxLUA_USE_wxListCtrl",
      DefType = "class",
      Intrinsic = false,
***************
*** 1764,1768 ****
    wxListItem = {
      BaseClass = "wxObject",
!     Condition = "wxLUA_USE_wxListCtrl",
      DefType = "class",
      Intrinsic = false,
--- 1768,1772 ----
    wxListItem = {
      BaseClass = "wxObject",
!     Condition = "wxUSE_LISTCTRL && wxLUA_USE_wxListCtrl",
      DefType = "class",
      Intrinsic = false,
***************
*** 1770,1774 ****
    },
    wxListItemAttr = {
!     Condition = "wxLUA_USE_wxListCtrl",
      DefType = "class",
      Intrinsic = false,
--- 1774,1778 ----
    },
    wxListItemAttr = {
!     Condition = "wxUSE_LISTCTRL && wxLUA_USE_wxListCtrl",
      DefType = "class",
      Intrinsic = false,
***************
*** 1777,1781 ****
    wxListView = {
      BaseClass = "wxListCtrl",
!     Condition = "wxLUA_USE_wxListCtrl",
      DefType = "class",
      Intrinsic = false,
--- 1781,1785 ----
    wxListView = {
      BaseClass = "wxListCtrl",
!     Condition = "wxUSE_LISTCTRL && wxLUA_USE_wxListCtrl",
      DefType = "class",
      Intrinsic = false,
***************
*** 1796,1805 ****
      Name = "wxListbookEvent",
    },
-   wxLog = {
-     Condition = "(wxCHECK_VERSION(2,2,0) && !wxCHECK_VERSION(2,5,0) || (defined(WXWIN_COMPATIBILITY_2_4) && WXWIN_COMPATIBILITY_2_4)) && (wxUSE_LOG) && (wxLUA_USE_wxApp)",
-     DefType = "class",
-     Intrinsic = false,
-     Name = "wxLog",
-   },
    wxLuaHtmlWinTagEvent = {
      BaseClass = "wxEvent",
--- 1800,1803 ----
***************
*** 2015,2019 ****
    wxMultiChoiceDialog = {
      BaseClass = "wxDialog",
!     Condition = "wxLUA_USE_wxMultiChoiceDialog",
      DefType = "class",
      Intrinsic = false,
--- 2013,2017 ----
    wxMultiChoiceDialog = {
      BaseClass = "wxDialog",
!     Condition = "wxUSE_CHOICEDLG && wxLUA_USE_wxMultiChoiceDialog",
      DefType = "class",
      Intrinsic = false,
***************
*** 2152,2156 ****
    wxPasswordEntryDialog = {
      BaseClass = "wxTextEntryDialog",
!     Condition = "wxLUA_USE_wxTextEntryDialog",
      DefType = "class",
      Intrinsic = false,
--- 2150,2154 ----
    wxPasswordEntryDialog = {
      BaseClass = "wxTextEntryDialog",
!     Condition = "wxUSE_TEXTDLG && wxLUA_USE_wxTextEntryDialog",
      DefType = "class",
      Intrinsic = false,
***************
*** 2317,2321 ****
    wxProgressDialog = {
      BaseClass = "wxDialog",
!     Condition = "wxLUA_USE_wxProgressDialog",
      DefType = "class",
      Intrinsic = false,
--- 2315,2319 ----
    wxProgressDialog = {
      BaseClass = "wxDialog",
!     Condition = "wxUSE_PROGRESSDLG && wxLUA_USE_wxProgressDialog",
      DefType = "class",
      Intrinsic = false,
***************
*** 2344,2348 ****
    wxRadioBox = {
      BaseClass = "wxControl",
!     Condition = "wxLUA_USE_wxRadioBox",
      DefType = "class",
      Intrinsic = false,
--- 2342,2346 ----
    wxRadioBox = {
      BaseClass = "wxControl",
!     Condition = "wxUSE_RADIOBOX && wxLUA_USE_wxRadioBox",
      DefType = "class",
      Intrinsic = false,
***************
*** 2351,2355 ****
    wxRadioButton = {
      BaseClass = "wxControl",
!     Condition = "wxLUA_USE_wxRadioButton",
      DefType = "class",
      Intrinsic = false,
--- 2349,2353 ----
    wxRadioButton = {
      BaseClass = "wxControl",
!     Condition = "wxUSE_RADIOBTN && wxLUA_USE_wxRadioButton",
      DefType = "class",
      Intrinsic = false,
***************
*** 2492,2496 ****
    wxSingleChoiceDialog = {
      BaseClass = "wxDialog",
!     Condition = "wxLUA_USE_wxSingleChoiceDialog",
      DefType = "class",
      Intrinsic = false,
--- 2490,2494 ----
    wxSingleChoiceDialog = {
      BaseClass = "wxDialog",
!     Condition = "wxUSE_CHOICEDLG && wxLUA_USE_wxSingleChoiceDialog",
      DefType = "class",
      Intrinsic = false,
***************
*** 2750,2754 ****
    },
    wxSystemFeature = {
!     Condition = "(wxCHECK_VERSION(2,3,0)) && (wxLUA_USE_wxSystemSettings)",
      DefType = "enum",
      Intrinsic = true,
--- 2748,2752 ----
    },
    wxSystemFeature = {
!     Condition = "wxLUA_USE_wxSystemSettings",
      DefType = "enum",
      Intrinsic = true,
***************
*** 2775,2779 ****
    },
    wxSystemScreenType = {
!     Condition = "(wxCHECK_VERSION(2,3,0)) && (wxLUA_USE_wxSystemSettings)",
      DefType = "enum",
      Intrinsic = true,
--- 2773,2777 ----
    },
    wxSystemScreenType = {
!     Condition = "wxLUA_USE_wxSystemSettings",
      DefType = "enum",
      Intrinsic = true,
***************
*** 2860,2864 ****
    wxTextEntryDialog = {
      BaseClass = "wxDialog",
!     Condition = "wxLUA_USE_wxTextEntryDialog",
      DefType = "class",
      Intrinsic = false,
--- 2858,2862 ----
    wxTextEntryDialog = {
      BaseClass = "wxDialog",
!     Condition = "wxUSE_TEXTDLG && wxLUA_USE_wxTextEntryDialog",
      DefType = "class",
      Intrinsic = false,
***************
*** 2915,2919 ****
    wxToolBarSimple = {
      BaseClass = "wxToolBarBase",
!     Condition = "(wxCHECK_VERSION(2,2,0) && !wxCHECK_VERSION(2,5,0)) && (wxLUA_USE_wxToolbar)",
      DefType = "class",
      Intrinsic = false,
--- 2913,2917 ----
    wxToolBarSimple = {
      BaseClass = "wxToolBarBase",
!     Condition = "(!wxCHECK_VERSION(2,5,0)) && (wxLUA_USE_wxToolbar)",
      DefType = "class",
      Intrinsic = false,
***************
*** 3159,3163 ****
    wxWizard = {
      BaseClass = "wxDialog",
!     Condition = "wxLUA_USE_wxWizard",
      DefType = "class",
      Intrinsic = false,
--- 3157,3161 ----
    wxWizard = {
      BaseClass = "wxDialog",
!     Condition = "wxUSE_WIZARDDLG && wxLUA_USE_wxWizard",
      DefType = "class",
      Intrinsic = false,
***************
*** 3166,3170 ****
    wxWizardEvent = {
      BaseClass = "wxNotifyEvent",
!     Condition = "wxLUA_USE_wxWizard",
      DefType = "class",
      Intrinsic = false,
--- 3164,3168 ----
    wxWizardEvent = {
      BaseClass = "wxNotifyEvent",
!     Condition = "wxUSE_WIZARDDLG && wxLUA_USE_wxWizard",
      DefType = "class",
      Intrinsic = false,
***************
*** 3173,3177 ****
    wxWizardPage = {
      BaseClass = "wxPanel",
!     Condition = "wxLUA_USE_wxWizard",
      DefType = "class",
      Intrinsic = false,
--- 3171,3175 ----
    wxWizardPage = {
      BaseClass = "wxPanel",
!     Condition = "wxUSE_WIZARDDLG && wxLUA_USE_wxWizard",
      DefType = "class",
      Intrinsic = false,
***************
*** 3180,3184 ****
    wxWizardPageSimple = {
      BaseClass = "wxWizardPage",
!     Condition = "wxLUA_USE_wxWizard",
      DefType = "class",
      Intrinsic = false,
--- 3178,3182 ----
    wxWizardPageSimple = {
      BaseClass = "wxWizardPage",
!     Condition = "wxUSE_WIZARDDLG && wxLUA_USE_wxWizard",
      DefType = "class",
      Intrinsic = false,
***************
*** 3302,3307 ****
    ["%wxchkver272"] = "wxCHECK_VERSION(2,7,2)",
    ["%wxchkver28"] = "wxCHECK_VERSION(2,8,0)",
!   ["%wxchkver_2_2"] = "wxCHECK_VERSION(2,2,0)",
!   ["%wxchkver_2_5"] = "wxCHECK_VERSION(2,5,0)",
    ["%wxcompat20"] = "(defined(WXWIN_COMPATIBILITY_2) && WXWIN_COMPATIBILITY_2)",
    ["%wxcompat22"] = "(defined(WXWIN_COMPATIBILITY_2_2) && WXWIN_COMPATIBILITY_2_2)",
--- 3300,3304 ----
    ["%wxchkver272"] = "wxCHECK_VERSION(2,7,2)",
    ["%wxchkver28"] = "wxCHECK_VERSION(2,8,0)",
!   ["%wxchkver_2_8"] = "wxCHECK_VERSION(2,8,0)",
    ["%wxcompat20"] = "(defined(WXWIN_COMPATIBILITY_2) && WXWIN_COMPATIBILITY_2)",
    ["%wxcompat22"] = "(defined(WXWIN_COMPATIBILITY_2_2) && WXWIN_COMPATIBILITY_2_2)",
***************
*** 3318,3321 ****
--- 3315,3319 ----
    wxLUA_USE_Geometry = "wxLUA_USE_Geometry",
    wxLUA_USE_MDI = "wxLUA_USE_MDI",
+   wxLUA_USE_wxAboutDialog = "wxLUA_USE_wxAboutDialog",
    wxLUA_USE_wxAcceleratorTable = "wxLUA_USE_wxAcceleratorTable",
    wxLUA_USE_wxApp = "wxLUA_USE_wxApp",
***************
*** 3440,3443 ****
--- 3438,3442 ----
    wxLUA_USE_wxWizard = "wxLUA_USE_wxWizard",
    wxLUA_USE_wxXMLResource = "wxLUA_USE_wxXMLResource",
+   wxUSE_ABOUTDLG = "wxUSE_ABOUTDLG",
    wxUSE_ACCEL = "wxUSE_ACCEL",
    wxUSE_ACCESSIBILITY = "wxUSE_ACCESSIBILITY",

[Wxlua-commit] wxLua/bindings genwxbind.lua,1.85,1.86

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

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

Modified Files:
	genwxbind.lua 
Log Message:
update bindings, better docs, add wxAboutBox for 2.8
fix /* */ in genwxbind.lua
Remove wxPlatformXXX just use __WXMSW__ or whatever


Index: genwxbind.lua
===================================================================
RCS file: /cvsroot/wxlua/wxLua/bindings/genwxbind.lua,v
retrieving revision 1.85
retrieving revision 1.86
diff -C2 -d -r1.85 -r1.86
*** genwxbind.lua	4 Dec 2006 05:54:40 -0000	1.85
--- genwxbind.lua	7 Dec 2006 06:32:41 -0000	1.86
***************
*** 746,749 ****
--- 746,750 ----
  
      -- wxUSE_ conditions
+     conditions["wxUSE_ABOUTDLG"]                = "wxUSE_ABOUTDLG"
      conditions["wxUSE_ACCEL"]                   = "wxUSE_ACCEL"
      conditions["wxUSE_ACCESSIBILITY"]           = "wxUSE_ACCESSIBILITY"
***************
*** 929,932 ****
--- 930,934 ----
      conditions["wxLUA_USE_Geometry"]                = "wxLUA_USE_Geometry"
      conditions["wxLUA_USE_MDI"]                     = "wxLUA_USE_MDI"
+     conditions["wxLUA_USE_wxAboutDialog"]           = "wxLUA_USE_wxAboutDialog"
      conditions["wxLUA_USE_wxAcceleratorTable"]      = "wxLUA_USE_wxAcceleratorTable"
      conditions["wxLUA_USE_wxApp"]                   = "wxLUA_USE_wxApp"
***************
*** 1684,1691 ****
  
              if keywords[tag] then
-                 if not lineState.ActionAttributes[tag] and lineState.ActionMandatory then
-                     print("Error: Expected Line Action '"..lineState.Action.."', got '"..tag.."'. "..LineTableErrString(lineTable))
-                 end
- 
                  -- block comment (start)
                  if tag == "/*" then
--- 1686,1689 ----
***************
*** 1695,1702 ****
                  elseif tag == "*/" then
                      parseState.IsBlockComment = false
-                 end
  
                  -- ignore until end of block comment
!                 if not parseState.IsBlockComment then
                      -- end inline conditionals
                      if lineState.InLineConditionIf  and not lineState.InLineConditionEndIf then
--- 1693,1704 ----
                  elseif tag == "*/" then
                      parseState.IsBlockComment = false
  
                  -- ignore until end of block comment
!                 elseif not parseState.IsBlockComment then
! 
!                     if not lineState.ActionAttributes[tag] and lineState.ActionMandatory then
!                         print("Error: Expected Line Action '"..lineState.Action.."', got '"..tag.."'. "..LineTableErrString(lineTable))
!                     end
! 
                      -- end inline conditionals
                      if lineState.InLineConditionIf  and not lineState.InLineConditionEndIf then

[Wxlua-commit] wxLua/modules/wxbind/src appframe.cpp, 1.24, 1.25 controls.cpp, 1.32, 1.33 dialogs.cpp, 1.19, 1.20 event.cpp, 1.26, 1.27 file.cpp, 1.21, 1.22 gdi.cpp, 1.35, 1.36 grid.cpp, 1.17, 1.18 help.cpp, 1.14, 1.15 html.cpp, 1.19, 1.20 image.cpp, 1.17, 1.18 mdi.cpp, 1.16, 1.17 menutool.cpp, 1.18, 1.19 print.cpp, 1.16, 1.17 windows.cpp, 1.28, 1.29 wx_bind.cpp, 1.64, 1.65

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

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

Modified Files:
	appframe.cpp controls.cpp dialogs.cpp event.cpp file.cpp 
	gdi.cpp grid.cpp help.cpp html.cpp image.cpp mdi.cpp 
	menutool.cpp print.cpp windows.cpp wx_bind.cpp 
Log Message:
update bindings, better docs, add wxAboutBox for 2.8
fix /* */ in genwxbind.lua
Remove wxPlatformXXX just use __WXMSW__ or whatever


Index: print.cpp
===================================================================
RCS file: /cvsroot/wxlua/wxLua/modules/wxbind/src/print.cpp,v
retrieving revision 1.16
retrieving revision 1.17
diff -C2 -d -r1.16 -r1.17
*** print.cpp	9 Jun 2006 22:51:32 -0000	1.16
--- print.cpp	7 Dec 2006 06:32:44 -0000	1.17
***************
*** 323,348 ****
  
  
- #if ((wxCHECK_VERSION(2,3,0)) && ((wxLUA_USE_wxLuaPrintout) && (wxLUA_USE_wxPrint))) && (wxLUA_USE_wxLuaPrintout)
- //     %wxchkver23 void ReportError(wxWindow *parent, wxLuaPrintout *printout, const wxString& message)
- static int LUACALL wxLua_wxPrinter_ReportError(lua_State *L)
- {
-     wxLuaState wxlState(L);
-     // const wxString message
-     const wxString message = lua2wx(wxlState.GetStringType(4));
-     // wxLuaPrintout printout
-     wxLuaPrintout * printout = (wxLuaPrintout *)wxlState.GetUserDataType(3, s_wxluatag_wxLuaPrintout);
-     // wxWindow parent
-     wxWindow * parent = (wxWindow *)wxlState.GetUserDataType(2, s_wxluatag_wxWindow);
-     // get this
-     wxPrinter * self = (wxPrinter *)wxlState.GetUserDataType(1, s_wxluatag_wxPrinter);
-     // call ReportError
-     self->ReportError(parent, printout, message);
- 
-     return 0;
- }
- 
- #endif // ((wxCHECK_VERSION(2,3,0)) && ((wxLUA_USE_wxLuaPrintout) && (wxLUA_USE_wxPrint))) && (wxLUA_USE_wxLuaPrintout)
- 
- 
  #if (wxLUA_USE_wxDC) && ((wxLUA_USE_wxLuaPrintout) && (wxLUA_USE_wxPrint))
  //     wxDC* PrintDialog(wxWindow *parent)
--- 323,326 ----
***************
*** 406,409 ****
--- 384,405 ----
  }
  
+ //     void ReportError(wxWindow *parent, wxLuaPrintout *printout, const wxString& message)
+ static int LUACALL wxLua_wxPrinter_ReportError(lua_State *L)
+ {
+     wxLuaState wxlState(L);
+     // const wxString message
+     const wxString message = lua2wx(wxlState.GetStringType(4));
+     // wxLuaPrintout printout
+     wxLuaPrintout * printout = (wxLuaPrintout *)wxlState.GetUserDataType(3, s_wxluatag_wxLuaPrintout);
+     // wxWindow parent
+     wxWindow * parent = (wxWindow *)wxlState.GetUserDataType(2, s_wxluatag_wxWindow);
+     // get this
+     wxPrinter * self = (wxPrinter *)wxlState.GetUserDataType(1, s_wxluatag_wxPrinter);
+     // call ReportError
+     self->ReportError(parent, printout, message);
+ 
+     return 0;
+ }
+ 
  #endif // (wxLUA_USE_wxLuaPrintout) && ((wxLUA_USE_wxLuaPrintout) && (wxLUA_USE_wxPrint))
  
***************
*** 523,531 ****
  static WXLUAMETHOD s_wxPrinter_methods[] = {
  
- #if ((wxCHECK_VERSION(2,3,0)) && ((wxLUA_USE_wxLuaPrintout) && (wxLUA_USE_wxPrint))) && (wxLUA_USE_wxLuaPrintout)
-     { LuaMethod, "ReportError", wxLua_wxPrinter_ReportError, 3, 3, { &s_wxluatag_wxWindow, &s_wxluatag_wxLuaPrintout, &s_wxluaarg_String, 0 } },
- #endif  // ((wxCHECK_VERSION(2,3,0)) && ((wxLUA_USE_wxLuaPrintout) && (wxLUA_USE_wxPrint))) && (wxLUA_USE_wxLuaPrintout)
- 
- 
  #if (wxLUA_USE_wxDC) && ((wxLUA_USE_wxLuaPrintout) && (wxLUA_USE_wxPrint))
      { LuaMethod, "PrintDialog", wxLua_wxPrinter_PrintDialog, 1, 1, { &s_wxluatag_wxWindow, 0 } },
--- 519,522 ----
***************
*** 536,539 ****
--- 527,531 ----
      { LuaMethod, "CreateAbortWindow", wxLua_wxPrinter_CreateAbortWindow, 2, 2, { &s_wxluatag_wxWindow, &s_wxluatag_wxLuaPrintout, 0 } },
      { LuaMethod, "Print", wxLua_wxPrinter_Print, 3, 2, { &s_wxluatag_wxWindow, &s_wxluatag_wxLuaPrintout, &s_wxluaarg_Boolean, 0 } },
+     { LuaMethod, "ReportError", wxLua_wxPrinter_ReportError, 3, 3, { &s_wxluatag_wxWindow, &s_wxluatag_wxLuaPrintout, &s_wxluaarg_String, 0 } },
  #endif  // (wxLUA_USE_wxLuaPrintout) && ((wxLUA_USE_wxLuaPrintout) && (wxLUA_USE_wxPrint))
  

Index: controls.cpp
===================================================================
RCS file: /cvsroot/wxlua/wxLua/modules/wxbind/src/controls.cpp,v
retrieving revision 1.32
retrieving revision 1.33
diff -C2 -d -r1.32 -r1.33
*** controls.cpp	11 Oct 2006 03:24:02 -0000	1.32
--- controls.cpp	7 Dec 2006 06:32:43 -0000	1.33
***************
*** 1391,1395 ****
  
  
! #if wxLUA_USE_wxComboBox
  // -------------------------------------------------------------------------------------------------
  // Bind class wxComboBox
--- 1391,1395 ----
  
  
! #if wxUSE_COMBOBOX && wxLUA_USE_wxComboBox
  // -------------------------------------------------------------------------------------------------
[...1234 lines suppressed...]
  
! #if ((wxUSE_RADIOBTN && wxLUA_USE_wxRadioButton) && (wxLUA_USE_wxValidator)) && (wxLUA_USE_wxPointSizeRect)
      { LuaConstructor, "wxRadioButton", wxLua_wxRadioButton_constructor, 8, 3, { &s_wxluatag_wxWindow, &s_wxluaarg_Number, &s_wxluaarg_String, &s_wxluatag_wxPoint, &s_wxluatag_wxSize, &s_wxluaarg_Number, &s_wxluatag_wxValidator, &s_wxluaarg_String, 0 } },
      { LuaMethod, "Create", wxLua_wxRadioButton_Create, 8, 3, { &s_wxluatag_wxWindow, &s_wxluaarg_Number, &s_wxluaarg_String, &s_wxluatag_wxPoint, &s_wxluatag_wxSize, &s_wxluaarg_Number, &s_wxluatag_wxValidator, &s_wxluaarg_String, 0 } },
! #endif  // ((wxUSE_RADIOBTN && wxLUA_USE_wxRadioButton) && (wxLUA_USE_wxValidator)) && (wxLUA_USE_wxPointSizeRect)
  
      { LuaConstructor, "wxRadioButtonDefault", wxLua_wxRadioButtonDefault_constructor, 0, 0, { 0 } },
***************
*** 5729,5733 ****
  WXLUAMETHOD* wxRadioButton_methods = s_wxRadioButton_methods;
  int wxRadioButton_methodCount = sizeof(s_wxRadioButton_methods)/sizeof(s_wxRadioButton_methods[0]);
! #endif  // wxLUA_USE_wxRadioButton
  
  
--- 5721,5725 ----
  WXLUAMETHOD* wxRadioButton_methods = s_wxRadioButton_methods;
  int wxRadioButton_methodCount = sizeof(s_wxRadioButton_methods)/sizeof(s_wxRadioButton_methods[0]);
! #endif  // wxUSE_RADIOBTN && wxLUA_USE_wxRadioButton
  
  

Index: grid.cpp
===================================================================
RCS file: /cvsroot/wxlua/wxLua/modules/wxbind/src/grid.cpp,v
retrieving revision 1.17
retrieving revision 1.18
diff -C2 -d -r1.17 -r1.18
*** grid.cpp	9 Jun 2006 22:51:32 -0000	1.17
--- grid.cpp	7 Dec 2006 06:32:43 -0000	1.18
***************
*** 7112,7116 ****
  
  
! #if (wxCHECK_VERSION(2,3,0)) && (wxLUA_USE_wxGrid)
  // -------------------------------------------------------------------------------------------------
  // Bind class wxGridEditorCreatedEvent
--- 7112,7116 ----
  
  
! #if wxLUA_USE_wxGrid
  // -------------------------------------------------------------------------------------------------
  // Bind class wxGridEditorCreatedEvent
***************
*** 7121,7125 ****
  
  
! #if ((wxCHECK_VERSION(2,3,0)) && (wxLUA_USE_wxGrid)) && (wxLUA_USE_wxObject)
  //     wxGridEditorCreatedEvent(int id, wxEventType type, wxObject* obj, int row, int col, wxControl* ctrl)
  static int LUACALL wxLua_wxGridEditorCreatedEvent_constructor(lua_State *L)
--- 7121,7125 ----
  
  
! #if (wxLUA_USE_wxGrid) && (wxLUA_USE_wxObject)
  //     wxGridEditorCreatedEvent(int id, wxEventType type, wxObject* obj, int row, int col, wxControl* ctrl)
  static int LUACALL wxLua_wxGridEditorCreatedEvent_constructor(lua_State *L)
***************
*** 7149,7153 ****
  }
  
! #endif // ((wxCHECK_VERSION(2,3,0)) && (wxLUA_USE_wxGrid)) && (wxLUA_USE_wxObject)
  
  //     int GetRow()
--- 7149,7153 ----
  }
  
! #endif // (wxLUA_USE_wxGrid) && (wxLUA_USE_wxObject)
  
  //     int GetRow()
***************
*** 7270,7276 ****
  static WXLUAMETHOD s_wxGridEditorCreatedEvent_methods[] = {
  
! #if ((wxCHECK_VERSION(2,3,0)) && (wxLUA_USE_wxGrid)) && (wxLUA_USE_wxObject)
      { LuaConstructor, "wxGridEditorCreatedEvent", wxLua_wxGridEditorCreatedEvent_constructor, 6, 6, { &s_wxluaarg_Number, &s_wxluaarg_Number, &s_wxluatag_wxObject, &s_wxluaarg_Number, &s_wxluaarg_Number, &s_wxluatag_wxControl, 0 } },
! #endif  // ((wxCHECK_VERSION(2,3,0)) && (wxLUA_USE_wxGrid)) && (wxLUA_USE_wxObject)
  
      { LuaMethod, "GetRow", wxLua_wxGridEditorCreatedEvent_GetRow, 0, 0, { 0 } },
--- 7270,7276 ----
  static WXLUAMETHOD s_wxGridEditorCreatedEvent_methods[] = {
  
! #if (wxLUA_USE_wxGrid) && (wxLUA_USE_wxObject)
      { LuaConstructor, "wxGridEditorCreatedEvent", wxLua_wxGridEditorCreatedEvent_constructor, 6, 6, { &s_wxluaarg_Number, &s_wxluaarg_Number, &s_wxluatag_wxObject, &s_wxluaarg_Number, &s_wxluaarg_Number, &s_wxluatag_wxControl, 0 } },
! #endif  // (wxLUA_USE_wxGrid) && (wxLUA_USE_wxObject)
  
      { LuaMethod, "GetRow", wxLua_wxGridEditorCreatedEvent_GetRow, 0, 0, { 0 } },
***************
*** 7293,7296 ****
  WXLUAMETHOD* wxGridEditorCreatedEvent_methods = s_wxGridEditorCreatedEvent_methods;
  int wxGridEditorCreatedEvent_methodCount = sizeof(s_wxGridEditorCreatedEvent_methods)/sizeof(s_wxGridEditorCreatedEvent_methods[0]);
! #endif  // (wxCHECK_VERSION(2,3,0)) && (wxLUA_USE_wxGrid)
  
--- 7293,7296 ----
  WXLUAMETHOD* wxGridEditorCreatedEvent_methods = s_wxGridEditorCreatedEvent_methods;
  int wxGridEditorCreatedEvent_methodCount = sizeof(s_wxGridEditorCreatedEvent_methods)/sizeof(s_wxGridEditorCreatedEvent_methods[0]);
! #endif  // wxLUA_USE_wxGrid
  

Index: file.cpp
===================================================================
RCS file: /cvsroot/wxlua/wxLua/modules/wxbind/src/file.cpp,v
retrieving revision 1.21
retrieving revision 1.22
diff -C2 -d -r1.21 -r1.22
*** file.cpp	9 Jun 2006 22:51:32 -0000	1.21
--- file.cpp	7 Dec 2006 06:32:43 -0000	1.22
***************
*** 1985,1989 ****
  
  
! #if ((wxCHECK_VERSION(2,3,0)) && (wxLUA_USE_wxDir)) && (wxLUA_USE_wxArrayString)
  // %override wxLua_wxDir_GetAllFiles
  // static unsigned int GetAllFiles(const wxString& dirname, wxArrayString *files, const wxString& filespec = "", int flags = wxDIR_DEFAULT)
--- 1985,1989 ----
  
  
! #if (wxLUA_USE_wxArrayString) && (wxLUA_USE_wxDir)
  // %override wxLua_wxDir_GetAllFiles
  // static unsigned int GetAllFiles(const wxString& dirname, wxArrayString *files, const wxString& filespec = "", int flags = wxDIR_DEFAULT)
***************
*** 2011,2015 ****
  }
  
! #endif // ((wxCHECK_VERSION(2,3,0)) && (wxLUA_USE_wxDir)) && (wxLUA_USE_wxArrayString)
  
  //     wxDir()
--- 2011,2015 ----
  }
  
! #endif // (wxLUA_USE_wxArrayString) && (wxLUA_USE_wxDir)
  
  //     wxDir()
***************
*** 2206,2212 ****
  static WXLUAMETHOD s_wxDir_methods[] = {
  
! #if ((wxCHECK_VERSION(2,3,0)) && (wxLUA_USE_wxDir)) && (wxLUA_USE_wxArrayString)
      { LuaMethod, "GetAllFiles", wxLua_wxDir_GetAllFiles, 4, 2, { &s_wxluaarg_String, &s_wxluatag_wxArrayString, &s_wxluaarg_String, &s_wxluaarg_Number, 0 } },
! #endif  // ((wxCHECK_VERSION(2,3,0)) && (wxLUA_USE_wxDir)) && (wxLUA_USE_wxArrayString)
  
      { LuaConstructor, "wxDir", wxLua_wxDir_constructor, 0, 0, { 0 } },
--- 2206,2212 ----
  static WXLUAMETHOD s_wxDir_methods[] = {
  
! #if (wxLUA_USE_wxArrayString) && (wxLUA_USE_wxDir)
      { LuaMethod, "GetAllFiles", wxLua_wxDir_GetAllFiles, 4, 2, { &s_wxluaarg_String, &s_wxluatag_wxArrayString, &s_wxluaarg_String, &s_wxluaarg_Number, 0 } },
! #endif  // (wxLUA_USE_wxArrayString) && (wxLUA_USE_wxDir)
  
      { LuaConstructor, "wxDir", wxLua_wxDir_constructor, 0, 0, { 0 } },

Index: help.cpp
===================================================================
RCS file: /cvsroot/wxlua/wxLua/modules/wxbind/src/help.cpp,v
retrieving revision 1.14
retrieving revision 1.15
diff -C2 -d -r1.14 -r1.15
*** help.cpp	9 Jun 2006 22:51:32 -0000	1.14
--- help.cpp	7 Dec 2006 06:32:43 -0000	1.15
***************
*** 36,62 ****
  
  
- #if ((wxCHECK_VERSION(2,3,0)) && ((wxLUA_USE_wxHelpController) && (wxUSE_HELP))) && (wxLUA_USE_wxPointSizeRect)
- //     %wxchkver23 virtual bool DisplayTextPopup(const wxString& text, const wxPoint& pos)
- static int LUACALL wxLua_wxHelpController_DisplayTextPopup(lua_State *L)
- {
-     wxLuaState wxlState(L);
-     bool returns;
-     // const wxPoint pos
-     const wxPoint * pos = (const wxPoint *)wxlState.GetUserDataType(3, s_wxluatag_wxPoint);
-     // const wxString text
-     const wxString text = lua2wx(wxlState.GetStringType(2));
-     // get this
-     wxHelpController * self = (wxHelpController *)wxlState.GetUserDataType(1, s_wxluatag_wxHelpController);
-     // call DisplayTextPopup
-     returns = self->DisplayTextPopup(text, *pos);
-     // push the result flag
-     lua_pushboolean(L, returns);
- 
-     return 1;
- }
- 
- #endif // ((wxCHECK_VERSION(2,3,0)) && ((wxLUA_USE_wxHelpController) && (wxUSE_HELP))) && (wxLUA_USE_wxPointSizeRect)
- 
- 
  #if ((wxLUA_USE_wxFrame) && ((wxLUA_USE_wxHelpController) && (wxUSE_HELP))) && (wxLUA_USE_wxPointSizeRect)
  // %override wxLua_wxHelpController_GetFrameParameters
--- 36,39 ----
***************
*** 88,91 ****
--- 65,87 ----
  
  #if ((wxLUA_USE_wxHelpController) && (wxUSE_HELP)) && (wxLUA_USE_wxPointSizeRect)
+ //     virtual bool DisplayTextPopup(const wxString& text, const wxPoint& pos)
+ static int LUACALL wxLua_wxHelpController_DisplayTextPopup(lua_State *L)
+ {
+     wxLuaState wxlState(L);
+     bool returns;
+     // const wxPoint pos
+     const wxPoint * pos = (const wxPoint *)wxlState.GetUserDataType(3, s_wxluatag_wxPoint);
+     // const wxString text
+     const wxString text = lua2wx(wxlState.GetStringType(2));
+     // get this
+     wxHelpController * self = (wxHelpController *)wxlState.GetUserDataType(1, s_wxluatag_wxHelpController);
+     // call DisplayTextPopup
+     returns = self->DisplayTextPopup(text, *pos);
+     // push the result flag
+     lua_pushboolean(L, returns);
+ 
+     return 1;
+ }
+ 
  //     virtual void SetFrameParameters(const wxString& title, const wxSize& size, const wxPoint& pos = wxDefaultPosition, bool newFrameEachTime = false)
  static int LUACALL wxLua_wxHelpController_SetFrameParameters(lua_State *L)
***************
*** 112,136 ****
  #endif // ((wxLUA_USE_wxHelpController) && (wxUSE_HELP)) && (wxLUA_USE_wxPointSizeRect)
  
- 
- #if (wxCHECK_VERSION(2,3,0)) && ((wxLUA_USE_wxHelpController) && (wxUSE_HELP))
- //     %wxchkver23 virtual bool DisplayContextPopup(int contextId)
- static int LUACALL wxLua_wxHelpController_DisplayContextPopup(lua_State *L)
- {
-     wxLuaState wxlState(L);
-     bool returns;
-     // int contextId
-     int contextId = (int)wxlState.GetNumberType(2);
-     // get this
-     wxHelpController * self = (wxHelpController *)wxlState.GetUserDataType(1, s_wxluatag_wxHelpController);
-     // call DisplayContextPopup
-     returns = self->DisplayContextPopup(contextId);
-     // push the result flag
-     lua_pushboolean(L, returns);
- 
-     return 1;
- }
- 
- #endif // (wxCHECK_VERSION(2,3,0)) && ((wxLUA_USE_wxHelpController) && (wxUSE_HELP))
- 
  //     wxHelpController()
  static int LUACALL wxLua_wxHelpController_constructor(lua_State *L)
--- 108,111 ----
***************
*** 194,197 ****
--- 169,189 ----
  }
  
+ //     virtual bool DisplayContextPopup(int contextId)
+ static int LUACALL wxLua_wxHelpController_DisplayContextPopup(lua_State *L)
+ {
+     wxLuaState wxlState(L);
+     bool returns;
+     // int contextId
+     int contextId = (int)wxlState.GetNumberType(2);
+     // get this
+     wxHelpController * self = (wxHelpController *)wxlState.GetUserDataType(1, s_wxluatag_wxHelpController);
+     // call DisplayContextPopup
+     returns = self->DisplayContextPopup(contextId);
+     // push the result flag
+     lua_pushboolean(L, returns);
+ 
+     return 1;
+ }
+ 
  //     virtual bool DisplaySection(int sectionNo)
  static int LUACALL wxLua_wxHelpController_DisplaySection(lua_State *L)
***************
*** 331,339 ****
  static WXLUAMETHOD s_wxHelpController_methods[] = {
  
- #if ((wxCHECK_VERSION(2,3,0)) && ((wxLUA_USE_wxHelpController) && (wxUSE_HELP))) && (wxLUA_USE_wxPointSizeRect)
-     { LuaMethod, "DisplayTextPopup", wxLua_wxHelpController_DisplayTextPopup, 2, 2, { &s_wxluaarg_String, &s_wxluatag_wxPoint, 0 } },
- #endif  // ((wxCHECK_VERSION(2,3,0)) && ((wxLUA_USE_wxHelpController) && (wxUSE_HELP))) && (wxLUA_USE_wxPointSizeRect)
- 
- 
  #if ((wxLUA_USE_wxFrame) && ((wxLUA_USE_wxHelpController) && (wxUSE_HELP))) && (wxLUA_USE_wxPointSizeRect)
      { LuaMethod, "GetFrameParameters", wxLua_wxHelpController_GetFrameParameters, 3, 0, { &s_wxluatag_wxSize, &s_wxluatag_wxPoint, &s_wxluaarg_LightUserData, 0 } },
--- 323,326 ----
***************
*** 342,357 ****
  
  #if ((wxLUA_USE_wxHelpController) && (wxUSE_HELP)) && (wxLUA_USE_wxPointSizeRect)
      { LuaMethod, "SetFrameParameters", wxLua_wxHelpController_SetFrameParameters, 4, 2, { &s_wxluaarg_String, &s_wxluatag_wxSize, &s_wxluatag_wxPoint, &s_wxluaarg_Boolean, 0 } },
  #endif  // ((wxLUA_USE_wxHelpController) && (wxUSE_HELP)) && (wxLUA_USE_wxPointSizeRect)
  
- 
- #if (wxCHECK_VERSION(2,3,0)) && ((wxLUA_USE_wxHelpController) && (wxUSE_HELP))
-     { LuaMethod, "DisplayContextPopup", wxLua_wxHelpController_DisplayContextPopup, 1, 1, { &s_wxluaarg_Number, 0 } },
- #endif  // (wxCHECK_VERSION(2,3,0)) && ((wxLUA_USE_wxHelpController) && (wxUSE_HELP))
- 
      { LuaConstructor, "wxHelpController", wxLua_wxHelpController_constructor, 0, 0, { 0 } },
      { LuaMethod, "Initialize", wxLua_wxHelpController_Initialize, 1, 1, { &s_wxluaarg_String, 0 } },
      { LuaMethod, "DisplayBlock", wxLua_wxHelpController_DisplayBlock, 1, 1, { &s_wxluaarg_Number, 0 } },
      { LuaMethod, "DisplayContents", wxLua_wxHelpController_DisplayContents, 0, 0, { 0 } },
      { LuaMethod, "DisplaySection", wxLua_wxHelpController_DisplaySection, 1, 1, { &s_wxluaarg_Number, 0 } },
      { LuaMethod, "DisplaySectionString", wxLua_wxHelpController_DisplaySectionString, 1, 1, { &s_wxluaarg_String, 0 } },
--- 329,341 ----
  
  #if ((wxLUA_USE_wxHelpController) && (wxUSE_HELP)) && (wxLUA_USE_wxPointSizeRect)
+     { LuaMethod, "DisplayTextPopup", wxLua_wxHelpController_DisplayTextPopup, 2, 2, { &s_wxluaarg_String, &s_wxluatag_wxPoint, 0 } },
      { LuaMethod, "SetFrameParameters", wxLua_wxHelpController_SetFrameParameters, 4, 2, { &s_wxluaarg_String, &s_wxluatag_wxSize, &s_wxluatag_wxPoint, &s_wxluaarg_Boolean, 0 } },
  #endif  // ((wxLUA_USE_wxHelpController) && (wxUSE_HELP)) && (wxLUA_USE_wxPointSizeRect)
  
      { LuaConstructor, "wxHelpController", wxLua_wxHelpController_constructor, 0, 0, { 0 } },
      { LuaMethod, "Initialize", wxLua_wxHelpController_Initialize, 1, 1, { &s_wxluaarg_String, 0 } },
      { LuaMethod, "DisplayBlock", wxLua_wxHelpController_DisplayBlock, 1, 1, { &s_wxluaarg_Number, 0 } },
      { LuaMethod, "DisplayContents", wxLua_wxHelpController_DisplayContents, 0, 0, { 0 } },
+     { LuaMethod, "DisplayContextPopup", wxLua_wxHelpController_DisplayContextPopup, 1, 1, { &s_wxluaarg_Number, 0 } },
      { LuaMethod, "DisplaySection", wxLua_wxHelpController_DisplaySection, 1, 1, { &s_wxluaarg_Number, 0 } },
      { LuaMethod, "DisplaySectionString", wxLua_wxHelpController_DisplaySectionString, 1, 1, { &s_wxluaarg_String, 0 } },

Index: dialogs.cpp
===================================================================
RCS file: /cvsroot/wxlua/wxLua/modules/wxbind/src/dialogs.cpp,v
retrieving revision 1.19
retrieving revision 1.20
diff -C2 -d -r1.19 -r1.20
*** dialogs.cpp	9 Jun 2006 22:51:32 -0000	1.19
--- dialogs.cpp	7 Dec 2006 06:32:43 -0000	1.20
***************
*** 302,306 ****
  
  
! #if wxLUA_USE_wxColourDialog
  // -------------------------------------------------------------------------------------------------
  // Bind class wxColourDialog
--- 302,995 ----
  
  
! #if wxCHECK_VERSION(2,8,0) && wxUSE_ABOUTDLG && wxLUA_USE_wxAboutDialog
! // -------------------------------------------------------------------------------------------------
[...1545 lines suppressed...]
--- 3848,3855 ----
  WXLUAMETHOD* wxWizardPageSimple_methods = s_wxWizardPageSimple_methods;
  int wxWizardPageSimple_methodCount = sizeof(s_wxWizardPageSimple_methods)/sizeof(s_wxWizardPageSimple_methods[0]);
! #endif  // wxUSE_WIZARDDLG && wxLUA_USE_wxWizard
  
  
! #if wxUSE_WIZARDDLG && wxLUA_USE_wxWizard
  // -------------------------------------------------------------------------------------------------
  // Bind class wxWizardEvent
***************
*** 3265,3268 ****
  WXLUAMETHOD* wxWizardEvent_methods = s_wxWizardEvent_methods;
  int wxWizardEvent_methodCount = sizeof(s_wxWizardEvent_methods)/sizeof(s_wxWizardEvent_methods[0]);
! #endif  // wxLUA_USE_wxWizard
  
--- 3954,3957 ----
  WXLUAMETHOD* wxWizardEvent_methods = s_wxWizardEvent_methods;
  int wxWizardEvent_methodCount = sizeof(s_wxWizardEvent_methods)/sizeof(s_wxWizardEvent_methods[0]);
! #endif  // wxUSE_WIZARDDLG && wxLUA_USE_wxWizard
  

Index: appframe.cpp
===================================================================
RCS file: /cvsroot/wxlua/wxLua/modules/wxbind/src/appframe.cpp,v
retrieving revision 1.24
retrieving revision 1.25
diff -C2 -d -r1.24 -r1.25
*** appframe.cpp	22 Nov 2006 06:08:33 -0000	1.24
--- appframe.cpp	7 Dec 2006 06:32:43 -0000	1.25
***************
*** 27,58 ****
  
  
- #if (wxCHECK_VERSION(2,2,0) && !wxCHECK_VERSION(2,5,0) || (defined(WXWIN_COMPATIBILITY_2_4) && WXWIN_COMPATIBILITY_2_4)) && (wxUSE_LOG) && (wxLUA_USE_wxApp)
- // -------------------------------------------------------------------------------------------------
- // Bind class wxLog
- // -------------------------------------------------------------------------------------------------
- 
- // Lua MetaTable Tag for Class 'wxLog'
- int s_wxluatag_wxLog = -1;
- 
- static int LUACALL wxLua_wxLog_destructor(lua_State *)
- {
-     return 0;
- }
- 
- 
- 
- 
- 
- // Map Lua Class Methods to C Binding Functions
- static WXLUAMETHOD s_wxLog_methods[] = {
-     { LuaDelete, "wxLog", wxLua_wxLog_destructor, 0, 0, {0} },
- };
- 
- // Extern accessor to class method map
- WXLUAMETHOD* wxLog_methods = s_wxLog_methods;
- int wxLog_methodCount = sizeof(s_wxLog_methods)/sizeof(s_wxLog_methods[0]);
- #endif  // (wxCHECK_VERSION(2,2,0) && !wxCHECK_VERSION(2,5,0) || (defined(WXWIN_COMPATIBILITY_2_4) && WXWIN_COMPATIBILITY_2_4)) && (wxUSE_LOG) && (wxLUA_USE_wxApp)
- 
- 
  #if wxLUA_USE_wxApp
  // -------------------------------------------------------------------------------------------------
--- 27,30 ----

Index: event.cpp
===================================================================
RCS file: /cvsroot/wxlua/wxLua/modules/wxbind/src/event.cpp,v
retrieving revision 1.26
retrieving revision 1.27
diff -C2 -d -r1.26 -r1.27
*** event.cpp	11 Oct 2006 03:24:02 -0000	1.26
--- event.cpp	7 Dec 2006 06:32:43 -0000	1.27
***************
*** 4046,4051 ****
  int wxUpdateUIEvent_methodCount = sizeof(s_wxUpdateUIEvent_methods)/sizeof(s_wxUpdateUIEvent_methods[0]);
  
- 
- #if wxCHECK_VERSION(2,3,0)
  // -------------------------------------------------------------------------------------------------
  // Bind class wxHelpEvent
--- 4046,4049 ----
***************
*** 4055,4117 ****
  int s_wxluatag_wxHelpEvent = -1;
  
- 
- #if (wxLUA_USE_wxPointSizeRect) && (wxCHECK_VERSION(2,3,0))
- //     wxHelpEvent(wxEventType type = wxEVT_NULL, wxWindowID id = 0, const wxPoint& pt = wxDefaultPosition)
- static int LUACALL wxLua_wxHelpEvent_constructor(lua_State *L)
- {
-     wxLuaState wxlState(L);
-     wxHelpEvent *returns;
-     // get number of arguments
-     int argCount = lua_gettop(L);
-     // const wxPoint pt = wxDefaultPosition
-     const wxPoint * pt = (argCount >= 3 ? (const wxPoint *)wxlState.GetUserDataType(3, s_wxluatag_wxPoint) : &wxDefaultPosition);
-     // wxWindowID id = 0
-     wxWindowID id = (argCount >= 2 ? (wxWindowID)wxlState.GetNumberType(2) : 0);
-     // wxEventType type = wxEVT_NULL
-     wxEventType type = (argCount >= 1 ? (wxEventType)wxlState.GetNumberType(1) : wxEVT_NULL);
-     // call constructor
-     returns = new wxHelpEvent(type, id, *pt);
-     // add to tracked memory list
-     wxLua_AddToTrackedMemoryList(wxlState, (wxHelpEvent *)returns);
-     // push the constructed class pointer
-     wxlState.PushUserDataType(s_wxluatag_wxHelpEvent, returns);
- 
-     return 1;
- }
- 
- //     wxPoint  GetPosition()
- static int LUACALL wxLua_wxHelpEvent_GetPosition(lua_State *L)
- {
-     wxLuaState wxlState(L);
-     wxPoint *returns;
-     // get this
-     wxHelpEvent * self = (wxHelpEvent *)wxlState.GetUserDataType(1, s_wxluatag_wxHelpEvent);
-     // call GetPosition
-     // allocate a new object using the copy constructor
-     returns = new wxPoint(self->GetPosition());
-     // add the new object to the tracked memory list
-     wxLua_AddToTrackedMemoryList(wxlState, (wxPoint *)returns);
-     // push the result datatype
-     wxlState.PushUserDataType(s_wxluatag_wxPoint, returns);
- 
-     return 1;
- }
- 
- //     void SetPosition(const wxPoint& pos)
- static int LUACALL wxLua_wxHelpEvent_SetPosition(lua_State *L)
- {
-     wxLuaState wxlState(L);
-     // const wxPoint pos
-     const wxPoint * pos = (const wxPoint *)wxlState.GetUserDataType(2, s_wxluatag_wxPoint);
-     // get this
-     wxHelpEvent * self = (wxHelpEvent *)wxlState.GetUserDataType(1, s_wxluatag_wxHelpEvent);
-     // call SetPosition
-     self->SetPosition(*pos);
- 
-     return 0;
- }
- 
- #endif // (wxLUA_USE_wxPointSizeRect) && (wxCHECK_VERSION(2,3,0))
- 
  //     wxString GetLink()
  static int LUACALL wxLua_wxHelpEvent_GetLink(lua_State *L)
--- 4053,4056 ----
***************
*** 4198,4215 ****
  
  
  
  
  
- // Map Lua Class Methods to C Binding Functions
- static WXLUAMETHOD s_wxHelpEvent_methods[] = {
  
- #if (wxLUA_USE_wxPointSizeRect) && (wxCHECK_VERSION(2,3,0))
-     { LuaConstructor, "wxHelpEvent", wxLua_wxHelpEvent_constructor, 3, 0, { &s_wxluaarg_Number, &s_wxluaarg_Number, &s_wxluatag_wxPoint, 0 } },
-     { LuaMethod, "GetPosition", wxLua_wxHelpEvent_GetPosition, 0, 0, { 0 } },
-     { LuaMethod, "SetPosition", wxLua_wxHelpEvent_SetPosition, 1, 1, { &s_wxluatag_wxPoint, 0 } },
-     { LuaGetProp, "Position", wxLua_wxHelpEvent_GetPosition, 0, 0, {0} },
-     { LuaSetProp, "Position", wxLua_wxHelpEvent_SetPosition, 1, 1, {0} },
- #endif  // (wxLUA_USE_wxPointSizeRect) && (wxCHECK_VERSION(2,3,0))
  
      { LuaMethod, "GetLink", wxLua_wxHelpEvent_GetLink, 0, 0, { 0 } },
      { LuaMethod, "GetTarget", wxLua_wxHelpEvent_GetTarget, 0, 0, { 0 } },
--- 4137,4204 ----
  
  
+ #if wxLUA_USE_wxPointSizeRect
+ //     wxHelpEvent(wxEventType type = wxEVT_NULL, wxWindowID id = 0, const wxPoint& pt = wxDefaultPosition)
+ static int LUACALL wxLua_wxHelpEvent_constructor(lua_State *L)
+ {
+     wxLuaState wxlState(L);
+     wxHelpEvent *returns;
+     // get number of arguments
+     int argCount = lua_gettop(L);
+     // const wxPoint pt = wxDefaultPosition
+     const wxPoint * pt = (argCount >= 3 ? (const wxPoint *)wxlState.GetUserDataType(3, s_wxluatag_wxPoint) : &wxDefaultPosition);
+     // wxWindowID id = 0
+     wxWindowID id = (argCount >= 2 ? (wxWindowID)wxlState.GetNumberType(2) : 0);
+     // wxEventType type = wxEVT_NULL
+     wxEventType type = (argCount >= 1 ? (wxEventType)wxlState.GetNumberType(1) : wxEVT_NULL);
+     // call constructor
+     returns = new wxHelpEvent(type, id, *pt);
+     // add to tracked memory list
+     wxLua_AddToTrackedMemoryList(wxlState, (wxHelpEvent *)returns);
+     // push the constructed class pointer
+     wxlState.PushUserDataType(s_wxluatag_wxHelpEvent, returns);
+ 
+     return 1;
+ }
+ 
+ //     wxPoint  GetPosition()
+ static int LUACALL wxLua_wxHelpEvent_GetPosition(lua_State *L)
+ {
+     wxLuaState wxlState(L);
+     wxPoint *returns;
+     // get this
+     wxHelpEvent * self = (wxHelpEvent *)wxlState.GetUserDataType(1, s_wxluatag_wxHelpEvent);
+     // call GetPosition
+     // allocate a new object using the copy constructor
+     returns = new wxPoint(self->GetPosition());
+     // add the new object to the tracked memory list
+     wxLua_AddToTrackedMemoryList(wxlState, (wxPoint *)returns);
+     // push the result datatype
+     wxlState.PushUserDataType(s_wxluatag_wxPoint, returns);
+ 
+     return 1;
+ }
+ 
+ //     void SetPosition(const wxPoint& pos)
+ static int LUACALL wxLua_wxHelpEvent_SetPosition(lua_State *L)
+ {
+     wxLuaState wxlState(L);
+     // const wxPoint pos
+     const wxPoint * pos = (const wxPoint *)wxlState.GetUserDataType(2, s_wxluatag_wxPoint);
+     // get this
+     wxHelpEvent * self = (wxHelpEvent *)wxlState.GetUserDataType(1, s_wxluatag_wxHelpEvent);
+     // call SetPosition
+     self->SetPosition(*pos);
+ 
+     return 0;
+ }
+ 
+ #endif // wxLUA_USE_wxPointSizeRect
  
  
  
  
  
+ // Map Lua Class Methods to C Binding Functions
+ static WXLUAMETHOD s_wxHelpEvent_methods[] = {
      { LuaMethod, "GetLink", wxLua_wxHelpEvent_GetLink, 0, 0, { 0 } },
      { LuaMethod, "GetTarget", wxLua_wxHelpEvent_GetTarget, 0, 0, { 0 } },
***************
*** 4222,4225 ****
--- 4211,4223 ----
      { LuaDelete, "wxHelpEvent", wxLua_wxHelpEvent_destructor, 0, 0, {0} },
      { LuaMethod, "Delete", wxLua_wxHelpEvent_Delete, 0, 0, {0} },
+ 
+ #if wxLUA_USE_wxPointSizeRect
+     { LuaConstructor, "wxHelpEvent", wxLua_wxHelpEvent_constructor, 3, 0, { &s_wxluaarg_Number, &s_wxluaarg_Number, &s_wxluatag_wxPoint, 0 } },
+     { LuaMethod, "GetPosition", wxLua_wxHelpEvent_GetPosition, 0, 0, { 0 } },
+     { LuaMethod, "SetPosition", wxLua_wxHelpEvent_SetPosition, 1, 1, { &s_wxluatag_wxPoint, 0 } },
+     { LuaGetProp, "Position", wxLua_wxHelpEvent_GetPosition, 0, 0, {0} },
+     { LuaSetProp, "Position", wxLua_wxHelpEvent_SetPosition, 1, 1, {0} },
+ #endif  // wxLUA_USE_wxPointSizeRect
+ 
  };
  
***************
*** 4227,4230 ****
  WXLUAMETHOD* wxHelpEvent_methods = s_wxHelpEvent_methods;
  int wxHelpEvent_methodCount = sizeof(s_wxHelpEvent_methods)/sizeof(s_wxHelpEvent_methods[0]);
- #endif  // wxCHECK_VERSION(2,3,0)
  
--- 4225,4227 ----

Index: windows.cpp
===================================================================
RCS file: /cvsroot/wxlua/wxLua/modules/wxbind/src/windows.cpp,v
retrieving revision 1.28
retrieving revision 1.29
diff -C2 -d -r1.28 -r1.29
*** windows.cpp	22 Nov 2006 21:13:56 -0000	1.28
--- windows.cpp	7 Dec 2006 06:32:44 -0000	1.29
***************
*** 4970,4992 ****
  
  
- #if (wxLUA_USE_wxNotebook && wxLUA_USE_wxListCtrl) && (wxLUA_USE_wxListCtrl)
- //     wxListView* GetListView()
- static int LUACALL wxLua_wxListbook_GetListView(lua_State *L)
- {
-     wxLuaState wxlState(L);
-     wxListView *returns;
-     // get this
-     wxListbook * self = (wxListbook *)wxlState.GetUserDataType(1, s_wxluatag_wxListbook);
-     // call GetListView
-     returns = self->GetListView();
-     // push the result datatype
-     wxlState.PushUserDataType(s_wxluatag_wxListView, returns);
- 
-     return 1;
- }
- 
- #endif // (wxLUA_USE_wxNotebook && wxLUA_USE_wxListCtrl) && (wxLUA_USE_wxListCtrl)
- 
- 
  #if (wxLUA_USE_wxNotebook && wxLUA_USE_wxListCtrl) && (wxLUA_USE_wxPointSizeRect)
  //     wxListbook(wxWindow* parent, wxWindowID id, const wxPoint& pos = wxDefaultPosition, const wxSize& size = wxDefaultSize, long style = 0, const wxString& name = "wxListbook")
--- 4970,4973 ----
***************
*** 5051,5054 ****
--- 5032,5054 ----
  #endif // (wxLUA_USE_wxNotebook && wxLUA_USE_wxListCtrl) && (wxLUA_USE_wxPointSizeRect)
  
+ 
+ #if (wxLUA_USE_wxNotebook && wxLUA_USE_wxListCtrl) && (wxUSE_LISTCTRL && wxLUA_USE_wxListCtrl)
+ //     wxListView* GetListView()
+ static int LUACALL wxLua_wxListbook_GetListView(lua_State *L)
+ {
+     wxLuaState wxlState(L);
+     wxListView *returns;
+     // get this
+     wxListbook * self = (wxListbook *)wxlState.GetUserDataType(1, s_wxluatag_wxListbook);
+     // call GetListView
+     returns = self->GetListView();
+     // push the result datatype
+     wxlState.PushUserDataType(s_wxluatag_wxListView, returns);
+ 
+     return 1;
+ }
+ 
+ #endif // (wxLUA_USE_wxNotebook && wxLUA_USE_wxListCtrl) && (wxUSE_LISTCTRL && wxLUA_USE_wxListCtrl)
+ 
  //     %constructor wxListbookDefault()
  static int LUACALL wxLua_wxListbookDefault_constructor(lua_State *L)
***************
*** 5094,5102 ****
  static WXLUAMETHOD s_wxListbook_methods[] = {
  
- #if (wxLUA_USE_wxNotebook && wxLUA_USE_wxListCtrl) && (wxLUA_USE_wxListCtrl)
-     { LuaMethod, "GetListView", wxLua_wxListbook_GetListView, 0, 0, { 0 } },
- #endif  // (wxLUA_USE_wxNotebook && wxLUA_USE_wxListCtrl) && (wxLUA_USE_wxListCtrl)
- 
- 
  #if (wxLUA_USE_wxNotebook && wxLUA_USE_wxListCtrl) && (wxLUA_USE_wxPointSizeRect)
      { LuaConstructor, "wxListbook", wxLua_wxListbook_constructor, 6, 2, { &s_wxluatag_wxWindow, &s_wxluaarg_Number, &s_wxluatag_wxPoint, &s_wxluatag_wxSize, &s_wxluaarg_Number, &s_wxluaarg_String, 0 } },
--- 5094,5097 ----
***************
*** 5104,5107 ****
--- 5099,5107 ----
  #endif  // (wxLUA_USE_wxNotebook && wxLUA_USE_wxListCtrl) && (wxLUA_USE_wxPointSizeRect)
  
+ 
+ #if (wxLUA_USE_wxNotebook && wxLUA_USE_wxListCtrl) && (wxUSE_LISTCTRL && wxLUA_USE_wxListCtrl)
+     { LuaMethod, "GetListView", wxLua_wxListbook_GetListView, 0, 0, { 0 } },
+ #endif  // (wxLUA_USE_wxNotebook && wxLUA_USE_wxListCtrl) && (wxUSE_LISTCTRL && wxLUA_USE_wxListCtrl)
+ 
      { LuaConstructor, "wxListbookDefault", wxLua_wxListbookDefault_constructor, 0, 0, { 0 } },
      { LuaMethod, "IsVertical", wxLua_wxListbook_IsVertical, 0, 0, { 0 } },
***************
*** 6458,6462 ****
  
  
! #if ((wxLUA_USE_MDI) && ((wxLUA_USE_MDI) && (wxLUA_USE_wxSashWindow))) && (wxLUA_USE_wxPointSizeRect)
  //     bool LayoutMDIFrame(wxMDIParentFrame* frame, wxRect* rect = NULL)
  static int LUACALL wxLua_wxLayoutAlgorithm_LayoutMDIFrame(lua_State *L)
--- 6458,6462 ----
  
  
! #if ((wxLUA_USE_MDI) && (wxLUA_USE_wxSashWindow)) && (wxLUA_USE_wxPointSizeRect)
  //     bool LayoutMDIFrame(wxMDIParentFrame* frame, wxRect* rect = NULL)
  static int LUACALL wxLua_wxLayoutAlgorithm_LayoutMDIFrame(lua_State *L)
***************
*** 6480,6484 ****
  }
  
! #endif // ((wxLUA_USE_MDI) && ((wxLUA_USE_MDI) && (wxLUA_USE_wxSashWindow))) && (wxLUA_USE_wxPointSizeRect)
  
  
--- 6480,6484 ----
  }
  
! #endif // ((wxLUA_USE_MDI) && (wxLUA_USE_wxSashWindow)) && (wxLUA_USE_wxPointSizeRect)
  
  
***************
*** 6553,6559 ****
  static WXLUAMETHOD s_wxLayoutAlgorithm_methods[] = {
  
! #if ((wxLUA_USE_MDI) && ((wxLUA_USE_MDI) && (wxLUA_USE_wxSashWindow))) && (wxLUA_USE_wxPointSizeRect)
      { LuaMethod, "LayoutMDIFrame", wxLua_wxLayoutAlgorithm_LayoutMDIFrame, 2, 1, { &s_wxluatag_wxMDIParentFrame, &s_wxluatag_wxRect, 0 } },
! #endif  // ((wxLUA_USE_MDI) && ((wxLUA_USE_MDI) && (wxLUA_USE_wxSashWindow))) && (wxLUA_USE_wxPointSizeRect)
  
  
--- 6553,6559 ----
  static WXLUAMETHOD s_wxLayoutAlgorithm_methods[] = {
  
! #if ((wxLUA_USE_MDI) && (wxLUA_USE_wxSashWindow)) && (wxLUA_USE_wxPointSizeRect)
      { LuaMethod, "LayoutMDIFrame", wxLua_wxLayoutAlgorithm_LayoutMDIFrame, 2, 1, { &s_wxluatag_wxMDIParentFrame, &s_wxluatag_wxRect, 0 } },
! #endif  // ((wxLUA_USE_MDI) && (wxLUA_USE_wxSashWindow)) && (wxLUA_USE_wxPointSizeRect)
  
  

Index: menutool.cpp
===================================================================
RCS file: /cvsroot/wxlua/wxLua/modules/wxbind/src/menutool.cpp,v
retrieving revision 1.18
retrieving revision 1.19
diff -C2 -d -r1.18 -r1.19
*** menutool.cpp	9 Jun 2006 22:51:32 -0000	1.18
--- menutool.cpp	7 Dec 2006 06:32:43 -0000	1.19
***************
*** 3032,3036 ****
  
  
! #if (wxCHECK_VERSION(2,2,0) && !wxCHECK_VERSION(2,5,0)) && (wxLUA_USE_wxToolbar)
  // -------------------------------------------------------------------------------------------------
  // Bind class wxToolBarSimple
--- 3032,3036 ----
  
  
! #if (!wxCHECK_VERSION(2,5,0)) && (wxLUA_USE_wxToolbar)
  // -------------------------------------------------------------------------------------------------
  // Bind class wxToolBarSimple
***************
*** 3040,3046 ****
  int s_wxluatag_wxToolBarSimple = -1;
  
  
! #if ((wxCHECK_VERSION(2,2,0) && !wxCHECK_VERSION(2,5,0)) && (wxLUA_USE_wxToolbar)) && (wxLUA_USE_wxPointSizeRect)
! // %wxchkver22&!%wxchkver25     wxToolBarSimple(wxWindow *parent, wxWindowID id, const wxPoint& pos = wxDefaultPosition, const wxSize& size = wxDefaultSize, long style = wxNO_BORDER | wxTB_HORIZONTAL, const wxString &name = wxToolBarNameStr)
  static int LUACALL wxLua_wxToolBarSimple_constructor(lua_State *L)
  {
--- 3040,3067 ----
  int s_wxluatag_wxToolBarSimple = -1;
  
+ //     %constructor wxPreToolBarSimple()
+ static int LUACALL wxLua_wxPreToolBarSimple_constructor(lua_State *L)
+ {
+     wxLuaState wxlState(L);
+     wxToolBarSimple *returns;
+     // call constructor
+     returns = new wxToolBarSimple();
+     // add to tracked window list
+     if (returns && returns->IsKindOf(CLASSINFO(wxWindow)))
+         wxlState.AddToTrackedWindowList((wxWindow*)returns);
+     // push the constructed class pointer
+     wxlState.PushUserDataType(s_wxluatag_wxToolBarSimple, returns);
  
!     return 1;
! }
! 
! static int LUACALL wxLua_wxToolBarSimple_destructor(lua_State *)
! {
!     return 0;
! }
! 
! 
! #if ((!wxCHECK_VERSION(2,5,0)) && (wxLUA_USE_wxToolbar)) && (wxLUA_USE_wxPointSizeRect)
! //     wxToolBarSimple(wxWindow *parent, wxWindowID id, const wxPoint& pos = wxDefaultPosition, const wxSize& size = wxDefaultSize, long style = wxNO_BORDER | wxTB_HORIZONTAL, const wxString &name = wxToolBarNameStr)
  static int LUACALL wxLua_wxToolBarSimple_constructor(lua_State *L)
  {
***************
*** 3072,3076 ****
  }
  
! // %wxchkver22&!%wxchkver25     bool    Create(wxWindow *parent,wxWindowID id, const wxPoint& pos = wxDefaultPosition, const wxSize& size = wxDefaultSize, long style = wxNO_BORDER | wxTB_HORIZONTAL, const wxString &name = wxToolBarNameStr)
  static int LUACALL wxLua_wxToolBarSimple_Create(lua_State *L)
  {
--- 3093,3097 ----
  }
  
! //     bool    Create(wxWindow *parent,wxWindowID id, const wxPoint& pos = wxDefaultPosition, const wxSize& size = wxDefaultSize, long style = wxNO_BORDER | wxTB_HORIZONTAL, const wxString &name = wxToolBarNameStr)
  static int LUACALL wxLua_wxToolBarSimple_Create(lua_State *L)
  {
***************
*** 3101,3109 ****
  }
  
! #endif // ((wxCHECK_VERSION(2,2,0) && !wxCHECK_VERSION(2,5,0)) && (wxLUA_USE_wxToolbar)) && (wxLUA_USE_wxPointSizeRect)
  
  
! #if ((wxCHECK_VERSION(2,2,0) && !wxCHECK_VERSION(2,5,0)) && (wxLUA_USE_wxToolbar)) && (wxLUA_USE_wxToolbar)
! // %wxchkver22&!%wxchkver25     wxToolBarToolBase *FindToolForPosition(wxCoord x, wxCoord y)
  static int LUACALL wxLua_wxToolBarSimple_FindToolForPosition(lua_State *L)
  {
--- 3122,3130 ----
  }
  
! #endif // ((!wxCHECK_VERSION(2,5,0)) && (wxLUA_USE_wxToolbar)) && (wxLUA_USE_wxPointSizeRect)
  
  
! #if ((!wxCHECK_VERSION(2,5,0)) && (wxLUA_USE_wxToolbar)) && (wxLUA_USE_wxToolbar)
! //     wxToolBarToolBase *FindToolForPosition(wxCoord x, wxCoord y)
  static int LUACALL wxLua_wxToolBarSimple_FindToolForPosition(lua_State *L)
  {
***************
*** 3124,3149 ****
  }
  
! #endif // ((wxCHECK_VERSION(2,2,0) && !wxCHECK_VERSION(2,5,0)) && (wxLUA_USE_wxToolbar)) && (wxLUA_USE_wxToolbar)
! 
! // %wxchkver22&!%wxchkver25     %constructor wxPreToolBarSimple()
! static int LUACALL wxLua_wxPreToolBarSimple_constructor(lua_State *L)
! {
!     wxLuaState wxlState(L);
!     wxToolBarSimple *returns;
!     // call constructor
!     returns = new wxToolBarSimple();
!     // add to tracked window list
!     if (returns && returns->IsKindOf(CLASSINFO(wxWindow)))
!         wxlState.AddToTrackedWindowList((wxWindow*)returns);
!     // push the constructed class pointer
!     wxlState.PushUserDataType(s_wxluatag_wxToolBarSimple, returns);
! 
!     return 1;
! }
! 
! static int LUACALL wxLua_wxToolBarSimple_destructor(lua_State *)
! {
!     return 0;
! }
  
  
--- 3145,3149 ----
  }
  
! #endif // ((!wxCHECK_VERSION(2,5,0)) && (wxLUA_USE_wxToolbar)) && (wxLUA_USE_wxToolbar)
  
  
***************
*** 3153,3169 ****
  // Map Lua Class Methods to C Binding Functions
  static WXLUAMETHOD s_wxToolBarSimple_methods[] = {
  
! #if ((wxCHECK_VERSION(2,2,0) && !wxCHECK_VERSION(2,5,0)) && (wxLUA_USE_wxToolbar)) && (wxLUA_USE_wxPointSizeRect)
      { LuaConstructor, "wxToolBarSimple", wxLua_wxToolBarSimple_constructor, 6, 2, { &s_wxluatag_wxWindow, &s_wxluaarg_Number, &s_wxluatag_wxPoint, &s_wxluatag_wxSize, &s_wxluaarg_Number, &s_wxluaarg_String, 0 } },
      { LuaMethod, "Create", wxLua_wxToolBarSimple_Create, 6, 2, { &s_wxluatag_wxWindow, &s_wxluaarg_Number, &s_wxluatag_wxPoint, &s_wxluatag_wxSize, &s_wxluaarg_Number, &s_wxluaarg_String, 0 } },
! #endif  // ((wxCHECK_VERSION(2,2,0) && !wxCHECK_VERSION(2,5,0)) && (wxLUA_USE_wxToolbar)) && (wxLUA_USE_wxPointSizeRect)
  
  
! #if ((wxCHECK_VERSION(2,2,0) && !wxCHECK_VERSION(2,5,0)) && (wxLUA_USE_wxToolbar)) && (wxLUA_USE_wxToolbar)
      { LuaMethod, "FindToolForPosition", wxLua_wxToolBarSimple_FindToolForPosition, 2, 2, { &s_wxluaarg_Number, &s_wxluaarg_Number, 0 } },
! #endif  // ((wxCHECK_VERSION(2,2,0) && !wxCHECK_VERSION(2,5,0)) && (wxLUA_USE_wxToolbar)) && (wxLUA_USE_wxToolbar)
  
-     { LuaConstructor, "wxPreToolBarSimple", wxLua_wxPreToolBarSimple_constructor, 0, 0, { 0 } },
-     { LuaDelete, "wxToolBarSimple", wxLua_wxToolBarSimple_destructor, 0, 0, {0} },
  };
  
--- 3153,3169 ----
  // Map Lua Class Methods to C Binding Functions
  static WXLUAMETHOD s_wxToolBarSimple_methods[] = {
+     { LuaConstructor, "wxPreToolBarSimple", wxLua_wxPreToolBarSimple_constructor, 0, 0, { 0 } },
+     { LuaDelete, "wxToolBarSimple", wxLua_wxToolBarSimple_destructor, 0, 0, {0} },
  
! #if ((!wxCHECK_VERSION(2,5,0)) && (wxLUA_USE_wxToolbar)) && (wxLUA_USE_wxPointSizeRect)
      { LuaConstructor, "wxToolBarSimple", wxLua_wxToolBarSimple_constructor, 6, 2, { &s_wxluatag_wxWindow, &s_wxluaarg_Number, &s_wxluatag_wxPoint, &s_wxluatag_wxSize, &s_wxluaarg_Number, &s_wxluaarg_String, 0 } },
      { LuaMethod, "Create", wxLua_wxToolBarSimple_Create, 6, 2, { &s_wxluatag_wxWindow, &s_wxluaarg_Number, &s_wxluatag_wxPoint, &s_wxluatag_wxSize, &s_wxluaarg_Number, &s_wxluaarg_String, 0 } },
! #endif  // ((!wxCHECK_VERSION(2,5,0)) && (wxLUA_USE_wxToolbar)) && (wxLUA_USE_wxPointSizeRect)
  
  
! #if ((!wxCHECK_VERSION(2,5,0)) && (wxLUA_USE_wxToolbar)) && (wxLUA_USE_wxToolbar)
      { LuaMethod, "FindToolForPosition", wxLua_wxToolBarSimple_FindToolForPosition, 2, 2, { &s_wxluaarg_Number, &s_wxluaarg_Number, 0 } },
! #endif  // ((!wxCHECK_VERSION(2,5,0)) && (wxLUA_USE_wxToolbar)) && (wxLUA_USE_wxToolbar)
  
  };
  
***************
*** 3171,3175 ****
  WXLUAMETHOD* wxToolBarSimple_methods = s_wxToolBarSimple_methods;
  int wxToolBarSimple_methodCount = sizeof(s_wxToolBarSimple_methods)/sizeof(s_wxToolBarSimple_methods[0]);
! #endif  // (wxCHECK_VERSION(2,2,0) && !wxCHECK_VERSION(2,5,0)) && (wxLUA_USE_wxToolbar)
  
  
--- 3171,3175 ----
  WXLUAMETHOD* wxToolBarSimple_methods = s_wxToolBarSimple_methods;
  int wxToolBarSimple_methodCount = sizeof(s_wxToolBarSimple_methods)/sizeof(s_wxToolBarSimple_methods[0]);
! #endif  // (!wxCHECK_VERSION(2,5,0)) && (wxLUA_USE_wxToolbar)
  
  

Index: image.cpp
===================================================================
RCS file: /cvsroot/wxlua/wxLua/modules/wxbind/src/image.cpp,v
retrieving revision 1.17
retrieving revision 1.18
diff -C2 -d -r1.17 -r1.18
*** image.cpp	2 Nov 2006 23:38:09 -0000	1.17
--- image.cpp	7 Dec 2006 06:32:43 -0000	1.18
***************
*** 36,40 ****
  
  
! #if (((wxCHECK_VERSION(2,3,0)) && (wxLUA_USE_wxImage)) && (wxLUA_USE_wxBitmap)) && (wxLUA_USE_wxImage)
  // %override wxLua_wxImageFromBitmap_constructor
  // %constructor wxImageFromBitmap(const wxBitmap& bitmap)
--- 36,40 ----
  
  
! #if (wxLUA_USE_wxBitmap) && (wxLUA_USE_wxImage)
  // %override wxLua_wxImageFromBitmap_constructor
  // %constructor wxImageFromBitmap(const wxBitmap& bitmap)
***************
*** 55,146 ****
  }
  
! #endif // (((wxCHECK_VERSION(2,3,0)) && (wxLUA_USE_wxImage)) && (wxLUA_USE_wxBitmap)) && (wxLUA_USE_wxImage)
! 
! 
! #if (wxCHECK_VERSION(2,3,0)) && (wxLUA_USE_wxImage)
! //     %wxchkver23 wxString GetOption(const wxString &name) const
! static int LUACALL wxLua_wxImage_GetOption(lua_State *L)
! {
!     wxLuaState wxlState(L);
!     wxString returns;
!     // const wxString name
!     const wxString name = lua2wx(wxlState.GetStringType(2));
!     // get this
!     wxImage * self = (wxImage *)wxlState.GetUserDataType(1, s_wxluatag_wxImage);
!     // call GetOption
!     returns = self->GetOption(name);
!     // push the result string
!     lua_pushstring(L, wx2lua(returns) );
! 
!     return 1;
! }
! 
! //     %wxchkver23 int GetOptionInt(const wxString &name) const
! static int LUACALL wxLua_wxImage_GetOptionInt(lua_State *L)
! {
!     wxLuaState wxlState(L);
!     int returns;
!     // const wxString name
!     const wxString name = lua2wx(wxlState.GetStringType(2));
!     // get this
!     wxImage * self = (wxImage *)wxlState.GetUserDataType(1, s_wxluatag_wxImage);
!     // call GetOptionInt
!     returns = self->GetOptionInt(name);
!     // push the result number
!     lua_pushnumber(L, returns);
! 
!     return 1;
! }
! 
! //     %wxchkver23 int HasOption(const wxString &name) const
! static int LUACALL wxLua_wxImage_HasOption(lua_State *L)
! {
!     wxLuaState wxlState(L);
!     int returns;
!     // const wxString name
!     const wxString name = lua2wx(wxlState.GetStringType(2));
!     // get this
!     wxImage * self = (wxImage *)wxlState.GetUserDataType(1, s_wxluatag_wxImage);
!     // call HasOption
!     returns = self->HasOption(name);
!     // push the result number
!     lua_pushnumber(L, returns);
! 
!     return 1;
! }
! 
! //     %wxchkver23 void SetOption(const wxString &name, const wxString &value)
! static int LUACALL wxLua_wxImage_SetOption(lua_State *L)
! {
!     wxLuaState wxlState(L);
!     // const wxString value
!     const wxString value = lua2wx(wxlState.GetStringType(3));
!     // const wxString name
!     const wxString name = lua2wx(wxlState.GetStringType(2));
!     // get this
!     wxImage * self = (wxImage *)wxlState.GetUserDataType(1, s_wxluatag_wxImage);
!     // call SetOption
!     self->SetOption(name, value);
! 
!     return 0;
! }
! 
! //     %wxchkver23 %rename SetOptionInt void SetOption(const wxString &name, int value)
! static int LUACALL wxLua_wxImage_SetOptionInt(lua_State *L)
! {
!     wxLuaState wxlState(L);
!     // int value
!     int value = (int)wxlState.GetNumberType(3);
!     // const wxString name
!     const wxString name = lua2wx(wxlState.GetStringType(2));
!     // get this
!     wxImage * self = (wxImage *)wxlState.GetUserDataType(1, s_wxluatag_wxImage);
!     // call SetOption
!     self->SetOption(name, value);
! 
!     return 0;
! }
! 
! #endif // (wxCHECK_VERSION(2,3,0)) && (wxLUA_USE_wxImage)
  
  
--- 55,59 ----
  }
  
! #endif // (wxLUA_USE_wxBitmap) && (wxLUA_USE_wxImage)
  
  
***************
*** 939,942 ****
--- 852,906 ----
  }
  
+ //     wxString GetOption(const wxString &name) const
+ static int LUACALL wxLua_wxImage_GetOption(lua_State *L)
+ {
+     wxLuaState wxlState(L);
+     wxString returns;
+     // const wxString name
+     const wxString name = lua2wx(wxlState.GetStringType(2));
+     // get this
+     wxImage * self = (wxImage *)wxlState.GetUserDataType(1, s_wxluatag_wxImage);
+     // call GetOption
+     returns = self->GetOption(name);
+     // push the result string
+     lua_pushstring(L, wx2lua(returns) );
+ 
+     return 1;
+ }
+ 
+ //     int GetOptionInt(const wxString &name) const
+ static int LUACALL wxLua_wxImage_GetOptionInt(lua_State *L)
+ {
+     wxLuaState wxlState(L);
+     int returns;
+     // const wxString name
+     const wxString name = lua2wx(wxlState.GetStringType(2));
+     // get this
+     wxImage * self = (wxImage *)wxlState.GetUserDataType(1, s_wxluatag_wxImage);
+     // call GetOptionInt
+     returns = self->GetOptionInt(name);
+     // push the result number
+     lua_pushnumber(L, returns);
+ 
+     return 1;
+ }
+ 
+ //     int HasOption(const wxString &name) const
+ static int LUACALL wxLua_wxImage_HasOption(lua_State *L)
+ {
+     wxLuaState wxlState(L);
+     int returns;
+     // const wxString name
+     const wxString name = lua2wx(wxlState.GetStringType(2));
+     // get this
+     wxImage * self = (wxImage *)wxlState.GetUserDataType(1, s_wxluatag_wxImage);
+     // call HasOption
+     returns = self->HasOption(name);
+     // push the result number
+     lua_pushnumber(L, returns);
+ 
+     return 1;
+ }
+ 
  //     void InitAlpha()
  static int LUACALL wxLua_wxImage_InitAlpha(lua_State *L)
***************
*** 1358,1361 ****
--- 1322,1357 ----
  }
  
+ //     void SetOption(const wxString &name, const wxString &value)
+ static int LUACALL wxLua_wxImage_SetOption(lua_State *L)
+ {
+     wxLuaState wxlState(L);
+     // const wxString value
+     const wxString value = lua2wx(wxlState.GetStringType(3));
+     // const wxString name
+     const wxString name = lua2wx(wxlState.GetStringType(2));
+     // get this
+     wxImage * self = (wxImage *)wxlState.GetUserDataType(1, s_wxluatag_wxImage);
+     // call SetOption
+     self->SetOption(name, value);
+ 
+     return 0;
+ }
+ 
+ //     %rename SetOptionInt void SetOption(const wxString &name, int value)
+ static int LUACALL wxLua_wxImage_SetOptionInt(lua_State *L)
+ {
+     wxLuaState wxlState(L);
+     // int value
+     int value = (int)wxlState.GetNumberType(3);
+     // const wxString name
+     const wxString name = lua2wx(wxlState.GetStringType(2));
+     // get this
+     wxImage * self = (wxImage *)wxlState.GetUserDataType(1, s_wxluatag_wxImage);
+     // call SetOption
+     self->SetOption(name, value);
+ 
+     return 0;
+ }
+ 
  //     void SetRGB(int x, int y, unsigned char red, unsigned char green, unsigned char blue)
  static int LUACALL wxLua_wxImage_SetRGB(lua_State *L)
***************
*** 1430,1445 ****
  static WXLUAMETHOD s_wxImage_methods[] = {
  
! #if (((wxCHECK_VERSION(2,3,0)) && (wxLUA_USE_wxImage)) && (wxLUA_USE_wxBitmap)) && (wxLUA_USE_wxImage)
      { LuaConstructor, "wxImageFromBitmap", wxLua_wxImageFromBitmap_constructor, 1, 1, { &s_wxluatag_wxBitmap, 0 } },
! #endif  // (((wxCHECK_VERSION(2,3,0)) && (wxLUA_USE_wxImage)) && (wxLUA_USE_wxBitmap)) && (wxLUA_USE_wxImage)
! 
! 
! #if (wxCHECK_VERSION(2,3,0)) && (wxLUA_USE_wxImage)
!     { LuaMethod, "GetOption", wxLua_wxImage_GetOption, 1, 1, { &s_wxluaarg_String, 0 } },
!     { LuaMethod, "GetOptionInt", wxLua_wxImage_GetOptionInt, 1, 1, { &s_wxluaarg_String, 0 } },
!     { LuaMethod, "HasOption", wxLua_wxImage_HasOption, 1, 1, { &s_wxluaarg_String, 0 } },
!     { LuaMethod, "SetOption", wxLua_wxImage_SetOption, 2, 2, { &s_wxluaarg_String, &s_wxluaarg_String, 0 } },
!     { LuaMethod, "SetOptionInt", wxLua_wxImage_SetOptionInt, 2, 2, { &s_wxluaarg_String, &s_wxluaarg_Number, 0 } },
! #endif  // (wxCHECK_VERSION(2,3,0)) && (wxLUA_USE_wxImage)
  
  
--- 1426,1432 ----
  static WXLUAMETHOD s_wxImage_methods[] = {
  
! #if (wxLUA_USE_wxBitmap) && (wxLUA_USE_wxImage)
      { LuaConstructor, "wxImageFromBitmap", wxLua_wxImageFromBitmap_constructor, 1, 1, { &s_wxluatag_wxBitmap, 0 } },
! #endif  // (wxLUA_USE_wxBitmap) && (wxLUA_USE_wxImage)
  
  
***************
*** 1501,1504 ****
--- 1488,1494 ----
      { LuaMethod, "HasAlpha", wxLua_wxImage_HasAlpha, 0, 0, { 0 } },
      { LuaMethod, "HasMask", wxLua_wxImage_HasMask, 0, 0, { 0 } },
+     { LuaMethod, "GetOption", wxLua_wxImage_GetOption, 1, 1, { &s_wxluaarg_String, 0 } },
+     { LuaMethod, "GetOptionInt", wxLua_wxImage_GetOptionInt, 1, 1, { &s_wxluaarg_String, 0 } },
+     { LuaMethod, "HasOption", wxLua_wxImage_HasOption, 1, 1, { &s_wxluaarg_String, 0 } },
      { LuaMethod, "InitAlpha", wxLua_wxImage_InitAlpha, 0, 0, { 0 } },
      { LuaMethod, "InitStandardHandlers", wxLua_wxImage_InitStandardHandlers, 0, 0, { 0 } },
***************
*** 1524,1527 ****
--- 1514,1519 ----
      { LuaMethod, "SetMaskColour", wxLua_wxImage_SetMaskColour, 3, 3, { &s_wxluaarg_Number, &s_wxluaarg_Number, &s_wxluaarg_Number, 0 } },
      { LuaMethod, "SetMaskFromImage", wxLua_wxImage_SetMaskFromImage, 4, 4, { &s_wxluatag_wxImage, &s_wxluaarg_Number, &s_wxluaarg_Number, &s_wxluaarg_Number, 0 } },
+     { LuaMethod, "SetOption", wxLua_wxImage_SetOption, 2, 2, { &s_wxluaarg_String, &s_wxluaarg_String, 0 } },
+     { LuaMethod, "SetOptionInt", wxLua_wxImage_SetOptionInt, 2, 2, { &s_wxluaarg_String, &s_wxluaarg_Number, 0 } },
      { LuaMethod, "SetRGB", wxLua_wxImage_SetRGB, 5, 5, { &s_wxluaarg_Number, &s_wxluaarg_Number, &s_wxluaarg_Number, &s_wxluaarg_Number, &s_wxluaarg_Number, 0 } },
      { LuaMethod, "op_assign", wxLua_wxImage_op_assign, 1, 1, { &s_wxluatag_wxImage, 0 } },

Index: mdi.cpp
===================================================================
RCS file: /cvsroot/wxlua/wxLua/modules/wxbind/src/mdi.cpp,v
retrieving revision 1.16
retrieving revision 1.17
diff -C2 -d -r1.16 -r1.17
*** mdi.cpp	9 Jun 2006 22:51:32 -0000	1.16
--- mdi.cpp	7 Dec 2006 06:32:43 -0000	1.17
***************
*** 705,730 ****
  
  
- #if ((wxCHECK_VERSION(2,2,0) && !wxCHECK_VERSION(2,5,0)) && (wxLUA_USE_MDI)) && (wxLUA_USE_MDI)
- //     %wxchkver22&!%wxchkver25 void ActivateView(wxView* view, bool activate, bool deleting)
- static int LUACALL wxLua_wxDocManager_ActivateView(lua_State *L)
- {
-     wxLuaState wxlState(L);
-     // bool deleting
-     bool deleting = wxlState.GetBooleanType(4);
-     // bool activate
-     bool activate = wxlState.GetBooleanType(3);
-     // wxView view
-     wxView * view = (wxView *)wxlState.GetUserDataType(2, s_wxluatag_wxView);
-     // get this
-     wxDocManager * self = (wxDocManager *)wxlState.GetUserDataType(1, s_wxluatag_wxDocManager);
-     // call ActivateView
-     self->ActivateView(view, activate, deleting);
- 
-     return 0;
- }
- 
- #endif // ((wxCHECK_VERSION(2,2,0) && !wxCHECK_VERSION(2,5,0)) && (wxLUA_USE_MDI)) && (wxLUA_USE_MDI)
- 
- 
  #if ((wxCHECK_VERSION(2,5,0)) && (wxLUA_USE_MDI)) && (wxLUA_USE_MDI)
  //     %wxchkver25 void ActivateView(wxView* view, bool activate)
--- 705,708 ----
***************
*** 766,769 ****
--- 744,769 ----
  
  
+ #if (wxLUA_USE_MDI) && ((!wxCHECK_VERSION(2,5,0)) && (wxLUA_USE_MDI))
+ //     !%wxchkver25 void ActivateView(wxView* view, bool activate, bool deleting)
+ static int LUACALL wxLua_wxDocManager_ActivateView(lua_State *L)
+ {
+     wxLuaState wxlState(L);
+     // bool deleting
+     bool deleting = wxlState.GetBooleanType(4);
+     // bool activate
+     bool activate = wxlState.GetBooleanType(3);
+     // wxView view
+     wxView * view = (wxView *)wxlState.GetUserDataType(2, s_wxluatag_wxView);
+     // get this
+     wxDocManager * self = (wxDocManager *)wxlState.GetUserDataType(1, s_wxluatag_wxDocManager);
+     // call ActivateView
+     self->ActivateView(view, activate, deleting);
+ 
+     return 0;
+ }
+ 
+ #endif // (wxLUA_USE_MDI) && ((!wxCHECK_VERSION(2,5,0)) && (wxLUA_USE_MDI))
+ 
+ 
  #if (wxLUA_USE_MDI) && (wxLUA_USE_wxConfig)
  //     void FileHistoryLoad(wxConfigBase& config)
***************
*** 1330,1338 ****
  
  
- #if ((wxCHECK_VERSION(2,2,0) && !wxCHECK_VERSION(2,5,0)) && (wxLUA_USE_MDI)) && (wxLUA_USE_MDI)
-     { LuaMethod, "ActivateView", wxLua_wxDocManager_ActivateView, 3, 3, { &s_wxluatag_wxView, &s_wxluaarg_Boolean, &s_wxluaarg_Boolean, 0 } },
- #endif  // ((wxCHECK_VERSION(2,2,0) && !wxCHECK_VERSION(2,5,0)) && (wxLUA_USE_MDI)) && (wxLUA_USE_MDI)
- 
- 
  #if ((wxCHECK_VERSION(2,5,0)) && (wxLUA_USE_MDI)) && (wxLUA_USE_MDI)
      { LuaMethod, "ActivateView", wxLua_wxDocManager_ActivateView, 2, 2, { &s_wxluatag_wxView, &s_wxluaarg_Boolean, 0 } },
--- 1330,1333 ----
***************
*** 1345,1348 ****
--- 1340,1348 ----
  
  
+ #if (wxLUA_USE_MDI) && ((!wxCHECK_VERSION(2,5,0)) && (wxLUA_USE_MDI))
+     { LuaMethod, "ActivateView", wxLua_wxDocManager_ActivateView, 3, 3, { &s_wxluatag_wxView, &s_wxluaarg_Boolean, &s_wxluaarg_Boolean, 0 } },
+ #endif  // (wxLUA_USE_MDI) && ((!wxCHECK_VERSION(2,5,0)) && (wxLUA_USE_MDI))
+ 
+ 
  #if (wxLUA_USE_MDI) && (wxLUA_USE_wxConfig)
      { LuaMethod, "FileHistoryLoad", wxLua_wxDocManager_FileHistoryLoad, 1, 1, { &s_wxluatag_wxConfigBase, 0 } },
***************
*** 2784,2820 ****
  
  
- #if ((wxCHECK_VERSION(2,3,0)) && (wxLUA_USE_wxCommandProcessor)) && (wxLUA_USE_wxCommandProcessor)
- //     %wxchkver23 virtual void Store(wxCommand *command)
- static int LUACALL wxLua_wxCommandProcessor_Store(lua_State *L)
- {
-     wxLuaState wxlState(L);
-     // wxCommand command
-     wxCommand * command = (wxCommand *)wxlState.GetUserDataType(2, s_wxluatag_wxCommand);
-     // get this
-     wxCommandProcessor * self = (wxCommandProcessor *)wxlState.GetUserDataType(1, s_wxluatag_wxCommandProcessor);
-     // call Store
-     self->Store(command);
- 
-     return 0;
- }
- 
- //     %wxchkver23 wxCommand *GetCurrentCommand() const
- static int LUACALL wxLua_wxCommandProcessor_GetCurrentCommand(lua_State *L)
- {
-     wxLuaState wxlState(L);
-     wxCommand *returns;
-     // get this
-     wxCommandProcessor * self = (wxCommandProcessor *)wxlState.GetUserDataType(1, s_wxluatag_wxCommandProcessor);
-     // call GetCurrentCommand
-     returns = self->GetCurrentCommand();
-     // push the result datatype
-     wxlState.PushUserDataType(s_wxluatag_wxCommand, returns);
- 
-     return 1;
- }
- 
- #endif // ((wxCHECK_VERSION(2,3,0)) && (wxLUA_USE_wxCommandProcessor)) && (wxLUA_USE_wxCommandProcessor)
- 
- 
  #if (wxLUA_USE_wxList) && (wxLUA_USE_wxCommandProcessor)
  // %override wxLua_wxCommandProcessor_GetCommands
--- 2784,2787 ----
***************
*** 3137,3140 ****
--- 3104,3136 ----
  }
  
+ //     virtual void Store(wxCommand *command)
+ static int LUACALL wxLua_wxCommandProcessor_Store(lua_State *L)
+ {
+     wxLuaState wxlState(L);
+     // wxCommand command
+     wxCommand * command = (wxCommand *)wxlState.GetUserDataType(2, s_wxluatag_wxCommand);
+     // get this
+     wxCommandProcessor * self = (wxCommandProcessor *)wxlState.GetUserDataType(1, s_wxluatag_wxCommandProcessor);
+     // call Store
+     self->Store(command);
+ 
+     return 0;
+ }
+ 
+ //     wxCommand *GetCurrentCommand() const
+ static int LUACALL wxLua_wxCommandProcessor_GetCurrentCommand(lua_State *L)
+ {
+     wxLuaState wxlState(L);
+     wxCommand *returns;
+     // get this
+     wxCommandProcessor * self = (wxCommandProcessor *)wxlState.GetUserDataType(1, s_wxluatag_wxCommandProcessor);
+     // call GetCurrentCommand
+     returns = self->GetCurrentCommand();
+     // push the result datatype
+     wxlState.PushUserDataType(s_wxluatag_wxCommand, returns);
+ 
+     return 1;
+ }
+ 
  static int LUACALL wxLua_wxCommandProcessor_destructor(lua_State *)
  {
***************
*** 3149,3158 ****
  static WXLUAMETHOD s_wxCommandProcessor_methods[] = {
  
- #if ((wxCHECK_VERSION(2,3,0)) && (wxLUA_USE_wxCommandProcessor)) && (wxLUA_USE_wxCommandProcessor)
-     { LuaMethod, "Store", wxLua_wxCommandProcessor_Store, 1, 1, { &s_wxluatag_wxCommand, 0 } },
-     { LuaMethod, "GetCurrentCommand", wxLua_wxCommandProcessor_GetCurrentCommand, 0, 0, { 0 } },
- #endif  // ((wxCHECK_VERSION(2,3,0)) && (wxLUA_USE_wxCommandProcessor)) && (wxLUA_USE_wxCommandProcessor)
- 
- 
  #if (wxLUA_USE_wxList) && (wxLUA_USE_wxCommandProcessor)
      { LuaMethod, "GetCommands", wxLua_wxCommandProcessor_GetCommands, 0, 0, { 0 } },
--- 3145,3148 ----
***************
*** 3183,3186 ****
--- 3173,3178 ----
      { LuaMethod, "SetUndoAccelerator", wxLua_wxCommandProcessor_SetUndoAccelerator, 1, 1, { &s_wxluaarg_String, 0 } },
      { LuaMethod, "Submit", wxLua_wxCommandProcessor_Submit, 2, 1, { &s_wxluatag_wxCommand, &s_wxluaarg_Boolean, 0 } },
+     { LuaMethod, "Store", wxLua_wxCommandProcessor_Store, 1, 1, { &s_wxluatag_wxCommand, 0 } },
+     { LuaMethod, "GetCurrentCommand", wxLua_wxCommandProcessor_GetCurrentCommand, 0, 0, { 0 } },
      { LuaDelete, "wxCommandProcessor", wxLua_wxCommandProcessor_destructor, 0, 0, {0} },
  };

Index: html.cpp
===================================================================
RCS file: /cvsroot/wxlua/wxLua/modules/wxbind/src/html.cpp,v
retrieving revision 1.19
retrieving revision 1.20
diff -C2 -d -r1.19 -r1.20
*** html.cpp	20 Sep 2006 04:07:37 -0000	1.19
--- html.cpp	7 Dec 2006 06:32:43 -0000	1.20
***************
*** 131,167 ****
  #endif // ((wxCHECK_VERSION(2,7,0)) && (wxLUA_USE_wxHTML)) && (wxLUA_USE_wxArrayInt)
  
- 
- #if (wxCHECK_VERSION(2,3,0)) && (wxLUA_USE_wxHTML)
- //     %wxchkver23 virtual wxString GetId() const
- static int LUACALL wxLua_wxHtmlCell_GetId(lua_State *L)
- {
-     wxLuaState wxlState(L);
-     wxString returns;
-     // get this
-     wxHtmlCell * self = (wxHtmlCell *)wxlState.GetUserDataType(1, s_wxluatag_wxHtmlCell);
-   ...
 
[truncated message content]

[Wxlua-commit] wxLua/samples editor.wx.lua, 1.33, 1.34 fldemo.wx.lua, 1.6, 1.7

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

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

Modified Files:
	editor.wx.lua fldemo.wx.lua 
Log Message:
update bindings, better docs, add wxAboutBox for 2.8
fix /* */ in genwxbind.lua
Remove wxPlatformXXX just use __WXMSW__ or whatever


Index: editor.wx.lua
===================================================================
RCS file: /cvsroot/wxlua/wxLua/samples/editor.wx.lua,v
retrieving revision 1.33
retrieving revision 1.34
diff -C2 -d -r1.33 -r1.34
*** editor.wx.lua	5 Dec 2006 23:38:28 -0000	1.33
--- editor.wx.lua	7 Dec 2006 06:32:44 -0000	1.34
***************
*** 1637,1641 ****
                  end
              end
!             if wx.wxPlatformWindows then
                  eventFileName = wx.wxUnix2DosFilename(eventFileName)
              end
--- 1637,1641 ----
                  end
              end
!             if wx.__WXMSW__ then
                  eventFileName = wx.wxUnix2DosFilename(eventFileName)
              end

Index: fldemo.wx.lua
===================================================================
RCS file: /cvsroot/wxlua/wxLua/samples/fldemo.wx.lua,v
retrieving revision 1.6
retrieving revision 1.7
diff -C2 -d -r1.6 -r1.7
*** fldemo.wx.lua	26 Sep 2006 22:22:00 -0000	1.6
--- fldemo.wx.lua	7 Dec 2006 06:32:44 -0000	1.7
***************
*** 90,94 ****
      layout = wx.wxFrameLayout(frame, client)
  
!     if wx.wxPlatformGTK then
          local props = layout:GetPaneProperties()
          props:SetRealTimeUpdates(false)
--- 90,94 ----
      layout = wx.wxFrameLayout(frame, client)
  
!     if wx.__WXGTK__ then
          local props = layout:GetPaneProperties()
          props:SetRealTimeUpdates(false)

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

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

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

Modified Files:
	wxldefs.h 
Log Message:
update bindings, better docs, add wxAboutBox for 2.8
fix /* */ in genwxbind.lua
Remove wxPlatformXXX just use __WXMSW__ or whatever


Index: wxldefs.h
===================================================================
RCS file: /cvsroot/wxlua/wxLua/modules/wxlua/include/wxldefs.h,v
retrieving revision 1.7
retrieving revision 1.8
diff -C2 -d -r1.7 -r1.8
*** wxldefs.h	28 Aug 2006 05:26:20 -0000	1.7
--- wxldefs.h	7 Dec 2006 06:32:44 -0000	1.8
***************
*** 30,34 ****
  #define WXLUA_RELEASE_VERSION    3
  #define WXLUA_SUBRELEASE_VERSION 0
! #define WXLUA_VERSION_STRING    _T("wxLua 2.6.3")
  
  // For non-Unix systems (i.e. when building without a configure script),
--- 30,34 ----
  #define WXLUA_RELEASE_VERSION    3
  #define WXLUA_SUBRELEASE_VERSION 0
! #define WXLUA_VERSION_STRING    wxT("wxLua 2.6.3")
  
  // For non-Unix systems (i.e. when building without a configure script),
***************
*** 41,56 ****
  
  // ----------------------------------------------------------------------------
- // Strings pushed into lua to determine the platform
- // ----------------------------------------------------------------------------
- 
- #if defined(__WXGTK__)
-     #define wxPlatformGTK     wxVERSION_NUMBER
- #elif  defined(__WXMSW__)
-     #define wxPlatformWindows wxVERSION_NUMBER
- #elif  defined(__WXMAC__)
-     #define wxPlatformMac     wxVERSION_NUMBER
- #endif
- 
- // ----------------------------------------------------------------------------
  // If you're using stdcall in Lua, then override this with
  //   "LUACALL = __stdcall" in your makefile or project.
--- 41,44 ----

[Wxlua-commit] wxLua/modules/wxbind/setup wxluasetup.h,1.10,1.11

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

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

Modified Files:
	wxluasetup.h 
Log Message:
update bindings, better docs, add wxAboutBox for 2.8
fix /* */ in genwxbind.lua
Remove wxPlatformXXX just use __WXMSW__ or whatever


Index: wxluasetup.h
===================================================================
RCS file: /cvsroot/wxlua/wxLua/modules/wxbind/setup/wxluasetup.h,v
retrieving revision 1.10
retrieving revision 1.11
diff -C2 -d -r1.10 -r1.11
*** wxluasetup.h	2 Nov 2006 23:38:09 -0000	1.10
--- wxluasetup.h	7 Dec 2006 06:32:43 -0000	1.11
***************
*** 7,10 ****
--- 7,11 ----
  #define wxLUA_USE_Geometry                      1
  #define wxLUA_USE_MDI                           1
+ #define wxLUA_USE_wxAboutDialog                 1
  #define wxLUA_USE_wxAcceleratorTable            1
  #define wxLUA_USE_wxApp                         1

[Wxlua-commit] wxLua/modules/wxbind/include wxbind.h,1.42,1.43

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

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

Modified Files:
	wxbind.h 
Log Message:
update bindings, better docs, add wxAboutBox for 2.8
fix /* */ in genwxbind.lua
Remove wxPlatformXXX just use __WXMSW__ or whatever


Index: wxbind.h
===================================================================
RCS file: /cvsroot/wxlua/wxLua/modules/wxbind/include/wxbind.h,v
retrieving revision 1.42
retrieving revision 1.43
diff -C2 -d -r1.42 -r1.43
*** wxbind.h	22 Nov 2006 06:08:33 -0000	1.42
--- wxbind.h	7 Dec 2006 06:32:42 -0000	1.43
***************
*** 66,69 ****
--- 66,77 ----
  #endif // (!defined(__WXMSW__)) && (wxLUA_USE_wxHelpController) && (wxUSE_HELP)
  
+ #if (!wxCHECK_VERSION(2,5,0)) && (wxLUA_USE_wxToolbar)
+     #include "wx/tbarsmpl.h"
+ #endif // (!wxCHECK_VERSION(2,5,0)) && (wxLUA_USE_wxToolbar)
+ 
+ #if (!wxCHECK_VERSION(2,5,0)) && (wxLUA_USE_wxXMLResource)
+     #include "wx/xrc/xml.h"
+ #endif // (!wxCHECK_VERSION(2,5,0)) && (wxLUA_USE_wxXMLResource)
+ 
  #if (defined(__WXMSW__) || defined(__WXMAC__) || defined(__WXPM__)) && (wxLUA_USE_wxMetafile)
      #include "wx/metafile.h"
***************
*** 78,93 ****
  #endif // (defined(__WXMSW__)) && (wxLUA_USE_wxHelpController) && (wxUSE_HELP)
  
- #if (wxCHECK_VERSION(2,2,0) && !wxCHECK_VERSION(2,5,0)) && (wxLUA_USE_wxToolbar)
-     #include "wx/tbarsmpl.h"
- #endif // (wxCHECK_VERSION(2,2,0) && !wxCHECK_VERSION(2,5,0)) && (wxLUA_USE_wxToolbar)
- 
- #if (wxCHECK_VERSION(2,2,0) && !wxCHECK_VERSION(2,5,0)) && (wxLUA_USE_wxXMLResource)
-     #include "wx/xrc/xml.h"
- #endif // (wxCHECK_VERSION(2,2,0) && !wxCHECK_VERSION(2,5,0)) && (wxLUA_USE_wxXMLResource)
- 
- #if (wxCHECK_VERSION(2,3,0)) && (wxLUA_USE_wxCommandProcessor)
-     #include "wx/cmdproc.h"
- #endif // (wxCHECK_VERSION(2,3,0)) && (wxLUA_USE_wxCommandProcessor)
- 
  #if (wxCHECK_VERSION(2,4,0) && defined(__WXMSW__)) && (wxLUA_USE_wxTabCtrl)
      #include "wx/tabctrl.h"
--- 86,89 ----
***************
*** 106,113 ****
  #endif // (wxLUA_USE_wxBitmapButton) && (wxLUA_USE_wxButton)
  
- #if (wxLUA_USE_wxCheckListBox) && (wxLUA_USE_wxListBox)
-     #include "wx/checklst.h"
- #endif // (wxLUA_USE_wxCheckListBox) && (wxLUA_USE_wxListBox)
- 
  #if (wxLUA_USE_wxHelpController) && (wxUSE_HELP)
      #include "wx/help.h"
--- 102,105 ----
***************
*** 123,126 ****
--- 115,122 ----
  #endif // (wxLUA_USE_wxMiniFrame) && (wxLUA_USE_wxFrame)
  
+ #if (wxUSE_CHECKLISTBOX && wxLUA_USE_wxCheckListBox) && (wxUSE_LISTBOX && wxLUA_USE_wxListBox)
+     #include "wx/checklst.h"
+ #endif // (wxUSE_CHECKLISTBOX && wxLUA_USE_wxCheckListBox) && (wxUSE_LISTBOX && wxLUA_USE_wxListBox)
+ 
  #if (wxUSE_PRINTING_ARCHITECTURE && wxUSE_POSTSCRIPT) && (wxLUA_USE_wxPrint)
      #include "wx/dcps.h"
***************
*** 149,152 ****
--- 145,152 ----
  #endif // wxCHECK_VERSION(2,4,0)
  
+ #if wxCHECK_VERSION(2,8,0) && wxUSE_ABOUTDLG && wxLUA_USE_wxAboutDialog
+     #include "wx/aboutdlg.h"
+ #endif // wxCHECK_VERSION(2,8,0) && wxUSE_ABOUTDLG && wxLUA_USE_wxAboutDialog
+ 
  #if wxLUA_USE_Geometry
      #include "wx/geometry.h"
***************
*** 224,232 ****
  #endif // wxLUA_USE_wxClipboard
  
- #if wxLUA_USE_wxColourDialog
-     #include "wx/cmndata.h"
-     #include "wx/colordlg.h"
- #endif // wxLUA_USE_wxColourDialog
- 
  #if wxLUA_USE_wxColourPenBrush
      #include "wx/brush.h"
--- 224,227 ----
***************
*** 236,242 ****
  #endif // wxLUA_USE_wxColourPenBrush
  
! #if wxLUA_USE_wxComboBox
!     #include "wx/combobox.h"
! #endif // wxLUA_USE_wxComboBox
  
  #if wxLUA_USE_wxConfig
--- 231,237 ----
  #endif // wxLUA_USE_wxColourPenBrush
  
! #if wxLUA_USE_wxCommandProcessor
!     #include "wx/cmdproc.h"
! #endif // wxLUA_USE_wxCommandProcessor
  
  #if wxLUA_USE_wxConfig
***************
*** 316,332 ****
  #endif // wxLUA_USE_wxFileName
  
- #if wxLUA_USE_wxFindReplaceDialog
-     #include "wx/fdrepdlg.h"
- #endif // wxLUA_USE_wxFindReplaceDialog
- 
  #if wxLUA_USE_wxFont
      #include "wx/font.h"
  #endif // wxLUA_USE_wxFont
  
- #if wxLUA_USE_wxFontDialog
-     #include "wx/cmndata.h"
-     #include "wx/fontdlg.h"
- #endif // wxLUA_USE_wxFontDialog
- 
  #if wxLUA_USE_wxFontEnumerator
      #include "wx/fontenum.h"
--- 311,318 ----
***************
*** 349,356 ****
  #endif // wxLUA_USE_wxGLCanvas && wxUSE_GLCANVAS
  
- #if wxLUA_USE_wxGauge
-     #include "wx/gauge.h"
- #endif // wxLUA_USE_wxGauge
- 
  #if wxLUA_USE_wxGenericDirCtrl && wxUSE_DIRDLG
      #include "wx/dirctrl.h"
--- 335,338 ----
***************
*** 403,414 ****
  #endif // wxLUA_USE_wxList
  
- #if wxLUA_USE_wxListBox
-     #include "wx/listbox.h"
- #endif // wxLUA_USE_wxListBox
- 
- #if wxLUA_USE_wxListCtrl
-     #include "wx/listctrl.h"
- #endif // wxLUA_USE_wxListCtrl
- 
  #if wxLUA_USE_wxLuaHtmlWindow
      #include "wxbind/include/wxlhtmlwin.h"
--- 385,388 ----
***************
*** 460,475 ****
  #endif // wxLUA_USE_wxPrint
  
- #if wxLUA_USE_wxProgressDialog
-     #include "wx/generic/progdlgg.h"
- #endif // wxLUA_USE_wxProgressDialog
- 
- #if wxLUA_USE_wxRadioBox
-     #include "wx/radiobox.h"
- #endif // wxLUA_USE_wxRadioBox
- 
- #if wxLUA_USE_wxRadioButton
-     #include "wx/radiobut.h"
- #endif // wxLUA_USE_wxRadioButton
- 
  #if wxLUA_USE_wxRegEx
      #include "wx/regex.h"
--- 434,437 ----
***************
*** 588,599 ****
  #endif // wxLUA_USE_wxValidator
  
- #if wxLUA_USE_wxWizard
-     #include "wx/wizard.h"
- #endif // wxLUA_USE_wxWizard
- 
  #if wxLUA_USE_wxXMLResource
      #include "wx/xrc/xmlres.h"
  #endif // wxLUA_USE_wxXMLResource
  
  #if wxUSE_STREAMS
      #include "wx/stream.h"
--- 550,599 ----
  #endif // wxLUA_USE_wxValidator
  
  #if wxLUA_USE_wxXMLResource
      #include "wx/xrc/xmlres.h"
  #endif // wxLUA_USE_wxXMLResource
  
+ #if wxUSE_COLOURDLG && wxLUA_USE_wxColourDialog
+     #include "wx/cmndata.h"
+     #include "wx/colordlg.h"
+ #endif // wxUSE_COLOURDLG && wxLUA_USE_wxColourDialog
+ 
+ #if wxUSE_COMBOBOX && wxLUA_USE_wxComboBox
+     #include "wx/combobox.h"
+ #endif // wxUSE_COMBOBOX && wxLUA_USE_wxComboBox
+ 
+ #if wxUSE_FINDREPLDLG && wxLUA_USE_wxFindReplaceDialog
+     #include "wx/fdrepdlg.h"
+ #endif // wxUSE_FINDREPLDLG && wxLUA_USE_wxFindReplaceDialog
+ 
+ #if wxUSE_FONTDLG && wxLUA_USE_wxFontDialog
+     #include "wx/cmndata.h"
+     #include "wx/fontdlg.h"
+ #endif // wxUSE_FONTDLG && wxLUA_USE_wxFontDialog
+ 
+ #if wxUSE_GAUGE && wxLUA_USE_wxGauge
+     #include "wx/gauge.h"
+ #endif // wxUSE_GAUGE && wxLUA_USE_wxGauge
+ 
+ #if wxUSE_LISTBOX && wxLUA_USE_wxListBox
+     #include "wx/listbox.h"
+ #endif // wxUSE_LISTBOX && wxLUA_USE_wxListBox
+ 
+ #if wxUSE_LISTCTRL && wxLUA_USE_wxListCtrl
+     #include "wx/listctrl.h"
+ #endif // wxUSE_LISTCTRL && wxLUA_USE_wxListCtrl
+ 
+ #if wxUSE_PROGRESSDLG && wxLUA_USE_wxProgressDialog
+     #include "wx/generic/progdlgg.h"
+ #endif // wxUSE_PROGRESSDLG && wxLUA_USE_wxProgressDialog
+ 
+ #if wxUSE_RADIOBOX && wxLUA_USE_wxRadioBox
+     #include "wx/radiobox.h"
+ #endif // wxUSE_RADIOBOX && wxLUA_USE_wxRadioBox
+ 
+ #if wxUSE_RADIOBTN && wxLUA_USE_wxRadioButton
+     #include "wx/radiobut.h"
+ #endif // wxUSE_RADIOBTN && wxLUA_USE_wxRadioButton
+ 
  #if wxUSE_STREAMS
      #include "wx/stream.h"
***************
*** 602,605 ****
--- 602,609 ----
  #endif // wxUSE_STREAMS
  
+ #if wxUSE_WIZARDDLG && wxLUA_USE_wxWizard
+     #include "wx/wizard.h"
+ #endif // wxUSE_WIZARDDLG && wxLUA_USE_wxWizard
+ 
  
  // ----------------------------------------------------------------------------
***************
*** 611,614 ****
--- 615,622 ----
  #endif // (!defined(__WXMSW__)) && (wxLUA_USE_wxHelpController) && (wxUSE_HELP)
  
+ #if (!wxCHECK_VERSION(2,5,0)) && (wxLUA_USE_wxToolbar)
+     extern WXDLLIMPEXP_DATA_WXBIND(int) s_wxluatag_wxToolBarSimple;
+ #endif // (!wxCHECK_VERSION(2,5,0)) && (wxLUA_USE_wxToolbar)
+ 
  #if (defined(__WXMSW__) || defined(__WXMAC__) || defined(__WXPM__)) && (wxLUA_USE_wxMetafile)
      extern WXDLLIMPEXP_DATA_WXBIND(int) s_wxluatag_wxMetafile;
***************
*** 630,645 ****
  #endif // (defined(__WXMSW__)) && (wxLUA_USE_wxHelpController) && (wxUSE_HELP)
  
- #if (wxCHECK_VERSION(2,2,0) && !wxCHECK_VERSION(2,5,0) || (defined(WXWIN_COMPATIBILITY_2_4) && WXWIN_COMPATIBILITY_2_4)) && (wxUSE_LOG) && (wxLUA_USE_wxApp)
-     extern WXDLLIMPEXP_DATA_WXBIND(int) s_wxluatag_wxLog;
- #endif // (wxCHECK_VERSION(2,2,0) && !wxCHECK_VERSION(2,5,0) || (defined(WXWIN_COMPATIBILITY_2_4) && WXWIN_COMPATIBILITY_2_4)) && (wxUSE_LOG) && (wxLUA_USE_wxApp)
- 
- #if (wxCHECK_VERSION(2,2,0) && !wxCHECK_VERSION(2,5,0)) && (wxLUA_USE_wxToolbar)
-     extern WXDLLIMPEXP_DATA_WXBIND(int) s_wxluatag_wxToolBarSimple;
- #endif // (wxCHECK_VERSION(2,2,0) && !wxCHECK_VERSION(2,5,0)) && (wxLUA_USE_wxToolbar)
- 
- #if (wxCHECK_VERSION(2,3,0)) && (wxLUA_USE_wxGrid)
-     extern WXDLLIMPEXP_DATA_WXBIND(int) s_wxluatag_wxGridEditorCreatedEvent;
- #endif // (wxCHECK_VERSION(2,3,0)) && (wxLUA_USE_wxGrid)
- 
  #if (wxCHECK_VERSION(2,4,0) && defined(__WXMSW__)) && (wxLUA_USE_wxTabCtrl)
      extern WXDLLIMPEXP_DATA_WXBIND(int) s_wxluatag_wxTabCtrl;
--- 638,641 ----
***************
*** 663,670 ****
  #endif // (wxLUA_USE_wxBrushList) && (wxLUA_USE_wxColourPenBrush)
  
- #if (wxLUA_USE_wxCheckListBox) && (wxLUA_USE_wxListBox)
-     extern WXDLLIMPEXP_DATA_WXBIND(int) s_wxluatag_wxCheckListBox;
- #endif // (wxLUA_USE_wxCheckListBox) && (wxLUA_USE_wxListBox)
- 
  #if (wxLUA_USE_wxHelpController) && (wxUSE_HELP)
      extern WXDLLIMPEXP_DATA_WXBIND(int) s_wxluatag_wxHelpController;
--- 659,662 ----
***************
*** 690,693 ****
--- 682,689 ----
  #endif // (wxLUA_USE_wxPenList) && (wxLUA_USE_wxColourPenBrush)
  
+ #if (wxUSE_CHECKLISTBOX && wxLUA_USE_wxCheckListBox) && (wxUSE_LISTBOX && wxLUA_USE_wxListBox)
+     extern WXDLLIMPEXP_DATA_WXBIND(int) s_wxluatag_wxCheckListBox;
+ #endif // (wxUSE_CHECKLISTBOX && wxLUA_USE_wxCheckListBox) && (wxUSE_LISTBOX && wxLUA_USE_wxListBox)
+ 
  #if (wxUSE_GIF) && (wxLUA_USE_wxImage)
      extern WXDLLIMPEXP_DATA_WXBIND(int) s_wxluatag_wxGIFHandler;
***************
*** 750,753 ****
--- 746,750 ----
  extern WXDLLIMPEXP_DATA_WXBIND(int) s_wxluatag_wxFocusEvent;
  extern WXDLLIMPEXP_DATA_WXBIND(int) s_wxluatag_wxGDIObject;
+ extern WXDLLIMPEXP_DATA_WXBIND(int) s_wxluatag_wxHelpEvent;
  extern WXDLLIMPEXP_DATA_WXBIND(int) s_wxluatag_wxIconizeEvent;
  extern WXDLLIMPEXP_DATA_WXBIND(int) s_wxluatag_wxIdleEvent;
***************
*** 778,789 ****
  extern WXDLLIMPEXP_DATA_WXBIND(int) s_wxluatag_wxWindowDisabler;
  
- #if wxCHECK_VERSION(2,3,0)
-     extern WXDLLIMPEXP_DATA_WXBIND(int) s_wxluatag_wxHelpEvent;
- #endif // wxCHECK_VERSION(2,3,0)
- 
  #if wxCHECK_VERSION(2,7,0)
      extern WXDLLIMPEXP_DATA_WXBIND(int) s_wxluatag_wxMouseState;
  #endif // wxCHECK_VERSION(2,7,0)
  
  #if wxLUA_USE_Geometry
      extern WXDLLIMPEXP_DATA_WXBIND(int) s_wxluatag_wxPoint2DDouble;
--- 775,786 ----
  extern WXDLLIMPEXP_DATA_WXBIND(int) s_wxluatag_wxWindowDisabler;
  
  #if wxCHECK_VERSION(2,7,0)
      extern WXDLLIMPEXP_DATA_WXBIND(int) s_wxluatag_wxMouseState;
  #endif // wxCHECK_VERSION(2,7,0)
  
+ #if wxCHECK_VERSION(2,8,0) && wxUSE_ABOUTDLG && wxLUA_USE_wxAboutDialog
+     extern WXDLLIMPEXP_DATA_WXBIND(int) s_wxluatag_wxAboutDialogInfo;
+ #endif // wxCHECK_VERSION(2,8,0) && wxUSE_ABOUTDLG && wxLUA_USE_wxAboutDialog
+ 
  #if wxLUA_USE_Geometry
      extern WXDLLIMPEXP_DATA_WXBIND(int) s_wxluatag_wxPoint2DDouble;
***************
*** 873,881 ****
  #endif // wxLUA_USE_wxClipboard
  
- #if wxLUA_USE_wxColourDialog
-     extern WXDLLIMPEXP_DATA_WXBIND(int) s_wxluatag_wxColourData;
-     extern WXDLLIMPEXP_DATA_WXBIND(int) s_wxluatag_wxColourDialog;
- #endif // wxLUA_USE_wxColourDialog
- 
  #if wxLUA_USE_wxColourPenBrush
      extern WXDLLIMPEXP_DATA_WXBIND(int) s_wxluatag_wxBrush;
--- 870,873 ----
***************
*** 885,892 ****
  #endif // wxLUA_USE_wxColourPenBrush
  
- #if wxLUA_USE_wxComboBox
-     extern WXDLLIMPEXP_DATA_WXBIND(int) s_wxluatag_wxComboBox;
- #endif // wxLUA_USE_wxComboBox
- 
  #if wxLUA_USE_wxCommandProcessor
      extern WXDLLIMPEXP_DATA_WXBIND(int) s_wxluatag_wxCommand;
--- 877,880 ----
***************
*** 993,1011 ****
  #endif // wxLUA_USE_wxFileName
  
- #if wxLUA_USE_wxFindReplaceDialog
-     extern WXDLLIMPEXP_DATA_WXBIND(int) s_wxluatag_wxFindDialogEvent;
-     extern WXDLLIMPEXP_DATA_WXBIND(int) s_wxluatag_wxFindReplaceData;
-     extern WXDLLIMPEXP_DATA_WXBIND(int) s_wxluatag_wxFindReplaceDialog;
- #endif // wxLUA_USE_wxFindReplaceDialog
- 
  #if wxLUA_USE_wxFont
      extern WXDLLIMPEXP_DATA_WXBIND(int) s_wxluatag_wxFont;
  #endif // wxLUA_USE_wxFont
  
- #if wxLUA_USE_wxFontDialog
-     extern WXDLLIMPEXP_DATA_WXBIND(int) s_wxluatag_wxFontData;
-     extern WXDLLIMPEXP_DATA_WXBIND(int) s_wxluatag_wxFontDialog;
- #endif // wxLUA_USE_wxFontDialog
- 
  #if wxLUA_USE_wxFontEnumerator
      extern WXDLLIMPEXP_DATA_WXBIND(int) s_wxluatag_wxFontEnumerator;
--- 981,988 ----
***************
*** 1033,1040 ****
  #endif // wxLUA_USE_wxGLCanvas && wxUSE_GLCANVAS
  
- #if wxLUA_USE_wxGauge
-     extern WXDLLIMPEXP_DATA_WXBIND(int) s_wxluatag_wxGauge;
- #endif // wxLUA_USE_wxGauge
- 
  #if wxLUA_USE_wxGenericDirCtrl && wxUSE_DIRDLG
      extern WXDLLIMPEXP_DATA_WXBIND(int) s_wxluatag_wxGenericDirCtrl;
--- 1010,1013 ----
***************
*** 1067,1070 ****
--- 1040,1044 ----
      extern WXDLLIMPEXP_DATA_WXBIND(int) s_wxluatag_wxGridCellTextEditor;
      extern WXDLLIMPEXP_DATA_WXBIND(int) s_wxluatag_wxGridCellWorker;
+     extern WXDLLIMPEXP_DATA_WXBIND(int) s_wxluatag_wxGridEditorCreatedEvent;
      extern WXDLLIMPEXP_DATA_WXBIND(int) s_wxluatag_wxGridEvent;
      extern WXDLLIMPEXP_DATA_WXBIND(int) s_wxluatag_wxGridRangeSelectEvent;
***************
*** 1119,1134 ****
  #endif // wxLUA_USE_wxList
  
- #if wxLUA_USE_wxListBox
-     extern WXDLLIMPEXP_DATA_WXBIND(int) s_wxluatag_wxListBox;
- #endif // wxLUA_USE_wxListBox
- 
- #if wxLUA_USE_wxListCtrl
-     extern WXDLLIMPEXP_DATA_WXBIND(int) s_wxluatag_wxListCtrl;
-     extern WXDLLIMPEXP_DATA_WXBIND(int) s_wxluatag_wxListEvent;
-     extern WXDLLIMPEXP_DATA_WXBIND(int) s_wxluatag_wxListItem;
-     extern WXDLLIMPEXP_DATA_WXBIND(int) s_wxluatag_wxListItemAttr;
-     extern WXDLLIMPEXP_DATA_WXBIND(int) s_wxluatag_wxListView;
- #endif // wxLUA_USE_wxListCtrl
- 
  #if wxLUA_USE_wxLuaHtmlWindow
      extern WXDLLIMPEXP_DATA_WXBIND(int) s_wxluatag_wxLuaHtmlWinTagEvent;
--- 1093,1096 ----
***************
*** 1161,1168 ****
  #endif // wxLUA_USE_wxMessageDialog
  
- #if wxLUA_USE_wxMultiChoiceDialog
-     extern WXDLLIMPEXP_DATA_WXBIND(int) s_wxluatag_wxMultiChoiceDialog;
- #endif // wxLUA_USE_wxMultiChoiceDialog
- 
  #if wxLUA_USE_wxNotebook
      extern WXDLLIMPEXP_DATA_WXBIND(int) s_wxluatag_wxBookCtrlBase;
--- 1123,1126 ----
***************
*** 1212,1227 ****
  #endif // wxLUA_USE_wxProcess
  
- #if wxLUA_USE_wxProgressDialog
-     extern WXDLLIMPEXP_DATA_WXBIND(int) s_wxluatag_wxProgressDialog;
- #endif // wxLUA_USE_wxProgressDialog
- 
- #if wxLUA_USE_wxRadioBox
-     extern WXDLLIMPEXP_DATA_WXBIND(int) s_wxluatag_wxRadioBox;
- #endif // wxLUA_USE_wxRadioBox
- 
- #if wxLUA_USE_wxRadioButton
-     extern WXDLLIMPEXP_DATA_WXBIND(int) s_wxluatag_wxRadioButton;
- #endif // wxLUA_USE_wxRadioButton
- 
  #if wxLUA_USE_wxRegEx
      extern WXDLLIMPEXP_DATA_WXBIND(int) s_wxluatag_wxRegEx;
--- 1170,1173 ----
***************
*** 1250,1257 ****
  #endif // wxLUA_USE_wxScrolledWindow
  
- #if wxLUA_USE_wxSingleChoiceDialog
-     extern WXDLLIMPEXP_DATA_WXBIND(int) s_wxluatag_wxSingleChoiceDialog;
- #endif // wxLUA_USE_wxSingleChoiceDialog
- 
  #if wxLUA_USE_wxSizer
      extern WXDLLIMPEXP_DATA_WXBIND(int) s_wxluatag_wxBoxSizer;
--- 1196,1199 ----
***************
*** 1343,1351 ****
  #endif // wxLUA_USE_wxTextCtrl
  
- #if wxLUA_USE_wxTextEntryDialog
-     extern WXDLLIMPEXP_DATA_WXBIND(int) s_wxluatag_wxPasswordEntryDialog;
-     extern WXDLLIMPEXP_DATA_WXBIND(int) s_wxluatag_wxTextEntryDialog;
- #endif // wxLUA_USE_wxTextEntryDialog
- 
  #if wxLUA_USE_wxTextValidator
      extern WXDLLIMPEXP_DATA_WXBIND(int) s_wxluatag_wxTextValidator;
--- 1285,1288 ----
***************
*** 1394,1404 ****
  #endif // wxLUA_USE_wxWindowList
  
- #if wxLUA_USE_wxWizard
-     extern WXDLLIMPEXP_DATA_WXBIND(int) s_wxluatag_wxWizard;
-     extern WXDLLIMPEXP_DATA_WXBIND(int) s_wxluatag_wxWizardEvent;
-     extern WXDLLIMPEXP_DATA_WXBIND(int) s_wxluatag_wxWizardPage;
-     extern WXDLLIMPEXP_DATA_WXBIND(int) s_wxluatag_wxWizardPageSimple;
- #endif // wxLUA_USE_wxWizard
- 
  #if wxLUA_USE_wxXMLResource
      extern WXDLLIMPEXP_DATA_WXBIND(int) s_wxluatag_wxXmlDocument;
--- 1331,1334 ----
***************
*** 1409,1412 ****
--- 1339,1398 ----
  #endif // wxLUA_USE_wxXMLResource
  
+ #if wxUSE_CHOICEDLG && wxLUA_USE_wxMultiChoiceDialog
+     extern WXDLLIMPEXP_DATA_WXBIND(int) s_wxluatag_wxMultiChoiceDialog;
+ #endif // wxUSE_CHOICEDLG && wxLUA_USE_wxMultiChoiceDialog
+ 
+ #if wxUSE_CHOICEDLG && wxLUA_USE_wxSingleChoiceDialog
+     extern WXDLLIMPEXP_DATA_WXBIND(int) s_wxluatag_wxSingleChoiceDialog;
+ #endif // wxUSE_CHOICEDLG && wxLUA_USE_wxSingleChoiceDialog
+ 
+ #if wxUSE_COLOURDLG && wxLUA_USE_wxColourDialog
+     extern WXDLLIMPEXP_DATA_WXBIND(int) s_wxluatag_wxColourData;
+     extern WXDLLIMPEXP_DATA_WXBIND(int) s_wxluatag_wxColourDialog;
+ #endif // wxUSE_COLOURDLG && wxLUA_USE_wxColourDialog
+ 
+ #if wxUSE_COMBOBOX && wxLUA_USE_wxComboBox
+     extern WXDLLIMPEXP_DATA_WXBIND(int) s_wxluatag_wxComboBox;
+ #endif // wxUSE_COMBOBOX && wxLUA_USE_wxComboBox
+ 
+ #if wxUSE_FINDREPLDLG && wxLUA_USE_wxFindReplaceDialog
+     extern WXDLLIMPEXP_DATA_WXBIND(int) s_wxluatag_wxFindDialogEvent;
+     extern WXDLLIMPEXP_DATA_WXBIND(int) s_wxluatag_wxFindReplaceData;
+     extern WXDLLIMPEXP_DATA_WXBIND(int) s_wxluatag_wxFindReplaceDialog;
+ #endif // wxUSE_FINDREPLDLG && wxLUA_USE_wxFindReplaceDialog
+ 
+ #if wxUSE_FONTDLG && wxLUA_USE_wxFontDialog
+     extern WXDLLIMPEXP_DATA_WXBIND(int) s_wxluatag_wxFontData;
+     extern WXDLLIMPEXP_DATA_WXBIND(int) s_wxluatag_wxFontDialog;
+ #endif // wxUSE_FONTDLG && wxLUA_USE_wxFontDialog
+ 
+ #if wxUSE_GAUGE && wxLUA_USE_wxGauge
+     extern WXDLLIMPEXP_DATA_WXBIND(int) s_wxluatag_wxGauge;
+ #endif // wxUSE_GAUGE && wxLUA_USE_wxGauge
+ 
+ #if wxUSE_LISTBOX && wxLUA_USE_wxListBox
+     extern WXDLLIMPEXP_DATA_WXBIND(int) s_wxluatag_wxListBox;
+ #endif // wxUSE_LISTBOX && wxLUA_USE_wxListBox
+ 
+ #if wxUSE_LISTCTRL && wxLUA_USE_wxListCtrl
+     extern WXDLLIMPEXP_DATA_WXBIND(int) s_wxluatag_wxListCtrl;
+     extern WXDLLIMPEXP_DATA_WXBIND(int) s_wxluatag_wxListEvent;
+     extern WXDLLIMPEXP_DATA_WXBIND(int) s_wxluatag_wxListItem;
+     extern WXDLLIMPEXP_DATA_WXBIND(int) s_wxluatag_wxListItemAttr;
+     extern WXDLLIMPEXP_DATA_WXBIND(int) s_wxluatag_wxListView;
+ #endif // wxUSE_LISTCTRL && wxLUA_USE_wxListCtrl
+ 
+ #if wxUSE_PROGRESSDLG && wxLUA_USE_wxProgressDialog
+     extern WXDLLIMPEXP_DATA_WXBIND(int) s_wxluatag_wxProgressDialog;
+ #endif // wxUSE_PROGRESSDLG && wxLUA_USE_wxProgressDialog
+ 
+ #if wxUSE_RADIOBOX && wxLUA_USE_wxRadioBox
+     extern WXDLLIMPEXP_DATA_WXBIND(int) s_wxluatag_wxRadioBox;
+ #endif // wxUSE_RADIOBOX && wxLUA_USE_wxRadioBox
+ 
+ #if wxUSE_RADIOBTN && wxLUA_USE_wxRadioButton
+     extern WXDLLIMPEXP_DATA_WXBIND(int) s_wxluatag_wxRadioButton;
+ #endif // wxUSE_RADIOBTN && wxLUA_USE_wxRadioButton
+ 
  #if wxUSE_STREAMS
      extern WXDLLIMPEXP_DATA_WXBIND(int) s_wxluatag_wxFileInputStream;
***************
*** 1417,1420 ****
--- 1403,1418 ----
  #endif // wxUSE_STREAMS
  
+ #if wxUSE_TEXTDLG && wxLUA_USE_wxTextEntryDialog
+     extern WXDLLIMPEXP_DATA_WXBIND(int) s_wxluatag_wxPasswordEntryDialog;
+     extern WXDLLIMPEXP_DATA_WXBIND(int) s_wxluatag_wxTextEntryDialog;
+ #endif // wxUSE_TEXTDLG && wxLUA_USE_wxTextEntryDialog
+ 
+ #if wxUSE_WIZARDDLG && wxLUA_USE_wxWizard
+     extern WXDLLIMPEXP_DATA_WXBIND(int) s_wxluatag_wxWizard;
+     extern WXDLLIMPEXP_DATA_WXBIND(int) s_wxluatag_wxWizardEvent;
+     extern WXDLLIMPEXP_DATA_WXBIND(int) s_wxluatag_wxWizardPage;
+     extern WXDLLIMPEXP_DATA_WXBIND(int) s_wxluatag_wxWizardPageSimple;
+ #endif // wxUSE_WIZARDDLG && wxLUA_USE_wxWizard
+ 
  
  
***************
*** 1428,1431 ****
--- 1426,1434 ----
  #endif // (!defined(__WXMSW__)) && (wxLUA_USE_wxHelpController) && (wxUSE_HELP)
  
+ #if (!wxCHECK_VERSION(2,5,0)) && (wxLUA_USE_wxToolbar)
+     extern WXDLLIMPEXP_WXBIND WXLUAMETHOD* wxToolBarSimple_methods;
+     extern WXDLLIMPEXP_DATA_WXBIND(int) wxToolBarSimple_methodCount;
+ #endif // (!wxCHECK_VERSION(2,5,0)) && (wxLUA_USE_wxToolbar)
+ 
  #if (defined(__WXMSW__) || defined(__WXMAC__) || defined(__WXPM__)) && (wxLUA_USE_wxMetafile)
      extern WXDLLIMPEXP_WXBIND WXLUAMETHOD* wxMetafile_methods;
***************
*** 1454,1472 ****
  #endif // (defined(__WXMSW__)) && (wxLUA_USE_wxHelpController) && (wxUSE_HELP)
  
- #if (wxCHECK_VERSION(2,2,0) && !wxCHECK_VERSION(2,5,0) || (defined(WXWIN_COMPATIBILITY_2_4) && WXWIN_COMPATIBILITY_2_4)) && (wxUSE_LOG) && (wxLUA_USE_wxApp)
-     extern WXDLLIMPEXP_WXBIND WXLUAMETHOD* wxLog_methods;
-     extern WXDLLIMPEXP_DATA_WXBIND(int) wxLog_methodCount;
- #endif // (wxCHECK_VERSION(2,2,0) && !wxCHECK_VERSION(2,5,0) || (defined(WXWIN_COMPATIBILITY_2_4) && WXWIN_COMPATIBILITY_2_4)) && (wxUSE_LOG) && (wxLUA_USE_wxApp)
- 
- #if (wxCHECK_VERSION(2,2,0) && !wxCHECK_VERSION(2,5,0)) && (wxLUA_USE_wxToolbar)
-     extern WXDLLIMPEXP_WXBIND WXLUAMETHOD* wxToolBarSimple_methods;
-     extern WXDLLIMPEXP_DATA_WXBIND(int) wxToolBarSimple_methodCount;
- #endif // (wxCHECK_VERSION(2,2,0) && !wxCHECK_VERSION(2,5,0)) && (wxLUA_USE_wxToolbar)
- 
- #if (wxCHECK_VERSION(2,3,0)) && (wxLUA_USE_wxGrid)
-     extern WXDLLIMPEXP_WXBIND WXLUAMETHOD* wxGridEditorCreatedEvent_methods;
-     extern WXDLLIMPEXP_DATA_WXBIND(int) wxGridEditorCreatedEvent_methodCount;
- #endif // (wxCHECK_VERSION(2,3,0)) && (wxLUA_USE_wxGrid)
- 
  #if (wxCHECK_VERSION(2,4,0) && defined(__WXMSW__)) && (wxLUA_USE_wxTabCtrl)
      extern WXDLLIMPEXP_WXBIND WXLUAMETHOD* wxTabCtrl_methods;
--- 1457,1460 ----
***************
*** 1496,1504 ****
  #endif // (wxLUA_USE_wxBrushList) && (wxLUA_USE_wxColourPenBrush)
  
- #if (wxLUA_USE_wxCheckListBox) && (wxLUA_USE_wxListBox)
-     extern WXDLLIMPEXP_WXBIND WXLUAMETHOD* wxCheckListBox_methods;
-     extern WXDLLIMPEXP_DATA_WXBIND(int) wxCheckListBox_methodCount;
- #endif // (wxLUA_USE_wxCheckListBox) && (wxLUA_USE_wxListBox)
- 
  #if (wxLUA_USE_wxHelpController) && (wxUSE_HELP)
      extern WXDLLIMPEXP_WXBIND WXLUAMETHOD* wxHelpController_methods;
--- 1484,1487 ----
***************
*** 1532,1535 ****
--- 1515,1523 ----
  #endif // (wxLUA_USE_wxPenList) && (wxLUA_USE_wxColourPenBrush)
  
+ #if (wxUSE_CHECKLISTBOX && wxLUA_USE_wxCheckListBox) && (wxUSE_LISTBOX && wxLUA_USE_wxListBox)
+     extern WXDLLIMPEXP_WXBIND WXLUAMETHOD* wxCheckListBox_methods;
+     extern WXDLLIMPEXP_DATA_WXBIND(int) wxCheckListBox_methodCount;
+ #endif // (wxUSE_CHECKLISTBOX && wxLUA_USE_wxCheckListBox) && (wxUSE_LISTBOX && wxLUA_USE_wxListBox)
+ 
  #if (wxUSE_GIF) && (wxLUA_USE_wxImage)
      extern WXDLLIMPEXP_WXBIND WXLUAMETHOD* wxGIFHandler_methods;
***************
*** 1616,1619 ****
--- 1604,1609 ----
  extern WXDLLIMPEXP_WXBIND WXLUAMETHOD* wxGDIObject_methods;
  extern WXDLLIMPEXP_DATA_WXBIND(int) wxGDIObject_methodCount;
+ extern WXDLLIMPEXP_WXBIND WXLUAMETHOD* wxHelpEvent_methods;
+ extern WXDLLIMPEXP_DATA_WXBIND(int) wxHelpEvent_methodCount;
  extern WXDLLIMPEXP_WXBIND WXLUAMETHOD* wxIconizeEvent_methods;
  extern WXDLLIMPEXP_DATA_WXBIND(int) wxIconizeEvent_methodCount;
***************
*** 1671,1679 ****
  extern WXDLLIMPEXP_DATA_WXBIND(int) wxWindowDisabler_methodCount;
  
- #if wxCHECK_VERSION(2,3,0)
-     extern WXDLLIMPEXP_WXBIND WXLUAMETHOD* wxHelpEvent_methods;
-     extern WXDLLIMPEXP_DATA_WXBIND(int) wxHelpEvent_methodCount;
- #endif // wxCHECK_VERSION(2,3,0)
- 
  #if wxCHECK_VERSION(2,7,0)
      extern WXDLLIMPEXP_WXBIND WXLUAMETHOD* wxMouseState_methods;
--- 1661,1664 ----
***************
*** 1681,1684 ****
--- 1666,1674 ----
  #endif // wxCHECK_VERSION(2,7,0)
  
+ #if wxCHECK_VERSION(2,8,0) && wxUSE_ABOUTDLG && wxLUA_USE_wxAboutDialog
+     extern WXDLLIMPEXP_WXBIND WXLUAMETHOD* wxAboutDialogInfo_methods;
+     extern WXDLLIMPEXP_DATA_WXBIND(int) wxAboutDialogInfo_methodCount;
+ #endif // wxCHECK_VERSION(2,8,0) && wxUSE_ABOUTDLG && wxLUA_USE_wxAboutDialog
+ 
  #if wxLUA_USE_Geometry
      extern WXDLLIMPEXP_WXBIND WXLUAMETHOD* wxPoint2DDouble_methods;
***************
*** 1801,1811 ****
  #endif // wxLUA_USE_wxClipboard
  
- #if wxLUA_USE_wxColourDialog
-     extern WXDLLIMPEXP_WXBIND WXLUAMETHOD* wxColourData_methods;
-     extern WXDLLIMPEXP_DATA_WXBIND(int) wxColourData_methodCount;
-     extern WXDLLIMPEXP_WXBIND WXLUAMETHOD* wxColourDialog_methods;
-     extern WXDLLIMPEXP_DATA_WXBIND(int) wxColourDialog_methodCount;
- #endif // wxLUA_USE_wxColourDialog
- 
  #if wxLUA_USE_wxColourPenBrush
      extern WXDLLIMPEXP_WXBIND WXLUAMETHOD* wxBrush_methods;
--- 1791,1794 ----
***************
*** 1819,1827 ****
  #endif // wxLUA_USE_wxColourPenBrush
  
- #if wxLUA_USE_wxComboBox
-     extern WXDLLIMPEXP_WXBIND WXLUAMETHOD* wxComboBox_methods;
-     extern WXDLLIMPEXP_DATA_WXBIND(int) wxComboBox_methodCount;
- #endif // wxLUA_USE_wxComboBox
- 
  #if wxLUA_USE_wxCommandProcessor
      extern WXDLLIMPEXP_WXBIND WXLUAMETHOD* wxCommand_methods;
--- 1802,1805 ----
***************
*** 1972,1984 ****
  #endif // wxLUA_USE_wxFileName
  
- #if wxLUA_USE_wxFindReplaceDialog
-     extern WXDLLIMPEXP_WXBIND WXLUAMETHOD* wxFindDialogEvent_methods;
-     extern WXDLLIMPEXP_DATA_WXBIND(int) wxFindDialogEvent_methodCount;
-     extern WXDLLIMPEXP_WXBIND WXLUAMETHOD* wxFindReplaceData_methods;
-     extern WXDLLIMPEXP_DATA_WXBIND(int) wxFindReplaceData_methodCount;
-     extern WXDLLIMPEXP_WXBIND WXLUAMETHOD* wxFindReplaceDialog_methods;
-     extern WXDLLIMPEXP_DATA_WXBIND(int) wxFindReplaceDialog_methodCount;
- #endif // wxLUA_USE_wxFindReplaceDialog
- 
  #if wxLUA_USE_wxFont
      extern WXDLLIMPEXP_WXBIND WXLUAMETHOD* wxFont_methods;
--- 1950,1953 ----
***************
*** 1986,1996 ****
  #endif // wxLUA_USE_wxFont
  
- #if wxLUA_USE_wxFontDialog
-     extern WXDLLIMPEXP_WXBIND WXLUAMETHOD* wxFontData_methods;
-     extern WXDLLIMPEXP_DATA_WXBIND(int) wxFontData_methodCount;
-     extern WXDLLIMPEXP_WXBIND WXLUAMETHOD* wxFontDialog_methods;
-     extern WXDLLIMPEXP_DATA_WXBIND(int) wxFontDialog_methodCount;
- #endif // wxLUA_USE_wxFontDialog
- 
  #if wxLUA_USE_wxFontEnumerator
      extern WXDLLIMPEXP_WXBIND WXLUAMETHOD* wxFontEnumerator_methods;
--- 1955,1958 ----
***************
*** 2025,2033 ****
  #endif // wxLUA_USE_wxGLCanvas && wxUSE_GLCANVAS
  
- #if wxLUA_USE_wxGauge
-     extern WXDLLIMPEXP_WXBIND WXLUAMETHOD* wxGauge_methods;
-     extern WXDLLIMPEXP_DATA_WXBIND(int) wxGauge_methodCount;
- #endif // wxLUA_USE_wxGauge
- 
  #if wxLUA_USE_wxGenericDirCtrl && wxUSE_DIRDLG
      extern WXDLLIMPEXP_WXBIND WXLUAMETHOD* wxGenericDirCtrl_methods;
--- 1987,1990 ----
***************
*** 2083,2086 ****
--- 2040,2045 ----
      extern WXDLLIMPEXP_WXBIND WXLUAMETHOD* wxGridCellWorker_methods;
      extern WXDLLIMPEXP_DATA_WXBIND(int) wxGridCellWorker_methodCount;
+     extern WXDLLIMPEXP_WXBIND WXLUAMETHOD* wxGridEditorCreatedEvent_methods;
+     extern WXDLLIMPEXP_DATA_WXBIND(int) wxGridEditorCreatedEvent_methodCount;
      extern WXDLLIMPEXP_WXBIND WXLUAMETHOD* wxGridEvent_methods;
      extern WXDLLIMPEXP_DATA_WXBIND(int) wxGridEvent_methodCount;
***************
*** 2164,2185 ****
  #endif // wxLUA_USE_wxList
  
- #if wxLUA_USE_wxListBox
-     extern WXDLLIMPEXP_WXBIND WXLUAMETHOD* wxListBox_methods;
-     extern WXDLLIMPEXP_DATA_WXBIND(int) wxListBox_methodCount;
- #endif // wxLUA_USE_wxListBox
- 
- #if wxLUA_USE_wxListCtrl
-     extern WXDLLIMPEXP_WXBIND WXLUAMETHOD* wxListCtrl_methods;
-     extern WXDLLIMPEXP_DATA_WXBIND(int) wxListCtrl_methodCount;
-     extern WXDLLIMPEXP_WXBIND WXLUAMETHOD* wxListEvent_methods;
-     extern WXDLLIMPEXP_DATA_WXBIND(int) wxListEvent_methodCount;
-     extern WXDLLIMPEXP_WXBIND WXLUAMETHOD* wxListItem_methods;
-     extern WXDLLIMPEXP_DATA_WXBIND(int) wxListItem_methodCount;
-     extern WXDLLIMPEXP_WXBIND WXLUAMETHOD* wxListItemAttr_methods;
-     extern WXDLLIMPEXP_DATA_WXBIND(int) wxListItemAttr_methodCount;
-     extern WXDLLIMPEXP_WXBIND WXLUAMETHOD* wxListView_methods;
-     extern WXDLLIMPEXP_DATA_WXBIND(int) wxListView_methodCount;
- #endif // wxLUA_USE_wxListCtrl
- 
  #if wxLUA_USE_wxLuaHtmlWindow
      extern WXDLLIMPEXP_WXBIND WXLUAMETHOD* wxLuaHtmlWinTagEvent_methods;
--- 2123,2126 ----
***************
*** 2224,2232 ****
  #endif // wxLUA_USE_wxMessageDialog
  
- #if wxLUA_USE_wxMultiChoiceDialog
-     extern WXDLLIMPEXP_WXBIND WXLUAMETHOD* wxMultiChoiceDialog_methods;
-     extern WXDLLIMPEXP_DATA_WXBIND(int) wxMultiChoiceDialog_methodCount;
- #endif // wxLUA_USE_wxMultiChoiceDialog
- 
  #if wxLUA_USE_wxNotebook
      extern WXDLLIMPEXP_WXBIND WXLUAMETHOD* wxBookCtrlBase_methods;
--- 2165,2168 ----
***************
*** 2299,2317 ****
  #endif // wxLUA_USE_wxProcess
  
- #if wxLUA_USE_wxProgressDialog
-     extern WXDLLIMPEXP_WXBIND WXLUAMETHOD* wxProgressDialog_methods;
-     extern WXDLLIMPEXP_DATA_WXBIND(int) wxProgressDialog_methodCount;
- #endif // wxLUA_USE_wxProgressDialog
- 
- #if wxLUA_USE_wxRadioBox
-     extern WXDLLIMPEXP_WXBIND WXLUAMETHOD* wxRadioBox_methods;
-     extern WXDLLIMPEXP_DATA_WXBIND(int) wxRadioBox_methodCount;
- #endif // wxLUA_USE_wxRadioBox
- 
- #if wxLUA_USE_wxRadioButton
-     extern WXDLLIMPEXP_WXBIND WXLUAMETHOD* wxRadioButton_methods;
-     extern WXDLLIMPEXP_DATA_WXBIND(int) wxRadioButton_methodCount;
- #endif // wxLUA_USE_wxRadioButton
- 
  #if wxLUA_USE_wxRegEx
      extern WXDLLIMPEXP_WXBIND WXLUAMETHOD* wxRegEx_methods;
--- 2235,2238 ----
***************
*** 2351,2359 ****
  #endif // wxLUA_USE_wxScrolledWindow
  
- #if wxLUA_USE_wxSingleChoiceDialog
-     extern WXDLLIMPEXP_WXBIND WXLUAMETHOD* wxSingleChoiceDialog_methods;
-     extern WXDLLIMPEXP_DATA_WXBIND(int) wxSingleChoiceDialog_methodCount;
- #endif // wxLUA_USE_wxSingleChoiceDialog
- 
  #if wxLUA_USE_wxSizer
      extern WXDLLIMPEXP_WXBIND WXLUAMETHOD* wxBoxSizer_methods;
--- 2272,2275 ----
***************
*** 2486,2496 ****
  #endif // wxLUA_USE_wxTextCtrl
  
- #if wxLUA_USE_wxTextEntryDialog
-     extern WXDLLIMPEXP_WXBIND WXLUAMETHOD* wxPasswordEntryDialog_methods;
-     extern WXDLLIMPEXP_DATA_WXBIND(int) wxPasswordEntryDialog_methodCount;
-     extern WXDLLIMPEXP_WXBIND WXLUAMETHOD* wxTextEntryDialog_methods;
-     extern WXDLLIMPEXP_DATA_WXBIND(int) wxTextEntryDialog_methodCount;
- #endif // wxLUA_USE_wxTextEntryDialog
- 
  #if wxLUA_USE_wxTextValidator
      extern WXDLLIMPEXP_WXBIND WXLUAMETHOD* wxTextValidator_methods;
--- 2402,2405 ----
***************
*** 2558,2572 ****
  #endif // wxLUA_USE_wxWindowList
  
- #if wxLUA_USE_wxWizard
-     extern WXDLLIMPEXP_WXBIND WXLUAMETHOD* wxWizard_methods;
-     extern WXDLLIMPEXP_DATA_WXBIND(int) wxWizard_methodCount;
-     extern WXDLLIMPEXP_WXBIND WXLUAMETHOD* wxWizardEvent_methods;
-     extern WXDLLIMPEXP_DATA_WXBIND(int) wxWizardEvent_methodCount;
-     extern WXDLLIMPEXP_WXBIND WXLUAMETHOD* wxWizardPage_methods;
-     extern WXDLLIMPEXP_DATA_WXBIND(int) wxWizardPage_methodCount;
-     extern WXDLLIMPEXP_WXBIND WXLUAMETHOD* wxWizardPageSimple_methods;
-     extern WXDLLIMPEXP_DATA_WXBIND(int) wxWizardPageSimple_methodCount;
- #endif // wxLUA_USE_wxWizard
- 
  #if wxLUA_USE_wxXMLResource
      extern WXDLLIMPEXP_WXBIND WXLUAMETHOD* wxXmlDocument_methods;
--- 2467,2470 ----
***************
*** 2582,2585 ****
--- 2480,2559 ----
  #endif // wxLUA_USE_wxXMLResource
  
+ #if wxUSE_CHOICEDLG && wxLUA_USE_wxMultiChoiceDialog
+     extern WXDLLIMPEXP_WXBIND WXLUAMETHOD* wxMultiChoiceDialog_methods;
+     extern WXDLLIMPEXP_DATA_WXBIND(int) wxMultiChoiceDialog_methodCount;
+ #endif // wxUSE_CHOICEDLG && wxLUA_USE_wxMultiChoiceDialog
+ 
+ #if wxUSE_CHOICEDLG && wxLUA_USE_wxSingleChoiceDialog
+     extern WXDLLIMPEXP_WXBIND WXLUAMETHOD* wxSingleChoiceDialog_methods;
+     extern WXDLLIMPEXP_DATA_WXBIND(int) wxSingleChoiceDialog_methodCount;
+ #endif // wxUSE_CHOICEDLG && wxLUA_USE_wxSingleChoiceDialog
+ 
+ #if wxUSE_COLOURDLG && wxLUA_USE_wxColourDialog
+     extern WXDLLIMPEXP_WXBIND WXLUAMETHOD* wxColourData_methods;
+     extern WXDLLIMPEXP_DATA_WXBIND(int) wxColourData_methodCount;
+     extern WXDLLIMPEXP_WXBIND WXLUAMETHOD* wxColourDialog_methods;
+     extern WXDLLIMPEXP_DATA_WXBIND(int) wxColourDialog_methodCount;
+ #endif // wxUSE_COLOURDLG && wxLUA_USE_wxColourDialog
+ 
+ #if wxUSE_COMBOBOX && wxLUA_USE_wxComboBox
+     extern WXDLLIMPEXP_WXBIND WXLUAMETHOD* wxComboBox_methods;
+     extern WXDLLIMPEXP_DATA_WXBIND(int) wxComboBox_methodCount;
+ #endif // wxUSE_COMBOBOX && wxLUA_USE_wxComboBox
+ 
+ #if wxUSE_FINDREPLDLG && wxLUA_USE_wxFindReplaceDialog
+     extern WXDLLIMPEXP_WXBIND WXLUAMETHOD* wxFindDialogEvent_methods;
+     extern WXDLLIMPEXP_DATA_WXBIND(int) wxFindDialogEvent_methodCount;
+     extern WXDLLIMPEXP_WXBIND WXLUAMETHOD* wxFindReplaceData_methods;
+     extern WXDLLIMPEXP_DATA_WXBIND(int) wxFindReplaceData_methodCount;
+     extern WXDLLIMPEXP_WXBIND WXLUAMETHOD* wxFindReplaceDialog_methods;
+     extern WXDLLIMPEXP_DATA_WXBIND(int) wxFindReplaceDialog_methodCount;
+ #endif // wxUSE_FINDREPLDLG && wxLUA_USE_wxFindReplaceDialog
+ 
+ #if wxUSE_FONTDLG && wxLUA_USE_wxFontDialog
+     extern WXDLLIMPEXP_WXBIND WXLUAMETHOD* wxFontData_methods;
+     extern WXDLLIMPEXP_DATA_WXBIND(int) wxFontData_methodCount;
+     extern WXDLLIMPEXP_WXBIND WXLUAMETHOD* wxFontDialog_methods;
+     extern WXDLLIMPEXP_DATA_WXBIND(int) wxFontDialog_methodCount;
+ #endif // wxUSE_FONTDLG && wxLUA_USE_wxFontDialog
+ 
+ #if wxUSE_GAUGE && wxLUA_USE_wxGauge
+     extern WXDLLIMPEXP_WXBIND WXLUAMETHOD* wxGauge_methods;
+     extern WXDLLIMPEXP_DATA_WXBIND(int) wxGauge_methodCount;
+ #endif // wxUSE_GAUGE && wxLUA_USE_wxGauge
+ 
+ #if wxUSE_LISTBOX && wxLUA_USE_wxListBox
+     extern WXDLLIMPEXP_WXBIND WXLUAMETHOD* wxListBox_methods;
+     extern WXDLLIMPEXP_DATA_WXBIND(int) wxListBox_methodCount;
+ #endif // wxUSE_LISTBOX && wxLUA_USE_wxListBox
+ 
+ #if wxUSE_LISTCTRL && wxLUA_USE_wxListCtrl
+     extern WXDLLIMPEXP_WXBIND WXLUAMETHOD* wxListCtrl_methods;
+     extern WXDLLIMPEXP_DATA_WXBIND(int) wxListCtrl_methodCount;
+     extern WXDLLIMPEXP_WXBIND WXLUAMETHOD* wxListEvent_methods;
+     extern WXDLLIMPEXP_DATA_WXBIND(int) wxListEvent_methodCount;
+     extern WXDLLIMPEXP_WXBIND WXLUAMETHOD* wxListItem_methods;
+     extern WXDLLIMPEXP_DATA_WXBIND(int) wxListItem_methodCount;
+     extern WXDLLIMPEXP_WXBIND WXLUAMETHOD* wxListItemAttr_methods;
+     extern WXDLLIMPEXP_DATA_WXBIND(int) wxListItemAttr_methodCount;
+     extern WXDLLIMPEXP_WXBIND WXLUAMETHOD* wxListView_methods;
+     extern WXDLLIMPEXP_DATA_WXBIND(int) wxListView_methodCount;
+ #endif // wxUSE_LISTCTRL && wxLUA_USE_wxListCtrl
+ 
+ #if wxUSE_PROGRESSDLG && wxLUA_USE_wxProgressDialog
+     extern WXDLLIMPEXP_WXBIND WXLUAMETHOD* wxProgressDialog_methods;
+     extern WXDLLIMPEXP_DATA_WXBIND(int) wxProgressDialog_methodCount;
+ #endif // wxUSE_PROGRESSDLG && wxLUA_USE_wxProgressDialog
+ 
+ #if wxUSE_RADIOBOX && wxLUA_USE_wxRadioBox
+     extern WXDLLIMPEXP_WXBIND WXLUAMETHOD* wxRadioBox_methods;
+     extern WXDLLIMPEXP_DATA_WXBIND(int) wxRadioBox_methodCount;
+ #endif // wxUSE_RADIOBOX && wxLUA_USE_wxRadioBox
+ 
+ #if wxUSE_RADIOBTN && wxLUA_USE_wxRadioButton
+     extern WXDLLIMPEXP_WXBIND WXLUAMETHOD* wxRadioButton_methods;
+     extern WXDLLIMPEXP_DATA_WXBIND(int) wxRadioButton_methodCount;
+ #endif // wxUSE_RADIOBTN && wxLUA_USE_wxRadioButton
+ 
  #if wxUSE_STREAMS
      extern WXDLLIMPEXP_WXBIND WXLUAMETHOD* wxFileInputStream_methods;
***************
*** 2595,2598 ****
--- 2569,2590 ----
  #endif // wxUSE_STREAMS
  
+ #if wxUSE_TEXTDLG && wxLUA_USE_wxTextEntryDialog
+     extern WXDLLIMPEXP_WXBIND WXLUAMETHOD* wxPasswordEntryDialog_methods;
+     extern WXDLLIMPEXP_DATA_WXBIND(int) wxPasswordEntryDialog_methodCount;
+     extern WXDLLIMPEXP_WXBIND WXLUAMETHOD* wxTextEntryDialog_methods;
+     extern WXDLLIMPEXP_DATA_WXBIND(int) wxTextEntryDialog_methodCount;
+ #endif // wxUSE_TEXTDLG && wxLUA_USE_wxTextEntryDialog
+ 
+ #if wxUSE_WIZARDDLG && wxLUA_USE_wxWizard
+     extern WXDLLIMPEXP_WXBIND WXLUAMETHOD* wxWizard_methods;
+     extern WXDLLIMPEXP_DATA_WXBIND(int) wxWizard_methodCount;
+     extern WXDLLIMPEXP_WXBIND WXLUAMETHOD* wxWizardEvent_methods;
+     extern WXDLLIMPEXP_DATA_WXBIND(int) wxWizardEvent_methodCount;
+     extern WXDLLIMPEXP_WXBIND WXLUAMETHOD* wxWizardPage_methods;
+     extern WXDLLIMPEXP_DATA_WXBIND(int) wxWizardPage_methodCount;
+     extern WXDLLIMPEXP_WXBIND WXLUAMETHOD* wxWizardPageSimple_methods;
+     extern WXDLLIMPEXP_DATA_WXBIND(int) wxWizardPageSimple_methodCount;
+ #endif // wxUSE_WIZARDDLG && wxLUA_USE_wxWizard
+ 
  
  
***************
*** 2608,2611 ****
--- 2600,2607 ----
  #endif // wxCHECK_VERSION(2,7,0)
  
+ #if wxCHECK_VERSION(2,8,0) && wxUSE_ABOUTDLG && wxLUA_USE_wxAboutDialog
+     wxLUA_DECLARE_ENCAPSULATION(WXDLLIMPEXP_WXBIND, wxAboutDialogInfo, wxAboutDialogInfo)
+ #endif // wxCHECK_VERSION(2,8,0) && wxUSE_ABOUTDLG && wxLUA_USE_wxAboutDialog
+ 
  #if wxLUA_USE_Geometry
      wxLUA_DECLARE_ENCAPSULATION(WXDLLIMPEXP_WXBIND, wxPoint2DDouble, wxPoint2DDouble)
***************
*** 2704,2711 ****
  #endif // wxLUA_USE_wxGrid
  
- #if wxLUA_USE_wxListCtrl
-     wxLUA_DECLARE_ENCAPSULATION(WXDLLIMPEXP_WXBIND, wxListItemAttr, wxListItemAttr)
- #endif // wxLUA_USE_wxListCtrl
- 
  #if wxLUA_USE_wxPointSizeRect
      wxLUA_DECLARE_ENCAPSULATION(WXDLLIMPEXP_WXBIND, wxPoint, wxPoint)
--- 2700,2703 ----
***************
*** 2745,2748 ****
--- 2737,2744 ----
  #endif // wxLUA_USE_wxXMLResource
  
+ #if wxUSE_LISTCTRL && wxLUA_USE_wxListCtrl
+     wxLUA_DECLARE_ENCAPSULATION(WXDLLIMPEXP_WXBIND, wxListItemAttr, wxListItemAttr)
+ #endif // wxUSE_LISTCTRL && wxLUA_USE_wxListCtrl
+ 
  
  #endif // __HOOK_WXLUA_wx_H__

[Wxlua-commit] wxLua/bindings/wxwidgets appframe.i, 1.23, 1.24 clipdrag.i, 1.19, 1.20 config.i, 1.12, 1.13 controls.i, 1.23, 1.24 data.i, 1.18, 1.19 datetime.i, 1.19, 1.20 defsutil.i, 1.29, 1.30 dialogs.i, 1.20, 1.21 event.i, 1.16, 1.17 file.i, 1.12, 1.13 fl.i, 1.7, 1.8 gdi.i, 1.31, 1.32 geometry.i, 1.6, 1.7 grid.i, 1.9, 1.10 help.i, 1.8, 1.9 html.i, 1.11, 1.12 image.i, 1.14, 1.15 mdi.i, 1.8, 1.9 menutool.i, 1.10, 1.11 print.i, 1.10, 1.11 regex.i, 1.4, 1.5 sizer.i, 1.8, 1.9 socket.i, 1.8, 1.9 wave.i, 1.9, 1.10 windows.i, 1.23, 1.24 wx_datatypes.lua, 1.40, 1.41 wxlua.i, 1.18, 1.19 xml.i, 1.4, 1.5

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

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

Modified Files:
	appframe.i clipdrag.i config.i controls.i data.i datetime.i 
	defsutil.i dialogs.i event.i file.i fl.i gdi.i geometry.i 
	grid.i help.i html.i image.i mdi.i menutool.i print.i regex.i 
	sizer.i socket.i wave.i windows.i wx_datatypes.lua wxlua.i 
	xml.i 
Log Message:
update bindings, better docs, add wxAboutBox for 2.8
fix /* */ in genwxbind.lua
Remove wxPlatformXXX just use __WXMSW__ or whatever


Index: wave.i
===================================================================
RCS file: /cvsroot/wxlua/wxLua/bindings/wxwidgets/wave.i,v
retrieving revision 1.9
retrieving revision 1.10
diff -C2 -d -r1.9 -r1.10
*** wave.i	25 May 2006 22:50:05 -0000	1.9
--- wave.i	7 Dec 2006 06:32:42 -0000	1.10
***************
*** 61,65 ****
  %endif // %msw&!%wxchkver25
  
! %endif wxLUA_USE_wxWave
  
  //-----------------------------------------------------------------------------
--- 61,65 ----
  %endif // %msw&!%wxchkver25
  
! %endif //wxLUA_USE_wxWave
  
  //-----------------------------------------------------------------------------
***************
*** 216,219 ****
  %endclass
  
! %endif wxLUA_USE_wxJoystick|wxUSE_JOYSTICK
  
--- 216,219 ----
  %endclass
  
! %endif //wxLUA_USE_wxJoystick|wxUSE_JOYSTICK
  

Index: menutool.i
===================================================================
RCS file: /cvsroot/wxlua/wxLua/bindings/wxwidgets/menutool.i,v
retrieving revision 1.10
retrieving revision 1.11
diff -C2 -d -r1.10 -r1.11
*** menutool.i	17 May 2006 05:02:04 -0000	1.10
--- menutool.i	7 Dec 2006 06:32:42 -0000	1.11
***************
*** 170,175 ****
  %class %delete wxMenuEvent, wxEvent
      %define %event wxEVT_MENU_HIGHLIGHT
!     %wxchkver23 %define %event wxEVT_MENU_OPEN
!     %wxchkver23 %define %event wxEVT_MENU_CLOSE
      %define %event wxEVT_MENU_HIGHLIGHT
  
--- 170,175 ----
  %class %delete wxMenuEvent, wxEvent
      %define %event wxEVT_MENU_HIGHLIGHT
!     %define %event wxEVT_MENU_OPEN
!     %define %event wxEVT_MENU_CLOSE
      %define %event wxEVT_MENU_HIGHLIGHT
  
***************
*** 180,184 ****
  %endclass
  
! %endif wxLUA_USE_wxMenu
  
  //-----------------------------------------------------------------------------
--- 180,184 ----
  %endclass
  
! %endif //wxLUA_USE_wxMenu
  
  //-----------------------------------------------------------------------------
***************
*** 194,201 ****
  %define wxTB_VERTICAL
  %define wxTB_3DBUTTONS
! %wxchkver23 %define wxTB_TEXT
! %wxchkver23 %define wxTB_NOICONS
! %wxchkver23 %define wxTB_NODIVIDER
! %wxchkver23 %define wxTB_NOALIGN
  %define wxTB_HORZ_LAYOUT
  %define wxTB_HORZ_TEXT
--- 194,201 ----
  %define wxTB_VERTICAL
  %define wxTB_3DBUTTONS
! %define wxTB_TEXT
! %define wxTB_NOICONS
! %define wxTB_NODIVIDER
! %define wxTB_NOALIGN
  %define wxTB_HORZ_LAYOUT
  %define wxTB_HORZ_TEXT
***************
*** 276,287 ****
  // wxToolBarSimple
  
! %wxchkver22&!%wxchkver25 %include "wx/tbarsmpl.h"
  
! %wxchkver22&!%wxchkver25 %class wxToolBarSimple, wxToolBarBase
! %wxchkver22&!%wxchkver25     wxToolBarSimple(wxWindow *parent, wxWindowID id, const wxPoint& pos = wxDefaultPosition, const wxSize& size = wxDefaultSize, long style = wxNO_BORDER | wxTB_HORIZONTAL, const wxString &name = wxToolBarNameStr)
! %wxchkver22&!%wxchkver25     %constructor wxPreToolBarSimple()
! %wxchkver22&!%wxchkver25     bool    Create(wxWindow *parent,wxWindowID id, const wxPoint& pos = wxDefaultPosition, const wxSize& size = wxDefaultSize, long style = wxNO_BORDER | wxTB_HORIZONTAL, const wxString &name = wxToolBarNameStr)
! %wxchkver22&!%wxchkver25     wxToolBarToolBase *FindToolForPosition(wxCoord x, wxCoord y)
! %wxchkver22&!%wxchkver25 %endclass
  
  //-----------------------------------------------------------------------------
--- 276,291 ----
  // wxToolBarSimple
  
! %if !%wxchkver25
  
! %include "wx/tbarsmpl.h"
! 
! %class wxToolBarSimple, wxToolBarBase
!     wxToolBarSimple(wxWindow *parent, wxWindowID id, const wxPoint& pos = wxDefaultPosition, const wxSize& size = wxDefaultSize, long style = wxNO_BORDER | wxTB_HORIZONTAL, const wxString &name = wxToolBarNameStr)
!     %constructor wxPreToolBarSimple()
!     bool    Create(wxWindow *parent,wxWindowID id, const wxPoint& pos = wxDefaultPosition, const wxSize& size = wxDefaultSize, long style = wxNO_BORDER | wxTB_HORIZONTAL, const wxString &name = wxToolBarNameStr)
!     wxToolBarToolBase *FindToolForPosition(wxCoord x, wxCoord y)
! %endclass
! 
! %endif // !%wxchkver25
  
  //-----------------------------------------------------------------------------
***************
*** 347,350 ****
  %endclass
  
! %endif wxLUA_USE_wxToolbar
  
--- 351,354 ----
  %endclass
  
! %endif //wxLUA_USE_wxToolbar
  

Index: clipdrag.i
===================================================================
RCS file: /cvsroot/wxlua/wxLua/bindings/wxwidgets/clipdrag.i,v
retrieving revision 1.19
retrieving revision 1.20
diff -C2 -d -r1.19 -r1.20
*** clipdrag.i	26 May 2006 03:19:51 -0000	1.19
--- clipdrag.i	7 Dec 2006 06:32:42 -0000	1.20
***************
*** 35,39 ****
  %endclass
  
! %endif wxLUA_USE_wxClipboard
  
  //-----------------------------------------------------------------------------
--- 35,39 ----
  %endclass
  
! %endif //wxLUA_USE_wxClipboard
  
  //-----------------------------------------------------------------------------
***************
*** 63,68 ****
      wxDF_LOCALE
      wxDF_PRIVATE
! %wxchkver23   wxDF_HTML
! %wxchkver23   wxDF_MAX
  %endenum
  
--- 63,68 ----
      wxDF_LOCALE
      wxDF_PRIVATE
!     wxDF_HTML
!     wxDF_MAX
  %endenum
  
***************
*** 183,187 ****
  //%endclass
  
! %endif wxLUA_USE_wxDataObject
  
  //-----------------------------------------------------------------------------
--- 183,187 ----
  //%endclass
  
! %endif //wxLUA_USE_wxDataObject
  
  //-----------------------------------------------------------------------------
***************
*** 192,196 ****
  %include "wx/dnd.h"
  
- %if %wxchkver23
  %enum
      wxDrag_CopyOnly
--- 192,195 ----
***************
*** 198,202 ****
      wxDrag_DefaultMove
  %endenum
- %endif
  
  %enum wxDragResult
--- 197,200 ----
***************
*** 272,276 ****
  %endclass
  
! %endif wxLUA_USE_wxDragDrop
  
  //-----------------------------------------------------------------------------
--- 270,274 ----
  %endclass
  
! %endif //wxLUA_USE_wxDragDrop
  
  //-----------------------------------------------------------------------------
***************
*** 303,305 ****
  %endif
  
! %endif wxLUA_USE_wxMetafile
--- 301,303 ----
  %endif
  
! %endif //wxLUA_USE_wxMetafile

Index: data.i
===================================================================
RCS file: /cvsroot/wxlua/wxLua/bindings/wxwidgets/data.i,v
retrieving revision 1.18
retrieving revision 1.19
diff -C2 -d -r1.18 -r1.19
*** data.i	26 May 2006 20:22:09 -0000	1.18
--- data.i	7 Dec 2006 06:32:42 -0000	1.19
***************
*** 69,73 ****
  %endclass
  
! %endif wxLUA_USE_wxObject
  
  //-----------------------------------------------------------------------------
--- 69,73 ----
  %endclass
  
! %endif //wxLUA_USE_wxObject
  
  //-----------------------------------------------------------------------------
***************
*** 96,100 ****
  %endclass
  
! %endif wxLUA_USE_wxClassInfo
  
  //-----------------------------------------------------------------------------
--- 96,100 ----
  %endclass
  
! %endif //wxLUA_USE_wxClassInfo
  
  //-----------------------------------------------------------------------------
***************
*** 118,122 ****
  %endclass
  
! %endif wxLUA_USE_wxValidator
  
  //-----------------------------------------------------------------------------
--- 118,122 ----
  %endclass
  
! %endif //wxLUA_USE_wxValidator
  
  //-----------------------------------------------------------------------------
***************
*** 160,164 ****
  %endclass
  
! %endif wxLUA_USE_wxTextValidator
  
  //-----------------------------------------------------------------------------
--- 160,164 ----
  %endclass
  
! %endif //wxLUA_USE_wxTextValidator
  
  //-----------------------------------------------------------------------------
***************
*** 180,184 ****
  %endclass
  
! %endif wxLUA_USE_wxGenericValidator
  
  //-----------------------------------------------------------------------------
--- 180,184 ----
  %endclass
  
! %endif //wxLUA_USE_wxGenericValidator
  
  //-----------------------------------------------------------------------------
***************
*** 241,245 ****
  %endclass
  
! %endif wxLUA_USE_wxList
  
  //-----------------------------------------------------------------------------
--- 241,245 ----
  %endclass
  
! %endif //wxLUA_USE_wxList
  
  //-----------------------------------------------------------------------------
***************
*** 291,295 ****
  %endclass
  
! %endif wxLUA_USE_wxArrayInt
  
  //-----------------------------------------------------------------------------
--- 291,295 ----
  %endclass
  
! %endif //wxLUA_USE_wxArrayInt
  
  //-----------------------------------------------------------------------------
***************
*** 324,328 ****
  %endclass
  
! %endif wxLUA_USE_wxArrayString
  
  //-----------------------------------------------------------------------------
--- 324,328 ----
  %endclass
  
! %endif //wxLUA_USE_wxArrayString
  
  //-----------------------------------------------------------------------------
***************
*** 354,358 ****
  
  //%class %noclassinfo wxHashTable, wxObject
! //    %wxchkver22&!%wxchkver25 wxHashTable(unsigned int key_type, int size = 1000)
  //    %wxchkver25 wxHashTable(wxKeyType key_type, int size = 1000)
  //    void BeginFind()
--- 354,358 ----
  
  //%class %noclassinfo wxHashTable, wxObject
! //    !%wxchkver25 wxHashTable(unsigned int key_type, int size = 1000)
  //    %wxchkver25 wxHashTable(wxKeyType key_type, int size = 1000)
  //    void BeginFind()
***************
*** 363,367 ****
  //    %rename GetStringKey wxObject * Get(const wxString &key)
  //    long MakeKey(const wxString& string)
! //    %wxchkver22&!%wxchkver25 wxNode * Next()
  //    %wxchkver25 wxHashTable::Node * Next()
  //    %rename PutNumKey void Put(long key, wxObject *object)
--- 363,367 ----
  //    %rename GetStringKey wxObject * Get(const wxString &key)
  //    long MakeKey(const wxString& string)
! //    !%wxchkver25 wxNode * Next()
  //    %wxchkver25 wxHashTable::Node * Next()
  //    %rename PutNumKey void Put(long key, wxObject *object)

Index: wx_datatypes.lua
===================================================================
RCS file: /cvsroot/wxlua/wxLua/bindings/wxwidgets/wx_datatypes.lua,v
retrieving revision 1.40
retrieving revision 1.41
diff -C2 -d -r1.40 -r1.41
*** wx_datatypes.lua	22 Nov 2006 06:08:32 -0000	1.40
--- wx_datatypes.lua	7 Dec 2006 06:32:42 -0000	1.41
***************
*** 169,172 ****
--- 169,178 ----
      Name = "wxANIHandler",
    },
+   wxAboutDialogInfo = {
+     Condition = "wxCHECK_VERSION(2,8,0) && wxUSE_ABOUTDLG && wxLUA_USE_wxAboutDialog",
+     DefType = "class",
+     Intrinsic = false,
+     Name = "wxAboutDialogInfo",
+   },
    wxAcceleratorEntry = {
      Condition = "wxLUA_USE_wxAcceleratorTable",
***************
*** 307,311 ****
    },
    wxBorder = {
-     Condition = "wxCHECK_VERSION(2,3,0)",
      DefType = "enum",
      Intrinsic = true,
--- 313,316 ----
***************
*** 444,448 ****
    wxCheckListBox = {
      BaseClass = "wxListBox",
!     Condition = "(wxLUA_USE_wxCheckListBox) && (wxLUA_USE_wxListBox)",
      DefType = "class",
      Intrinsic = false,
--- 449,453 ----
    wxCheckListBox = {
      BaseClass = "wxListBox",
!     Condition = "(wxUSE_CHECKLISTBOX && wxLUA_USE_wxCheckListBox) && (wxUSE_LISTBOX && wxLUA_USE_wxListBox)",
      DefType = "class",
      Intrinsic = false,
***************
*** 516,520 ****
    wxColourData = {
      BaseClass = "wxObject",
!     Condition = "wxLUA_USE_wxColourDialog",
      DefType = "class",
      Intrinsic = false,
--- 521,525 ----
    wxColourData = {
      BaseClass = "wxObject",
!     Condition = "wxUSE_COLOURDLG && wxLUA_USE_wxColourDialog",
      DefType = "class",
      Intrinsic = false,
***************
*** 529,533 ****
    wxColourDialog = {
      BaseClass = "wxDialog",
!     Condition = "wxLUA_USE_wxColourDialog",
      DefType = "class",
      Intrinsic = false,
--- 534,538 ----
    wxColourDialog = {
      BaseClass = "wxDialog",
!     Condition = "wxUSE_COLOURDLG && wxLUA_USE_wxColourDialog",
      DefType = "class",
      Intrinsic = false,
***************
*** 536,540 ****
    wxComboBox = {
      BaseClass = "wxControlWithItems",
!     Condition = "wxLUA_USE_wxComboBox",
      DefType = "class",
      Intrinsic = false,
--- 541,545 ----
    wxComboBox = {
      BaseClass = "wxControlWithItems",
!     Condition = "wxUSE_COMBOBOX && wxLUA_USE_wxComboBox",
      DefType = "class",
      Intrinsic = false,
***************
*** 973,977 ****
    wxFindDialogEvent = {
      BaseClass = "wxCommandEvent",
!     Condition = "wxLUA_USE_wxFindReplaceDialog",
      DefType = "class",
      Intrinsic = false,
--- 978,982 ----
    wxFindDialogEvent = {
      BaseClass = "wxCommandEvent",
!     Condition = "wxUSE_FINDREPLDLG && wxLUA_USE_wxFindReplaceDialog",
      DefType = "class",
      Intrinsic = false,
***************
*** 979,983 ****
    },
    wxFindReplaceData = {
!     Condition = "wxLUA_USE_wxFindReplaceDialog",
      DefType = "class",
      Intrinsic = false,
--- 984,988 ----
    },
    wxFindReplaceData = {
!     Condition = "wxUSE_FINDREPLDLG && wxLUA_USE_wxFindReplaceDialog",
      DefType = "class",
      Intrinsic = false,
***************
*** 986,990 ****
    wxFindReplaceDialog = {
      BaseClass = "wxDialog",
!     Condition = "wxLUA_USE_wxFindReplaceDialog",
      DefType = "class",
      Intrinsic = false,
--- 991,995 ----
    wxFindReplaceDialog = {
      BaseClass = "wxDialog",
!     Condition = "wxUSE_FINDREPLDLG && wxLUA_USE_wxFindReplaceDialog",
      DefType = "class",
      Intrinsic = false,
***************
*** 992,996 ****
    },
    wxFindReplaceDialogStyles = {
!     Condition = "wxLUA_USE_wxFindReplaceDialog",
      DefType = "enum",
      Intrinsic = true,
--- 997,1001 ----
    },
    wxFindReplaceDialogStyles = {
!     Condition = "wxUSE_FINDREPLDLG && wxLUA_USE_wxFindReplaceDialog",
      DefType = "enum",
      Intrinsic = true,
***************
*** 998,1002 ****
    },
    wxFindReplaceFlags = {
!     Condition = "wxLUA_USE_wxFindReplaceDialog",
      DefType = "enum",
      Intrinsic = true,
--- 1003,1007 ----
    },
    wxFindReplaceFlags = {
!     Condition = "wxUSE_FINDREPLDLG && wxLUA_USE_wxFindReplaceDialog",
      DefType = "enum",
      Intrinsic = true,
***************
*** 1040,1044 ****
    },
    wxFontData = {
!     Condition = "wxLUA_USE_wxFontDialog",
      DefType = "class",
      Intrinsic = false,
--- 1045,1049 ----
    },
    wxFontData = {
!     Condition = "wxUSE_FONTDLG && wxLUA_USE_wxFontDialog",
      DefType = "class",
      Intrinsic = false,
***************
*** 1047,1051 ****
    wxFontDialog = {
      BaseClass = "wxDialog",
!     Condition = "wxLUA_USE_wxFontDialog",
      DefType = "class",
      Intrinsic = false,
--- 1052,1056 ----
    wxFontDialog = {
      BaseClass = "wxDialog",
!     Condition = "wxUSE_FONTDLG && wxLUA_USE_wxFontDialog",
      DefType = "class",
      Intrinsic = false,
***************
*** 1162,1166 ****
    wxGauge = {
      BaseClass = "wxControl",
!     Condition = "wxLUA_USE_wxGauge",
      DefType = "class",
      Intrinsic = false,
--- 1167,1171 ----
    wxGauge = {
      BaseClass = "wxControl",
!     Condition = "wxUSE_GAUGE && wxLUA_USE_wxGauge",
      DefType = "class",
      Intrinsic = false,
***************
*** 1348,1352 ****
    wxGridEditorCreatedEvent = {
      BaseClass = "wxCommandEvent",
!     Condition = "(wxCHECK_VERSION(2,3,0)) && (wxLUA_USE_wxGrid)",
      DefType = "class",
      Intrinsic = false,
--- 1353,1357 ----
    wxGridEditorCreatedEvent = {
      BaseClass = "wxCommandEvent",
!     Condition = "wxLUA_USE_wxGrid",
      DefType = "class",
      Intrinsic = false,
***************
*** 1423,1427 ****
    wxHelpEvent = {
      BaseClass = "wxCommandEvent",
-     Condition = "wxCHECK_VERSION(2,3,0)",
      DefType = "class",
      Intrinsic = false,
--- 1428,1431 ----
***************
*** 1737,1741 ****
    wxListBox = {
      BaseClass = "wxControlWithItems",
!     Condition = "wxLUA_USE_wxListBox",
      DefType = "class",
      Intrinsic = false,
--- 1741,1745 ----
    wxListBox = {
      BaseClass = "wxControlWithItems",
!     Condition = "wxUSE_LISTBOX && wxLUA_USE_wxListBox",
      DefType = "class",
      Intrinsic = false,
***************
*** 1743,1747 ****
    },
    wxListColumnFormat = {
!     Condition = "wxLUA_USE_wxListCtrl",
      DefType = "enum",
      Intrinsic = true,
--- 1747,1751 ----
    },
    wxListColumnFormat = {
!     Condition = "wxUSE_LISTCTRL && wxLUA_USE_wxListCtrl",
      DefType = "enum",
      Intrinsic = true,
***************
*** 1750,1754 ****
    wxListCtrl = {
      BaseClass = "wxControl",
!     Condition = "wxLUA_USE_wxListCtrl",
      DefType = "class",
      Intrinsic = false,
--- 1754,1758 ----
    wxListCtrl = {
      BaseClass = "wxControl",
!     Condition = "wxUSE_LISTCTRL && wxLUA_USE_wxListCtrl",
      DefType = "class",
      Intrinsic = false,
***************
*** 1757,1761 ****
    wxListEvent = {
      BaseClass = "wxNotifyEvent",
!     Condition = "wxLUA_USE_wxListCtrl",
      DefType = "class",
      Intrinsic = false,
--- 1761,1765 ----
    wxListEvent = {
      BaseClass = "wxNotifyEvent",
!     Condition = "wxUSE_LISTCTRL && wxLUA_USE_wxListCtrl",
      DefType = "class",
      Intrinsic = false,
***************
*** 1764,1768 ****
    wxListItem = {
      BaseClass = "wxObject",
!     Condition = "wxLUA_USE_wxListCtrl",
      DefType = "class",
      Intrinsic = false,
--- 1768,1772 ----
    wxListItem = {
      BaseClass = "wxObject",
!     Condition = "wxUSE_LISTCTRL && wxLUA_USE_wxListCtrl",
      DefType = "class",
      Intrinsic = false,
***************
*** 1770,1774 ****
    },
    wxListItemAttr = {
!     Condition = "wxLUA_USE_wxListCtrl",
      DefType = "class",
      Intrinsic = false,
--- 1774,1778 ----
    },
    wxListItemAttr = {
!     Condition = "wxUSE_LISTCTRL && wxLUA_USE_wxListCtrl",
      DefType = "class",
      Intrinsic = false,
***************
*** 1777,1781 ****
    wxListView = {
      BaseClass = "wxListCtrl",
!     Condition = "wxLUA_USE_wxListCtrl",
      DefType = "class",
      Intrinsic = false,
--- 1781,1785 ----
    wxListView = {
      BaseClass = "wxListCtrl",
!     Condition = "wxUSE_LISTCTRL && wxLUA_USE_wxListCtrl",
      DefType = "class",
      Intrinsic = false,
***************
*** 1796,1805 ****
      Name = "wxListbookEvent",
    },
-   wxLog = {
-     Condition = "(wxCHECK_VERSION(2,2,0) && !wxCHECK_VERSION(2,5,0) || (defined(WXWIN_COMPATIBILITY_2_4) && WXWIN_COMPATIBILITY_2_4)) && (wxUSE_LOG) && (wxLUA_USE_wxApp)",
-     DefType = "class",
-     Intrinsic = false,
-     Name = "wxLog",
-   },
    wxLuaHtmlWinTagEvent = {
      BaseClass = "wxEvent",
--- 1800,1803 ----
***************
*** 2015,2019 ****
    wxMultiChoiceDialog = {
      BaseClass = "wxDialog",
!     Condition = "wxLUA_USE_wxMultiChoiceDialog",
      DefType = "class",
      Intrinsic = false,
--- 2013,2017 ----
    wxMultiChoiceDialog = {
      BaseClass = "wxDialog",
!     Condition = "wxUSE_CHOICEDLG && wxLUA_USE_wxMultiChoiceDialog",
      DefType = "class",
      Intrinsic = false,
***************
*** 2152,2156 ****
    wxPasswordEntryDialog = {
      BaseClass = "wxTextEntryDialog",
!     Condition = "wxLUA_USE_wxTextEntryDialog",
      DefType = "class",
      Intrinsic = false,
--- 2150,2154 ----
    wxPasswordEntryDialog = {
      BaseClass = "wxTextEntryDialog",
!     Condition = "wxUSE_TEXTDLG && wxLUA_USE_wxTextEntryDialog",
      DefType = "class",
      Intrinsic = false,
***************
*** 2317,2321 ****
    wxProgressDialog = {
      BaseClass = "wxDialog",
!     Condition = "wxLUA_USE_wxProgressDialog",
      DefType = "class",
      Intrinsic = false,
--- 2315,2319 ----
    wxProgressDialog = {
      BaseClass = "wxDialog",
!     Condition = "wxUSE_PROGRESSDLG && wxLUA_USE_wxProgressDialog",
      DefType = "class",
      Intrinsic = false,
***************
*** 2344,2348 ****
    wxRadioBox = {
      BaseClass = "wxControl",
!     Condition = "wxLUA_USE_wxRadioBox",
      DefType = "class",
      Intrinsic = false,
--- 2342,2346 ----
    wxRadioBox = {
      BaseClass = "wxControl",
!     Condition = "wxUSE_RADIOBOX && wxLUA_USE_wxRadioBox",
      DefType = "class",
      Intrinsic = false,
***************
*** 2351,2355 ****
    wxRadioButton = {
      BaseClass = "wxControl",
!     Condition = "wxLUA_USE_wxRadioButton",
      DefType = "class",
      Intrinsic = false,
--- 2349,2353 ----
    wxRadioButton = {
      BaseClass = "wxControl",
!     Condition = "wxUSE_RADIOBTN && wxLUA_USE_wxRadioButton",
      DefType = "class",
      Intrinsic = false,
***************
*** 2492,2496 ****
    wxSingleChoiceDialog = {
      BaseClass = "wxDialog",
!     Condition = "wxLUA_USE_wxSingleChoiceDialog",
      DefType = "class",
      Intrinsic = false,
--- 2490,2494 ----
    wxSingleChoiceDialog = {
      BaseClass = "wxDialog",
!     Condition = "wxUSE_CHOICEDLG && wxLUA_USE_wxSingleChoiceDialog",
      DefType = "class",
      Intrinsic = false,
***************
*** 2739,2743 ****
    },
    wxSystemFeature = {
!     Condition = "(wxCHECK_VERSION(2,3,0)) && (wxLUA_USE_wxSystemSettings)",
      DefType = "enum",
      Intrinsic = true,
--- 2737,2741 ----
    },
    wxSystemFeature = {
!     Condition = "wxLUA_USE_wxSystemSettings",
      DefType = "enum",
      Intrinsic = true,
***************
*** 2764,2768 ****
    },
    wxSystemScreenType = {
!     Condition = "(wxCHECK_VERSION(2,3,0)) && (wxLUA_USE_wxSystemSettings)",
      DefType = "enum",
      Intrinsic = true,
--- 2762,2766 ----
    },
    wxSystemScreenType = {
!     Condition = "wxLUA_USE_wxSystemSettings",
      DefType = "enum",
      Intrinsic = true,
***************
*** 2849,2853 ****
    wxTextEntryDialog = {
      BaseClass = "wxDialog",
!     Condition = "wxLUA_USE_wxTextEntryDialog",
      DefType = "class",
      Intrinsic = false,
--- 2847,2851 ----
    wxTextEntryDialog = {
      BaseClass = "wxDialog",
!     Condition = "wxUSE_TEXTDLG && wxLUA_USE_wxTextEntryDialog",
      DefType = "class",
      Intrinsic = false,
***************
*** 2904,2908 ****
    wxToolBarSimple = {
      BaseClass = "wxToolBarBase",
!     Condition = "(wxCHECK_VERSION(2,2,0) && !wxCHECK_VERSION(2,5,0)) && (wxLUA_USE_wxToolbar)",
      DefType = "class",
      Intrinsic = false,
--- 2902,2906 ----
    wxToolBarSimple = {
      BaseClass = "wxToolBarBase",
!     Condition = "(!wxCHECK_VERSION(2,5,0)) && (wxLUA_USE_wxToolbar)",
      DefType = "class",
      Intrinsic = false,
***************
*** 3148,3152 ****
    wxWizard = {
      BaseClass = "wxDialog",
!     Condition = "wxLUA_USE_wxWizard",
      DefType = "class",
      Intrinsic = false,
--- 3146,3150 ----
    wxWizard = {
      BaseClass = "wxDialog",
!     Condition = "wxUSE_WIZARDDLG && wxLUA_USE_wxWizard",
      DefType = "class",
      Intrinsic = false,
***************
*** 3155,3159 ****
    wxWizardEvent = {
      BaseClass = "wxNotifyEvent",
!     Condition = "wxLUA_USE_wxWizard",
      DefType = "class",
      Intrinsic = false,
--- 3153,3157 ----
    wxWizardEvent = {
      BaseClass = "wxNotifyEvent",
!     Condition = "wxUSE_WIZARDDLG && wxLUA_USE_wxWizard",
      DefType = "class",
      Intrinsic = false,
***************
*** 3162,3166 ****
    wxWizardPage = {
      BaseClass = "wxPanel",
!     Condition = "wxLUA_USE_wxWizard",
      DefType = "class",
      Intrinsic = false,
--- 3160,3164 ----
    wxWizardPage = {
      BaseClass = "wxPanel",
!     Condition = "wxUSE_WIZARDDLG && wxLUA_USE_wxWizard",
      DefType = "class",
      Intrinsic = false,
***************
*** 3169,3173 ****
    wxWizardPageSimple = {
      BaseClass = "wxWizardPage",
!     Condition = "wxLUA_USE_wxWizard",
      DefType = "class",
      Intrinsic = false,
--- 3167,3171 ----
    wxWizardPageSimple = {
      BaseClass = "wxWizardPage",
!     Condition = "wxUSE_WIZARDDLG && wxLUA_USE_wxWizard",
      DefType = "class",
      Intrinsic = false,
***************
*** 3291,3296 ****
    ["%wxchkver272"] = "wxCHECK_VERSION(2,7,2)",
    ["%wxchkver28"] = "wxCHECK_VERSION(2,8,0)",
!   ["%wxchkver_2_2"] = "wxCHECK_VERSION(2,2,0)",
!   ["%wxchkver_2_5"] = "wxCHECK_VERSION(2,5,0)",
    ["%wxcompat20"] = "(defined(WXWIN_COMPATIBILITY_2) && WXWIN_COMPATIBILITY_2)",
    ["%wxcompat22"] = "(defined(WXWIN_COMPATIBILITY_2_2) && WXWIN_COMPATIBILITY_2_2)",
--- 3289,3293 ----
    ["%wxchkver272"] = "wxCHECK_VERSION(2,7,2)",
    ["%wxchkver28"] = "wxCHECK_VERSION(2,8,0)",
!   ["%wxchkver_2_8"] = "wxCHECK_VERSION(2,8,0)",
    ["%wxcompat20"] = "(defined(WXWIN_COMPATIBILITY_2) && WXWIN_COMPATIBILITY_2)",
    ["%wxcompat22"] = "(defined(WXWIN_COMPATIBILITY_2_2) && WXWIN_COMPATIBILITY_2_2)",
***************
*** 3307,3310 ****
--- 3304,3308 ----
    wxLUA_USE_Geometry = "wxLUA_USE_Geometry",
    wxLUA_USE_MDI = "wxLUA_USE_MDI",
+   wxLUA_USE_wxAboutDialog = "wxLUA_USE_wxAboutDialog",
    wxLUA_USE_wxAcceleratorTable = "wxLUA_USE_wxAcceleratorTable",
    wxLUA_USE_wxApp = "wxLUA_USE_wxApp",
***************
*** 3429,3432 ****
--- 3427,3431 ----
    wxLUA_USE_wxWizard = "wxLUA_USE_wxWizard",
    wxLUA_USE_wxXMLResource = "wxLUA_USE_wxXMLResource",
+   wxUSE_ABOUTDLG = "wxUSE_ABOUTDLG",
    wxUSE_ACCEL = "wxUSE_ACCEL",
    wxUSE_ACCESSIBILITY = "wxUSE_ACCESSIBILITY",

Index: print.i
===================================================================
RCS file: /cvsroot/wxlua/wxLua/bindings/wxwidgets/print.i,v
retrieving revision 1.10
retrieving revision 1.11
diff -C2 -d -r1.10 -r1.11
*** print.i	17 May 2006 05:02:04 -0000	1.10
--- print.i	7 Dec 2006 06:32:42 -0000	1.11
***************
*** 64,72 ****
      bool Print(wxWindow *parent, wxLuaPrintout *printout, bool prompt=true)
      wxDC* PrintDialog(wxWindow *parent)
!     %wxchkver23 void ReportError(wxWindow *parent, wxLuaPrintout *printout, const wxString& message)
      bool Setup(wxWindow *parent)
  %endclass
  
! %endif wxLUA_USE_wxLuaPrintout
  
  //-----------------------------------------------------------------------------
--- 64,72 ----
      bool Print(wxWindow *parent, wxLuaPrintout *printout, bool prompt=true)
      wxDC* PrintDialog(wxWindow *parent)
!     void ReportError(wxWindow *parent, wxLuaPrintout *printout, const wxString& message)
      bool Setup(wxWindow *parent)
  %endclass
  
! %endif //wxLUA_USE_wxLuaPrintout
  
  //-----------------------------------------------------------------------------
***************
*** 543,547 ****
  %endclass
  
! %endif wxLUA_USE_wxLuaPrintout
  
  //-----------------------------------------------------------------------------
--- 543,547 ----
  %endclass
  
! %endif //wxLUA_USE_wxLuaPrintout
  
  //-----------------------------------------------------------------------------
***************
*** 573,576 ****
  %endif // %msw|%mac
  
! %endif wxLUA_USE_wxPrint
  
--- 573,576 ----
  %endif // %msw|%mac
  
! %endif //wxLUA_USE_wxPrint
  

Index: file.i
===================================================================
RCS file: /cvsroot/wxlua/wxLua/bindings/wxwidgets/file.i,v
retrieving revision 1.12
retrieving revision 1.13
diff -C2 -d -r1.12 -r1.13
*** file.i	18 May 2006 05:47:39 -0000	1.12
--- file.i	7 Dec 2006 06:32:42 -0000	1.13
***************
*** 181,185 ****
  %endclass
  
! %endif wxLUA_USE_wxFileName
  
  //-----------------------------------------------------------------------------
--- 181,185 ----
  %endclass
  
! %endif //wxLUA_USE_wxFileName
  
  //-----------------------------------------------------------------------------
***************
*** 251,255 ****
  %endclass
  
! %endif wxLUA_USE_wxFile
  
  //-----------------------------------------------------------------------------
--- 251,255 ----
  %endclass
  
! %endif //wxLUA_USE_wxFile
  
  //-----------------------------------------------------------------------------
***************
*** 272,276 ****
      static bool Exists(const wxString& dir)
      // %override [unsigned int, lua string table] wxDir::GetAllFiles(const wxString& dirname, const wxString& filespec = "", int flags = wxDIR_DEFAULT)
!     %wxchkver23 static unsigned int GetAllFiles(const wxString& dirname, wxArrayString *files, const wxString& filespec = "", int flags = wxDIR_DEFAULT)
      // %override [bool, string filename] wxDir::GetFirst(const wxString& filespec = "", int flags = wxDIR_DEFAULT)
      bool GetFirst(wxString * filename, const wxString& filespec = "", int flags = wxDIR_DEFAULT) const
--- 272,276 ----
      static bool Exists(const wxString& dir)
      // %override [unsigned int, lua string table] wxDir::GetAllFiles(const wxString& dirname, const wxString& filespec = "", int flags = wxDIR_DEFAULT)
!     static unsigned int GetAllFiles(const wxString& dirname, wxArrayString *files, const wxString& filespec = "", int flags = wxDIR_DEFAULT)
      // %override [bool, string filename] wxDir::GetFirst(const wxString& filespec = "", int flags = wxDIR_DEFAULT)
      bool GetFirst(wxString * filename, const wxString& filespec = "", int flags = wxDIR_DEFAULT) const
***************
*** 284,288 ****
  %endclass
  
! %endif wxLUA_USE_wxDir
  
  //-----------------------------------------------------------------------------
--- 284,288 ----
  %endclass
  
! %endif //wxLUA_USE_wxDir
  
  //-----------------------------------------------------------------------------

Index: regex.i
===================================================================
RCS file: /cvsroot/wxlua/wxLua/bindings/wxwidgets/regex.i,v
retrieving revision 1.4
retrieving revision 1.5
diff -C2 -d -r1.4 -r1.5
*** regex.i	17 May 2006 05:02:04 -0000	1.4
--- regex.i	7 Dec 2006 06:32:42 -0000	1.5
***************
*** 49,52 ****
  %endclass
  
! %endif wxLUA_USE_wxRegEx
  
--- 49,52 ----
  %endclass
  
! %endif //wxLUA_USE_wxRegEx
  

Index: dialogs.i
===================================================================
RCS file: /cvsroot/wxlua/wxLua/bindings/wxwidgets/dialogs.i,v
retrieving revision 1.20
retrieving revision 1.21
diff -C2 -d -r1.20 -r1.21
*** dialogs.i	6 Nov 2006 06:11:43 -0000	1.20
--- dialogs.i	7 Dec 2006 06:32:42 -0000	1.21
***************
*** 26,30 ****
      wxFILE_MUST_EXIST
      wxMULTIPLE
!     %wxchkver23 wxCHANGE_DIR
  %endenum
  
--- 26,30 ----
      wxFILE_MUST_EXIST
      wxMULTIPLE
!     wxCHANGE_DIR
  %endenum
  
***************
*** 39,55 ****
  %function wxString wxFileSelector(const wxString& message, const wxString& default_path = "", const wxString& default_filename = "", const wxString& default_extension = "", const wxString& wildcard = "*.*", int flags = 0, wxWindow *parent = NULL, int x = -1, int y = -1)
  %function void wxEndBusyCursor()
! %function wxColour wxGetColourFromUser(wxWindow *parent, const wxColour& colInit)
! %function wxFont wxGetFontFromUser(wxWindow *parent, const wxFont& fontInit)
  // %override [int, lua int table] wxGetMultipleChoices(const wxString& message, const wxString& caption, lua string table, wxWindow *parent = NULL, int x = -1, int y = -1, bool centre = true, int width=150, int height=200)
! %function int wxGetMultipleChoices(const wxString& message, const wxString& caption, int n, const wxString choices[], int nsel, int *selection, wxWindow *parent = NULL, int x = -1, int y = -1, bool centre = true, int width=150, int height=200)
  %if wxUSE_NUMBERDLG
  %wxchkver25 %include "wx/numdlg.h" // FIXME not in 2.4
  %function long wxGetNumberFromUser(const wxString& message, const wxString& prompt, const wxString& caption, long value, long min = 0, long max = 100, wxWindow *parent = NULL, const wxPoint& pos = wxDefaultPosition)
  %endif // wxUSE_NUMBERDLG
! %function wxString wxGetPasswordFromUser(const wxString& message, const wxString& caption = "Input text", const wxString& default_value = "", wxWindow *parent = NULL)
! %function wxString wxGetTextFromUser(const wxString& message, const wxString& caption = "Input text", const wxString& default_value = "", wxWindow *parent = NULL, int x = -1, int y = -1, bool centre = true)
  // int wxGetMultipleChoice(const wxString& message, const wxString& caption, int n, const wxString& choices[], int nsel, int *selection, wxWindow *parent = NULL, int x = -1, int y = -1, bool centre = true, int width=150, int height=200)
! %function wxString wxGetSingleChoice(const wxString& message, const wxString& caption, const wxArrayString_FromLuaTable& choices, wxWindow *parent = NULL, int x = wxDefaultCoord, int y = wxDefaultCoord, bool centre = true, int width = wxCHOICE_WIDTH, int height = wxCHOICE_HEIGHT)
! %function int wxGetSingleChoiceIndex(const wxString& message, const wxString& caption, const wxArrayString_FromLuaTable& choices, wxWindow *parent = NULL, int x = wxDefaultCoord, int y = wxDefaultCoord, bool centre = true, int width = wxCHOICE_WIDTH, int height = wxCHOICE_HEIGHT)
  %function bool wxIsBusy()
  %function int wxMessageBox(const wxString& message, const wxString& caption = "Message", int style = wxOK | wxCENTRE, wxWindow *parent = NULL, int x = -1, int y = -1)
--- 39,55 ----
  %function wxString wxFileSelector(const wxString& message, const wxString& default_path = "", const wxString& default_filename = "", const wxString& default_extension = "", const wxString& wildcard = "*.*", int flags = 0, wxWindow *parent = NULL, int x = -1, int y = -1)
  %function void wxEndBusyCursor()
! wxUSE_COLOURDLG %function wxColour wxGetColourFromUser(wxWindow *parent, const wxColour& colInit)
! wxUSE_FONTDLG %function wxFont wxGetFontFromUser(wxWindow *parent, const wxFont& fontInit)
  // %override [int, lua int table] wxGetMultipleChoices(const wxString& message, const wxString& caption, lua string table, wxWindow *parent = NULL, int x = -1, int y = -1, bool centre = true, int width=150, int height=200)
! wxUSE_CHOICEDLG %function int wxGetMultipleChoices(const wxString& message, const wxString& caption, int n, const wxString choices[], int nsel, int *selection, wxWindow *parent = NULL, int x = -1, int y = -1, bool centre = true, int width=150, int height=200)
  %if wxUSE_NUMBERDLG
  %wxchkver25 %include "wx/numdlg.h" // FIXME not in 2.4
  %function long wxGetNumberFromUser(const wxString& message, const wxString& prompt, const wxString& caption, long value, long min = 0, long max = 100, wxWindow *parent = NULL, const wxPoint& pos = wxDefaultPosition)
  %endif // wxUSE_NUMBERDLG
! wxUSE_TEXTDLG %function wxString wxGetPasswordFromUser(const wxString& message, const wxString& caption = "Input text", const wxString& default_value = "", wxWindow *parent = NULL)
! wxUSE_TEXTDLG %function wxString wxGetTextFromUser(const wxString& message, const wxString& caption = "Input text", const wxString& default_value = "", wxWindow *parent = NULL, int x = -1, int y = -1, bool centre = true)
  // int wxGetMultipleChoice(const wxString& message, const wxString& caption, int n, const wxString& choices[], int nsel, int *selection, wxWindow *parent = NULL, int x = -1, int y = -1, bool centre = true, int width=150, int height=200)
! wxUSE_CHOICEDLG %function wxString wxGetSingleChoice(const wxString& message, const wxString& caption, const wxArrayString_FromLuaTable& choices, wxWindow *parent = NULL, int x = wxDefaultCoord, int y = wxDefaultCoord, bool centre = true, int width = wxCHOICE_WIDTH, int height = wxCHOICE_HEIGHT)
! wxUSE_CHOICEDLG %function int wxGetSingleChoiceIndex(const wxString& message, const wxString& caption, const wxArrayString_FromLuaTable& choices, wxWindow *parent = NULL, int x = wxDefaultCoord, int y = wxDefaultCoord, bool centre = true, int width = wxCHOICE_WIDTH, int height = wxCHOICE_HEIGHT)
  %function bool wxIsBusy()
  %function int wxMessageBox(const wxString& message, const wxString& caption = "Message", int style = wxOK | wxCENTRE, wxWindow *parent = NULL, int x = -1, int y = -1)
***************
*** 66,71 ****
  %define wxDIALOG_MODELESS
  %define wxDEFAULT_DIALOG_STYLE
! %wxchkver23 %define wxDIALOG_NO_PARENT
! %wxchkver23 %define wxDIALOG_EX_CONTEXTHELP
  // %define wxDIALOG_EX_METAL mac only
  %define wxCHOICEDLG_STYLE
--- 66,71 ----
  %define wxDIALOG_MODELESS
  %define wxDEFAULT_DIALOG_STYLE
! %define wxDIALOG_NO_PARENT
! %define wxDIALOG_EX_CONTEXTHELP
  // %define wxDIALOG_EX_METAL mac only
  %define wxCHOICEDLG_STYLE
***************
*** 87,91 ****
      //bool IsIconized() const - in wxToplevelWindow
      bool IsModal() const
!     //%wxchkver23 void SetIcon(const wxIcon& icon) - in wxToplevelWindow
      // void SetModal(const bool flag) - deprecated
      void SetReturnCode(int retCode)
--- 87,91 ----
      //bool IsIconized() const - in wxToplevelWindow
      bool IsModal() const
!     // void SetIcon(const wxIcon& icon) - in wxToplevelWindow
      // void SetModal(const bool flag) - deprecated
      void SetReturnCode(int retCode)
***************
*** 100,106 ****
  
  //-----------------------------------------------------------------------------
  // wxColourDialog
  
! %if wxLUA_USE_wxColourDialog
  
  %include "wx/colordlg.h"
--- 100,176 ----
  
  //-----------------------------------------------------------------------------
+ // wxAboutDialog
+ 
+ %if %wxchkver_2_8 & wxUSE_ABOUTDLG & wxLUA_USE_wxAboutDialog
+ 
+ %include "wx/aboutdlg.h"
+ 
+ %class %noclassinfo %encapsulate %delete wxAboutDialogInfo
+     wxAboutDialogInfo()
+ 
+     void SetName(const wxString& name)
+     wxString GetName() const
+ 
+     void SetVersion(const wxString& version)
+     bool HasVersion() const
+     wxString GetVersion() const
+ 
+     void SetDescription(const wxString& desc)
+     bool HasDescription() const
+     wxString GetDescription() const
+ 
+     void SetCopyright(const wxString& copyright)
+     bool HasCopyright() const
+     wxString GetCopyright() const
+ 
+     void SetLicence(const wxString& licence)
+     void SetLicense(const wxString& licence)
+     bool HasLicence() const
+     wxString GetLicence() const
+ 
+     void SetIcon(const wxIcon& icon)
+     bool HasIcon() const
+     wxIcon GetIcon() const
+ 
+     void SetWebSite(const wxString& url, const wxString& desc = wxEmptyString)
+     bool HasWebSite() const
+ 
+     wxString GetWebSiteURL() const
+     wxString GetWebSiteDescription() const
+ 
+     void SetDevelopers(const wxArrayString_FromLuaTable& developers)
+     void AddDeveloper(const wxString& developer)
+     bool HasDevelopers() const
+     const wxArrayString& GetDevelopers() const
+ 
+     void SetDocWriters(const wxArrayString_FromLuaTable& docwriters)
+     void AddDocWriter(const wxString& docwriter)
+     bool HasDocWriters() const
+     wxArrayString GetDocWriters() const
+ 
+     void SetArtists(const wxArrayString_FromLuaTable& artists)
+     void AddArtist(const wxString& artist)
+     bool HasArtists() const
+     wxArrayString GetArtists() const
+ 
+     void SetTranslators(const wxArrayString_FromLuaTable& translators)
+     void AddTranslator(const wxString& translator)
+     bool HasTranslators() const
+     wxArrayString GetTranslators() const
+ 
+     // implementation only
+     // -------------------
+     //bool IsSimple() const
+     //wxString GetDescriptionAndCredits() const
+ %endclass
+ 
+ %function void wxAboutBox(const wxAboutDialogInfo& info)
+ 
+ %endif //%wxchkver_2_8 & wxUSE_ABOUTDLG & wxLUA_USE_wxAboutDialog
+ 
+ //-----------------------------------------------------------------------------
  // wxColourDialog
  
! %if wxUSE_COLOURDLG & wxLUA_USE_wxColourDialog
  
  %include "wx/colordlg.h"
***************
*** 177,181 ****
  %endclass
  
! %endif wxLUA_USE_wxFileDialog
  
  //-----------------------------------------------------------------------------
--- 247,251 ----
  %endclass
  
! %endif //wxLUA_USE_wxFileDialog
  
  //-----------------------------------------------------------------------------
***************
*** 203,207 ****
  %endclass
  
! %endif wxLUA_USE_wxDirDialog
  
  //-----------------------------------------------------------------------------
--- 273,277 ----
  %endclass
  
! %endif //wxLUA_USE_wxDirDialog
  
  //-----------------------------------------------------------------------------
***************
*** 219,228 ****
  %endclass
  
! %endif wxLUA_USE_wxMessageDialog
  
  //-----------------------------------------------------------------------------
  // wxMultiChoiceDialog - use wxGetMultipleChoices
  
! %if wxLUA_USE_wxMultiChoiceDialog
  
  %class wxMultiChoiceDialog, wxDialog
--- 289,298 ----
  %endclass
  
! %endif //wxLUA_USE_wxMessageDialog
  
  //-----------------------------------------------------------------------------
  // wxMultiChoiceDialog - use wxGetMultipleChoices
  
! %if wxUSE_CHOICEDLG & wxLUA_USE_wxMultiChoiceDialog
  
  %class wxMultiChoiceDialog, wxDialog
***************
*** 234,243 ****
  %endclass
  
! %endif wxLUA_USE_wxMultiChoiceDialog
  
  //-----------------------------------------------------------------------------
  // wxSingleChoiceDialog - use wxGetSingleChoice or wxGetSingleChoiceIndex
  
! %if wxLUA_USE_wxSingleChoiceDialog
  
  %class wxSingleChoiceDialog, wxDialog
--- 304,313 ----
  %endclass
  
! %endif //wxUSE_CHOICEDLG & wxLUA_USE_wxMultiChoiceDialog
  
  //-----------------------------------------------------------------------------
  // wxSingleChoiceDialog - use wxGetSingleChoice or wxGetSingleChoiceIndex
  
! %if wxUSE_CHOICEDLG & wxLUA_USE_wxSingleChoiceDialog
  
  %class wxSingleChoiceDialog, wxDialog
***************
*** 254,263 ****
  %endclass
  
! %endif wxLUA_USE_wxSingleChoiceDialog
  
  //-----------------------------------------------------------------------------
  // wxTextEntryDialog - see also wxGetTextFromUser
  
! %if wxLUA_USE_wxTextEntryDialog
  
  %define wxTextEntryDialogStyle
--- 324,333 ----
  %endclass
  
! %endif //wxUSE_CHOICEDLG & wxLUA_USE_wxSingleChoiceDialog
  
  //-----------------------------------------------------------------------------
  // wxTextEntryDialog - see also wxGetTextFromUser
  
! %if wxUSE_TEXTDLG & wxLUA_USE_wxTextEntryDialog
  
  %define wxTextEntryDialogStyle
***************
*** 281,290 ****
  %endclass
  
! %endif wxLUA_USE_wxTextEntryDialog
  
  //-----------------------------------------------------------------------------
  // wxFontDialog
  
! %if wxLUA_USE_wxFontDialog
  
  %include "wx/fontdlg.h"
--- 351,360 ----
  %endclass
  
! %endif //wxUSE_TEXTDLG & wxLUA_USE_wxTextEntryDialog
  
  //-----------------------------------------------------------------------------
  // wxFontDialog
  
! %if wxUSE_FONTDLG & wxLUA_USE_wxFontDialog
  
  %include "wx/fontdlg.h"
***************
*** 328,337 ****
  %endclass
  
! %endif wxLUA_USE_wxFontDialog
  
  //-----------------------------------------------------------------------------
  // wxFindReplaceDialog
  
! %if wxLUA_USE_wxFindReplaceDialog
  
  %include "wx/fdrepdlg.h"
--- 398,407 ----
  %endclass
  
! %endif //wxUSE_FONTDLG & wxLUA_USE_wxFontDialog
  
  //-----------------------------------------------------------------------------
  // wxFindReplaceDialog
  
! %if wxUSE_FINDREPLDLG & wxLUA_USE_wxFindReplaceDialog
  
  %include "wx/fdrepdlg.h"
***************
*** 404,413 ****
  %endclass
  
! %endif wxLUA_USE_wxFindReplaceDialog
  
  //-----------------------------------------------------------------------------
  // wxProgressDialog
  
! %if wxLUA_USE_wxProgressDialog
  
  %include "wx/generic/progdlgg.h"
--- 474,483 ----
  %endclass
  
! %endif //wxUSE_FINDREPLDLG & wxLUA_USE_wxFindReplaceDialog
  
  //-----------------------------------------------------------------------------
  // wxProgressDialog
  
! %if wxUSE_PROGRESSDLG & wxLUA_USE_wxProgressDialog
  
  %include "wx/generic/progdlgg.h"
***************
*** 430,434 ****
  %endclass
  
! %endif wxLUA_USE_wxProgressDialog
  
  //-----------------------------------------------------------------------------
--- 500,504 ----
  %endclass
  
! %endif //wxUSE_PROGRESSDLG & wxLUA_USE_wxProgressDialog
  
  //-----------------------------------------------------------------------------
***************
*** 471,480 ****
  %endclass
  
! %endif wxLUA_USE_wxSplashScreen
  
  //-----------------------------------------------------------------------------
  // wxWizard
  
! %if wxLUA_USE_wxWizard
  
  %include "wx/wizard.h"
--- 541,550 ----
  %endclass
  
! %endif //wxLUA_USE_wxSplashScreen
  
  //-----------------------------------------------------------------------------
  // wxWizard
  
! %if wxUSE_WIZARDDLG & wxLUA_USE_wxWizard
  
  %include "wx/wizard.h"
***************
*** 540,542 ****
  %endclass
  
! %endif wxLUA_USE_wxWizard
--- 610,612 ----
  %endclass
  
! %endif //wxUSE_WIZARDDLG & wxLUA_USE_wxWizard

Index: geometry.i
===================================================================
RCS file: /cvsroot/wxlua/wxLua/bindings/wxwidgets/geometry.i,v
retrieving revision 1.6
retrieving revision 1.7
diff -C2 -d -r1.6 -r1.7
*** geometry.i	17 May 2006 05:02:04 -0000	1.6
--- geometry.i	7 Dec 2006 06:32:42 -0000	1.7
***************
*** 271,273 ****
  //%endclass
  
! %endif wxLUA_USE_Geometry
--- 271,273 ----
  //%endclass
  
! %endif //wxLUA_USE_Geometry

Index: xml.i
===================================================================
RCS file: /cvsroot/wxlua/wxLua/bindings/wxwidgets/xml.i,v
retrieving revision 1.4
retrieving revision 1.5
diff -C2 -d -r1.4 -r1.5
*** xml.i	17 May 2006 05:02:05 -0000	1.4
--- xml.i	7 Dec 2006 06:32:42 -0000	1.5
***************
*** 9,13 ****
  %if wxLUA_USE_wxXMLResource
  
! %wxchkver22&!%wxchkver25 %include "wx/xrc/xml.h"
  %wxchkver25 %include "wx/xml/xml.h"
  %include "wx/xrc/xmlres.h"
--- 9,13 ----
  %if wxLUA_USE_wxXMLResource
  
! !%wxchkver25 %include "wx/xrc/xml.h"
  %wxchkver25 %include "wx/xml/xml.h"
  %include "wx/xrc/xmlres.h"
***************
*** 172,174 ****
  %endclass
  
! %endif wxLUA_USE_wxXMLResource
--- 172,174 ----
  %endclass
  
! %endif //wxLUA_USE_wxXMLResource

Index: windows.i
===================================================================
RCS file: /cvsroot/wxlua/wxLua/bindings/wxwidgets/windows.i,v
retrieving revision 1.23
retrieving revision 1.24
diff -C2 -d -r1.23 -r1.24
*** windows.i	22 Nov 2006 21:13:56 -0000	1.23
--- windows.i	7 Dec 2006 06:32:42 -0000	1.24
***************
*** 309,313 ****
  %endclass
  
! %endif wxLUA_USE_wxWindowList
  
  //-----------------------------------------------------------------------------
--- 309,313 ----
  %endclass
  
! %endif //wxLUA_USE_wxWindowList
  
  //-----------------------------------------------------------------------------
***************
*** 395,399 ****
  %endclass
  
! %endif wxLUA_USE_wxNotebook
  
  //-----------------------------------------------------------------------------
--- 395,399 ----
  %endclass
  
! %endif //wxLUA_USE_wxNotebook
  
  //-----------------------------------------------------------------------------
***************
*** 405,411 ****
  
  %define wxNB_FIXEDWIDTH
! %wxchkver23 %define wxNB_MULTILINE
  
! %wxchkver23&(!%wxchkver27|%wxcompat26) %define wxNB_TOP
  !%wxchkver27|%wxcompat26 %define wxNB_LEFT
  !%wxchkver27|%wxcompat26 %define wxNB_RIGHT
--- 405,411 ----
  
  %define wxNB_FIXEDWIDTH
! %define wxNB_MULTILINE
  
! !%wxchkver27|%wxcompat26 %define wxNB_TOP  // use wxBK_XXX after 2.6
  !%wxchkver27|%wxcompat26 %define wxNB_LEFT
  !%wxchkver27|%wxcompat26 %define wxNB_RIGHT
***************
*** 479,483 ****
  %endclass
  
! %endif wxLUA_USE_wxNotebook
  
  //-----------------------------------------------------------------------------
--- 479,483 ----
  %endclass
  
! %endif //wxLUA_USE_wxNotebook
  
  //-----------------------------------------------------------------------------
***************
*** 522,526 ****
  %endclass
  
! %endif wxLUA_USE_wxNotebook & wxLUA_USE_wxListCtrl
  
  //-----------------------------------------------------------------------------
--- 522,526 ----
  %endclass
  
! %endif //wxLUA_USE_wxNotebook & wxLUA_USE_wxListCtrl
  
  //-----------------------------------------------------------------------------
***************
*** 565,569 ****
  %endclass
  
! %endif wxLUA_USE_wxNotebook & wxLUA_USE_wxChoice
  
  //-----------------------------------------------------------------------------
--- 565,569 ----
  %endclass
  
! %endif //wxLUA_USE_wxNotebook & wxLUA_USE_wxChoice
  
  //-----------------------------------------------------------------------------
***************
*** 578,585 ****
      %define wxTC_RIGHTJUSTIFY
      %define wxTC_FIXEDWIDTH
!     %wxchkver23 %define wxTC_TOP
!     %wxchkver23 %define wxTC_LEFT
!     %wxchkver23 %define wxTC_RIGHT
!     %wxchkver23 %define wxTC_BOTTOM
      %define wxTC_MULTILINE
      %define wxTC_OWNERDRAW
--- 578,585 ----
      %define wxTC_RIGHTJUSTIFY
      %define wxTC_FIXEDWIDTH
!     %define wxTC_TOP
!     %define wxTC_LEFT
!     %define wxTC_RIGHT
!     %define wxTC_BOTTOM
      %define wxTC_MULTILINE
      %define wxTC_OWNERDRAW
***************
*** 627,631 ****
  %endif
  
! %endif wxLUA_USE_wxTabCtrl
  
  //-----------------------------------------------------------------------------
--- 627,631 ----
  %endif
  
! %endif //wxLUA_USE_wxTabCtrl
  
  //-----------------------------------------------------------------------------
***************
*** 722,728 ****
  
      bool LayoutFrame(wxFrame* frame, wxWindow* mainWindow = NULL) const
- %if wxLUA_USE_MDI
      bool LayoutMDIFrame(wxMDIParentFrame* frame, wxRect* rect = NULL)
- %endif wxLUA_USE_MDI
      bool LayoutWindow(wxWindow* frame, wxWindow* mainWindow = NULL)
  %endclass
--- 722,726 ----
***************
*** 796,800 ****
  %endclass
  
! %endif wxLUA_USE_wxSashWindow
  
  //-----------------------------------------------------------------------------
--- 794,798 ----
  %endclass
  
! %endif //wxLUA_USE_wxSashWindow
  
  //-----------------------------------------------------------------------------
***************
*** 831,835 ****
  %endclass
  
! %endif wxLUA_USE_wxScrolledWindow
  
  //-----------------------------------------------------------------------------
--- 829,833 ----
  %endclass
  
! %endif //wxLUA_USE_wxScrolledWindow
  
  //-----------------------------------------------------------------------------
***************
*** 850,854 ****
  %define wxSP_3D
  %wxchkver24 %define wxSP_NO_XP_THEME
! %wxchkver23 %define wxSP_SASH_AQUA
  
  %class wxSplitterWindow, wxWindow
--- 848,852 ----
  %define wxSP_3D
  %wxchkver24 %define wxSP_NO_XP_THEME
! %define wxSP_SASH_AQUA
  
  %class wxSplitterWindow, wxWindow
***************
*** 906,910 ****
  %endclass
  
! %endif wxLUA_USE_wxSplitterWindow
  
  //-----------------------------------------------------------------------------
--- 904,908 ----
  %endclass
  
! %endif //wxLUA_USE_wxSplitterWindow
  
  //-----------------------------------------------------------------------------
***************
*** 922,926 ****
  %endclass
  
! %endif wxLUA_USE_wxStaticBox
  
  //-----------------------------------------------------------------------------
--- 920,924 ----
  %endclass
  
! %endif //wxLUA_USE_wxStaticBox
  
  //-----------------------------------------------------------------------------
***************
*** 942,946 ****
  %endclass
  
! %endif wxLUA_USE_wxStaticBitmap
  
  //-----------------------------------------------------------------------------
--- 940,944 ----
  %endclass
  
! %endif //wxLUA_USE_wxStaticBitmap
  
  //-----------------------------------------------------------------------------
***************
*** 965,969 ****
  %endclass
  
! %endif wxLUA_USE_wxStaticText
  
  //-----------------------------------------------------------------------------
--- 963,967 ----
  %endclass
  
! %endif //wxLUA_USE_wxStaticText
  
  //-----------------------------------------------------------------------------
***************
*** 988,990 ****
  %endclass
  
! %endif wxLUA_USE_wxStaticLine
--- 986,988 ----
  %endclass
  
! %endif //wxLUA_USE_wxStaticLine

Index: gdi.i
===================================================================
RCS file: /cvsroot/wxlua/wxLua/bindings/wxwidgets/gdi.i,v
retrieving revision 1.31
retrieving revision 1.32
diff -C2 -d -r1.31 -r1.32
*** gdi.i	30 Nov 2006 05:56:31 -0000	1.31
--- gdi.i	7 Dec 2006 06:32:42 -0000	1.32
***************
*** 122,126 ****
  %endclass
  
! %endif wxLUA_USE_wxPointSizeRect
  
  //-----------------------------------------------------------------------------
--- 122,126 ----
  %endclass
  
! %endif //wxLUA_USE_wxPointSizeRect
  
  //-----------------------------------------------------------------------------
***************
*** 206,210 ****
  %endclass
  
! %endif wxLUA_USE_wxRegion
  
  //-----------------------------------------------------------------------------
--- 206,210 ----
  %endclass
  
! %endif //wxLUA_USE_wxRegion
  
  //-----------------------------------------------------------------------------
***************
*** 243,247 ****
      wxFONTFAMILY_TELETYPE
      wxFONTFAMILY_MAX
!     %wxchkver23 wxFONTFAMILY_UNKNOWN
  %endenum
  
--- 243,247 ----
      wxFONTFAMILY_TELETYPE
      wxFONTFAMILY_MAX
!     wxFONTFAMILY_UNKNOWN
  %endenum
  
***************
*** 301,308 ****
      wxFONTENCODING_CP866
      wxFONTENCODING_CP874
!     %wxchkver23    wxFONTENCODING_CP932
!     %wxchkver23    wxFONTENCODING_CP936
!     %wxchkver23    wxFONTENCODING_CP949
!     %wxchkver23    wxFONTENCODING_CP950
      wxFONTENCODING_CP1250
      wxFONTENCODING_CP1251
--- 301,308 ----
      wxFONTENCODING_CP866
      wxFONTENCODING_CP874
!     wxFONTENCODING_CP932
!     wxFONTENCODING_CP936
!     wxFONTENCODING_CP949
!     wxFONTENCODING_CP950
      wxFONTENCODING_CP1250
      wxFONTENCODING_CP1251
***************
*** 314,319 ****
      wxFONTENCODING_CP1257
      wxFONTENCODING_CP12_MAX
!     %wxchkver23    wxFONTENCODING_UTF7
!     %wxchkver23    wxFONTENCODING_UTF8
      wxFONTENCODING_UNICODE
      wxFONTENCODING_MAX
--- 314,319 ----
      wxFONTENCODING_CP1257
      wxFONTENCODING_CP12_MAX
!     wxFONTENCODING_UTF7
!     wxFONTENCODING_UTF8
      wxFONTENCODING_UNICODE
      wxFONTENCODING_MAX
***************
*** 365,369 ****
  %endclass
  
! %endif wxLUA_USE_wxFont
  
  //-----------------------------------------------------------------------------
--- 365,369 ----
  %endclass
  
! %endif //wxLUA_USE_wxFont
  
  //-----------------------------------------------------------------------------
***************
*** 389,393 ****
  %endclass
  
! %endif wxLUA_USE_wxFontEnumerator
  
  //-----------------------------------------------------------------------------
--- 389,393 ----
  %endclass
  
! %endif //wxLUA_USE_wxFontEnumerator
  
  //-----------------------------------------------------------------------------
***************
*** 405,409 ****
  %endclass
  
! %endif wxLUA_USE_wxFontList
  
  //-----------------------------------------------------------------------------
--- 405,409 ----
  %endclass
  
! %endif //wxLUA_USE_wxFontList
  
  //-----------------------------------------------------------------------------
***************
*** 435,439 ****
  %endclass
  
! %endif wxLUA_USE_wxFontMapper
  
  //-----------------------------------------------------------------------------
--- 435,439 ----
  %endclass
  
! %endif //wxLUA_USE_wxFontMapper
  
  //-----------------------------------------------------------------------------
***************
*** 570,574 ****
  %endclass
  
! %endif wxLUA_USE_wxPenList
  
  //-----------------------------------------------------------------------------
--- 570,574 ----
  %endclass
  
! %endif //wxLUA_USE_wxPenList
  
  //-----------------------------------------------------------------------------
***************
*** 625,630 ****
  %endclass
  
! %endif wxLUA_USE_wxBrushList
! %endif wxLUA_USE_wxColourPenBrush
  
  //-----------------------------------------------------------------------------
--- 625,630 ----
  %endclass
  
! %endif //wxLUA_USE_wxBrushList
! %endif //wxLUA_USE_wxColourPenBrush
  
  //-----------------------------------------------------------------------------
***************
*** 649,653 ****
  %endclass
  
! %endif wxLUA_USE_wxPalette
  
  //-----------------------------------------------------------------------------
--- 649,653 ----
  %endclass
  
! %endif //wxLUA_USE_wxPalette
  
  //-----------------------------------------------------------------------------
***************
*** 682,686 ****
  %endclass
  
! %endif wxLUA_USE_wxIcon
  
  //-----------------------------------------------------------------------------
--- 682,686 ----
  %endclass
  
! %endif //wxLUA_USE_wxIcon
  
  //-----------------------------------------------------------------------------
***************
*** 707,711 ****
      %constructor wxBitmapFromFile(const wxString& name, wxBitmapType type = wxBITMAP_TYPE_ANY)
      %constructor wxBitmapFromXPMData(const char **data)
!     %wxchkver23 %constructor wxBitmapFromImage(const wxImage &image, int depth = -1)
  
      //%win static void AddHandler(wxBitmapHandler* handler)
--- 707,711 ----
      %constructor wxBitmapFromFile(const wxString& name, wxBitmapType type = wxBITMAP_TYPE_ANY)
      %constructor wxBitmapFromXPMData(const char **data)
!     %constructor wxBitmapFromImage(const wxImage &image, int depth = -1)
  
      //%win static void AddHandler(wxBitmapHandler* handler)
***************
*** 719,723 ****
      int GetDepth() const
      //%wxchkver25&%win static wxGDIImageHandlerList& GetHandlers()
!     //%wxchkver22&!%wxchkver25&%win static wxList& GetHandlers()
      int GetHeight() const
      wxPalette* GetPalette() const
--- 719,723 ----
      int GetDepth() const
      //%wxchkver25&%win static wxGDIImageHandlerList& GetHandlers()
!     //!%wxchkver25&%win static wxList& GetHandlers()
      int GetHeight() const
      wxPalette* GetPalette() const
***************
*** 745,749 ****
  %endclass
  
! %endif wxLUA_USE_wxBitmap
  
  //-----------------------------------------------------------------------------
--- 745,749 ----
  %endclass
  
! %endif //wxLUA_USE_wxBitmap
  
  //-----------------------------------------------------------------------------
***************
*** 759,763 ****
      wxCURSOR_NONE
      wxCURSOR_ARROW
!     %wxchkver23 wxCURSOR_RIGHT_ARROW
      wxCURSOR_BULLSEYE
      wxCURSOR_CHAR
--- 759,763 ----
      wxCURSOR_NONE
      wxCURSOR_ARROW
!     wxCURSOR_RIGHT_ARROW
      wxCURSOR_BULLSEYE
      wxCURSOR_CHAR
***************
*** 819,823 ****
  %endclass
  
! %endif wxLUA_USE_wxCursor
  
  //-----------------------------------------------------------------------------
--- 819,823 ----
  %endclass
  
! %endif //wxLUA_USE_wxCursor
  
  //-----------------------------------------------------------------------------
***************
*** 837,841 ****
  %endclass
  
! %endif wxLUA_USE_wxMask
  
  //-----------------------------------------------------------------------------
--- 837,841 ----
  %endclass
  
! %endif //wxLUA_USE_wxMask
  
  //-----------------------------------------------------------------------------
***************
*** 876,880 ****
  %endclass
  
! %endif wxLUA_USE_wxImageList
  
  //-----------------------------------------------------------------------------
--- 876,880 ----
  %endclass
  
! %endif //wxLUA_USE_wxImageList
  
  //-----------------------------------------------------------------------------
***************
*** 1153,1157 ****
  %endclass
  
! %endif wxLUA_USE_wxDC
  
  //-----------------------------------------------------------------------------
--- 1153,1157 ----
  %endclass
  
! %endif //wxLUA_USE_wxDC
  
  //-----------------------------------------------------------------------------
***************
*** 1196,1200 ****
  %endclass
  
! %endif wxLUA_USE_wxCaret
  
  
--- 1196,1200 ----
  %endclass
  
! %endif //wxLUA_USE_wxCaret
  
  
***************
*** 1246,1250 ****
  %endclass
  
! %endif wxLUA_USE_wxGLCanvas & wxUSE_GLCANVAS
  
  //-----------------------------------------------------------------------------
--- 1246,1250 ----
  %endclass
  
! %endif //wxLUA_USE_wxGLCanvas & wxUSE_GLCANVAS
  
  //-----------------------------------------------------------------------------
***************
*** 1310,1312 ****
  %endclass
  
! %endif wxLUA_USE_wxDisplay & wxUSE_DISPLAY
--- 1310,1312 ----
  %endclass
  
! %endif //wxLUA_USE_wxDisplay & wxUSE_DISPLAY

Index: html.i
===================================================================
RCS file: /cvsroot/wxlu...
 
[truncated message content]

[Wxlua-commit] wxLua/apps/wxlua/src lconsole.cpp, 1.12, 1.13 lconsole.h, 1.7, 1.8 wxlua.cpp, 1.39, 1.40 wxlua.h, 1.21, 1.22

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

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

Modified Files:
	lconsole.cpp lconsole.h wxlua.cpp wxlua.h 
Log Message:
fix warnings in wxlstate for VC
cleanup wxlcallb
rename m_deleteTable to m_winDestroyTable since it's the tag for EVT_DESTROY
simplify the wxLua editor app and add more messages, make the console really work nicely


Index: wxlua.cpp
===================================================================
RCS file: /cvsroot/wxlua/wxLua/apps/wxlua/src/wxlua.cpp,v
retrieving revision 1.39
retrieving revision 1.40
diff -C2 -d -r1.39 -r1.40
*** wxlua.cpp	5 Dec 2006 23:38:28 -0000	1.39
--- wxlua.cpp	7 Dec 2006 01:22:02 -0000	1.40
***************
*** 24,34 ****
  #endif
  
- #include "wx/splitter.h"
  #include "wx/cmdline.h"
  #include "wx/fs_mem.h"
  #include "wx/image.h"
  #include "wxlua/include/wxlua.h"
  #include "wxluasocket/include/wxldserv.h"
  #include "wxlua.h"
  
  #include "art/wxluasmall.xpm"
--- 24,35 ----
  #endif
  
  #include "wx/cmdline.h"
  #include "wx/fs_mem.h"
  #include "wx/image.h"
+ 
  #include "wxlua/include/wxlua.h"
  #include "wxluasocket/include/wxldserv.h"
  #include "wxlua.h"
+ #include "editor.h"
  
  #include "art/wxluasmall.xpm"
***************
*** 39,47 ****
  }
  
  // Declare the binding initialization functions as extern so we don't have to
  //  #include the binding header for simplicity.
! extern bool wxLuaBinding_wx_init();             // modules/wxbind
! extern bool wxLuaBinding_wxstc_init();          // modules/wxstcbind
! extern bool wxLuaBinding_wxluasocket_init();    // modules/wxluasocket
  
  // ---------------------------------------------------------------------------
--- 40,50 ----
  }
  
+ #define ID_WXLUA_CONSOLE 100
+ 
  // Declare the binding initialization functions as extern so we don't have to
  //  #include the binding header for simplicity.
! extern bool wxLuaBinding_wx_init();          // modules/wxbind
! extern bool wxLuaBinding_wxstc_init();       // modules/wxstcbind
! extern bool wxLuaBinding_wxluasocket_init(); // modules/wxluasocket
  
  // ---------------------------------------------------------------------------
***************
*** 54,61 ****
          wxCMD_LINE_VAL_NONE, wxCMD_LINE_PARAM_OPTIONAL|wxCMD_LINE_OPTION_HELP },
  
!     { wxCMD_LINE_SWITCH, wxT("c"), wxT("console"), wxT("show message console"),
          wxCMD_LINE_VAL_NONE, wxCMD_LINE_PARAM_OPTIONAL },
  
!     { wxCMD_LINE_OPTION, wxT("d"), wxT("debuggee"), wxT("run as debuggee, internal use"),
          wxCMD_LINE_VAL_STRING, wxCMD_LINE_PARAM_OPTIONAL },
  
--- 57,64 ----
          wxCMD_LINE_VAL_NONE, wxCMD_LINE_PARAM_OPTIONAL|wxCMD_LINE_OPTION_HELP },
  
!     { wxCMD_LINE_SWITCH, wxT("c"), wxT("console"), wxT("show message console for print statements"),
          wxCMD_LINE_VAL_NONE, wxCMD_LINE_PARAM_OPTIONAL },
  
!     { wxCMD_LINE_OPTION, wxT("d"), wxT("debuggee"), wxT("run as debuggee, -d[host]:[port]"),
          wxCMD_LINE_VAL_STRING, wxCMD_LINE_PARAM_OPTIONAL },
  
***************
*** 66,70 ****
          wxCMD_LINE_VAL_STRING, wxCMD_LINE_PARAM_OPTIONAL|wxCMD_LINE_NEEDS_SEPARATOR },
  
!     { wxCMD_LINE_PARAM,  wxT(""),  wxT(""),       wxT("run wxLua program w/ command line args"),
          wxCMD_LINE_VAL_STRING, wxCMD_LINE_PARAM_OPTIONAL|wxCMD_LINE_PARAM_MULTIPLE },
  
--- 69,76 ----
          wxCMD_LINE_VAL_STRING, wxCMD_LINE_PARAM_OPTIONAL|wxCMD_LINE_NEEDS_SEPARATOR },
  
!     { wxCMD_LINE_SWITCH, wxT("q"), wxT("quit"), wxT("Do not exit even if there are no top level windows open."),
!         wxCMD_LINE_VAL_NONE, wxCMD_LINE_PARAM_OPTIONAL },
! 
!     { wxCMD_LINE_PARAM,  wxT(""),  wxT(""),    wxT("run wxLua program w/ command line args"),
          wxCMD_LINE_VAL_STRING, wxCMD_LINE_PARAM_OPTIONAL|wxCMD_LINE_PARAM_MULTIPLE },
  
***************
*** 75,79 ****
  // wxLuaStandaloneApp
  // ---------------------------------------------------------------------------
- 
  IMPLEMENT_APP(wxLuaStandaloneApp)
  
--- 81,84 ----
***************
*** 85,96 ****
  
  bool wxLuaStandaloneApp::OnInit()
! {
!     m_luaConsole     = NULL;
!     m_fMemoryBitmapAdded = false;
      m_pDebugTarget = NULL;
  
!     wxString errorStr;
!     int      argCount = 0;
!     bool     fOk      = false;
  
  #if defined(__WXMSW__) && wxCHECK_VERSION(2, 3, 3)
--- 90,103 ----
  
  bool wxLuaStandaloneApp::OnInit()
! {    
!     m_programName  = argv[0];  // The name of this program
!     m_luaConsole   = NULL;
!     m_want_console = false;
      m_pDebugTarget = NULL;
+     m_mem_bitmap_added = false;
  
!     int  arg_count = 0;     // counter for args used during parsing
!     bool run_ok    = false; // has the lua program executed ok
!     bool dont_quit = false; // user specified -q switch to not quit
  
  #if defined(__WXMSW__) && wxCHECK_VERSION(2, 3, 3)
***************
*** 100,110 ****
  #endif // defined(__WXMSW__) && wxCHECK_VERSION(2, 3, 3)
  
-     // The name of this program
-     m_programName = argv[0];
- 
      wxInitAllImageHandlers();
      wxFileSystem::AddHandler(new wxMemoryFSHandler);
      wxMemoryFSHandler::AddFile(wxT("wxLua"), wxBitmap(wxLuaSmall_xpm), wxBITMAP_TYPE_XPM);
!     m_fMemoryBitmapAdded = true;
  
  #ifdef __WXGTK__
--- 107,114 ----
  #endif // defined(__WXMSW__) && wxCHECK_VERSION(2, 3, 3)
  
      wxInitAllImageHandlers();
      wxFileSystem::AddHandler(new wxMemoryFSHandler);
      wxMemoryFSHandler::AddFile(wxT("wxLua"), wxBitmap(wxLuaSmall_xpm), wxBITMAP_TYPE_XPM);
!     m_mem_bitmap_added = true;
  
  #ifdef __WXGTK__
***************
*** 125,129 ****
      wxLuaBinding_wxluasocket_init();
  
!     m_wxlState = wxLuaState(this, -1);
      if (!m_wxlState.Ok())
          return false;
--- 129,133 ----
      wxLuaBinding_wxluasocket_init();
  
!     m_wxlState = wxLuaState(this, wxID_ANY);
      if (!m_wxlState.Ok())
          return false;
***************
*** 140,212 ****
          case 0:
          {
-             argCount = 0;
              wxString value;
-             if (parser.Found(wxT("d"), &value))
-             {
-                 // Note: wxLuaDebuggerServer::StartClient() runs wxExecute(m_programName -d[host]:[port], ...)
  
!                 // Set up for debugging
!                 wxString serverName(value.BeforeFirst(wxT(':')));
! 
!                 long portNumber = 0;
!                 if (value.AfterFirst(wxT(':')).ToLong(&portNumber))
!                 {
!                     m_pDebugTarget = new wxLuaDebugTarget(m_wxlState, serverName, (int)portNumber);
!                     if (m_pDebugTarget != NULL)
!                         return m_pDebugTarget->Run();
!                 }
!                 return false;
!             }
  
              // Check if we are to display the console
              if (parser.Found(wxT("c")))
              {
!                 argCount++;
!                 if (!m_luaConsole)
!                 {
!                     wxLuaConsole *wxlConsole = new wxLuaConsole(this, m_wxlState);
!                     wxlConsole->Show(true);
!                 }
              }
  
!             // See if a file has been specified that we are to edit
!             if (parser.Found(wxT("e"), &value))
              {
!                 argCount++;
!                 wxString fileName = value;
  
!                 PushArgs(argv, argc, argCount);
  
!                 int rc = RunEditor();
!                 fOk = wxLuaState::CheckRunError(rc, &errorStr);
!                 if (!fOk)
!                     DisplayError(errorStr);
  
!                 break;
              }
  
!             if (parser.GetParamCount() == 0)
              {
!                 PushArgs(argv, argc, argCount);
!                 int rc = RunEditor();
  
!                 fOk = wxLuaState::CheckRunError(rc, &errorStr);
!                 if (!fOk)
!                     DisplayError(errorStr);
  
                  break;
              }
  
              // See if we are to run the specified file with command-line arguments.
              //if (parser.Found(wxT("r"), &value))
              {
!                 argCount++; // skip the program we're running
                  wxString fileName = parser.GetParam(0); // already handled 0 params
!                 PushArgs(argv, argc, argCount);
  
                  int rc = m_wxlState.RunFile(fileName);
!                 fOk = wxLuaState::CheckRunError(rc, &errorStr);
!                 if (!fOk)
!                     DisplayError(errorStr);
  
                  break;
--- 144,224 ----
          case 0:
          {
              wxString value;
  
!             // don't quit the program for no top level windows
!             if (parser.Found(wxT("q")))
!                 dont_quit = true;
  
              // Check if we are to display the console
              if (parser.Found(wxT("c")))
              {
!                 arg_count++;
!                 m_want_console = true;
!                 m_luaConsole = new wxLuaConsole(NULL, ID_WXLUA_CONSOLE);
!                 m_luaConsole->Show(true);
              }
  
!             // set up for debugging
!             if (parser.Found(wxT("d"), &value))
              {
!                 // Note: wxLuaDebuggerServer::StartClient() runs 
!                 //       wxExecute(m_programName -d[host]:[port], ...)
  
!                 wxString serverName(value.BeforeFirst(wxT(':')));
  
!                 if (serverName.IsEmpty())
!                 {
!                     DisplayMessage(_("The wxLua debugger server host name is empty : wxLua -d[host]:[port]\n"), true);
!                 }
!                 else
!                 {
!                     long portNumber = 0;
!                     if (value.AfterFirst(wxT(':')).ToLong(&portNumber))
!                     {
!                         m_pDebugTarget = new wxLuaDebugTarget(m_wxlState, serverName, (int)portNumber);
!                         if (m_pDebugTarget != NULL)
!                             return m_pDebugTarget->Run();
!                         else
!                             DisplayMessage(_("The wxLua debug target cannot start.\n"), true);
!                     }
!                     else
!                         DisplayMessage(_("The wxLua debugger server port is not a number : wxLua -d[host]:[port]\n"), true);
!                 }
  
!                 return (m_luaConsole != NULL); // will exit app when console is closed
              }
  
!             // See if a file has been specified to edit or just start editor
!             bool run_editor = parser.Found(wxT("e"), &value);
!             if (run_editor || (parser.GetParamCount() == 0))
              {
!                 // remove -e arg, but push the args in any case
!                 if (run_editor) arg_count++; 
!                 PushArgs(argv, argc, arg_count);
  
!                 int rc = m_wxlState.RunBuffer(wxLuaEditor, wxLuaEditor_len, m_programName);
!                 wxString errorStr;
!                 run_ok = wxLuaState::CheckRunError(rc, &errorStr);
!                 if (!run_ok)
!                     DisplayMessage(errorStr, true, m_wxlState);
  
                  break;
              }
  
+             // at least one parameter was specified, it must be a program to run.
+ 
              // See if we are to run the specified file with command-line arguments.
+             // This is the default action if r is not specified.
              //if (parser.Found(wxT("r"), &value))
              {
!                 arg_count++; // skip the program we're running
                  wxString fileName = parser.GetParam(0); // already handled 0 params
!                 PushArgs(argv, argc, arg_count);
  
                  int rc = m_wxlState.RunFile(fileName);
!                 wxString errorStr;
!                 run_ok = wxLuaState::CheckRunError(rc, &errorStr);
!                 if (!run_ok)
!                     DisplayMessage(errorStr, true, m_wxlState);
  
                  break;
***************
*** 223,233 ****
  
      // check to see if there is a toplevel window open for the user to close, else exit
!     if (fOk)
      {
          if (GetTopWindow() == NULL)
!             fOk = false;
      }
  
!     return (m_luaConsole != NULL) || fOk;
  }
  
--- 235,245 ----
  
      // check to see if there is a toplevel window open for the user to close, else exit
!     if (run_ok && !dont_quit)
      {
          if (GetTopWindow() == NULL)
!             run_ok = false;
      }
  
!     return (m_luaConsole != NULL) || run_ok;
  }
  
***************
*** 242,245 ****
--- 254,262 ----
      }
  
+     m_wxlState.CloseLuaState(true);
+     m_wxlState.Destroy();
+ 
+     m_want_console = false; // no more messages
+ 
      if (m_luaConsole)
      {
***************
*** 248,260 ****
      }
  
!     if (m_fMemoryBitmapAdded)
          wxMemoryFSHandler::RemoveFile(wxT("wxLua"));
  
-     m_wxlState.CloseLuaState(true);
-     m_wxlState.Destroy();
- 
      wxSafeYield();  // make sure windows get destroyed
  
!     wxApp::OnExit();
  
  #if defined(__WXMSW__) && wxCHECK_VERSION(2, 3, 3)
--- 265,274 ----
      }
  
!     if (m_mem_bitmap_added)
          wxMemoryFSHandler::RemoveFile(wxT("wxLua"));
  
      wxSafeYield();  // make sure windows get destroyed
  
!     int ret = wxApp::OnExit();
  
  #if defined(__WXMSW__) && wxCHECK_VERSION(2, 3, 3)
***************
*** 262,290 ****
  #endif // defined(__WXMSW__) && wxCHECK_VERSION(2, 3, 3)
  
!     return 0;
  }
  
! #include "editor.h"
! 
! int  wxLuaStandaloneApp::RunEditor()
  {
!     return m_wxlState.RunBuffer(wxLuaEditor, wxLuaEditor_len, m_programName);
! }
  
! void wxLuaStandaloneApp::DisplayError(const wxString &errorStr) const
! {
!     if (m_pDebugTarget != NULL)
!         m_pDebugTarget->DisplayError(errorStr);
!     else
      {
          if (m_luaConsole != NULL)
!             m_luaConsole->DisplayText(errorStr, true);
          else
  #ifdef __WXMSW__
!             wxMessageBox(errorStr, wxT("wxLua Error"));
  #else
!             fprintf(stderr, wx2lua(errorStr + wxT("\n")));
  #endif // __WXMSW__
! 
      }
  }
--- 276,325 ----
  #endif // defined(__WXMSW__) && wxCHECK_VERSION(2, 3, 3)
  
!     return ret;
  }
  
! void wxLuaStandaloneApp::DisplayMessage(const wxString &msg, bool is_error,
!                                         const wxLuaState& wxlState)
  {
!     // If they closed the console, but specified they wanted it
!     // on the command-line, recreate it.
!     if (m_want_console && (m_luaConsole == NULL))
!     {
!         m_luaConsole = new wxLuaConsole(NULL, ID_WXLUA_CONSOLE);
!         m_luaConsole->Show(true);
!     }
  
!     if (!is_error)
      {
          if (m_luaConsole != NULL)
!             m_luaConsole->DisplayText(msg);
          else
+         {
  #ifdef __WXMSW__
!             wxMessageBox(msg, wxT("wxLua Print"));
  #else
!             fprintf(stderr, wx2lua(msg + wxT("\n")));
!             //wxPrintf(msg + wxT("\n"));
  #endif // __WXMSW__
!         }
!     }
!     else
!     {
!         if (m_pDebugTarget != NULL)
!             m_pDebugTarget->DisplayError(msg);
!         else if (m_luaConsole != NULL)
!         {
!             m_luaConsole->DisplayText(msg);
!             m_luaConsole->SetExitOnError(is_error);
!             m_luaConsole->DisplayStack(wxlState);
!         }
!         else
!         {
! #ifdef __WXMSW__
!             wxMessageBox(msg, wxT("wxLua Error"));
! #else
!             fprintf(stderr, wx2lua(msg + wxT("\n")));
! #endif // __WXMSW__
!         }
      }
  }
***************
*** 314,335 ****
          lua_rawseti(L, -2, 0);
          lua_setglobal(L, "arg");
- 
-         return narg;
      }
  
!     luaL_checkstack(L, narg + 3, "too many arguments to script");
!     for (i = start_n+1; i < argc; i++)
!         lua_pushstring(L, wx2lua(argv[i]));
  
!     lua_createtable(L, narg, start_n + 1);
  
!     for (i = 0; i < argc; i++)
!     {
!         lua_pushstring(L, wx2lua(argv[i]));
!         lua_rawseti(L, -2, i - start_n);
      }
  
-     lua_setglobal(L, "arg");
- 
      return narg;
  }
--- 349,370 ----
          lua_rawseti(L, -2, 0);
          lua_setglobal(L, "arg");
      }
+     else
+     {
+         luaL_checkstack(L, narg + 3, "too many arguments to script");
+         for (i = start_n+1; i < argc; i++)
+             lua_pushstring(L, wx2lua(argv[i]));
  
!         lua_createtable(L, narg, start_n + 1);
  
!         for (i = 0; i < argc; i++)
!         {
!             lua_pushstring(L, wx2lua(argv[i]));
!             lua_rawseti(L, -2, i - start_n);
!         }
  
!         lua_setglobal(L, "arg");
      }
  
      return narg;
  }
***************
*** 337,355 ****
  void wxLuaStandaloneApp::OnLua( wxLuaEvent &event )
  {
!     if (event.GetEventType() == wxEVT_LUA_PRINT)
!     {
!         if (m_luaConsole != NULL)
!             m_luaConsole->DisplayText(event.GetString());
!         else
! #ifdef __WXMSW__
!             wxMessageBox(event.GetString(), wxT("wxLua Print"));
! #else
!             fprintf(stderr, wx2lua(event.GetString() + wxT("\n")));
!             //wxPrintf(event.GetString() + wxT("\n"));
! #endif // __WXMSW__
!     }
!     else if (event.GetEventType() == wxEVT_LUA_ERROR)
!     {
!         DisplayError(event.GetString());
!     }
  }
--- 372,376 ----
  void wxLuaStandaloneApp::OnLua( wxLuaEvent &event )
  {
!     DisplayMessage(event.GetString(), event.GetEventType() == wxEVT_LUA_ERROR,
!                    event.GetwxLuaState());
  }

Index: lconsole.h
===================================================================
RCS file: /cvsroot/wxlua/wxLua/apps/wxlua/src/lconsole.h,v
retrieving revision 1.7
retrieving revision 1.8
diff -C2 -d -r1.7 -r1.8
*** lconsole.h	5 Dec 2006 23:38:28 -0000	1.7
--- lconsole.h	7 Dec 2006 01:22:02 -0000	1.8
***************
*** 14,37 ****
  #endif
  
! class wxLuaStandaloneApp;
  #include "wxlua/include/wxlua.h"
  
  // ----------------------------------------------------------------------------
! // wxLuaDebugPanel
! // ----------------------------------------------------------------------------
! 
! class wxLuaDebugListBox : public wxListBox
! {
! public:
!     wxLuaDebugListBox(wxWindow *parent, const wxLuaState& wxlState);
! 
!     void FillListbox();
! 
! protected:
!     wxLuaState m_wxlState;
! };
! 
! // ----------------------------------------------------------------------------
! // wxLuaConsole - define our console class
  // ----------------------------------------------------------------------------
  
--- 14,22 ----
  #endif
  
! #include "wx/frame.h"
  #include "wxlua/include/wxlua.h"
  
  // ----------------------------------------------------------------------------
! // wxLuaConsole - define a console class to display print statements
  // ----------------------------------------------------------------------------
  
***************
*** 39,54 ****
  {
  public:
!     wxLuaConsole(wxLuaStandaloneApp *pApp, const wxLuaState& wxlState);
!     void DisplayText(const wxString& msg, bool fError = false);
  
  protected:
      void OnCloseWindow(wxCloseEvent& event);
  
!     wxSplitterWindow   *m_splitter;
!     wxTextCtrl         *m_textCtrl;
!     wxLuaStandaloneApp *m_pApp;
!     wxLuaDebugListBox  *m_debugListBox;
!     bool                m_fError;
  
      DECLARE_EVENT_TABLE()
  };
--- 24,51 ----
  {
  public:
!     wxLuaConsole(wxWindow* parent, wxWindowID id, 
!                  const wxString& title = wxT("wxLua console"),
!                  const wxPoint& pos = wxDefaultPosition, 
!                  const wxSize& size = wxSize(300, 400), 
!                  long style = wxDEFAULT_FRAME_STYLE, 
!                  const wxString& name = wxT("wxLuaConsole"));
!     
!     // Display a message in the console
!     void DisplayText(const wxString& msg);
!     // Display the stack in a wxListBox, but only if there are any items in it 
!     void DisplayStack(const wxLuaState& wxlState);
!     // An error has occurred, when this window is closed call wxExit to close
!     //   the app.
!     void SetExitOnError(bool is_error) { m_exit_on_error = m_exit_on_error || is_error; }
  
  protected:
      void OnCloseWindow(wxCloseEvent& event);
  
!     wxSplitterWindow *m_splitter;
!     wxTextCtrl       *m_textCtrl;
!     wxListBox        *m_debugListBox;
!     bool              m_exit_on_error;
  
+ private:
      DECLARE_EVENT_TABLE()
  };

Index: wxlua.h
===================================================================
RCS file: /cvsroot/wxlua/wxLua/apps/wxlua/src/wxlua.h,v
retrieving revision 1.21
retrieving revision 1.22
diff -C2 -d -r1.21 -r1.22
*** wxlua.h	3 Oct 2006 05:12:44 -0000	1.21
--- wxlua.h	7 Dec 2006 01:22:02 -0000	1.22
***************
*** 17,23 ****
  #endif
  
- #include "lconsole.h"
- #include "wxluasocket/include/wxldtarg.h"
  #include "wx/app.h"
  
  class WXDLLIMPEXP_WXLUA wxLuaEvent;
--- 17,23 ----
  #endif
  
  #include "wx/app.h"
+ #include "wxluasocket/include/wxldtarg.h"
+ #include "lconsole.h"
  
  class WXDLLIMPEXP_WXLUA wxLuaEvent;
***************
*** 34,43 ****
      virtual int  OnExit();
  
!     void DisplayError(const wxString &strError) const;
! 
!     // set the lua console
!     void SetLuaConsole(wxLuaConsole *pConsole) { m_luaConsole = pConsole; }
! 
!     int  RunEditor();
  
      void CreateSimpleArgs();
--- 34,39 ----
      virtual int  OnExit();
  
!     void DisplayMessage(const wxString &msg, bool is_error,
!                         const wxLuaState& wxlState = wxNullLuaState);
  
      void CreateSimpleArgs();
***************
*** 49,53 ****
      wxLuaState        m_wxlState;
      wxLuaConsole     *m_luaConsole;
!     bool              m_fMemoryBitmapAdded;
      wxLuaDebugTarget *m_pDebugTarget;
  
--- 45,50 ----
      wxLuaState        m_wxlState;
      wxLuaConsole     *m_luaConsole;
!     bool              m_want_console;
!     bool              m_mem_bitmap_added;
      wxLuaDebugTarget *m_pDebugTarget;
  

Index: lconsole.cpp
===================================================================
RCS file: /cvsroot/wxlua/wxLua/apps/wxlua/src/lconsole.cpp,v
retrieving revision 1.12
retrieving revision 1.13
diff -C2 -d -r1.12 -r1.13
*** lconsole.cpp	5 Dec 2006 23:38:28 -0000	1.12
--- lconsole.cpp	7 Dec 2006 01:22:02 -0000	1.13
***************
*** 34,59 ****
  
  // ----------------------------------------------------------------------------
! // wxLuaDebugPanel
  // ----------------------------------------------------------------------------
  
! wxLuaDebugListBox::wxLuaDebugListBox(wxWindow *parent, const wxLuaState& wxlState)
!                   :wxListBox()
  {
!     if (!wxListBox::Create(parent, wxID_ANY, wxDefaultPosition, wxDefaultSize,
!                            0, NULL, wxLB_SINGLE))
!        return;
  
!     m_wxlState = wxlState;
  }
  
! void wxLuaDebugListBox::FillListbox()
  {
!     wxCHECK_RET(m_wxlState.Ok(), wxT("Invalid wxLuaState"));
      int       nIndex    = 0;
      lua_Debug luaDebug;
      wxString  buffer;
  
!     Clear();
!     lua_State* L = m_wxlState.GetLuaState();
  
      while (lua_getstack(L, nIndex, &luaDebug) != 0)
--- 34,90 ----
  
  // ----------------------------------------------------------------------------
! // wxLuaConsole
  // ----------------------------------------------------------------------------
  
! BEGIN_EVENT_TABLE(wxLuaConsole, wxFrame)
!     EVT_CLOSE(wxLuaConsole::OnCloseWindow)
! END_EVENT_TABLE()
! 
! wxLuaConsole::wxLuaConsole(wxWindow* parent, wxWindowID id, const wxString& title,
!                            const wxPoint& pos, const wxSize& size, 
!                            long style, const wxString& name)
!              :wxFrame(parent, id, title, pos, size, style, name), m_exit_on_error(false)
  {
!     SetIcon(wxICON(LUA));
  
!     m_splitter = new wxSplitterWindow(this, wxID_ANY,
!                                       wxDefaultPosition, wxDefaultSize, 
!                                       wxSP_3DSASH);
!     m_textCtrl = new wxTextCtrl(m_splitter, wxID_ANY, wxEmptyString,
!                                 wxDefaultPosition, wxDefaultSize,
!                                 wxTE_MULTILINE | wxTE_READONLY | wxTE_RICH);
!     m_debugListBox = new wxListBox(m_splitter, wxID_ANY, 
!                                    wxDefaultPosition, wxDefaultSize,
!                                    0, NULL, wxLB_SINGLE);    
!     m_debugListBox->Show(false);
!     
!     // listbox is shown only when used
!     m_splitter->Initialize(m_textCtrl);
  }
  
! void wxLuaConsole::OnCloseWindow(wxCloseEvent&)
  {
!     if (wxGetApp().m_luaConsole == this)
!         wxGetApp().m_luaConsole = NULL;
! 
!     Destroy();
!     if (m_exit_on_error)
!         wxExit();
! }
! 
! void wxLuaConsole::DisplayText(const wxString& msg)
! {
!     m_textCtrl->AppendText(msg + wxT("\n"));
! }
! 
! void wxLuaConsole::DisplayStack(const wxLuaState& wxlState)
! {
!     wxCHECK_RET(wxlState.Ok(), wxT("Invalid wxLuaState"));
      int       nIndex    = 0;
      lua_Debug luaDebug;
      wxString  buffer;
  
!     m_debugListBox->Clear();
!     lua_State* L = wxlState.GetLuaState();
  
      while (lua_getstack(L, nIndex, &luaDebug) != 0)
***************
*** 84,153 ****
              // skip over ourselves on the stack
              if (nIndex > 0)
!                 Append(buffer, (void *) nIndex);
          }
          nIndex++;
      }
- }
- 
- // ----------------------------------------------------------------------------
- // wxLuaConsole
- // ----------------------------------------------------------------------------
  
! BEGIN_EVENT_TABLE(wxLuaConsole, wxFrame)
!     EVT_CLOSE(wxLuaConsole::OnCloseWindow)
! END_EVENT_TABLE()
! 
! wxLuaConsole::wxLuaConsole(wxLuaStandaloneApp *pApp, const wxLuaState& wxlState)
!              : wxFrame(NULL, wxID_ANY, wxT("wxLua Console"), wxDefaultPosition, wxSize(300, 340)),
!                m_pApp(pApp), m_fError(false)
! {
!     SetIcon(wxICON(LUA));
! 
!     m_splitter = new wxSplitterWindow(this, wxID_ANY,
!                                       wxDefaultPosition, wxDefaultSize, 
!                                       wxSP_3DSASH);
!     m_textCtrl = new wxTextCtrl( m_splitter, wxID_ANY, wxT(""),
!                                  wxDefaultPosition, wxDefaultSize,
!                                  wxTE_MULTILINE | wxTE_READONLY
! #ifdef __WXMSW__
!                                         | wxTE_RICH
! #endif
!                                );
!     m_debugListBox = new wxLuaDebugListBox( m_splitter, wxlState);
!     m_debugListBox->Show(false);
!     
!     // listbox is shown only when used
!     m_splitter->Initialize(m_textCtrl);
! 
!     pApp->SetLuaConsole(this);
! }
! 
! void wxLuaConsole::OnCloseWindow(wxCloseEvent&)
! {
!     m_pApp->SetLuaConsole(NULL);
! 
!     Destroy();
!     if (m_fError)
!         wxExit();
! }
! 
! void wxLuaConsole::DisplayText(const wxString& msg, bool fError)
! {
!     if (fError)
!         m_fError = true;
! 
!     m_textCtrl->AppendText(msg + wxT("\n"));
! 
!     if (fError)
      {
!         m_debugListBox->FillListbox();
! 
!         // only show the listbox if it has anything in it
!         if (m_debugListBox->GetCount() && !m_splitter->IsSplit())
!         {
!             m_splitter->SplitHorizontally( m_textCtrl, m_debugListBox, 150);
!             m_splitter->SetMinimumPaneSize(50);
!         }
! 
      }
  }
--- 115,128 ----
              // skip over ourselves on the stack
              if (nIndex > 0)
!                 m_debugListBox->Append(buffer, (void *) nIndex);
          }
          nIndex++;
      }
  
!     // only show the listbox if it has anything in it
!     if (m_debugListBox->GetCount() && !m_splitter->IsSplit())
      {
!         m_splitter->SplitHorizontally( m_textCtrl, m_debugListBox, 150);
!         m_splitter->SetMinimumPaneSize(50);
      }
  }

[Wxlua-commit] wxLua/modules/wxlua/include wxlcallb.h, 1.11, 1.12 wxlstate.h, 1.52, 1.53

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

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

Modified Files:
	wxlcallb.h wxlstate.h 
Log Message:
fix warnings in wxlstate for VC
cleanup wxlcallb
rename m_deleteTable to m_winDestroyTable since it's the tag for EVT_DESTROY
simplify the wxLua editor app and add more messages, make the console really work nicely


Index: wxlcallb.h
===================================================================
RCS file: /cvsroot/wxlua/wxLua/modules/wxlua/include/wxlcallb.h,v
retrieving revision 1.11
retrieving revision 1.12
diff -C2 -d -r1.11 -r1.12
*** wxlcallb.h	25 May 2006 03:55:23 -0000	1.11
--- wxlcallb.h	7 Dec 2006 01:22:02 -0000	1.12
***************
*** 28,33 ****
      //  if only one event Id is needed set lastId = wxID_ANY
      wxLuaCallback( const wxLuaState& state, int theRoutine,
!                    wxWindowID winId, wxWindowID lastId, wxEventType eventType,
!                    wxEvtHandler *pHandler );
  
      virtual ~wxLuaCallback();
--- 28,33 ----
      //  if only one event Id is needed set lastId = wxID_ANY
      wxLuaCallback( const wxLuaState& state, int theRoutine,
!                    wxWindowID winId, wxWindowID lastId, 
!                    wxEventType eventType, wxEvtHandler *pHandler );
  
      virtual ~wxLuaCallback();
***************
*** 67,72 ****
  
  // ----------------------------------------------------------------------------
! // LuaDestroyCallback - proxy class to handle the destruction of wxWindow
! //                      derived objects using wxEVT_DESTROY
  // ----------------------------------------------------------------------------
  
--- 67,72 ----
  
  // ----------------------------------------------------------------------------
! // wxLuaDestroyCallback - proxy class to handle the destruction of wxWindow
! //                        derived objects using wxEVT_DESTROY
  // ----------------------------------------------------------------------------
  
***************
*** 83,86 ****
--- 83,87 ----
  
      wxLuaState GetwxLuaState() const { return m_wxlState; }
+     int GetId() const { return m_id; }
      wxEvtHandler* GetEvtHandler() const { return m_pHandler; }
  

Index: wxlstate.h
===================================================================
RCS file: /cvsroot/wxlua/wxLua/modules/wxlua/include/wxlstate.h,v
retrieving revision 1.52
retrieving revision 1.53
diff -C2 -d -r1.52 -r1.53
*** wxlstate.h	6 Dec 2006 06:58:23 -0000	1.52
--- wxlstate.h	7 Dec 2006 01:22:02 -0000	1.53
***************
*** 205,209 ****
      int  m_functionTag;     // The lua tag for function objects.
      int  m_wxLuaNull;       // The lua tag for wxLuaNull (for NULL pointers)
!     int  m_wxDeleteTable;   // The lua tag for the wxWindow destroy tracking table
      int  m_wxEventTag;      // The lua tag for wxEvents
      int  m_wxWindowTag;     // The lua tag for wxWindows
--- 205,209 ----
      int  m_functionTag;     // The lua tag for function objects.
      int  m_wxLuaNull;       // The lua tag for wxLuaNull (for NULL pointers)
!     int  m_wxWinDestroyTable; // The lua tag for the wxWindow destroy tracking table
      int  m_wxEventTag;      // The lua tag for wxEvents
      int  m_wxWindowTag;     // The lua tag for wxWindows
***************
*** 317,321 ****
      wxLuaState(const wxLuaState& wxlState) { Create(wxlState); }
      // Copy constructor, refs existing wxLuaStateRefData (internal use)
!     wxLuaState(wxLuaStateRefData* refData) { Create(refData); }
  
      // ALWAYS destroy lua_State instead of calling UnRef, else circular
--- 317,321 ----
      wxLuaState(const wxLuaState& wxlState) { Create(wxlState); }
      // Copy constructor, refs existing wxLuaStateRefData (internal use)
!     wxLuaState(wxLuaStateRefData* refData, lua_State* L) { Create(refData, L); }
  
      // ALWAYS destroy lua_State instead of calling UnRef, else circular
***************
*** 484,488 ****
      int  GetLuaFunctionTag() const;  // The lua tag for function objects.
      int  GetLuaNull() const;         // The lua tag for wxLuaNull (for NULL pointers)
!     int  GetLuaDeleteTable() const;  // The lua tag for the wxWindow destroy tracking table
      int  GetwxEventTag() const;      // The lua tag for wxEvents
      int  GetwxWindowTag() const;     // The lua tag for wxWindows
--- 484,488 ----
      int  GetLuaFunctionTag() const;  // The lua tag for function objects.
      int  GetLuaNull() const;         // The lua tag for wxLuaNull (for NULL pointers)
!     int  GetLuaWinDestroyTable() const; // The lua tag for the wxWindow destroy tracking table
      int  GetwxEventTag() const;      // The lua tag for wxEvents
      int  GetwxWindowTag() const;     // The lua tag for wxWindows

[Wxlua-commit] wxLua/modules/wxlua/src wxlcallb.cpp, 1.19, 1.20 wxlstate.cpp, 1.79, 1.80

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

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

Modified Files:
	wxlcallb.cpp wxlstate.cpp 
Log Message:
fix warnings in wxlstate for VC
cleanup wxlcallb
rename m_deleteTable to m_winDestroyTable since it's the tag for EVT_DESTROY
simplify the wxLua editor app and add more messages, make the console really work nicely


Index: wxlstate.cpp
===================================================================
RCS file: /cvsroot/wxlua/wxLua/modules/wxlua/src/wxlstate.cpp,v
retrieving revision 1.79
retrieving revision 1.80
diff -C2 -d -r1.79 -r1.80
*** wxlstate.cpp	6 Dec 2006 06:58:23 -0000	1.79
--- wxlstate.cpp	7 Dec 2006 01:22:02 -0000	1.80
***************
*** 903,907 ****
      m_functionTag         = 0;
      m_wxLuaNull           = 0;
!     m_wxDeleteTable       = 0;
      m_wxEventTag          = 0;
      m_wxWindowTag         = 0;
--- 903,907 ----
      m_functionTag         = 0;
      m_wxLuaNull           = 0;
!     m_wxWinDestroyTable   = 0;
      m_wxEventTag          = 0;
      m_wxWindowTag         = 0;
***************
*** 1756,1760 ****
      {
          M_WXLSTATEDATA->m_wxlStateData->m_functionTag = tnewtag();
!         M_WXLSTATEDATA->m_wxlStateData->m_wxDeleteTable = tnewweaktag(false, true);
      }
  
--- 1756,1760 ----
      {
          M_WXLSTATEDATA->m_wxlStateData->m_functionTag = tnewtag();
!         M_WXLSTATEDATA->m_wxlStateData->m_wxWinDestroyTable = tnewweaktag(false, true);
      }
  
***************
*** 1892,1899 ****
      return M_WXLSTATEDATA->m_wxlStateData->m_wxLuaNull;
  }
! int wxLuaState::GetLuaDeleteTable() const
  {
      wxCHECK_MSG(GetRefData() != NULL, 0, wxT("Invalid wxLuaState"));
!     return M_WXLSTATEDATA->m_wxlStateData->m_wxDeleteTable;
  }
  int wxLuaState::GetwxEventTag() const
--- 1892,1899 ----
      return M_WXLSTATEDATA->m_wxlStateData->m_wxLuaNull;
  }
! int wxLuaState::GetLuaWinDestroyTable() const
  {
      wxCHECK_MSG(GetRefData() != NULL, 0, wxT("Invalid wxLuaState"));
!     return M_WXLSTATEDATA->m_wxlStateData->m_wxWinDestroyTable;
  }
  int wxLuaState::GetwxEventTag() const
***************
*** 2528,2532 ****
                  if ((pLuaObject != NULL) && pLuaObject->GetObject())
                  {
!                     wxCHECK_MSG(pLuaObject->GetwxLuaState() == *this, false, wxT("wxLuaState GetDerivedMethod out of sync"));
                      return true;
                  }
--- 2528,2532 ----
                  if ((pLuaObject != NULL) && pLuaObject->GetObject())
                  {
!                     wxCHECK_MSG(pLuaObject->GetwxLuaState() == *this, false, wxT("wxLuaState HasDerivedMethod out of sync"));
                      return true;
                  }
***************
*** 2546,2550 ****
           it != wxLuaStateRefData::s_wxHashMapLuaStateRefData.end(); ++it)
      {
!         wxLuaState wxlState((wxLuaStateRefData*)it->second);
          if (wxlState.HasDerivedMethod(pObject, method))
              return wxlState;
--- 2546,2550 ----
           it != wxLuaStateRefData::s_wxHashMapLuaStateRefData.end(); ++it)
      {
!         wxLuaState wxlState((wxLuaStateRefData*)it->second, ((wxLuaStateRefData*)it->second)->m_lua_State);
          if (wxlState.HasDerivedMethod(pObject, method))
              return wxlState;

Index: wxlcallb.cpp
===================================================================
RCS file: /cvsroot/wxlua/wxLua/modules/wxlua/src/wxlcallb.cpp,v
retrieving revision 1.19
retrieving revision 1.20
diff -C2 -d -r1.19 -r1.20
*** wxlcallb.cpp	28 Aug 2006 05:26:20 -0000	1.19
--- wxlcallb.cpp	7 Dec 2006 01:22:02 -0000	1.20
***************
*** 34,39 ****
  
  wxLuaCallback::wxLuaCallback( const wxLuaState& state, int theRoutine,
!                               wxWindowID winId, wxWindowID lastId, wxEventType eventType,
!                               wxEvtHandler *pEvtHandler )
                : wxEvtHandler(), m_wxlState(state),
                  m_pHandler(pEvtHandler), m_id(winId), m_lastId(lastId),
--- 34,39 ----
  
  wxLuaCallback::wxLuaCallback( const wxLuaState& state, int theRoutine,
!                               wxWindowID winId, wxWindowID lastId, 
!                               wxEventType eventType, wxEvtHandler *pEvtHandler )
                : wxEvtHandler(), m_wxlState(state),
                  m_pHandler(pEvtHandler), m_id(winId), m_lastId(lastId),
***************
*** 178,182 ****
  
          // get a reference to the destroy handler table
!         if (m_wxlState.tget(m_wxlState.GetLuaDeleteTable()))
          {
              // create a reference to object
--- 178,182 ----
  
          // get a reference to the destroy handler table
!         if (m_wxlState.tget(m_wxlState.GetLuaWinDestroyTable()))
          {
              // create a reference to object
***************
*** 227,231 ****
      // Note: do not remove from wxLuaState's destroyHandlerList here, wait 'till destructor
  
!     if (m_wxlState.tget(m_wxlState.GetLuaDeleteTable()))
      {
          lua_State* L = m_wxlState.GetLuaState();
--- 227,231 ----
      // Note: do not remove from wxLuaState's destroyHandlerList here, wait 'till destructor
  
!     if (m_wxlState.tget(m_wxlState.GetLuaWinDestroyTable()))
      {
          lua_State* L = m_wxlState.GetLuaState();

[Wxlua-commit] wxLua/modules/wxlua/include wxlstate.h,1.51,1.52

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

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

Modified Files:
	wxlstate.h 
Log Message:
removed WXLUA_USE_NEWTHREAD_HANDLER and friends by replacing luaE_newthread, luaE_freethread
we now look up coroutine wxLuaStateData by using a light user data pushed into the lua registry table
the lua is now an unmodified copy of lua with no mods necessary


Index: wxlstate.h
===================================================================
RCS file: /cvsroot/wxlua/wxLua/modules/wxlua/include/wxlstate.h,v
retrieving revision 1.51
retrieving revision 1.52
diff -C2 -d -r1.51 -r1.52
*** wxlstate.h	28 Sep 2006 22:26:05 -0000	1.51
--- wxlstate.h	6 Dec 2006 06:58:23 -0000	1.52
***************
*** 272,275 ****
--- 272,276 ----
      lua_State* m_lua_State;         // the lua_State that "is" lua
      bool       m_lua_State_static;  // lua_close the lua_State if !static
+     bool       m_lua_State_coroutine; // this is a coroutine, don't close it
  
      wxLuaStateData* m_wxlStateData;    // the data shared for this state
***************
*** 295,302 ****
      WXLUASTATE_ATTACH   = 1, // Attach to a previously created wxLuaState's
                               //   lua_State refing the existing wxLuaStateRefData
!     WXLUASTATE_SETSTATE = 2, // Set the lua_State, register the bindings,
                               //   and don't close it when destroyed
-     WXLUASTATE_COROUTINE = 3 // This is a coroutine created state, just
-                              //   track the state (internal use)
  };
  
--- 296,301 ----
      WXLUASTATE_ATTACH   = 1, // Attach to a previously created wxLuaState's
                               //   lua_State refing the existing wxLuaStateRefData
!     WXLUASTATE_SETSTATE = 2  // Set the lua_State, register the bindings,
                               //   and don't close it when destroyed
  };
  
***************
*** 333,337 ****
      bool Create(lua_State* L, wxLuaState_Type type = WXLUASTATE_ATTACH);
      // attach to the refData (internal use)
!     bool Create(wxLuaStateRefData* refData);
  
      // Is this wxLuaState valid, has refed data and it's lua_State is created
--- 332,336 ----
      bool Create(lua_State* L, wxLuaState_Type type = WXLUASTATE_ATTACH);
      // attach to the refData (internal use)
!     bool Create(wxLuaStateRefData* refData, lua_State* L);
  
      // Is this wxLuaState valid, has refed data and it's lua_State is created

[Wxlua-commit] wxLua/modules/lua/include luathread.h,1.2,NONE

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

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

Removed Files:
	luathread.h 
Log Message:
removed WXLUA_USE_NEWTHREAD_HANDLER and friends by replacing luaE_newthread, luaE_freethread
we now look up coroutine wxLuaStateData by using a light user data pushed into the lua registry table
the lua is now an unmodified copy of lua with no mods necessary


--- luathread.h DELETED ---