wxlua-commit — CVS commits of wxLua

[Wxlua-commit] wxLua/docs dirs.txt,NONE,1.1 newdirs.txt,1.2,NONE

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

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

Added Files:
	dirs.txt 
Removed Files:
	newdirs.txt 
Log Message:
use generic name for directory list file


--- NEW FILE: dirs.txt ---
06/01/2005

This is a description of the directory structure of wxLua. 

-------------------------------------------------------------------------------    
Directory structure
-------------------------------------------------------------------------------    

wxLua/
    /art/           - images and icons are here, preferably in XPM format
    /apps/          - c/c++ application code is here
        /build/     - build for all applications
        /wxlua/     - wxLua the main IDE for wxLua (the "Standalone" program)
        /embedded/  - an embedded sample
        /runtime/   - a stripped down runtime for wxLua
    /bin/           - output binaries are built here, lua for example
    /build/         - cmake, bakefile stuff here, may call sub build dirs
    /docs/          - any generic docs go here
    /lib/           - output libs are built here, wxlualib for example
    /samples/       - sample wxlua programs 
        /name/      - any multifile sample gets its own dir
    /utils/         - generic utils, bin2c for example
    /bindings/      - input *.i files to make the "wrappers"
        wxluawrap.lua - the main wrapper file 
        /wxwidgets/ - wrapper files for wxWidgets
        /bit/       - the bitwise lib for lua, maybe nothing needed here
        /other .i files for other stuff.../
  
    /wrappers/      - output of the wrapper files may be built here
        /wxwidgets/ - output of bindings and wxLuaPrinting, wxLuaHtmlWin
        /bit/       - the wrapper is the "src" of the bit library
        /output of other .i files for other stuff.../
        
    /modules/           - c/c++ code for wxlua
        /build/         - build files for all of this
        /lua/           - lua itself
            /include/
            /src/
            /the rest of lua.../
        /wxlua/         - the wxlua library itself
            /include/   - internal.h, interp.h, library.h, callback.h
            /src/       - internal.cpp, interp.cpp, library.cpp
        /wxluasocket/   - lua to cpp sockets (the original lua sockets)
            /include/   - debugio.h, dserver.h, socket.h 
            /src/       - debugio.cpp, dserver.cpp, socket.cpp
        /wxluadebug/    - mechanism for getting/showing info from lua
            /include/   - debug.h, stacktree, splittree
            /src/       - debug.cpp, stacktree, splittree
        /wxxmlrpc/      - ??
            /include/   - 
            /src/       - 
        /wxdebuggernub/ - ?? this is a generic lib for xmlrpc? don"t prepend wxlua to it
            /include/   - 
            /src/       - 
        /wxluadebugger/ - this depends on wxlua so prepend wxlua to it
            /include/   - 
            /src/       - 

-------------------------------------------------------------------------------    
Original wxLua distribution directory structure
-------------------------------------------------------------------------------    

wxLua/
    Embedded/    - moved to apps/xxx FIXME
    Examples/    - moved to samples
    Import/      - moved to bindings/wxwidgets
    Library/     - moved to modules wxlua, wxluadebug, wxluasocket
    Standalone/  - moved to apps/wxlua

-------------------------------------------------------------------------------    
File name mapping from the original wxLua
-------------------------------------------------------------------------------    

These header files were in wxLua/Library

wxlua.h     wxLua.h
callback.h  wxLuaCallback.h
debug.h     wxLuaDebug.h
debugio.h   wxLuaDebugIO.h
dserver.h   wxLuaDebugServer.h
dservice.h  wxLuaDebuggerService.h
htmlwin.h   wxLuaHtmlWindow.h
internal.h  wxLuaInternals.h
interp.h    wxLuaInterpreter.h
library.h   wxLuaLibrary.h
printing.h  wxLuaPrinting.h
socket.h    wxLuaSocket.h
splttree.h  wxLuaSplitTree.h
staktree.h  wxLuaStackTree.h

These source files were in wxLua/Library

debug.cpp    wxLuaDebug.cpp
debugio.cpp  wxLuaDebugIO.cpp
dserver.cpp  wxLuaDebugServer.cpp
dservice.cpp wxLuaDebuggerService.cpp
htmlwin.cpp  wxLuaHtmlWindow.cpp
internal.cpp wxLuaInternals.cpp
interp.cpp   wxLuaInterpreter.cpp
library.cpp  wxLuaLibrary.cpp
printing.cpp wxLuaPrinting.cpp
socket.cpp   wxLuaSocket.cpp
splttree.cpp wxLuaSplitTree.cpp
staktree.cpp wxLuaStackTree.cpp

dtarget.h    wxLuaDebugTarget.h   moved from wxLua/Standalone
dtarget.cpp  wxLuaDebugTarget.cpp moved from wxLua/Standalone

--- newdirs.txt DELETED ---

[Wxlua-commit] wxLua/bin readme.txt,NONE,1.1 README.txt,1.3,NONE

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

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

Added Files:
	readme.txt 
Removed Files:
	README.txt 
Log Message:
add licence and make READMEs lowercase


--- README.txt DELETED ---

--- NEW FILE: readme.txt ---
The output binaries are created here.

[Wxlua-commit] wxLua/lib readme.txt,NONE,1.1 README.txt,1.3,NONE

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

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

Added Files:
	readme.txt 
Removed Files:
	README.txt 
Log Message:
add licence and make READMEs lowercase


--- README.txt DELETED ---

--- NEW FILE: readme.txt ---
The output libraries are created here.

[Wxlua-commit] wxLua/docs licence.txt,NONE,1.1

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

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

Added Files:
	licence.txt 
Log Message:
add licence and make READMEs lowercase


--- NEW FILE: licence.txt ---
                wxWindows Library Licence, Version 3
                ====================================

  Copyright (c) 1998 Julian Smart, Robert Roebling et al

  Everyone is permitted to copy and distribute verbatim copies
  of this licence document, but changing it is not allowed.

                       WXWINDOWS LIBRARY LICENCE
     TERMS AND CONDITIONS FOR COPYING, DISTRIBUTION AND MODIFICATION
  
  This library is free software; you can redistribute it and/or modify it
  under the terms of the GNU Library General Public Licence as published by
  the Free Software Foundation; either version 2 of the Licence, or (at
  your option) any later version.
  
  This library is distributed in the hope that it will be useful, but
  WITHOUT ANY WARRANTY; without even the implied warranty of
  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU Library
  General Public Licence for more details.

  You should have received a copy of the GNU Library General Public Licence
  along with this software, usually in a file named COPYING.LIB.  If not,
  write to the Free Software Foundation, Inc., 59 Temple Place, Suite 330,
  Boston, MA 02111-1307 USA.

  EXCEPTION NOTICE

  1. As a special exception, the copyright holders of this library give
  permission for additional uses of the text contained in this release of
  the library as licenced under the wxWindows Library Licence, applying
  either version 3 of the Licence, or (at your option) any later version of
  the Licence as published by the copyright holders of version 3 of the
  Licence document.

  2. The exception is that you may use, copy, link, modify and distribute
  under the user's own terms, binary object code versions of works based
  on the Library.

  3. If you copy code from files distributed under the terms of the GNU
  General Public Licence or the GNU Library General Public Licence into a
  copy of this library, as this licence permits, the exception does not
  apply to the code that you add in this way.  To avoid misleading anyone as
  to the status of such modified files, you must delete this exception
  notice from such code and/or adjust the licensing conditions notice
  accordingly.

  4. If you write modifications of your own for this library, it is your
  choice whether to permit this exception to apply to your modifications. 
  If you do not wish that, you must delete the exception notice from such
  code and/or adjust the licensing conditions notice accordingly.

[Wxlua-commit] wxLua/modules/wxlua/include callback.h,1.1,1.2 internal.h,1.1,1.2 interp.h,1.1,1.2 library.h,1.1,1.2 wxlua.h,1.1,1.2

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

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

Modified Files:
	callback.h internal.h interp.h library.h wxlua.h 
Log Message:
still moving files to module and app directory


Index: interp.h
===================================================================
RCS file: /cvsroot/wxlua/wxLua/modules/wxlua/include/interp.h,v
retrieving revision 1.1
retrieving revision 1.2
diff -C2 -d -r1.1 -r1.2
*** interp.h	6 Jun 2005 23:06:18 -0000	1.1
--- interp.h	7 Jun 2005 04:17:39 -0000	1.2
***************
*** 16,24 ****
  #endif
  
! #include "wxlua/defs.h"
  
  extern "C"
  {
!     #include "lua.h"  // for DebugHook defines
  
      // To not include "lua.h" use these
--- 16,24 ----
  #endif
  
! #include "wxlua/include/defs.h"
  
  extern "C"
  {
!     #include "lua/include/lua.h"  // for DebugHook defines
  
      // To not include "lua.h" use these

Index: wxlua.h
===================================================================
RCS file: /cvsroot/wxlua/wxLua/modules/wxlua/include/wxlua.h,v
retrieving revision 1.1
retrieving revision 1.2
diff -C2 -d -r1.1 -r1.2
*** wxlua.h	6 Jun 2005 23:06:18 -0000	1.1
--- wxlua.h	7 Jun 2005 04:17:39 -0000	1.2
***************
*** 12,21 ****
  extern "C"
  {
!     #include "lua.h"
!     #include "lualib.h"
!     #include "lauxlib.h"
  }
  
! #include "wxlua/defs.h"
  
  // If you're using stdcall in Lua, then override this with
--- 12,21 ----
  extern "C"
  {
!     #include "lua/include/lua.h"
!     #include "lua/include/lualib.h"
!     #include "lua/include/lauxlib.h"
  }
  
! #include "wxlua/include/defs.h"
  
  // If you're using stdcall in Lua, then override this with

Index: callback.h
===================================================================
RCS file: /cvsroot/wxlua/wxLua/modules/wxlua/include/callback.h,v
retrieving revision 1.1
retrieving revision 1.2
diff -C2 -d -r1.1 -r1.2
*** callback.h	6 Jun 2005 23:06:18 -0000	1.1
--- callback.h	7 Jun 2005 04:17:39 -0000	1.2
***************
*** 10,14 ****
  #define WX_LUA_CALLBACK_H
  
! #include "wxlua/defs.h"
  
  class WXDLLIMPEXP_WXLUA wxLuaStateVariables;
--- 10,14 ----
  #define WX_LUA_CALLBACK_H
  
! #include "wxlua/include/defs.h"
  
  class WXDLLIMPEXP_WXLUA wxLuaStateVariables;

Index: library.h
===================================================================
RCS file: /cvsroot/wxlua/wxLua/modules/wxlua/include/library.h,v
retrieving revision 1.1
retrieving revision 1.2
diff -C2 -d -r1.1 -r1.2
*** library.h	6 Jun 2005 23:06:18 -0000	1.1
--- library.h	7 Jun 2005 04:17:39 -0000	1.2
***************
*** 12,20 ****
  #define WX_LUA_LIBRARY_H
  
! #ifdef __GNUG__
      #pragma interface "library.h"
  #endif
  
! #include "wxlua/defs.h"
  #include "wx/utils.h"
  #include "wx/app.h"
--- 12,20 ----
  #define WX_LUA_LIBRARY_H
  
! #if defined(__GNUG__) && !defined(NO_GCC_PRAGMA)
      #pragma interface "library.h"
  #endif
  
! #include "wxlua/include/defs.h"
  #include "wx/utils.h"
  #include "wx/app.h"

Index: internal.h
===================================================================
RCS file: /cvsroot/wxlua/wxLua/modules/wxlua/include/internal.h,v
retrieving revision 1.1
retrieving revision 1.2
diff -C2 -d -r1.1 -r1.2
*** internal.h	6 Jun 2005 23:06:18 -0000	1.1
--- internal.h	7 Jun 2005 04:17:39 -0000	1.2
***************
*** 15,26 ****
  
  #include "wx/treectrl.h"
! #include "wxlua/defs.h"
! #include "wxlua/wxlua.h"
! #include "wxlua/interp.h"
  
  extern "C"
  {
!     #include "lualib.h"
!     #include "lauxlib.h"
  }
  
--- 15,26 ----
  
  #include "wx/treectrl.h"
! #include "wxlua/include/defs.h"
! #include "wxlua/include/wxlua.h"
! #include "wxlua/include/interp.h"
  
  extern "C"
  {
!     #include "lua/include/lualib.h"
!     #include "lua/include/lauxlib.h"
  }
  

[Wxlua-commit] wxLua/modules/wxlua/src Makefile,NONE,1.1 internal.cpp,1.1,1.2 interp.cpp,1.1,1.2 library.cpp,1.1,1.2

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

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

Modified Files:
	internal.cpp interp.cpp library.cpp 
Added Files:
	Makefile 
Log Message:
still moving files to module and app directory


Index: interp.cpp
===================================================================
RCS file: /cvsroot/wxlua/wxLua/modules/wxlua/src/interp.cpp,v
retrieving revision 1.1
retrieving revision 1.2
diff -C2 -d -r1.1 -r1.2
*** interp.cpp	6 Jun 2005 23:06:19 -0000	1.1
--- interp.cpp	7 Jun 2005 04:17:39 -0000	1.2
***************
*** 27,32 ****
  #endif // WX_PRECOMP
  
! #include "wxlua/interp.h"
! #include "wxlua/internal.h"
  
  extern int s_wxLuaInterpreter;
--- 27,32 ----
  #endif // WX_PRECOMP
  
! #include "wxlua/include/interp.h"
! #include "wxlua/include/internal.h"
  
  extern int s_wxLuaInterpreter;
***************
*** 39,49 ****
  extern "C"
  {
!     #include "lua.h"
!     #include "lauxlib.h"
!     #include "lualib.h"
  
  #ifdef WXLUA_THREAD_INTERCEPTION
      // See lua/src/lstate.c for added hook into luaE_newthread()
!     #include "luathread.h"
  #endif //WXLUA_THREAD_INTERCEPTION
  }
--- 39,49 ----
  extern "C"
  {
!     #include "lua/include/lua.h"
!     #include "lua/include/lauxlib.h"
!     #include "lua/include/lualib.h"
  
  #ifdef WXLUA_THREAD_INTERCEPTION
      // See lua/src/lstate.c for added hook into luaE_newthread()
!     #include "lua/include/luathread.h"
  #endif //WXLUA_THREAD_INTERCEPTION
  }

Index: internal.cpp
===================================================================
RCS file: /cvsroot/wxlua/wxLua/modules/wxlua/src/internal.cpp,v
retrieving revision 1.1
retrieving revision 1.2
diff -C2 -d -r1.1 -r1.2
*** internal.cpp	6 Jun 2005 23:06:19 -0000	1.1
--- internal.cpp	7 Jun 2005 04:17:39 -0000	1.2
***************
*** 34,40 ****
  #include "wx/datetime.h"
  
! #include "../import/luasetup.h.in" // get the base library setup parameters
! #include "wxlua/internal.h"
! #include "wxlua/callback.h"
  
  class wxStyledTextCtrlDocument;   // for void* wxStyledTextCtrl::GetDocPointer()
--- 34,40 ----
  #include "wx/datetime.h"
  
! #include "../../../bindings/wxwidgets/luasetup.h.in" // get the base library setup parameters
! #include "wxlua/include/internal.h"
! #include "wxlua/include/callback.h"
  
  class wxStyledTextCtrlDocument;   // for void* wxStyledTextCtrl::GetDocPointer()
***************
*** 52,61 ****
  
  #if defined(__WXGTK__) || defined(__WXMAC__) || defined(__WXMOTIF__) 
!     #include "../wxLua.xpm"
  #endif
  
! #include "wxlua/interp.h"
! #include "wxlua/htmlwin.h"
! #include "wxlua/library.h"
  
  static int LUACALL LuaTableErrorHandler(lua_State *L)
--- 52,61 ----
  
  #if defined(__WXGTK__) || defined(__WXMAC__) || defined(__WXMOTIF__) 
!     #include "../../../art/wxlua.xpm"
  #endif
  
! #include "wxlua/include/interp.h"
! //#include "wxlua/include/htmlwin.h"
! //#include "wxlua/include/library.h"
  
  static int LUACALL LuaTableErrorHandler(lua_State *L)

--- NEW FILE: Makefile ---
# File:		Makefile
# Author:	J Winwood
# Created:	2002
# Updated:	
# Copyright: (c) 2002 Lomtick Software. All rights reserved.
#
# Makefile for wxLua library using gmake

LUADIR = ../../lua

WXDIR      = $(shell wx-config --prefix)
WXBASENAME = $(shell wx-config --basename)
WXLIBBASE  = $(shell wx-config --basename)
WXVERSION  = $(shell wx-config --version)
WXRELEASE  = $(shell wx-config --release)

CXXFLAGS = $(shell wx-config --cxxflags) -MMD -g -Wall
LDLIBS   = $(shell wx-config --libs)
CXX      = $(shell wx-config --cxx) 

APPEXTRADEFS=-I../../ -I$(WXDIR)/contrib/include -fexceptions -DLUACALL= 

LIBVERSION_CURRENT=1
LIBVERSION_REVISION=5
LIBVERSION_AGE=0

TARGET_LIBNAME = lib$(WXLIBBASE)_wxlua-$(WXRELEASE)

TARGET_LIB_STATIC = $(WXDIR)/lib/$(TARGET_LIBNAME).a
TARGET_LIB_SHARED = $(WXDIR)/lib/$(TARGET_LIBNAME).so.$(LIBVERSION_CURRENT).$(LIBVERSION_REVISION).$(LIBVERSION_AGE)
TARGET_LIB_LINK1  = $(TARGET_LIBNAME).so.$(LIBVERSION_CURRENT)
TARGET_LIB_LINK2  = $(TARGET_LIBNAME).so

RM        = rm -f
AR        = ar
AROPTIONS = rcu
RANLIB    = ranlib
LN_S      = ln -s

HEADERS = \
	../include/defs.h \
	../include/internal.h \
	../include/interp.h \
	../include/library.h \
	../include/wxlua.h

SOURCES = \
	internal.cpp \
	interp.cpp \
	library.cpp

OBJECTS=$(SOURCES:.cpp=.o)
DEPFILES=$(OBJECTS:.o=.d)

.cpp.o:
	$(CXX) -c $(CXXFLAGS) $(APPEXTRADEFS)-o $@ $<

all:   $(TARGET_LIB_STATIC) $(TARGET_LIB_SHARED)

$(TARGET_LIB_STATIC) : $(OBJECTS)   
	@$(RM) $@
	$(AR) $(AROPTIONS) $@ $(OBJECTS)
	$(RANLIB) $@

$(TARGET_LIB_SHARED): $(OBJECTS)
	$(CXX) -shared -o $@ $(OBJECTS)
	cd $(WXDIR)/lib \
                && $(RM) $(TARGET_LIB_LINK1) $(TARGET_LIB_LINK2) \
                && $(LN_S) $(TARGET_LIB_SHARED) $(TARGET_LIB_LINK1) \
                && $(LN_S) $(TARGET_LIB_SHARED) $(TARGET_LIB_LINK2)

clean:
	rm -f core $(OBJECTS) $(DEPFILES) \
	      $(TARGET_LIB_STATIC) $(TARGET_LIB_SHARED) \
              $(WXDIR)/lib/$(TARGET_LIB_LINK1) \
              $(WXDIR)/lib/$(TARGET_LIB_LINK2) 

-include $(DEPFILES)

Index: library.cpp
===================================================================
RCS file: /cvsroot/wxlua/wxLua/modules/wxlua/src/library.cpp,v
retrieving revision 1.1
retrieving revision 1.2
diff -C2 -d -r1.1 -r1.2
*** library.cpp	6 Jun 2005 23:06:19 -0000	1.1
--- library.cpp	7 Jun 2005 04:17:39 -0000	1.2
***************
*** 24,30 ****
  #endif
  
! #include "wxlua/library.h"
! #include "wxlua/internal.h"
! #include "wxlua/dserver.h"
  
  // ----------------------------------------------------------------------------
--- 24,30 ----
  #endif
  
! #include "wxlua/include/library.h"
! #include "wxlua/include/internal.h"
! //#include "wxlua/include/dserver.h"
  
  // ----------------------------------------------------------------------------

[Wxlua-commit] wxLua/modules/wxluadebug/include debug.h,1.1,1.2 splttree.h,1.1,1.2 staktree.h,1.1,1.2

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

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

Modified Files:
	debug.h splttree.h staktree.h 
Log Message:
still moving files to module and app directory


Index: staktree.h
===================================================================
RCS file: /cvsroot/wxlua/wxLua/modules/wxluadebug/include/staktree.h,v
retrieving revision 1.1
retrieving revision 1.2
diff -C2 -d -r1.1 -r1.2
*** staktree.h	6 Jun 2005 23:06:19 -0000	1.1
--- staktree.h	7 Jun 2005 04:17:40 -0000	1.2
***************
*** 15,20 ****
  #endif
  
! #include "wxlua/defs.h"
! #include "wxlua/splttree.h"
  
  class WXDLLIMPEXP_WXLUA wxLuaStackDataWindow;
--- 15,20 ----
  #endif
  
! #include "wxlua/include/defs.h"
! #include "wxluadebug/include/splttree.h"
  
  class WXDLLIMPEXP_WXLUA wxLuaStackDataWindow;

Index: debug.h
===================================================================
RCS file: /cvsroot/wxlua/wxLua/modules/wxluadebug/include/debug.h,v
retrieving revision 1.1
retrieving revision 1.2
diff -C2 -d -r1.1 -r1.2
*** debug.h	6 Jun 2005 23:06:19 -0000	1.1
--- debug.h	7 Jun 2005 04:17:40 -0000	1.2
***************
*** 30,34 ****
  #include "wx/treectrl.h"
  
! #include "wxlua/defs.h"
  
  class WXDLLIMPEXP_WXLUA wxLuaDebugData;
--- 30,34 ----
  #include "wx/treectrl.h"
  
! #include "wxlua/include/defs.h"
  
  class WXDLLIMPEXP_WXLUA wxLuaDebugData;

Index: splttree.h
===================================================================
RCS file: /cvsroot/wxlua/wxLua/modules/wxluadebug/include/splttree.h,v
retrieving revision 1.1
retrieving revision 1.2
diff -C2 -d -r1.1 -r1.2
*** splttree.h	6 Jun 2005 23:06:19 -0000	1.1
--- splttree.h	7 Jun 2005 04:17:40 -0000	1.2
***************
*** 20,24 ****
  #endif
  
! #include "wxlua/defs.h"
  #include "wx/treectrl.h"
  #include "wx/splitter.h"
--- 20,24 ----
  #endif
  
! #include "wxlua/include/defs.h"
  #include "wx/treectrl.h"
  #include "wx/splitter.h"

[Wxlua-commit] wxLua/bindings/wxwidgets htmlwin.cpp,NONE,1.1 htmlwin.h,NONE,1.1 printing.cpp,NONE,1.1 printing.h,NONE,1.1 wrappers.lst,NONE,1.1 wxluawrap.i,NONE,1.1 wxlua.i,1.1,1.2 wxLuaWrap.i,1.1,NONE

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

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

Modified Files:
	wxlua.i 
Added Files:
	htmlwin.cpp htmlwin.h printing.cpp printing.h wrappers.lst 
	wxluawrap.i 
Removed Files:
	wxLuaWrap.i 
Log Message:
still moving files to module and app directory


--- NEW FILE: wxluawrap.i ---
/////////////////////////////////////////////////////////////////////////////
// Name:        wxLuaWrap.i
// Purpose:     definition of interface data, functions and classes
// Author:      J Winwood
// Modified by: J Winwood. Automatic generation of event table.
//                         More code generation overrides.
//                         Support for wxWindows 2.3 and wxWindows 2.4
// Created:     3/11/2001
// Copyrights:
// Original file from wxBasic (Wrap.i) (c) 2001 David Cuny
// Modifications for wxLua             (c) 2001, 2002, 2003 J. Winwood
// Portions are extracted from the wxWindows documentation
// and headers therefore
// Portions (c) 2001 wxWindows development team
// Licence:     wxWindows licence
/////////////////////////////////////////////////////////////////////////////

%define wxBACKINGSTORE
%define wxBACKWARD
%define wxBOTH
%define wxBOTTOM
%define wxCANCEL
%define wxCENTER
%define wxCENTER_FRAME
%define wxCENTER_ON_SCREEN
%define wxCENTRE
%define wxCENTRE_ON_SCREEN
%define wxCOLOURED
//%define wxED_BUTTONS_BOTTOM  // for wxExtDialog? not used?
//%define wxED_BUTTONS_RIGHT
//%define wxED_CLIENT_MARGIN
//%define wxED_STATIC_LINE
%define wxEQUIV
%define wxFIXED_LENGTH
%define wxFORWARD
%define wxGTK
%define wxHELP
%define wxHORIZONTAL
%define wxINVERT
%define wxMORE
%define wxMOTIF_X
%define wxNO
%define wxNO_BORDER
%define wxNO_DEFAULT
%define wxOK
%define wxPASSWORD
%define wxPROCESS_ENTER
%define wxRESET
%define wxRESIZE_BOX
%define wxRETAINED
%define wxRIGHT
%define wxSET
%define wxSETUP
%define wxSIZE_ALLOW_MINUS_ONE
%define wxSIZE_AUTO
%define wxSIZE_AUTO_HEIGHT
%define wxSIZE_AUTO_WIDTH
%define wxSIZE_NO_ADJUSTMENTS
%define wxSIZE_USE_EXISTING
%define wxST_NO_AUTORESIZE
%define wxTOP
%define wxUNKNOWN_PLATFORM
//%define wxUSER_COLOURS depricated use wxNO_3D
%define wxVERTICAL
%define wxWINDOWS
%define wxWS_EX_VALIDATE_RECURSIVELY
%define wxXVIEW_X
%define wxYES
%define wxYES_DEFAULT
%define wxYES_NO

%win %define wxPlatformWindows
%gtk %define wxPlatformGTK
%mac %define wxPlatformMac
%mgl %define wxPlatformMgl
%motif %define wxPlatformMotif
%os2 %define wxPlatformOS2
%univ %define wxPlatformUniv
%x11 %define wxPlatformX11
%cocoa %define wxPlatformCocoa

%include "wx/wx.h"
%include "wxlua/include/internal.h"

%includefile override.hpp

// classes
%class %noclassinfo wxLog
%endclass
%class %noclassinfo wxProcess
%endclass

//======================================================================================

// These are out of order to ensure proper checking for base classes
%includefile data.i
%includefile event.i
%includefile windows.i
%includefile gdi.i
%includefile appframe.i
%includefile dialogs.i
%includefile print.i
%includefile clipdrag.i
%includefile config.i
%includefile controls.i
%includefile datetime.i
%includefile defsutil.i
%includefile file.i
%includefile grid.i
%includefile help.i
%includefile html.i
%includefile image.i
%includefile mdi.i
%includefile menutool.i
%includefile plot.i
%includefile sizer.i
%includefile socket.i
%includefile geometry.i
%includefile wave.i
%includefile regex.i
%includefile wxlua.i

%includefile fl.i
%includefile stc.i
%includefile xml.i


--- NEW FILE: printing.cpp ---
/////////////////////////////////////////////////////////////////////////////
// Name:        wxLuaPrinting.cpp
// Purpose:     Provide an interface to wxPrintout for wxLua.
// Author:      J. Winwood.
// Created:     July 2002.
// Copyright:   (c) 2002 Lomtick Software. All rights reserved.
// Licence:     wxWidgets licence
/////////////////////////////////////////////////////////////////////////////
/*
#if defined(__GNUG__) && !defined(NO_GCC_PRAGMA)
    #pragma implementation "printing.h"
#endif

#include "wx/wxprec.h"

#ifdef __BORLANDC__
    #pragma hdrstop
#endif

#ifndef WX_PRECOMP
    #include "wx/wx.h"
#endif
*/
#include "wx/datetime.h"

#include "wxlua/include/callback.h"
#include "wxlua/include/internal.h"
//#include "wxlua/printing.h"

// forward reference
class wxLuaObject;

// This lua tag is defined in wxLuaWrap.cpp
extern int s_wxLuaPrintout;

// ----------------------------------------------------------------------------
// wxLuaPrintout
// ----------------------------------------------------------------------------

IMPLEMENT_CLASS(wxLuaPrintout, wxPrintout)

wxLuaPrintout::wxLuaPrintout(const wxString& title, wxLuaObject *pObject) :
                 wxPrintout(title),
                 m_pObject(pObject),
                 m_minPage(0),
                 m_maxPage(0),
                 m_pageFrom(0),
                 m_pageTo(0)
{
}

void wxLuaPrintout::SetPageInfo(int minPage, int maxPage, int pageFrom, int pageTo)
{
    m_minPage  = minPage;
    m_maxPage  = maxPage;
    m_pageFrom = pageFrom;
    m_pageTo   = pageTo;
}

void wxLuaPrintout::GetPageInfo(int *minPage, int *maxPage, int *pageFrom, int *pageTo)
{    
    lua_State *luaState = getDerivedMethod(this, "GetPageInfo");
    if (luaState != NULL)
    {
        int nOldTop = lua_gettop(luaState);
        tpushusertag(luaState, this, s_wxLuaPrintout);
        
        LuaCall(luaState, 1, false);
        
        *minPage  = (int) lua_tonumber(luaState, -4);
        *maxPage  = (int) lua_tonumber(luaState, -3);
        *pageFrom = (int) lua_tonumber(luaState, -2);
        *pageTo   = (int) lua_tonumber(luaState, -1);
                
        lua_settop(luaState, nOldTop);
    }
    else
    {
        *minPage  = m_minPage;
        *maxPage  = m_maxPage;
        *pageFrom = m_pageFrom;
        *pageTo   = m_pageTo;
    }
}

bool wxLuaPrintout::HasPage(int pageNum)
{
    bool fResult = false;
    lua_State *luaState = getDerivedMethod(this, "HasPage");
    if (luaState != NULL)
    {
        int nOldTop = lua_gettop(luaState);
        tpushusertag(luaState, this, s_wxLuaPrintout);
        lua_pushnumber(luaState, pageNum);
        
        LuaCall(luaState, 2, false);
        
        fResult = (lua_toboolean(luaState, -1) != false);
        lua_settop(luaState, nOldTop);
    }
    else
        fResult = wxPrintout::HasPage(pageNum);
    return fResult;
}

bool wxLuaPrintout::OnBeginDocument(int startPage, int endPage)
{
    bool fResult = true;
    
    lua_State *luaState = getDerivedMethod(this, "OnBeginDocument");
    if (luaState != NULL)
    {
        int nOldTop = lua_gettop(luaState);
        tpushusertag(luaState, this, s_wxLuaPrintout);
        lua_pushnumber(luaState, startPage);
        lua_pushnumber(luaState, endPage);
        
        LuaCall(luaState, 3, false);
        
        fResult = (lua_toboolean(luaState, -1) != false);
        lua_pop(luaState, 1);
        lua_settop(luaState, nOldTop);
    }
    else
        fResult = wxPrintout::OnBeginDocument(startPage, endPage);            

    return fResult;
}

void wxLuaPrintout::OnEndDocument()
{
    lua_State *luaState = getDerivedMethod(this, "OnEndDocument");
    if (luaState != NULL)
    {
        int nOldTop = lua_gettop(luaState);
        tpushusertag(luaState, this, s_wxLuaPrintout);       
        LuaCall(luaState, 1, true);
        lua_settop(luaState, nOldTop);
    }
    else
        wxPrintout::OnEndDocument();
}

void wxLuaPrintout::OnBeginPrinting()
{
    lua_State *luaState = getDerivedMethod(this, "OnBeginPrinting");
    if (luaState != NULL)
    {
        int nOldTop = lua_gettop(luaState);
        tpushusertag(luaState, this, s_wxLuaPrintout);       
        LuaCall(luaState, 1, true);
        lua_settop(luaState, nOldTop);
    }
    else
        wxPrintout::OnBeginPrinting();
}

void wxLuaPrintout::OnEndPrinting()
{
    lua_State *luaState = getDerivedMethod(this, "OnEndPrinting");
    if (luaState != NULL)
    {
        int nOldTop = lua_gettop(luaState);
        tpushusertag(luaState, this, s_wxLuaPrintout);       
        LuaCall(luaState, 1, true);
        lua_settop(luaState, nOldTop);
    }
    else
        wxPrintout::OnEndPrinting();
}

void wxLuaPrintout::OnPreparePrinting()
{
    lua_State *luaState = getDerivedMethod(this, "OnPreparePrinting");
    if (luaState != NULL)
    {
        int nOldTop = lua_gettop(luaState);
        tpushusertag(luaState, this, s_wxLuaPrintout);       
        LuaCall(luaState, 1, true);
        lua_settop(luaState, nOldTop);
    }
    else
        wxPrintout::OnPreparePrinting();
}

bool wxLuaPrintout::OnPrintPage(int pageNum)
{
    bool fResult = false;
    lua_State *luaState = getDerivedMethod(this, "OnPrintPage");
    if (luaState != NULL)
    {
        int nOldTop = lua_gettop(luaState);
        tpushusertag(luaState, this, s_wxLuaPrintout);
        lua_pushnumber(luaState, pageNum);
        
        LuaCall(luaState, 2, false);
        
        fResult = (lua_toboolean(luaState, -1) != false);
        lua_settop(luaState, nOldTop);
    }
    return fResult;
}

--- NEW FILE: wrappers.lst ---
WRAPPERS = \
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 \
plot.i     \
print.i    \
regex.i    \
sizer.i    \
socket.i   \
stc.i      \
wave.i     \
windows.i  \
wxlua.i    \
wxluawrap.i \
xml.i

--- NEW FILE: htmlwin.h ---
/////////////////////////////////////////////////////////////////////////////
// Purpose:     A wrapper around wxHtmlWindow for wxLua
// Author:      J. Winwood
// Created:     June 2002
// Copyright:   (c) 2002 Lomtick Software. All rights reserved.
// Licence:     wxWidgets licence
/////////////////////////////////////////////////////////////////////////////

#ifndef WX_LUA_HTML_WINDOW_H
#define WX_LUA_HTML_WINDOW_H

//#if defined(__GNUG__) && !defined(NO_GCC_PRAGMA)
//    #pragma interface "htmlwin.h"
//#endif

#include "wxlua/include/defs.h"
#include "wx/print.h"
#include "wx/html/htmlwin.h"
#include "wx/html/htmlcell.h"

// ----------------------------------------------------------------------------
// wxLuaHtmlWindow
// ----------------------------------------------------------------------------

class wxLuaHtmlWindow : public wxHtmlWindow
{
public:

    wxLuaHtmlWindow();
    virtual ~wxLuaHtmlWindow();

    wxLuaHtmlWindow(wxWindow *parent,
                    wxWindowID id = -1,
                    const wxPoint& pos = wxDefaultPosition,
                    const wxSize& size = wxDefaultSize,
                    long style = wxHW_SCROLLBAR_AUTO,
                    const wxString& name = wxT("wxLuaHtmlWindow"));

    virtual void OnCellClicked(wxHtmlCell *cell, wxCoord x, wxCoord y, const wxMouseEvent& event);
    virtual void OnCellMouseHover(wxHtmlCell *cell, wxCoord x, wxCoord y);
    virtual void OnLinkClicked(const wxHtmlLinkInfo& link);
    virtual void OnSetTitle(const wxString& title);

private:
    DECLARE_EVENT_TABLE()
    DECLARE_CLASS (wxLuaHtmlWindow)
};

// ----------------------------------------------------------------------------
// wxLuaHtmlWinTagEvent
// ----------------------------------------------------------------------------

class wxLuaHtmlWinTagEvent : public wxEvent
{
public:
    wxLuaHtmlWinTagEvent();
    wxLuaHtmlWinTagEvent(int eventType);
    virtual ~wxLuaHtmlWinTagEvent();

    void SetTagInfo(const wxHtmlTag *pHtmlTag, wxHtmlWinParser *pParser);

    const wxHtmlTag *GetHtmlTag() const;
    wxHtmlWinParser *GetHtmlParser() const;
    void             SetParseInnerCalled(bool fParseInnerCalled);
    bool             GetParseInnerCalled() const;

protected:
    virtual wxEvent* Clone() const;

private:
    const wxHtmlTag *m_pHtmlTag;
    wxHtmlWinParser *m_pHtmlParser;
    bool             m_fParseInnerCalled;
    DECLARE_DYNAMIC_CLASS(wxLuaHtmlWinTagEvent)
};

typedef void (wxEvtHandler::*wxLuaHtmlWinTagEventFunction)(wxLuaHtmlWinTagEvent&);

BEGIN_DECLARE_EVENT_TYPES()
    DECLARE_LOCAL_EVENT_TYPE(wxEVT_HTML_TAG_HANDLER, 2520)
END_DECLARE_EVENT_TYPES()

#define EVT_HTML_TAG_HANDLER(id, fn) DECLARE_EVENT_TABLE_ENTRY(wxEVT_HTML_TAG_HANDLER, id, -1, (wxObjectEventFunction) (wxEventFunction) (wxLuaHtmlWinTagEventFunction) & fn, (wxObject *) NULL),

#endif //WX_LUA_HTML_WINDOW_H

Index: wxlua.i
===================================================================
RCS file: /cvsroot/wxlua/wxLua/bindings/wxwidgets/wxlua.i,v
retrieving revision 1.1
retrieving revision 1.2
diff -C2 -d -r1.1 -r1.2
*** wxlua.i	6 Jun 2005 23:06:07 -0000	1.1
--- wxlua.i	7 Jun 2005 04:17:38 -0000	1.2
***************
*** 34,38 ****
  %if wxLUA_USE_wxLuaDebugServer
  
! %include "wxlua/dserver.h"
  
  %class %noclassinfo %delete wxLuaDebugServer
--- 34,38 ----
  %if wxLUA_USE_wxLuaDebugServer
  
! %include "wxluasocket/include/dserver.h"
  
  %class %noclassinfo %delete wxLuaDebugServer
***************
*** 83,87 ****
  %if wxLUA_USE_wxLuaPrintout
  
! %include "wxlua/printing.h"
  
  %class %delete wxLuaPrintout, wxPrintout
--- 83,88 ----
  %if wxLUA_USE_wxLuaPrintout
  
! %inlinefile printing.h
! %inlinefile printing.cpp
  
  %class %delete wxLuaPrintout, wxPrintout
***************
*** 98,102 ****
  %if wxLUA_USE_wxLuaHtmlWindow
  
! %include "wxlua/htmlwin.h"
  
  %class wxLuaHtmlWindow, wxHtmlWindow
--- 99,104 ----
  %if wxLUA_USE_wxLuaHtmlWindow
  
! %inlinefile htmlwin.h
! %inlinefile htmlwin.cpp
  
  %class wxLuaHtmlWindow, wxHtmlWindow
***************
*** 123,127 ****
  %if wxLUA_USE_wxLuaApp
  
! %include "wxlua/library.h"
  
  %endif wxLUA_USE_wxLuaApp
--- 125,129 ----
  %if wxLUA_USE_wxLuaApp
  
! %include "wxlua/include/library.h"
  
  %endif wxLUA_USE_wxLuaApp

--- wxLuaWrap.i DELETED ---

--- NEW FILE: htmlwin.cpp ---
/////////////////////////////////////////////////////////////////////////////
// Name:        wxLuaHtmlWindow.cpp
// Purpose:     Provide an interface to wxHtmlWindow for wxLua.
// Author:      J. Winwood.
// Created:     June 2002.
// Copyright:   (c) 2002 Lomtick Software. All rights reserved.
// Licence:     wxWidgets licence
/////////////////////////////////////////////////////////////////////////////
/*
#if defined(__GNUG__) && !defined(NO_GCC_PRAGMA)
    #pragma implementation "htmlwin.h"
#endif

#include "wx/wxprec.h"

#ifdef __BORLANDC__
    #pragma hdrstop
#endif

#ifndef WX_PRECOMP
    #include "wx/wx.h"
#endif
*/
#include "wx/datetime.h"

#include "wxlua/include/callback.h"
//#include "wxlua/htmlwin.h"
#include "wxlua/include/internal.h"

// These are the wxLua tags defined in wxLuaWrap.cpp
extern int s_wxLuaHtmlWindow;
extern int s_wxHtmlCell;
extern int s_wxMouseEvent;
extern int s_wxHtmlLinkInfo;

DEFINE_EVENT_TYPE(wxEVT_HTML_TAG_HANDLER)

// ----------------------------------------------------------------------------
// wxLuaHtmlWindow
// ----------------------------------------------------------------------------

IMPLEMENT_CLASS(wxLuaHtmlWindow, wxHtmlWindow)

BEGIN_EVENT_TABLE(wxLuaHtmlWindow, wxHtmlWindow)
END_EVENT_TABLE()

wxLuaHtmlWindow::wxLuaHtmlWindow() : wxHtmlWindow()
{
}

wxLuaHtmlWindow::~wxLuaHtmlWindow()
{
}

wxLuaHtmlWindow::wxLuaHtmlWindow(wxWindow *parent, 
                                 wxWindowID id, 
                                 const wxPoint& pos, 
                                 const wxSize& size, 
                                 long  style, 
                                 const wxString& name) :
                 wxHtmlWindow(parent, id, pos, size, style, name)
{
}

void wxLuaHtmlWindow::OnCellClicked(wxHtmlCell *cell, wxCoord x, wxCoord y, const wxMouseEvent& event)
{
    bool fResult = false;
    lua_State *luaState = getDerivedMethod(this, "OnCellClicked");
    if (luaState != NULL)
    {
        int nOldTop = lua_gettop(luaState);
        tpushusertag(luaState, this, s_wxLuaHtmlWindow);
        tpushusertag(luaState, cell, s_wxHtmlCell);
        lua_pushnumber(luaState, x);
        lua_pushnumber(luaState, y);
        tpushusertag(luaState, (void *) &event, s_wxMouseEvent);
        
        LuaCall(luaState, 5, false);
        
        fResult = (lua_tonumber(luaState, -1) != 0);
        lua_settop(luaState, nOldTop);
        
        if (fResult)
            wxHtmlWindow::OnCellClicked(cell, x, y, event);
    }
    else
        wxHtmlWindow::OnCellClicked(cell, x, y, event);
}

void wxLuaHtmlWindow::OnCellMouseHover(wxHtmlCell *cell, wxCoord x, wxCoord y)
{
    lua_State *luaState = getDerivedMethod(this, "OnCellMouseHover");
    if (luaState != NULL)
    {
        int nOldTop = lua_gettop(luaState);
        tpushusertag(luaState, this, s_wxLuaHtmlWindow);
        tpushusertag(luaState, cell, s_wxHtmlCell);
        lua_pushnumber(luaState, x);
        lua_pushnumber(luaState, y);
        
        LuaCall(luaState, 4, true);
        lua_settop(luaState, nOldTop);
    }
    else
        wxHtmlWindow::OnCellMouseHover(cell, x, y);
}

void wxLuaHtmlWindow::OnLinkClicked(const wxHtmlLinkInfo& link)
{
    lua_State *luaState = getDerivedMethod(this, "OnLinkClicked");
    if (luaState != NULL)
    {
        int nOldTop = lua_gettop(luaState);
        tpushusertag(luaState, this, s_wxLuaHtmlWindow);
        tpushusertag(luaState, (void *) &link, s_wxHtmlLinkInfo);
        
        LuaCall(luaState, 2, true);
        lua_settop(luaState, nOldTop);
    }
    else
        wxHtmlWindow::OnLinkClicked(link);
}

void wxLuaHtmlWindow::OnSetTitle(const wxString& title)
{
    lua_State *luaState = getDerivedMethod(this, "OnSetTitle");
    if (luaState != NULL)
    {
        int nOldTop = lua_gettop(luaState);
        tpushusertag(luaState, this, s_wxLuaHtmlWindow);
        lua_pushstring(luaState, wx2lua(title));
    
        LuaCall(luaState, 2, true);
        lua_settop(luaState, nOldTop);
    }
    else
        wxHtmlWindow::OnSetTitle(title);
}

// ----------------------------------------------------------------------------
// wxLuaHtmlWinTagHandler
// ----------------------------------------------------------------------------

class wxLuaHtmlWinTagHandler : public wxHtmlWinTagHandler
{
public:
    wxLuaHtmlWinTagHandler()
    {
    }
    
    wxString GetSupportedTags()
    {
        return wxString(wxT("LUA"));
    }

    bool HandleTag(const wxHtmlTag& tag)
    {
        wxLuaHtmlWinTagEvent htmlEvent(wxEVT_HTML_TAG_HANDLER);
        htmlEvent.SetTagInfo(&tag, m_WParser);
    
        if (wxTheApp->ProcessEvent(htmlEvent))
            return htmlEvent.GetParseInnerCalled();
        
        return FALSE;
    }
};

class wxLuaHtmlTagsModule : public wxHtmlTagsModule
{
    DECLARE_DYNAMIC_CLASS(wxLuaHtmlTagsModule)
public:
    void FillHandlersTable(wxHtmlWinParser *parser)
    {
        parser->AddTagHandler(new wxLuaHtmlWinTagHandler);
    }
};

IMPLEMENT_DYNAMIC_CLASS(wxLuaHtmlTagsModule, wxHtmlTagsModule)

// ----------------------------------------------------------------------------
// wxLuaHtmlWinTagEvent
// ----------------------------------------------------------------------------

IMPLEMENT_DYNAMIC_CLASS(wxLuaHtmlWinTagEvent, wxEvent)

wxLuaHtmlWinTagEvent::wxLuaHtmlWinTagEvent() :
    m_pHtmlTag(NULL),
    m_pHtmlParser(NULL),
    m_fParseInnerCalled(false)
{
}

wxLuaHtmlWinTagEvent::wxLuaHtmlWinTagEvent(int eventType) :
    m_pHtmlTag(NULL),
    m_pHtmlParser(NULL),
    m_fParseInnerCalled(false)
{
    SetEventType(eventType);    
}

wxLuaHtmlWinTagEvent::~wxLuaHtmlWinTagEvent()
{
}

void wxLuaHtmlWinTagEvent::SetTagInfo(const wxHtmlTag *pHtmlTag, 
                                      wxHtmlWinParser *pParser)
{
    m_pHtmlTag    = pHtmlTag;
    m_pHtmlParser = pParser;
}

wxEvent* wxLuaHtmlWinTagEvent::Clone() const
{
    wxLuaHtmlWinTagEvent *pEvent = new wxLuaHtmlWinTagEvent(GetEventType());
    if (pEvent != NULL)
    {
        pEvent->m_pHtmlTag          = m_pHtmlTag;
        pEvent->m_pHtmlParser       = m_pHtmlParser;
        pEvent->m_fParseInnerCalled = m_fParseInnerCalled;
    }
    return pEvent;
}

const wxHtmlTag *wxLuaHtmlWinTagEvent::GetHtmlTag() const
{
    return m_pHtmlTag;
}

wxHtmlWinParser *wxLuaHtmlWinTagEvent::GetHtmlParser() const
{
    return m_pHtmlParser;
}

bool wxLuaHtmlWinTagEvent::GetParseInnerCalled() const
{
    return m_fParseInnerCalled;
}

void wxLuaHtmlWinTagEvent::SetParseInnerCalled(bool fParseInnerCalled)
{
    m_fParseInnerCalled = fParseInnerCalled;
}

--- NEW FILE: printing.h ---
/////////////////////////////////////////////////////////////////////////////
// Purpose:     A wrapper around wxPrintout for wxLua
// Author:      J. Winwood
// Created:     July 2002
// Copyright:   (c) 2002 Lomtick Software. All rights reserved.
// Licence:     wxWidgets licence
/////////////////////////////////////////////////////////////////////////////

#ifndef WX_LUA_PRINTING_H
#define WX_LUA_PRINTING_H

//#if defined(__GNUG__) && !defined(NO_GCC_PRAGMA)
//    #pragma interface "printing.h"
//#endif

#include "wxlua/include/defs.h"
#include "wx/print.h"

// ----------------------------------------------------------------------------
// wxLuaPrintout
// ----------------------------------------------------------------------------

class wxLuaPrintout : public wxPrintout
{
public:
    wxLuaPrintout(const wxString& title = _("Printout"),
                  wxLuaObject *pObject = NULL);

    void SetPageInfo(int minPage, int maxPage, int pageFrom, int pageTo);
    // overrides
    virtual void GetPageInfo(int *minPage, int *maxPage, int *pageFrom, int *pageTo);
    virtual bool HasPage(int pageNum);
    virtual bool OnBeginDocument(int startPage, int endPage);
    virtual void OnEndDocument();
    virtual void OnBeginPrinting();
    virtual void OnEndPrinting();
    virtual void OnPreparePrinting();
    virtual bool OnPrintPage(int pageNumber);

    wxLuaObject *GetID() const { return m_pObject; }

private:
    wxLuaObject *m_pObject;
    int          m_minPage;
    int          m_maxPage;
    int          m_pageFrom;
    int          m_pageTo;
    DECLARE_CLASS(wxLuaPrintout)
};

#endif //WX_LUA_PRINTING_H

[Wxlua-commit] wxLua/modules/lua Makefile,1.1,1.2 config,1.1,1.2

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

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

Modified Files:
	Makefile config 
Log Message:
still moving files to module and app directory


Index: Makefile
===================================================================
RCS file: /cvsroot/wxlua/wxLua/modules/lua/Makefile,v
retrieving revision 1.1
retrieving revision 1.2
diff -C2 -d -r1.1 -r1.2
*** Makefile	6 Jun 2005 23:06:14 -0000	1.1
--- Makefile	7 Jun 2005 04:17:38 -0000	1.2
***************
*** 14,18 ****
  	cd src/luac; $(MAKE) $@
  	cd src/lua; $(MAKE) $@
- 	cd wxluautil; $(MAKE) $@
  
  # in case they were not created during unpacking
--- 14,17 ----

Index: config
===================================================================
RCS file: /cvsroot/wxlua/wxLua/modules/lua/config,v
retrieving revision 1.1
retrieving revision 1.2
diff -C2 -d -r1.1 -r1.2
*** config	6 Jun 2005 23:06:14 -0000	1.1
--- config	7 Jun 2005 04:17:39 -0000	1.2
***************
*** 167,173 ****
  V=5.0
  
! BIN= $(LUA)/bin
  INC= $(LUA)/include
! LIB= $(LUA)/lib
  
  INCS= -I$(INC) $(EXTRA_INCS)
--- 167,173 ----
  V=5.0
  
! BIN= $(LUA)/../../bin
  INC= $(LUA)/include
! LIB= $(LUA)/../../lib
  
  INCS= -I$(INC) $(EXTRA_INCS)

[Wxlua-commit] wxLua/modules/wxluasocket/src Makefile,NONE,1.1 debugio.cpp,1.1,1.2 dserver.cpp,1.1,1.2 dtarget.cpp,1.1,1.2 socket.cpp,1.1,1.2

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

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

Modified Files:
	debugio.cpp dserver.cpp dtarget.cpp socket.cpp 
Added Files:
	Makefile 
Log Message:
still moving files to module and app directory


Index: dtarget.cpp
===================================================================
RCS file: /cvsroot/wxlua/wxLua/modules/wxluasocket/src/dtarget.cpp,v
retrieving revision 1.1
retrieving revision 1.2
diff -C2 -d -r1.1 -r1.2
*** dtarget.cpp	6 Jun 2005 23:06:20 -0000	1.1
--- dtarget.cpp	7 Jun 2005 04:17:41 -0000	1.2
***************
*** 22,26 ****
  #endif
  
! #include "wxlua/dtarget.h"
  
  static const char *debugName = "__wxLuaDebug__";
--- 22,26 ----
  #endif
  
! #include "wxluasocket/include/dtarget.h"
  
  static const char *debugName = "__wxLuaDebug__";

--- NEW FILE: Makefile ---
# File:		Makefile
# Author:	J Winwood
# Created:	2002
# Updated:	
# Copyright: (c) 2002 Lomtick Software. All rights reserved.
#
# Makefile for wxLua library using gmake

LUADIR = ../../lua

WXDIR      = $(shell wx-config --prefix)
WXBASENAME = $(shell wx-config --basename)
WXLIBBASE  = $(shell wx-config --basename)
WXVERSION  = $(shell wx-config --version)
WXRELEASE  = $(shell wx-config --release)

CXXFLAGS = $(shell wx-config --cxxflags) -MMD -g -Wall
LDLIBS   = $(shell wx-config --libs)
CXX      = $(shell wx-config --cxx) 

APPEXTRADEFS=-I../../ -I$(WXDIR)/contrib/include -fexceptions -DLUACALL= 

LIBVERSION_CURRENT=1
LIBVERSION_REVISION=5
LIBVERSION_AGE=0

TARGET_LIBNAME = lib$(WXLIBBASE)_wxluasocket-$(WXRELEASE)

TARGET_LIB_STATIC = $(WXDIR)/lib/$(TARGET_LIBNAME).a
TARGET_LIB_SHARED = $(WXDIR)/lib/$(TARGET_LIBNAME).so.$(LIBVERSION_CURRENT).$(LIBVERSION_REVISION).$(LIBVERSION_AGE)
TARGET_LIB_LINK1  = $(TARGET_LIBNAME).so.$(LIBVERSION_CURRENT)
TARGET_LIB_LINK2  = $(TARGET_LIBNAME).so

RM        = rm -f
AR        = ar
AROPTIONS = rcu
RANLIB    = ranlib
LN_S      = ln -s

HEADERS = \
	../include/debugio.h \
	../include/dserver.h \
	../include/dtarget.h \
	../include/socket.h

SOURCES = \
	debugio.cpp \
	dserver.cpp \
	dtarget.cpp \
	socket.cpp

OBJECTS=$(SOURCES:.cpp=.o)
DEPFILES=$(OBJECTS:.o=.d)

.cpp.o:
	$(CXX) -c $(CXXFLAGS) $(APPEXTRADEFS)-o $@ $<

all:   $(TARGET_LIB_STATIC) $(TARGET_LIB_SHARED)

$(TARGET_LIB_STATIC) : $(OBJECTS)   
	@$(RM) $@
	$(AR) $(AROPTIONS) $@ $(OBJECTS)
	$(RANLIB) $@

$(TARGET_LIB_SHARED): $(OBJECTS)
	$(CXX) -shared -o $@ $(OBJECTS)
	cd $(WXDIR)/lib \
                && $(RM) $(TARGET_LIB_LINK1) $(TARGET_LIB_LINK2) \
                && $(LN_S) $(TARGET_LIB_SHARED) $(TARGET_LIB_LINK1) \
                && $(LN_S) $(TARGET_LIB_SHARED) $(TARGET_LIB_LINK2)

clean:
	rm -f core $(OBJECTS) $(DEPFILES) \
	      $(TARGET_LIB_STATIC) $(TARGET_LIB_SHARED) \
              $(WXDIR)/lib/$(TARGET_LIB_LINK1) \
              $(WXDIR)/lib/$(TARGET_LIB_LINK2) 

-include $(DEPFILES)

Index: dserver.cpp
===================================================================
RCS file: /cvsroot/wxlua/wxLua/modules/wxluasocket/src/dserver.cpp,v
retrieving revision 1.1
retrieving revision 1.2
diff -C2 -d -r1.1 -r1.2
*** dserver.cpp	6 Jun 2005 23:06:20 -0000	1.1
--- dserver.cpp	7 Jun 2005 04:17:41 -0000	1.2
***************
*** 23,32 ****
  
  #include "wx/thread.h"
! #include "wxlua/internal.h"
! #include "wxlua/library.h"
! #include "wxlua/dserver.h"
  
  #if wxCHECK_VERSION(2, 3, 0)
! #include "wxlua/staktree.h"
  #endif
  
--- 23,32 ----
  
  #include "wx/thread.h"
! #include "wxlua/include/internal.h"
! #include "wxlua/include/library.h"
! #include "wxluasocket/include/dserver.h"
  
  #if wxCHECK_VERSION(2, 3, 0)
! #include "wxluadebug/include/staktree.h"
  #endif
  

Index: socket.cpp
===================================================================
RCS file: /cvsroot/wxlua/wxLua/modules/wxluasocket/src/socket.cpp,v
retrieving revision 1.1
retrieving revision 1.2
diff -C2 -d -r1.1 -r1.2
*** socket.cpp	6 Jun 2005 23:06:20 -0000	1.1
--- socket.cpp	7 Jun 2005 04:17:41 -0000	1.2
***************
*** 22,26 ****
  #endif
  
! #include "wxlua/socket.h"
  
  #ifdef _MSC_VER
--- 22,26 ----
  #endif
  
! #include "wxluasocket/include/socket.h"
  
  #ifdef _MSC_VER

Index: debugio.cpp
===================================================================
RCS file: /cvsroot/wxlua/wxLua/modules/wxluasocket/src/debugio.cpp,v
retrieving revision 1.1
retrieving revision 1.2
diff -C2 -d -r1.1 -r1.2
*** debugio.cpp	6 Jun 2005 23:06:20 -0000	1.1
--- debugio.cpp	7 Jun 2005 04:17:41 -0000	1.2
***************
*** 22,29 ****
  #endif
  
! #include "wxlua/debugio.h"
! #include "wxlua/internal.h"
! #include "wxlua/debug.h"
! #include "wxlua/socket.h"
  
  // ----------------------------------------------------------------------------
--- 22,29 ----
  #endif
  
! #include "wxluasocket/include/debugio.h"
! #include "wxlua/include/internal.h"
! #include "wxluadebug/include/debug.h"
! #include "wxluasocket/include/socket.h"
  
  // ----------------------------------------------------------------------------

[Wxlua-commit] wxLua/modules/wxluasocket/include debugio.h,1.1,1.2 dserver.h,1.1,1.2 dtarget.h,1.1,1.2 socket.h,1.1,1.2

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

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

Modified Files:
	debugio.h dserver.h dtarget.h socket.h 
Log Message:
still moving files to module and app directory


Index: dtarget.h
===================================================================
RCS file: /cvsroot/wxlua/wxLua/modules/wxluasocket/include/dtarget.h,v
retrieving revision 1.1
retrieving revision 1.2
diff -C2 -d -r1.1 -r1.2
*** dtarget.h	6 Jun 2005 23:06:20 -0000	1.1
--- dtarget.h	7 Jun 2005 04:17:40 -0000	1.2
***************
*** 16,27 ****
  
  #include "wx/dynarray.h"
! #include "wxlua/defs.h"
! #include "wxlua/wxlua.h"
! #include "wxlua/internal.h"
! #include "wxlua/library.h"
! #include "wxlua/debug.h"
! #include "wxlua/debugio.h"
! #include "wxlua/socket.h"
! #include "wxlua/staktree.h"
  
  // ----------------------------------------------------------------------------
--- 16,27 ----
  
  #include "wx/dynarray.h"
! #include "wxlua/include/defs.h"
! #include "wxlua/include/wxlua.h"
! #include "wxlua/include/internal.h"
! #include "wxlua/include/library.h"
! #include "wxluadebug/include/debug.h"
! #include "wxluasocket/include/debugio.h"
! #include "wxluasocket/include/socket.h"
! #include "wxluadebug/include/staktree.h"
  
  // ----------------------------------------------------------------------------

Index: dserver.h
===================================================================
RCS file: /cvsroot/wxlua/wxLua/modules/wxluasocket/include/dserver.h,v
retrieving revision 1.1
retrieving revision 1.2
diff -C2 -d -r1.1 -r1.2
*** dserver.h	6 Jun 2005 23:06:20 -0000	1.1
--- dserver.h	7 Jun 2005 04:17:40 -0000	1.2
***************
*** 15,22 ****
  
  #include "wx/process.h"
! #include "wxlua/defs.h"
! #include "wxlua/socket.h"
! #include "wxlua/debug.h"
! #include "wxlua/debugio.h"
  
  class WXDLLIMPEXP_WXLUA wxLuaDebugServer;
--- 15,22 ----
  
  #include "wx/process.h"
! #include "wxlua/include/defs.h"
! #include "wxluasocket/include/socket.h"
! #include "wxluadebug/include/debug.h"
! #include "wxluasocket/include/debugio.h"
  
  class WXDLLIMPEXP_WXLUA wxLuaDebugServer;

Index: debugio.h
===================================================================
RCS file: /cvsroot/wxlua/wxLua/modules/wxluasocket/include/debugio.h,v
retrieving revision 1.1
retrieving revision 1.2
diff -C2 -d -r1.1 -r1.2
*** debugio.h	6 Jun 2005 23:06:20 -0000	1.1
--- debugio.h	7 Jun 2005 04:17:40 -0000	1.2
***************
*** 14,18 ****
  #endif
  
! #include "wxlua/defs.h"
  
  class WXDLLIMPEXP_WXLUA wxLuaDebugData;
--- 14,18 ----
  #endif
  
! #include "wxlua/include/defs.h"
  
  class WXDLLIMPEXP_WXLUA wxLuaDebugData;

Index: socket.h
===================================================================
RCS file: /cvsroot/wxlua/wxLua/modules/wxluasocket/include/socket.h,v
retrieving revision 1.1
retrieving revision 1.2
diff -C2 -d -r1.1 -r1.2
*** socket.h	6 Jun 2005 23:06:20 -0000	1.1
--- socket.h	7 Jun 2005 04:17:40 -0000	1.2
***************
*** 15,19 ****
  #endif
  
! #include "wxlua/defs.h"
  
  #ifdef WIN32
--- 15,19 ----
  #endif
  
! #include "wxlua/include/defs.h"
  
  #ifdef WIN32

[Wxlua-commit] wxLua/modules/wxluadebug/src Makefile,NONE,1.1 debug.cpp,1.1,1.2 splttree.cpp,1.1,1.2 staktree.cpp,1.1,1.2

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

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

Modified Files:
	debug.cpp splttree.cpp staktree.cpp 
Added Files:
	Makefile 
Log Message:
still moving files to module and app directory


Index: splttree.cpp
===================================================================
RCS file: /cvsroot/wxlua/wxLua/modules/wxluadebug/src/splttree.cpp,v
retrieving revision 1.1
retrieving revision 1.2
diff -C2 -d -r1.1 -r1.2
*** splttree.cpp	6 Jun 2005 23:06:19 -0000	1.1
--- splttree.cpp	7 Jun 2005 04:17:40 -0000	1.2
***************
*** 42,46 ****
  #endif
  
! #include "wxlua/splttree.h"
  #include <math.h>
  
--- 42,46 ----
  #endif
  
! #include "wxluadebug/include/splttree.h"
  #include <math.h>
  

--- NEW FILE: Makefile ---
# File:		Makefile
# Author:	J Winwood
# Created:	2002
# Updated:	
# Copyright: (c) 2002 Lomtick Software. All rights reserved.
#
# Makefile for wxLua library using gmake

LUADIR = ../../lua

WXDIR      = $(shell wx-config --prefix)
WXBASENAME = $(shell wx-config --basename)
WXLIBBASE  = $(shell wx-config --basename)
WXVERSION  = $(shell wx-config --version)
WXRELEASE  = $(shell wx-config --release)

CXXFLAGS = $(shell wx-config --cxxflags) -MMD -g -Wall
LDLIBS   = $(shell wx-config --libs)
CXX      = $(shell wx-config --cxx) 

APPEXTRADEFS=-I../../ -I$(WXDIR)/contrib/include -fexceptions -DLUACALL= 

LIBVERSION_CURRENT=1
LIBVERSION_REVISION=5
LIBVERSION_AGE=0

TARGET_LIBNAME = lib$(WXLIBBASE)_wxluadebug-$(WXRELEASE)

TARGET_LIB_STATIC = $(WXDIR)/lib/$(TARGET_LIBNAME).a
TARGET_LIB_SHARED = $(WXDIR)/lib/$(TARGET_LIBNAME).so.$(LIBVERSION_CURRENT).$(LIBVERSION_REVISION).$(LIBVERSION_AGE)
TARGET_LIB_LINK1  = $(TARGET_LIBNAME).so.$(LIBVERSION_CURRENT)
TARGET_LIB_LINK2  = $(TARGET_LIBNAME).so

RM        = rm -f
AR        = ar
AROPTIONS = rcu
RANLIB    = ranlib
LN_S      = ln -s

HEADERS = \
	../include/debug.h \
	../include/splttree.h \
	../include/staktree.h

SOURCES = \
	debug.cpp \
	splttree.cpp \
	staktree.cpp

OBJECTS=$(SOURCES:.cpp=.o)
DEPFILES=$(OBJECTS:.o=.d)

.cpp.o:
	$(CXX) -c $(CXXFLAGS) $(APPEXTRADEFS)-o $@ $<

all:   $(TARGET_LIB_STATIC) $(TARGET_LIB_SHARED)

$(TARGET_LIB_STATIC) : $(OBJECTS)   
	@$(RM) $@
	$(AR) $(AROPTIONS) $@ $(OBJECTS)
	$(RANLIB) $@

$(TARGET_LIB_SHARED): $(OBJECTS)
	$(CXX) -shared -o $@ $(OBJECTS)
	cd $(WXDIR)/lib \
                && $(RM) $(TARGET_LIB_LINK1) $(TARGET_LIB_LINK2) \
                && $(LN_S) $(TARGET_LIB_SHARED) $(TARGET_LIB_LINK1) \
                && $(LN_S) $(TARGET_LIB_SHARED) $(TARGET_LIB_LINK2)

clean:
	rm -f core $(OBJECTS) $(DEPFILES) \
	      $(TARGET_LIB_STATIC) $(TARGET_LIB_SHARED) \
              $(WXDIR)/lib/$(TARGET_LIB_LINK1) \
              $(WXDIR)/lib/$(TARGET_LIB_LINK2) 

-include $(DEPFILES)

Index: staktree.cpp
===================================================================
RCS file: /cvsroot/wxlua/wxLua/modules/wxluadebug/src/staktree.cpp,v
retrieving revision 1.1
retrieving revision 1.2
diff -C2 -d -r1.1 -r1.2
*** staktree.cpp	6 Jun 2005 23:06:19 -0000	1.1
--- staktree.cpp	7 Jun 2005 04:17:40 -0000	1.2
***************
*** 27,40 ****
  
  #include "wx/imaglist.h"
! #include "wxlua/staktree.h"
! #include "wxlua/internal.h"
! #include "wxlua/wxlua.h"
  
! #include "wxlua/debugio.h"
! #include "wxlua/dserver.h"
! #include "wxlua/library.h"
  
  #if defined(__WXGTK__) || defined(__WXMAC__) || defined(__WXMOTIF__)
!     #include "../wxLua.xpm"
  #endif
  
--- 27,40 ----
  
  #include "wx/imaglist.h"
! #include "wxluadebug/include/staktree.h"
! #include "wxlua/include/internal.h"
! #include "wxlua/include/wxlua.h"
  
! #include "wxluasocket/include/debugio.h"
! #include "wxluasocket/include/dserver.h"
! #include "wxlua/include/library.h"
  
  #if defined(__WXGTK__) || defined(__WXMAC__) || defined(__WXMOTIF__)
!     #include "../../../art/wxlua.xpm"
  #endif
  

Index: debug.cpp
===================================================================
RCS file: /cvsroot/wxlua/wxLua/modules/wxluadebug/src/debug.cpp,v
retrieving revision 1.1
retrieving revision 1.2
diff -C2 -d -r1.1 -r1.2
*** debug.cpp	6 Jun 2005 23:06:19 -0000	1.1
--- debug.cpp	7 Jun 2005 04:17:40 -0000	1.2
***************
*** 23,28 ****
  #endif
  
! #include "wxlua/debug.h"
! #include "wxlua/internal.h"
  
  DEFINE_EVENT_TYPE(wxEVT_DEBUG_CLIENT_CONNECTED)
--- 23,28 ----
  #endif
  
! #include "wxluadebug/include/debug.h"
! #include "wxlua/include/internal.h"
  
  DEFINE_EVENT_TYPE(wxEVT_DEBUG_CLIENT_CONNECTED)

[Wxlua-commit] wxLua/src htmlwin.cpp,1.1,NONE printing.cpp,1.1,NONE

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

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

Removed Files:
	htmlwin.cpp printing.cpp 
Log Message:
still moving files to module and app directory


--- printing.cpp DELETED ---

--- htmlwin.cpp DELETED ---

[Wxlua-commit] wxLua/wxlua editor.h,1.1,NONE lconsole.cpp,1.1,NONE lconsole.h,1.1,NONE luasetup.h.in,1.1,NONE wrap.bat,1.1,NONE wrap.lua,1.1,NONE wxLua_wx26.dsp,1.1,NONE wxLua_wx26.dsw,1.1,NONE wxlua.ico,1.1,NONE wxlua.rc,1.1,NONE wxluaapp.cpp,1.1,NONE wxluaapp.h,1.1,NONE

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

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

Removed Files:
	editor.h lconsole.cpp lconsole.h luasetup.h.in wrap.bat 
	wrap.lua wxLua_wx26.dsp wxLua_wx26.dsw wxlua.ico wxlua.rc 
	wxluaapp.cpp wxluaapp.h 
Log Message:
still moving files to module and app directory


--- wxluaapp.cpp DELETED ---

--- wxLua_wx26.dsp DELETED ---

--- editor.h DELETED ---

--- wxluaapp.h DELETED ---

--- luasetup.h.in DELETED ---

--- lconsole.h DELETED ---

--- wxlua.rc DELETED ---

--- wrap.lua DELETED ---

--- wrap.bat DELETED ---

--- lconsole.cpp DELETED ---

--- wxLua_wx26.dsw DELETED ---

--- wxlua.ico DELETED ---

[Wxlua-commit] wxLua/bindings wxluawrap.lua,NONE,1.1

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

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

Added Files:
	wxluawrap.lua 
Log Message:
still moving files to module and app directory


--- NEW FILE: wxluawrap.lua ---
----------------------------------------------------------------------------------
-- Name:        wxLuaWrap.i
-- Purpose:     definition of interface data, functions and classes
-- Author:      J Winwood
-- Created:     3/11/2001
-- Modified by: J Winwood. 21/1/2002
--              Automatic generation of event handler table.
--              Minor modifications for code generation.
-- RCS-ID:      $Id: wxluawrap.lua,v 1.1 2005/06/07 04:17:38 jrl1 Exp $
-- Copyright:
-- Original files for wxBasic (Wrap.bas, others)
--      (c) 2001 David Cuny
-- Conversion to Lua, modification to generate Lua wrappers
-- Modified interface for %override, %define and %includefile etc.
--      (c) 2001-2002 J Winwood
-- Modified interface for lua 5.
--      (c) 2003 J Winwood
-- Licence:     wxWindows licence
----------------------------------------------------------------------------------
[...3186 lines suppressed...]

    for idx, val in pointerList do
        if idx ~= nil and idx ~= "n" and idx ~= "" and val then
            outfile:write("        { 0, (const void **) &",idx,", \"",idx,"\", &",val," },\n")
            count = count + 1
        end
    end
    pointerList = nil

    outfile:write("    };\n")
    outfile:write("    count = ",count,";\n")
    outfile:write("    return objectList;\n")
    outfile:write("};\n")
    io.write()

    print("Generated File: "..fileout)
end


main()

[Wxlua-commit] wxLua/include/wxlua htmlwin.h,1.1,NONE printing.h,1.1,NONE

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

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

Removed Files:
	htmlwin.h printing.h 
Log Message:
still moving files to module and app directory


--- htmlwin.h DELETED ---

--- printing.h DELETED ---

[Wxlua-commit] wxLua/art wxlua.ico,NONE,1.1

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

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

Added Files:
	wxlua.ico 
Log Message:
still moving files to module and app directory


--- NEW FILE: wxlua.ico ---
(This appears to be a binary file; contents omitted.)

[Wxlua-commit] wxLua/modules/lua/include Makefile,NONE,1.1

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

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

Added Files:
	Makefile 
Log Message:
still moving files to module and app directory


--- NEW FILE: Makefile ---
# makefile for Lua distribution (includes)

LUA= ..

include $(LUA)/config

SRCS= lua.h lualib.h lauxlib.h

all:

clean:

co:
	co -q -f -M $(SRCS)

klean:	clean
	rm -f $(SRCS)

[Wxlua-commit] wxLua/apps/wxlua/src Makefile,NONE,1.1 Makefile_import,NONE,1.1 editor.h,NONE,1.1 lconsole.cpp,NONE,1.1 lconsole.h,NONE,1.1 luasetup.h.in,NONE,1.1 wrap.bat,NONE,1.1 wrap.lua,NONE,1.1 wxLua_wx26.dsp,NONE,1.1 wxLua_wx26.dsw,NONE,1.1 wxlua.cpp,NONE,1.1 wxlua.h,NONE,1.1 wxlua.rc,NONE,1.1

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

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

Added Files:
	Makefile Makefile_import editor.h lconsole.cpp lconsole.h 
	luasetup.h.in wrap.bat wrap.lua wxLua_wx26.dsp wxLua_wx26.dsw 
	wxlua.cpp wxlua.h wxlua.rc 
Log Message:
still moving files to module and app directory


--- NEW FILE: wxLua_wx26.dsp ---
# Microsoft Developer Studio Project File - Name="wxLua_wx26" - Package Owner=<4>
# Microsoft Developer Studio Generated Build File, Format Version 6.00
# ** DO NOT EDIT **

# TARGTYPE "Win32 (x86) Application" 0x0101

CFG=wxLua_wx26 - Win32 Debug
!MESSAGE This is not a valid makefile. To build this project using NMAKE,
!MESSAGE use the Export Makefile command and run
!MESSAGE 
!MESSAGE NMAKE /f "wxLua_wx26.mak".
!MESSAGE 
!MESSAGE You can specify a configuration when running NMAKE
!MESSAGE by defining the macro CFG on the command line. For example:
!MESSAGE 
!MESSAGE NMAKE /f "wxLua_wx26.mak" CFG="wxLua_wx26 - Win32 Debug"
!MESSAGE 
!MESSAGE Possible choices for configuration are:
!MESSAGE 
!MESSAGE "wxLua_wx26 - Win32 Release" (based on "Win32 (x86) Application")
!MESSAGE "wxLua_wx26 - Win32 Debug" (based on "Win32 (x86) Application")
!MESSAGE 

# Begin Project
# PROP AllowPerConfigDependencies 0
# PROP Scc_ProjName ""
# PROP Scc_LocalPath ""
CPP=cl.exe
MTL=midl.exe
RSC=rc.exe

!IF  "$(CFG)" == "wxLua_wx26 - Win32 Release"

# PROP BASE Use_MFC 0
# PROP BASE Use_Debug_Libraries 0
# PROP BASE Output_Dir "vc_msw_wx26"
# PROP BASE Intermediate_Dir "vc_msw_wx26"
# PROP BASE Target_Dir ""
# PROP Use_MFC 0
# PROP Use_Debug_Libraries 0
# PROP Output_Dir "vc_msw_wx26"
# PROP Intermediate_Dir "vc_msw_wx26"
# PROP Target_Dir ""
# ADD BASE CPP /nologo /FD /GR /GX /MD /Fdvc_msw_wx26\wxLua_wx26.pdb /O1 /GR /GX /I "$(WXWIN)\include" /I "$(WXWIN)\lib\vc_lib\msw" /W4 /I "." /I "$(WXWIN)\contrib\include" /I "..\include" /I "..\lua\include" /D "WIN32" /D "__WXMSW__" /D "_WINDOWS" /c
# ADD CPP /nologo /FD /GR /GX /MD /Fdvc_msw_wx26\wxLua_wx26.pdb /O1 /GR /GX /I "$(WXWIN)\include" /I "$(WXWIN)\lib\vc_lib\msw" /W4 /I "." /I "$(WXWIN)\contrib\include" /I "..\include" /I "..\lua\include" /D "WIN32" /D "__WXMSW__" /D "_WINDOWS" /c
# ADD BASE MTL /nologo /D "WIN32" /D "__WXMSW__" /D "_WINDOWS" /mktyplib203 /win32
# ADD MTL /nologo /D "WIN32" /D "__WXMSW__" /D "_WINDOWS" /mktyplib203 /win32
# ADD BASE RSC /l 0x405 /d "__WXMSW__" /i "$(WXWIN)\include" /i "$(WXWIN)\lib\vc_lib\msw" /i "." /d "_WINDOWS" 
# ADD RSC /l 0x405 /d "__WXMSW__" /i "$(WXWIN)\include" /i "$(WXWIN)\lib\vc_lib\msw" /i "." /d "_WINDOWS" 
BSC32=bscmake.exe
# ADD BASE BSC32 /nologo
# ADD BSC32 /nologo
LINK32=link.exe
# ADD BASE LINK32 ..\lib\lua50_wx26.lib ..\lib\wxlualib_wx26.lib wxmsw26_stc.lib wxbase26_xml.lib wxmsw26_xrc.lib wxmsw26_html.lib wxmsw26_adv.lib wxbase26_net.lib wxmsw26_core.lib wxbase26.lib wxtiff.lib wxjpeg.lib wxpng.lib wxzlib.lib wxregex.lib wxexpat.lib kernel32.lib user32.lib gdi32.lib comdlg32.lib winspool.lib winmm.lib shell32.lib comctl32.lib odbc32.lib ole32.lib oleaut32.lib uuid.lib rpcrt4.lib advapi32.lib wsock32.lib oleacc.lib /nologo /machine:i386  /out:"vc_msw_wx26\wxLua_wx26.exe" /libpath:"$(WXWIN)\lib\vc_lib" /subsystem:windows
# ADD LINK32 ..\lib\lua50_wx26.lib ..\lib\wxlualib_wx26.lib wxmsw26_stc.lib wxbase26_xml.lib wxmsw26_xrc.lib wxmsw26_html.lib wxmsw26_adv.lib wxbase26_net.lib wxmsw26_core.lib wxbase26.lib wxtiff.lib wxjpeg.lib wxpng.lib wxzlib.lib wxregex.lib wxexpat.lib kernel32.lib user32.lib gdi32.lib comdlg32.lib winspool.lib winmm.lib shell32.lib comctl32.lib odbc32.lib ole32.lib oleaut32.lib uuid.lib rpcrt4.lib advapi32.lib wsock32.lib oleacc.lib /nologo /machine:i386  /out:"vc_msw_wx26\wxLua_wx26.exe" /libpath:"$(WXWIN)\lib\vc_lib" /subsystem:windows

!ELSEIF  "$(CFG)" == "wxLua_wx26 - Win32 Debug"

# PROP BASE Use_MFC 0
# PROP BASE Use_Debug_Libraries 1
# PROP BASE Output_Dir "vc_mswd_wx26"
# PROP BASE Intermediate_Dir "vc_mswd_wx26"
# PROP BASE Target_Dir ""
# PROP Use_MFC 0
# PROP Use_Debug_Libraries 1
# PROP Output_Dir "vc_mswd_wx26"
# PROP Intermediate_Dir "vc_mswd_wx26"
# PROP Target_Dir ""
# ADD BASE CPP /nologo /FD /GR /GX /MDd /Zi /Gm /GZ /Fdvc_mswd_wx26\wxLua_wx26.pdb /Od /GR /GX /I "$(WXWIN)\include" /I "$(WXWIN)\lib\vc_lib\mswd" /W4 /I "." /I "$(WXWIN)\contrib\include" /I "..\include" /I "..\lua\include" /D "WIN32" /D "_DEBUG" /D "__WXMSW__" /D "__WXDEBUG__" /D "_WINDOWS" /c 
# ADD CPP /nologo /FD /GR /GX /MDd /Zi /Gm /GZ /Fdvc_mswd_wx26\wxLua_wx26.pdb /Od /GR /GX /I "$(WXWIN)\include" /I "$(WXWIN)\lib\vc_lib\mswd" /W4 /I "." /I "$(WXWIN)\contrib\include" /I "..\include" /I "..\lua\include" /D "WIN32" /D "_DEBUG" /D "__WXMSW__" /D "__WXDEBUG__" /D "_WINDOWS" /c
# ADD BASE MTL /nologo /D "WIN32" /D "_DEBUG" /D "__WXMSW__" /D "__WXDEBUG__" /D "_WINDOWS" /mktyplib203 /win32
# ADD MTL /nologo /D "WIN32" /D "_DEBUG" /D "__WXMSW__" /D "__WXDEBUG__" /D "_WINDOWS" /mktyplib203 /win32
# ADD BASE RSC /l 0x405 /d "_DEBUG" /d "__WXMSW__" /d "__WXDEBUG__" /i "$(WXWIN)\include" /i "$(WXWIN)\lib\vc_lib\mswd" /i "." /d "_WINDOWS" 
# ADD RSC /l 0x405 /d "_DEBUG" /d "__WXMSW__" /d "__WXDEBUG__" /i "$(WXWIN)\include" /i "$(WXWIN)\lib\vc_lib\mswd" /i "." /d "_WINDOWS" 
BSC32=bscmake.exe
# ADD BASE BSC32 /nologo
# ADD BSC32 /nologo
LINK32=link.exe
# ADD BASE LINK32 ..\lib\lua50d_wx26.lib ..\lib\wxlualibd_wx26.lib wxmsw26d_stc.lib wxbase26d_xml.lib wxmsw26d_xrc.lib wxmsw26d_html.lib wxmsw26d_adv.lib wxbase26d_net.lib wxmsw26d_core.lib wxbase26d.lib wxtiffd.lib wxjpegd.lib wxpngd.lib wxzlibd.lib wxregexd.lib wxexpatd.lib kernel32.lib user32.lib gdi32.lib comdlg32.lib winspool.lib winmm.lib shell32.lib comctl32.lib odbc32.lib ole32.lib oleaut32.lib uuid.lib rpcrt4.lib advapi32.lib wsock32.lib oleacc.lib /nologo /machine:i386  /out:"vc_mswd_wx26\wxLua_wx26.exe" /debug /libpath:"$(WXWIN)\lib\vc_lib" /subsystem:windows
# ADD LINK32 ..\lib\lua50d_wx26.lib ..\lib\wxlualibd_wx26.lib wxmsw26d_stc.lib wxbase26d_xml.lib wxmsw26d_xrc.lib wxmsw26d_html.lib wxmsw26d_adv.lib wxbase26d_net.lib wxmsw26d_core.lib wxbase26d.lib wxtiffd.lib wxjpegd.lib wxpngd.lib wxzlibd.lib wxregexd.lib wxexpatd.lib kernel32.lib user32.lib gdi32.lib comdlg32.lib winspool.lib winmm.lib shell32.lib comctl32.lib odbc32.lib ole32.lib oleaut32.lib uuid.lib rpcrt4.lib advapi32.lib wsock32.lib oleacc.lib /nologo /machine:i386  /out:"vc_mswd_wx26\wxLua_wx26.exe" /debug /libpath:"$(WXWIN)\lib\vc_lib" /subsystem:windows



!ENDIF

# Begin Target

# Name "wxLua_wx26 - Win32 Release"
# Name "wxLua_wx26 - Win32 Debug"
# PROP Default_Filter ""
# Begin Source File

SOURCE=.\wxLua.ico
# End Source File
# Begin Source File

SOURCE=..\import\override.hpp
# End Source File
# Begin Source File

SOURCE=..\import\wxLuaWrap.i

!IF  "$(CFG)" == "wxLua_wx26 - Win32 Release"

USERDEP__WXLUA="..\import\override.hpp"        
# Begin Custom Build - Generating Binding

"wxLuaWrap.cpp" : $(SOURCE) "$(INTDIR)" "$(OUTDIR)"
        echo Building wrapper file wxLuaWrap.cpp
	wrap.bat
        
# End Custom Build

!ELSEIF  "$(CFG)" == "wxLua_wx26 - Win32 Debug"

USERDEP__WXLUA="..\import\override.hpp"        
# Begin Custom Build - Generating Binding

"wxLuaWrap.cpp" : $(SOURCE) "$(INTDIR)" "$(OUTDIR)"
        echo Building wrapper file wxLuaWrap.cpp
	wrap.bat
        
# End Custom Build

!ENDIF 

# End Source File
# Begin Source File

SOURCE=.\wxLuaWrap.cpp
# End Source File
# Begin Source File

SOURCE=.\wxlua.rc
# End Source File
# Begin Source File

SOURCE=.\wxluaapp.cpp
# End Source File
# Begin Source File

SOURCE=.\wxluaapp.h
# End Source File
# Begin Source File

SOURCE=.\lconsole.cpp
# End Source File
# Begin Source File

SOURCE=.\lconsole.h
# End Source File
# End Target
# End Project

--- NEW FILE: editor.h ---
/* Editor.wx.luc */
static const unsigned char wxLuaEditor[]={
 27, 76,117, 97, 80,  1,  4,  4,  4,  6,  8,  9,  9,  8,182,  9,147,104,231,245,
125, 65,  8,  0,  0,  0, 61, 40,110,111,110,101, 41,  0,  0,  0,  0,  0,  0,  0,
  0, 53,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0, 18,  1,  0,  0,  4,  3,
  0,  0,  0,119,120,  0,  4, 13,  0,  0,  0,119,120, 73, 68, 95, 72, 73, 71, 72,
 69, 83, 84,  0,  3,  0,  0,  0,  0,  0,  0,240, 63,  3,  0,  0,  0,  0,  0,  0,
  0, 64,  3,  0,  0,  0,  0,  0,  0,  8, 64,  3,  0,  0,  0,  0,  0,  0, 16, 64,
  3,  0,  0,  0,  0,  0,  0, 20, 64,  3,  0,  0,  0,  0,  0,  0, 24, 64,  3,  0,
  0,  0,  0,  0,  0, 28, 64,  3,  0,  0,  0,  0,  0,  0, 32, 64,  3,  0,  0,  0,
  0,  0,  0, 34, 64,  3,  0,  0,  0,  0,  0,  0, 36, 64,  3,  0,  0,  0,  0,  0,
  0, 38, 64,  3,  0,  0,  0,  0,  0,  0, 40, 64,  3,  0,  0,  0,  0,  0,  0, 42,
 64,  3,  0,  0,  0,  0,  0,  0, 44, 64,  3,  0,  0,  0,  0,  0,  0, 46, 64,  3,
  0,  0,  0,  0,  0,  0, 48, 64,  3,  0,  0,  0,  0,  0,  0, 49, 64,  3,  0,  0,
  0,  0,  0,  0, 50, 64,  3,  0,  0,  0,  0,  0,  0, 51, 64,  3,  0,  0,  0,  0,
  0,  0, 52, 64,  3,  0,  0,  0,  0,  0,  0, 53, 64,  3,  0,  0,  0,  0,  0,  0,
 54, 64,  3,  0,  0,  0,  0,  0,  0, 55, 64,  3,  0,  0,  0,  0,  0,  0, 56, 64,
  3,  0,  0,  0,  0,  0,  0, 57, 64,  3,  0,  0,  0,  0,  0,  0, 58, 64,  3,  0,
  0,  0,  0,  0,  0, 59, 64,  3,  0,  0,  0,  0,  0,  0, 89, 64,  4, 12,  0,  0,
[...2543 lines suppressed...]
  0, 32,197, 11,  0, 32,203, 92, 16, 32,  5,  0,  0, 34, 70, 88, 17, 34,  5,  0,
  0, 35,198,229, 17, 35,133, 64,  0, 36, 89,128,  2, 32,197, 11,  0, 32, 75,127,
 16, 32, 10,  0,  2, 34,129, 12,  0, 35,  1, 65,  0, 36,  1, 65,  0, 37, 65, 65,
  0, 38,223,  0,  0, 34, 89,128,  1, 32,197, 11,  0, 32,129, 65,  0, 34,139,  8,
 16, 32,193, 65,  0, 34, 89,128,  1, 32,197, 11,  0, 32,  1, 66,  0, 34,139,  8,
 16, 32,133, 33,  0, 34, 89,128,  1, 32,  5, 27,  0, 32,197, 11,  0, 33, 65, 66,
  0, 34, 89,128,  1, 32,197, 11,  0, 32,129, 66,  0, 34,139,  8, 16, 32,  5,  0,
  0, 34,193, 66,  0, 35,198,  8, 17, 34, 89,128,  1, 32,  5, 33,  0, 32, 24,  0,
 16, 32, 84, 10,128,  0,  3,  0, 16, 32,  5, 33,  0, 33,  1, 67,  0, 34,134,136,
 16, 33,135,  7,  0, 33,  5, 33,  0, 33,  3,  0, 18, 34,158,  5,128, 33, 65, 67,
  0, 37, 85,137, 17,  1,212,  1,128,  0,  1, 67,  0, 37, 85,137, 17,  1, 20,  1,
128,  0,197, 39,  0, 37,  0,  0, 18, 38,  0,  0, 18, 39, 89,128,  1, 37,129,  0,
  0, 32,133, 10,  0, 37,129, 67,  0, 39,203,137, 18, 37,153,  0,  1, 37,  1, 67,
  0, 38, 86,  9, 19,  0, 20,  1,128,  0,133, 10,  0, 37,193, 67,  0, 39,203,137,
 18, 37,  1, 67,  0, 39, 89,128,  1, 37, 93,  0,  0, 33,148,249,127,  0, 88,  0,
 16, 32,148,  1,128,  0, 69, 32,  0, 33, 65, 33,  0, 34,153,  0,  1, 33,197, 32,
  0, 34,  0,128, 16, 35,129,  0,  0, 36, 89,128,  1, 34,197, 11,  0, 32,  1, 68,
  0, 34,139,  8, 16, 32, 69, 68,  0, 34, 89,128,  1, 32, 27,128,  0,  0,
};


--- NEW FILE: luasetup.h.in ---
// Automatically generated by utils/get_luasetup edit as necessary.

#ifndef __WXLUA_SETUP__
#define __WXLUA_SETUP__

#define wxLUA_USE_FL                            0
#define wxLUA_USE_Geometry                      1
#define wxLUA_USE_MDI                           1
#define wxLUA_USE_wxAcceleratorTable            1
#define wxLUA_USE_wxApp                         1
#define wxLUA_USE_wxArrayInt                    1
#define wxLUA_USE_wxArrayString                 1
#define wxLUA_USE_wxBitmap                      1
#define wxLUA_USE_wxBitmapButton                1
#define wxLUA_USE_wxBrushList                   1
#define wxLUA_USE_wxButton                      1
#define wxLUA_USE_wxCalendarCtrl                1
#define wxLUA_USE_wxCaret                       1
#define wxLUA_USE_wxCheckBox                    1
#define wxLUA_USE_wxCheckListBox                1
#define wxLUA_USE_wxChoice                      1
#define wxLUA_USE_wxClassInfo                   1
#define wxLUA_USE_wxClipboard                   1
#define wxLUA_USE_wxColourDialog                1
#define wxLUA_USE_wxColourPenBrush              1
#define wxLUA_USE_wxComboBox                    1
#define wxLUA_USE_wxCommandProcessor            1
#define wxLUA_USE_wxConfig                      1
#define wxLUA_USE_wxCursor                      1
#define wxLUA_USE_wxDataObject                  1
#define wxLUA_USE_wxDateSpan                    1
#define wxLUA_USE_wxDateTime                    1
#define wxLUA_USE_wxDC                          1
#define wxLUA_USE_wxDialog                      1
#define wxLUA_USE_wxDir                         1
#define wxLUA_USE_wxDirDialog                   1
#define wxLUA_USE_wxDragDrop                    1
#define wxLUA_USE_wxFile                        1
#define wxLUA_USE_wxFileDialog                  1
#define wxLUA_USE_wxFileHistory                 1
#define wxLUA_USE_wxFileName                    1
#define wxLUA_USE_wxFindReplaceDialog           1
#define wxLUA_USE_wxFont                        1
#define wxLUA_USE_wxFontDialog                  1
#define wxLUA_USE_wxFontEnumerator              1
#define wxLUA_USE_wxFontList                    1
#define wxLUA_USE_wxFontMapper                  1
#define wxLUA_USE_wxFrame                       1
#define wxLUA_USE_wxGauge                       1
#define wxLUA_USE_wxGenericValidator            1
#define wxLUA_USE_wxGrid                        1
#define wxLUA_USE_wxHashTable                   1
#define wxLUA_USE_wxHelpController              1
#define wxLUA_USE_wxHTML                        1
#define wxLUA_USE_wxHtmlHelpController          1
#define wxLUA_USE_wxIcon                        1
#define wxLUA_USE_wxID_XXX                      1
#define wxLUA_USE_wxImage                       1
#define wxLUA_USE_wxImageList                   1
#define wxLUA_USE_wxLayoutConstraints           1
#define wxLUA_USE_wxList                        1
#define wxLUA_USE_wxListBox                     1
#define wxLUA_USE_wxListCtrl                    1
#define wxLUA_USE_wxLuaApp                      1
#define wxLUA_USE_wxLuaDebugServer              1
#define wxLUA_USE_wxLuaHtmlWindow               1
#define wxLUA_USE_wxLuaPrintout                 1
#define wxLUA_USE_wxMask                        1
#define wxLUA_USE_wxMenu                        1
#define wxLUA_USE_wxMessageDialog               1
#define wxLUA_USE_wxMetafile                    1
#define wxLUA_USE_wxMiniFrame                   1
#define wxLUA_USE_wxNotebook                    1
#define wxLUA_USE_wxObject                      1
#define wxLUA_USE_wxPalette                     1
#define wxLUA_USE_wxPenList                     1
#define wxLUA_USE_wxPointSizeRect               1
#define wxLUA_USE_wxPrint                       1
#define wxLUA_USE_wxProgressDialog              1
#define wxLUA_USE_wxRadioBox                    1
#define wxLUA_USE_wxRadioButton                 1
#define wxLUA_USE_wxRegEx                       1
#define wxLUA_USE_wxRegion                      1
#define wxLUA_USE_wxSashWindow                  1
#define wxLUA_USE_wxScrollBar                   1
#define wxLUA_USE_wxScrolledWindow              1
#define wxLUA_USE_wxSingleChoiceDialog          1
#define wxLUA_USE_wxSizer                       1
#define wxLUA_USE_wxSlider                      1
#define wxLUA_USE_wxSocket                      1
#define wxLUA_USE_wxSpinButton                  1
#define wxLUA_USE_wxSpinCtrl                    1
#define wxLUA_USE_wxSplitterWindow              1
#define wxLUA_USE_wxStaticBitmap                1
#define wxLUA_USE_wxStaticBox                   1
#define wxLUA_USE_wxStaticLine                  1
#define wxLUA_USE_wxStaticText                  1
#define wxLUA_USE_wxStatusBar                   1
#define wxLUA_USE_wxStringList                  1
#define wxLUA_USE_wxStyledTextCtrl              1
#define wxLUA_USE_wxSystemSettings              1
#define wxLUA_USE_wxTabCtrl                     1
#define wxLUA_USE_wxTaskBarIcon                 1
#define wxLUA_USE_wxTextCtrl                    1
#define wxLUA_USE_wxTextEntryDialog             1
#define wxLUA_USE_wxTextValidator               1
#define wxLUA_USE_wxTimer                       1
#define wxLUA_USE_wxTimeSpan                    1
#define wxLUA_USE_wxToolbar                     1
#define wxLUA_USE_wxTooltip                     1
#define wxLUA_USE_wxTreeCtrl                    1
#define wxLUA_USE_wxValidator                   1
#define wxLUA_USE_wxWave                        1
#define wxLUA_USE_wxWindowList                  1
#define wxLUA_USE_wxWizard                      1
#define wxLUA_USE_wxXMLResource                 1

#endif // __WXLUA_SETUP__

--- NEW FILE: lconsole.h ---
/////////////////////////////////////////////////////////////////////////////
// Purpose:     Interface to a console to help debug wxLua
// Author:      Francis Irving
// Created:     16/01/2002
// Copyright:   (c) 2002 Creature Labs. All rights reserved.
// Licence:     wxWindows licence
/////////////////////////////////////////////////////////////////////////////

#ifndef WX_LUA_CONSOLE_H
#define WX_LUA_CONSOLE_H

#if defined(__GNUG__) && !defined(NO_GCC_PRAGMA)
    #pragma interface "lconsole.h"
#endif

class wxLuaStandaloneApp;
#include "wxlua/include/wxlua.h"

class wxDebugPanel : public wxPanel
{
public:
    wxDebugPanel(wxWindow *parent, lua_State *pState);

    void FillListbox();

private:
    lua_State    *m_pState;
    wxListBox    *m_listBox;

    DECLARE_EVENT_TABLE()

    void OnSizeWindow(wxSizeEvent& event);
    void OnEraseBackground(wxEraseEvent& event);
};

// define our console class
class wxLuaConsole : public wxFrame
{
public:
    wxLuaConsole(wxLuaStandaloneApp *pApp, lua_State *pState);
    void DisplayText(wxString msg, bool fError = false);

private:
    DECLARE_EVENT_TABLE()

    void OnCloseWindow(wxCloseEvent& event);
    void OnEraseBackground(wxEraseEvent& event);
    void FillListbox();

    wxSplitterWindow   *m_splitter;
    wxTextCtrl         *m_textCtrl;
    wxLuaStandaloneApp *m_pApp;
    wxDebugPanel       *m_panel;
    bool                m_fError;
};

#endif

--- NEW FILE: Makefile ---
# File:		Makefile
# Author:	John Labenski, J Winwood
# Created:	2004
# Updated:
# Copyright: (c) 2002. J Winwood
#
# Makefile for wxLua standalone sample using gmake

LUADIR = ../../../modules/lua
WXDIR = $(shell wx-config --prefix)
WXLIBDIR = $(WXDIR)/lib

WXBASENAME = $(shell wx-config --basename)
WXLIBBASE  = $(shell wx-config --basename)
WXVERSION  = $(shell wx-config --version)
WXRELEASE  = $(shell wx-config --release)

CXXFLAGS = $(shell wx-config --cxxflags) -MMD -g
LDLIBS   = $(shell wx-config --libs)
CXX      = $(shell wx-config --cxx) 

PROGRAM = wxLua

LUA_LIBS  = ../../../lib/liblua.a ../../../lib/liblualib.a 
WXLUA_LIB = $(WXLIBBASE)_wxlua-$(WXRELEASE)
WXLUADEBUG_LIB = $(WXLIBBASE)_wxluadebug-$(WXRELEASE)
WXLUASOCKET_LIB = $(WXLIBBASE)_wxluasocket-$(WXRELEASE)
WXSTC_LIB = $(WXLIBBASE)_stc-$(WXRELEASE)
WXXRC_LIB = $(WXLIBBASE)_xrc-$(WXRELEASE)
WXFL_LIB  = $(WXLIBBASE)_fl-$(WXRELEASE)

APPEXTRADEFS=-I../../../modules -I$(WXDIR)/contrib/include -fexceptions -DLUACALL=

# This will build a static wxLua app, staticly linked to .a libs
#APPEXTRALIBS=-L$(WXLIBDIR) $(WXLIBDIR)/lib$(WXLUA_LIB).a $(WXLIBDIR)/lib$(STC_LIB).a $(WXLIBDIR)/lib$(WXXRC_LIB).a $(WXLIBDIR)/lib$(WXFL_LIB).a $(LUA_LIBS)

# This will build a shared wxLua app, dynamicly linked to .so libs
#  -l$(WXFL_LIB)
APPEXTRALIBS=-L$(WXLIBDIR) -l$(WXLUA_LIB) -l$(WXLUADEBUG_LIB) -l$(WXLUASOCKET_LIB) -l$(WXSTC_LIB) -l$(WXXRC_LIB) $(LUA_LIBS)

OBJECTS=wxlua.o wxluawrap.o

DEPFILES=$(OBJECTS:.o=.d)

.cpp.o:
	$(CXX) -c $(CXXFLAGS) $(APPEXTRADEFS) -o $@ $<

all: wxLuaLib wxLuaDebugLib wxLuaSocketLib luawrappers $(PROGRAM)  

$(PROGRAM): $(OBJECTS) $(LUA_LIBS)
	$(CXX) -o $@ $(OBJECTS) $(LDLIBS) $(APPEXTRALIBS) 

lua:
	@(cd $(LUADIR) && make)

luawrappers:
	make -f Makefile_import

wxLuaLib:
	@(cd ../../../modules/wxlua/src && make)

wxLuaDebugLib:
	@(cd ../../../modules/wxluadebug/src && make)

wxLuaSocketLib:
	@(cd ../../../modules/wxluasocket/src && make)

clean:
	rm -f $(OBJECTS) $(DEPFILES) $(PROGRAM) core

cleanall:
	rm -f $(OBJECTS) $(DEPFILES) $(PROGRAM) core
	make -f Makefile_import clean
	@(cd ../../../modules/wxlua/src && make clean)
	@(cd ../../../modules/wxluadebug/src && make clean)
	@(cd ../../../modules/wxluasocket/src && make clean)


-include $(DEPFILES)

--- NEW FILE: Makefile_import ---
#
# File:		makefile.unx
# Author:	J Winwood
# Created:	2002
# Updated:	
# Copyright: (c) 2002. J Winwood
#
#
# Makefile for wxLua library, Unix

WXLUA = ../../..
LUA=$(WXLUA)/lua

WXDIR = $(shell wx-config --prefix)
WXCXXFLAGS =  $(shell wx-config --cxxflags)

include $(WXLUA)/bindings/wxwidgets/wrappers.lst

THEWRAPPERS=$(addprefix $(WXLUA)/bindings/wxwidgets/, $(WRAPPERS))

all: wxluawrap.cpp

DEPFILES = wrap.lua luasetup.h.in $(WXLUA)/bindings/wxluawrap.lua $(WXLUA)/bindings/wxwidgets/override.hpp $(THEWRAPPERS)

wxluawrap.cpp: $(DEPFILES)
	$(WXLUA)/bin/lua -e"target=\"gtk\"; wxWinDir=\"$(WXDIR)\"; wxCxxFlags=\"$(WXCXXFLAGS)\"" wrap.lua

clean:
	rm -f wxluawrap.cpp 
	


--- NEW FILE: wxlua.rc ---
/////////////////////////////////////////////////////////////////////////////
// Purpose:     Resources for wxLuaStandalone
// Author:      J Winwood
// Created:     04/11/2001
// RCS-ID:      $Id: wxlua.rc,v 1.1 2005/06/07 04:17:29 jrl1 Exp $
// Copyright:   (c) 2001-2002 Lomtick Software. All rights reserved.
// Licence:     wxWindows licence
/////////////////////////////////////////////////////////////////////////////

lua   ICON   "wxlua.ico"
//logo  BITMAP "..\examples\bitmaps\wxLua.bmp"

#include "wx/msw/wx.rc"

// 1     24     "wxLua.manifest" // looks horrible!
--- NEW FILE: wxlua.cpp ---
/////////////////////////////////////////////////////////////////////////////
// Purpose:     Standalone wxLua application
// Author:      Francis Irving
// Created:     16/01/2002
// Modifications: J. Winwood. Bug fixes to original wxLua code.
// RCS-ID:      $Id: wxlua.cpp,v 1.1 2005/06/07 04:17:29 jrl1 Exp $
// Copyright:   (c) 2002 Creature Labs. All rights reserved.
// Copyright:   (c) 2001-2002 Lomtick Software. All rights reserved.
// Licence:     wxWindows licence
/////////////////////////////////////////////////////////////////////////////

#if defined(__GNUG__) && !defined(NO_GCC_PRAGMA)
    #pragma implementation "wxlua.h"
#endif

#include "wx/wxprec.h"

#ifdef __BORLANDC__
    #pragma hdrstop
#endif

#ifndef WX_PRECOMP
    #include "wx/wx.h"
#endif

#include "wx/splitter.h"
#include "wx/cmdline.h"
#include "wx/fs_mem.h"
#include "wx/image.h"
#include "wxlua/include/wxlua.h"
#include "wxlua.h"

#if wxCHECK_VERSION(2, 3, 0)
    #include "wxluadebug/include/splttree.h"
    #include "wxluadebug/include/staktree.h"
#endif

extern "C"
{
    #include "lua/include/lualib.h"
}

extern wxString g_strProgramName;
extern wxString g_strNetworkName;

// ---------------------------------------------------------------------------
// LuaHandler - routes commands from the wxLuaHandler to the app
// ---------------------------------------------------------------------------

class LuaHandler : public wxLuaHandler
{
public:
    LuaHandler(wxLuaStandaloneApp *app) : m_app(app) {}

    virtual void AddPendingEvent(wxEvent& event) { m_app->AddPendingEvent(event); }
    virtual bool ProcessEvent(wxEvent& event) { return m_app->ProcessEvent(event); }
    virtual void SetStackFrame(wxLuaStackFrame *pStackFrame) { m_app->SetStackFrame(pStackFrame); }
    virtual void DisplayError(const wxString &strError) const { m_app->DisplayError(strError); }

public:
    static wxLuaHandler* sm_luahandler;
    wxLuaStandaloneApp *m_app;
};

// ---------------------------------------------------------------------------
// wxLuaException - exception handler for linux
// ---------------------------------------------------------------------------

#ifndef __WXMSW__
class wxLuaException
{
public:
    // constructors
    wxLuaException(int nReturnCode) :
    m_nReturnCode(nReturnCode)
    {
    }

    wxLuaException(const wxLuaException &e) :
    m_nReturnCode(e.m_nReturnCode)
    {
    }

private:
    wxLuaException& operator=(const wxLuaException& e);

private:
    int m_nReturnCode;
};
#endif // __WXMSW__

// ---------------------------------------------------------------------------
// wxLuaStandaloneApp
// ---------------------------------------------------------------------------

IMPLEMENT_APP(wxLuaStandaloneApp)

BEGIN_EVENT_TABLE(wxLuaStandaloneApp, wxApp)
    EVT_LUA_CONSOLE     (-1, wxLuaStandaloneApp::OnLua)
    EVT_LUA_WARNING     (-1, wxLuaStandaloneApp::OnLua)
    EVT_LUA_ERROR       (-1, wxLuaStandaloneApp::OnLua)
    EVT_LUA_DEBUG_HOOK  (-1, wxLuaStandaloneApp::OnLua)
    EVT_LUA_SHUTDOWN    (-1, wxLuaStandaloneApp::OnLua)
    EVT_DEBUG_STACK_ENUM(wxLuaStandaloneApp::OnDebugStackEnum)
    EVT_DEBUG_STACK_ENTRY_ENUM(wxLuaStandaloneApp::OnDebugStackEntryEnum)
    EVT_DEBUG_TABLE_ENUM(wxLuaStandaloneApp::OnDebugTableEnum)
END_EVENT_TABLE()

bool wxLuaStandaloneApp::OnInit()
{
    wxString errorStr;
    int      argCount = 0;
    bool     fOk      = false;
    m_pStackFrame = NULL;

#if defined(__WXMSW__) && wxCHECK_VERSION(2, 3, 3)
    WSADATA wsaData;
    WORD wVersionRequested = MAKEWORD(1, 1);
    WSAStartup(wVersionRequested, &wsaData);
#endif

    g_strProgramName = argv[0];
    g_strNetworkName = wxGetHostName();

    m_fMemoryBitmapAdded = false;
#if wxCHECK_VERSION(2, 3, 0)
    m_pDebugTarget = NULL;
#endif
#ifdef __WXMSW__
    m_pConsole = NULL;
#endif

    // Initialize lua
    m_luaInterpreter = new wxLuaInterpreter(this, -1);
    m_luaState = m_luaInterpreter->GetLuaState();
    m_luaHandler = new LuaHandler(this);

    if (m_luaInterpreter->Ok())
    {
        RegisterClasses(m_luaState);

        if (argc == 1)
        {
            CreateSimpleArgs();
            int rc = RunEditor();

            fOk = wxLuaCheckRunError(rc, &errorStr);
            if (!fOk)
                DisplayError(errorStr);
        }
        else
        // If there is only one command line argument
#if wxCHECK_VERSION(2, 3, 0) || defined(__WXMSW__)
        if (argc == 2 && *argv[1] == wxT('-'))
        {
#if wxCHECK_VERSION(2, 3, 0)
            // Check if we are launched as a debuggee
            if (wxStrlen(argv[1]) > 2 && argv[1][1] == wxT('d'))
            {
                // Set up for debugging

                wxChar *serverPtr = argv[1] + 2;
                wxChar *portPtr   = wxStrrchr(serverPtr, wxT(':'));

                if (portPtr != NULL)
                {
                    *portPtr = 0;
                    int portNumber = wxAtoi(portPtr + 1);

                    m_pDebugTarget = new LuaDebugTarget(m_luaState,
                                                        serverPtr,
                                                        portNumber);
                    if (m_pDebugTarget != NULL)
                        return m_pDebugTarget->Run();
                }
                return FALSE;
            }
#endif
#ifdef __WXMSW__
            // Check if we are to display the console
            if ((wxStrlen(argv[1]) == 2) && (argv[1][1] == wxT('c')))
            {
                wxLuaConsole *pConsole = new wxLuaConsole(this, m_luaState);
                if (pConsole != NULL)
                    pConsole->Show(TRUE);

                CreateSimpleArgs();
                int rc = RunEditor();

                fOk = wxLuaCheckRunError(rc, &errorStr);
                if (!fOk)
                    DisplayError(errorStr);
            }
            else
#endif
            // See if a file has been specified that we are to edit
            if ((wxStrlen(argv[1]) > 2) && (argv[1][1] == wxT('e')))
            {
                wxString fileName = argv[1] + 2;

                lua_newtable(m_luaState);
                lua_pushstring(m_luaState, wx2lua(fileName));
                lua_rawseti(m_luaState, -2, 1);
                lua_pushstring(m_luaState, wx2lua(g_strProgramName));
                lua_rawseti(m_luaState, -2, 0);
                lua_setglobal(m_luaState, "args");

                int rc = RunEditor();

                fOk = wxLuaCheckRunError(rc, &errorStr);
                if (!fOk)
                    DisplayError(errorStr);
            }
            else
            // Otherwise just run the file
            {
                CreateSimpleArgs();
                if (m_luaInterpreter->RunFile(argv[1]) == 0)
                    fOk = TRUE;
            }
        }
        else
#endif
        // execute the program using argc, argv;
        for (int idx = 1; idx < argc; ++idx)
        {
#ifdef __WXMSW__
            if ((m_pConsole == NULL) && (strlen(argv[idx]) == 2) && (argv[idx][0] == wxT('-')) && (argv[idx][1] == wxT('c')))
            {
                wxLuaConsole *pConsole = new wxLuaConsole(this, m_luaState);
                if (pConsole != NULL)
                    pConsole->Show(TRUE);
            }
            else
#endif
            // See if we are to run the specified file with command-line arguments.
            if (wxStrlen(argv[idx]) > 2 && argv[idx][0] == wxT('-') && argv[idx][1] == wxT('f'))
            {
                wxString fileName = argv[idx] + 2;

                lua_newtable(m_luaState);

                // accumulate the arguments into the 'args' table
                for (++idx; idx < argc; ++idx)
                {
                    lua_pushstring(m_luaState, wx2lua(argv[idx]));
                    lua_rawseti(m_luaState, -2, ++argCount);
                }

                lua_pushstring(m_luaState, wx2lua(fileName));
                lua_rawseti(m_luaState, -2, 0);

                lua_setglobal(m_luaState, "args");

                if (m_luaInterpreter->RunFile(fileName) == 0)
                    fOk = TRUE;

                break;
            }
            else
            // See if a file has been specified that we are to edit
            if (wxStrlen(argv[idx]) > 2 && argv[idx][0] == wxT('-') && argv[idx][1] == wxT('e'))
            {
                wxString fileName = argv[idx] + 2;

                lua_newtable(m_luaState);
                lua_pushstring(m_luaState, wx2lua(fileName));
                lua_rawseti(m_luaState, -2, 1);
                lua_pushstring(m_luaState, wx2lua(g_strProgramName));
                lua_rawseti(m_luaState, -2, 0);
                lua_setglobal(m_luaState, "args");

                int rc = RunEditor();

                fOk = wxLuaCheckRunError(rc, &errorStr);
                if (!fOk)
                    DisplayError(errorStr);

                break;
            }
            else
            {
                CreateSimpleArgs();
                if (m_luaInterpreter->RunFile(argv[idx]) == 0)
                    fOk = TRUE;
            }
        }
    }
#ifdef __WXMSW__
    return (m_pConsole != NULL) || fOk;
#else
    return fOk;
#endif
}

int wxLuaStandaloneApp::OnExit()
{
#if wxCHECK_VERSION(2, 3, 0)
    // If acting as a debuggee, we're done - disconnect from the debugger.
    if (m_pDebugTarget != NULL)
    {
        m_pDebugTarget->Stop();
        delete m_pDebugTarget;
        m_pDebugTarget = NULL;
    }
#endif

    if (m_fMemoryBitmapAdded)
        wxMemoryFSHandler::RemoveFile(wxT("wxLua"));

    delete m_luaInterpreter;
    delete m_luaHandler;
    m_luaState = NULL;

    wxSafeYield();  // make sure windows get destroyed

    wxApp::OnExit();

#if defined(__WXMSW__) && wxCHECK_VERSION(2, 3, 3)
    WSACleanup ();
#endif

    return 0;
}

void wxLuaStandaloneApp::OnLua( wxLuaEvent &event )
{
    if (event.GetEventType() == wxEVT_LUA_CONSOLE)
    {
#ifdef __WXMSW__
        if (m_pConsole != NULL)
            m_pConsole->DisplayText(event.GetString());
        else
            wxMessageBox(event.GetString(), wxT("wxLua"));
#else
        wxPrintf(wxT("%s\n"), event.GetString().c_str());
#endif
    }
    else if (event.GetEventType() == wxEVT_LUA_ERROR)
    {
        DisplayError(event.GetString());
    }
}

int LUACALL wxLuaStackDialog(lua_State *L)
{
#if wxCHECK_VERSION(2, 3, 0)
    wxLuaInterface li(L);
    wxLuaStackFrame *pStackFrame = new wxLuaStackFrame(NULL,
                                                       wxT("Stack frame"),
                                                       wxDefaultPosition,
                                                       wxSize(500, 250),
                                                       &li);
    pStackFrame->ShowModal();
    pStackFrame->Destroy();
#endif
    return 0;
}

void wxLuaStandaloneApp::RegisterClasses(lua_State *L)
{
    lua_pushcfunction(L, wxLuaStackDialog);
    lua_setglobal(L, "wxLuaStackDialog");
}

int  wxLuaStandaloneApp::RunEditor()
{
    #include "editor.h"

    wxFileSystem::AddHandler(new wxMemoryFSHandler);

    wxImage::AddHandler(new wxXPMHandler);
    #include "../art/wxluasmall.xpm"
    wxMemoryFSHandler::AddFile(wxT("wxLua"), wxBitmap(wxLuaSmall_xpm), wxBITMAP_TYPE_XPM);
    m_fMemoryBitmapAdded = true;

    lua_pushcfunction(m_luaState, CreateStandaloneBitmaps);
    lua_setglobal(m_luaState, "standaloneLoadBitmaps");

    return m_luaInterpreter->RunBuffer(wxLuaEditor, sizeof(wxLuaEditor), g_strProgramName);
}

void wxLuaStandaloneApp::DisplayError(const wxString &errorStr) const
{
    if (m_pDebugTarget != NULL)
        m_pDebugTarget->DisplayError(errorStr);
    else
    {
#ifdef __WXMSW__
        if (m_pConsole != NULL)
            m_pConsole->DisplayText(errorStr, true);
        else
            wxMessageBox(errorStr, wxT("wxLua"));
#else
        fprintf(stderr, wx2lua(errorStr));
#endif
    }
}

void wxLuaStandaloneApp::CreateSimpleArgs()
{
    lua_newtable(m_luaState);
    lua_pushstring(m_luaState, wx2lua(g_strProgramName));
    lua_rawseti(m_luaState, -2, 0);
    lua_setglobal(m_luaState, "args");
}

void wxLuaStandaloneApp::OnDebugStackEnum(wxLuaDebugEvent &event)
{
#if wxCHECK_VERSION(2, 3, 0)
    if (m_pStackFrame != NULL)
        m_pStackFrame->FillStackCombobox(event.GetDebugData());
    else
#endif
        event.Skip();
}

void wxLuaStandaloneApp::OnDebugStackEntryEnum(wxLuaDebugEvent &event)
{
#if wxCHECK_VERSION(2, 3, 0)
    if (m_pStackFrame != NULL)
        m_pStackFrame->FillStackEntry(event.GetReference(), event.GetDebugData());
    else
#endif
        event.Skip();
}

void wxLuaStandaloneApp::OnDebugTableEnum(wxLuaDebugEvent &event)
{
#if wxCHECK_VERSION(2, 3, 0)
    if (m_pStackFrame != NULL)
        m_pStackFrame->FillTableEntry(wxTreeItemId((wxTreeItemIdValue)event.GetReference()), event.GetDebugData());
    else
#endif
        event.Skip();
}

--- NEW FILE: wrap.bat ---
if exist ..\..\..\bin\lua.exe goto RELEASE
if exist ..\..\..\bin\luad.exe goto DEBUG

echo You need to compile either a debug or release version of lua.exe.
goto END

:RELEASE
  ..\bin\lua -e"target=\"msw\"" wrap.lua
  echo Creating wrappers release
  goto END

:DEBUG
  ..\bin\luad -e"target=\"msw\"" wrap.lua
  echo Creating wrappers debug
  goto END

:END

--- NEW FILE: wxlua.h ---
/////////////////////////////////////////////////////////////////////////////
// Purpose:     Standalone wxLua application
// Author:      Francis Irving
// Created:     16/01/2002
// Modified:    J. Winwood. Added debugging support
//              May 2002.
// Copyright:   (c) 2002 Creature Labs. All rights reserved.
// Copyright:   (c) 2002 Lomtick Software. All rights reserved.
// Licence:     wxWindows licence
/////////////////////////////////////////////////////////////////////////////

#ifndef WX_LUAAPP_H
#define WX_LUAAPP_H

#if defined(__GNUG__) && !defined(NO_GCC_PRAGMA)
    #pragma interface "wxlua.h"
#endif

#include "wxlua/include/library.h"
#ifdef __WXMSW__
    #include "lconsole.h"
#endif

#if wxCHECK_VERSION(2, 3, 0)
    #include "wxluasocket/include/dtarget.h"
#endif

#include "wx/app.h"

class LuaHandler;

class wxLuaStandaloneApp : public wxApp
{
private:
    wxLuaStackFrame  *m_pStackFrame;
    LuaHandler       *m_luaHandler;
    wxLuaInterpreter *m_luaInterpreter;
    lua_State        *m_luaState;
#ifdef __WXMSW__
    wxLuaConsole     *m_pConsole;
#endif
    bool              m_fMemoryBitmapAdded;
#if wxCHECK_VERSION(2, 3, 0)
    LuaDebugTarget   *m_pDebugTarget;
#endif

    DECLARE_EVENT_TABLE();

public:
// Override the base class virtual functions
    bool OnInit();
    int  OnExit();
    void DisplayError(const wxString &strError) const;

// set the lua console
#ifdef __WXMSW__
    void SetLuaConsole(wxLuaConsole *pConsole) { m_pConsole = pConsole; }
#endif

    void SetStackFrame(wxLuaStackFrame *pStackFrame) { m_pStackFrame = pStackFrame; }
    void OnLua(wxLuaEvent &event);

    static int LUACALL PanicFunction(lua_State * /*L*/);

// register all the classes, methods, etc. in the generated list
    void RegisterClasses(lua_State *L);

    int  RunEditor();

private:
    void CreateSimpleArgs();

    void OnDebugStackEnum(wxLuaDebugEvent &event);
    void OnDebugTableEnum(wxLuaDebugEvent &event);
    void OnDebugStackEntryEnum(wxLuaDebugEvent &event);
};

DECLARE_APP(wxLuaStandaloneApp)

#endif

--- NEW FILE: wrap.lua ---
#! ../../../bin/lua

fVerbose = 1

luasetupFile    = "luasetup.h.in"
luasetupFileOut = "luasetup.h"

inputPaths = { "../../../bindings/wxwidgets/" }
outputFile = "wxluawrap.cpp"

dofile("../../../bindings/wxluawrap.lua")


--- NEW FILE: lconsole.cpp ---
/////////////////////////////////////////////////////////////////////////////
// Purpose:     A console to help debug/use wxLua
// Author:      J Winwood
// Created:     14/11/2001
// Modifications: Enhanced console window functionality
// RCS-ID:      $Id: lconsole.cpp,v 1.1 2005/06/07 04:17:29 jrl1 Exp $
// Copyright:   (c) 2001-2002 Lomtick Software. All rights reserved.
// Licence:     wxWindows licence
/////////////////////////////////////////////////////////////////////////////

#if defined(__GNUG__) && !defined(NO_GCC_PRAGMA)
    #pragma implementation "lconsole.h"
#endif

#include "wx/wxprec.h"
 
#ifdef __BORLANDC__
    #pragma hdrstop
#endif

#ifndef WX_PRECOMP
    #include "wx/wx.h"
#endif

#if defined(__WXGTK__) || defined(__WXMOTIF__)
    #include "../../../art/wxlua.xpm"
#endif

#include "wx/splitter.h"

#include "wxlua/include/wxlua.h"
#include "wxlua.h"
#include "lconsole.h"

BEGIN_EVENT_TABLE(wxDebugPanel, wxPanel)
    EVT_ERASE_BACKGROUND(wxDebugPanel::OnEraseBackground)
    EVT_SIZE(wxDebugPanel::OnSizeWindow)
END_EVENT_TABLE()

wxDebugPanel::wxDebugPanel(wxWindow *parent, lua_State *pState) :
    wxPanel(parent, -1, wxPoint(0, 0), wxSize(50, 1500)),
    m_pState(pState)
{
    m_listBox = new wxListBox( this,
                               -1,
                               wxPoint(0, 20),
                               wxSize(0, 130),
                               0, NULL,
                               wxLB_SINGLE);
}

void wxDebugPanel::OnSizeWindow(wxSizeEvent& event)
{
    wxSize size = event.GetSize();
    m_listBox->SetSize(0, 0, size.x, size.y);
}
 
void wxDebugPanel::FillListbox()
{
    int       nIndex    = 0; 
    lua_Debug luaDebug;
    wxString  buffer;   

    m_listBox->Clear();

    while (lua_getstack(m_pState, nIndex, &luaDebug) != 0)
    {
        buffer.Empty();
        if (lua_getinfo(m_pState, "Sln", &luaDebug))
        {
            int lineNumber = luaDebug.currentline;
            if (lineNumber == -1)
            {
                if (luaDebug.name != NULL)
                    buffer.Printf(wxT("function %s"), 
                                  luaDebug.name);
                else
                    buffer.Printf(wxT("{global}"));
            }
            else
            {
                if (luaDebug.name != NULL)
                    buffer.Printf(wxT("function %s line %u"), 
                                  luaDebug.name,
                                  lineNumber);
                else
                    buffer.Printf(wxT("{global} line %u"), 
                                  lineNumber);
            }

            // skip over ourselves on the stack
            if (nIndex > 0)
                m_listBox->Append(buffer, (void *) nIndex);
        }
        nIndex++;
    }
}

void wxDebugPanel::OnEraseBackground(wxEraseEvent& WXUNUSED(event))
{
}

BEGIN_EVENT_TABLE(wxLuaConsole, wxFrame)
    EVT_CLOSE(wxLuaConsole::OnCloseWindow)
    EVT_ERASE_BACKGROUND(wxLuaConsole::OnEraseBackground)
END_EVENT_TABLE()

wxLuaConsole::wxLuaConsole(wxLuaStandaloneApp *pApp, lua_State *pState) : 
    m_pApp(pApp),
    m_fError(false),
    wxFrame(0, -1, wxT("wxLua Console"), wxPoint(0, 0), wxSize(250, 340))
{
    pApp->SetLuaConsole(this);
    
    SetIcon(wxICON(LUA));

    m_splitter = new wxSplitterWindow(this, 
                                      -1, 
                                      wxPoint(0, 0), 
                                      wxSize(0, 0), 
                                      wxSP_3DSASH);
    m_textCtrl = new wxTextCtrl( m_splitter, 
                                 -1, 
                                 wxT(""), 
                                 wxPoint(0, 0), 
                                 wxSize(0, 0), 
                                 wxTE_MULTILINE | wxTE_READONLY
#ifdef __WXMSW__    
                                        | wxTE_RICH
#endif    
                               );    
    m_panel = new wxDebugPanel( m_splitter, pState);
    m_splitter->SplitHorizontally( m_textCtrl, m_panel, 150);
    m_splitter->SetMinimumPaneSize(50);
}

void wxLuaConsole::OnEraseBackground(wxEraseEvent& WXUNUSED(event))
{
}

void wxLuaConsole::OnCloseWindow(wxCloseEvent&)
{
    m_pApp->SetLuaConsole(NULL);    
    Destroy();
    if (m_fError)
        wxExit();
}

void wxLuaConsole::DisplayText(wxString msg, bool fError)
{
    if (fError)
        m_fError = true;
    msg += wxString(wxT("\n"));
    m_textCtrl->AppendText(msg);
    if (fError)
        m_panel->FillListbox();
}

--- NEW FILE: wxLua_wx26.dsw ---
Microsoft Developer Studio Workspace File, Format Version 6.00
# WARNING: DO NOT EDIT OR DELETE THIS WORKSPACE FILE!

###############################################################################

Project: "lua"=..\lua\src\lua\lua.dsp - Package Owner=<4>

Package=<5>
{{{
}}}

Package=<4>
{{{
}}}

###############################################################################

Project: "lua50_wx26"=..\lua\lua50_wx26.dsp - Package Owner=<4>

Package=<5>
{{{
}}}

Package=<4>
{{{
}}}

###############################################################################

Project: "wxLuaLib_wx26"=..\src\wxLuaLib_wx26.dsp - Package Owner=<4>

Package=<5>
{{{
}}}

Package=<4>
{{{
    Begin Project Dependency
    Project_Dep_Name lua
    End Project Dependency
    Begin Project Dependency
    Project_Dep_Name lua50_wx26
    End Project Dependency
}}}

###############################################################################

Project: "wxLua_wx26"=.\wxLua_wx26.dsp - Package Owner=<4>

Package=<5>
{{{
}}}

Package=<4>
{{{
    Begin Project Dependency
    Project_Dep_Name lua
    End Project Dependency
    Begin Project Dependency
    Project_Dep_Name lua50_wx26
    End Project Dependency
    Begin Project Dependency
    Project_Dep_Name wxLuaLib_wx26
    End Project Dependency
}}}

###############################################################################

Global:

Package=<5>
{{{
}}}

Package=<3>
{{{
}}}

###############################################################################

[Wxlua-commit] wxLua/apps/wxlua/src - New directory

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

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

Log Message:
Directory /cvsroot/wxlua/wxLua/apps/wxlua/src added to the repository

[Wxlua-commit] wxLua/apps/wxlua - New directory

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

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

Log Message:
Directory /cvsroot/wxlua/wxLua/apps/wxlua added to the repository

[Wxlua-commit] wxLua/apps - New directory

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

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

Log Message:
Directory /cvsroot/wxlua/wxLua/apps added to the repository

[Wxlua-commit] wxLua/lib README.txt,1.2,1.3

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

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

Added Files:
	README.txt 
Log Message:
readded README without exe bit set


--- NEW FILE: README.txt ---
The output libraries are created here.

[Wxlua-commit] wxLua/bin README.txt,1.2,1.3

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

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

Added Files:
	README.txt 
Log Message:
readded README without exe bit set


--- NEW FILE: README.txt ---
The output binaries are created here.

[Wxlua-commit] wxLua/lib README.txt,1.1,NONE

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

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

Removed Files:
	README.txt 
Log Message:
remove readme and readd to remove exe


--- README.txt DELETED ---