wxlua-commit — CVS commits of wxLua

[Wxlua-commit] wxLua/apps/wxluaedit/src wxledit.cpp,1.1,1.2

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

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

Modified Files:
	wxledit.cpp 
Log Message:
rebaked files for new files created from internal.cpp


Index: wxledit.cpp
===================================================================
RCS file: /cvsroot/wxlua/wxLua/apps/wxluaedit/src/wxledit.cpp,v
retrieving revision 1.1
retrieving revision 1.2
diff -C2 -d -r1.1 -r1.2
*** wxledit.cpp	24 Nov 2005 06:38:17 -0000	1.1
--- wxledit.cpp	25 Nov 2005 03:03:10 -0000	1.2
***************
*** 29,33 ****
  
  #include "wxledit.h"
! #include "wxlua/include/interp.h"
  #include "wxluadebug/include/staktree.h"
  #include "wxluadebug/include/debug.h"
--- 29,33 ----
  
  #include "wxledit.h"
! #include "wxlua/include/wxlintrp.h"
  #include "wxluadebug/include/staktree.h"
  #include "wxluadebug/include/debug.h"

[Wxlua-commit] wxLua/modules/wxlua/include wxlbind.h,NONE,1.1 wxlcallb.h,NONE,1.1 wxldefs.h,NONE,1.1 wxlhandl.h,NONE,1.1 wxlintrp.h,NONE,1.1 wxlstate.h,NONE,1.1

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

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

Added Files:
	wxlbind.h wxlcallb.h wxldefs.h wxlhandl.h wxlintrp.h 
	wxlstate.h 
Log Message:
added replacements for interp, callback - breaking up internal


--- NEW FILE: wxlstate.h ---
/////////////////////////////////////////////////////////////////////////////
// Purpose:     Interface to wxLua
// Author:      Ray Gilbert, John Labenski, J Winwood
// Created:     14/11/2001
// Copyright:   (c) 2001-2002 Lomtick Software. All rights reserved.
// Licence:     wxWidgets licence
/////////////////////////////////////////////////////////////////////////////

#ifndef _WXLSTATE_H_
#define _WXLSTATE_H_

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

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

    // To not include "lua.h" use these
    //typedef struct lua_State lua_State;
    //typedef struct lua_Debug lua_Debug;
    //typedef int (*lua_CFunction)(lua_State *);
}

#include "wxlua/include/internal.h"

class WXDLLIMPEXP_WXLUA wxLuaState;

#include "wx/hashmap.h"
WX_DECLARE_VOIDPTR_HASH_MAP( wxLuaState *, wxHashMapLuaState );

//----------------------------------------------------------------------------
// wxLuaStateRefData
//----------------------------------------------------------------------------

class WXDLLIMPEXP_WXLUA wxLuaStateRefData : public wxObjectRefData
{
public:
    wxLuaStateRefData();
    wxLuaStateRefData( const wxLuaStateRefData& data );
    virtual ~wxLuaStateRefData();

    // clear all wxLuaCallbacks on destruction
    void ClearCallbacks();

    lua_State *m_lua_State;

    wxLuaBindingList m_bindings;    // A list of generated lua bindings

    bool         m_typesRegistered; // Is the binding registered
    int          m_startTag;        // The first wxLua allocated lua tag
    int          m_lastTag;         // The last wxLua lua tag of registered classes
    int          m_functionTag;     // The lua tag for function objects.
    int          m_wxLuaTable;      // The lua tag for the wxLua private tables
    int          m_wxLuaNull;       // The lua tag for wxLuaNull (for NULL pointers)
    int          m_wxDeleteTable;   // The lua tag for the wxWindow destroy tracking table

    wxEventType  m_inEventType;     // wxEventType set when in event, else -1

    wxHashTable *m_pDerivedList;    // The list of derived objects.
    wxHashTable *m_pTrackedList;    // The list of tracked objects.
    wxList      *m_pAppHandlerList; // The list of event objects associated with the application object
    wxList      *m_pDestroyHandlerList; // The list of wxLuaDestroyCallbacks installed
    wxList      *m_pWindowList;     // The list of all wxWindow objects, wxWidgets will delete these
                                    //    but for an embedded program they must be deleted before
                                    //    deleting shutting down the interpreter, else they dangle
                                    //    used in ~wxLuaInterpreter
    wxArrayInt  m_usedIndexes;


    static wxHashMapLuaState s_wxHashMapLuaState;

private:
    void Init();
};

//----------------------------------------------------------------------------
// wxLuaState - a ref counted class to interface between C++ and lua's C lua_State
//----------------------------------------------------------------------------

class WXDLLIMPEXP_WXLUA wxLuaState : public wxObject
{
public:
    wxLuaState() : wxObject() {}
    wxLuaState( const wxLuaState& wxlState ) { Create(wxlState); }

    virtual ~wxLuaState() {}

    // Destroy the refed data
    void Destroy() { UnRef(); }
    // Is this wxLuaState valid, has refed data
    bool Ok() const { return m_refData != NULL; }

    // -----------------------------------------------------------------------
    // (re)Create this wxLuaState, unrefing this wxLuaState first.
    void Create( const wxLuaState& wxlState );


    void LUACALL RegisterBindings(bool registerTypes);
    void LUACALL UnRegisterBindings();

    wxLuaBinding* GetLuaBinding(const wxString& nameSpace);

    const WXLUACLASS * GetLuaClass(int iClassTag);
    const WXLUACLASS * GetLuaClass(const char* className);
    const WXLUACLASS * GetBaseLuaClass(int iClassTag);
    bool IsDerivedClass(int iClassTag, int iBaseClassTag);

    const WXLUAEVENT * GetLuaEvent(wxEvent *pEvent);








    // operators
    bool operator == (const wxLuaState& wxlState) const
        { return m_refData == wxlState.m_refData; }
    bool operator != (const wxLuaState& wxlState) const
        { return m_refData != wxlState.m_refData; }

    wxLuaState& operator = (const wxLuaState& wxlState)
    {
        if ( (*this) != wxlState )
            Ref(wxlState);
        return *this;
    }

private:
    // ref counting code
    virtual wxObjectRefData *CreateRefData() const;
    virtual wxObjectRefData *CloneRefData(const wxObjectRefData *data) const;

    DECLARE_DYNAMIC_CLASS(wxLuaState)

};

#endif // _WXLSTATE_H_

--- NEW FILE: wxldefs.h ---
///////////////////////////////////////////////////////////////////////////////
// Name:        wxldefs.h
// Purpose:     wxLua common defines
// Author:      John Labenski
// Modified by:
// Created:     5/28/2005
// RCS-ID:
// Copyright:   (c) John Labenski
// Licence:     wxWidgets licence
///////////////////////////////////////////////////////////////////////////////

#ifndef __WX_WXLDEFS_H__
#define __WX_WXLDEFS_H__

#include "wx/defs.h"

extern "C"
{
    typedef struct lua_State lua_State;
    typedef struct lua_Debug lua_Debug;
}

// ----------------------------------------------------------------------------
// If you're using stdcall in Lua, then override this with
//   "LUACALL = __stdcall" in your makefile or project.
// ----------------------------------------------------------------------------

#ifndef LUACALL
    #define LUACALL
#endif

// ----------------------------------------------------------------------------
// WXDLLIMPEXP macros
// ----------------------------------------------------------------------------

// These are our DLL macros (see the contrib libs like wxPlot)
#ifdef WXMAKINGDLL_WXLUA
    #define WXDLLIMPEXP_WXLUA WXEXPORT
    #define WXDLLIMPEXP_DATA_WXLUA(type) WXEXPORT type
#elif defined(WXUSINGDLL)
    #define WXDLLIMPEXP_WXLUA WXIMPORT
    #define WXDLLIMPEXP_DATA_WXLUA(type) WXIMPORT type
#else // not making nor using DLL
    #define WXDLLIMPEXP_WXLUA
    #define WXDLLIMPEXP_DATA_WXLUA(type) type
#endif

#endif  // __WX_WXLDEFS_H__

--- NEW FILE: wxlhandl.h ---
////////////////////////////////////////////////////////////////////////////////
// Purpose:     wxLuaHandler - Custom Lua Handler
// Author:      Francis Irving
// Created:     16/01/2002
// Modified:    J. Winwood. April 2002. Added debugging interfaces
// Copyright:   (c) 2002 Creature Labs. All rights reserved.
// Copyright:   (c) 2002 Lomtick Software. All rights reserved.
// Licence:     wxWidgets licence
////////////////////////////////////////////////////////////////////////////////

#ifndef _WXLHANDL_H_
#define _WXLHANDL_H_

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

#include "wxlua/include/wxldefs.h"
#include "wx/utils.h"
#include "wx/app.h"

class WXDLLIMPEXP_WXLUA wxLuaDebugEvent;
class WXDLLIMPEXP_WXLUA wxLuaStackFrame;

// ----------------------------------------------------------------------------
// wxLuaHandler - Allow for Custom Lua Handler (an alternative to wxLuaApp)
// ----------------------------------------------------------------------------

class WXDLLIMPEXP_WXLUA wxLuaHandler
{
public:
    wxLuaHandler();
    virtual ~wxLuaHandler();

    virtual void AddPendingEvent(wxEvent& event) = 0;

    virtual bool ProcessEvent(wxEvent& event) = 0;

//#if wxUSE_LUASTACKFRAME
//    virtual void SetStackFrame(wxLuaStackFrame *pStackFrame) = 0;
//#endif // wxUSE_LUASTACKFRAME

    virtual void DisplayError(const wxString &strError) const = 0;

    void EnterLuaCriticalSection()
    {
        m_luaCriticalSection.Enter();
    }

    void LeaveLuaCriticalSection()
    {
        m_luaCriticalSection.Leave();
    }

public:
    static wxLuaHandler* sm_luahandler;
    wxCriticalSection  m_luaCriticalSection;
};


// Lua App/Debugger Interface
wxLuaHandler& wxGetLuaHandler();

#endif //_WXLHANDL_H_

--- NEW FILE: wxlcallb.h ---
/////////////////////////////////////////////////////////////////////////////
// Purpose:     wxLuaCallback and wxLuaDestroyCallback
// Author:      Francis Irving
// Created:     21/01/2002
// Copyright:   (c) 2002 Creature Labs. All rights reserved.
// Licence:     wxWidgets licence
/////////////////////////////////////////////////////////////////////////////

#ifndef _WXLCALLB_H_
#define _WXLCALLB_H_

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

#include "wxlua/include/wxldefs.h"

class WXDLLIMPEXP_WXLUA wxLuaStateVariables;

// ----------------------------------------------------------------------------
// wxLuaCallback - proxy class to pass a reference to a lua function
//                 through the wxWidgets event system.
// ----------------------------------------------------------------------------

class WXDLLIMPEXP_WXLUA wxLuaCallback : public wxEvtHandler
{
public:
    wxLuaCallback( lua_State    *state,
                   int           theRoutine,
                   wxWindowID    id,
                   wxEventType   eventType,
                   wxEvtHandler *pHandler );

    virtual ~wxLuaCallback();

    void ClearState()     { m_luaState = NULL; }
    void ClearStateVars() { m_luaStateVars = NULL; }

    lua_State* GetLuaState() const { return m_luaState; }
    int GetId() const { return m_id; }
    wxEventType GetEventType() const { return m_eventType; }
    wxEvtHandler *GetEvtHandler() const { return m_pHandler; }

    // central event handler
    void EventHandler(wxEvent& event);

protected:
    // event handler dispatcher back to Lua
    void CallFunction(wxEvent *pEvent);

    // reference to the routine to call
    int                  m_routine;
    // Lua state instance
    lua_State           *m_luaState;
    // store the state variables since we're added to a list of callbacks.
    // The lua_State is NULLed when the window (handler) is destroyed,
    // but we still want to remove us from the state vars callback list.
    wxLuaStateVariables *m_luaStateVars;
    wxEvtHandler        *m_pHandler;
    wxWindowID           m_id;
    wxEventType          m_eventType;
private:
    DECLARE_CLASS(wxLuaCallback);
};

// ----------------------------------------------------------------------------
// LuaDestroyCallback - proxy class to handle the destruction of wxWindow
//                      derived objects
// ----------------------------------------------------------------------------

class WXDLLIMPEXP_WXLUA wxLuaDestroyCallback : public wxEvtHandler
{
public:
    wxLuaDestroyCallback( lua_State    *state,
                          wxWindowID    id,
                          wxEvtHandler *pHandler,
                          int           iTag);

    virtual ~wxLuaDestroyCallback();

    void ClearState()     { m_luaState = NULL; }
    void ClearStateVars() { m_luaStateVars = NULL; }

    lua_State*    GetLuaState()   const { return m_luaState; }
    wxEvtHandler* GetEvtHandler() const { return m_pHandler; }

    // central event handler
    void EventHandler(wxWindowDestroyEvent& event);

protected:
    void OnDestroy();

    // Lua state instance
    lua_State           *m_luaState;
    // store the state variables see wxLuaCallback for reasoning
    wxLuaStateVariables *m_luaStateVars;
    wxEvtHandler        *m_pHandler;
    int                  m_id;

private:
    DECLARE_CLASS(wxLuaDestroyCallback)
};

#endif //_WXLCALLB_H_

--- NEW FILE: wxlintrp.h ---
/////////////////////////////////////////////////////////////////////////////
// Name:        wxLuaInterpreter
// Purpose:     A simple class for a C++ wxWidgets program to embed wxLua
// Author:      John Labenski
// Modified by:
// Created:     11/05/2002
// Copyright:   (c) John Labenski
// Licence:     wxWidgets licence
/////////////////////////////////////////////////////////////////////////////

#ifndef _WX_LUA_INTERPRETER_H_
#define _WX_LUA_INTERPRETER_H_

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

#include "wxlua/include/wxldefs.h"

extern "C"
{
    #include "lua/include/lua.h"  // for DebugHook defines

    // To not include "lua.h" use these
    //typedef struct lua_State lua_State;
    //typedef struct lua_Debug lua_Debug;
    //typedef int (*lua_CFunction)(lua_State *);
}

class WXDLLEXPORT wxEvtHandler;

class WXDLLIMPEXP_WXLUA wxLuaEvent;
class WXDLLIMPEXP_WXLUA wxLuaStateVariables;
class WXDLLIMPEXP_WXLUA wxLuaInterpreter;

#include "wx/hashmap.h"
WX_DECLARE_VOIDPTR_HASH_MAP( wxLuaInterpreter *, wxHashMapLuaInterpreter );
extern wxHashMapLuaInterpreter s_wxHashMapLuaInterpreter;

//-----------------------------------------------------------------------------
// Extra wxLua helpers that use the lua_State to find owner wxLuaInterpreter
//-----------------------------------------------------------------------------

extern wxLuaInterpreter    *wxFindLuaInterpreter(lua_State *L);
extern wxLuaStateVariables *wxFindLuaStateVariables(lua_State *L);

//-----------------------------------------------------------------------------
// wxLuaInterpreter
//
// notes : create instance, call RunString("some lua code")
//         Events are sent to the evthander if !null with the given id #
//-----------------------------------------------------------------------------

class WXDLLIMPEXP_WXLUA wxLuaInterpreter : public wxObject
{
public:
    // default constructor - must call Create in order to use
    wxLuaInterpreter();
    // Create a wxLua instance, handler and id can be null/wxID_ANY for don't care
    wxLuaInterpreter(wxEvtHandler *handler, wxWindowID id = wxID_ANY);
    wxLuaInterpreter(lua_State *L, wxEvtHandler *handler, wxWindowID id = wxID_ANY);

    virtual ~wxLuaInterpreter();

    // (re)Create a new wxLua instance, handler and id can be null/wxID_ANY for don't care
    //   don't forget to ShutDown the last one first (if you want to)
    bool Create(lua_State *L, wxEvtHandler *handler=NULL, wxWindowID id = wxID_ANY);
    bool Create(wxEvtHandler *handler=NULL, wxWindowID id = wxID_ANY)
        { return Create(NULL, handler, id); }
    // destroy and cleanup the interpreter, returns sucess
    // if 'force' then make sure all wxWindows are destroyed.
    bool Destroy(bool force = true);

    // cleanup window list
    void GarbageCollectWindows(bool closeWindows = false);

    // has the interpreter been sucessfully created
    bool Ok() const;

    // Set the event handler that the events will be sent to, can be null
    void SetEventHandler(wxEvtHandler *evtHandler);
    wxEvtHandler *GetEventHandler() const { return m_evtHandler; }

    // Get/Set the id that the events will be sent with
    void SetId(int id) { m_id = id; }
    int  GetId() const { return m_id; }

    // Run a lua file
    int RunFile(const wxString &fileName);
    // Run a string that contains lua code
    int RunString(const wxString &script, const wxString& name = wxEmptyString);
    // Run a char array #include(d) from bin2c compilation
    int RunBuffer(const unsigned char buf[], size_t size, const wxString &name = wxT("= lua"));

    // Is a program running now
    bool IsRunning() const { return m_is_running; }
    // Break a currently running lua program
    void Break(const wxString &message = wxT("Interpreter stopped"));
    // has Break() been called
    bool GetBreak() const { return m_user_break; }
    wxString GetBreakMessage() const { return m_break_msg; }

    // Have lua run an internal hook function with this mask
    //   hook = LUA_MASKCALL | LUA_MASKRET | LUA_MASKLINE | LUA_MASKCOUNT
    // Every count hook mask a wxEVT_LUA_DEBUG_HOOK event is sent if send_debug_evt
    //   if yield > 0 then wxYield is called every yield milliseconds
    //      I don't know what resonable values are
    // turn the hook off with count < 1
    void SetLuaDebugHook(int count = 1000,
                         int yield = 50,
                         bool send_debug_evt = FALSE,
                         int hook = LUA_MASKCOUNT);
    int  GetLuaDebugHookCount() const { return m_lua_debug_hook_count; }
    int  GetLuaDebugHookYield() const { return m_lua_debug_hook_yield; }
    bool GetLuaDebugHookSendEvt() const { return m_lua_debug_hook_send_evt; }
    int  GetLuaDebugHook() const { return m_lua_debug_hook; }

    // registers a new function for Lua
    void RegisterFunction(lua_CFunction func, const wxString &funcName);

    // Get a pointer to the lua_State that "is" lua
    lua_State *GetLuaState() const;
    // Get a pointer to additional wxLua variables used for this lua_State
    wxLuaStateVariables *GetStateVariables() const;

    // -----------------------------------------------------------------------
    // implementation

    // generic function to generate a wxEVT_LUA_ERROR with the string message
    void DisplayError( const wxString &errorMsg );

    // checks return val of 'lua_load' and `lua_pcall', if error send wxEVT_LUA_ERROR
    bool CheckRunError(int rc);

    // internally used so debug hook events are sent no more often than yield time
    unsigned long GetLastLuaDebugHookTime() const;
    void SetLastLuaDebugHookTime(unsigned long t);

    void SendEvent( wxLuaEvent &event ) const;

    // operators
    operator lua_State*() { return GetLuaState(); }

protected:
    bool m_is_running;

    unsigned long m_last_debug_hook_time;

    bool m_user_break;
    wxString m_break_msg;

    wxLuaStateVariables *m_luaStateVariables;
    lua_State *m_lua_State;
    bool       m_luaAllocated;

    int  m_lua_debug_hook_count;
    int  m_lua_debug_hook_yield;
    bool m_lua_debug_hook_send_evt;
    int  m_lua_debug_hook;

    wxEvtHandler *m_evtHandler;
    int m_id;

private :
    void Init();
    DECLARE_ABSTRACT_CLASS(wxLuaInterpreter)
};

//-----------------------------------------------------------------------------
// wxLuaEvent
//-----------------------------------------------------------------------------

class WXDLLIMPEXP_WXLUA wxLuaEvent: public wxNotifyEvent
{
public:
    wxLuaEvent(wxEventType commandType = wxEVT_NULL, wxWindowID id = wxID_ANY,
               wxLuaInterpreter *intrepreter=NULL);

    wxLuaEvent( const wxLuaEvent &event ) : wxNotifyEvent(event)
    {
        m_stop_interpreter = event.m_stop_interpreter;
        m_luaInterpreter = event.m_luaInterpreter;
        m_lua_Debug = event.m_lua_Debug;
    }

    virtual wxEvent *Clone() const { return new wxLuaEvent(*this); }

    // use GetString method to retrieve info

    // Get the line number in the code, -1 if unknown
    int GetLineNum() const { return m_commandInt; }

    wxLuaInterpreter *GetLuaInterpreter() const { return m_luaInterpreter; }
    void SetLuaInterpreter(wxLuaInterpreter *interp) { m_luaInterpreter = interp; }

    lua_State *GetLuaState() const { return m_luaInterpreter ? m_luaInterpreter->GetLuaState() : NULL; }
    // non null only for EVT_LUA_DEBUG_HOOK
    lua_Debug *GetLuaDebug() const { return m_lua_Debug; }

    // If called from a wxEVT_LUA_DEBUG_HOOK the interpreter will stop
    void StopInterpreter(bool stop) { m_stop_interpreter = stop; }

    bool m_stop_interpreter;
    wxLuaInterpreter *m_luaInterpreter;
    lua_Debug *m_lua_Debug;
};

BEGIN_DECLARE_EVENT_TYPES()
    DECLARE_EXPORTED_EVENT_TYPE(WXDLLIMPEXP_WXLUA, wxEVT_LUA_CREATION,   0) // a wxLuaInterpreter is being created
    DECLARE_EXPORTED_EVENT_TYPE(WXDLLIMPEXP_WXLUA, wxEVT_LUA_CONSOLE,    0) // print statements and such, check GetString()
    DECLARE_EXPORTED_EVENT_TYPE(WXDLLIMPEXP_WXLUA, wxEVT_LUA_WARNING,    0) // unused, lua doesn't seem to warn for anything
    DECLARE_EXPORTED_EVENT_TYPE(WXDLLIMPEXP_WXLUA, wxEVT_LUA_ERROR,      0) // error occurred, check GetString()
    DECLARE_EXPORTED_EVENT_TYPE(WXDLLIMPEXP_WXLUA, wxEVT_LUA_DEBUG_HOOK, 0) // see LuaDebugHook function
    DECLARE_EXPORTED_EVENT_TYPE(WXDLLIMPEXP_WXLUA, wxEVT_LUA_SHUTDOWN,   0) // unused, I used this in some other interpreter, not sure why it'd be useful
    DECLARE_EXPORTED_EVENT_TYPE(WXDLLIMPEXP_WXLUA, wxEVT_LUA_INIT,       0) // after app starts, first idle
    DECLARE_EXPORTED_EVENT_TYPE(WXDLLIMPEXP_WXLUA, wxEVT_LUA_DEBUGGERATTACHED,   0)     // after app starts, first idle
END_DECLARE_EVENT_TYPES()

typedef void (wxEvtHandler::*wxLuaEventFunction)(wxLuaEvent&);

#define EVT_LUA_CREATION(id, fn)     DECLARE_EVENT_TABLE_ENTRY(wxEVT_LUA_CREATION,   id, wxID_ANY, (wxObjectEventFunction) (wxEventFunction) (wxCommandEventFunction) (wxNotifyEventFunction) (wxLuaEventFunction) & fn, (wxObject *) NULL ),
#define EVT_LUA_CONSOLE(id, fn)      DECLARE_EVENT_TABLE_ENTRY(wxEVT_LUA_CONSOLE,    id, wxID_ANY, (wxObjectEventFunction) (wxEventFunction) (wxCommandEventFunction) (wxNotifyEventFunction) (wxLuaEventFunction) & fn, (wxObject *) NULL ),
#define EVT_LUA_WARNING(id, fn)      DECLARE_EVENT_TABLE_ENTRY(wxEVT_LUA_WARNING,    id, wxID_ANY, (wxObjectEventFunction) (wxEventFunction) (wxCommandEventFunction) (wxNotifyEventFunction) (wxLuaEventFunction) & fn, (wxObject *) NULL ),
#define EVT_LUA_ERROR(id, fn)        DECLARE_EVENT_TABLE_ENTRY(wxEVT_LUA_ERROR,      id, wxID_ANY, (wxObjectEventFunction) (wxEventFunction) (wxCommandEventFunction) (wxNotifyEventFunction) (wxLuaEventFunction) & fn, (wxObject *) NULL ),
#define EVT_LUA_DEBUG_HOOK(id, fn)   DECLARE_EVENT_TABLE_ENTRY(wxEVT_LUA_DEBUG_HOOK, id, wxID_ANY, (wxObjectEventFunction) (wxEventFunction) (wxCommandEventFunction) (wxNotifyEventFunction) (wxLuaEventFunction) & fn, (wxObject *) NULL ),
#define EVT_LUA_SHUTDOWN(id, fn)     DECLARE_EVENT_TABLE_ENTRY(wxEVT_LUA_SHUTDOWN,   id, wxID_ANY, (wxObjectEventFunction) (wxEventFunction) (wxCommandEventFunction) (wxNotifyEventFunction) (wxLuaEventFunction) & fn, (wxObject *) NULL ),
#define EVT_LUA_INIT(id, fn)         DECLARE_EVENT_TABLE_ENTRY(wxEVT_LUA_INIT, id,   -1, (wxObjectEventFunction) (wxEventFunction) (wxCommandEventFunction) (wxNotifyEventFunction) (wxLuaEventFunction) & fn, (wxObject *) NULL ),
#define EVT_LUA_DEBUGGERATTACHED(fn) DECLARE_EVENT_TABLE_ENTRY(wxEVT_LUA_DEBUGGERATTACHED, -1,   -1, (wxObjectEventFunction) (wxEventFunction) (wxCommandEventFunction) (wxNotifyEventFunction) (wxLuaEventFunction) & fn, (wxObject *) NULL ),

#endif  // _WX_LUA_INTERPRETER_H_

--- NEW FILE: wxlbind.h ---
/////////////////////////////////////////////////////////////////////////////
// Purpose:     wxLuaBinding
// Author:      Ray Gilbert, John Labenski, J Winwood
// Created:     14/11/2001
// Copyright:
// Licence:     wxWidgets licence
/////////////////////////////////////////////////////////////////////////////

#ifndef _WXLBIND_H_
#define _WXLBIND_H_

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

#include "wxlua/include/wxldefs.h"
#include "wxlua/include/wxlua.h"
#include "wxlua/include/wxlintrp.h"

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

// ----------------------------------------------------------------------------
// wxLua binding enums and structs
// ----------------------------------------------------------------------------

enum LuaType                        // The type of a Lua method
{
    LuaDelete        = 1,           // gc routine
    LuaConstructor   = 2,           // constructor
    LuaDestructor    = 4,           // destructor (not used)
    LuaMethod        = 8,           // class method
    LuaGlobal        = 16,          // global method (not really related to the class)
    LuaGetProp       = 32,
    LuaSetProp       = 64
};

struct WXLUAMETHOD                  // defines a LUA method or property
{
    LuaType        type;            // type (one of the above enumeration values)
    const char    *name;            // name of the method or property
    lua_CFunction  func;            // function that implements the method or property
    int            params;          // number of params to the method (required + optional)
    int            required;        // number of required params
};

struct WXLUACLASS                   // defines a LUA class interface
{
    const char    *name;            // name of the class
    WXLUAMETHOD   *methods;         // pointer to methods for this class
    int            num_methods;     // number of methods
    int            baseclass_tag;   // index in the class list to the base class
    wxClassInfo   *pClassInfo;      // pointer to the wxClassInfo associated with this class
    int           *class_tag;       // tag for user data allocated by ourselves
                                    // and therefore needs gc.
    const char    *baseclass;       // name of base class
};

struct WXLUADEFINE                  // defines a wxWidgets define for wxLua
{
    const char    *name;            // name
    bool           isString;        // true if a string definition FIXME use WXLUASTRING
    double         value;           // numeric value
    const wxChar  *strValue;        // string value
};

struct WXLUASTRING                  // defines a wxWidgets define for wxLua
{
    const char    *name;            // name
    const wxChar  *value;           // string value
};

struct WXLUAEVENT                   // defines a wxWidgets Event for wxLua
{
    const int  *eventType;          // new wxWidgets event type
    const char *eventName;          // name of the event
    int        *eventClassTag;      // lua class tag
};

struct WXLUAOBJECT                  // Defines a wxWidgets object or pointer for wxLua
{
    const void  *objPtr;            // a pointer to the object or pointer
    const void **pObjPtr;           // a pointer to the object or pointer
    const char  *objName;           // the name of the object or pointer
    int         *objClassTag;       // the class tag of the object or pointer.
};

typedef WXLUACLASS* (*GetClassListFunction)(size_t &);
typedef WXLUADEFINE* (*GetDefineListFunction)(size_t &);
//typedef WXLUASTRING* (*GetDefineListFunction)(size_t &); FIXME - use this
typedef WXLUAEVENT* (*GetEventListFunction)(size_t &);
typedef WXLUAOBJECT* (*GetObjectListFunction)(size_t &);
typedef WXLUAMETHOD* (*GetBuiltinListFunction)(size_t &);

// ----------------------------------------------------------------------------
// wxLuaBinding
//
//    The wxLuaBinding object binds classes, functions, objects, and
//    event callbacks to the lua interpreter.
// ----------------------------------------------------------------------------

class WXDLLIMPEXP_WXLUA wxLuaBinding : public wxObject
{
public:
    wxLuaBinding();

    // lua namespace e.g. "wx"
    wxString nameSpace;

    // Pointers to external Binding Functions
    GetClassListFunction pfGetClassList;
    GetDefineListFunction pfGetDefineList;
    GetEventListFunction pfGetEventList;
    GetObjectListFunction pfGetObjectList;
    GetBuiltinListFunction pfGetBuiltinList;

    // Binds C Functions/Defines/Object/Events to Lua Table
    void RegisterBinding(lua_State *L, bool registerTypes);
    // Unbinds C Functions/Defines/Object/Events by clearing Lua Table
    void UnRegisterBinding(lua_State *L);

    //
    size_t GetLuaClassCount() const { return m_classCount; }
    WXLUACLASS* GetLuaClassList() { return m_classList; }

    size_t GetLuaDefineCount() const { return m_defineCount; }
    WXLUADEFINE* GetLuaDefineList() { return m_defineList; }

    size_t GetLuaEventCount() { return m_eventCount; }
    WXLUAEVENT* GetLuaEventList() { return m_eventList; }

    size_t GetLuaObjectCount() { return m_objectCount; }
    WXLUAOBJECT* GetLuaObjectList() { return m_objectList; }

    size_t GetLuaBuiltinCount() { return m_builtinCount; }
    WXLUAMETHOD* GetLuaBuiltinList() { return m_builtinList; }

    bool IsTag(int tag) { return (tag >= m_startTag && tag <= m_lastTag); }

    // Look for base class in binding, set baseclass_tag
    bool SetBaseClassTag(WXLUACLASS *pClass);

protected:
    // Registers binding, returns lua table reference to binding
    int LUACALL RegisterFunctions(lua_State *L, bool registerTypes);
    // Register the classes, definitions, objects and pointers generated by the binding
    // Sort the event list into order for faster event handler processing.
    void LUACALL RegisterGeneratedClasses(lua_State *L, int tableOffset, bool registerTypes);

    virtual void OnRegister(lua_State * WXUNUSED(L), bool WXUNUSED(registerTypes), int WXUNUSED(luaTable)) {}

    // binding objects
    size_t m_classCount;
    WXLUACLASS* m_classList;
    size_t m_defineCount;
    WXLUADEFINE* m_defineList;
    size_t m_eventCount;
    WXLUAEVENT* m_eventList;
    size_t m_objectCount;
    WXLUAOBJECT* m_objectList;
    size_t m_builtinCount;
    WXLUAMETHOD* m_builtinList;

    bool m_typesRegistered; // Is the binding registered
    int m_startTag;         // The first wxLua allocated lua tag
    int m_lastTag;          // The last wxLua lua tag of registered classes
    int m_wxLuaTable;       // The lua tag for the wxLua private tables

    DECLARE_CLASS(wxLuaBinding)
};

// list of wxLua Bindings
WX_DECLARE_USER_EXPORTED_LIST(wxLuaBinding, wxLuaBindingList, WXDLLIMPEXP_WXLUA);

#endif // _WXLBIND_H_

[Wxlua-commit] wxLua/modules/wxlua/src wxlbind.cpp,NONE,1.1 wxlcallb.cpp,NONE,1.1 wxlhandl.cpp,NONE,1.1 wxlintrp.cpp,NONE,1.1 wxlstate.cpp,NONE,1.1

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

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

Added Files:
	wxlbind.cpp wxlcallb.cpp wxlhandl.cpp wxlintrp.cpp 
	wxlstate.cpp 
Log Message:
added replacements for interp, callback - breaking up internal


--- NEW FILE: wxlstate.cpp ---
/////////////////////////////////////////////////////////////////////////////
// Purpose:     Interface to wxLua
// Author:      Ray Gilbert, John Labenski, J Winwood
// Created:     14/11/2001
// Copyright:   (c) 2001-2002 Lomtick Software. All rights reserved.
// Licence:     wxWidgets licence
/////////////////////////////////////////////////////////////////////////////

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

// For compilers that support precompilation, includes <wx/wx.h>.
#include "wx/wxprec.h"

#ifdef __BORLANDC__
    #pragma hdrstop
#endif

// for all others, include the necessary headers
#ifndef WX_PRECOMP
    #include "wx/wx.h"
#endif

#include "wxlua/include/wxlstate.h"
#include "wxlua/include/wxlcallb.h"
#include "wxbind/include/wxbind.h"

extern bool wxLuaCleanupWindows(wxList *list, bool only_check); // in interp.cpp

extern int wxLuaEventListCompareFn(const void *p1, const void *p2); // in wxlbind.cpp
extern int wxLuaClassListCompareByTag(const void *p1, const void *p2); // in wxlbind.cpp
const char *wxLuaReferences; // in internal.cpp

//----------------------------------------------------------------------------
// wxLuaStateRefData
//----------------------------------------------------------------------------

wxHashMapLuaState wxLuaStateRefData::s_wxHashMapLuaState;

void wxLuaStateRefData::Init()
{
    m_lua_State           = NULL;
    m_typesRegistered     = false;
    m_startTag            = 0;
    m_lastTag             = 0;
    m_functionTag         = 0;
    m_wxLuaTable          = 0;
    m_wxLuaNull           = 0;
    m_wxDeleteTable       = 0;
    m_inEventType         = -1;
    m_pDerivedList        = new wxHashTable(wxKEY_INTEGER);
    m_pTrackedList        = new wxHashTable(wxKEY_INTEGER);
    m_pAppHandlerList     = new wxList;
    m_pDestroyHandlerList = new wxList;
    m_pWindowList         = new wxList;
}

wxLuaStateRefData::wxLuaStateRefData()
{
    Init();
}

wxLuaStateRefData::wxLuaStateRefData( const wxLuaStateRefData& data )
{

}

wxLuaStateRefData::~wxLuaStateRefData()
{
    // remove deleted windows first
    if (m_pWindowList && m_pWindowList->GetCount())
        wxLuaCleanupWindows(m_pWindowList, true);

    // are there still windows? ask to abort deleting them if !force
    if (m_pWindowList && m_pWindowList->GetCount())
    {
/*
        int ret = wxOK;

        //if (!force)
        {
            ret = wxMessageBox(wxT("Windows are still open, would you like to delete them?"),
                               wxT("Delete existing windows?"), wxOK|wxCANCEL|wxICON_QUESTION);
        }

        if (ret == wxCANCEL)
            return FALSE;
*/
        //wxPrintf(wxT("Deleting windows\n"));

        // delete windows and their eventhandler since they delete the LuaCallbacks
        //  which require a lua_State
        wxLuaCleanupWindows(m_pWindowList, FALSE);
        // wait for wxWindow::Destroy() to really delete the windows
        //wxYieldIfNeeded();
    }

    CleanupWxLua(m_lua_State, true);

    s_wxHashMapLuaState.erase(m_lua_State);

    ClearCallbacks();
    delete m_pDerivedList;
    delete m_pTrackedList;
    delete m_pAppHandlerList;
    delete m_pDestroyHandlerList;
    delete m_pWindowList;
}

void wxLuaStateRefData::ClearCallbacks()
{
    // remove any and all callbacks that use this event handler since its gone
    wxNode* node = m_pAppHandlerList->GetFirst();
    while (node)
    {
        wxLuaCallback *pCallback = (wxLuaCallback *) node->GetData();

        if (pCallback)
        {
            pCallback->ClearState();
            pCallback->ClearStateVars();
        }

        node = node->GetNext();
    }
    node = m_pDestroyHandlerList->GetFirst();
    while (node)
    {
        wxLuaDestroyCallback *pCallback = (wxLuaDestroyCallback *) node->GetData();

        if (pCallback)
        {
            pCallback->ClearState();
            pCallback->ClearStateVars();
        }

        node = node->GetNext();
    }

    // don't "own" pointers to wxLuaCallbacks, let wxEventHandler do it
    m_pAppHandlerList->DeleteContents(false);
    // don't delete wxLuaDestroyCallbacks, let wxEventHandler do it
    m_pDestroyHandlerList->DeleteContents(false);
}


//----------------------------------------------------------------------------
// wxLuaState
//----------------------------------------------------------------------------

IMPLEMENT_DYNAMIC_CLASS(wxLuaState, wxObject)

#define M_WXLSTATEDATA ((wxLuaStateRefData*)m_refData)

wxObjectRefData *wxLuaState::CreateRefData() const
{
    return new wxLuaStateRefData;
}
wxObjectRefData *wxLuaState::CloneRefData(const wxObjectRefData *data) const
{
    return new wxLuaStateRefData(*(const wxLuaStateRefData *)data);
}

void LUACALL wxLuaState::RegisterBindings(bool registerTypes)
{
    wxCHECK_RET(Ok(), wxT("Invalid wxLuaState"));
    lua_State* L = M_WXLSTATEDATA->m_lua_State;
    wxCHECK_RET(L, wxT("Invalid wxLuaState"));

    // create references table in registry
    lua_pushstring(L, wxLuaReferences);
    lua_newtable(L);
    lua_rawset(L, LUA_REGISTRYINDEX);

    // Register bindings
    wxLuaBindingList::Node *node;
    for (node = M_WXLSTATEDATA->m_bindings.GetFirst(); node; node = node->GetNext() )
    {
        wxLuaBinding* binding = node->GetData();
        binding->RegisterBinding(L, registerTypes);
    }

    M_WXLSTATEDATA->m_typesRegistered = true;

    // setup base class tags
    for (node = M_WXLSTATEDATA->m_bindings.GetFirst(); node; node = node->GetNext() )
    {
        wxLuaBinding* binding = node->GetData();

        WXLUACLASS* pClass = (WXLUACLASS *)binding->GetLuaClassList();
        for (size_t i = 0; i < binding->GetLuaClassCount(); i++)
        {
            WXLUACLASS* pLuaClass = pClass + i;
            pLuaClass->baseclass_tag = -1;

            if (pLuaClass->baseclass)
            {
                wxLuaBindingList::Node* basenode;
                for (basenode = M_WXLSTATEDATA->m_bindings.GetFirst(); basenode; basenode = basenode->GetNext() )
                {
                    wxLuaBinding* basebinding = basenode->GetData();

                    // found base class in binding?
                    if (basebinding->SetBaseClassTag(pLuaClass))
                        break;
                }
            }
        }
    }

    // register our 'function' object handlers
    if (registerTypes)
    {
        M_WXLSTATEDATA->m_functionTag = tnewtag(L);
        M_WXLSTATEDATA->m_wxDeleteTable = tnewweaktag(L, false, true);
    }

    tsettagmethod (L, M_WXLSTATEDATA->m_functionTag, "__gc",    functionGarbageCollect);
    tsettagmethod (L, M_WXLSTATEDATA->m_functionTag, "__call",   callFunction);
}

void LUACALL wxLuaState::UnRegisterBindings()
{
    wxCHECK_RET(Ok(), wxT("Invalid wxLuaState"));
    lua_State* L = M_WXLSTATEDATA->m_lua_State;
    wxCHECK_RET(L, wxT("Invalid wxLuaState"));

    // UnRegister bindings
    wxLuaBindingList::Node *node;
    for (node = M_WXLSTATEDATA->m_bindings.GetFirst(); node; node = node->GetNext() )
    {
        wxLuaBinding* binding = node->GetData();

        binding->UnRegisterBinding(L);
    }

    lua_pushstring(L, wxLuaReferences);
    lua_pushnil(L);
    lua_rawset(L, LUA_REGISTRYINDEX);
}

// Find binding with given nameSpace
wxLuaBinding* wxLuaState::GetLuaBinding(const wxString& nameSpace)
{
    wxLuaBindingList::Node *node;
    for (node = M_WXLSTATEDATA->m_bindings.GetFirst(); node; node = node->GetNext() )
    {
        wxLuaBinding* binding = node->GetData();
        if (binding->nameSpace == nameSpace)
            return binding;
    }

    return NULL;
}

// Get WXLUACLASS for given Tag
const WXLUACLASS* wxLuaState::GetLuaClass(int iClassTag)
{
    WXLUACLASS classItem;
    classItem.class_tag = &iClassTag;

    wxLuaBindingList::Node *node;
    for (node = M_WXLSTATEDATA->m_bindings.GetFirst(); node; node = node->GetNext() )
    {
        wxLuaBinding* binding = node->GetData();

        // this relies on LUA allocating tags in ascending order of definition
        // if LUA stops doing this, then the search may break.
        const WXLUACLASS *pLuaClass = (WXLUACLASS *) bsearch(&classItem,
                                                         binding->GetLuaClassList(),
                                                         binding->GetLuaClassCount(),
                                                         sizeof(WXLUACLASS),
                                                         wxLuaClassListCompareByTag);

        // found
        if (pLuaClass)
            return pLuaClass;
    }

    return NULL;
}

// Get WXLUACLASS for given class name
const WXLUACLASS* wxLuaState::GetLuaClass(const char* className)
{
    wxLuaBindingList::Node *node;
    for (node = M_WXLSTATEDATA->m_bindings.GetFirst(); node; node = node->GetNext() )
    {
        wxLuaBinding* binding = node->GetData();

        WXLUACLASS *pLuaClass = (WXLUACLASS *)binding->GetLuaClassList();
        for (size_t i = 0; i < binding->GetLuaClassCount(); i++)
        {
            if (strcmp(pLuaClass->name, className) == 0)
                return pLuaClass;

            pLuaClass++;
        }
    }

    return NULL;
}

// Get base WXLUACLASS for given Tag
const WXLUACLASS* wxLuaState::GetBaseLuaClass(int iClassTag)
{
    const WXLUACLASS *pLuaClass = GetLuaClass(iClassTag);
    if (pLuaClass && pLuaClass->baseclass_tag != -1)
        return GetLuaClass(pLuaClass->baseclass_tag);

    return NULL;
}

// returns true is iClassTag is derived from iBaseClassTag
bool wxLuaState::IsDerivedClass(int iClassTag, int iBaseClassTag)
{
    if (iClassTag == iBaseClassTag)
        return true;

    const WXLUACLASS *pLuaClass = GetLuaClass(iClassTag);
    if (pLuaClass && pLuaClass->baseclass_tag != -1)
        return IsDerivedClass(pLuaClass->baseclass_tag, iBaseClassTag);

    return false;
}

// Get WXLUAEVENT for given wxEvent
const WXLUAEVENT* wxLuaState::GetLuaEvent(wxEvent *pEvent)
{
    WXLUAEVENT eventItem;
    int eventType = pEvent->GetEventType();
    eventItem.eventType = &eventType;

    wxLuaBindingList::Node *node;
    for (node = M_WXLSTATEDATA->m_bindings.GetFirst(); node; node = node->GetNext() )
    {
        wxLuaBinding* binding = node->GetData();

        WXLUAEVENT *pLuaEvent = (WXLUAEVENT *) bsearch(&eventItem,
                                                    binding->GetLuaEventList(),
                                                    binding->GetLuaEventCount(),
                                                    sizeof(WXLUAEVENT),
                                                    wxLuaEventListCompareFn);

        // found
        if (pLuaEvent)
            return pLuaEvent;
    }

    return NULL;
}



--- NEW FILE: wxlbind.cpp ---
/////////////////////////////////////////////////////////////////////////////
// Purpose:       wxLuaBinding
// Author:        Ray Gilbert, John Labenski, J Winwood
// Created:       14/11/2001
// Copyright:
// Licence:       wxWidgets licence
/////////////////////////////////////////////////////////////////////////////

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

#include "wx/wxprec.h"

#ifdef __BORLANDC__
    #pragma hdrstop
#endif

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

#include "wx/datetime.h"

#include "../../../bindings/wxwidgets/luasetup.h.in" // get the base library setup parameters
#include "wxlua/include/internal.h"
#include "wxlua/include/wxlcallb.h"
#include "wxlua/include/wxlbind.h"
#include "wxbind/include/wxbind.h"
#include "wxlua/include/wxlintrp.h"

#include "wx/listimpl.cpp"
WX_DEFINE_LIST(wxLuaBindingList);

static int LUACALL wxLuaTableErrorHandler(lua_State *L)
{
    terror(L, "Cannot modify read-only wxLua table");
    return 0;
}

// Function to compare to events by eventType
int wxLuaEventListCompareFn(const void *p1, const void *p2)
{
    return (*((const WXLUAEVENT *) p1)->eventType) - (*((const WXLUAEVENT *) p2)->eventType);
}

// ----------------------------------------------------------------------------
// wxLuaBinding
// ----------------------------------------------------------------------------

IMPLEMENT_CLASS(wxLuaBinding, wxObject)

wxLuaBinding::wxLuaBinding()
:
    wxObject(),
    pfGetClassList(NULL),
    pfGetDefineList(NULL),
    pfGetEventList(NULL),
    pfGetObjectList(NULL),
    pfGetBuiltinList(NULL),
    m_classCount(0),
    m_classList(NULL),
    m_defineCount(0),
    m_defineList(NULL),
    m_eventCount(0),
    m_eventList(NULL),
    m_objectCount(0),
    m_objectList(NULL),
    m_builtinCount(0),
    m_builtinList(NULL),
    m_typesRegistered(false),
    m_startTag(0),
    m_lastTag(0),
    m_wxLuaTable(0)
{
}

void wxLuaBinding::RegisterBinding(lua_State *L, bool registerTypes)
{
    int luaTable = RegisterFunctions(L, registerTypes);

    // create a global
    lua_pushstring(L, wx2lua(nameSpace));
    lua_pushvalue(L, luaTable);
    lua_rawset(L, LUA_GLOBALSINDEX);
    lua_pop(L, 1);
}

void wxLuaBinding::UnRegisterBinding(lua_State *L)
{
    lua_pushstring(L, wx2lua(nameSpace));
    lua_pushnil(L);
    lua_rawset(L, LUA_GLOBALSINDEX);
}

int LUACALL wxLuaBinding::RegisterFunctions(lua_State *L, bool registerTypes)
{
    GET_LUASTATEVARS_MSG(L, 0)

    if (!registerTypes && !m_typesRegistered)
        terror(L, "wxLua: First time registration must register types");

    // create references table in registry
//    lua_pushstring(L, wxLuaReferences);
//    lua_newtable(L);
//    lua_rawset(L, LUA_REGISTRYINDEX);

    // create a tag for the wxLua table
    if (registerTypes)
        m_wxLuaTable = tnewtag(L);

    // create the wxLua table
    lua_newtable(L);
    int tableOffset = lua_gettop(L);

    // set the table tag
    tsettag (L, m_wxLuaTable);

    // prevent changes from lua scripts
    tsettagmethod (L, m_wxLuaTable, "__newindex", wxLuaTableErrorHandler);

    // register all out classes etc. in the wxLua table
    RegisterGeneratedClasses(L, tableOffset, registerTypes);

    OnRegister(L, registerTypes, tableOffset);

	m_typesRegistered = true;

    return tableOffset;
}

void LUACALL wxLuaBinding::RegisterGeneratedClasses(lua_State *L, int tableOffset, bool registerTypes)
{
    GET_LUASTATEVARS_RET(L)

    static const luaL_reg funcTable[] =
    {
        {"__gc",       garbageCollect },
        {"__index",    getTableFunc   },
        {"__newindex", setTableFunc   }
    };
    const unsigned funcCount = sizeof(funcTable)/sizeof(funcTable[0]);

    size_t iClass;
    if (registerTypes)
        m_startTag = tnewtag(L);

    int iTag = m_startTag;

    // install the classes, functions and methods
    m_classList = (*pfGetClassList)(m_classCount);
    for (iClass = 0; iClass < m_classCount; ++iClass,
        iTag = registerTypes ? tnewtag(L) : iTag + 1)
    {
        WXLUACLASS *pClass = m_classList + iClass;

        *pClass->class_tag = iTag;

        //wxPrintf(wxT("RegisterGenClasses %d '%s'\n"), iTag, lua2wx(pClass->name).c_str());

        for (unsigned iFunction = 0; iFunction < funcCount; iFunction++)
        {
            tsettagmethod (L, iTag, funcTable[iFunction].name, funcTable[iFunction].func, (void *) pClass);
        }

        for (int iMethod = 0; iMethod < pClass->num_methods; ++iMethod)
        {
            WXLUAMETHOD *pMethod = pClass->methods + iMethod;
            if ((pMethod->type == LuaConstructor) || (pMethod->type == LuaGlobal))
            {
                lua_pushstring(L, pMethod->name);
                lua_pushcfunction(L, pMethod->func);
                lua_rawset(L, tableOffset);
            }
        }
    }
    m_lastTag = iTag;

    // register all the builtin functions
    m_builtinList = (*pfGetBuiltinList)(m_builtinCount);
    for (size_t iBuiltin= 0; iBuiltin < m_builtinCount; ++iBuiltin)
    {
        WXLUAMETHOD *pMethod = m_builtinList + iBuiltin;
        lua_pushstring(L, pMethod->name);
        lua_pushcfunction(L, pMethod->func);
        lua_rawset(L, tableOffset);
    }

    // for backward compatibility
    lua_pushliteral(L, "FALSE");
    lua_pushboolean(L, false);
    lua_rawset(L, tableOffset);

    lua_pushliteral(L, "TRUE");
    lua_pushboolean(L, true);
    lua_rawset(L, tableOffset);

    // install the definitions and strings
    m_defineList = (*pfGetDefineList)(m_defineCount);
    for (size_t iDefine = 0; iDefine < m_defineCount; ++iDefine)
    {
        WXLUADEFINE *pDefine = m_defineList + iDefine;
        lua_pushstring(L, pDefine->name);
        if (pDefine->isString)
            lua_pushstring(L, wx2lua(pDefine->strValue));
        else
            lua_pushnumber(L, pDefine->value);
        lua_rawset(L, tableOffset);
    }

    // install the objects and pointers
    m_objectList = (*pfGetObjectList)(m_objectCount);
    for (size_t iObject = 0; iObject < m_objectCount; ++iObject)
    {
        WXLUAOBJECT *pObject = m_objectList + iObject;
        lua_pushstring(L, pObject->objName);
        if (pObject->objPtr != 0)
            tpushusertag(L, pObject->objPtr, *pObject->objClassTag);
        else
            tpushusertag(L, *pObject->pObjPtr, *pObject->objClassTag);
        lua_rawset(L, tableOffset);
    }

    // register all the event types
    m_eventList = (*pfGetEventList)(m_eventCount);
    for (size_t iEvent = 0; iEvent < m_eventCount; ++iEvent)
    {
        WXLUAEVENT *pEvent = m_eventList + iEvent;
        lua_pushstring(L, pEvent->eventName);
        lua_pushnumber(L, *pEvent->eventType);
        lua_rawset(L, tableOffset);
    }

    // sort the event list into order for faster lookup.
    qsort(m_eventList,
          m_eventCount,
          sizeof(WXLUAEVENT),
          wxLuaEventListCompareFn);
}

bool wxLuaBinding::SetBaseClassTag(WXLUACLASS *pClass)
{
    if (!pClass->baseclass)
        return false;

    if (!m_classList)
        return false;

    // install the classes, functions and methods
    for (size_t i = 0; i < m_classCount; ++i)
    {
        WXLUACLASS* baseClass = m_classList + i;

        if (strcmp(baseClass->name, pClass->baseclass) == 0)
        {
            pClass->baseclass_tag = *baseClass->class_tag;
            return true;
        }
    }

    return false;
}

--- NEW FILE: wxlintrp.cpp ---
/////////////////////////////////////////////////////////////////////////////
// Name:        wxLuaInterpreter
// Purpose:     A simple class for a C++ wxWidgets program to embed wxLua
// Author:      John Labenski
// Modified by:
// Created:     11/05/2002
// RCS-ID:
// Copyright:   (c) John Labenki
// Licence:     wxWidgets licence
/////////////////////////////////////////////////////////////////////////////
// references
// http://www.andreas-rozek.de/Lua/index_en.html interesing libraries perhaps

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

// For compilers that support precompilation, includes "wx/wx.h".
#include "wx/wxprec.h"

#ifdef __BORLANDC__
    #pragma hdrstop
#endif

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

#include "wxlua/include/wxlintrp.h"
#include "wxlua/include/internal.h"

extern int s_wxLuaInterpreter;

wxHashMapLuaInterpreter s_wxHashMapLuaInterpreter;

// add lua_States created from lua's coroutines
#define WXLUA_THREAD_INTERCEPTION

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
}

#ifdef WXLUA_THREAD_INTERCEPTION

// Hook into function calls to luaE_newthread (calls from coroutine.create/wrap)
//  and add the new lua_State as a child sharing it's wxLuaStateVariables
void wxLuaInterpreter_newthread_handler(lua_State *L, lua_State *L1)
{
    // L is the original lua_State, L1 new child thread
    wxLuaInterpreter *L_interp = wxFindLuaInterpreter(L);
    //printf("Adding new lua_State from a thread L=%ld L1=%ld\n", (long)L, (long)L1); fflush(stdout);

    if (L_interp != NULL)
        s_wxHashMapLuaInterpreter[L1] = L_interp;
}

// Hook into function calls to luaE_freethread (calls from coroutine.create/wrap)
//  and remove the child lua_State
void wxLuaInterpreter_freethread_handler(lua_State *WXUNUSED(L), lua_State *L1)
{
    // L is the original lua_State, L1 child thread, don't remove L
    //printf("Freeing lua_State from a thread L=%ld L1=%ld\n", (long)L, (long)L1); fflush(stdout);
    s_wxHashMapLuaInterpreter.erase(L1);
}

static void setupthreadhandlers()
{
    if (luaX_getnewthreadhandler() == NULL)
        luaX_setnewthreadhandler( wxLuaInterpreter_newthread_handler );
    if (luaX_getfreethreadhandler() == NULL)
        luaX_setfreethreadhandler( wxLuaInterpreter_freethread_handler );
}

#endif //WXLUA_THREAD_INTERCEPTION

// ----------------------------------------------------------------------------
// Extra wxLua helpers that use the lua_State to find owner wxLuaInterpreter
// ----------------------------------------------------------------------------

wxLuaInterpreter *wxFindLuaInterpreter(lua_State *L)
{

    int top = lua_gettop( L );

    // try to get the state
    lua_pushstring( L, "__wxLuaInterpreter" );
    lua_gettable( L, LUA_REGISTRYINDEX );

    // if nothing was returned or it wasn't a ptr, abort
    if ( top == lua_gettop(L) || !lua_islightuserdata(L, -1) )
    {
        lua_settop( L, top );
        return NULL;
    }
    // get the pointer, clean the stack, return
    wxLuaInterpreter* lI = (wxLuaInterpreter*)lua_touserdata( L, -1 );
    lua_settop( L, top );
    return lI;
}

wxLuaStateVariables *wxFindLuaStateVariables(lua_State *L)
{
    wxLuaInterpreter *luaInterpreter = wxFindLuaInterpreter(L);
    if (luaInterpreter && luaInterpreter->Ok())
        return luaInterpreter->GetStateVariables();

    return NULL;
}

// ----------------------------------------------------------------------------
// wxFindWindowByPointer - find a window by it's pointer
//     return NULL if doesn't exist, see wxFindWindowByID and wxFindWindowByLabel
// ----------------------------------------------------------------------------
static wxWindow *wxFindWindowPointerRecursively(const wxWindow *parent, const wxWindow *win)
{
    wxCHECK_MSG(win, NULL, wxT("invalid window in wxFindWindowPointerRecursively"));

    if ( parent )
    {
        // see if this is the one we're looking for
        if ( parent == win )
            return (wxWindow*)win;

        // It wasn't, so check all its children
        for ( wxWindowList::Node * node = parent->GetChildren().GetFirst();
              node;
              node = node->GetNext() )
        {
            // recursively check each child
            wxWindow *child_win = (wxWindow *)node->GetData();
            wxWindow *retwin = wxFindWindowPointerRecursively(child_win, win);
            if (retwin)
                return retwin;
        }
    }

    // Not found
    return NULL;
}

// Check to see if wxWidgets still thinks "win" is a valid window
//   parent is the window to start with, if parent=NULL check all windows
static wxWindow* wxFindWindowByPointer(const wxWindow *parent, const wxWindow *win)
{
    wxCHECK_MSG(win, NULL, wxT("Invalid window in wxFindWindowByPointer"));

    if ( parent )
    {
        // just check parent and all its children
        return wxFindWindowPointerRecursively(parent, win);
    }
    // start at very top of wx's windows
    for ( wxWindowList::Node * top_node = wxTopLevelWindows.GetFirst();
          top_node;
          top_node = top_node->GetNext() )
    {
        // recursively check each window & its children
        wxWindow *top_win = top_node->GetData();
        wxWindow *retwin = wxFindWindowPointerRecursively(top_win, win);
        if (retwin)
            return retwin;
    }

    return NULL;
}

// ----------------------------------------------------------------------------
// wxLuaCleanupWindows - given a wxList of wxWindows it runs wxFindWindowByPointer
//    on it to remove dead pointers from the list if only_check=TRUE or
//    Destroy() the windows and remove them from the list if !only_check.
//    This is for use with wxLuaStateVariables::m_pWindowList.
//    returns TRUE if any windows removed, ie. the list has changed
// ----------------------------------------------------------------------------
bool wxLuaCleanupWindows(wxList *list, bool only_check)
{
    bool removed = FALSE;

    wxNode *node = list->GetFirst();

    while (node != NULL)
    {
        wxWindow *win = (wxWindow *)node->GetData();

        if (!win)
        {
            wxNode *lastNode = node;
            node = node->GetNext();
            list->DeleteNode(lastNode);
        }
        else if (wxFindWindowByPointer(NULL, win) == NULL)
        {
            removed = TRUE;
            wxNode *lastNode = node;
            node = node->GetNext();
            //printf("%d %d\n", int(lastNode), int(node)); fflush(stdout);
            list->DeleteNode(lastNode);
        }
        else if (!only_check)
        {
            removed = TRUE;
            if (win->HasCapture())
                win->ReleaseMouse();

            // release capture for children since we may be abruptly ending
            for ( wxWindowList::compatibility_iterator childNode = win->GetChildren().GetFirst();
                  childNode;
                  childNode = childNode->GetNext() )
            {
                wxWindow *child = childNode->GetData();
                list->DeleteObject(child);
                if (child->HasCapture())
                    child->ReleaseMouse();
            }

            if (!win->IsBeingDeleted())
            {
                delete win;
            }

            // wxLuaWindowDestroyHandler should destroy this node
            //  and also delete all the children and their nodes
            //  it's probably best to start from the top again
            list->DeleteObject(win);

            //wxPrintf(wxT("%d %d\n"), int(1), int(win)); fflush(stdout);

            node = list->GetFirst();
        }
        else
            node = node->GetNext();
    }
    return removed;
}

// ----------------------------------------------------------------------------
// lua hooks and function replacements for embedding into wxWidgets
// ----------------------------------------------------------------------------

int LuaPrint( lua_State *L )
{
    wxString msg;
    int i, n = lua_gettop(L);

    // figure out the types here in c++ land
    lua_getglobal(L, "tostring");
    for (i = 1; i <= n; i++)
    {
        if (i > 1) msg.Append(wxT(", "));

        if (lua_isstring(L, i))
            msg += lua2wx(lua_tostring(L, i));
        else if (lua_isnumber(L, i))
            msg += wxString::Format(wxT("%lf"), lua_tonumber(L, i));
        else if (lua_iscfunction(L, i))
            msg += wxString::Format(wxT("C function %ld"), (long int)lua_tocfunction(L, i));
        else if (lua_isuserdata(L, i))
            msg += wxString::Format(wxT("User data %ld"), (long int)lua_touserdata(L, i));
        else if (lua_isboolean(L, i))
            msg += lua_toboolean(L,i) ? wxT("true") : wxT("false");
        else if (lua_isnil(L,i))
            msg += wxT("nil");
        else if (lua_isnone(L,i))
            msg += wxT("unknown");
        else
            msg += wxString::Format(wxT("%s:%p"), lua_typename(L,lua_type(L,i)), lua_topointer(L,i));
    }

    if (!msg.IsEmpty())
    {
        wxLuaInterpreter *luaInterpreter = wxFindLuaInterpreter(L);

        if (luaInterpreter)
        {
            wxLuaEvent event(wxEVT_LUA_CONSOLE, luaInterpreter->GetId(), luaInterpreter);
            event.SetString(msg);
            luaInterpreter->SendEvent( event );
        }
    }

    return 0; // no items put onto stack
}

// copied from the Lua 5.0.1 debug library
#define LEVELS1 12  /* size of the first part of the stack */
#define LEVELS2 10  /* size of the second part of the stack */

// copied from the Lua 5.0.1 debug library
int LuaTraceback(lua_State *L)
{
    int level = 1;      // skip level 0 (it's this function)
    int firstpart = 1;  // still before eventual `...'
    lua_Debug ar;
    if (lua_gettop(L) == 0)
        lua_pushliteral(L, "");
    else if (!lua_isstring(L, 1))   // no string message
        return 1;
    else
        lua_pushliteral(L, "\n");

    lua_pushliteral(L, "stack traceback:");
    while (lua_getstack(L, level++, &ar))
    {
        if (level > LEVELS1 && firstpart)
        {
            // no more than `LEVELS2' more levels?
            if (!lua_getstack(L, level+LEVELS2, &ar))
                level--;  // keep going
            else
            {
                lua_pushliteral(L, "\n\t...");  // too many levels
                while (lua_getstack(L, level+LEVELS2, &ar))  // find last levels
                    level++;
            }
            firstpart = 0;
            continue;
        }
        lua_pushliteral(L, "\n\t");
        lua_getinfo(L, "Snl", &ar);
        lua_pushfstring(L, "%s:", ar.short_src);
        if (ar.currentline > 0)
            lua_pushfstring(L, "%d:", ar.currentline);
        switch (*ar.namewhat)
        {
            case 'g':  // global
            case 'l':  // local
            case 'f':  // field
            case 'm':  // method
                lua_pushfstring(L, " in function `%s'", ar.name);
                break;
            default: {
                if (*ar.what == 'm')  // main?
                    lua_pushfstring(L, " in main chunk");
                else if (*ar.what == 'C' || *ar.what == 't')
                    lua_pushliteral(L, " ?");  // C function or tail call
                else
                    lua_pushfstring(L, " in function <%s:%d>",
                                    ar.short_src, ar.linedefined);
            }
        }
        lua_concat(L, lua_gettop(L));
    }
    lua_concat(L, lua_gettop(L));
    return 1;
}

int LuaAlert( lua_State *L )
{
    wxLuaInterpreter *luaInterpreter = wxFindLuaInterpreter(L);

    if (luaInterpreter)
    {
        wxString msg = lua2wx(lua_tostring(L, 1));

        wxLuaEvent event(wxEVT_LUA_ERROR, luaInterpreter->GetId(), luaInterpreter);
        event.SetString(msg);

        long line = -1;
        wxString lineStr = msg;

        // Why can't I fill a lua_Debug here? Try to get the line number
        // by parsing the error message that looks like this, 1 is linenumber
        // [string "a = 1("]:1: unexpected symbol near `<eof>'
        while(!lineStr.IsEmpty())
        {
            lineStr = lineStr.AfterFirst(wxT(']'));
            if ((lineStr.Length() > 0) && (lineStr.GetChar(0) == wxT(':')))
            {
                lineStr = lineStr.AfterFirst(wxT(':'));
                if (lineStr.IsEmpty() || lineStr.BeforeFirst(wxT(':')).ToLong(&line))
                    break;
            }
        }

        event.SetInt((int)line);
        luaInterpreter->SendEvent( event );
    }

    return 0;
}

void LuaDebugHook(lua_State *L, lua_Debug *LDebug)
{
    wxLuaInterpreter *luaInterpreter = wxFindLuaInterpreter(L);

    // during program shutdown this can be called - ignore it
    if (luaInterpreter == NULL)
        return;

    // FIXME - for select event types we don't want to do anything
    wxEventType evtType = luaInterpreter->GetStateVariables()->m_inEventType;
    if ((evtType != -1))
        //(evtType == wxEVT_IDLE) && (evtType == wxEVT_PAINT) &&
        //(evtType == wxEVT_DESTROY) && (evtType == wxEVT_CLOSE_WINDOW))
        return;

    // they want to break the program, restore old debug hook, then error out
    if (luaInterpreter->GetBreak())
    {
        // restore hook to previous state see wxLuaInterpreter::Break()
        luaInterpreter->SetLuaDebugHook(luaInterpreter->GetLuaDebugHookCount(),
                                        luaInterpreter->GetLuaDebugHookYield(),
                                        luaInterpreter->GetLuaDebugHookSendEvt(),
                                        luaInterpreter->GetLuaDebugHook());

        terror(L, wx2lua(luaInterpreter->GetBreakMessage()));
        return;
    }

    if (luaInterpreter->GetLuaDebugHookSendEvt())
    {
        int ret = 0;
        ret = lua_getinfo(L, "l", LDebug); // line (ldebug.currentline)

        wxLuaEvent event(wxEVT_LUA_DEBUG_HOOK, luaInterpreter->GetId(), luaInterpreter);
        event.m_lua_Debug = LDebug;
        event.SetInt(LDebug->currentline);
        luaInterpreter->SendEvent( event );
        if (event.m_stop_interpreter)
            terror(L, "Interpreter stopped");
    }

    // Try to yield *after* sending event to allow C++ gui update
    if (luaInterpreter->GetLuaDebugHookYield() > 0)
    {
        // yield based on number of ms passed NOT every hook event
        unsigned long last_time = luaInterpreter->GetLastLuaDebugHookTime();
        unsigned long cur_time  = wxGetLocalTimeMillis().GetLo();

        if ((cur_time > last_time + luaInterpreter->GetLuaDebugHookYield()) ||
            (cur_time < last_time)) // wrapped
        {
            luaInterpreter->SetLastLuaDebugHookTime( cur_time );

            bool painting = false;

#if WXWIN_COMPATIBILITY_24 || !wxCHECK_VERSION(2, 5, 0)
            wxNode* node;
#else
			wxHashTable::Node* node;
#endif

            // FIXME - wxGTK crashes if wxYield[IfNeeded] is called within a paint handler? I think
            luaInterpreter->GetStateVariables()->m_pTrackedList->BeginFind();
            node = luaInterpreter->GetStateVariables()->m_pTrackedList->Next();
            while (node)
            {
                if (wxDynamicCast(node->GetData(), wxPaintDC))
                {
                    painting = true;
                    break;
                }
                node = luaInterpreter->GetStateVariables()->m_pTrackedList->Next();
            }

            if (!painting)
                wxYieldIfNeeded();
        }
    }
}

//-----------------------------------------------------------------------------
// wxLuaEvent
//-----------------------------------------------------------------------------

DEFINE_LOCAL_EVENT_TYPE(wxEVT_LUA_CREATION)
DEFINE_LOCAL_EVENT_TYPE(wxEVT_LUA_CONSOLE)
DEFINE_LOCAL_EVENT_TYPE(wxEVT_LUA_WARNING)
DEFINE_LOCAL_EVENT_TYPE(wxEVT_LUA_ERROR)
DEFINE_LOCAL_EVENT_TYPE(wxEVT_LUA_DEBUG_HOOK)
DEFINE_LOCAL_EVENT_TYPE(wxEVT_LUA_INIT)
DEFINE_LOCAL_EVENT_TYPE(wxEVT_LUA_DEBUGGERATTACHED)
DEFINE_LOCAL_EVENT_TYPE(wxEVT_LUA_SHUTDOWN)

wxLuaEvent::wxLuaEvent(wxEventType commandType, int id, wxLuaInterpreter *interpreter)
           : wxNotifyEvent(commandType, id)
{
    m_luaInterpreter = interpreter;
    m_lua_Debug = NULL;
    m_stop_interpreter = FALSE;
}

//-----------------------------------------------------------------------------
// wxLuaInterpreter
//-----------------------------------------------------------------------------
IMPLEMENT_ABSTRACT_CLASS(wxLuaInterpreter, wxObject)

wxLuaInterpreter::wxLuaInterpreter() : wxObject()
{
    Init();
}
wxLuaInterpreter::wxLuaInterpreter(wxEvtHandler *handler, int id) : wxObject()
{
    Init();
    Create(handler, id);
}

void wxLuaInterpreter::Init()
{
#ifdef WXLUA_THREAD_INTERCEPTION
	setupthreadhandlers();
#endif //WXLUA_THREAD_INTERCEPTION

    m_is_running = FALSE;
    m_user_break = FALSE;

    m_last_debug_hook_time = wxGetLocalTimeMillis().GetLo();

    m_id = wxID_ANY;
    m_evtHandler = NULL;
    m_lua_State = NULL;
    m_luaAllocated = false;
    m_luaStateVariables = NULL;

    m_lua_debug_hook_count = 100;
    m_lua_debug_hook_yield = 50;
    m_lua_debug_hook_send_evt = FALSE;
    m_lua_debug_hook = 0;
}

bool wxLuaInterpreter::Create(lua_State *inL, wxEvtHandler *handler, int id)
{
    if (Ok() && !Destroy(true))
        return false;

    m_luaStateVariables = new wxLuaStateVariables;
    m_evtHandler = handler;
    m_id = id;

    // create a lua instance
    if (inL != NULL)
    {
        m_lua_State = inL;
        m_luaAllocated = false;
    }
    else
    {
        m_lua_State = lua_open();
        m_luaAllocated = true;
    }

    lua_State *L = m_lua_State;
    // load some useful libraries
    luaopen_base(L);
    luaopen_table(L);
    luaopen_string(L);
    luaopen_math(L);
    luaopen_debug(L);
    luaopen_io(L);
    luaopen_loadlib(L);

    s_wxHashMapLuaInterpreter[L] = this;

    // Stick us into the lua interpreter - push key, value
    lua_pushstring( L, "__wxLuaInterpreter" );
    lua_pushlightuserdata( L, (void*)this );
    // set the value
    lua_settable( L, LUA_REGISTRYINDEX );

    // register handlers to send events
    if (m_luaAllocated)
    {
        RegisterFunction(LuaPrint, wxT("print"));
        RegisterFunction(LuaAlert, wxT("_ALERT"));
        RegisterFunction(LuaTraceback, wxT("_TRACEBACK"));
    }

    // alert people that we've been created so they can finish setting us up
    wxLuaEvent event(wxEVT_LUA_CREATION, GetId(), this);
    SendEvent( event );

    // now register bindings
    m_luaStateVariables->RegisterBindings(m_lua_State, true);

    return true;
}

wxLuaInterpreter::~wxLuaInterpreter()
{
    if (Ok())
    {
        m_evtHandler = NULL;  // no events here, the handler may already be gone
        Destroy(true);
    }

    delete m_luaStateVariables;
}

void wxLuaInterpreter::GarbageCollectWindows(bool closeWindows)
{
    // remove deleted windows
    if (Ok() &&
        m_luaStateVariables->m_pWindowList &&
        m_luaStateVariables->m_pWindowList->GetCount())
        wxLuaCleanupWindows(m_luaStateVariables->m_pWindowList, !closeWindows);
}

bool wxLuaInterpreter::Destroy(bool force)
{
    wxCHECK_MSG(Ok(), FALSE, wxT("Interpreter not created"));
    wxCHECK_MSG(!m_is_running, FALSE, wxT("Interpreter still running, can't destroy"));

    // remove deleted windows first
    if (m_luaStateVariables->m_pWindowList &&
        m_luaStateVariables->m_pWindowList->GetCount())
        wxLuaCleanupWindows(m_luaStateVariables->m_pWindowList, TRUE);

    // are there still windows? ask to abort deleting them if !force
    if (m_luaStateVariables->m_pWindowList &&
        m_luaStateVariables->m_pWindowList->GetCount())
    {
        int ret = wxOK;

        if (!force)
        {
            ret = wxMessageBox(wxT("Windows are still open, would you like to delete them?"),
                               wxT("Delete existing windows?"), wxOK|wxCANCEL|wxICON_QUESTION);
        }

        if (ret == wxCANCEL)
            return FALSE;

        //wxPrintf(wxT("Deleting windows\n"));

        // delete windows and their eventhandler since they delete the LuaCallbacks
        //  which require a lua_State
        wxLuaCleanupWindows(m_luaStateVariables->m_pWindowList, FALSE);
        // wait for wxWindow::Destroy() to really delete the windows
        //wxYieldIfNeeded();
    }

    CleanupWxLua(m_lua_State, m_luaAllocated);

    s_wxHashMapLuaInterpreter.erase(m_lua_State);

    delete m_luaStateVariables;
    m_luaStateVariables = NULL;
    m_lua_State = NULL;
    m_evtHandler = NULL;

    return TRUE;
}

bool wxLuaInterpreter::Ok() const
{
    return m_lua_State != NULL;
}

void wxLuaInterpreter::SetEventHandler(wxEvtHandler *evtHandler)
{
    m_evtHandler = evtHandler;
}

int wxLuaInterpreter::RunFile(const wxString &filename)
{
    wxCHECK_MSG(Ok(), -1, wxT("lua interpreter not created"));
    wxCHECK_MSG(!m_is_running, -1, wxT("lua interpreter is already running"));
    m_user_break = FALSE;

    m_is_running = TRUE;
//    int ret_val = lua_dofile(m_lua_State, wx2lua(filename));
    int ret_val = LuaDoFile(m_lua_State, filename); // FIXME use LuaDoFile in RunFile ?
    m_is_running = FALSE;
    if (!m_user_break)
        (void)CheckRunError(ret_val);

    m_user_break = FALSE;
    return ret_val;
}

int wxLuaInterpreter::RunString(const wxString &script, const wxString& WXUNUSED(name))
{
    wxCHECK_MSG(Ok(), -1, wxT("lua interpreter not created"));
    wxCHECK_MSG(!m_is_running, -1, wxT("lua interpreter is already running"));
    m_user_break = FALSE;

    m_is_running = TRUE;
    //int ret_val = luaL_loadbuffer(m_lua_State, wx2lua(script), script.Len(), wx2lua(name));
    int ret_val = lua_dostring(m_lua_State, wx2lua(script));
    m_is_running = FALSE;

    // if it's been stopped then don't send this error message, already sent stopped one
    if (!m_user_break)
        (void)CheckRunError(ret_val);

    m_user_break = FALSE;
    return ret_val;
}

int wxLuaInterpreter::RunBuffer(const unsigned char buf[], size_t size, const wxString &name)
{
    wxCHECK_MSG(Ok(), -1, wxT("lua interpreter not created"));
    wxCHECK_MSG(!m_is_running, -1, wxT("lua interpreter is already running"));
    m_user_break = FALSE;

    m_is_running = TRUE;
    //int ret_val = luaL_loadbuffer(m_lua_State, (const char*)buf, size, wx2lua(name));
    int ret_val = lua_dobuffer(m_lua_State, (const char*)buf, size, wx2lua(name));
    m_is_running = FALSE;

    if (!m_user_break)
        (void)CheckRunError(ret_val);

    m_user_break = FALSE;
    return ret_val;
}

void wxLuaInterpreter::Break(const wxString &msg)
{
    wxCHECK_RET(Ok(), wxT("lua interpreter not created"));
    wxCHECK_RET(m_is_running, wxT("lua interpreter not running"));

    // Lua likes to be stopped within the debug hook, you get funny wxYield
    //  recursion asserts if you call terror() within another wxYield, ie. from a gui button

    m_break_msg = msg;
    m_user_break = TRUE;
    SetLuaDebugHook(1, -1, FALSE);
    m_is_running = FALSE;
}

void wxLuaInterpreter::SetLuaDebugHook(int count, int yield, bool send_debug_evt, int hook)
{
    wxCHECK_RET(Ok(), wxT("lua interpreter not created"));

    m_lua_debug_hook_count = count;
    m_lua_debug_hook_yield = yield;
    m_lua_debug_hook_send_evt = send_debug_evt;
    m_lua_debug_hook = hook;

    if (count > 0)
    {
        // These are the various hooks you can install
        //LUA_MASKCALL, LUA_MASKRET, LUA_MASKLINE, and LUA_MASKCOUNT
        //lua_sethook(m_lua_State, LuaDebugHook, LUA_MASKCALL | LUA_MASKLINE | LUA_MASKRET, 0);
        lua_sethook(m_lua_State, LuaDebugHook, hook, count);
    }
    else
        lua_sethook(m_lua_State, LuaDebugHook, 0, 0); // disable hook
}

unsigned long wxLuaInterpreter::GetLastLuaDebugHookTime() const
{
    return m_last_debug_hook_time;
}
void wxLuaInterpreter::SetLastLuaDebugHookTime(unsigned long t)
{
    m_last_debug_hook_time = t;
}

lua_State *wxLuaInterpreter::GetLuaState() const
{
    return m_lua_State;
}
wxLuaStateVariables *wxLuaInterpreter::GetStateVariables() const
{
    return m_luaStateVariables;
}

void wxLuaInterpreter::RegisterFunction(lua_CFunction func, const wxString &funcName)
{
    wxCHECK_RET(Ok(), wxT("lua interpreter not created"));
    lua_register( GetLuaState(), wx2lua(funcName), func );
}

void wxLuaInterpreter::DisplayError( const wxString &errorMsg )
{
    wxLuaEvent event(wxEVT_LUA_ERROR, GetId(), this);
    event.SetString(errorMsg);
    SendEvent( event );
}

bool wxLuaInterpreter::CheckRunError(int rc)
{
    wxString msg;
    if (!wxLuaCheckRunError(rc, &msg))
    {
        wxLuaEvent event(wxEVT_LUA_ERROR, GetId(), this);
        event.SetString(msg);
        event.SetInt(-1); // don't know what line the error occured
        SendEvent( event );
        return FALSE;
    }
    return TRUE;
}

void wxLuaInterpreter::SendEvent( wxLuaEvent &event ) const
{
    if (GetEventHandler())
    {
        event.SetEventObject( (wxObject*)this );
        GetEventHandler()->ProcessEvent(event);
    }
}

--- NEW FILE: wxlcallb.cpp ---
/////////////////////////////////////////////////////////////////////////////
// Name:        wxLuaCall
// Purpose:     A simple class for a C++ wxWidgets program to embed wxLua
// Author:      Francis Irving
// Created:     11/05/2002
// Copyright:   (c) 2002 Creature Labs. All rights reserved.
// Licence:     wxWidgets licence
/////////////////////////////////////////////////////////////////////////////

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

// For compilers that support precompilation, includes "wx/wx.h".
#include "wx/wxprec.h"

#ifdef __BORLANDC__
    #pragma hdrstop
#endif

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

#include "wxlua/include/internal.h"
#include "wxlua/include/wxlcallb.h"

extern int s_wxEvent;

//-----------------------------------------------------------------------------
// wxLuaCallback
//-----------------------------------------------------------------------------

IMPLEMENT_CLASS(wxLuaCallback, wxEvtHandler);

// Encapsulate a lua function reference for use by a event callback
wxLuaCallback::wxLuaCallback( lua_State    *L,
                              int           theRoutine,
                              int           id,
                              wxEventType   eventType,
                              wxEvtHandler *pEvtHandler )
                              : m_luaState(L), m_luaStateVars(NULL),
                                m_pHandler(pEvtHandler),
                                m_id(id), m_eventType(eventType)
{
    GET_LUASTATEVARS_RET(L)
    m_luaStateVars = stateVars;
    m_routine = tinsert(L, theRoutine);

    pEvtHandler->Connect( id,
                          eventType,
                          (wxObjectEventFunction)&wxLuaCallback::EventHandler,
                          this);

    // FIXME - Need to track events attached to an application object
    // labenski - track all of them? useful to run ClearState when window is destroyed
    //if (pEvtHandler->IsKindOf(CLASSINFO(wxApp)))
    {
        m_luaStateVars->m_pAppHandlerList->Append(this);
    }
}

wxLuaCallback::~wxLuaCallback()
{
    // Remove the reference to the Lua function that we are going to call
    if (m_luaState)
        tremove(m_luaState, m_routine);
    // delete the reference to this handler
    if (m_luaStateVars)
        m_luaStateVars->m_pAppHandlerList->DeleteObject(this);
}

// This function is called with "this" being of the type which the event is arriving
// at.  The user data is used to route it to the correct place.
void wxLuaCallback::EventHandler(wxEvent& event)
{
    wxLuaCallback *theCallback = (wxLuaCallback *) event.m_callbackUserData;

    if (!theCallback || !theCallback->GetLuaState() || !theCallback->m_luaStateVars)
        return;

    theCallback->m_luaStateVars->m_inEventType = event.GetEventType();

    if (event.GetEventType() == wxEVT_DESTROY)
    {
        event.Skip();
        theCallback->m_luaStateVars->m_pWindowList->DeleteObject((wxWindow*)event.GetEventObject());

        // Disconnect all callbacks associated with this window's evthandler
        theCallback->ClearState();

        wxEvtHandler *evtHandler = ((wxWindow*)event.GetEventObject())->GetEventHandler();

        wxNode* node = theCallback->m_luaStateVars->m_pAppHandlerList->GetFirst();
        while (node)
        {
            wxLuaCallback *pCallback = (wxLuaCallback *) node->GetData();

            if ((pCallback != NULL) && (pCallback->GetEvtHandler() == evtHandler))
            {
                pCallback->ClearState();
            }

            node = node->GetNext();
        }
    }
    else //if (theCallback->m_luaState)
        theCallback->CallFunction(&event);

    theCallback->m_luaStateVars->m_inEventType = -1;
}

// Call a lua function to handle an event. The lua function will receive
// a single parameter, the type of event.
void wxLuaCallback::CallFunction(wxEvent *pEvent)
{
    // Cannot call it if Lua is gone or the interpreter has been destroyed
    // This can happen when the program exists since windows may be destroyed
    // after lua has been deleted

    if (!m_luaState || !wxFindLuaStateVariables(m_luaState))
        return;

    int eventClassTag = s_wxEvent;

    GET_LUASTATEVARS_RET(m_luaState)
    const WXLUAEVENT *pLuaEvent = stateVars->GetLuaEvent(pEvent);
    if (pLuaEvent)
        eventClassTag = *pLuaEvent->eventClassTag;

    lua_checkstack(m_luaState,LUA_MINSTACK);
    int oldTop = lua_gettop(m_luaState);
    if (tget(m_luaState, m_routine))
    {
        lua_pushvalue(m_luaState, LUA_GLOBALSINDEX);
        if (lua_setfenv(m_luaState, -2) != 0)
        {
            tpushusertag(m_luaState, pEvent, eventClassTag);
            LuaCall(m_luaState, 1, true);
        }
        else
            terror(m_luaState, "wxLua: CallFunction: function is not a Lua function.");
    }
    else
        terror(m_luaState, "wxLua: CallFunction: function has been garbage collected.");

    lua_settop(m_luaState, oldTop);
}

// ----------------------------------------------------------------------------
// wxLuaDestroyCallback
// ----------------------------------------------------------------------------

IMPLEMENT_CLASS(wxLuaDestroyCallback, wxEvtHandler);

wxLuaDestroyCallback::wxLuaDestroyCallback(lua_State *L, int id, wxEvtHandler *pHandler, int iTag)
                     : m_luaState(L), m_luaStateVars(NULL), m_pHandler(pHandler), m_id(id)
{
    GET_LUASTATEVARS_RET(L)
    m_luaStateVars = stateVars;

    // allocate a LUA proxy for the object
    const void **ptr = (const void **) lua_newuserdata(L, sizeof(void *));
    if (ptr != NULL)
    {
        // save the address of the object in the proxy
        *ptr = pHandler;

        // and set the metatable of the proxy
        if (iTag != TLUA_NOTAG && tget(L, iTag))
        {
            if (lua_setmetatable(L, -2) == 0)
            {
                terror(L, "wxLua: Unable to set metatable");
            }
        }

        // get a reference to the destroy handler table
        if (tget(L, stateVars->m_wxDeleteTable))
        {
            // create a reference to object
            lua_pushlightuserdata(L, pHandler); // key
            lua_pushvalue(L, -3);               // value
            // save it in the destroy handler table
            lua_rawset(L, -3);
            lua_pop(L, 1);
        }

        stateVars->m_pDestroyHandlerList->Append(this);

        // connect the event handler
        pHandler->Connect(id,
                          wxEVT_DESTROY,
                          (wxObjectEventFunction)&wxLuaDestroyCallback::EventHandler,
                          this);
    }
    else
    {
        terror(L, "wxLua: Out of memory");
    }
}

wxLuaDestroyCallback::~wxLuaDestroyCallback()
{
    if (m_luaStateVars)
        m_luaStateVars->m_pDestroyHandlerList->DeleteObject(this);
}

void wxLuaDestroyCallback::EventHandler(wxWindowDestroyEvent& event)
{
    wxLuaDestroyCallback *theCallback = (wxLuaDestroyCallback *) event.m_callbackUserData;
    if (theCallback && (((wxWindow*)event.GetEventObject())->GetEventHandler() == m_pHandler))
    {
        theCallback->OnDestroy();
    }

    event.Skip();
}

void wxLuaDestroyCallback::OnDestroy()
{
    // FIXME - Is it an error to receive an event after you've deleted lua?
    //  probably not if lua is getting shutdown
    if (!m_luaState || !m_luaStateVars)
        return;

    // Note: do not remove from m_pDestroyHandlerList here, wait 'till destructor

    if (tget(m_luaState, m_luaStateVars->m_wxDeleteTable))
    {
        // clear the metatable reference in the lua proxy.
        lua_pushlightuserdata(m_luaState, m_pHandler);
        lua_rawget(m_luaState, -2);
        lua_pushnil(m_luaState);
        lua_setmetatable(m_luaState, -2);
        lua_pop(m_luaState, 2);
    }
}

--- NEW FILE: wxlhandl.cpp ---
/////////////////////////////////////////////////////////////////////////////
// Purpose:     Implements wxLuaApp and the wxGetBaseApp function
// Author:      J Winwood
// Created:     14/11/2001
// Modifications: Thanks to Francis Irving for separating out into
//                Library and Standalone modules.
// Copyright:   (c) 2002 Creature Labs. All rights reserved.
// Copyright:   (c) 2001-2002 Lomtick Software. All rights reserved.
// Licence:     wxWidgets licence
/////////////////////////////////////////////////////////////////////////////

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

#include "wx/wxprec.h"

#ifdef __BORLANDC__
    #pragma hdrstop
#endif

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

#include "wxlua/include/wxlhandl.h"
#include "wxlua/include/internal.h"

// ----------------------------------------------------------------------------
// wxLuaHandler - Allow for Custom Lua Handler (an alternative to wxLuaApp)
// ----------------------------------------------------------------------------

wxLuaHandler* wxLuaHandler::sm_luahandler = NULL;

wxLuaHandler::wxLuaHandler()
{
    wxASSERT(!sm_luahandler);

    sm_luahandler = this;
}

wxLuaHandler::~wxLuaHandler()
{
    sm_luahandler = NULL;
}

wxLuaHandler& wxGetLuaHandler()
{
    return *wxLuaHandler::sm_luahandler;
}

[Wxlua-commit] wxLua/modules/wxbind/src luasetup.h,1.1,1.2 wxlhtmlwin.cpp,1.1,1.2 wxlprint.cpp,1.1,1.2

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

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

Modified Files:
	luasetup.h wxlhtmlwin.cpp wxlprint.cpp 
Log Message:
started to break up internal.cpp into wxlstate, wxlcallb...
rename library.h/cpp to wxlhandl since it only contains wxLuaHandler
remove wxLuaApp code, it doesn't exist anymore
compiles and runs in linux


Index: wxlprint.cpp
===================================================================
RCS file: /cvsroot/wxlua/wxLua/modules/wxbind/src/wxlprint.cpp,v
retrieving revision 1.1
retrieving revision 1.2
diff -C2 -d -r1.1 -r1.2
*** wxlprint.cpp	18 Jun 2005 20:53:41 -0000	1.1
--- wxlprint.cpp	25 Nov 2005 02:43:01 -0000	1.2
***************
*** 24,31 ****
  #include "wx/datetime.h"
  
! #include "wxlua/include/callback.h"
  #include "wxlua/include/internal.h"
  #include "wxbind/include/wxlprint.h"
  
  // forward reference
  class wxLuaObject;
--- 24,34 ----
  #include "wx/datetime.h"
  
! #include "wxlua/include/wxlcallb.h"
  #include "wxlua/include/internal.h"
+ #include "luasetup.h"
  #include "wxbind/include/wxlprint.h"
  
+ #if wxLUA_USE_wxLuaPrintout
+ 
  // forward reference
  class wxLuaObject;
***************
*** 59,63 ****
  
  void wxLuaPrintout::GetPageInfo(int *minPage, int *maxPage, int *pageFrom, int *pageTo)
! {    
      lua_State *luaState = getDerivedMethod(this, "GetPageInfo");
      if (luaState != NULL)
--- 62,66 ----
  
  void wxLuaPrintout::GetPageInfo(int *minPage, int *maxPage, int *pageFrom, int *pageTo)
! {
      lua_State *luaState = getDerivedMethod(this, "GetPageInfo");
      if (luaState != NULL)
***************
*** 65,76 ****
          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);
      }
--- 68,79 ----
          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);
      }
***************
*** 93,99 ****
          tpushusertag(luaState, this, s_wxLuaPrintout);
          lua_pushnumber(luaState, pageNum);
!         
          LuaCall(luaState, 2, false);
!         
          fResult = (lua_toboolean(luaState, -1) != false);
          lua_settop(luaState, nOldTop);
--- 96,102 ----
          tpushusertag(luaState, this, s_wxLuaPrintout);
          lua_pushnumber(luaState, pageNum);
! 
          LuaCall(luaState, 2, false);
! 
          fResult = (lua_toboolean(luaState, -1) != false);
          lua_settop(luaState, nOldTop);
***************
*** 107,111 ****
  {
      bool fResult = true;
!     
      lua_State *luaState = getDerivedMethod(this, "OnBeginDocument");
      if (luaState != NULL)
--- 110,114 ----
  {
      bool fResult = true;
! 
      lua_State *luaState = getDerivedMethod(this, "OnBeginDocument");
      if (luaState != NULL)
***************
*** 115,121 ****
          lua_pushnumber(luaState, startPage);
          lua_pushnumber(luaState, endPage);
!         
          LuaCall(luaState, 3, false);
!         
          fResult = (lua_toboolean(luaState, -1) != false);
          lua_pop(luaState, 1);
--- 118,124 ----
          lua_pushnumber(luaState, startPage);
          lua_pushnumber(luaState, endPage);
! 
          LuaCall(luaState, 3, false);
! 
          fResult = (lua_toboolean(luaState, -1) != false);
          lua_pop(luaState, 1);
***************
*** 123,127 ****
      }
      else
!         fResult = wxPrintout::OnBeginDocument(startPage, endPage);            
  
      return fResult;
--- 126,130 ----
      }
      else
!         fResult = wxPrintout::OnBeginDocument(startPage, endPage);
  
      return fResult;
***************
*** 134,138 ****
      {
          int nOldTop = lua_gettop(luaState);
!         tpushusertag(luaState, this, s_wxLuaPrintout);       
          LuaCall(luaState, 1, true);
          lua_settop(luaState, nOldTop);
--- 137,141 ----
      {
          int nOldTop = lua_gettop(luaState);
!         tpushusertag(luaState, this, s_wxLuaPrintout);
          LuaCall(luaState, 1, true);
          lua_settop(luaState, nOldTop);
***************
*** 148,152 ****
      {
          int nOldTop = lua_gettop(luaState);
!         tpushusertag(luaState, this, s_wxLuaPrintout);       
          LuaCall(luaState, 1, true);
          lua_settop(luaState, nOldTop);
--- 151,155 ----
      {
          int nOldTop = lua_gettop(luaState);
!         tpushusertag(luaState, this, s_wxLuaPrintout);
          LuaCall(luaState, 1, true);
          lua_settop(luaState, nOldTop);
***************
*** 162,166 ****
      {
          int nOldTop = lua_gettop(luaState);
!         tpushusertag(luaState, this, s_wxLuaPrintout);       
          LuaCall(luaState, 1, true);
          lua_settop(luaState, nOldTop);
--- 165,169 ----
      {
          int nOldTop = lua_gettop(luaState);
!         tpushusertag(luaState, this, s_wxLuaPrintout);
          LuaCall(luaState, 1, true);
          lua_settop(luaState, nOldTop);
***************
*** 176,180 ****
      {
          int nOldTop = lua_gettop(luaState);
!         tpushusertag(luaState, this, s_wxLuaPrintout);       
          LuaCall(luaState, 1, true);
          lua_settop(luaState, nOldTop);
--- 179,183 ----
      {
          int nOldTop = lua_gettop(luaState);
!         tpushusertag(luaState, this, s_wxLuaPrintout);
          LuaCall(luaState, 1, true);
          lua_settop(luaState, nOldTop);
***************
*** 193,199 ****
          tpushusertag(luaState, this, s_wxLuaPrintout);
          lua_pushnumber(luaState, pageNum);
!         
          LuaCall(luaState, 2, false);
!         
          fResult = (lua_toboolean(luaState, -1) != false);
          lua_settop(luaState, nOldTop);
--- 196,202 ----
          tpushusertag(luaState, this, s_wxLuaPrintout);
          lua_pushnumber(luaState, pageNum);
! 
          LuaCall(luaState, 2, false);
! 
          fResult = (lua_toboolean(luaState, -1) != false);
          lua_settop(luaState, nOldTop);
***************
*** 201,202 ****
--- 204,207 ----
      return fResult;
  }
+ 
+ #endif // wxLUA_USE_wxLuaPrintout

Index: luasetup.h
===================================================================
RCS file: /cvsroot/wxlua/wxLua/modules/wxbind/src/luasetup.h,v
retrieving revision 1.1
retrieving revision 1.2
diff -C2 -d -r1.1 -r1.2
*** luasetup.h	18 Jun 2005 21:07:54 -0000	1.1
--- luasetup.h	25 Nov 2005 02:43:01 -0000	1.2
***************
*** 62,66 ****
  #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
--- 62,65 ----

Index: wxlhtmlwin.cpp
===================================================================
RCS file: /cvsroot/wxlua/wxLua/modules/wxbind/src/wxlhtmlwin.cpp,v
retrieving revision 1.1
retrieving revision 1.2
diff -C2 -d -r1.1 -r1.2
*** wxlhtmlwin.cpp	18 Jun 2005 20:53:41 -0000	1.1
--- wxlhtmlwin.cpp	25 Nov 2005 02:43:01 -0000	1.2
***************
*** 24,32 ****
  #include "wx/datetime.h"
  
! #include "wxbind/include/wxlhtmlwin.h"
! #include "wxlua/include/callback.h"
  #include "wxlua/include/internal.h"
  
! // These are the wxLua tags defined in wxLuaWrap.cpp
  extern int s_wxLuaHtmlWindow;
  extern int s_wxHtmlCell;
--- 24,35 ----
  #include "wx/datetime.h"
  
! #include "wxlua/include/wxlcallb.h"
  #include "wxlua/include/internal.h"
+ #include "luasetup.h"
+ #include "wxbind/include/wxlhtmlwin.h"
  
! #if wxLUA_USE_wxHTML
! 
! // These are the wxLua tags defined in wxbind
  extern int s_wxLuaHtmlWindow;
  extern int s_wxHtmlCell;
***************
*** 53,61 ****
  }
  
! wxLuaHtmlWindow::wxLuaHtmlWindow(wxWindow *parent, 
!                                  wxWindowID id, 
!                                  const wxPoint& pos, 
!                                  const wxSize& size, 
!                                  long  style, 
                                   const wxString& name) :
                   wxHtmlWindow(parent, id, pos, size, style, name)
--- 56,64 ----
  }
  
! wxLuaHtmlWindow::wxLuaHtmlWindow(wxWindow *parent,
!                                  wxWindowID id,
!                                  const wxPoint& pos,
!                                  const wxSize& size,
!                                  long  style,
                                   const wxString& name) :
                   wxHtmlWindow(parent, id, pos, size, style, name)
***************
*** 75,84 ****
          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);
--- 78,87 ----
          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);
***************
*** 98,102 ****
          lua_pushnumber(luaState, x);
          lua_pushnumber(luaState, y);
!         
          LuaCall(luaState, 4, true);
          lua_settop(luaState, nOldTop);
--- 101,105 ----
          lua_pushnumber(luaState, x);
          lua_pushnumber(luaState, y);
! 
          LuaCall(luaState, 4, true);
          lua_settop(luaState, nOldTop);
***************
*** 114,118 ****
          tpushusertag(luaState, this, s_wxLuaHtmlWindow);
          tpushusertag(luaState, (void *) &link, s_wxHtmlLinkInfo);
!         
          LuaCall(luaState, 2, true);
          lua_settop(luaState, nOldTop);
--- 117,121 ----
          tpushusertag(luaState, this, s_wxLuaHtmlWindow);
          tpushusertag(luaState, (void *) &link, s_wxHtmlLinkInfo);
! 
          LuaCall(luaState, 2, true);
          lua_settop(luaState, nOldTop);
***************
*** 130,134 ****
          tpushusertag(luaState, this, s_wxLuaHtmlWindow);
          lua_pushstring(luaState, wx2lua(title));
!     
          LuaCall(luaState, 2, true);
          lua_settop(luaState, nOldTop);
--- 133,137 ----
          tpushusertag(luaState, this, s_wxLuaHtmlWindow);
          lua_pushstring(luaState, wx2lua(title));
! 
          LuaCall(luaState, 2, true);
          lua_settop(luaState, nOldTop);
***************
*** 148,152 ****
      {
      }
!     
      wxString GetSupportedTags()
      {
--- 151,155 ----
      {
      }
! 
      wxString GetSupportedTags()
      {
***************
*** 158,165 ****
          wxLuaHtmlWinTagEvent htmlEvent(wxEVT_HTML_TAG_HANDLER);
          htmlEvent.SetTagInfo(&tag, m_WParser);
!     
          if (wxTheApp->ProcessEvent(htmlEvent))
              return htmlEvent.GetParseInnerCalled();
!         
          return FALSE;
      }
--- 161,168 ----
          wxLuaHtmlWinTagEvent htmlEvent(wxEVT_HTML_TAG_HANDLER);
          htmlEvent.SetTagInfo(&tag, m_WParser);
! 
          if (wxTheApp->ProcessEvent(htmlEvent))
              return htmlEvent.GetParseInnerCalled();
! 
          return FALSE;
      }
***************
*** 196,200 ****
      m_fParseInnerCalled(false)
  {
!     SetEventType(eventType);    
  }
  
--- 199,203 ----
      m_fParseInnerCalled(false)
  {
!     SetEventType(eventType);
  }
  
***************
*** 203,207 ****
  }
  
! void wxLuaHtmlWinTagEvent::SetTagInfo(const wxHtmlTag *pHtmlTag, 
                                        wxHtmlWinParser *pParser)
  {
--- 206,210 ----
  }
  
! void wxLuaHtmlWinTagEvent::SetTagInfo(const wxHtmlTag *pHtmlTag,
                                        wxHtmlWinParser *pParser)
  {
***************
*** 241,242 ****
--- 244,247 ----
      m_fParseInnerCalled = fParseInnerCalled;
  }
+ 
+ #endif //wxLUA_USE_wxHTML

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

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

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

Modified Files:
	Makefile internal.cpp 
Removed Files:
	interp.cpp library.cpp 
Log Message:
started to break up internal.cpp into wxlstate, wxlcallb...
rename library.h/cpp to wxlhandl since it only contains wxLuaHandler
remove wxLuaApp code, it doesn't exist anymore
compiles and runs in linux


--- interp.cpp DELETED ---

Index: internal.cpp
===================================================================
RCS file: /cvsroot/wxlua/wxLua/modules/wxlua/src/internal.cpp,v
retrieving revision 1.5
retrieving revision 1.6
diff -C2 -d -r1.5 -r1.6
*** internal.cpp	19 Nov 2005 07:08:39 -0000	1.5
--- internal.cpp	25 Nov 2005 02:43:02 -0000	1.6
***************
*** 36,40 ****
  #include "../../../bindings/wxwidgets/luasetup.h.in" // get the base library setup parameters
  #include "wxlua/include/internal.h"
! #include "wxlua/include/callback.h"
  #include "wxbind/include/wxbind.h"
  
--- 36,40 ----
  #include "../../../bindings/wxwidgets/luasetup.h.in" // get the base library setup parameters
  #include "wxlua/include/internal.h"
! #include "wxlua/include/wxlcallb.h"
  #include "wxbind/include/wxbind.h"
  
***************
*** 52,305 ****
  extern int s_wxBitmap;
  
! #if defined(__WXGTK__) || defined(__WXMAC__) || defined(__WXMOTIF__) 
      #include "../../../art/wxlua.xpm"
  #endif
  
! #include "wxlua/include/interp.h"
! 
! // lua registry table
! static const char wxLuaReferences[] = "wxLuaReferences";
! static const char wxNull[]          = "wxNull";
! 
! #include "wx/listimpl.cpp"
! WX_DEFINE_LIST(wxLuaBindingList);
! 
! static int LUACALL LuaTableErrorHandler(lua_State *L)
! {
!     terror(L, "Cannot modify read-only wxLua table");
!     return 0;
! }
! 
! ///////////////////////////////////////////////////
! // wxLua Binding Class
! //
! //
! // The wxLuaBinding object binds classes, functions, objects, and event callbacks
! // to the lua interpreter
! //
! IMPLEMENT_CLASS(wxLuaBinding, wxObject)
! 
! wxLuaBinding::wxLuaBinding()
! :
!     wxObject(),
!     pfGetClassList(NULL),
!     pfGetDefineList(NULL),
!     pfGetEventList(NULL),
!     pfGetObjectList(NULL),
!     pfGetBuiltinList(NULL),
!     m_classCount(0),
!     m_classList(NULL),
!     m_defineCount(0),
!     m_defineList(NULL),
!     m_eventCount(0),
!     m_eventList(NULL),
!     m_objectCount(0),
!     m_objectList(NULL),
!     m_builtinCount(0),
!     m_builtinList(NULL),
!     m_typesRegistered(false),
!     m_startTag(0),
!     m_lastTag(0),
!     m_wxLuaTable(0)
! {
! }
! 
! // Binds C Functions/Defines/Object/Events to Lua Table
! void wxLuaBinding::RegisterBinding(lua_State *L, bool registerTypes)
! {
!     int luaTable = RegisterFunctions(L, registerTypes);
! 
!     // create a global
!     lua_pushstring(L, wx2lua(nameSpace));
!     lua_pushvalue(L, luaTable);
!     lua_rawset(L, LUA_GLOBALSINDEX);
!     lua_pop(L, 1);
! }
! 
! // Unbinds C Functions/Defines/Object/Events by clearing Lua Table
! void wxLuaBinding::UnRegisterBinding(lua_State *L)
! {
!     lua_pushstring(L, wx2lua(nameSpace));
!     lua_pushnil(L);
!     lua_rawset(L, LUA_GLOBALSINDEX);
! }
! 
! // Registers binding, returns lua table reference to binding
! int LUACALL wxLuaBinding::RegisterFunctions(lua_State *L, bool registerTypes)
! {
!     GET_LUASTATEVARS_MSG(L, 0)
! 
!     if (!registerTypes && !m_typesRegistered)
!         terror(L, "wxLua: First time registration must register types");
! 
!     // create references table in registry
! //    lua_pushstring(L, wxLuaReferences);
! //    lua_newtable(L);
! //    lua_rawset(L, LUA_REGISTRYINDEX);
! 
!     // create a tag for the wxLua table
!     if (registerTypes)
!         m_wxLuaTable = tnewtag(L);
! 
!     // create the wxLua table
!     lua_newtable(L);
!     int tableOffset = lua_gettop(L);
! 
!     // set the table tag
!     tsettag (L, m_wxLuaTable);
! 
!     // prevent changes from lua scripts
!     tsettagmethod (L, m_wxLuaTable, "__newindex", LuaTableErrorHandler);
! 
!     // register all out classes etc. in the wxLua table
!     RegisterGeneratedClasses(L, tableOffset, registerTypes);
! 
!     OnRegister(L, registerTypes, tableOffset);
! 
! 	m_typesRegistered = true;
! 
!     return tableOffset;
! }
! 
! // Function to compare to events by eventType
! static int eventListCompareFn(const void *p1, const void *p2)
! {
!     return (*((const WXLUAEVENT *) p1)->eventType) - (*((const WXLUAEVENT *) p2)->eventType);
! }
! 
! // Register the classes, definitions, objects and pointers generated by the binding
! // Sort the event list into order for faster event handler processing.
! void LUACALL wxLuaBinding::RegisterGeneratedClasses(lua_State *L, int tableOffset, bool registerTypes)
! {
!     GET_LUASTATEVARS_RET(L)
! 
!     static const luaL_reg funcTable[] =
!     {
!         {"__gc",       garbageCollect },
!         {"__index",    getTableFunc   },
!         {"__newindex", setTableFunc   }
!     };
!     const unsigned funcCount = sizeof(funcTable)/sizeof(funcTable[0]);
! 
!     size_t iClass;
!     if (registerTypes)
!         m_startTag = tnewtag(L);
! 
!     int iTag = m_startTag;
! 
!     // install the classes, functions and methods
!     m_classList = (*pfGetClassList)(m_classCount);
!     for (iClass = 0; iClass < m_classCount; ++iClass,
!         iTag = registerTypes ? tnewtag(L) : iTag + 1)
!     {
!         WXLUACLASS *pClass = m_classList + iClass;
! 
!         *pClass->class_tag = iTag;
! 
!         //wxPrintf(wxT("RegisterGenClasses %d '%s'\n"), iTag, lua2wx(pClass->name).c_str());
! 
!         for (unsigned iFunction = 0; iFunction < funcCount; iFunction++)
!         {
!             tsettagmethod (L, iTag, funcTable[iFunction].name, funcTable[iFunction].func, (void *) pClass);
!         }
! 
!         for (int iMethod = 0; iMethod < pClass->num_methods; ++iMethod)
!         {
!             WXLUAMETHOD *pMethod = pClass->methods + iMethod;
!             if ((pMethod->type == LuaConstructor) || (pMethod->type == LuaGlobal))
!             {
!                 lua_pushstring(L, pMethod->name);
!                 lua_pushcfunction(L, pMethod->func);
!                 lua_rawset(L, tableOffset);
!             }
!         }
!     }
!     m_lastTag = iTag;
!     
!     // register all the builtin functions
!     m_builtinList = (*pfGetBuiltinList)(m_builtinCount);
!     for (size_t iBuiltin= 0; iBuiltin < m_builtinCount; ++iBuiltin)
!     {
!         WXLUAMETHOD *pMethod = m_builtinList + iBuiltin;
!         lua_pushstring(L, pMethod->name);
!         lua_pushcfunction(L, pMethod->func);
!         lua_rawset(L, tableOffset);
!     }
! 
!     // for backward compatibility
!     lua_pushliteral(L, "FALSE");
!     lua_pushboolean(L, false);
!     lua_rawset(L, tableOffset);
! 
!     lua_pushliteral(L, "TRUE");
!     lua_pushboolean(L, true);
!     lua_rawset(L, tableOffset);
! 
!     // install the definitions and strings
!     m_defineList = (*pfGetDefineList)(m_defineCount);
!     for (size_t iDefine = 0; iDefine < m_defineCount; ++iDefine)
!     {
!         WXLUADEFINE *pDefine = m_defineList + iDefine;
!         lua_pushstring(L, pDefine->name);
!         if (pDefine->isString)
!             lua_pushstring(L, wx2lua(pDefine->strValue));
!         else
!             lua_pushnumber(L, pDefine->value);
!         lua_rawset(L, tableOffset);
!     }
! 
!     // install the objects and pointers
!     m_objectList = (*pfGetObjectList)(m_objectCount);
!     for (size_t iObject = 0; iObject < m_objectCount; ++iObject)
!     {
!         WXLUAOBJECT *pObject = m_objectList + iObject;
!         lua_pushstring(L, pObject->objName);
!         if (pObject->objPtr != 0)
!             tpushusertag(L, pObject->objPtr, *pObject->objClassTag);
!         else
!             tpushusertag(L, *pObject->pObjPtr, *pObject->objClassTag);
!         lua_rawset(L, tableOffset);
!     }
! 
!     // register all the event types
!     m_eventList = (*pfGetEventList)(m_eventCount);
!     for (size_t iEvent = 0; iEvent < m_eventCount; ++iEvent)
!     {
!         WXLUAEVENT *pEvent = m_eventList + iEvent;
!         lua_pushstring(L, pEvent->eventName);
!         lua_pushnumber(L, *pEvent->eventType);
!         lua_rawset(L, tableOffset);
!     }
! 
!     // sort the event list into order for faster lookup.
!     qsort(m_eventList,
!           m_eventCount,
!           sizeof(WXLUAEVENT),
!           eventListCompareFn);
! }
! 
! // Look for base class in binding, set baseclass_tag
! bool wxLuaBinding::SetBaseClassTag(WXLUACLASS *pClass)
! {
!     if (!pClass->baseclass)
!         return false;
! 
!     if (!m_classList)
!         return false;
! 
!     // install the classes, functions and methods
!     for (size_t i = 0; i < m_classCount; ++i)
!     {
!         WXLUACLASS* baseClass = m_classList + i;
  
!         if (strcmp(baseClass->name, pClass->baseclass) == 0)
!         {
!             pClass->baseclass_tag = *baseClass->class_tag;
!             return true;
!         }
!     }
  
!     return false;
! }
  
  // ----------------------------------------------------------------------------
--- 52,66 ----
  extern int s_wxBitmap;
  
! #if defined(__WXGTK__) || defined(__WXMAC__) || defined(__WXMOTIF__)
      #include "../../../art/wxlua.xpm"
  #endif
  
! #include "wxlua/include/wxlintrp.h"
  
! extern int wxLuaEventListCompareFn(const void *p1, const void *p2); // in wxlbind.cpp
  
! // lua registry table
! static const char wxLuaReferences[]  = "wxLuaReferences";
! static const char wxLuaNull[]        = "wxNull";
  
  // ----------------------------------------------------------------------------
***************
*** 314,318 ****
      m_functionTag     = 0;
      m_wxLuaTable      = 0;
!     m_wxNull          = 0;
      m_wxDeleteTable   = 0;
      m_inEventType     = -1;
--- 75,79 ----
      m_functionTag     = 0;
      m_wxLuaTable      = 0;
!     m_wxLuaNull       = 0;
      m_wxDeleteTable   = 0;
      m_inEventType     = -1;
***************
*** 367,371 ****
          node = node->GetNext();
      }
!     
      // don't "own" pointers to wxLuaCallbacks, let wxEventHandler do it
      m_pAppHandlerList->DeleteContents(false);
--- 128,132 ----
          node = node->GetNext();
      }
! 
      // don't "own" pointers to wxLuaCallbacks, let wxEventHandler do it
      m_pAppHandlerList->DeleteContents(false);
***************
*** 386,390 ****
      {
          wxLuaBinding* binding = node->GetData();
- 
          binding->RegisterBinding(L, registerTypes);
      }
--- 147,150 ----
***************
*** 409,413 ****
                  {
                      wxLuaBinding* basebinding = basenode->GetData();
!     
                      // found base class in binding?
                      if (basebinding->SetBaseClassTag(pLuaClass))
--- 169,173 ----
                  {
                      wxLuaBinding* basebinding = basenode->GetData();
! 
                      // found base class in binding?
                      if (basebinding->SetBaseClassTag(pLuaClass))
***************
*** 462,466 ****
  
  // Function to compare the class tag of two classes
! static int classListCompareByTag(const void *p1, const void *p2)
  {
      return (*((const WXLUACLASS *) p1)->class_tag) - (*((const WXLUACLASS *) p2)->class_tag);
--- 222,226 ----
  
  // Function to compare the class tag of two classes
! int wxLuaClassListCompareByTag(const void *p1, const void *p2)
  {
      return (*((const WXLUACLASS *) p1)->class_tag) - (*((const WXLUACLASS *) p2)->class_tag);
***************
*** 484,490 ****
                                                           binding->GetLuaClassCount(),
                                                           sizeof(WXLUACLASS),
!                                                          classListCompareByTag);
  
!         // found 
          if (pLuaClass)
              return pLuaClass;
--- 244,250 ----
                                                           binding->GetLuaClassCount(),
                                                           sizeof(WXLUACLASS),
!                                                          wxLuaClassListCompareByTag);
  
!         // found
          if (pLuaClass)
              return pLuaClass;
***************
*** 554,560 ****
                                                      binding->GetLuaEventCount(),
                                                      sizeof(WXLUAEVENT),
!                                                     eventListCompareFn);
  
!         // found 
          if (pLuaEvent)
              return pLuaEvent;
--- 314,320 ----
                                                      binding->GetLuaEventCount(),
                                                      sizeof(WXLUAEVENT),
!                                                     wxLuaEventListCompareFn);
  
!         // found
          if (pLuaEvent)
              return pLuaEvent;
***************
*** 570,574 ****
  
      // from lua50/lib/lbaselib.c, the collectgarbage lua function
!     // see int luaB_collectgarbage(lua_State *L); 
      //lua_setgcthreshold(L, luaL_optint(L, 1, 0)); // = luaB_collectgarbage(L);
  
--- 330,334 ----
  
      // from lua50/lib/lbaselib.c, the collectgarbage lua function
!     // see int luaB_collectgarbage(lua_State *L);
      //lua_setgcthreshold(L, luaL_optint(L, 1, 0)); // = luaB_collectgarbage(L);
  
***************
*** 648,656 ****
              iCount = (int) lua_tonumber(L, -1);  // get result value
          lua_pop(L, 1);                           // pop result
!     
          iCount++;                                // next unallocated index
  
! 		lua_pushvalue(L, nTop);                  // push value to store
! 		lua_rawseti(L, -2, iCount);              // store value, pop value
  
          lua_pushliteral(L, "n");                 // push key
--- 408,416 ----
              iCount = (int) lua_tonumber(L, -1);  // get result value
          lua_pop(L, 1);                           // pop result
! 
          iCount++;                                // next unallocated index
  
!         lua_pushvalue(L, nTop);                  // push value to store
!         lua_rawseti(L, -2, iCount);              // store value, pop value
  
          lua_pushliteral(L, "n");                 // push key
***************
*** 715,719 ****
  
      if (iIndex > 0 && iIndex <= iCount)	    // ensure in range
!     {        
          lua_pushnil(L);                     // push nil as value
          lua_rawseti(L, -2, iIndex);         // set table, pop value
--- 475,479 ----
  
      if (iIndex > 0 && iIndex <= iCount)	    // ensure in range
!     {
          lua_pushnil(L);                     // push nil as value
          lua_rawseti(L, -2, iIndex);         // set table, pop value
***************
*** 894,908 ****
  // Default constructor
  wxLuaObject::wxLuaObject() : m_luaState(NULL), m_iReference(LUA_NOREF),
!                              m_allocatedBool(FALSE), m_bool(FALSE),
!                              m_allocatedInt(FALSE), m_int(0),
!                              m_allocatedString(FALSE), m_allocatedArray(FALSE)
  {
  }
  
  // Constructor that is passed a lua state and a parameter index.
! wxLuaObject::wxLuaObject(lua_State *L, int iParam, int WXUNUSED(iRef)) 
!             : m_luaState(L), m_allocatedBool(FALSE), m_bool(FALSE),
!                              m_allocatedInt(FALSE), m_int(0),
!                              m_allocatedString(FALSE), m_allocatedArray(FALSE)
  {
      // set up the reference
--- 654,668 ----
  // Default constructor
  wxLuaObject::wxLuaObject() : m_luaState(NULL), m_iReference(LUA_NOREF),
!                              m_allocatedBool(false), m_bool(false),
!                              m_allocatedInt(false), m_int(0),
!                              m_allocatedString(false), m_allocatedArray(false)
  {
  }
  
  // Constructor that is passed a lua state and a parameter index.
! wxLuaObject::wxLuaObject(lua_State *L, int iParam, int WXUNUSED(iRef))
!             : m_luaState(L), m_allocatedBool(false), m_bool(false),
!                              m_allocatedInt(false), m_int(0),
!                              m_allocatedString(false), m_allocatedArray(false)
  {
      // set up the reference
***************
*** 1264,1268 ****
          DumpType(lua_state, -1, valueType, value, valueInfo);
  
!         wxString info = wxString::Format(wxT("%s%-32s\t%-15s\t%-20s\t%-10s\t%s"), 
                  indentStr.c_str(),
                  indexValue.c_str(),
--- 1024,1028 ----
          DumpType(lua_state, -1, valueType, value, valueInfo);
  
!         wxString info = wxString::Format(wxT("%s%-32s\t%-15s\t%-20s\t%-10s\t%s"),
                  indentStr.c_str(),
                  indexValue.c_str(),
***************
*** 1311,1315 ****
  {
      bool result = false;
!     GET_LUASTATEVARS_MSG(L, FALSE)
  
      wxObject *pDeleteObject = stateVars->m_pTrackedList->Delete((int) pObject);
--- 1071,1075 ----
  {
      bool result = false;
!     GET_LUASTATEVARS_MSG(L, false)
  
      wxObject *pDeleteObject = stateVars->m_pTrackedList->Delete((int) pObject);
***************
*** 1331,1346 ****
  bool IsParentWindowTracked(wxList *list, wxWindow* win)
  {
!     wxCHECK_MSG(list && win, FALSE, wxT("Invalid list or parent"));
      wxWindow *parent = win;
!     
      while (parent)
      {
          if (list->Find(parent))
!             return TRUE;
!         
          parent = parent->GetParent();
      }
!     
!     return FALSE;
  }
  
--- 1091,1106 ----
  bool IsParentWindowTracked(wxList *list, wxWindow* win)
  {
!     wxCHECK_MSG(list && win, false, wxT("Invalid list or parent"));
      wxWindow *parent = win;
! 
      while (parent)
      {
          if (list->Find(parent))
!             return true;
! 
          parent = parent->GetParent();
      }
! 
!     return false;
  }
  
***************
*** 1354,1358 ****
  
      GET_LUASTATEVARS_RET(L)
!     
      // only need to track parent window, it deletes children for us
      if (!IsParentWindowTracked(stateVars->m_pWindowList, pWindow))
--- 1114,1118 ----
  
      GET_LUASTATEVARS_RET(L)
! 
      // only need to track parent window, it deletes children for us
      if (!IsParentWindowTracked(stateVars->m_pWindowList, pWindow))
***************
*** 1387,1391 ****
          if (stateVars->IsDerivedClass(iTag, iParamTag))
              pReturn = ttouserdata(L, iParam);
!         else if (stateVars->m_wxNull != iTag)
              goto error;
      }
--- 1147,1151 ----
          if (stateVars->IsDerivedClass(iTag, iParamTag))
              pReturn = ttouserdata(L, iParam);
!         else if (stateVars->m_wxLuaNull != iTag)
              goto error;
      }
***************
*** 1398,1491 ****
  }
  
- // ----------------------------------------------------------------------------
- // wxLuaDestroyCallback
- // ----------------------------------------------------------------------------
- 
- IMPLEMENT_CLASS(wxLuaDestroyCallback, wxEvtHandler);
- 
- wxLuaDestroyCallback::wxLuaDestroyCallback(lua_State *L, int id, wxEvtHandler *pHandler, int iTag) 
-                      : m_luaState(L), m_luaStateVars(NULL), m_pHandler(pHandler), m_id(id)
- {
-     GET_LUASTATEVARS_RET(L)
-     m_luaStateVars = stateVars;
- 
-     // allocate a LUA proxy for the object
-     const void **ptr = (const void **) lua_newuserdata(L, sizeof(void *));
-     if (ptr != NULL)
-     {
-         // save the address of the object in the proxy
-         *ptr = pHandler;
- 
-         // and set the metatable of the proxy
-         if (iTag != TLUA_NOTAG && tget(L, iTag))
-         {
-             if (lua_setmetatable(L, -2) == 0)
-             {
-                 terror(L, "wxLua: Unable to set metatable");
-             }
-         }
- 
-         // get a reference to the destroy handler table
-         if (tget(L, stateVars->m_wxDeleteTable))
-         {
-             // create a reference to object
-             lua_pushlightuserdata(L, pHandler); // key
-             lua_pushvalue(L, -3);               // value
-             // save it in the destroy handler table
-             lua_rawset(L, -3);
-             lua_pop(L, 1);
-         }
- 
-         stateVars->m_pDestroyHandlerList->Append(this);
- 
-         // connect the event handler
-         pHandler->Connect(id,
-                           wxEVT_DESTROY,
-                           (wxObjectEventFunction)&wxLuaDestroyCallback::EventHandler,
-                           this);
-     }
-     else
-     {
-         terror(L, "wxLua: Out of memory");
-     }
- }
- 
- void wxLuaDestroyCallback::EventHandler(wxWindowDestroyEvent& event)
- {
-     wxLuaDestroyCallback *theCallback = (wxLuaDestroyCallback *) event.m_callbackUserData;
-     if (theCallback && (((wxWindow*)event.GetEventObject())->GetEventHandler() == m_pHandler))
-     {
-         theCallback->OnDestroy();
-     }
- 
-     event.Skip();
- }
- 
- void wxLuaDestroyCallback::OnDestroy()
- {
-     // FIXME - Is it an error to receive an event after you've deleted lua?
-     //  probably not if lua is getting shutdown
-     if (!m_luaState || !m_luaStateVars)
-         return;
-     
-     // Note: do not remove from m_pDestroyHandlerList here, wait 'till destructor
- 
-     if (tget(m_luaState, m_luaStateVars->m_wxDeleteTable))
-     {
-         // clear the metatable reference in the lua proxy.
-         lua_pushlightuserdata(m_luaState, m_pHandler);
-         lua_rawget(m_luaState, -2);
-         lua_pushnil(m_luaState);
-         lua_setmetatable(m_luaState, -2);
-         lua_pop(m_luaState, 2);
-     }
- }
- 
- wxLuaDestroyCallback::~wxLuaDestroyCallback()
- {
-     if (m_luaStateVars)
-         m_luaStateVars->m_pDestroyHandlerList->DeleteObject(this);
- }
- 
  // Push a data type onto the stack and set its tag
  void LUACALL pushuserdatatype(lua_State *L, int iTag, const void *data)
--- 1158,1161 ----
***************
*** 1567,1575 ****
      int num = (int) lua_toboolean(L, iParam);
  
! //  This test is not reliable FALSE == 0 but TRUE !=0 not TRUE == 1
  //  The paramter can be the result of evaluating an expression as well as one of the two
  //  boolean constants.
! //  if (!(num == TRUE) || !(num == FALSE))
! //      terror(L, wxString::Format("wxLua: Expected 'TRUE' or 'FALSE' for parameter %d.", iParam));
  
      return num ? true : false;
--- 1237,1245 ----
      int num = (int) lua_toboolean(L, iParam);
  
! //  This test is not reliable false == 0 but true !=0 not true == 1
  //  The paramter can be the result of evaluating an expression as well as one of the two
  //  boolean constants.
! //  if (!(num == true) || !(num == false))
! //      terror(L, wxString::Format("wxLua: Expected 'true' or 'false' for parameter %d.", iParam));
  
      return num ? true : false;
***************
*** 2053,2058 ****
      GET_LUASTATEVARS_MSG(L, NULL)
  
!     if (nTag == stateVars->m_wxNull)
!         return wxNull;
      if (nTag == stateVars->m_functionTag)
          return "wxLuaFunction";
--- 1723,1728 ----
      GET_LUASTATEVARS_MSG(L, NULL)
  
!     if (nTag == stateVars->m_wxLuaNull)
!         return wxLuaNull;
      if (nTag == stateVars->m_functionTag)
          return "wxLuaFunction";
***************
*** 2147,2151 ****
                  pCallback = new wxLuaCallback(L, 3, id, (int) eventType, evtHandler);
              }
!             
              break;
          }
--- 1817,1821 ----
                  pCallback = new wxLuaCallback(L, 3, id, (int) eventType, evtHandler);
              }
! 
              break;
          }
***************
*** 2195,2317 ****
  }
  
- //-----------------------------------------------------------------------------
- // wxLuaCallback
- //-----------------------------------------------------------------------------
- 
- IMPLEMENT_CLASS(wxLuaCallback, wxEvtHandler);
- 
- // Encapsulate a lua function reference for use by a event callback
- wxLuaCallback::wxLuaCallback( lua_State    *L,
-                               int           theRoutine,
-                               int           id,
-                               wxEventType   eventType,
-                               wxEvtHandler *pEvtHandler )
-                               : m_luaState(L), m_luaStateVars(NULL),
-                                 m_pHandler(pEvtHandler),
-                                 m_id(id), m_eventType(eventType)
- {
-     GET_LUASTATEVARS_RET(L)
-     m_luaStateVars = stateVars;
-     m_routine = tinsert(L, theRoutine);
- 
-     pEvtHandler->Connect( id,
-                           eventType,
-                           (wxObjectEventFunction)&wxLuaCallback::EventHandler,
-                           this);
- 
-     // FIXME - Need to track events attached to an application object
-     // labenski - track all of them? useful to run ClearState when window is destroyed
-     //if (pEvtHandler->IsKindOf(CLASSINFO(wxApp)))
-     {
-         m_luaStateVars->m_pAppHandlerList->Append(this);
-     }
- }
- 
- wxLuaCallback::~wxLuaCallback()
- {
-     // Remove the reference to the Lua function that we are going to call
-     if (m_luaState)
-         tremove(m_luaState, m_routine);
-     // delete the reference to this handler
-     if (m_luaStateVars)
-         m_luaStateVars->m_pAppHandlerList->DeleteObject(this);
- }
- 
- // This function is called with "this" being of the type which the event is arriving
- // at.  The user data is used to route it to the correct place.
- void wxLuaCallback::EventHandler(wxEvent& event)
- {        
-     wxLuaCallback *theCallback = (wxLuaCallback *) event.m_callbackUserData;
- 
-     if (!theCallback || !theCallback->GetLuaState() || !theCallback->m_luaStateVars)
-         return;
- 
-     theCallback->m_luaStateVars->m_inEventType = event.GetEventType();
- 
-     if (event.GetEventType() == wxEVT_DESTROY)
-     {
-         event.Skip();
-         theCallback->m_luaStateVars->m_pWindowList->DeleteObject((wxWindow*)event.GetEventObject());
- 
-         // Disconnect all callbacks associated with this window's evthandler
-         theCallback->ClearState();
- 
-         wxEvtHandler *evtHandler = ((wxWindow*)event.GetEventObject())->GetEventHandler();
- 
-         wxNode* node = theCallback->m_luaStateVars->m_pAppHandlerList->GetFirst();
-         while (node)
-         {
-             wxLuaCallback *pCallback = (wxLuaCallback *) node->GetData();
- 
-             if ((pCallback != NULL) && (pCallback->GetEvtHandler() == evtHandler))
-             {
-                 pCallback->ClearState();
-             }
- 
-             node = node->GetNext();
-         }
-     }
-     else //if (theCallback->m_luaState)
-         theCallback->CallFunction(&event);
-         
-     theCallback->m_luaStateVars->m_inEventType = -1;
- }
- 
- // Call a lua function to handle an event. The lua function will receive
- // a single parameter, the type of event.
- void wxLuaCallback::CallFunction(wxEvent *pEvent)
- {
-     // Cannot call it if Lua is gone or the interpreter has been destroyed
-     // This can happen when the program exists since windows may be destroyed
-     // after lua has been deleted 
- 
-     if (!m_luaState || !wxFindLuaStateVariables(m_luaState))
-         return;
- 
-     int eventClassTag = s_wxEvent;
- 
-     GET_LUASTATEVARS_RET(m_luaState)
-     const WXLUAEVENT *pLuaEvent = stateVars->GetLuaEvent(pEvent);
-     if (pLuaEvent)
-         eventClassTag = *pLuaEvent->eventClassTag;
- 
-     lua_checkstack(m_luaState,LUA_MINSTACK);
-     int oldTop = lua_gettop(m_luaState);
-     if (tget(m_luaState, m_routine))
-     {
-         lua_pushvalue(m_luaState, LUA_GLOBALSINDEX);
-         if (lua_setfenv(m_luaState, -2) != 0)
-         {
-             tpushusertag(m_luaState, pEvent, eventClassTag);
-             LuaCall(m_luaState, 1, true);
-         }
-         else
-             terror(m_luaState, "wxLua: CallFunction: function is not a Lua function.");
-     }
-     else
-         terror(m_luaState, "wxLua: CallFunction: function has been garbage collected.");
- 
-     lua_settop(m_luaState, oldTop);
- }
  
  int LUACALL CreateStandaloneBitmaps(lua_State *L)
--- 1865,1868 ----

Index: Makefile
===================================================================
RCS file: /cvsroot/wxlua/wxLua/modules/wxlua/src/Makefile,v
retrieving revision 1.2
retrieving revision 1.3
diff -C2 -d -r1.2 -r1.3
*** Makefile	20 Nov 2005 22:28:07 -0000	1.2
--- Makefile	25 Nov 2005 02:43:02 -0000	1.3
***************
*** 2,6 ****
  # Author:	J Winwood
  # Created:	2002
! # Updated:	
  # Copyright: (c) 2002 Lomtick Software. All rights reserved.
  #
--- 2,6 ----
  # Author:	J Winwood
  # Created:	2002
! # Updated:
  # Copyright: (c) 2002 Lomtick Software. All rights reserved.
  #
***************
*** 26,30 ****
  WXCXXFLAGS = $(shell $(WXCONFIG) --cxxflags)
  WXLDLIBS   = $(shell $(WXCONFIG) --libs)
! WXCXX      = $(shell $(WXCONFIG) --cxx) 
  WXLIB_DIR  = $(WXPREFIX)/lib
  # ----------------------------------------------------------------------------
--- 26,30 ----
  WXCXXFLAGS = $(shell $(WXCONFIG) --cxxflags)
  WXLDLIBS   = $(shell $(WXCONFIG) --libs)
! WXCXX      = $(shell $(WXCONFIG) --cxx)
  WXLIB_DIR  = $(WXPREFIX)/lib
  # ----------------------------------------------------------------------------
***************
*** 34,38 ****
  CXX      = $(WXCXX)
  
! APPEXTRADEFS=-I../../ -I$(WXPREFIX)/contrib/include -fexceptions -DLUACALL= 
  
  TARGET_LIBNAME = lib$(WXBASENAME)_wxlua-$(WXRELEASE)
--- 34,38 ----
  CXX      = $(WXCXX)
  
! APPEXTRADEFS=-I../../ -I$(WXPREFIX)/contrib/include -fexceptions -DLUACALL=
  
  TARGET_LIBNAME = lib$(WXBASENAME)_wxlua-$(WXRELEASE)
***************
*** 51,64 ****
  
  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)
--- 51,70 ----
  
  HEADERS = \
! 	../include/wxldefs.h \
  	../include/internal.h \
! 	../include/wxlua.h \
! 	../include/wxlbind.h \
! 	../include/wxlcallb.h \
! 	../include/wxlhandl.h \
! 	../include/wxlintrp.h \
! 	../include/wxlstate.h
  
  SOURCES = \
  	internal.cpp \
! 	wxlbind.cpp \
! 	wxlcallb.cpp \
! 	wxlhandl.cpp \
! 	wxlintrp.cpp \
! 	wxlstate.cpp
  
  OBJECTS=$(SOURCES:.cpp=.o)
***************
*** 66,74 ****
  
  .cpp.o:
! 	$(CXX) -c $(CXXFLAGS) $(APPEXTRADEFS)-o $@ $<
  
  all: $(TARGET_LIB_STATIC) $(TARGET_LIB_SHARED)
  
! $(TARGET_LIB_STATIC) : $(OBJECTS)   
  	@$(RM) $@
  	$(AR) $(AROPTIONS) $@ $(OBJECTS)
--- 72,80 ----
  
  .cpp.o:
! 	$(CXX) -c $(CXXFLAGS) $(APPEXTRADEFS) -o $@ $<
  
  all: $(TARGET_LIB_STATIC) $(TARGET_LIB_SHARED)
  
! $(TARGET_LIB_STATIC) : $(OBJECTS)
  	@$(RM) $@
  	$(AR) $(AROPTIONS) $@ $(OBJECTS)
***************
*** 86,90 ****
  	      $(TARGET_LIB_STATIC) $(TARGET_LIB_SHARED) \
                $(TARGET_LIBDIR)/$(TARGET_LIB_LINK1) \
!               $(TARGET_LIBDIR)/$(TARGET_LIB_LINK2) 
  
  -include $(DEPFILES)
--- 92,96 ----
  	      $(TARGET_LIB_STATIC) $(TARGET_LIB_SHARED) \
                $(TARGET_LIBDIR)/$(TARGET_LIB_LINK1) \
!               $(TARGET_LIBDIR)/$(TARGET_LIB_LINK2)
  
  -include $(DEPFILES)

--- library.cpp DELETED ---

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

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

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

Modified Files:
	debugio.h dserver.h dservice.h dtarget.h socket.h 
Log Message:
started to break up internal.cpp into wxlstate, wxlcallb...
rename library.h/cpp to wxlhandl since it only contains wxLuaHandler
remove wxLuaApp code, it doesn't exist anymore
compiles and runs in linux


Index: dtarget.h
===================================================================
RCS file: /cvsroot/wxlua/wxLua/modules/wxluasocket/include/dtarget.h,v
retrieving revision 1.2
retrieving revision 1.3
diff -C2 -d -r1.2 -r1.3
*** dtarget.h	7 Jun 2005 04:17:40 -0000	1.2
--- dtarget.h	25 Nov 2005 02:43:02 -0000	1.3
***************
*** 16,23 ****
  
  #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"
--- 16,22 ----
  
  #include "wx/dynarray.h"
! #include "wxlua/include/wxldefs.h"
  #include "wxlua/include/wxlua.h"
  #include "wxlua/include/internal.h"
  #include "wxluadebug/include/debug.h"
  #include "wxluasocket/include/debugio.h"

Index: dservice.h
===================================================================
RCS file: /cvsroot/wxlua/wxLua/modules/wxluasocket/include/dservice.h,v
retrieving revision 1.1
retrieving revision 1.2
diff -C2 -d -r1.1 -r1.2
*** dservice.h	20 Nov 2005 20:10:41 -0000	1.1
--- dservice.h	25 Nov 2005 02:43:02 -0000	1.2
***************
*** 21,25 ****
  #endif
  
! #include "wxlua/defs.h"
  
  #include "wx/dynarray.h"
--- 21,25 ----
  #endif
  
! #include "wxlua/include/wxldefs.h"
  
  #include "wx/dynarray.h"
***************
*** 37,44 ****
  #endif
  
! #include "wxlua/wxlua.h"
! #include "wxlua/internal.h"
! #include "wxlua/library.h"
! #include "wxlua/dserver.h"
  
  #define SERVER_ID          1200
--- 37,43 ----
  #endif
  
! #include "wxlua/include/wxlua.h"
! #include "wxlua/include/internal.h"
! #include "wxluadebug/include/dserver.h"
  
  #define SERVER_ID          1200
***************
*** 364,368 ****
  
      // Not Required for Debug Service
!     virtual bool Run(const wxString &WXUNUSED(fileName), 
                       const wxString &WXUNUSED(buffer)) { return false; }
  
--- 363,367 ----
  
      // Not Required for Debug Service
!     virtual bool Run(const wxString &WXUNUSED(fileName),
                       const wxString &WXUNUSED(buffer)) { return false; }
  

Index: dserver.h
===================================================================
RCS file: /cvsroot/wxlua/wxLua/modules/wxluasocket/include/dserver.h,v
retrieving revision 1.2
retrieving revision 1.3
diff -C2 -d -r1.2 -r1.3
*** dserver.h	7 Jun 2005 04:17:40 -0000	1.2
--- dserver.h	25 Nov 2005 02:43:02 -0000	1.3
***************
*** 15,19 ****
  
  #include "wx/process.h"
! #include "wxlua/include/defs.h"
  #include "wxluasocket/include/socket.h"
  #include "wxluadebug/include/debug.h"
--- 15,19 ----
  
  #include "wx/process.h"
! #include "wxlua/include/wxldefs.h"
  #include "wxluasocket/include/socket.h"
  #include "wxluadebug/include/debug.h"

Index: debugio.h
===================================================================
RCS file: /cvsroot/wxlua/wxLua/modules/wxluasocket/include/debugio.h,v
retrieving revision 1.2
retrieving revision 1.3
diff -C2 -d -r1.2 -r1.3
*** debugio.h	7 Jun 2005 04:17:40 -0000	1.2
--- debugio.h	25 Nov 2005 02:43:02 -0000	1.3
***************
*** 14,18 ****
  #endif
  
! #include "wxlua/include/defs.h"
  
  class WXDLLIMPEXP_WXLUA wxLuaDebugData;
--- 14,18 ----
  #endif
  
! #include "wxlua/include/wxldefs.h"
  
  class WXDLLIMPEXP_WXLUA wxLuaDebugData;

Index: socket.h
===================================================================
RCS file: /cvsroot/wxlua/wxLua/modules/wxluasocket/include/socket.h,v
retrieving revision 1.2
retrieving revision 1.3
diff -C2 -d -r1.2 -r1.3
*** socket.h	7 Jun 2005 04:17:40 -0000	1.2
--- socket.h	25 Nov 2005 02:43:02 -0000	1.3
***************
*** 15,19 ****
  #endif
  
! #include "wxlua/include/defs.h"
  
  #ifdef WIN32
--- 15,19 ----
  #endif
  
! #include "wxlua/include/wxldefs.h"
  
  #ifdef WIN32
***************
*** 154,159 ****
  {
  public:
!     enum SocketErrorCode 
!     { 
          SOCKET_NOT_CLOSED,
          SOCKET_NOT_CONNECTED,
--- 154,159 ----
  {
  public:
!     enum SocketErrorCode
!     {
          SOCKET_NOT_CLOSED,
          SOCKET_NOT_CONNECTED,
***************
*** 179,184 ****
          switch(m_errnum)
          {
!         case WSANOTINITIALISED: 
!             m_description = _("A successful WSAStartup must occur before using this function."); 
              break;
  
--- 179,184 ----
          switch(m_errnum)
          {
!         case WSANOTINITIALISED:
!             m_description = _("A successful WSAStartup must occur before using this function.");
              break;
  

[Wxlua-commit] wxLua/modules/wxluasocket/src dserver.cpp,1.3,1.4 dtarget.cpp,1.3,1.4

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

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

Modified Files:
	dserver.cpp dtarget.cpp 
Log Message:
started to break up internal.cpp into wxlstate, wxlcallb...
rename library.h/cpp to wxlhandl since it only contains wxLuaHandler
remove wxLuaApp code, it doesn't exist anymore
compiles and runs in linux


Index: dtarget.cpp
===================================================================
RCS file: /cvsroot/wxlua/wxLua/modules/wxluasocket/src/dtarget.cpp,v
retrieving revision 1.3
retrieving revision 1.4
diff -C2 -d -r1.3 -r1.4
*** dtarget.cpp	17 Nov 2005 05:51:21 -0000	1.3
--- dtarget.cpp	25 Nov 2005 02:43:02 -0000	1.4
***************
*** 23,26 ****
--- 23,27 ----
  
  #include "wxluasocket/include/dtarget.h"
+ #include "wxlua/include/wxlhandl.h"
  
  #if !wxCHECK_VERSION(2, 6, 0)
***************
*** 284,290 ****
                      }
                      break;
!                 case CMD_DISABLE_BREAKPOINT: 
                      break;
!                 case CMD_ENABLE_BREAKPOINT: 
                      break;
              }
--- 285,291 ----
                      }
                      break;
!                 case CMD_DISABLE_BREAKPOINT:
                      break;
!                 case CMD_ENABLE_BREAKPOINT:
                      break;
              }

Index: dserver.cpp
===================================================================
RCS file: /cvsroot/wxlua/wxLua/modules/wxluasocket/src/dserver.cpp,v
retrieving revision 1.3
retrieving revision 1.4
diff -C2 -d -r1.3 -r1.4
*** dserver.cpp	17 Nov 2005 05:51:21 -0000	1.3
--- dserver.cpp	25 Nov 2005 02:43:02 -0000	1.4
***************
*** 23,29 ****
  
  #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)
--- 23,29 ----
  
  #include "wx/thread.h"
  #include "wxluasocket/include/dserver.h"
+ #include "wxlua/include/internal.h"
+ #include "wxlua/include/wxlhandl.h"
  
  #if wxCHECK_VERSION(2, 3, 0)

[Wxlua-commit] wxLua/modules/wxlua/include internal.h,1.4,1.5 wxlua.h,1.3,1.4 callback.h,1.2,NONE defs.h,1.1,NONE interp.h,1.3,NONE library.h,1.3,NONE

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

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

Modified Files:
	internal.h wxlua.h 
Removed Files:
	callback.h defs.h interp.h library.h 
Log Message:
started to break up internal.cpp into wxlstate, wxlcallb...
rename library.h/cpp to wxlhandl since it only contains wxLuaHandler
remove wxLuaApp code, it doesn't exist anymore
compiles and runs in linux


--- defs.h DELETED ---

--- callback.h DELETED ---

--- interp.h DELETED ---

Index: wxlua.h
===================================================================
RCS file: /cvsroot/wxlua/wxLua/modules/wxlua/include/wxlua.h,v
retrieving revision 1.3
retrieving revision 1.4
diff -C2 -d -r1.3 -r1.4
*** wxlua.h	18 Jun 2005 20:45:59 -0000	1.3
--- wxlua.h	25 Nov 2005 02:43:02 -0000	1.4
***************
*** 10,44 ****
  #define WX_LUA_H
  
- 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
- //   "LUACALL = __stdcall" in your makefile or project.
- #ifndef LUACALL
-     #define LUACALL
- #endif
- 
- // Two cases where you might multiply call RegisterWxLua:
- // 1. You have several lua_State values.  Then registerTypes
- // should always be true.
- // 2. You have only one lua_State, but have swapped out
- // the global table.  Then you want to set registerTypes to false
- // for second and subsequent registrations.
- int LUACALL RegisterWxLuaFunctions(lua_State *L, bool registerTypes = true);
  
! // Call this on application exit, to let wxLua tidy up
! void LUACALL CleanupWxLua(lua_State *L, bool closeLua = true);
! 
! // Given a lua tag, return the corresponding tag name
! const char * LUACALL GetLuaTagName(lua_State *L, int nTag);
  
- // Used to create a set of standard bitmaps for wxLua
- int LUACALL CreateStandaloneBitmaps(lua_State *luaState);
  
  #endif // WX_LUA_H
--- 10,16 ----
  #define WX_LUA_H
  
  
! #include "wxlua/include/internal.h"
  
  
  #endif // WX_LUA_H

--- library.h DELETED ---

Index: internal.h
===================================================================
RCS file: /cvsroot/wxlua/wxLua/modules/wxlua/include/internal.h,v
retrieving revision 1.4
retrieving revision 1.5
diff -C2 -d -r1.4 -r1.5
*** internal.h	17 Nov 2005 05:51:20 -0000	1.4
--- internal.h	25 Nov 2005 02:43:02 -0000	1.5
***************
*** 15,21 ****
  
  #include "wx/treectrl.h"
! #include "wxlua/include/defs.h"
  #include "wxlua/include/wxlua.h"
! #include "wxlua/include/interp.h"
  
  extern "C"
--- 15,22 ----
  
  #include "wx/treectrl.h"
! #include "wxlua/include/wxldefs.h"
! #include "wxlua/include/wxlbind.h"
  #include "wxlua/include/wxlua.h"
! #include "wxlua/include/wxlintrp.h"
  
  extern "C"
***************
*** 45,190 ****
  
  // ----------------------------------------------------------------------------
- // wxLua type enums and structs
- // ----------------------------------------------------------------------------
- 
- enum LuaType                        // The type of a Lua method
- {
-     LuaDelete        = 1,           // gc routine
-     LuaConstructor   = 2,           // constructor
-     LuaDestructor    = 4,           // destructor (not used)
-     LuaMethod        = 8,           // class method
-     LuaGlobal        = 16,          // global method (not really related to the class)
-     LuaGetProp       = 32,
-     LuaSetProp       = 64
- };
- 
- struct WXLUAMETHOD                  // defines a LUA method or property
- {
-     LuaType        type;            // type (one of the above enumeration values)
-     const char    *name;            // name of the method or property
-     lua_CFunction  func;            // function that implements the method or property
-     int            params;          // number of params to the method (required + optional)
-     int            required;        // number of required params
- };
- 
- struct WXLUACLASS                   // defines a LUA class interface
- {
-     const char    *name;            // name of the class
-     WXLUAMETHOD   *methods;         // pointer to methods for this class
-     int            num_methods;     // number of methods
-     int            baseclass_tag;   // index in the class list to the base class
-     wxClassInfo   *pClassInfo;      // pointer to the wxClassInfo associated with this class
-     int           *class_tag;       // tag for user data allocated by ourselves
-                                     // and therefore needs gc.
-     const char    *baseclass;       // name of base class 
- };
- 
- struct WXLUADEFINE                  // defines a wxWidgets define for wxLua
- {
-     const char    *name;            // name
-     bool           isString;        // true if a string definition FIXME use WXLUASTRING
-     double         value;           // numeric value
-     const wxChar  *strValue;        // string value
- };
- 
- struct WXLUASTRING                  // defines a wxWidgets define for wxLua
- {
-     const char    *name;            // name
-     const wxChar  *value;           // string value
- };
- 
- struct WXLUAEVENT                   // defines a wxWidgets Event for wxLua
- {
-     const int  *eventType;          // new wxWidgets event type
-     const char *eventName;          // name of the event
-     int        *eventClassTag;      // lua class tag
- };
- 
- struct WXLUAOBJECT                  // Defines a wxWidgets object or pointer for wxLua
- {
-     const void  *objPtr;            // a pointer to the object or pointer
-     const void **pObjPtr;           // a pointer to the object or pointer
-     const char  *objName;           // the name of the object or pointer
-     int         *objClassTag;       // the class tag of the object or pointer.
- };
- 
- typedef WXLUACLASS* (*GetClassListFunction)(size_t &);
- typedef WXLUADEFINE* (*GetDefineListFunction)(size_t &);
- //typedef WXLUASTRING* (*GetDefineListFunction)(size_t &); FIXME - use this
- typedef WXLUAEVENT* (*GetEventListFunction)(size_t &);
- typedef WXLUAOBJECT* (*GetObjectListFunction)(size_t &);
- typedef WXLUAMETHOD* (*GetBuiltinListFunction)(size_t &);
- 
- class WXDLLIMPEXP_WXLUA wxLuaBinding : public wxObject
- {
- public:
-     wxLuaBinding();
- 
-     // lua namespace e.g. "wx"
-     wxString nameSpace;
- 
-     // Pointers to external Binding Functions
-     GetClassListFunction pfGetClassList;
-     GetDefineListFunction pfGetDefineList;
-     GetEventListFunction pfGetEventList;
-     GetObjectListFunction pfGetObjectList;
-     GetBuiltinListFunction pfGetBuiltinList;
- 
-     // Registers binding
-     void RegisterBinding(lua_State *L, bool registerTypes);
-     void UnRegisterBinding(lua_State *L);
- 
-     // 
-     size_t GetLuaClassCount() const { return m_classCount; }
-     WXLUACLASS* GetLuaClassList() { return m_classList; }
- 
-     size_t GetLuaDefineCount() const { return m_defineCount; }
-     WXLUADEFINE* GetLuaDefineList() { return m_defineList; }
- 
-     size_t GetLuaEventCount() { return m_eventCount; }
-     WXLUAEVENT* GetLuaEventList() { return m_eventList; }
- 
-     size_t GetLuaObjectCount() { return m_objectCount; }
-     WXLUAOBJECT* GetLuaObjectList() { return m_objectList; }
- 
-     size_t GetLuaBuiltinCount() { return m_builtinCount; }
-     WXLUAMETHOD* GetLuaBuiltinList() { return m_builtinList; }
- 
-     bool IsTag(int tag) { return (tag >= m_startTag && tag <= m_lastTag); }
- 
-     // Look for base class WXDLLIMPEXP_CDLUA in binding, set baseclass_tag
-     bool SetBaseClassTag(WXLUACLASS *pClass);
- 
- protected:
-     int LUACALL RegisterFunctions(lua_State *L, bool registerTypes);
-     void LUACALL RegisterGeneratedClasses(lua_State *L, int tableOffset, bool registerTypes);
- 
-     virtual void OnRegister(lua_State * WXUNUSED(L), bool WXUNUSED(registerTypes), int WXUNUSED(luaTable)) {}
- 
-     // binding objects
-     size_t m_classCount;
-     WXLUACLASS* m_classList;
-     size_t m_defineCount;
-     WXLUADEFINE* m_defineList;
-     size_t m_eventCount;
-     WXLUAEVENT* m_eventList;
-     size_t m_objectCount;
-     WXLUAOBJECT* m_objectList;
-     size_t m_builtinCount;
-     WXLUAMETHOD* m_builtinList;
- 
-     bool m_typesRegistered; // Is the binding registered
-     int m_startTag;         // The first wxLua allocated lua tag
-     int m_lastTag;          // The last wxLua lua tag of registered classes
-     int m_wxLuaTable;       // The lua tag for the wxLua private tables
- 
-     DECLARE_CLASS(wxLuaBinding)
- };
- 
- // list of wxLua Bindings
- // WX_DECLARE_LIST(wxLuaBinding, wxLuaBindingList);
- WX_DECLARE_USER_EXPORTED_LIST(wxLuaBinding, wxLuaBindingList, WXDLLIMPEXP_WXLUA);
- 
- // ----------------------------------------------------------------------------
  // wxLuaStateVariables - state variables for a wxLua instance
  // ----------------------------------------------------------------------------
--- 46,49 ----
***************
*** 195,199 ****
      wxLuaStateVariables();
      ~wxLuaStateVariables();
!     
      void ClearCallbacks();
  
--- 54,58 ----
      wxLuaStateVariables();
      ~wxLuaStateVariables();
! 
      void ClearCallbacks();
  
***************
*** 217,221 ****
      int          m_functionTag;     // The lua tag for function objects.
      int          m_wxLuaTable;      // The lua tag for the wxLua private tables
!     int          m_wxNull;          // The lua tag for wxNull (for NULL pointers)
      int          m_wxDeleteTable;   // The lua tag for the wxWindow destroy tracking table
  
--- 76,80 ----
      int          m_functionTag;     // The lua tag for function objects.
      int          m_wxLuaTable;      // The lua tag for the wxLua private tables
!     int          m_wxLuaNull;       // The lua tag for wxLuaNull (for NULL pointers)
      int          m_wxDeleteTable;   // The lua tag for the wxWindow destroy tracking table
  
***************
*** 225,229 ****
      wxHashTable *m_pTrackedList;    // The list of tracked objects.
      wxList      *m_pAppHandlerList; // The list of event objects associated with the application object
!     wxList      *m_pDestroyHandlerList; // The list of wxLuaDestroyCallbacks installed 
      wxList      *m_pWindowList;     // The list of all wxWindow objects, wxWidgets will delete these
                                      //    but for an embedded program they must be deleted before
--- 84,88 ----
      wxHashTable *m_pTrackedList;    // The list of tracked objects.
      wxList      *m_pAppHandlerList; // The list of event objects associated with the application object
!     wxList      *m_pDestroyHandlerList; // The list of wxLuaDestroyCallbacks installed
      wxList      *m_pWindowList;     // The list of all wxWindow objects, wxWidgets will delete these
                                      //    but for an embedded program they must be deleted before
***************
*** 248,251 ****
--- 107,113 ----
      wxCHECK_RET(stateVars, wxT("invalid wxLuaInterpreter"));
  
+ // Call this on application exit, to let wxLua tidy up
+ void LUACALL CleanupWxLua(lua_State *L, bool closeLua = true);
+ 
  // ----------------------------------------------------------------------------
  // SmartStringArray - A class to wrap an array of wxStrings with an
***************
*** 436,439 ****
--- 298,304 ----
  int LUACALL callFunction(lua_State *L);
  
+ // Given a lua tag, return the corresponding tag name
+ const char * LUACALL GetLuaTagName(lua_State *L, int nTag);
+ 
  // global function in Lua for wiring
  int LUACALL ConnectEvent(lua_State *L);
***************
*** 540,543 ****
--- 405,413 ----
  };
  
+ 
+ // ----------------------------------------------------------------------------
+ // Used to create a set of standard bitmaps for wxLua
+ int LUACALL CreateStandaloneBitmaps(lua_State *luaState);
+ 
  // ----------------------------------------------------------------------------
  // String functions - convert between Lua (ansi string) and wxString (encoded)
***************
*** 549,553 ****
      if (luastr == NULL)
          return wxEmptyString;
!     
      return wxConvertMB2WX(luastr);
  }
--- 419,423 ----
      if (luastr == NULL)
          return wxEmptyString;
! 
      return wxConvertMB2WX(luastr);
  }

[Wxlua-commit] wxLua/modules/wxluadebug/src staktree.cpp,1.3,1.4

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

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

Modified Files:
	staktree.cpp 
Log Message:
started to break up internal.cpp into wxlstate, wxlcallb...
rename library.h/cpp to wxlhandl since it only contains wxLuaHandler
remove wxLuaApp code, it doesn't exist anymore
compiles and runs in linux


Index: staktree.cpp
===================================================================
RCS file: /cvsroot/wxlua/wxLua/modules/wxluadebug/src/staktree.cpp,v
retrieving revision 1.3
retrieving revision 1.4
diff -C2 -d -r1.3 -r1.4
*** staktree.cpp	18 Jun 2005 20:46:01 -0000	1.3
--- staktree.cpp	25 Nov 2005 02:43:02 -0000	1.4
***************
*** 33,37 ****
  #include "wxluasocket/include/debugio.h"
  #include "wxluasocket/include/dserver.h"
- #include "wxlua/include/library.h"
  
  #if defined(__WXGTK__) || defined(__WXMAC__) || defined(__WXMOTIF__)
--- 33,36 ----
***************
*** 273,277 ****
  		m_stackComboBox->Append(item->GetName());
  #else
! 		m_stackComboBox->Append(item->GetName(), (void *) item->GetReference());        
  #endif
      }
--- 272,276 ----
  		m_stackComboBox->Append(item->GetName());
  #else
! 		m_stackComboBox->Append(item->GetName(), (void *) item->GetReference());
  #endif
      }

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

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

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

Modified Files:
	debug.h splttree.h staktree.h 
Log Message:
started to break up internal.cpp into wxlstate, wxlcallb...
rename library.h/cpp to wxlhandl since it only contains wxLuaHandler
remove wxLuaApp code, it doesn't exist anymore
compiles and runs in linux


Index: staktree.h
===================================================================
RCS file: /cvsroot/wxlua/wxLua/modules/wxluadebug/include/staktree.h,v
retrieving revision 1.3
retrieving revision 1.4
diff -C2 -d -r1.3 -r1.4
*** staktree.h	17 Nov 2005 05:51:20 -0000	1.3
--- staktree.h	25 Nov 2005 02:43:02 -0000	1.4
***************
*** 15,19 ****
  #endif
  
! #include "wxlua/include/defs.h"
  #include "wxluadebug/include/splttree.h"
  
--- 15,19 ----
  #endif
  
! #include "wxlua/include/wxldefs.h"
  #include "wxluadebug/include/splttree.h"
  

Index: debug.h
===================================================================
RCS file: /cvsroot/wxlua/wxLua/modules/wxluadebug/include/debug.h,v
retrieving revision 1.2
retrieving revision 1.3
diff -C2 -d -r1.2 -r1.3
*** debug.h	7 Jun 2005 04:17:40 -0000	1.2
--- debug.h	25 Nov 2005 02:43:02 -0000	1.3
***************
*** 30,34 ****
  #include "wx/treectrl.h"
  
! #include "wxlua/include/defs.h"
  
  class WXDLLIMPEXP_WXLUA wxLuaDebugData;
--- 30,34 ----
  #include "wx/treectrl.h"
  
! #include "wxlua/include/wxldefs.h"
  
  class WXDLLIMPEXP_WXLUA wxLuaDebugData;
***************
*** 244,248 ****
      wxLuaDebugEvent();
      wxLuaDebugEvent(int eventType);
!     wxLuaDebugEvent(int eventType, 
                      int lineNumber,
                      const wxString &fileName,
--- 244,248 ----
      wxLuaDebugEvent();
      wxLuaDebugEvent(int eventType);
!     wxLuaDebugEvent(int eventType,
                      int lineNumber,
                      const wxString &fileName,

Index: splttree.h
===================================================================
RCS file: /cvsroot/wxlua/wxLua/modules/wxluadebug/include/splttree.h,v
retrieving revision 1.2
retrieving revision 1.3
diff -C2 -d -r1.2 -r1.3
*** splttree.h	7 Jun 2005 04:17:40 -0000	1.2
--- splttree.h	25 Nov 2005 02:43:02 -0000	1.3
***************
*** 20,24 ****
  #endif
  
! #include "wxlua/include/defs.h"
  #include "wx/treectrl.h"
  #include "wx/splitter.h"
--- 20,24 ----
  #endif
  
! #include "wxlua/include/wxldefs.h"
  #include "wx/treectrl.h"
  #include "wx/splitter.h"

[Wxlua-commit] wxLua/modules/wxbind/include wxlhtmlwin.h,1.1,1.2 wxlprint.h,1.1,1.2

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

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

Modified Files:
	wxlhtmlwin.h wxlprint.h 
Log Message:
started to break up internal.cpp into wxlstate, wxlcallb...
rename library.h/cpp to wxlhandl since it only contains wxLuaHandler
remove wxLuaApp code, it doesn't exist anymore
compiles and runs in linux


Index: wxlhtmlwin.h
===================================================================
RCS file: /cvsroot/wxlua/wxLua/modules/wxbind/include/wxlhtmlwin.h,v
retrieving revision 1.1
retrieving revision 1.2
diff -C2 -d -r1.1 -r1.2
*** wxlhtmlwin.h	18 Jun 2005 20:53:41 -0000	1.1
--- wxlhtmlwin.h	25 Nov 2005 02:43:01 -0000	1.2
***************
*** 14,18 ****
  #endif
  
! #include "wxlua/include/defs.h"
  #include "wx/print.h"
  #include "wx/html/htmlwin.h"
--- 14,18 ----
  #endif
  
! #include "wxlua/include/wxldefs.h"
  #include "wx/print.h"
  #include "wx/html/htmlwin.h"

Index: wxlprint.h
===================================================================
RCS file: /cvsroot/wxlua/wxLua/modules/wxbind/include/wxlprint.h,v
retrieving revision 1.1
retrieving revision 1.2
diff -C2 -d -r1.1 -r1.2
*** wxlprint.h	18 Jun 2005 20:53:41 -0000	1.1
--- wxlprint.h	25 Nov 2005 02:43:01 -0000	1.2
***************
*** 14,18 ****
  #endif
  
! #include "wxlua/include/defs.h"
  #include "wx/print.h"
  
--- 14,18 ----
  #endif
  
! #include "wxlua/include/wxldefs.h"
  #include "wx/print.h"
  

[Wxlua-commit] wxLua/modules/build/bakefiles sources.bkl,1.7,1.8

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

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

Modified Files:
	sources.bkl 
Log Message:
started to break up internal.cpp into wxlstate, wxlcallb...
rename library.h/cpp to wxlhandl since it only contains wxLuaHandler
remove wxLuaApp code, it doesn't exist anymore
compiles and runs in linux


Index: sources.bkl
===================================================================
RCS file: /cvsroot/wxlua/wxLua/modules/build/bakefiles/sources.bkl,v
retrieving revision 1.7
retrieving revision 1.8
diff -C2 -d -r1.7 -r1.8
*** sources.bkl	24 Nov 2005 21:34:16 -0000	1.7
--- sources.bkl	25 Nov 2005 02:43:01 -0000	1.8
***************
*** 126,139 ****
      <set var="wxlua_src">
          wxlua/src/internal.cpp
!         wxlua/src/interp.cpp
!         wxlua/src/library.cpp
      </set>
  
      <set var="wxlua_hdr">
-          wxlua/include/callback.h
-          wxlua/include/defs.h
           wxlua/include/internal.h
!          wxlua/include/interp.h
!          wxlua/include/library.h
           wxlua/include/wxlua.h
      </set>
--- 126,144 ----
      <set var="wxlua_src">
          wxlua/src/internal.cpp
!         wxlua/src/wxlbind.cpp
!         wxlua/src/wxlcallb.cpp
!         wxlua/src/wxlhandl.cpp
!         wxlua/src/wxlintrp.cpp
!         wxlua/src/wxlstate.cpp
      </set>
  
      <set var="wxlua_hdr">
           wxlua/include/internal.h
!          wxlua/include/wxlbind.h
!          wxlua/include/wxldefs.h
!          wxlua/include/wxlcallb.h
!          wxlua/include/wxlhandl.h
!          wxlua/include/wxlintrp.h
!          wxlua/include/wxlstate.h
           wxlua/include/wxlua.h
      </set>

[Wxlua-commit] wxLua/bindings/wxwidgets luasetup.h.in,1.1,1.2 wx.rules,1.4,1.5 wxlua.i,1.4,1.5

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

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

Modified Files:
	luasetup.h.in wx.rules wxlua.i 
Log Message:
started to break up internal.cpp into wxlstate, wxlcallb...
rename library.h/cpp to wxlhandl since it only contains wxLuaHandler
remove wxLuaApp code, it doesn't exist anymore
compiles and runs in linux


Index: luasetup.h.in
===================================================================
RCS file: /cvsroot/wxlua/wxLua/bindings/wxwidgets/luasetup.h.in,v
retrieving revision 1.1
retrieving revision 1.2
diff -C2 -d -r1.1 -r1.2
*** luasetup.h.in	6 Jun 2005 23:06:07 -0000	1.1
--- luasetup.h.in	25 Nov 2005 02:43:01 -0000	1.2
***************
*** 62,66 ****
  #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
--- 62,65 ----

Index: wxlua.i
===================================================================
RCS file: /cvsroot/wxlua/wxLua/bindings/wxwidgets/wxlua.i,v
retrieving revision 1.4
retrieving revision 1.5
diff -C2 -d -r1.4 -r1.5
*** wxlua.i	23 Nov 2005 20:33:14 -0000	1.4
--- wxlua.i	25 Nov 2005 02:43:01 -0000	1.5
***************
*** 121,130 ****
  %endif wxLUA_USE_wxLuaHtmlWindow
  
- %if wxLUA_USE_wxLuaApp
- 
- %include "wxlua/include/library.h"
- 
- %endif wxLUA_USE_wxLuaApp
- 
  ///////////////////////////////////////////////////////////////////////////////
  // wxLuaTreeItemData
--- 121,124 ----

Index: wx.rules
===================================================================
RCS file: /cvsroot/wxlua/wxLua/bindings/wxwidgets/wx.rules,v
retrieving revision 1.4
retrieving revision 1.5
diff -C2 -d -r1.4 -r1.5
*** wx.rules	24 Nov 2005 06:38:17 -0000	1.4
--- wx.rules	25 Nov 2005 02:43:01 -0000	1.5
***************
*** 28,32 ****
  
  -- list of interface files to use to make the bindings
! interfaceFileList = 
  {
      "appframe.i",
--- 28,32 ----
  
  -- list of interface files to use to make the bindings
! interfaceFileList =
  {
      "appframe.i",
***************
*** 72,80 ****
      "    if (registerTypes)\n",
      "    {\n",
!     "        stateVars->m_wxNull = tnewtag(L);\n",
      "    }\n",
      "\n",
      "    tpushliteralstring(L, \"wxNull\");\n",
!     "    tpushusertag(L, NULL, stateVars->m_wxNull);\n",
      "    lua_rawset(L, luaTable);\n",
  }
--- 72,80 ----
      "    if (registerTypes)\n",
      "    {\n",
!     "        stateVars->m_wxLuaNull = tnewtag(L);\n",
      "    }\n",
      "\n",
      "    tpushliteralstring(L, \"wxNull\");\n",
!     "    tpushusertag(L, NULL, stateVars->m_wxLuaNull);\n",
      "    lua_rawset(L, luaTable);\n",
  }

[Wxlua-commit] wxLua/apps/wxlua/src Makefile,1.6,1.7 wxlua.h,1.1,1.2

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

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

Modified Files:
	Makefile wxlua.h 
Log Message:
started to break up internal.cpp into wxlstate, wxlcallb...
rename library.h/cpp to wxlhandl since it only contains wxLuaHandler
remove wxLuaApp code, it doesn't exist anymore
compiles and runs in linux


Index: Makefile
===================================================================
RCS file: /cvsroot/wxlua/wxLua/apps/wxlua/src/Makefile,v
retrieving revision 1.6
retrieving revision 1.7
diff -C2 -d -r1.6 -r1.7
*** Makefile	20 Nov 2005 22:28:07 -0000	1.6
--- Makefile	25 Nov 2005 02:43:01 -0000	1.7
***************
*** 62,66 ****
  all: lua wxLuaLib wxLuaDebugLib wxLuaSocketLib wxLuaBindings $(PROGRAM)  
  
! $(PROGRAM): $(OBJECTS) $(LUA_LIBS)
  	$(CXX) -o $@ $(OBJECTS) $(LDLIBS) $(APPEXTRALIBS) 
  
--- 62,66 ----
  all: lua wxLuaLib wxLuaDebugLib wxLuaSocketLib wxLuaBindings $(PROGRAM)  
  
! $(PROGRAM): $(OBJECTS) $(LUA_LIBS) wxLuaLib wxLuaDebugLib wxLuaSocketLib wxLuaBindings 
  	$(CXX) -o $@ $(OBJECTS) $(LDLIBS) $(APPEXTRALIBS) 
  

Index: wxlua.h
===================================================================
RCS file: /cvsroot/wxlua/wxLua/apps/wxlua/src/wxlua.h,v
retrieving revision 1.1
retrieving revision 1.2
diff -C2 -d -r1.1 -r1.2
*** wxlua.h	7 Jun 2005 04:17:29 -0000	1.1
--- wxlua.h	25 Nov 2005 02:43:01 -0000	1.2
***************
*** 17,21 ****
  #endif
  
! #include "wxlua/include/library.h"
  #ifdef __WXMSW__
      #include "lconsole.h"
--- 17,22 ----
  #endif
  
! #include "wxlua/include/wxlhandl.h"
! 
  #ifdef __WXMSW__
      #include "lconsole.h"

[Wxlua-commit] wxLua/apps/build/msw makefile.bcc,1.9,1.10 makefile.gcc,1.9,1.10 makefile.vc,1.7,1.8 makefile.wat,1.9,1.10

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

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

Modified Files:
	makefile.bcc makefile.gcc makefile.vc makefile.wat 
Log Message:
fix wxluaedit bakefile and rebake


Index: makefile.vc
===================================================================
RCS file: /cvsroot/wxlua/wxLua/apps/build/msw/makefile.vc,v
retrieving revision 1.7
retrieving revision 1.8
diff -C2 -d -r1.7 -r1.8
*** makefile.vc	24 Nov 2005 21:34:16 -0000	1.7
--- makefile.vc	24 Nov 2005 22:10:32 -0000	1.8
***************
*** 67,71 ****
  	/I$(WX_DIR)\include /I..\..\..\modules $(__WARNINGS) $(__OPTIMIZEFLAG) \
  	$(__DEBUGINFO) /Fd..\..\..\bin\wxluaedit.pdb $(____DEBUGRUNTIME) \
! 	$(__WX_SHAREDDEFINE_p) /GR /EHsc $(CPPFLAGS) $(CXXFLAGS)
  APP_WXLUAEDIT_OBJECTS =  \
  	msvc$(WXLIBPOSTFIX)\app_wxluaedit_wxledit.obj \
--- 67,72 ----
  	/I$(WX_DIR)\include /I..\..\..\modules $(__WARNINGS) $(__OPTIMIZEFLAG) \
  	$(__DEBUGINFO) /Fd..\..\..\bin\wxluaedit.pdb $(____DEBUGRUNTIME) \
! 	$(__WX_SHAREDDEFINE_p) /I$(WXSTEDIT)\include /GR /EHsc $(CPPFLAGS) \
! 	$(CXXFLAGS)
  APP_WXLUAEDIT_OBJECTS =  \
  	msvc$(WXLIBPOSTFIX)\app_wxluaedit_wxledit.obj \
***************
*** 196,200 ****
  ..\..\..\bin\wxluaedit.exe: $(APP_WXLUAEDIT_OBJECTS) msvc$(WXLIBPOSTFIX)\app_wxluaedit_wxluaedit.res
  	link /NOLOGO /OUT:$@ $(LDFLAGS) /LIBPATH:$(WX_DIR)$(__WXLIBPATH_FILENAMES) $(__DEBUGINFO_0)  /LIBPATH:..\..\..\$(__WXLUA_OUTPUT_FOLDER_FILENAMES) @<<
! 	$(APP_WXLUAEDIT_OBJECTS)  wxluadebug.lib wxluasocket.lib wxlua.lib wxbind.lib lua.lib wxmsw$(WX_VERSION)$(WXLIBPOSTFIX)_adv.lib wxbase$(WX_VERSION)$(WXLIBPOSTFIX).lib wxmsw$(WX_VERSION)$(WXLIBPOSTFIX)_core.lib wxmsw$(WX_VERSION)$(WXLIBPOSTFIX)_html.lib wxmsw$(WX_VERSION)$(WXLIBPOSTFIX)_media.lib wxbase$(WX_VERSION)$(WXLIBPOSTFIX)_net.lib wxbase$(WX_VERSION)$(WXLIBPOSTFIX)_xml.lib wxmsw$(WX_VERSION)$(WXLIBPOSTFIX)_xrc.lib wxmsw$(WX_VERSION)$(WXLIBPOSTFIX)_stc.lib wxtiff$(WX3RDPARTYLIBPOSTFIX).lib wxjpeg$(WX3RDPARTYLIBPOSTFIX).lib wxpng$(WX3RDPARTYLIBPOSTFIX).lib wxzlib$(WX3RDPARTYLIBPOSTFIX).lib wxregex$(WXLIBPOSTFIX).lib wxexpat$(WX3RDPARTYLIBPOSTFIX).lib kernel32.lib user32.lib gdi32.lib comdlg32.lib winspool.lib winmm.lib shell32.lib comctl32.lib ole32.lib oleaut32.lib uuid.lib rpcrt4.lib advapi32.lib wsock32.lib odbc32.lib oleacc.lib
  <<
  !endif
--- 197,201 ----
  ..\..\..\bin\wxluaedit.exe: $(APP_WXLUAEDIT_OBJECTS) msvc$(WXLIBPOSTFIX)\app_wxluaedit_wxluaedit.res
  	link /NOLOGO /OUT:$@ $(LDFLAGS) /LIBPATH:$(WX_DIR)$(__WXLIBPATH_FILENAMES) $(__DEBUGINFO_0)  /LIBPATH:..\..\..\$(__WXLUA_OUTPUT_FOLDER_FILENAMES) @<<
! 	$(APP_WXLUAEDIT_OBJECTS)  wxluadebug.lib wxluasocket.lib wxlua.lib wxbind.lib lua.lib wxmsw$(WX_VERSION)$(WXLIBPOSTFIX)_adv.lib wxbase$(WX_VERSION)$(WXLIBPOSTFIX).lib wxmsw$(WX_VERSION)$(WXLIBPOSTFIX)_core.lib wxmsw$(WX_VERSION)$(WXLIBPOSTFIX)_html.lib wxmsw$(WX_VERSION)$(WXLIBPOSTFIX)_media.lib wxbase$(WX_VERSION)$(WXLIBPOSTFIX)_net.lib wxbase$(WX_VERSION)$(WXLIBPOSTFIX)_xml.lib wxmsw$(WX_VERSION)$(WXLIBPOSTFIX)_xrc.lib wxmsw$(WX_VERSION)$(WXLIBPOSTFIX)_stc.lib wxmsw$(WX_VERSION)$(WXLIBPOSTFIX)_stedit.lib wxtiff$(WX3RDPARTYLIBPOSTFIX).lib wxjpeg$(WX3RDPARTYLIBPOSTFIX).lib wxpng$(WX3RDPARTYLIBPOSTFIX).lib wxzlib$(WX3RDPARTYLIBPOSTFIX).lib wxregex$(WXLIBPOSTFIX).lib wxexpat$(WX3RDPARTYLIBPOSTFIX).lib kernel32.lib user32.lib gdi32.lib comdlg32.lib winspool.lib winmm.lib shell32.lib comctl32.lib ole32.lib oleaut32.lib uuid.lib rpcrt4.lib advapi32.lib wsock32.lib odbc32.lib oleacc.lib
  <<
  !endif
***************
*** 215,219 ****
  	$(CXX) /c /nologo /TP /Fo$@ $(APP_WXLUAEDIT_CXXFLAGS) $**
  
! msvc$(WXLIBPOSTFIX)\app_wxluaedit_wxluaedit.res: ..\..\wxlua\src\wxluaedit.rc
  	rc /fo$@  /d WIN32 $(__WXUNICODE_DEFINE_p_0) $(__WXDEBUG_DEFINE_p_0) /d __WXMSW__ /i $(WX_DIR)$(__WXLIBPATH_FILENAMES)\msw$(WXLIBPOSTFIX) /i $(WX_DIR)\include /i ..\..\..\modules $(____DEBUGRUNTIME_0) $(__WX_SHAREDDEFINE_p_0) $**
  
--- 216,220 ----
  	$(CXX) /c /nologo /TP /Fo$@ $(APP_WXLUAEDIT_CXXFLAGS) $**
  
! msvc$(WXLIBPOSTFIX)\app_wxluaedit_wxluaedit.res: ..\..\wxluaedit\src\wxluaedit.rc
  	rc /fo$@  /d WIN32 $(__WXUNICODE_DEFINE_p_0) $(__WXDEBUG_DEFINE_p_0) /d __WXMSW__ /i $(WX_DIR)$(__WXLIBPATH_FILENAMES)\msw$(WXLIBPOSTFIX) /i $(WX_DIR)\include /i ..\..\..\modules $(____DEBUGRUNTIME_0) $(__WX_SHAREDDEFINE_p_0) $**
  

Index: makefile.bcc
===================================================================
RCS file: /cvsroot/wxlua/wxLua/apps/build/msw/makefile.bcc,v
retrieving revision 1.9
retrieving revision 1.10
diff -C2 -d -r1.9 -r1.10
*** makefile.bcc	24 Nov 2005 21:34:16 -0000	1.9
--- makefile.bcc	24 Nov 2005 22:10:32 -0000	1.10
***************
*** 95,99 ****
  	-I$(WX_DIR)$(__WXLIBPATH_FILENAMES)\msw$(WXLIBPOSTFIX) \
  	-I$(WX_DIR)\include -I..\..\..\modules $(__OPTIMIZEFLAG) $(__DEBUGINFO) -tWM \
! 	$(__WX_SHAREDDEFINE_p) $(CPPFLAGS) $(CXXFLAGS)
  APP_WXLUAEDIT_OBJECTS =  \
  	borland$(WXLIBPOSTFIX)\app_wxluaedit_wxledit.obj \
--- 95,99 ----
  	-I$(WX_DIR)$(__WXLIBPATH_FILENAMES)\msw$(WXLIBPOSTFIX) \
  	-I$(WX_DIR)\include -I..\..\..\modules $(__OPTIMIZEFLAG) $(__DEBUGINFO) -tWM \
! 	$(__WX_SHAREDDEFINE_p) -I$(WXSTEDIT)\include $(CPPFLAGS) $(CXXFLAGS)
  APP_WXLUAEDIT_OBJECTS =  \
  	borland$(WXLIBPOSTFIX)\app_wxluaedit_wxledit.obj \
***************
*** 199,203 ****
  ..\..\..\bin\wxluaedit.exe: $(APP_WXLUAEDIT_OBJECTS)  borland$(WXLIBPOSTFIX)\app_wxluaedit_wxluaedit.res
  	ilink32 -Tpe -q $(LDFLAGS) -L$(BCCDIR)\lib -L$(BCCDIR)\lib\psdk -L$(WX_DIR)$(__WXLIBPATH_FILENAMES) $(__DEBUGINFO)  -L..\..\..\$(__WXLUA_OUTPUT_FOLDER_FILENAMES) @&&|
! 	c0x32.obj $(APP_WXLUAEDIT_OBJECTS),$@,, wxluadebug.lib wxluasocket.lib wxlua.lib wxbind.lib lua.lib wxmsw$(WX_VERSION)$(WXLIBPOSTFIX)_adv.lib wxbase$(WX_VERSION)$(WXLIBPOSTFIX).lib wxmsw$(WX_VERSION)$(WXLIBPOSTFIX)_core.lib wxmsw$(WX_VERSION)$(WXLIBPOSTFIX)_html.lib wxmsw$(WX_VERSION)$(WXLIBPOSTFIX)_media.lib wxbase$(WX_VERSION)$(WXLIBPOSTFIX)_net.lib wxbase$(WX_VERSION)$(WXLIBPOSTFIX)_xml.lib wxmsw$(WX_VERSION)$(WXLIBPOSTFIX)_xrc.lib wxmsw$(WX_VERSION)$(WXLIBPOSTFIX)_stc.lib wxtiff$(WX3RDPARTYLIBPOSTFIX).lib wxjpeg$(WX3RDPARTYLIBPOSTFIX).lib wxpng$(WX3RDPARTYLIBPOSTFIX).lib wxzlib$(WX3RDPARTYLIBPOSTFIX).lib wxregex$(WXLIBPOSTFIX).lib wxexpat$(WX3RDPARTYLIBPOSTFIX).lib ole2w32.lib oleacc.lib import32.lib cw32mt.lib,, borland$(WXLIBPOSTFIX)\app_wxluaedit_wxluaedit.res
  |
  !endif
--- 199,203 ----
  ..\..\..\bin\wxluaedit.exe: $(APP_WXLUAEDIT_OBJECTS)  borland$(WXLIBPOSTFIX)\app_wxluaedit_wxluaedit.res
  	ilink32 -Tpe -q $(LDFLAGS) -L$(BCCDIR)\lib -L$(BCCDIR)\lib\psdk -L$(WX_DIR)$(__WXLIBPATH_FILENAMES) $(__DEBUGINFO)  -L..\..\..\$(__WXLUA_OUTPUT_FOLDER_FILENAMES) @&&|
! 	c0x32.obj $(APP_WXLUAEDIT_OBJECTS),$@,, wxluadebug.lib wxluasocket.lib wxlua.lib wxbind.lib lua.lib wxmsw$(WX_VERSION)$(WXLIBPOSTFIX)_adv.lib wxbase$(WX_VERSION)$(WXLIBPOSTFIX).lib wxmsw$(WX_VERSION)$(WXLIBPOSTFIX)_core.lib wxmsw$(WX_VERSION)$(WXLIBPOSTFIX)_html.lib wxmsw$(WX_VERSION)$(WXLIBPOSTFIX)_media.lib wxbase$(WX_VERSION)$(WXLIBPOSTFIX)_net.lib wxbase$(WX_VERSION)$(WXLIBPOSTFIX)_xml.lib wxmsw$(WX_VERSION)$(WXLIBPOSTFIX)_xrc.lib wxmsw$(WX_VERSION)$(WXLIBPOSTFIX)_stc.lib wxmsw$(WX_VERSION)$(WXLIBPOSTFIX)_stedit.lib wxtiff$(WX3RDPARTYLIBPOSTFIX).lib wxjpeg$(WX3RDPARTYLIBPOSTFIX).lib wxpng$(WX3RDPARTYLIBPOSTFIX).lib wxzlib$(WX3RDPARTYLIBPOSTFIX).lib wxregex$(WXLIBPOSTFIX).lib wxexpat$(WX3RDPARTYLIBPOSTFIX).lib ole2w32.lib oleacc.lib import32.lib cw32mt.lib,, borland$(WXLIBPOSTFIX)\app_wxluaedit_wxluaedit.res
  |
  !endif
***************
*** 218,222 ****
  	$(CXX) -q -c -P -o$@ $(APP_WXLUAEDIT_CXXFLAGS) $**
  
! borland$(WXLIBPOSTFIX)\app_wxluaedit_wxluaedit.res: ..\..\wxlua\src\wxluaedit.rc
  	brcc32 -32 -r -fo$@ -i$(BCCDIR)\include $(__WXUNICODE_DEFINE_p_0) $(__WXDEBUG_DEFINE_p_0) -d__WXMSW__ -i$(WX_DIR)$(__WXLIBPATH_FILENAMES)\msw$(WXLIBPOSTFIX) -i$(WX_DIR)\include -i..\..\..\modules $(__WX_SHAREDDEFINE_p_0) $**
  
--- 218,222 ----
  	$(CXX) -q -c -P -o$@ $(APP_WXLUAEDIT_CXXFLAGS) $**
  
! borland$(WXLIBPOSTFIX)\app_wxluaedit_wxluaedit.res: ..\..\wxluaedit\src\wxluaedit.rc
  	brcc32 -32 -r -fo$@ -i$(BCCDIR)\include $(__WXUNICODE_DEFINE_p_0) $(__WXDEBUG_DEFINE_p_0) -d__WXMSW__ -i$(WX_DIR)$(__WXLIBPATH_FILENAMES)\msw$(WXLIBPOSTFIX) -i$(WX_DIR)\include -i..\..\..\modules $(__WX_SHAREDDEFINE_p_0) $**
  

Index: makefile.wat
===================================================================
RCS file: /cvsroot/wxlua/wxLua/apps/build/msw/makefile.wat,v
retrieving revision 1.9
retrieving revision 1.10
diff -C2 -d -r1.9 -r1.10
*** makefile.wat	24 Nov 2005 21:34:16 -0000	1.9
--- makefile.wat	24 Nov 2005 22:10:32 -0000	1.10
***************
*** 162,166 ****
  	-d__WXMSW__ -i=$(WX_DIR)$(__WXLIBPATH_FILENAMES)\msw$(WXLIBPOSTFIX) &
  	-i=$(WX_DIR)\include -i=..\..\..\modules $(__WARNINGS) $(__OPTIMIZEFLAG) &
! 	$(__DEBUGINFO) -bm $(__WX_SHAREDDEFINE_p) $(CPPFLAGS) $(CXXFLAGS)
  APP_WXLUAEDIT_OBJECTS =  &
  	watcom$(WXLIBPOSTFIX)\app_wxluaedit_wxledit.obj &
--- 162,167 ----
  	-d__WXMSW__ -i=$(WX_DIR)$(__WXLIBPATH_FILENAMES)\msw$(WXLIBPOSTFIX) &
  	-i=$(WX_DIR)\include -i=..\..\..\modules $(__WARNINGS) $(__OPTIMIZEFLAG) &
! 	$(__DEBUGINFO) -bm $(__WX_SHAREDDEFINE_p) -i=$(%WXSTEDIT)\include &
! 	$(CPPFLAGS) $(CXXFLAGS)
  APP_WXLUAEDIT_OBJECTS =  &
  	watcom$(WXLIBPOSTFIX)\app_wxluaedit_wxledit.obj &
***************
*** 206,210 ****
  	@%append watcom$(WXLIBPOSTFIX)\app_wxluaedit.lbc $(LDFLAGS) libpath $(WX_DIR)$(__WXLIBPATH_FILENAMES) $(__DEBUGINFO_0)  libpath ..\..\..\$(__WXLUA_OUTPUT_FOLDER_FILENAMES)
  	@for %i in ($(APP_WXLUAEDIT_OBJECTS)) do @%append watcom$(WXLIBPOSTFIX)\app_wxluaedit.lbc file %i
! 	@for %i in ( wxluadebug.lib wxluasocket.lib wxlua.lib wxbind.lib lua.lib wxmsw$(WX_VERSION)$(WXLIBPOSTFIX)_adv.lib wxbase$(WX_VERSION)$(WXLIBPOSTFIX).lib wxmsw$(WX_VERSION)$(WXLIBPOSTFIX)_core.lib wxmsw$(WX_VERSION)$(WXLIBPOSTFIX)_html.lib wxmsw$(WX_VERSION)$(WXLIBPOSTFIX)_media.lib wxbase$(WX_VERSION)$(WXLIBPOSTFIX)_net.lib wxbase$(WX_VERSION)$(WXLIBPOSTFIX)_xml.lib wxmsw$(WX_VERSION)$(WXLIBPOSTFIX)_xrc.lib wxmsw$(WX_VERSION)$(WXLIBPOSTFIX)_stc.lib wxtiff$(WX3RDPARTYLIBPOSTFIX).lib wxjpeg$(WX3RDPARTYLIBPOSTFIX).lib wxpng$(WX3RDPARTYLIBPOSTFIX).lib wxzlib$(WX3RDPARTYLIBPOSTFIX).lib wxregex$(WXLIBPOSTFIX).lib wxexpat$(WX3RDPARTYLIBPOSTFIX).lib kernel32.lib user32.lib gdi32.lib comdlg32.lib winspool.lib winmm.lib shell32.lib comctl32.lib ole32.lib oleaut32.lib uuid.lib rpcrt4.lib advapi32.lib wsock32.lib odbc32.lib) do @%append watcom$(WXLIBPOSTFIX)\app_wxluaedit.lbc library %i
  	@%append watcom$(WXLIBPOSTFIX)\app_wxluaedit.lbc option resource=watcom$(WXLIBPOSTFIX)\app_wxluaedit_wxluaedit.res
  	wlink @watcom$(WXLIBPOSTFIX)\app_wxluaedit.lbc
--- 207,211 ----
  	@%append watcom$(WXLIBPOSTFIX)\app_wxluaedit.lbc $(LDFLAGS) libpath $(WX_DIR)$(__WXLIBPATH_FILENAMES) $(__DEBUGINFO_0)  libpath ..\..\..\$(__WXLUA_OUTPUT_FOLDER_FILENAMES)
  	@for %i in ($(APP_WXLUAEDIT_OBJECTS)) do @%append watcom$(WXLIBPOSTFIX)\app_wxluaedit.lbc file %i
! 	@for %i in ( wxluadebug.lib wxluasocket.lib wxlua.lib wxbind.lib lua.lib wxmsw$(WX_VERSION)$(WXLIBPOSTFIX)_adv.lib wxbase$(WX_VERSION)$(WXLIBPOSTFIX).lib wxmsw$(WX_VERSION)$(WXLIBPOSTFIX)_core.lib wxmsw$(WX_VERSION)$(WXLIBPOSTFIX)_html.lib wxmsw$(WX_VERSION)$(WXLIBPOSTFIX)_media.lib wxbase$(WX_VERSION)$(WXLIBPOSTFIX)_net.lib wxbase$(WX_VERSION)$(WXLIBPOSTFIX)_xml.lib wxmsw$(WX_VERSION)$(WXLIBPOSTFIX)_xrc.lib wxmsw$(WX_VERSION)$(WXLIBPOSTFIX)_stc.lib wxmsw$(WX_VERSION)$(WXLIBPOSTFIX)_stedit.lib wxtiff$(WX3RDPARTYLIBPOSTFIX).lib wxjpeg$(WX3RDPARTYLIBPOSTFIX).lib wxpng$(WX3RDPARTYLIBPOSTFIX).lib wxzlib$(WX3RDPARTYLIBPOSTFIX).lib wxregex$(WXLIBPOSTFIX).lib wxexpat$(WX3RDPARTYLIBPOSTFIX).lib kernel32.lib user32.lib gdi32.lib comdlg32.lib winspool.lib winmm.lib shell32.lib comctl32.lib ole32.lib oleaut32.lib uuid.lib rpcrt4.lib advapi32.lib wsock32.lib odbc32.lib) do @%append watcom$(WXLIBPOSTFIX)\app_wxluaedit.lbc library %i
  	@%append watcom$(WXLIBPOSTFIX)\app_wxluaedit.lbc option resource=watcom$(WXLIBPOSTFIX)\app_wxluaedit_wxluaedit.res
  	wlink @watcom$(WXLIBPOSTFIX)\app_wxluaedit.lbc
***************
*** 226,230 ****
  	$(CXX) -zq -fo=$^@ $(APP_WXLUAEDIT_CXXFLAGS) $<
  
! watcom$(WXLIBPOSTFIX)\app_wxluaedit_wxluaedit.res :  .AUTODEPEND ..\..\wxlua\src\wxluaedit.rc
  	wrc -q -ad -bt=nt -r -fo=$^@ $(__WXUNICODE_DEFINE_p) $(__WXDEBUG_DEFINE_p) -d__WXMSW__ -i=$(WX_DIR)$(__WXLIBPATH_FILENAMES)\msw$(WXLIBPOSTFIX) -i=$(WX_DIR)\include -i=..\..\..\modules $(__WX_SHAREDDEFINE_p) $<
  
--- 227,231 ----
  	$(CXX) -zq -fo=$^@ $(APP_WXLUAEDIT_CXXFLAGS) $<
  
! watcom$(WXLIBPOSTFIX)\app_wxluaedit_wxluaedit.res :  .AUTODEPEND ..\..\wxluaedit\src\wxluaedit.rc
  	wrc -q -ad -bt=nt -r -fo=$^@ $(__WXUNICODE_DEFINE_p) $(__WXDEBUG_DEFINE_p) -d__WXMSW__ -i=$(WX_DIR)$(__WXLIBPATH_FILENAMES)\msw$(WXLIBPOSTFIX) -i=$(WX_DIR)\include -i=..\..\..\modules $(__WX_SHAREDDEFINE_p) $<
  

Index: makefile.gcc
===================================================================
RCS file: /cvsroot/wxlua/wxLua/apps/build/msw/makefile.gcc,v
retrieving revision 1.9
retrieving revision 1.10
diff -C2 -d -r1.9 -r1.10
*** makefile.gcc	24 Nov 2005 21:34:16 -0000	1.9
--- makefile.gcc	24 Nov 2005 22:10:32 -0000	1.10
***************
*** 66,70 ****
  	-I$(WX_DIR)$(WXLIBPATH)\msw$(WXLIBPOSTFIX) -I$(WX_DIR)\include \
  	-I..\..\..\modules $(__WARNINGS) $(__OPTIMIZEFLAG) $(__DEBUGINFO) -mthreads \
! 	$(__WX_SHAREDDEFINE_p) $(CPPFLAGS) $(CXXFLAGS)
  APP_WXLUAEDIT_OBJECTS =  \
  	mingw$(WXLIBPOSTFIX)\app_wxluaedit_wxledit.o \
--- 66,70 ----
  	-I$(WX_DIR)$(WXLIBPATH)\msw$(WXLIBPOSTFIX) -I$(WX_DIR)\include \
  	-I..\..\..\modules $(__WARNINGS) $(__OPTIMIZEFLAG) $(__DEBUGINFO) -mthreads \
! 	$(__WX_SHAREDDEFINE_p) -I$(WXSTEDIT)\include $(CPPFLAGS) $(CXXFLAGS)
  APP_WXLUAEDIT_OBJECTS =  \
  	mingw$(WXLIBPOSTFIX)\app_wxluaedit_wxledit.o \
***************
*** 169,173 ****
  ifeq ($(USE_WXLUAEDITAPP),1)
  ..\..\..\bin\wxluaedit.exe: $(APP_WXLUAEDIT_OBJECTS) mingw$(WXLIBPOSTFIX)\app_wxluaedit_wxluaedit_rc.o
! 	$(CXX) -o $@ $(APP_WXLUAEDIT_OBJECTS) $(LDFLAGS) -mthreads -L$(WX_DIR)$(WXLIBPATH) $(__DEBUGINFO) -mthreads -L..\..\..\$(__WXLUA_OUTPUT_FOLDER_FILENAMES)  -lwxluadebug -lwxluasocket -lwxlua -lwxbind -llua -lwxmsw$(WX_VERSION)$(WXLIBPOSTFIX)_adv -lwxbase$(WX_VERSION)$(WXLIBPOSTFIX) -lwxmsw$(WX_VERSION)$(WXLIBPOSTFIX)_core -lwxmsw$(WX_VERSION)$(WXLIBPOSTFIX)_html -lwxmsw$(WX_VERSION)$(WXLIBPOSTFIX)_media -lwxbase$(WX_VERSION)$(WXLIBPOSTFIX)_net -lwxbase$(WX_VERSION)$(WXLIBPOSTFIX)_xml -lwxmsw$(WX_VERSION)$(WXLIBPOSTFIX)_xrc -lwxmsw$(WX_VERSION)$(WXLIBPOSTFIX)_stc -lwxtiff$(WX3RDPARTYLIBPOSTFIX) -lwxjpeg$(WX3RDPARTYLIBPOSTFIX) -lwxpng$(WX3RDPARTYLIBPOSTFIX) -lwxzlib$(WX3RDPARTYLIBPOSTFIX) -lwxregex$(WXLIBPOSTFIX) -lwxexpat$(WX3RDPARTYLIBPOSTFIX) -lkernel32 -luser32 -lgdi32 -lcomdlg32 -lwinspool -lwinmm -lshell32 -lcomctl32 -lole32 -loleaut32 -luuid -lrpcrt4 -ladvapi32 -lwsock32 -lodbc32
  endif
  
--- 169,173 ----
  ifeq ($(USE_WXLUAEDITAPP),1)
  ..\..\..\bin\wxluaedit.exe: $(APP_WXLUAEDIT_OBJECTS) mingw$(WXLIBPOSTFIX)\app_wxluaedit_wxluaedit_rc.o
! 	$(CXX) -o $@ $(APP_WXLUAEDIT_OBJECTS) $(LDFLAGS) -mthreads -L$(WX_DIR)$(WXLIBPATH) $(__DEBUGINFO) -mthreads -L..\..\..\$(__WXLUA_OUTPUT_FOLDER_FILENAMES)  -lwxluadebug -lwxluasocket -lwxlua -lwxbind -llua -lwxmsw$(WX_VERSION)$(WXLIBPOSTFIX)_adv -lwxbase$(WX_VERSION)$(WXLIBPOSTFIX) -lwxmsw$(WX_VERSION)$(WXLIBPOSTFIX)_core -lwxmsw$(WX_VERSION)$(WXLIBPOSTFIX)_html -lwxmsw$(WX_VERSION)$(WXLIBPOSTFIX)_media -lwxbase$(WX_VERSION)$(WXLIBPOSTFIX)_net -lwxbase$(WX_VERSION)$(WXLIBPOSTFIX)_xml -lwxmsw$(WX_VERSION)$(WXLIBPOSTFIX)_xrc -lwxmsw$(WX_VERSION)$(WXLIBPOSTFIX)_stc -lwxmsw$(WX_VERSION)$(WXLIBPOSTFIX)_stedit -lwxtiff$(WX3RDPARTYLIBPOSTFIX) -lwxjpeg$(WX3RDPARTYLIBPOSTFIX) -lwxpng$(WX3RDPARTYLIBPOSTFIX) -lwxzlib$(WX3RDPARTYLIBPOSTFIX) -lwxregex$(WXLIBPOSTFIX) -lwxexpat$(WX3RDPARTYLIBPOSTFIX) -lkernel32 -luser32 -lgdi32 -lcomdlg32 -lwinspool -lwinmm -lshell32 -lcomctl32 -lole32 -loleaut32 -luuid -lrpcrt4 -ladvapi32 -lwsock32 -lodbc32
  endif
  
***************
*** 187,191 ****
  	$(CXX) -c -o $@ $(APP_WXLUAEDIT_CXXFLAGS) $(CPPDEPS) $<
  
! mingw$(WXLIBPOSTFIX)\app_wxluaedit_wxluaedit_rc.o: ../../wxlua/src/wxluaedit.rc
  	windres --use-temp-file -i$< -o$@ --define HAVE_W32API_H $(__WXUNICODE_DEFINE_p_0) $(__WXDEBUG_DEFINE_p_0) --define __WXMSW__ --include-dir $(WX_DIR)$(WXLIBPATH)\msw$(WXLIBPOSTFIX) --include-dir $(WX_DIR)/include --include-dir ..\..\..\modules $(__WX_SHAREDDEFINE_p_0)
  
--- 187,191 ----
  	$(CXX) -c -o $@ $(APP_WXLUAEDIT_CXXFLAGS) $(CPPDEPS) $<
  
! mingw$(WXLIBPOSTFIX)\app_wxluaedit_wxluaedit_rc.o: ../../wxluaedit/src/wxluaedit.rc
  	windres --use-temp-file -i$< -o$@ --define HAVE_W32API_H $(__WXUNICODE_DEFINE_p_0) $(__WXDEBUG_DEFINE_p_0) --define __WXMSW__ --include-dir $(WX_DIR)$(WXLIBPATH)\msw$(WXLIBPOSTFIX) --include-dir $(WX_DIR)/include --include-dir ..\..\..\modules $(__WX_SHAREDDEFINE_p_0)
  

[Wxlua-commit] wxLua/apps/build/bakefiles apps.bkl,1.7,1.8

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

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

Modified Files:
	apps.bkl 
Log Message:
fix wxluaedit bakefile and rebake


Index: apps.bkl
===================================================================
RCS file: /cvsroot/wxlua/wxLua/apps/build/bakefiles/apps.bkl,v
retrieving revision 1.7
retrieving revision 1.8
diff -C2 -d -r1.7 -r1.8
*** apps.bkl	24 Nov 2005 21:34:16 -0000	1.7
--- apps.bkl	24 Nov 2005 22:10:32 -0000	1.8
***************
*** 48,52 ****
      <!-- apps-specific options -->
      <include file="options.bkl"/>
!     <!-- <include file="../../../modules/build/bakefiles/options.bkl"/> -->
  
  
--- 48,52 ----
      <!-- apps-specific options -->
      <include file="options.bkl"/>
!     <include file="../../../modules/build/bakefiles/options.bkl"/>
  
  
***************
*** 92,96 ****
          <dirname>$(WXLUA_BASEDIR)$(DIRSEP)bin</dirname>
  		<exename>wxluaedit</exename>
!         <win32-res>wxlua/src/wxluaedit.rc</win32-res>
  
          <!-- Libraries must be put in the right order ! -->
--- 92,104 ----
          <dirname>$(WXLUA_BASEDIR)$(DIRSEP)bin</dirname>
  		<exename>wxluaedit</exename>
!         <win32-res>wxluaedit/src/wxluaedit.rc</win32-res>
! 
!         <!-- Path to the wxstedit includes -->
!         <if cond="FORMAT!='autoconf'">
!             <include>$(DOLLAR)($(ENV_VAR)WXSTEDIT)/include</include>
!         </if>
!         <if cond="FORMAT=='autoconf'">
!             <include>$(DOLLAR)(WXSTEDIT)/include</include>
!         </if>
  
          <!-- Libraries must be put in the right order ! -->
***************
*** 111,114 ****
--- 119,125 ----
  
          <wx-lib>stc</wx-lib>
+ 
+         <!-- Library for wxstedit -->
+         <wx-lib>stedit</wx-lib>
      </exe>
  

[Wxlua-commit] wxLua/apps Makefile.in,1.8,1.9

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

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

Modified Files:
	Makefile.in 
Log Message:
fix wxluaedit bakefile and rebake


Index: Makefile.in
===================================================================
RCS file: /cvsroot/wxlua/wxLua/apps/Makefile.in,v
retrieving revision 1.8
retrieving revision 1.9
diff -C2 -d -r1.8 -r1.9
*** Makefile.in	24 Nov 2005 21:34:15 -0000	1.8
--- Makefile.in	24 Nov 2005 22:10:32 -0000	1.9
***************
*** 30,34 ****
  	app_wxlua_lconsole.o \
  	$(__app_wxlua___win32rc)
! APP_WXLUAEDIT_CXXFLAGS = -I../modules $(WX_CXXFLAGS) $(CPPFLAGS) $(CXXFLAGS)
  APP_WXLUAEDIT_OBJECTS =  \
  	app_wxluaedit_wxledit.o \
--- 30,35 ----
  	app_wxlua_lconsole.o \
  	$(__app_wxlua___win32rc)
! APP_WXLUAEDIT_CXXFLAGS = -I../modules -I$(WXSTEDIT)/include $(WX_CXXFLAGS) \
! 	$(CPPFLAGS) $(CXXFLAGS)
  APP_WXLUAEDIT_OBJECTS =  \
  	app_wxluaedit_wxledit.o \
***************
*** 95,99 ****
  	$(CXXC) -c -o $@ $(APP_WXLUAEDIT_CXXFLAGS) ./wxluaedit/src/wxluaedit.cpp
  
! app_wxluaedit_wxluaedit_rc.o: ./wxlua/src/wxluaedit.rc
  	$(RESCOMP) -i$< -o$@ --include-dir ../modules
  
--- 96,100 ----
  	$(CXXC) -c -o $@ $(APP_WXLUAEDIT_CXXFLAGS) ./wxluaedit/src/wxluaedit.cpp
  
! app_wxluaedit_wxluaedit_rc.o: ./wxluaedit/src/wxluaedit.rc
  	$(RESCOMP) -i$< -o$@ --include-dir ../modules
  

[Wxlua-commit] wxLua/apps/build/msw makefile.bcc,1.8,1.9 makefile.gcc,1.8,1.9 makefile.vc,1.6,1.7 makefile.wat,1.8,1.9

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

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

Modified Files:
	makefile.bcc makefile.gcc makefile.vc makefile.wat 
Log Message:
formatting for bakfiles
added USE_WXLUAAPP, USE_WXLUAEDITAPP


Index: makefile.vc
===================================================================
RCS file: /cvsroot/wxlua/wxLua/apps/build/msw/makefile.vc,v
retrieving revision 1.6
retrieving revision 1.7
diff -C2 -d -r1.6 -r1.7
*** makefile.vc	23 Nov 2005 20:33:14 -0000	1.6
--- makefile.vc	24 Nov 2005 21:34:16 -0000	1.7
***************
*** 38,41 ****
--- 38,47 ----
  WX_VERSION = 26
  
+ # Compile the wxLua app ? [0,1]
+ USE_WXLUAAPP = 1
+ 
+ # Compile the wxLuaEditor app ? [0,1]
+ USE_WXLUAEDITAPP = 0
+ 
  
  
***************
*** 46,54 ****
  ### Variables: ###
  
! APP_WXLUA_CXXFLAGS = /MD$(__DEBUGRUNTIME_7) /DWIN32 $(__WXUNICODE_DEFINE_p) \
  	$(__WXDEBUG_DEFINE_p) /D__WXMSW__ \
  	/I$(WX_DIR)$(__WXLIBPATH_FILENAMES)\msw$(WXLIBPOSTFIX) \
! 	/I$(WX_DIR)\include /I..\..\..\modules $(__WARNINGS_2) $(__OPTIMIZEFLAG_3) \
! 	$(__DEBUGINFO_4) /Fd..\..\..\bin\wxlua.pdb $(____DEBUGRUNTIME_6_p) \
  	$(__WX_SHAREDDEFINE_p) /GR /EHsc $(CPPFLAGS) $(CXXFLAGS)
  APP_WXLUA_OBJECTS =  \
--- 52,60 ----
  ### Variables: ###
  
! APP_WXLUA_CXXFLAGS = /MD$(__DEBUGRUNTIME) /DWIN32 $(__WXUNICODE_DEFINE_p) \
  	$(__WXDEBUG_DEFINE_p) /D__WXMSW__ \
  	/I$(WX_DIR)$(__WXLIBPATH_FILENAMES)\msw$(WXLIBPOSTFIX) \
! 	/I$(WX_DIR)\include /I..\..\..\modules $(__WARNINGS) $(__OPTIMIZEFLAG) \
! 	$(__DEBUGINFO) /Fd..\..\..\bin\wxlua.pdb $(____DEBUGRUNTIME) \
  	$(__WX_SHAREDDEFINE_p) /GR /EHsc $(CPPFLAGS) $(CXXFLAGS)
  APP_WXLUA_OBJECTS =  \
***************
*** 56,59 ****
--- 62,75 ----
  	msvc$(WXLIBPOSTFIX)\app_wxlua_lconsole.obj \
  	msvc$(WXLIBPOSTFIX)\app_wxlua_wxlua.res
+ APP_WXLUAEDIT_CXXFLAGS = /MD$(__DEBUGRUNTIME) /DWIN32 $(__WXUNICODE_DEFINE_p) \
+ 	$(__WXDEBUG_DEFINE_p) /D__WXMSW__ \
+ 	/I$(WX_DIR)$(__WXLIBPATH_FILENAMES)\msw$(WXLIBPOSTFIX) \
+ 	/I$(WX_DIR)\include /I..\..\..\modules $(__WARNINGS) $(__OPTIMIZEFLAG) \
+ 	$(__DEBUGINFO) /Fd..\..\..\bin\wxluaedit.pdb $(____DEBUGRUNTIME) \
+ 	$(__WX_SHAREDDEFINE_p) /GR /EHsc $(CPPFLAGS) $(CXXFLAGS)
+ APP_WXLUAEDIT_OBJECTS =  \
+ 	msvc$(WXLIBPOSTFIX)\app_wxluaedit_wxledit.obj \
+ 	msvc$(WXLIBPOSTFIX)\app_wxluaedit_wxluaedit.obj \
+ 	msvc$(WXLIBPOSTFIX)\app_wxluaedit_wxluaedit.res
  
  ### Conditionally set variables: ###
***************
*** 62,70 ****
  WX3RDPARTYLIBPOSTFIX = d
  !endif
  !if "$(WX_UNICODE)" == "1"
  __WXUNICODE_DEFINE_p = /D_UNICODE
  !endif
  !if "$(WX_UNICODE)" == "1"
! __WXUNICODE_DEFINE_p_1 = /d _UNICODE
  !endif
  !if "$(WX_DEBUG)" == "1"
--- 78,92 ----
  WX3RDPARTYLIBPOSTFIX = d
  !endif
+ !if "$(USE_WXLUAAPP)" == "1"
+ __app_wxlua___depname = ..\..\..\bin\wxlua.exe
+ !endif
+ !if "$(USE_WXLUAEDITAPP)" == "1"
+ __app_wxluaedit___depname = ..\..\..\bin\wxluaedit.exe
+ !endif
  !if "$(WX_UNICODE)" == "1"
  __WXUNICODE_DEFINE_p = /D_UNICODE
  !endif
  !if "$(WX_UNICODE)" == "1"
! __WXUNICODE_DEFINE_p_0 = /d _UNICODE
  !endif
  !if "$(WX_DEBUG)" == "1"
***************
*** 72,118 ****
  !endif
  !if "$(WX_DEBUG)" == "1"
! __WXDEBUG_DEFINE_p_1 = /d __WXDEBUG__
  !endif
  !if "$(WX_DEBUG)" == "0"
! __WARNINGS_2 = /w
  !endif
  !if "$(WX_DEBUG)" == "1"
! __WARNINGS_2 = /W4
  !endif
  !if "$(WX_DEBUG)" == "0"
! __OPTIMIZEFLAG_3 = /O2
  !endif
  !if "$(WX_DEBUG)" == "1"
! __OPTIMIZEFLAG_3 = /Od
  !endif
  !if "$(WX_DEBUG)" == "0"
! __DEBUGINFO_4 = 
  !endif
  !if "$(WX_DEBUG)" == "1"
! __DEBUGINFO_4 = /Zi
  !endif
  !if "$(WX_DEBUG)" == "0"
! __DEBUGINFO_5 = 
  !endif
  !if "$(WX_DEBUG)" == "1"
! __DEBUGINFO_5 = /DEBUG
  !endif
  !if "$(WX_DEBUG)" == "0"
! ____DEBUGRUNTIME_6_p = 
  !endif
  !if "$(WX_DEBUG)" == "1"
! ____DEBUGRUNTIME_6_p = /D_DEBUG
  !endif
  !if "$(WX_DEBUG)" == "0"
! ____DEBUGRUNTIME_6_p_1 = 
  !endif
  !if "$(WX_DEBUG)" == "1"
! ____DEBUGRUNTIME_6_p_1 = /d _DEBUG
  !endif
  !if "$(WX_DEBUG)" == "0"
! __DEBUGRUNTIME_7 = 
  !endif
  !if "$(WX_DEBUG)" == "1"
! __DEBUGRUNTIME_7 = d
  !endif
  !if "$(WX_SHARED)" == "1"
--- 94,140 ----
  !endif
  !if "$(WX_DEBUG)" == "1"
! __WXDEBUG_DEFINE_p_0 = /d __WXDEBUG__
  !endif
  !if "$(WX_DEBUG)" == "0"
! __WARNINGS = /w
  !endif
  !if "$(WX_DEBUG)" == "1"
! __WARNINGS = /W4
  !endif
  !if "$(WX_DEBUG)" == "0"
! __OPTIMIZEFLAG = /O2
  !endif
  !if "$(WX_DEBUG)" == "1"
! __OPTIMIZEFLAG = /Od
  !endif
  !if "$(WX_DEBUG)" == "0"
! __DEBUGINFO = 
  !endif
  !if "$(WX_DEBUG)" == "1"
! __DEBUGINFO = /Zi
  !endif
  !if "$(WX_DEBUG)" == "0"
! __DEBUGINFO_0 = 
  !endif
  !if "$(WX_DEBUG)" == "1"
! __DEBUGINFO_0 = /DEBUG
  !endif
  !if "$(WX_DEBUG)" == "0"
! ____DEBUGRUNTIME = 
  !endif
  !if "$(WX_DEBUG)" == "1"
! ____DEBUGRUNTIME = /D_DEBUG
  !endif
  !if "$(WX_DEBUG)" == "0"
! ____DEBUGRUNTIME_0 = 
  !endif
  !if "$(WX_DEBUG)" == "1"
! ____DEBUGRUNTIME_0 = /d _DEBUG
  !endif
  !if "$(WX_DEBUG)" == "0"
! __DEBUGRUNTIME = 
  !endif
  !if "$(WX_DEBUG)" == "1"
! __DEBUGRUNTIME = d
  !endif
  !if "$(WX_SHARED)" == "1"
***************
*** 120,124 ****
  !endif
  !if "$(WX_SHARED)" == "1"
! __WX_SHAREDDEFINE_p_1 = /d WXUSINGDLL
  !endif
  !if "$(WX_SHARED)" == "0"
--- 142,146 ----
  !endif
  !if "$(WX_SHARED)" == "1"
! __WX_SHAREDDEFINE_p_0 = /d WXUSINGDLL
  !endif
  !if "$(WX_SHARED)" == "0"
***************
*** 151,155 ****
  ### Targets: ###
  
! all: ..\..\..\bin\wxlua.exe
  
  clean: 
--- 173,177 ----
  ### Targets: ###
  
! all: $(__app_wxlua___depname) $(__app_wxluaedit___depname)
  
  clean: 
***************
*** 160,168 ****
  	-if exist ..\..\..\bin\wxlua.ilk del ..\..\..\bin\wxlua.ilk
  	-if exist ..\..\..\bin\wxlua.pdb del ..\..\..\bin\wxlua.pdb
  
  ..\..\..\bin\wxlua.exe: $(APP_WXLUA_OBJECTS) msvc$(WXLIBPOSTFIX)\app_wxlua_wxlua.res
! 	link /NOLOGO /OUT:$@ $(LDFLAGS) /LIBPATH:$(WX_DIR)$(__WXLIBPATH_FILENAMES) $(__DEBUGINFO_5)  /LIBPATH:..\..\..\$(__WXLUA_OUTPUT_FOLDER_FILENAMES) @<<
  	$(APP_WXLUA_OBJECTS)  wxluadebug.lib wxluasocket.lib wxlua.lib wxbind.lib lua.lib wxmsw$(WX_VERSION)$(WXLIBPOSTFIX)_adv.lib wxbase$(WX_VERSION)$(WXLIBPOSTFIX).lib wxmsw$(WX_VERSION)$(WXLIBPOSTFIX)_core.lib wxmsw$(WX_VERSION)$(WXLIBPOSTFIX)_html.lib wxmsw$(WX_VERSION)$(WXLIBPOSTFIX)_media.lib wxbase$(WX_VERSION)$(WXLIBPOSTFIX)_net.lib wxbase$(WX_VERSION)$(WXLIBPOSTFIX)_xml.lib wxmsw$(WX_VERSION)$(WXLIBPOSTFIX)_xrc.lib wxmsw$(WX_VERSION)$(WXLIBPOSTFIX)_stc.lib wxtiff$(WX3RDPARTYLIBPOSTFIX).lib wxjpeg$(WX3RDPARTYLIBPOSTFIX).lib wxpng$(WX3RDPARTYLIBPOSTFIX).lib wxzlib$(WX3RDPARTYLIBPOSTFIX).lib wxregex$(WXLIBPOSTFIX).lib wxexpat$(WX3RDPARTYLIBPOSTFIX).lib kernel32.lib user32.lib gdi32.lib comdlg32.lib winspool.lib winmm.lib shell32.lib comctl32.lib ole32.lib oleaut32.lib uuid.lib rpcrt4.lib advapi32.lib wsock32.lib odbc32.lib oleacc.lib
  <<
  
  msvc$(WXLIBPOSTFIX)\app_wxlua_wxlua.obj: ..\..\wxlua\src\wxlua.cpp
--- 182,202 ----
  	-if exist ..\..\..\bin\wxlua.ilk del ..\..\..\bin\wxlua.ilk
  	-if exist ..\..\..\bin\wxlua.pdb del ..\..\..\bin\wxlua.pdb
+ 	-if exist ..\..\..\bin\wxluaedit.exe del ..\..\..\bin\wxluaedit.exe
+ 	-if exist ..\..\..\bin\wxluaedit.ilk del ..\..\..\bin\wxluaedit.ilk
+ 	-if exist ..\..\..\bin\wxluaedit.pdb del ..\..\..\bin\wxluaedit.pdb
  
+ !if "$(USE_WXLUAAPP)" == "1"
  ..\..\..\bin\wxlua.exe: $(APP_WXLUA_OBJECTS) msvc$(WXLIBPOSTFIX)\app_wxlua_wxlua.res
! 	link /NOLOGO /OUT:$@ $(LDFLAGS) /LIBPATH:$(WX_DIR)$(__WXLIBPATH_FILENAMES) $(__DEBUGINFO_0)  /LIBPATH:..\..\..\$(__WXLUA_OUTPUT_FOLDER_FILENAMES) @<<
  	$(APP_WXLUA_OBJECTS)  wxluadebug.lib wxluasocket.lib wxlua.lib wxbind.lib lua.lib wxmsw$(WX_VERSION)$(WXLIBPOSTFIX)_adv.lib wxbase$(WX_VERSION)$(WXLIBPOSTFIX).lib wxmsw$(WX_VERSION)$(WXLIBPOSTFIX)_core.lib wxmsw$(WX_VERSION)$(WXLIBPOSTFIX)_html.lib wxmsw$(WX_VERSION)$(WXLIBPOSTFIX)_media.lib wxbase$(WX_VERSION)$(WXLIBPOSTFIX)_net.lib wxbase$(WX_VERSION)$(WXLIBPOSTFIX)_xml.lib wxmsw$(WX_VERSION)$(WXLIBPOSTFIX)_xrc.lib wxmsw$(WX_VERSION)$(WXLIBPOSTFIX)_stc.lib wxtiff$(WX3RDPARTYLIBPOSTFIX).lib wxjpeg$(WX3RDPARTYLIBPOSTFIX).lib wxpng$(WX3RDPARTYLIBPOSTFIX).lib wxzlib$(WX3RDPARTYLIBPOSTFIX).lib wxregex$(WXLIBPOSTFIX).lib wxexpat$(WX3RDPARTYLIBPOSTFIX).lib kernel32.lib user32.lib gdi32.lib comdlg32.lib winspool.lib winmm.lib shell32.lib comctl32.lib ole32.lib oleaut32.lib uuid.lib rpcrt4.lib advapi32.lib wsock32.lib odbc32.lib oleacc.lib
  <<
+ !endif
+ 
+ !if "$(USE_WXLUAEDITAPP)" == "1"
+ ..\..\..\bin\wxluaedit.exe: $(APP_WXLUAEDIT_OBJECTS) msvc$(WXLIBPOSTFIX)\app_wxluaedit_wxluaedit.res
+ 	link /NOLOGO /OUT:$@ $(LDFLAGS) /LIBPATH:$(WX_DIR)$(__WXLIBPATH_FILENAMES) $(__DEBUGINFO_0)  /LIBPATH:..\..\..\$(__WXLUA_OUTPUT_FOLDER_FILENAMES) @<<
+ 	$(APP_WXLUAEDIT_OBJECTS)  wxluadebug.lib wxluasocket.lib wxlua.lib wxbind.lib lua.lib wxmsw$(WX_VERSION)$(WXLIBPOSTFIX)_adv.lib wxbase$(WX_VERSION)$(WXLIBPOSTFIX).lib wxmsw$(WX_VERSION)$(WXLIBPOSTFIX)_core.lib wxmsw$(WX_VERSION)$(WXLIBPOSTFIX)_html.lib wxmsw$(WX_VERSION)$(WXLIBPOSTFIX)_media.lib wxbase$(WX_VERSION)$(WXLIBPOSTFIX)_net.lib wxbase$(WX_VERSION)$(WXLIBPOSTFIX)_xml.lib wxmsw$(WX_VERSION)$(WXLIBPOSTFIX)_xrc.lib wxmsw$(WX_VERSION)$(WXLIBPOSTFIX)_stc.lib wxtiff$(WX3RDPARTYLIBPOSTFIX).lib wxjpeg$(WX3RDPARTYLIBPOSTFIX).lib wxpng$(WX3RDPARTYLIBPOSTFIX).lib wxzlib$(WX3RDPARTYLIBPOSTFIX).lib wxregex$(WXLIBPOSTFIX).lib wxexpat$(WX3RDPARTYLIBPOSTFIX).lib kernel32.lib user32.lib gdi32.lib comdlg32.lib winspool.lib winmm.lib shell32.lib comctl32.lib ole32.lib oleaut32.lib uuid.lib rpcrt4.lib advapi32.lib wsock32.lib odbc32.lib oleacc.lib
+ <<
+ !endif
  
  msvc$(WXLIBPOSTFIX)\app_wxlua_wxlua.obj: ..\..\wxlua\src\wxlua.cpp
***************
*** 173,176 ****
  
  msvc$(WXLIBPOSTFIX)\app_wxlua_wxlua.res: ..\..\wxlua\src\wxlua.rc
! 	rc /fo$@  /d WIN32 $(__WXUNICODE_DEFINE_p_1) $(__WXDEBUG_DEFINE_p_1) /d __WXMSW__ /i $(WX_DIR)$(__WXLIBPATH_FILENAMES)\msw$(WXLIBPOSTFIX) /i $(WX_DIR)\include /i ..\..\..\modules $(____DEBUGRUNTIME_6_p_1) $(__WX_SHAREDDEFINE_p_1) $**
  
--- 207,219 ----
  
  msvc$(WXLIBPOSTFIX)\app_wxlua_wxlua.res: ..\..\wxlua\src\wxlua.rc
! 	rc /fo$@  /d WIN32 $(__WXUNICODE_DEFINE_p_0) $(__WXDEBUG_DEFINE_p_0) /d __WXMSW__ /i $(WX_DIR)$(__WXLIBPATH_FILENAMES)\msw$(WXLIBPOSTFIX) /i $(WX_DIR)\include /i ..\..\..\modules $(____DEBUGRUNTIME_0) $(__WX_SHAREDDEFINE_p_0) $**
! 
! msvc$(WXLIBPOSTFIX)\app_wxluaedit_wxledit.obj: ..\..\wxluaedit\src\wxledit.cpp
! 	$(CXX) /c /nologo /TP /Fo$@ $(APP_WXLUAEDIT_CXXFLAGS) $**
! 
! msvc$(WXLIBPOSTFIX)\app_wxluaedit_wxluaedit.obj: ..\..\wxluaedit\src\wxluaedit.cpp
! 	$(CXX) /c /nologo /TP /Fo$@ $(APP_WXLUAEDIT_CXXFLAGS) $**
! 
! msvc$(WXLIBPOSTFIX)\app_wxluaedit_wxluaedit.res: ..\..\wxlua\src\wxluaedit.rc
! 	rc /fo$@  /d WIN32 $(__WXUNICODE_DEFINE_p_0) $(__WXDEBUG_DEFINE_p_0) /d __WXMSW__ /i $(WX_DIR)$(__WXLIBPATH_FILENAMES)\msw$(WXLIBPOSTFIX) /i $(WX_DIR)\include /i ..\..\..\modules $(____DEBUGRUNTIME_0) $(__WX_SHAREDDEFINE_p_0) $**
  

Index: makefile.bcc
===================================================================
RCS file: /cvsroot/wxlua/wxLua/apps/build/msw/makefile.bcc,v
retrieving revision 1.8
retrieving revision 1.9
diff -C2 -d -r1.8 -r1.9
*** makefile.bcc	23 Nov 2005 20:33:14 -0000	1.8
--- makefile.bcc	24 Nov 2005 21:34:16 -0000	1.9
***************
*** 65,68 ****
--- 65,78 ----
  !endif
  
+ # Compile the wxLua app ? [0,1]
+ !ifndef USE_WXLUAAPP
+ USE_WXLUAAPP = 1
+ !endif
+ 
+ # Compile the wxLuaEditor app ? [0,1]
+ !ifndef USE_WXLUAEDITAPP
+ USE_WXLUAEDITAPP = 0
+ !endif
+ 
  
  
***************
*** 76,84 ****
  	$(__WXDEBUG_DEFINE_p) -D__WXMSW__ \
  	-I$(WX_DIR)$(__WXLIBPATH_FILENAMES)\msw$(WXLIBPOSTFIX) \
! 	-I$(WX_DIR)\include -I..\..\..\modules $(__OPTIMIZEFLAG_1) $(__DEBUGINFO) \
! 	-tWM $(__WX_SHAREDDEFINE_p) $(CPPFLAGS) $(CXXFLAGS)
  APP_WXLUA_OBJECTS =  \
  	borland$(WXLIBPOSTFIX)\app_wxlua_wxlua.obj \
  	borland$(WXLIBPOSTFIX)\app_wxlua_lconsole.obj
  
  ### Conditionally set variables: ###
--- 86,102 ----
  	$(__WXDEBUG_DEFINE_p) -D__WXMSW__ \
  	-I$(WX_DIR)$(__WXLIBPATH_FILENAMES)\msw$(WXLIBPOSTFIX) \
! 	-I$(WX_DIR)\include -I..\..\..\modules $(__OPTIMIZEFLAG) $(__DEBUGINFO) -tWM \
! 	$(__WX_SHAREDDEFINE_p) $(CPPFLAGS) $(CXXFLAGS)
  APP_WXLUA_OBJECTS =  \
  	borland$(WXLIBPOSTFIX)\app_wxlua_wxlua.obj \
  	borland$(WXLIBPOSTFIX)\app_wxlua_lconsole.obj
+ APP_WXLUAEDIT_CXXFLAGS = -I$(BCCDIR)\include $(__WXUNICODE_DEFINE_p) \
+ 	$(__WXDEBUG_DEFINE_p) -D__WXMSW__ \
+ 	-I$(WX_DIR)$(__WXLIBPATH_FILENAMES)\msw$(WXLIBPOSTFIX) \
+ 	-I$(WX_DIR)\include -I..\..\..\modules $(__OPTIMIZEFLAG) $(__DEBUGINFO) -tWM \
+ 	$(__WX_SHAREDDEFINE_p) $(CPPFLAGS) $(CXXFLAGS)
+ APP_WXLUAEDIT_OBJECTS =  \
+ 	borland$(WXLIBPOSTFIX)\app_wxluaedit_wxledit.obj \
+ 	borland$(WXLIBPOSTFIX)\app_wxluaedit_wxluaedit.obj
  
  ### Conditionally set variables: ###
***************
*** 87,95 ****
  WX3RDPARTYLIBPOSTFIX = d
  !endif
  !if "$(WX_UNICODE)" == "1"
  __WXUNICODE_DEFINE_p = -D_UNICODE
  !endif
  !if "$(WX_UNICODE)" == "1"
! __WXUNICODE_DEFINE_p_1 = -d_UNICODE
  !endif
  !if "$(WX_DEBUG)" == "1"
--- 105,119 ----
  WX3RDPARTYLIBPOSTFIX = d
  !endif
+ !if "$(USE_WXLUAAPP)" == "1"
+ __app_wxlua___depname = ..\..\..\bin\wxlua.exe
+ !endif
+ !if "$(USE_WXLUAEDITAPP)" == "1"
+ __app_wxluaedit___depname = ..\..\..\bin\wxluaedit.exe
+ !endif
  !if "$(WX_UNICODE)" == "1"
  __WXUNICODE_DEFINE_p = -D_UNICODE
  !endif
  !if "$(WX_UNICODE)" == "1"
! __WXUNICODE_DEFINE_p_0 = -d_UNICODE
  !endif
  !if "$(WX_DEBUG)" == "1"
***************
*** 97,107 ****
  !endif
  !if "$(WX_DEBUG)" == "1"
! __WXDEBUG_DEFINE_p_1 = -d__WXDEBUG__
  !endif
  !if "$(WX_DEBUG)" == "0"
! __OPTIMIZEFLAG_1 = -O2
  !endif
  !if "$(WX_DEBUG)" == "1"
! __OPTIMIZEFLAG_1 = -Od
  !endif
  !if "$(WX_SHARED)" == "1"
--- 121,131 ----
  !endif
  !if "$(WX_DEBUG)" == "1"
! __WXDEBUG_DEFINE_p_0 = -d__WXDEBUG__
  !endif
  !if "$(WX_DEBUG)" == "0"
! __OPTIMIZEFLAG = -O2
  !endif
  !if "$(WX_DEBUG)" == "1"
! __OPTIMIZEFLAG = -Od
  !endif
  !if "$(WX_SHARED)" == "1"
***************
*** 109,113 ****
  !endif
  !if "$(WX_SHARED)" == "1"
! __WX_SHAREDDEFINE_p_1 = -dWXUSINGDLL
  !endif
  !if "$(WX_SHARED)" == "0"
--- 133,137 ----
  !endif
  !if "$(WX_SHARED)" == "1"
! __WX_SHAREDDEFINE_p_0 = -dWXUSINGDLL
  !endif
  !if "$(WX_SHARED)" == "0"
***************
*** 146,150 ****
  ### Targets: ###
  
! all: ..\..\..\bin\wxlua.exe
  
  clean: 
--- 170,174 ----
  ### Targets: ###
  
! all: $(__app_wxlua___depname) $(__app_wxluaedit___depname)
  
  clean: 
***************
*** 158,166 ****
--- 182,205 ----
  	-if exist ..\..\..\bin\wxlua.ilf del ..\..\..\bin\wxlua.ilf
  	-if exist ..\..\..\bin\wxlua.ils del ..\..\..\bin\wxlua.ils
+ 	-if exist ..\..\..\bin\wxluaedit.exe del ..\..\..\bin\wxluaedit.exe
+ 	-if exist ..\..\..\bin\wxluaedit.tds del ..\..\..\bin\wxluaedit.tds
+ 	-if exist ..\..\..\bin\wxluaedit.ilc del ..\..\..\bin\wxluaedit.ilc
+ 	-if exist ..\..\..\bin\wxluaedit.ild del ..\..\..\bin\wxluaedit.ild
+ 	-if exist ..\..\..\bin\wxluaedit.ilf del ..\..\..\bin\wxluaedit.ilf
+ 	-if exist ..\..\..\bin\wxluaedit.ils del ..\..\..\bin\wxluaedit.ils
  
+ !if "$(USE_WXLUAAPP)" == "1"
  ..\..\..\bin\wxlua.exe: $(APP_WXLUA_OBJECTS)  borland$(WXLIBPOSTFIX)\app_wxlua_wxlua.res
  	ilink32 -Tpe -q $(LDFLAGS) -L$(BCCDIR)\lib -L$(BCCDIR)\lib\psdk -L$(WX_DIR)$(__WXLIBPATH_FILENAMES) $(__DEBUGINFO)  -L..\..\..\$(__WXLUA_OUTPUT_FOLDER_FILENAMES) @&&|
  	c0x32.obj $(APP_WXLUA_OBJECTS),$@,, wxluadebug.lib wxluasocket.lib wxlua.lib wxbind.lib lua.lib wxmsw$(WX_VERSION)$(WXLIBPOSTFIX)_adv.lib wxbase$(WX_VERSION)$(WXLIBPOSTFIX).lib wxmsw$(WX_VERSION)$(WXLIBPOSTFIX)_core.lib wxmsw$(WX_VERSION)$(WXLIBPOSTFIX)_html.lib wxmsw$(WX_VERSION)$(WXLIBPOSTFIX)_media.lib wxbase$(WX_VERSION)$(WXLIBPOSTFIX)_net.lib wxbase$(WX_VERSION)$(WXLIBPOSTFIX)_xml.lib wxmsw$(WX_VERSION)$(WXLIBPOSTFIX)_xrc.lib wxmsw$(WX_VERSION)$(WXLIBPOSTFIX)_stc.lib wxtiff$(WX3RDPARTYLIBPOSTFIX).lib wxjpeg$(WX3RDPARTYLIBPOSTFIX).lib wxpng$(WX3RDPARTYLIBPOSTFIX).lib wxzlib$(WX3RDPARTYLIBPOSTFIX).lib wxregex$(WXLIBPOSTFIX).lib wxexpat$(WX3RDPARTYLIBPOSTFIX).lib ole2w32.lib oleacc.lib import32.lib cw32mt.lib,, borland$(WXLIBPOSTFIX)\app_wxlua_wxlua.res
  |
+ !endif
+ 
+ !if "$(USE_WXLUAEDITAPP)" == "1"
+ ..\..\..\bin\wxluaedit.exe: $(APP_WXLUAEDIT_OBJECTS)  borland$(WXLIBPOSTFIX)\app_wxluaedit_wxluaedit.res
+ 	ilink32 -Tpe -q $(LDFLAGS) -L$(BCCDIR)\lib -L$(BCCDIR)\lib\psdk -L$(WX_DIR)$(__WXLIBPATH_FILENAMES) $(__DEBUGINFO)  -L..\..\..\$(__WXLUA_OUTPUT_FOLDER_FILENAMES) @&&|
+ 	c0x32.obj $(APP_WXLUAEDIT_OBJECTS),$@,, wxluadebug.lib wxluasocket.lib wxlua.lib wxbind.lib lua.lib wxmsw$(WX_VERSION)$(WXLIBPOSTFIX)_adv.lib wxbase$(WX_VERSION)$(WXLIBPOSTFIX).lib wxmsw$(WX_VERSION)$(WXLIBPOSTFIX)_core.lib wxmsw$(WX_VERSION)$(WXLIBPOSTFIX)_html.lib wxmsw$(WX_VERSION)$(WXLIBPOSTFIX)_media.lib wxbase$(WX_VERSION)$(WXLIBPOSTFIX)_net.lib wxbase$(WX_VERSION)$(WXLIBPOSTFIX)_xml.lib wxmsw$(WX_VERSION)$(WXLIBPOSTFIX)_xrc.lib wxmsw$(WX_VERSION)$(WXLIBPOSTFIX)_stc.lib wxtiff$(WX3RDPARTYLIBPOSTFIX).lib wxjpeg$(WX3RDPARTYLIBPOSTFIX).lib wxpng$(WX3RDPARTYLIBPOSTFIX).lib wxzlib$(WX3RDPARTYLIBPOSTFIX).lib wxregex$(WXLIBPOSTFIX).lib wxexpat$(WX3RDPARTYLIBPOSTFIX).lib ole2w32.lib oleacc.lib import32.lib cw32mt.lib,, borland$(WXLIBPOSTFIX)\app_wxluaedit_wxluaedit.res
+ |
+ !endif
  
  borland$(WXLIBPOSTFIX)\app_wxlua_wxlua.obj: ..\..\wxlua\src\wxlua.cpp
***************
*** 171,174 ****
  
  borland$(WXLIBPOSTFIX)\app_wxlua_wxlua.res: ..\..\wxlua\src\wxlua.rc
! 	brcc32 -32 -r -fo$@ -i$(BCCDIR)\include $(__WXUNICODE_DEFINE_p_1) $(__WXDEBUG_DEFINE_p_1) -d__WXMSW__ -i$(WX_DIR)$(__WXLIBPATH_FILENAMES)\msw$(WXLIBPOSTFIX) -i$(WX_DIR)\include -i..\..\..\modules $(__WX_SHAREDDEFINE_p_1) $**
  
--- 210,222 ----
  
  borland$(WXLIBPOSTFIX)\app_wxlua_wxlua.res: ..\..\wxlua\src\wxlua.rc
! 	brcc32 -32 -r -fo$@ -i$(BCCDIR)\include $(__WXUNICODE_DEFINE_p_0) $(__WXDEBUG_DEFINE_p_0) -d__WXMSW__ -i$(WX_DIR)$(__WXLIBPATH_FILENAMES)\msw$(WXLIBPOSTFIX) -i$(WX_DIR)\include -i..\..\..\modules $(__WX_SHAREDDEFINE_p_0) $**
! 
! borland$(WXLIBPOSTFIX)\app_wxluaedit_wxledit.obj: ..\..\wxluaedit\src\wxledit.cpp
! 	$(CXX) -q -c -P -o$@ $(APP_WXLUAEDIT_CXXFLAGS) $**
! 
! borland$(WXLIBPOSTFIX)\app_wxluaedit_wxluaedit.obj: ..\..\wxluaedit\src\wxluaedit.cpp
! 	$(CXX) -q -c -P -o$@ $(APP_WXLUAEDIT_CXXFLAGS) $**
! 
! borland$(WXLIBPOSTFIX)\app_wxluaedit_wxluaedit.res: ..\..\wxlua\src\wxluaedit.rc
! 	brcc32 -32 -r -fo$@ -i$(BCCDIR)\include $(__WXUNICODE_DEFINE_p_0) $(__WXDEBUG_DEFINE_p_0) -d__WXMSW__ -i$(WX_DIR)$(__WXLIBPATH_FILENAMES)\msw$(WXLIBPOSTFIX) -i$(WX_DIR)\include -i..\..\..\modules $(__WX_SHAREDDEFINE_p_0) $**
  

Index: makefile.wat
===================================================================
RCS file: /cvsroot/wxlua/wxLua/apps/build/msw/makefile.wat,v
retrieving revision 1.8
retrieving revision 1.9
diff -C2 -d -r1.8 -r1.9
*** makefile.wat	23 Nov 2005 20:33:14 -0000	1.8
--- makefile.wat	24 Nov 2005 21:34:16 -0000	1.9
***************
*** 38,41 ****
--- 38,47 ----
  WX_VERSION = 26
  
+ # Compile the wxLua app ? [0,1]
+ USE_WXLUAAPP = 1
+ 
+ # Compile the wxLuaEditor app ? [0,1]
+ USE_WXLUAEDITAPP = 0
+ 
  
  
***************
*** 65,95 ****
  WX3RDPARTYLIBPOSTFIX = d
  !endif
! __WARNINGS_0 =
  !ifeq WX_DEBUG 0
! __WARNINGS_0 = 
  !endif
  !ifeq WX_DEBUG 1
! __WARNINGS_0 = -wx
  !endif
! __OPTIMIZEFLAG_1 =
  !ifeq WX_DEBUG 0
! __OPTIMIZEFLAG_1 = -ot -ox
  !endif
  !ifeq WX_DEBUG 1
! __OPTIMIZEFLAG_1 = -od
  !endif
! __DEBUGINFO_2 =
  !ifeq WX_DEBUG 0
! __DEBUGINFO_2 = -d0
  !endif
  !ifeq WX_DEBUG 1
! __DEBUGINFO_2 = -d2
  !endif
! __DEBUGINFO_3 =
  !ifeq WX_DEBUG 0
! __DEBUGINFO_3 = 
  !endif
  !ifeq WX_DEBUG 1
! __DEBUGINFO_3 = debug all
  !endif
  __WXLUA_OUTPUT_FOLDER_FILENAMES =
--- 71,109 ----
  WX3RDPARTYLIBPOSTFIX = d
  !endif
! __app_wxlua___depname =
! !ifeq USE_WXLUAAPP 1
! __app_wxlua___depname = ..\..\..\bin\wxlua.exe
! !endif
! __app_wxluaedit___depname =
! !ifeq USE_WXLUAEDITAPP 1
! __app_wxluaedit___depname = ..\..\..\bin\wxluaedit.exe
! !endif
! __WARNINGS =
  !ifeq WX_DEBUG 0
! __WARNINGS = 
  !endif
  !ifeq WX_DEBUG 1
! __WARNINGS = -wx
  !endif
! __OPTIMIZEFLAG =
  !ifeq WX_DEBUG 0
! __OPTIMIZEFLAG = -ot -ox
  !endif
  !ifeq WX_DEBUG 1
! __OPTIMIZEFLAG = -od
  !endif
! __DEBUGINFO =
  !ifeq WX_DEBUG 0
! __DEBUGINFO = -d0
  !endif
  !ifeq WX_DEBUG 1
! __DEBUGINFO = -d2
  !endif
! __DEBUGINFO_0 =
  !ifeq WX_DEBUG 0
! __DEBUGINFO_0 = 
  !endif
  !ifeq WX_DEBUG 1
! __DEBUGINFO_0 = debug all
  !endif
  __WXLUA_OUTPUT_FOLDER_FILENAMES =
***************
*** 140,149 ****
  APP_WXLUA_CXXFLAGS = $(__WXUNICODE_DEFINE_p) $(__WXDEBUG_DEFINE_p) -d__WXMSW__ &
  	-i=$(WX_DIR)$(__WXLIBPATH_FILENAMES)\msw$(WXLIBPOSTFIX) &
! 	-i=$(WX_DIR)\include -i=..\..\..\modules $(__WARNINGS_0) &
! 	$(__OPTIMIZEFLAG_1) $(__DEBUGINFO_2) -bm $(__WX_SHAREDDEFINE_p) $(CPPFLAGS) &
! 	$(CXXFLAGS)
  APP_WXLUA_OBJECTS =  &
  	watcom$(WXLIBPOSTFIX)\app_wxlua_wxlua.obj &
  	watcom$(WXLIBPOSTFIX)\app_wxlua_lconsole.obj
  
  
--- 154,169 ----
  APP_WXLUA_CXXFLAGS = $(__WXUNICODE_DEFINE_p) $(__WXDEBUG_DEFINE_p) -d__WXMSW__ &
  	-i=$(WX_DIR)$(__WXLIBPATH_FILENAMES)\msw$(WXLIBPOSTFIX) &
! 	-i=$(WX_DIR)\include -i=..\..\..\modules $(__WARNINGS) $(__OPTIMIZEFLAG) &
! 	$(__DEBUGINFO) -bm $(__WX_SHAREDDEFINE_p) $(CPPFLAGS) $(CXXFLAGS)
  APP_WXLUA_OBJECTS =  &
  	watcom$(WXLIBPOSTFIX)\app_wxlua_wxlua.obj &
  	watcom$(WXLIBPOSTFIX)\app_wxlua_lconsole.obj
+ APP_WXLUAEDIT_CXXFLAGS = $(__WXUNICODE_DEFINE_p) $(__WXDEBUG_DEFINE_p) &
+ 	-d__WXMSW__ -i=$(WX_DIR)$(__WXLIBPATH_FILENAMES)\msw$(WXLIBPOSTFIX) &
+ 	-i=$(WX_DIR)\include -i=..\..\..\modules $(__WARNINGS) $(__OPTIMIZEFLAG) &
+ 	$(__DEBUGINFO) -bm $(__WX_SHAREDDEFINE_p) $(CPPFLAGS) $(CXXFLAGS)
+ APP_WXLUAEDIT_OBJECTS =  &
+ 	watcom$(WXLIBPOSTFIX)\app_wxluaedit_wxledit.obj &
+ 	watcom$(WXLIBPOSTFIX)\app_wxluaedit_wxluaedit.obj
  
  
***************
*** 154,158 ****
  ### Targets: ###
  
! all : .SYMBOLIC ..\..\..\bin\wxlua.exe
  
  clean : .SYMBOLIC 
--- 174,178 ----
  ### Targets: ###
  
! all : .SYMBOLIC $(__app_wxlua___depname) $(__app_wxluaedit___depname)
  
  clean : .SYMBOLIC 
***************
*** 163,167 ****
--- 183,189 ----
  	-if exist watcom$(WXLIBPOSTFIX)\*.pch del watcom$(WXLIBPOSTFIX)\*.pch
  	-if exist ..\..\..\bin\wxlua.exe del ..\..\..\bin\wxlua.exe
+ 	-if exist ..\..\..\bin\wxluaedit.exe del ..\..\..\bin\wxluaedit.exe
  
+ !ifeq USE_WXLUAAPP 1
  ..\..\..\bin\wxlua.exe :  $(APP_WXLUA_OBJECTS) watcom$(WXLIBPOSTFIX)\app_wxlua_wxlua.res
  	@%create watcom$(WXLIBPOSTFIX)\app_wxlua.lbc
***************
*** 169,177 ****
  	@%append watcom$(WXLIBPOSTFIX)\app_wxlua.lbc name $^@
  	@%append watcom$(WXLIBPOSTFIX)\app_wxlua.lbc option caseexact
! 	@%append watcom$(WXLIBPOSTFIX)\app_wxlua.lbc $(LDFLAGS) libpath $(WX_DIR)$(__WXLIBPATH_FILENAMES) $(__DEBUGINFO_3)  libpath ..\..\..\$(__WXLUA_OUTPUT_FOLDER_FILENAMES)
  	@for %i in ($(APP_WXLUA_OBJECTS)) do @%append watcom$(WXLIBPOSTFIX)\app_wxlua.lbc file %i
  	@for %i in ( wxluadebug.lib wxluasocket.lib wxlua.lib wxbind.lib lua.lib wxmsw$(WX_VERSION)$(WXLIBPOSTFIX)_adv.lib wxbase$(WX_VERSION)$(WXLIBPOSTFIX).lib wxmsw$(WX_VERSION)$(WXLIBPOSTFIX)_core.lib wxmsw$(WX_VERSION)$(WXLIBPOSTFIX)_html.lib wxmsw$(WX_VERSION)$(WXLIBPOSTFIX)_media.lib wxbase$(WX_VERSION)$(WXLIBPOSTFIX)_net.lib wxbase$(WX_VERSION)$(WXLIBPOSTFIX)_xml.lib wxmsw$(WX_VERSION)$(WXLIBPOSTFIX)_xrc.lib wxmsw$(WX_VERSION)$(WXLIBPOSTFIX)_stc.lib wxtiff$(WX3RDPARTYLIBPOSTFIX).lib wxjpeg$(WX3RDPARTYLIBPOSTFIX).lib wxpng$(WX3RDPARTYLIBPOSTFIX).lib wxzlib$(WX3RDPARTYLIBPOSTFIX).lib wxregex$(WXLIBPOSTFIX).lib wxexpat$(WX3RDPARTYLIBPOSTFIX).lib kernel32.lib user32.lib gdi32.lib comdlg32.lib winspool.lib winmm.lib shell32.lib comctl32.lib ole32.lib oleaut32.lib uuid.lib rpcrt4.lib advapi32.lib wsock32.lib odbc32.lib) do @%append watcom$(WXLIBPOSTFIX)\app_wxlua.lbc library %i
  	@%append watcom$(WXLIBPOSTFIX)\app_wxlua.lbc option resource=watcom$(WXLIBPOSTFIX)\app_wxlua_wxlua.res
  	wlink @watcom$(WXLIBPOSTFIX)\app_wxlua.lbc
  
  watcom$(WXLIBPOSTFIX)\app_wxlua_wxlua.obj :  .AUTODEPEND ..\..\wxlua\src\wxlua.cpp
--- 191,213 ----
  	@%append watcom$(WXLIBPOSTFIX)\app_wxlua.lbc name $^@
  	@%append watcom$(WXLIBPOSTFIX)\app_wxlua.lbc option caseexact
! 	@%append watcom$(WXLIBPOSTFIX)\app_wxlua.lbc $(LDFLAGS) libpath $(WX_DIR)$(__WXLIBPATH_FILENAMES) $(__DEBUGINFO_0)  libpath ..\..\..\$(__WXLUA_OUTPUT_FOLDER_FILENAMES)
  	@for %i in ($(APP_WXLUA_OBJECTS)) do @%append watcom$(WXLIBPOSTFIX)\app_wxlua.lbc file %i
  	@for %i in ( wxluadebug.lib wxluasocket.lib wxlua.lib wxbind.lib lua.lib wxmsw$(WX_VERSION)$(WXLIBPOSTFIX)_adv.lib wxbase$(WX_VERSION)$(WXLIBPOSTFIX).lib wxmsw$(WX_VERSION)$(WXLIBPOSTFIX)_core.lib wxmsw$(WX_VERSION)$(WXLIBPOSTFIX)_html.lib wxmsw$(WX_VERSION)$(WXLIBPOSTFIX)_media.lib wxbase$(WX_VERSION)$(WXLIBPOSTFIX)_net.lib wxbase$(WX_VERSION)$(WXLIBPOSTFIX)_xml.lib wxmsw$(WX_VERSION)$(WXLIBPOSTFIX)_xrc.lib wxmsw$(WX_VERSION)$(WXLIBPOSTFIX)_stc.lib wxtiff$(WX3RDPARTYLIBPOSTFIX).lib wxjpeg$(WX3RDPARTYLIBPOSTFIX).lib wxpng$(WX3RDPARTYLIBPOSTFIX).lib wxzlib$(WX3RDPARTYLIBPOSTFIX).lib wxregex$(WXLIBPOSTFIX).lib wxexpat$(WX3RDPARTYLIBPOSTFIX).lib kernel32.lib user32.lib gdi32.lib comdlg32.lib winspool.lib winmm.lib shell32.lib comctl32.lib ole32.lib oleaut32.lib uuid.lib rpcrt4.lib advapi32.lib wsock32.lib odbc32.lib) do @%append watcom$(WXLIBPOSTFIX)\app_wxlua.lbc library %i
  	@%append watcom$(WXLIBPOSTFIX)\app_wxlua.lbc option resource=watcom$(WXLIBPOSTFIX)\app_wxlua_wxlua.res
  	wlink @watcom$(WXLIBPOSTFIX)\app_wxlua.lbc
+ !endif
+ 
+ !ifeq USE_WXLUAEDITAPP 1
+ ..\..\..\bin\wxluaedit.exe :  $(APP_WXLUAEDIT_OBJECTS) watcom$(WXLIBPOSTFIX)\app_wxluaedit_wxluaedit.res
+ 	@%create watcom$(WXLIBPOSTFIX)\app_wxluaedit.lbc
+ 	@%append watcom$(WXLIBPOSTFIX)\app_wxluaedit.lbc option quiet
+ 	@%append watcom$(WXLIBPOSTFIX)\app_wxluaedit.lbc name $^@
+ 	@%append watcom$(WXLIBPOSTFIX)\app_wxluaedit.lbc option caseexact
+ 	@%append watcom$(WXLIBPOSTFIX)\app_wxluaedit.lbc $(LDFLAGS) libpath $(WX_DIR)$(__WXLIBPATH_FILENAMES) $(__DEBUGINFO_0)  libpath ..\..\..\$(__WXLUA_OUTPUT_FOLDER_FILENAMES)
+ 	@for %i in ($(APP_WXLUAEDIT_OBJECTS)) do @%append watcom$(WXLIBPOSTFIX)\app_wxluaedit.lbc file %i
+ 	@for %i in ( wxluadebug.lib wxluasocket.lib wxlua.lib wxbind.lib lua.lib wxmsw$(WX_VERSION)$(WXLIBPOSTFIX)_adv.lib wxbase$(WX_VERSION)$(WXLIBPOSTFIX).lib wxmsw$(WX_VERSION)$(WXLIBPOSTFIX)_core.lib wxmsw$(WX_VERSION)$(WXLIBPOSTFIX)_html.lib wxmsw$(WX_VERSION)$(WXLIBPOSTFIX)_media.lib wxbase$(WX_VERSION)$(WXLIBPOSTFIX)_net.lib wxbase$(WX_VERSION)$(WXLIBPOSTFIX)_xml.lib wxmsw$(WX_VERSION)$(WXLIBPOSTFIX)_xrc.lib wxmsw$(WX_VERSION)$(WXLIBPOSTFIX)_stc.lib wxtiff$(WX3RDPARTYLIBPOSTFIX).lib wxjpeg$(WX3RDPARTYLIBPOSTFIX).lib wxpng$(WX3RDPARTYLIBPOSTFIX).lib wxzlib$(WX3RDPARTYLIBPOSTFIX).lib wxregex$(WXLIBPOSTFIX).lib wxexpat$(WX3RDPARTYLIBPOSTFIX).lib kernel32.lib user32.lib gdi32.lib comdlg32.lib winspool.lib winmm.lib shell32.lib comctl32.lib ole32.lib oleaut32.lib uuid.lib rpcrt4.lib advapi32.lib wsock32.lib odbc32.lib) do @%append watcom$(WXLIBPOSTFIX)\app_wxluaedit.lbc library %i
+ 	@%append watcom$(WXLIBPOSTFIX)\app_wxluaedit.lbc option resource=watcom$(WXLIBPOSTFIX)\app_wxluaedit_wxluaedit.res
+ 	wlink @watcom$(WXLIBPOSTFIX)\app_wxluaedit.lbc
+ !endif
  
  watcom$(WXLIBPOSTFIX)\app_wxlua_wxlua.obj :  .AUTODEPEND ..\..\wxlua\src\wxlua.cpp
***************
*** 184,185 ****
--- 220,230 ----
  	wrc -q -ad -bt=nt -r -fo=$^@ $(__WXUNICODE_DEFINE_p) $(__WXDEBUG_DEFINE_p) -d__WXMSW__ -i=$(WX_DIR)$(__WXLIBPATH_FILENAMES)\msw$(WXLIBPOSTFIX) -i=$(WX_DIR)\include -i=..\..\..\modules $(__WX_SHAREDDEFINE_p) $<
  
+ watcom$(WXLIBPOSTFIX)\app_wxluaedit_wxledit.obj :  .AUTODEPEND ..\..\wxluaedit\src\wxledit.cpp
+ 	$(CXX) -zq -fo=$^@ $(APP_WXLUAEDIT_CXXFLAGS) $<
+ 
+ watcom$(WXLIBPOSTFIX)\app_wxluaedit_wxluaedit.obj :  .AUTODEPEND ..\..\wxluaedit\src\wxluaedit.cpp
+ 	$(CXX) -zq -fo=$^@ $(APP_WXLUAEDIT_CXXFLAGS) $<
+ 
+ watcom$(WXLIBPOSTFIX)\app_wxluaedit_wxluaedit.res :  .AUTODEPEND ..\..\wxlua\src\wxluaedit.rc
+ 	wrc -q -ad -bt=nt -r -fo=$^@ $(__WXUNICODE_DEFINE_p) $(__WXDEBUG_DEFINE_p) -d__WXMSW__ -i=$(WX_DIR)$(__WXLIBPATH_FILENAMES)\msw$(WXLIBPOSTFIX) -i=$(WX_DIR)\include -i=..\..\..\modules $(__WX_SHAREDDEFINE_p) $<
+ 

Index: makefile.gcc
===================================================================
RCS file: /cvsroot/wxlua/wxLua/apps/build/msw/makefile.gcc,v
retrieving revision 1.8
retrieving revision 1.9
diff -C2 -d -r1.8 -r1.9
*** makefile.gcc	23 Nov 2005 20:33:14 -0000	1.8
--- makefile.gcc	24 Nov 2005 21:34:16 -0000	1.9
***************
*** 38,41 ****
--- 38,47 ----
  WX_VERSION = 26
  
+ # Compile the wxLua app ? [0,1]
+ USE_WXLUAAPP = 1
+ 
+ # Compile the wxLuaEditor app ? [0,1]
+ USE_WXLUAEDITAPP = 0
+ 
  
  
***************
*** 50,59 ****
  	$(__WXDEBUG_DEFINE_p) -D__WXMSW__ \
  	-I$(WX_DIR)$(WXLIBPATH)\msw$(WXLIBPOSTFIX) -I$(WX_DIR)\include \
! 	-I..\..\..\modules $(__WARNINGS_0) $(__OPTIMIZEFLAG_1) $(__DEBUGINFO) \
! 	-mthreads $(__WX_SHAREDDEFINE_p) $(CPPFLAGS) $(CXXFLAGS)
  APP_WXLUA_OBJECTS =  \
  	mingw$(WXLIBPOSTFIX)\app_wxlua_wxlua.o \
  	mingw$(WXLIBPOSTFIX)\app_wxlua_lconsole.o \
  	mingw$(WXLIBPOSTFIX)\app_wxlua_wxlua_rc.o
  
  ### Conditionally set variables: ###
--- 56,74 ----
  	$(__WXDEBUG_DEFINE_p) -D__WXMSW__ \
  	-I$(WX_DIR)$(WXLIBPATH)\msw$(WXLIBPOSTFIX) -I$(WX_DIR)\include \
! 	-I..\..\..\modules $(__WARNINGS) $(__OPTIMIZEFLAG) $(__DEBUGINFO) -mthreads \
! 	$(__WX_SHAREDDEFINE_p) $(CPPFLAGS) $(CXXFLAGS)
  APP_WXLUA_OBJECTS =  \
  	mingw$(WXLIBPOSTFIX)\app_wxlua_wxlua.o \
  	mingw$(WXLIBPOSTFIX)\app_wxlua_lconsole.o \
  	mingw$(WXLIBPOSTFIX)\app_wxlua_wxlua_rc.o
+ APP_WXLUAEDIT_CXXFLAGS = -DHAVE_W32API_H $(__WXUNICODE_DEFINE_p) \
+ 	$(__WXDEBUG_DEFINE_p) -D__WXMSW__ \
+ 	-I$(WX_DIR)$(WXLIBPATH)\msw$(WXLIBPOSTFIX) -I$(WX_DIR)\include \
+ 	-I..\..\..\modules $(__WARNINGS) $(__OPTIMIZEFLAG) $(__DEBUGINFO) -mthreads \
+ 	$(__WX_SHAREDDEFINE_p) $(CPPFLAGS) $(CXXFLAGS)
+ APP_WXLUAEDIT_OBJECTS =  \
+ 	mingw$(WXLIBPOSTFIX)\app_wxluaedit_wxledit.o \
+ 	mingw$(WXLIBPOSTFIX)\app_wxluaedit_wxluaedit.o \
+ 	mingw$(WXLIBPOSTFIX)\app_wxluaedit_wxluaedit_rc.o
  
  ### Conditionally set variables: ###
***************
*** 62,70 ****
  WX3RDPARTYLIBPOSTFIX = d
  endif
  ifeq ($(WX_UNICODE),1)
  __WXUNICODE_DEFINE_p = -D_UNICODE
  endif
  ifeq ($(WX_UNICODE),1)
! __WXUNICODE_DEFINE_p_1 = --define _UNICODE
  endif
  ifeq ($(WX_DEBUG),1)
--- 77,91 ----
  WX3RDPARTYLIBPOSTFIX = d
  endif
+ ifeq ($(USE_WXLUAAPP),1)
+ __app_wxlua___depname = ..\..\..\bin\wxlua.exe
+ endif
+ ifeq ($(USE_WXLUAEDITAPP),1)
+ __app_wxluaedit___depname = ..\..\..\bin\wxluaedit.exe
+ endif
  ifeq ($(WX_UNICODE),1)
  __WXUNICODE_DEFINE_p = -D_UNICODE
  endif
  ifeq ($(WX_UNICODE),1)
! __WXUNICODE_DEFINE_p_0 = --define _UNICODE
  endif
  ifeq ($(WX_DEBUG),1)
***************
*** 72,88 ****
  endif
  ifeq ($(WX_DEBUG),1)
! __WXDEBUG_DEFINE_p_1 = --define __WXDEBUG__
  endif
  ifeq ($(WX_DEBUG),0)
! __WARNINGS_0 = 
  endif
  ifeq ($(WX_DEBUG),1)
! __WARNINGS_0 = -W -Wall
  endif
  ifeq ($(WX_DEBUG),0)
! __OPTIMIZEFLAG_1 = -O2
  endif
  ifeq ($(WX_DEBUG),1)
! __OPTIMIZEFLAG_1 = -O0
  endif
  ifeq ($(WX_SHARED),1)
--- 93,124 ----
  endif
  ifeq ($(WX_DEBUG),1)
! __WXDEBUG_DEFINE_p_0 = --define __WXDEBUG__
  endif
  ifeq ($(WX_DEBUG),0)
! ifeq ($(WX_UNICODE),1)
! WXLIBPOSTFIX = u
! endif
  endif
  ifeq ($(WX_DEBUG),1)
! ifeq ($(WX_UNICODE),0)
! WXLIBPOSTFIX = d
! endif
! endif
! ifeq ($(WX_DEBUG),1)
! ifeq ($(WX_UNICODE),1)
! WXLIBPOSTFIX = ud
! endif
  endif
  ifeq ($(WX_DEBUG),0)
! __WARNINGS = 
  endif
  ifeq ($(WX_DEBUG),1)
! __WARNINGS = -W -Wall
! endif
! ifeq ($(WX_DEBUG),0)
! __OPTIMIZEFLAG = -O2
! endif
! ifeq ($(WX_DEBUG),1)
! __OPTIMIZEFLAG = -O0
  endif
  ifeq ($(WX_SHARED),1)
***************
*** 90,94 ****
  endif
  ifeq ($(WX_SHARED),1)
! __WX_SHAREDDEFINE_p_1 = --define WXUSINGDLL
  endif
  ifeq ($(WX_SHARED),0)
--- 126,130 ----
  endif
  ifeq ($(WX_SHARED),1)
! __WX_SHAREDDEFINE_p_0 = --define WXUSINGDLL
  endif
  ifeq ($(WX_SHARED),0)
***************
*** 98,116 ****
  __WXLUA_OUTPUT_FOLDER_FILENAMES = lib\gcc_dll
  endif
- ifeq ($(WX_DEBUG),0)
- ifeq ($(WX_UNICODE),1)
- WXLIBPOSTFIX = u
- endif
- endif
- ifeq ($(WX_DEBUG),1)
- ifeq ($(WX_UNICODE),0)
- WXLIBPOSTFIX = d
- endif
- endif
- ifeq ($(WX_DEBUG),1)
- ifeq ($(WX_UNICODE),1)
- WXLIBPOSTFIX = ud
- endif
- endif
  ifeq ($(WX_SHARED),0)
  WXLIBPATH = \lib\gcc_lib
--- 134,137 ----
***************
*** 133,137 ****
  ### Targets: ###
  
! all: ..\..\..\bin\wxlua.exe
  
  clean: 
--- 154,158 ----
  ### Targets: ###
  
! all: $(__app_wxlua___depname) $(__app_wxluaedit___depname)
  
  clean: 
***************
*** 139,145 ****
--- 160,174 ----
  	-if exist mingw$(WXLIBPOSTFIX)\*.d del mingw$(WXLIBPOSTFIX)\*.d
  	-if exist ..\..\..\bin\wxlua.exe del ..\..\..\bin\wxlua.exe
+ 	-if exist ..\..\..\bin\wxluaedit.exe del ..\..\..\bin\wxluaedit.exe
  
+ ifeq ($(USE_WXLUAAPP),1)
  ..\..\..\bin\wxlua.exe: $(APP_WXLUA_OBJECTS) mingw$(WXLIBPOSTFIX)\app_wxlua_wxlua_rc.o
  	$(CXX) -o $@ $(APP_WXLUA_OBJECTS) $(LDFLAGS) -mthreads -L$(WX_DIR)$(WXLIBPATH) $(__DEBUGINFO) -mthreads -L..\..\..\$(__WXLUA_OUTPUT_FOLDER_FILENAMES)  -lwxluadebug -lwxluasocket -lwxlua -lwxbind -llua -lwxmsw$(WX_VERSION)$(WXLIBPOSTFIX)_adv -lwxbase$(WX_VERSION)$(WXLIBPOSTFIX) -lwxmsw$(WX_VERSION)$(WXLIBPOSTFIX)_core -lwxmsw$(WX_VERSION)$(WXLIBPOSTFIX)_html -lwxmsw$(WX_VERSION)$(WXLIBPOSTFIX)_media -lwxbase$(WX_VERSION)$(WXLIBPOSTFIX)_net -lwxbase$(WX_VERSION)$(WXLIBPOSTFIX)_xml -lwxmsw$(WX_VERSION)$(WXLIBPOSTFIX)_xrc -lwxmsw$(WX_VERSION)$(WXLIBPOSTFIX)_stc -lwxtiff$(WX3RDPARTYLIBPOSTFIX) -lwxjpeg$(WX3RDPARTYLIBPOSTFIX) -lwxpng$(WX3RDPARTYLIBPOSTFIX) -lwxzlib$(WX3RDPARTYLIBPOSTFIX) -lwxregex$(WXLIBPOSTFIX) -lwxexpat$(WX3RDPARTYLIBPOSTFIX) -lkernel32 -luser32 -lgdi32 -lcomdlg32 -lwinspool -lwinmm -lshell32 -lcomctl32 -lole32 -loleaut32 -luuid -lrpcrt4 -ladvapi32 -lwsock32 -lodbc32
+ endif
+ 
+ ifeq ($(USE_WXLUAEDITAPP),1)
+ ..\..\..\bin\wxluaedit.exe: $(APP_WXLUAEDIT_OBJECTS) mingw$(WXLIBPOSTFIX)\app_wxluaedit_wxluaedit_rc.o
+ 	$(CXX) -o $@ $(APP_WXLUAEDIT_OBJECTS) $(LDFLAGS) -mthreads -L$(WX_DIR)$(WXLIBPATH) $(__DEBUGINFO) -mthreads -L..\..\..\$(__WXLUA_OUTPUT_FOLDER_FILENAMES)  -lwxluadebug -lwxluasocket -lwxlua -lwxbind -llua -lwxmsw$(WX_VERSION)$(WXLIBPOSTFIX)_adv -lwxbase$(WX_VERSION)$(WXLIBPOSTFIX) -lwxmsw$(WX_VERSION)$(WXLIBPOSTFIX)_core -lwxmsw$(WX_VERSION)$(WXLIBPOSTFIX)_html -lwxmsw$(WX_VERSION)$(WXLIBPOSTFIX)_media -lwxbase$(WX_VERSION)$(WXLIBPOSTFIX)_net -lwxbase$(WX_VERSION)$(WXLIBPOSTFIX)_xml -lwxmsw$(WX_VERSION)$(WXLIBPOSTFIX)_xrc -lwxmsw$(WX_VERSION)$(WXLIBPOSTFIX)_stc -lwxtiff$(WX3RDPARTYLIBPOSTFIX) -lwxjpeg$(WX3RDPARTYLIBPOSTFIX) -lwxpng$(WX3RDPARTYLIBPOSTFIX) -lwxzlib$(WX3RDPARTYLIBPOSTFIX) -lwxregex$(WXLIBPOSTFIX) -lwxexpat$(WX3RDPARTYLIBPOSTFIX) -lkernel32 -luser32 -lgdi32 -lcomdlg32 -lwinspool -lwinmm -lshell32 -lcomctl32 -lole32 -loleaut32 -luuid -lrpcrt4 -ladvapi32 -lwsock32 -lodbc32
+ endif
  
  mingw$(WXLIBPOSTFIX)\app_wxlua_wxlua.o: ../../wxlua/src/wxlua.cpp
***************
*** 150,154 ****
  
  mingw$(WXLIBPOSTFIX)\app_wxlua_wxlua_rc.o: ../../wxlua/src/wxlua.rc
! 	windres --use-temp-file -i$< -o$@ --define HAVE_W32API_H $(__WXUNICODE_DEFINE_p_1) $(__WXDEBUG_DEFINE_p_1) --define __WXMSW__ --include-dir $(WX_DIR)$(WXLIBPATH)\msw$(WXLIBPOSTFIX) --include-dir $(WX_DIR)/include --include-dir ..\..\..\modules $(__WX_SHAREDDEFINE_p_1)
  
  .PHONY: all clean
--- 179,192 ----
  
  mingw$(WXLIBPOSTFIX)\app_wxlua_wxlua_rc.o: ../../wxlua/src/wxlua.rc
! 	windres --use-temp-file -i$< -o$@ --define HAVE_W32API_H $(__WXUNICODE_DEFINE_p_0) $(__WXDEBUG_DEFINE_p_0) --define __WXMSW__ --include-dir $(WX_DIR)$(WXLIBPATH)\msw$(WXLIBPOSTFIX) --include-dir $(WX_DIR)/include --include-dir ..\..\..\modules $(__WX_SHAREDDEFINE_p_0)
! 
! mingw$(WXLIBPOSTFIX)\app_wxluaedit_wxledit.o: ../../wxluaedit/src/wxledit.cpp
! 	$(CXX) -c -o $@ $(APP_WXLUAEDIT_CXXFLAGS) $(CPPDEPS) $<
! 
! mingw$(WXLIBPOSTFIX)\app_wxluaedit_wxluaedit.o: ../../wxluaedit/src/wxluaedit.cpp
! 	$(CXX) -c -o $@ $(APP_WXLUAEDIT_CXXFLAGS) $(CPPDEPS) $<
! 
! mingw$(WXLIBPOSTFIX)\app_wxluaedit_wxluaedit_rc.o: ../../wxlua/src/wxluaedit.rc
! 	windres --use-temp-file -i$< -o$@ --define HAVE_W32API_H $(__WXUNICODE_DEFINE_p_0) $(__WXDEBUG_DEFINE_p_0) --define __WXMSW__ --include-dir $(WX_DIR)$(WXLIBPATH)\msw$(WXLIBPOSTFIX) --include-dir $(WX_DIR)/include --include-dir ..\..\..\modules $(__WX_SHAREDDEFINE_p_0)
  
  .PHONY: all clean

[Wxlua-commit] wxLua/build/msw makefile.bcc,1.6,1.7 makefile.gcc,1.6,1.7 makefile.vc,1.7,1.8 makefile.wat,1.6,1.7

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

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

Modified Files:
	makefile.bcc makefile.gcc makefile.vc makefile.wat 
Log Message:
formatting for bakfiles
added USE_WXLUAAPP, USE_WXLUAEDITAPP


Index: makefile.vc
===================================================================
RCS file: /cvsroot/wxlua/wxLua/build/msw/makefile.vc,v
retrieving revision 1.7
retrieving revision 1.8
diff -C2 -d -r1.7 -r1.8
*** makefile.vc	23 Nov 2005 06:03:40 -0000	1.7
--- makefile.vc	24 Nov 2005 21:34:16 -0000	1.8
***************
*** 30,42 ****
  
  # Does the wxLua debug support need to be compiled ? [0,1]
! USE_WXLUADEBUG = 1
  
  # Does the wxLua socket support need to be compiled ? [0,1]
! USE_WXLUASOCKET = 1
  
  # Does the wxLua utilities should be compiled ? [0,1]
  USE_UTIL = 1
  
! # Does the wxLua applications should be compiled ? [0,1]
  USE_APPS = 1
  
--- 30,48 ----
  
  # Does the wxLua debug support need to be compiled ? [0,1]
! USE_WXLUADEBUGLIB = 1
  
  # Does the wxLua socket support need to be compiled ? [0,1]
! USE_WXLUASOCKETLIB = 1
! 
! # Compile the wxLua app ? [0,1]
! USE_WXLUAAPP = 1
! 
! # Compile the wxLuaEditor app ? [0,1]
! USE_WXLUAEDITAPP = 0
  
  # Does the wxLua utilities should be compiled ? [0,1]
  USE_UTIL = 1
  
! # Should the wxLua applications be compiled ? [0,1]
  USE_APPS = 1
  
***************
*** 53,58 ****
  	WX_SHARED="$(WX_SHARED)" WX_UNICODE="$(WX_UNICODE)" WX_DEBUG="$(WX_DEBUG)" \
  	WX_VERSION="$(WX_VERSION)" USE_BIN2C="$(USE_BIN2C)" \
! 	USE_WXLUADEBUG="$(USE_WXLUADEBUG)" USE_WXLUASOCKET="$(USE_WXLUASOCKET)" \
! 	USE_UTIL="$(USE_UTIL)" USE_APPS="$(USE_APPS)"
  
  ### Conditionally set variables: ###
--- 59,66 ----
  	WX_SHARED="$(WX_SHARED)" WX_UNICODE="$(WX_UNICODE)" WX_DEBUG="$(WX_DEBUG)" \
  	WX_VERSION="$(WX_VERSION)" USE_BIN2C="$(USE_BIN2C)" \
! 	USE_WXLUADEBUGLIB="$(USE_WXLUADEBUGLIB)" \
! 	USE_WXLUASOCKETLIB="$(USE_WXLUASOCKETLIB)" USE_WXLUAAPP="$(USE_WXLUAAPP)" \
! 	USE_WXLUAEDITAPP="$(USE_WXLUAEDITAPP)" USE_UTIL="$(USE_UTIL)" \
! 	USE_APPS="$(USE_APPS)"
  
  ### Conditionally set variables: ###

Index: makefile.bcc
===================================================================
RCS file: /cvsroot/wxlua/wxLua/build/msw/makefile.bcc,v
retrieving revision 1.6
retrieving revision 1.7
diff -C2 -d -r1.6 -r1.7
*** makefile.bcc	23 Nov 2005 06:03:40 -0000	1.6
--- makefile.bcc	24 Nov 2005 21:34:16 -0000	1.7
***************
*** 81,91 ****
  
  # Does the wxLua debug support need to be compiled ? [0,1]
! !ifndef USE_WXLUADEBUG
! USE_WXLUADEBUG = 1
  !endif
  
  # Does the wxLua socket support need to be compiled ? [0,1]
! !ifndef USE_WXLUASOCKET
! USE_WXLUASOCKET = 1
  !endif
  
--- 81,101 ----
  
  # Does the wxLua debug support need to be compiled ? [0,1]
! !ifndef USE_WXLUADEBUGLIB
! USE_WXLUADEBUGLIB = 1
  !endif
  
  # Does the wxLua socket support need to be compiled ? [0,1]
! !ifndef USE_WXLUASOCKETLIB
! USE_WXLUASOCKETLIB = 1
! !endif
! 
! # Compile the wxLua app ? [0,1]
! !ifndef USE_WXLUAAPP
! USE_WXLUAAPP = 1
! !endif
! 
! # Compile the wxLuaEditor app ? [0,1]
! !ifndef USE_WXLUAEDITAPP
! USE_WXLUAEDITAPP = 0
  !endif
  
***************
*** 95,99 ****
  !endif
  
! # Does the wxLua applications should be compiled ? [0,1]
  !ifndef USE_APPS
  USE_APPS = 1
--- 105,109 ----
  !endif
  
! # Should the wxLua applications be compiled ? [0,1]
  !ifndef USE_APPS
  USE_APPS = 1
***************
*** 113,119 ****
  	-DWX_UNICODE="$(WX_UNICODE)" -DWX_DEBUG="$(WX_DEBUG)" \
  	-DWX_VERSION="$(WX_VERSION)" -DUSE_BIN2C="$(USE_BIN2C)" \
! 	-DUSE_WXLUADEBUG="$(USE_WXLUADEBUG)" \
! 	-DUSE_WXLUASOCKET="$(USE_WXLUASOCKET)" -DUSE_UTIL="$(USE_UTIL)" \
! 	-DUSE_APPS="$(USE_APPS)"
  
  ### Conditionally set variables: ###
--- 123,130 ----
  	-DWX_UNICODE="$(WX_UNICODE)" -DWX_DEBUG="$(WX_DEBUG)" \
  	-DWX_VERSION="$(WX_VERSION)" -DUSE_BIN2C="$(USE_BIN2C)" \
! 	-DUSE_WXLUADEBUGLIB="$(USE_WXLUADEBUGLIB)" \
! 	-DUSE_WXLUASOCKETLIB="$(USE_WXLUASOCKETLIB)" \
! 	-DUSE_WXLUAAPP="$(USE_WXLUAAPP)" -DUSE_WXLUAEDITAPP="$(USE_WXLUAEDITAPP)" \
! 	-DUSE_UTIL="$(USE_UTIL)" -DUSE_APPS="$(USE_APPS)"
  
  ### Conditionally set variables: ###

Index: makefile.wat
===================================================================
RCS file: /cvsroot/wxlua/wxLua/build/msw/makefile.wat,v
retrieving revision 1.6
retrieving revision 1.7
diff -C2 -d -r1.6 -r1.7
*** makefile.wat	23 Nov 2005 06:03:40 -0000	1.6
--- makefile.wat	24 Nov 2005 21:34:16 -0000	1.7
***************
*** 30,42 ****
  
  # Does the wxLua debug support need to be compiled ? [0,1]
! USE_WXLUADEBUG = 1
  
  # Does the wxLua socket support need to be compiled ? [0,1]
! USE_WXLUASOCKET = 1
  
  # Does the wxLua utilities should be compiled ? [0,1]
  USE_UTIL = 1
  
! # Does the wxLua applications should be compiled ? [0,1]
  USE_APPS = 1
  
--- 30,48 ----
  
  # Does the wxLua debug support need to be compiled ? [0,1]
! USE_WXLUADEBUGLIB = 1
  
  # Does the wxLua socket support need to be compiled ? [0,1]
! USE_WXLUASOCKETLIB = 1
! 
! # Compile the wxLua app ? [0,1]
! USE_WXLUAAPP = 1
! 
! # Compile the wxLuaEditor app ? [0,1]
! USE_WXLUAEDITAPP = 0
  
  # Does the wxLua utilities should be compiled ? [0,1]
  USE_UTIL = 1
  
! # Should the wxLua applications be compiled ? [0,1]
  USE_APPS = 1
  
***************
*** 79,84 ****
  	WX_SHARED="$(WX_SHARED)" WX_UNICODE="$(WX_UNICODE)" WX_DEBUG="$(WX_DEBUG)" &
  	WX_VERSION="$(WX_VERSION)" USE_BIN2C="$(USE_BIN2C)" &
! 	USE_WXLUADEBUG="$(USE_WXLUADEBUG)" USE_WXLUASOCKET="$(USE_WXLUASOCKET)" &
! 	USE_UTIL="$(USE_UTIL)" USE_APPS="$(USE_APPS)"
  
  
--- 85,92 ----
  	WX_SHARED="$(WX_SHARED)" WX_UNICODE="$(WX_UNICODE)" WX_DEBUG="$(WX_DEBUG)" &
  	WX_VERSION="$(WX_VERSION)" USE_BIN2C="$(USE_BIN2C)" &
! 	USE_WXLUADEBUGLIB="$(USE_WXLUADEBUGLIB)" &
! 	USE_WXLUASOCKETLIB="$(USE_WXLUASOCKETLIB)" USE_WXLUAAPP="$(USE_WXLUAAPP)" &
! 	USE_WXLUAEDITAPP="$(USE_WXLUAEDITAPP)" USE_UTIL="$(USE_UTIL)" &
! 	USE_APPS="$(USE_APPS)"
  
  

Index: makefile.gcc
===================================================================
RCS file: /cvsroot/wxlua/wxLua/build/msw/makefile.gcc,v
retrieving revision 1.6
retrieving revision 1.7
diff -C2 -d -r1.6 -r1.7
*** makefile.gcc	23 Nov 2005 06:03:40 -0000	1.6
--- makefile.gcc	24 Nov 2005 21:34:16 -0000	1.7
***************
*** 30,42 ****
  
  # Does the wxLua debug support need to be compiled ? [0,1]
! USE_WXLUADEBUG = 1
  
  # Does the wxLua socket support need to be compiled ? [0,1]
! USE_WXLUASOCKET = 1
  
  # Does the wxLua utilities should be compiled ? [0,1]
  USE_UTIL = 1
  
! # Does the wxLua applications should be compiled ? [0,1]
  USE_APPS = 1
  
--- 30,48 ----
  
  # Does the wxLua debug support need to be compiled ? [0,1]
! USE_WXLUADEBUGLIB = 1
  
  # Does the wxLua socket support need to be compiled ? [0,1]
! USE_WXLUASOCKETLIB = 1
! 
! # Compile the wxLua app ? [0,1]
! USE_WXLUAAPP = 1
! 
! # Compile the wxLuaEditor app ? [0,1]
! USE_WXLUAEDITAPP = 0
  
  # Does the wxLua utilities should be compiled ? [0,1]
  USE_UTIL = 1
  
! # Should the wxLua applications be compiled ? [0,1]
  USE_APPS = 1
  
***************
*** 53,58 ****
  	WX_SHARED="$(WX_SHARED)" WX_UNICODE="$(WX_UNICODE)" WX_DEBUG="$(WX_DEBUG)" \
  	WX_VERSION="$(WX_VERSION)" USE_BIN2C="$(USE_BIN2C)" \
! 	USE_WXLUADEBUG="$(USE_WXLUADEBUG)" USE_WXLUASOCKET="$(USE_WXLUASOCKET)" \
! 	USE_UTIL="$(USE_UTIL)" USE_APPS="$(USE_APPS)"
  
  ### Conditionally set variables: ###
--- 59,66 ----
  	WX_SHARED="$(WX_SHARED)" WX_UNICODE="$(WX_UNICODE)" WX_DEBUG="$(WX_DEBUG)" \
  	WX_VERSION="$(WX_VERSION)" USE_BIN2C="$(USE_BIN2C)" \
! 	USE_WXLUADEBUGLIB="$(USE_WXLUADEBUGLIB)" \
! 	USE_WXLUASOCKETLIB="$(USE_WXLUASOCKETLIB)" USE_WXLUAAPP="$(USE_WXLUAAPP)" \
! 	USE_WXLUAEDITAPP="$(USE_WXLUAEDITAPP)" USE_UTIL="$(USE_UTIL)" \
! 	USE_APPS="$(USE_APPS)"
  
  ### Conditionally set variables: ###

[Wxlua-commit] wxLua/modules/build/bakefiles modules.bkl,1.9,1.10 options.bkl,1.2,1.3 sources.bkl,1.6,1.7

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

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

Modified Files:
	modules.bkl options.bkl sources.bkl 
Log Message:
formatting for bakfiles
added USE_WXLUAAPP, USE_WXLUAEDITAPP


Index: options.bkl
===================================================================
RCS file: /cvsroot/wxlua/wxLua/modules/build/bakefiles/options.bkl,v
retrieving revision 1.2
retrieving revision 1.3
diff -C2 -d -r1.2 -r1.3
*** options.bkl	12 Jun 2005 21:21:10 -0000	1.2
--- options.bkl	24 Nov 2005 21:34:16 -0000	1.3
***************
*** 5,40 ****
  
  
! <!--                                                                -->
! <!--                 WXLUA MODULES OPTIONS BAKEFILE                 -->
! <!--                                                                -->
  
! <makefile>  
  
!     <!--                                                                     -->
!     <!--                The list of wxLua OPTIONS DEFAULTS                   -->
!     <!--                                                                     -->
  
      <!-- module enable/disable option defaults -->
!     <set var="USE_WXLUADEBUG_DEFAULT">1</set>
!     <set var="USE_WXLUASOCKET_DEFAULT">1</set>
!    
!         
!         
  
!     <!--                                                                     -->
!     <!--                        The list of wxLua OPTIONS                    -->
!     <!--                                                                     -->
  
      <!-- module enable/disable options -->
      <if cond="TARGETING_IDE=='0'">
!         <option name="USE_WXLUADEBUG">
              <values>0,1</values>
!             <default-value>$(USE_WXLUADEBUG_DEFAULT)</default-value>
              <description>Does the wxLua debug support need to be compiled ?</description>
          </option>
!         
!         <option name="USE_WXLUASOCKET">
              <values>0,1</values>
!             <default-value>$(USE_WXLUASOCKET_DEFAULT)</default-value>
              <description>Does the wxLua socket support need to be compiled ?</description>
          </option>
--- 5,38 ----
  
  
! <!-- ====================================================================== -->
! <!--                 WXLUA MODULES OPTIONS BAKEFILE                         -->
! <!-- ====================================================================== -->
  
! <makefile>
  
!     <!-- ================================================================== -->
!     <!--                The list of wxLua module OPTIONS DEFAULTS           -->
!     <!-- ================================================================== -->
  
      <!-- module enable/disable option defaults -->
!     <set var="USE_WXLUADEBUGLIB_DEFAULT">1</set>
!     <set var="USE_WXLUASOCKETLIB_DEFAULT">1</set>
  
! 
!     <!-- ================================================================== -->
!     <!--                        The list of wxLua module OPTIONS            -->
!     <!-- ================================================================== -->
  
      <!-- module enable/disable options -->
      <if cond="TARGETING_IDE=='0'">
!         <option name="USE_WXLUADEBUGLIB">
              <values>0,1</values>
!             <default-value>$(USE_WXLUADEBUGLIB_DEFAULT)</default-value>
              <description>Does the wxLua debug support need to be compiled ?</description>
          </option>
! 
!         <option name="USE_WXLUASOCKETLIB">
              <values>0,1</values>
!             <default-value>$(USE_WXLUASOCKETLIB_DEFAULT)</default-value>
              <description>Does the wxLua socket support need to be compiled ?</description>
          </option>
***************
*** 42,54 ****
      </if>
      <if cond="TARGETING_IDE=='1'">
!         
          <!-- here we are forced to use all '1' because otherwise Bakefile would simply
               skip some target and do not generate DSP files for that one.
               We don't want this: we want to generate DSP for all modules: the choice
               of the modules to compile will be left to the user... -->
!         <set var="USE_WXLUADEBUG">1</set>
!         <set var="USE_WXLUASOCKET">1</set>
      </if>
!     
!     
  </makefile>
--- 40,52 ----
      </if>
      <if cond="TARGETING_IDE=='1'">
! 
          <!-- here we are forced to use all '1' because otherwise Bakefile would simply
               skip some target and do not generate DSP files for that one.
               We don't want this: we want to generate DSP for all modules: the choice
               of the modules to compile will be left to the user... -->
!         <set var="USE_WXLUADEBUGLIB">1</set>
!         <set var="USE_WXLUASOCKETLIB">1</set>
      </if>
! 
! 
  </makefile>

Index: sources.bkl
===================================================================
RCS file: /cvsroot/wxlua/wxLua/modules/build/bakefiles/sources.bkl,v
retrieving revision 1.6
retrieving revision 1.7
diff -C2 -d -r1.6 -r1.7
*** sources.bkl	23 Nov 2005 20:33:15 -0000	1.6
--- sources.bkl	24 Nov 2005 21:34:16 -0000	1.7
***************
*** 1,153 ****
! <?xml version="1.0" ?>     	
! <makefile>                 	
!  					
!     <!--                                        -->	
!     <!--               build module                -->	
!     <!--                                        -->	
!     <set var="build_src">					
!     </set>                    				
!  								
!     <set var="build_hdr">       				
!     </set>                    				
!  								
!  								
!     <!--                                        -->	
!     <!--               lua module                -->	
!     <!--                                        -->	
!     <set var="lua_src">					
!         lua/src/lapi.c 	
!         lua/src/lcode.c 	
!         lua/src/ldebug.c 	
  <!--         lua/src/ldllmain.c 	 -->
!         lua/src/ldo.c 	
!         lua/src/ldump.c 	
!         lua/src/lfunc.c 	
!         lua/src/lgc.c 	
!         lua/src/llex.c 	
!         lua/src/lmem.c 	
!         lua/src/lobject.c 	
!         lua/src/lopcodes.c 	
!         lua/src/lparser.c 	
!         lua/src/lstate.c 	
!         lua/src/lstring.c 	
!         lua/src/ltable.c 	
!         lua/src/ltests.c 	
!         lua/src/ltm.c 	
!         lua/src/lundump.c 	
!         lua/src/lvm.c 	
!         lua/src/lzio.c 	
!     </set>                    				
!  								
!     <set var="lua_hdr">       				
!          lua/include/lauxlib.h 
!          lua/include/lua.h 
!          lua/include/lualib.h 
!          lua/include/luathread.h 
!     </set>                    				
!  								
!  								
!     <!--                                        -->	
!     <!--               wxbind module                -->	
!     <!--                                        -->	
!     <set var="wxbind_src">					
!         wxbind/src/appframe.cpp 	
!         wxbind/src/clipdrag.cpp 	
!         wxbind/src/config.cpp 	
!         wxbind/src/controls.cpp 	
!         wxbind/src/data.cpp 	
!         wxbind/src/datetime.cpp 	
!         wxbind/src/defsutil.cpp 	
!         wxbind/src/dialogs.cpp 	
!         wxbind/src/event.cpp 	
!         wxbind/src/file.cpp 	
!         wxbind/src/fl.cpp 	
!         wxbind/src/gdi.cpp 	
!         wxbind/src/geometry.cpp 	
!         wxbind/src/grid.cpp 	
!         wxbind/src/help.cpp 	
!         wxbind/src/html.cpp 	
!         wxbind/src/image.cpp 	
!         wxbind/src/mdi.cpp 	
!         wxbind/src/menutool.cpp 	
!         wxbind/src/plot.cpp 	
!         wxbind/src/print.cpp 	
!         wxbind/src/regex.cpp 	
!         wxbind/src/sizer.cpp 	
!         wxbind/src/socket.cpp 	
!         wxbind/src/stc.cpp 	
!         wxbind/src/thread.cpp 	
!         wxbind/src/wave.cpp 	
!         wxbind/src/windows.cpp 	
!         wxbind/src/wxlhtmlwin.cpp 	
!         wxbind/src/wxlprint.cpp 	
!         wxbind/src/wxlua.cpp 	
!         wxbind/src/wx_builtin.cpp 	
!         wxbind/src/wx_class.cpp 	
!         wxbind/src/wx_define.cpp 	
!         wxbind/src/wx_event.cpp 	
!         wxbind/src/wx_object.cpp 	
!         wxbind/src/xml.cpp 	
!     </set>                    				
!  								
!     <set var="wxbind_hdr">       				
!          wxbind/include/wxbind.h 
!          wxbind/include/wxlhtmlwin.h 
!          wxbind/include/wxlprint.h 
!     </set>                    				
!  								
!  								
!     <!--                                        -->	
!     <!--               wxlua module                -->	
!     <!--                                        -->	
!     <set var="wxlua_src">					
!         wxlua/src/internal.cpp 	
!         wxlua/src/interp.cpp 	
!         wxlua/src/library.cpp 	
!     </set>                    				
!  								
!     <set var="wxlua_hdr">       				
!          wxlua/include/callback.h 
!          wxlua/include/defs.h 
!          wxlua/include/internal.h 
!          wxlua/include/interp.h 
!          wxlua/include/library.h 
!          wxlua/include/wxlua.h 
!     </set>                    				
!  								
!  								
!     <!--                                        -->	
!     <!--               wxluadebug module                -->	
!     <!--                                        -->	
!     <set var="wxluadebug_src">					
!         wxluadebug/src/debug.cpp 	
!         wxluadebug/src/splttree.cpp 	
!         wxluadebug/src/staktree.cpp 	
!     </set>                    				
!  								
!     <set var="wxluadebug_hdr">       				
!          wxluadebug/include/debug.h 
!          wxluadebug/include/splttree.h 
!          wxluadebug/include/staktree.h 
!     </set>                    				
!  								
!  								
!     <!--                                        -->	
!     <!--               wxluasocket module                -->	
!     <!--                                        -->	
!     <set var="wxluasocket_src">					
!         wxluasocket/src/debugio.cpp 	
!         wxluasocket/src/dserver.cpp 	
!         wxluasocket/src/dtarget.cpp 	
!         wxluasocket/src/socket.cpp 	
!     </set>                    				
!  								
!     <set var="wxluasocket_hdr">       				
!          wxluasocket/include/debugio.h 
!          wxluasocket/include/dserver.h 
!          wxluasocket/include/dtarget.h 
!          wxluasocket/include/socket.h 
!     </set>                    				
!  								
!  								
!  
! </makefile>               
--- 1,175 ----
! <?xml version="1.0" ?>
! 
! <!-- ====================================================================== -->
! <!--                    WXLUA MODULES SOURCES BAKEFILE                      -->
! <!-- ====================================================================== -->
! 
! 
! <makefile>
! 
!     <!-- ================================================================== -->
!     <!--               build module                                         -->
!     <!-- ================================================================== -->
!     <set var="build_src">
!     </set>
! 
!     <set var="build_hdr">
!     </set>
! 
! 
!     <!-- ================================================================== -->
!     <!-- lua module : wxLua/modules/lua                                     -->
!     <!-- ================================================================== -->
!     <set var="lua_src">
!         lua/src/lapi.c
!         lua/src/lcode.c
!         lua/src/ldebug.c
  <!--         lua/src/ldllmain.c 	 -->
!         lua/src/ldo.c
!         lua/src/ldump.c
!         lua/src/lfunc.c
!         lua/src/lgc.c
!         lua/src/llex.c
!         lua/src/lmem.c
!         lua/src/lobject.c
!         lua/src/lopcodes.c
!         lua/src/lparser.c
!         lua/src/lstate.c
!         lua/src/lstring.c
!         lua/src/ltable.c
!         lua/src/ltests.c
!         lua/src/ltm.c
!         lua/src/lundump.c
!         lua/src/lvm.c
!         lua/src/lzio.c
!     </set>
! 
!     <set var="lua_hdr">
!          lua/include/lauxlib.h
!          lua/include/lua.h
!          lua/include/lualib.h
!          lua/include/luathread.h
!     </set>
! 
! 
!     <!-- ================================================================== -->
!     <!-- lua module : wxLua/modules/lua                                     -->
!     <!-- ================================================================== -->
!     <set var="lualib_src">
!         lua/src/lib/lauxlib.c
!         lua/src/lib/lbaselib.c
!         lua/src/lib/ldblib.c
!         lua/src/lib/liolib.c
!         lua/src/lib/lmathlib.c
!         lua/src/lib/loadlib.c
!         lua/src/lib/lstrlib.c
!         lua/src/lib/ltablib.c
!     </set>
! 
!     <set var="lualib_hdr">
!     </set>
! 
! 
!     <!-- ================================================================== -->
!     <!-- wxbind module : wxLua/modules/wxbind                               -->
!     <!-- ================================================================== -->
!     <set var="wxbind_src">
!         wxbind/src/appframe.cpp
!         wxbind/src/clipdrag.cpp
!         wxbind/src/config.cpp
!         wxbind/src/controls.cpp
!         wxbind/src/data.cpp
!         wxbind/src/datetime.cpp
!         wxbind/src/defsutil.cpp
!         wxbind/src/dialogs.cpp
!         wxbind/src/event.cpp
!         wxbind/src/file.cpp
!         wxbind/src/fl.cpp
!         wxbind/src/gdi.cpp
!         wxbind/src/geometry.cpp
!         wxbind/src/grid.cpp
!         wxbind/src/help.cpp
!         wxbind/src/html.cpp
!         wxbind/src/image.cpp
!         wxbind/src/mdi.cpp
!         wxbind/src/menutool.cpp
!         wxbind/src/plot.cpp
!         wxbind/src/print.cpp
!         wxbind/src/regex.cpp
!         wxbind/src/sizer.cpp
!         wxbind/src/socket.cpp
!         wxbind/src/stc.cpp
!         wxbind/src/thread.cpp
!         wxbind/src/wave.cpp
!         wxbind/src/windows.cpp
!         wxbind/src/wxlhtmlwin.cpp
!         wxbind/src/wxlprint.cpp
!         wxbind/src/wxlua.cpp
!         wxbind/src/wx_builtin.cpp
!         wxbind/src/wx_class.cpp
!         wxbind/src/wx_define.cpp
!         wxbind/src/wx_event.cpp
!         wxbind/src/wx_object.cpp
!         wxbind/src/xml.cpp
!     </set>
! 
!     <set var="wxbind_hdr">
!          wxbind/include/wxbind.h
!          wxbind/include/wxlhtmlwin.h
!          wxbind/include/wxlprint.h
!     </set>
! 
! 
!     <!-- ================================================================== -->
!     <!-- wxlua module : wxLua/modules/wxlua                                 -->
!     <!-- ================================================================== -->
!     <set var="wxlua_src">
!         wxlua/src/internal.cpp
!         wxlua/src/interp.cpp
!         wxlua/src/library.cpp
!     </set>
! 
!     <set var="wxlua_hdr">
!          wxlua/include/callback.h
!          wxlua/include/defs.h
!          wxlua/include/internal.h
!          wxlua/include/interp.h
!          wxlua/include/library.h
!          wxlua/include/wxlua.h
!     </set>
! 
! 
!     <!-- ================================================================== -->
!     <!-- wxluadebug module : wxLua/modules/wxluadebug                       -->
!     <!-- ================================================================== -->
!     <set var="wxluadebug_src">
!         wxluadebug/src/debug.cpp
!         wxluadebug/src/splttree.cpp
!         wxluadebug/src/staktree.cpp
!     </set>
! 
!     <set var="wxluadebug_hdr">
!          wxluadebug/include/debug.h
!          wxluadebug/include/splttree.h
!          wxluadebug/include/staktree.h
!     </set>
! 
! 
!     <!-- ================================================================== -->
!     <!-- wxluasocket module : wxLua/modules/wxluasocket                     -->
!     <!-- ================================================================== -->
!     <set var="wxluasocket_src">
!         wxluasocket/src/debugio.cpp
!         wxluasocket/src/dserver.cpp
!         wxluasocket/src/dtarget.cpp
!         wxluasocket/src/socket.cpp
!     </set>
! 
!     <set var="wxluasocket_hdr">
!          wxluasocket/include/debugio.h
!          wxluasocket/include/dserver.h
!          wxluasocket/include/dtarget.h
!          wxluasocket/include/socket.h
!     </set>
! 
! </makefile>

Index: modules.bkl
===================================================================
RCS file: /cvsroot/wxlua/wxLua/modules/build/bakefiles/modules.bkl,v
retrieving revision 1.9
retrieving revision 1.10
diff -C2 -d -r1.9 -r1.10
*** modules.bkl	23 Nov 2005 20:33:15 -0000	1.9
--- modules.bkl	24 Nov 2005 21:34:16 -0000	1.10
***************
*** 5,15 ****
  
  
! <!--                                                                -->
! <!--                    WXLUA BAKEFILE                              -->
! <!--                                                                -->
! <!--    The bakefile used to build all the modules.                 -->
! <!--                                                                -->
  
! <makefile>  
  
      <!-- This is a bakefile, that is, a generic template used to    -->
--- 5,15 ----
  
  
! <!-- ====================================================================== -->
! <!--                    WXLUA BAKEFILE                                      -->
! <!--                                                                        -->
! <!--    The bakefile used to build all the modules.                         -->
! <!-- ====================================================================== -->
  
! <makefile>
  
      <!-- This is a bakefile, that is, a generic template used to    -->
***************
*** 23,82 ****
  
  
  
-     <!--                                                                     -->
-     <!--                               SOURCE LIST                           -->
-     <!--                                                                     -->
-     
      <!-- This one contains the lists of all source & header files   -->
      <include file="sources.bkl"/>
-   
-     <set var="lualib_src">            
-     lua/src/lib/lauxlib.c 
-     lua/src/lib/lbaselib.c 
-     lua/src/lib/ldblib.c 
-     lua/src/lib/liolib.c 
-     lua/src/lib/lmathlib.c 
-     lua/src/lib/loadlib.c 
-     lua/src/lib/lstrlib.c 
-     lua/src/lib/ltablib.c 
-     </set>       
-     <set var="lualib_hdr"/>      
- 
  
  
!     <!--                                                                     -->
!     <!--                               VARIABLES                             -->
!     <!--                                                                     -->
! 
  
!     <!-- All the source files & header files linked above are relative to our base dir -->  
      <if cond="FORMAT!='autoconf'"><set var="WXLUA_MODULEDIR">..$(DIRSEP)..</set></if>
      <if cond="FORMAT=='autoconf'"><set var="WXLUA_MODULEDIR">.</set></if>
      <set var="WXLUA_BASEDIR">$(WXLUA_MODULEDIR)$(DIRSEP)..</set>
!     
      <!-- Put all the objects files generated by         -->
      <!-- the compilation in a subfolder of BUILD        -->
!     <if cond="FORMAT!='autoconf'"><set var="BUILDDIR">$(FORMAT)$(WXLUA_LIBPOSTFIX)</set></if> 
! 
!     
  
  
  
-     <!--                                                                     -->
-     <!--                        The list of wxLua OPTIONS                    -->
-     <!--                                                                     -->
-     
      <!-- modules-specific options -->
      <include file="options.bkl"/>
-     
- 
  
  
  
-     <!--                                                                     -->
-     <!--                             NEW RULES                               -->
-     <!--  with these ones, each module/sample target takes few lines only    -->
-     <!--                                                                     -->
-     
      <define-rule name="wxlua_lib" extends="lib">
          <template>
--- 23,61 ----
  
  
+     <!-- ================================================================== -->
+     <!--                               SOURCE LIST                          -->
+     <!-- ================================================================== -->
  
      <!-- This one contains the lists of all source & header files   -->
      <include file="sources.bkl"/>
  
  
!     <!-- ================================================================== -->
!     <!--                               VARIABLES                            -->
!     <!-- ================================================================== -->
  
!     <!-- All the source files & header files linked above are relative to our base dir -->
      <if cond="FORMAT!='autoconf'"><set var="WXLUA_MODULEDIR">..$(DIRSEP)..</set></if>
      <if cond="FORMAT=='autoconf'"><set var="WXLUA_MODULEDIR">.</set></if>
      <set var="WXLUA_BASEDIR">$(WXLUA_MODULEDIR)$(DIRSEP)..</set>
! 
      <!-- Put all the objects files generated by         -->
      <!-- the compilation in a subfolder of BUILD        -->
!     <if cond="FORMAT!='autoconf'"><set var="BUILDDIR">$(FORMAT)$(WXLUA_LIBPOSTFIX)</set></if>
  
  
+     <!-- ================================================================== -->
+     <!--                        The list of wxLua OPTIONS                   -->
+     <!-- ================================================================== -->
  
      <!-- modules-specific options -->
      <include file="options.bkl"/>
  
  
+     <!-- ================================================================== -->
+     <!--                             NEW RULES                              -->
+     <!--  with these ones, each module/sample target takes few lines only   -->
+     <!-- ================================================================== -->
  
      <define-rule name="wxlua_lib" extends="lib">
          <template>
***************
*** 87,116 ****
              <set var="__modname">$(value)</set>
              <set var="__modnamelow">$(__modname.lower())</set>
!             
!             <set var="__modsrc">$(mk.evalExpr('$(' + __modnamelow + '_src)'))</set>            
!             <set var="__modhdr">$(mk.evalExpr('$(' + __modnamelow + '_hdr)'))</set>            
  
              <libname>$(__modnamelow)</libname>
              <sources>$(__modsrc)</sources>
!             <headers>$(__modhdr)</headers>            
! 			
  			<!-- This is required because wxbind.h refers to wx contrib section, too -->
  			<if cond="TARGETING_WIN32=='1'"><include>$(WX_DIR)$(DIRSEP)contrib$(DIRSEP)include</include></if>
!             
              <!-- to make MSVC6PRJ output look better... -->
              <msvc-file-group>$(__modname) sources:*.cpp</msvc-file-group>
              <msvc-file-group>$(__modname) headers:*.h</msvc-file-group>
!         </define-tag>        
      </define-rule>
!     
      <define-rule name="wxlua_dll" extends="dll">
          <template>
              <dirname>$(WXLUA_BASEDIR)$(DIRSEP)$(WXLUA_DLLOUTPUT_FOLDER)</dirname>
!             
              <!-- The DLL version -->
              <version>$(WXLUA_VERSION)</version>
              <so_version>$(WXLUA_SOVERSION)</so_version>
!             <mac_version>$(WXLUA_MACVERSION)</mac_version>    
!             
              <!-- Libraries must be put in the right order ! -->
              <wxlua-req-libs/>
--- 66,95 ----
              <set var="__modname">$(value)</set>
              <set var="__modnamelow">$(__modname.lower())</set>
! 
!             <set var="__modsrc">$(mk.evalExpr('$(' + __modnamelow + '_src)'))</set>
!             <set var="__modhdr">$(mk.evalExpr('$(' + __modnamelow + '_hdr)'))</set>
  
              <libname>$(__modnamelow)</libname>
              <sources>$(__modsrc)</sources>
!             <headers>$(__modhdr)</headers>
! 
  			<!-- This is required because wxbind.h refers to wx contrib section, too -->
  			<if cond="TARGETING_WIN32=='1'"><include>$(WX_DIR)$(DIRSEP)contrib$(DIRSEP)include</include></if>
! 
              <!-- to make MSVC6PRJ output look better... -->
              <msvc-file-group>$(__modname) sources:*.cpp</msvc-file-group>
              <msvc-file-group>$(__modname) headers:*.h</msvc-file-group>
!         </define-tag>
      </define-rule>
! 
      <define-rule name="wxlua_dll" extends="dll">
          <template>
              <dirname>$(WXLUA_BASEDIR)$(DIRSEP)$(WXLUA_DLLOUTPUT_FOLDER)</dirname>
! 
              <!-- The DLL version -->
              <version>$(WXLUA_VERSION)</version>
              <so_version>$(WXLUA_SOVERSION)</so_version>
!             <mac_version>$(WXLUA_MACVERSION)</mac_version>
! 
              <!-- Libraries must be put in the right order ! -->
              <wxlua-req-libs/>
***************
*** 118,122 ****
              <wx-lib>xml</wx-lib>           <!-- in case we're using the XML layout load/save system -->
              <wx-lib>core</wx-lib>
!             <wx-lib>base</wx-lib>   
  
              <set var="__modname"/>
--- 97,101 ----
              <wx-lib>xml</wx-lib>           <!-- in case we're using the XML layout load/save system -->
              <wx-lib>core</wx-lib>
!             <wx-lib>base</wx-lib>
  
              <set var="__modname"/>
***************
*** 125,136 ****
              <set var="__modname">$(value)</set>
              <set var="__modnamelow">$(__modname.lower())</set>
!             
!             <set var="__modsrc">$(mk.evalExpr('$(' + __modnamelow + '_src)'))</set>            
!             <set var="__modhdr">$(mk.evalExpr('$(' + __modnamelow + '_hdr)'))</set>            
  
              <libname>$(__modnamelow)</libname>
              <sources>$(__modsrc)</sources>
              <headers>$(__modhdr)</headers>
! 			
  			<!-- This is required because wxbind.h refers to wx contrib section, too -->
  			<if cond="TARGETING_WIN32=='1'"><include>$(WX_DIR)$(DIRSEP)contrib$(DIRSEP)include</include></if>
--- 104,115 ----
              <set var="__modname">$(value)</set>
              <set var="__modnamelow">$(__modname.lower())</set>
! 
!             <set var="__modsrc">$(mk.evalExpr('$(' + __modnamelow + '_src)'))</set>
!             <set var="__modhdr">$(mk.evalExpr('$(' + __modnamelow + '_hdr)'))</set>
  
              <libname>$(__modnamelow)</libname>
              <sources>$(__modsrc)</sources>
              <headers>$(__modhdr)</headers>
! 
  			<!-- This is required because wxbind.h refers to wx contrib section, too -->
  			<if cond="TARGETING_WIN32=='1'"><include>$(WX_DIR)$(DIRSEP)contrib$(DIRSEP)include</include></if>
***************
*** 139,158 ****
              <msvc-file-group>$(__modname) sources:*.cpp</msvc-file-group>
              <msvc-file-group>$(__modname) headers:*.h</msvc-file-group>
!             
              <!-- now, shared stuff -->
!             <define>A2D$(__modname)MAKINGDLL</define>            
          </define-tag>
      </define-rule>
-     
  
!     
!     
!     
!     <!--                                                                     -->
!     <!--                            AUXILIARY TARGETS                        -->
!     <!--                                                                     -->
! 	
  	<if cond="TARGETING_IDE=='0' and TARGETING_WIN32=='1'">
! 	
      	<!-- the two folders where output will be stored -->
          <mkdir id="setuplibdir">
--- 118,134 ----
              <msvc-file-group>$(__modname) sources:*.cpp</msvc-file-group>
              <msvc-file-group>$(__modname) headers:*.h</msvc-file-group>
! 
              <!-- now, shared stuff -->
!             <define>A2D$(__modname)MAKINGDLL</define>
          </define-tag>
      </define-rule>
  
! 
!     <!-- ================================================================== -->
!     <!--                            AUXILIARY TARGETS                       -->
!     <!-- ================================================================== -->
! 
  	<if cond="TARGETING_IDE=='0' and TARGETING_WIN32=='1'">
! 
      	<!-- the two folders where output will be stored -->
          <mkdir id="setuplibdir">
***************
*** 168,175 ****
  
  
! 
!    
!     
!     <!--                                                                     -->
      <!--                        The list of wxLua MODULES                    -->
  	<!--                                                                     -->
--- 144,148 ----
  
  
!     <!-- ==================================================================  -->
      <!--                        The list of wxLua MODULES                    -->
  	<!--                                                                     -->
***************
*** 178,186 ****
  	<!-- is a module, what is an app (since app bakefile uses 'app_' prefix) -->
  	<!-- and what is a util...                                               -->
!     <!--                                                                     -->
!     
      <!-- all the sources listed into sources.bkl contain path relative to our MODULES dir -->
      <set var="SRCDIR">$(WXLUA_MODULEDIR)</set>
!     
      <!-- lua must always be built inconditionally in static mode
           NOTE: we won't use the lua_lib rule since the LUA module does not follow
--- 151,159 ----
  	<!-- is a module, what is an app (since app bakefile uses 'app_' prefix) -->
  	<!-- and what is a util...                                               -->
!     <!-- ==================================================================  -->
! 
      <!-- all the sources listed into sources.bkl contain path relative to our MODULES dir -->
      <set var="SRCDIR">$(WXLUA_MODULEDIR)</set>
! 
      <!-- lua must always be built inconditionally in static mode
           NOTE: we won't use the lua_lib rule since the LUA module does not follow
***************
*** 194,203 ****
          <libname>lua</libname>
      </lib>
!     
      <!-- this is the lua app
           NOTE: like for lua_lib we don't use any wxLua-project-specific rule here -->
      <exe id="mod_lua">
          <library>mod_lua_lib</library>
!         <sources>lua/src/lua/lua.c</sources>        
          <include>$(WXLUA_MODULEDIR)$(DIRSEP)lua$(DIRSEP)include</include>
          <dirname>$(WXLUA_BASEDIR)$(DIRSEP)bin</dirname>
--- 167,176 ----
          <libname>lua</libname>
      </lib>
! 
      <!-- this is the lua app
           NOTE: like for lua_lib we don't use any wxLua-project-specific rule here -->
      <exe id="mod_lua">
          <library>mod_lua_lib</library>
!         <sources>lua/src/lua/lua.c</sources>
          <include>$(WXLUA_MODULEDIR)$(DIRSEP)lua$(DIRSEP)include</include>
          <dirname>$(WXLUA_BASEDIR)$(DIRSEP)bin</dirname>
***************
*** 212,235 ****
      <!-- the wxLua lib & dll -->
      <wxlua_lib id="wxlua_lib" template="wxlua-lib" cond="WX_SHARED=='0'">
!         <module-name>WXLUA</module-name>        
      </wxlua_lib>
      <wxlua_dll id="wxlua_dll" template="wxlua" cond="WX_SHARED=='1'">
!         <module-name>WXLUA</module-name>        
      </wxlua_dll>
  
      <!-- the wxBind lib & dll -->
      <wxlua_lib id="wxbind_lib" template="wxlua-lib" cond="WX_SHARED=='0'">
!         <module-name>WXBIND</module-name>        
      </wxlua_lib>
      <wxlua_dll id="wxbind_dll" template="wxlua" cond="WX_SHARED=='1'">
!         <module-name>WXBIND</module-name>        
      </wxlua_dll>
! 	
      <!-- the wxLuaDebug lib & dll -->
      <wxlua_lib id="wxluadebug_lib" template="wxlua-lib" cond="WX_SHARED=='0'">
!         <module-name>WXLUADEBUG</module-name>        
      </wxlua_lib>
      <wxlua_dll id="wxluadebug_dll" template="wxlua" cond="WX_SHARED=='1'">
!         <module-name>WXLUADEBUG</module-name>        
      </wxlua_dll>
  
--- 185,208 ----
      <!-- the wxLua lib & dll -->
      <wxlua_lib id="wxlua_lib" template="wxlua-lib" cond="WX_SHARED=='0'">
!         <module-name>WXLUA</module-name>
      </wxlua_lib>
      <wxlua_dll id="wxlua_dll" template="wxlua" cond="WX_SHARED=='1'">
!         <module-name>WXLUA</module-name>
      </wxlua_dll>
  
      <!-- the wxBind lib & dll -->
      <wxlua_lib id="wxbind_lib" template="wxlua-lib" cond="WX_SHARED=='0'">
!         <module-name>WXBIND</module-name>
      </wxlua_lib>
      <wxlua_dll id="wxbind_dll" template="wxlua" cond="WX_SHARED=='1'">
!         <module-name>WXBIND</module-name>
      </wxlua_dll>
! 
      <!-- the wxLuaDebug lib & dll -->
      <wxlua_lib id="wxluadebug_lib" template="wxlua-lib" cond="WX_SHARED=='0'">
!         <module-name>WXLUADEBUG</module-name>
      </wxlua_lib>
      <wxlua_dll id="wxluadebug_dll" template="wxlua" cond="WX_SHARED=='1'">
!         <module-name>WXLUADEBUG</module-name>
      </wxlua_dll>
  
***************
*** 241,246 ****
          <module-name>WXLUASOCKET</module-name>
      </wxlua_dll>
!     
!     
      <!-- since all the previous targets would generate each one a different DSP project
           (i.e. a lot of project files), we instead tell Bakefile to merge the LIBS & DLLS
--- 214,219 ----
          <module-name>WXLUASOCKET</module-name>
      </wxlua_dll>
! 
! 
      <!-- since all the previous targets would generate each one a different DSP project
           (i.e. a lot of project files), we instead tell Bakefile to merge the LIBS & DLLS
***************
*** 254,258 ****
  		mod_wxluasocket=wxluasocket_lib+wxluasocket_dll
      </set>
!     
!     
  </makefile>
--- 227,231 ----
  		mod_wxluasocket=wxluasocket_lib+wxluasocket_dll
      </set>
! 
! 
  </makefile>

[Wxlua-commit] wxLua/build/autoconf autoconf_inc.m4,1.1,1.2

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

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

Modified Files:
	autoconf_inc.m4 
Log Message:
formatting for bakfiles
added USE_WXLUAAPP, USE_WXLUAEDITAPP


Index: autoconf_inc.m4
===================================================================
RCS file: /cvsroot/wxlua/wxLua/build/autoconf/autoconf_inc.m4,v
retrieving revision 1.1
retrieving revision 1.2
diff -C2 -d -r1.1 -r1.2
*** autoconf_inc.m4	20 Nov 2005 11:35:17 -0000	1.1
--- autoconf_inc.m4	24 Nov 2005 21:34:16 -0000	1.2
***************
*** 109,112 ****
--- 109,124 ----
      fi
      AC_SUBST(COND_USE_UTIL_1)
+ dnl ### begin block 20_COND_USE_WXLUAAPP_1[../../apps/build/bakefiles/apps.bkl] ###
+     COND_USE_WXLUAAPP_1="#"
+     if test "x$USE_WXLUAAPP" = "x1" ; then
+         COND_USE_WXLUAAPP_1=""
+     fi
+     AC_SUBST(COND_USE_WXLUAAPP_1)
+ dnl ### begin block 20_COND_USE_WXLUAEDITAPP_1[../../apps/build/bakefiles/apps.bkl] ###
+     COND_USE_WXLUAEDITAPP_1="#"
+     if test "x$USE_WXLUAEDITAPP" = "x1" ; then
+         COND_USE_WXLUAEDITAPP_1=""
+     fi
+     AC_SUBST(COND_USE_WXLUAEDITAPP_1)
  dnl ### begin block 20_COND_WINDOWS_IMPLIB_1[../../modules/build/bakefiles/modules.bkl] ###
      COND_WINDOWS_IMPLIB_1="#"

[Wxlua-commit] wxLua/apps/build/bakefiles apps.bkl,1.6,1.7 options.bkl,1.1,1.2 sources.bkl,1.1,1.2

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

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

Modified Files:
	apps.bkl options.bkl sources.bkl 
Log Message:
formatting for bakfiles
added USE_WXLUAAPP, USE_WXLUAEDITAPP


Index: options.bkl
===================================================================
RCS file: /cvsroot/wxlua/wxLua/apps/build/bakefiles/options.bkl,v
retrieving revision 1.1
retrieving revision 1.2
diff -C2 -d -r1.1 -r1.2
*** options.bkl	12 Jun 2005 21:21:10 -0000	1.1
--- options.bkl	24 Nov 2005 21:34:16 -0000	1.2
***************
*** 5,25 ****
  
  
! <!--                                                                -->
! <!--                   WXLUA-APPS OPTIONS BAKEFILE                  -->
! <!--                                                                -->
! <makefile>  
  
!     <!--                                                                     -->
!     <!--                The list of wxLua OPTIONS DEFAULTS                   -->
!     <!--                                                                     -->
  
!     
!     
!     
  
-     <!--                                                                     -->
-     <!--                        The list of wxArt2d OPTIONS                  -->
-     <!--                                                                     -->
  
-     
  </makefile>
--- 5,52 ----
  
  
! <!-- ====================================================================== -->
! <!--                   WXLUA-APPS OPTIONS BAKEFILE                          -->
! <!-- ====================================================================== -->
  
! <makefile>
  
!     <!-- ================================================================== -->
!     <!--                The list of wxLua App OPTIONS DEFAULTS              -->
!     <!-- ================================================================== -->
! 
!     <!-- module enable/disable option defaults -->
!     <set var="USE_WXLUAAPP_DEFAULT">1</set>
!     <set var="USE_WXLUAEDITAPP_DEFAULT">0</set>
! 
! 
!     <!-- ================================================================== -->
!     <!--                        The list of wxLua App OPTIONS               -->
!     <!-- ================================================================== -->
! 
!     <!-- module enable/disable options -->
!     <if cond="TARGETING_IDE=='0'">
!         <option name="USE_WXLUAAPP">
!             <values>0,1</values>
!             <default-value>$(USE_WXLUAAPP_DEFAULT)</default-value>
!             <description>Compile the wxLua app ?</description>
!         </option>
! 
!         <option name="USE_WXLUAEDITAPP">
!             <values>0,1</values>
!             <default-value>$(USE_WXLUAEDITAPP_DEFAULT)</default-value>
!             <description>Compile the wxLuaEditor app ?</description>
!         </option>
! 
!     </if>
!     <if cond="TARGETING_IDE=='1'">
! 
!         <!-- here we are forced to use all '1' because otherwise Bakefile would simply
!              skip some target and do not generate DSP files for that one.
!              We don't want this: we want to generate DSP for all modules: the choice
!              of the modules to compile will be left to the user... -->
!         <set var="USE_WXLUAAPP">1</set>
!         <set var="USE_WXLUAEDITAPP">1</set>
!     </if>
  
  
  </makefile>

Index: sources.bkl
===================================================================
RCS file: /cvsroot/wxlua/wxLua/apps/build/bakefiles/sources.bkl,v
retrieving revision 1.1
retrieving revision 1.2
diff -C2 -d -r1.1 -r1.2
*** sources.bkl	12 Jun 2005 21:21:10 -0000	1.1
--- sources.bkl	24 Nov 2005 21:34:16 -0000	1.2
***************
*** 4,23 ****
  <!-- RCS-ID: $Id$      -->
  
! <!--                                                                -->
! <!--                    WXLUA APPS SOURCES BAKEFILE                 -->
! <!--                                                                -->
  
! <makefile>  
  
!     <set var="WXLUA_SRC">
          wxlua/src/wxlua.cpp
          wxlua/src/lconsole.cpp
      </set>
!     <set var="WXLUA_HDR">
!         wxlua/include/editor.h
!         wxlua/include/lconsole.h
!         wxlua/include/wxlua.h
      </set>
  
-     
  </makefile>
--- 4,39 ----
  <!-- RCS-ID: $Id$      -->
  
! <!-- ====================================================================== -->
! <!--                    WXLUA APPS SOURCES BAKEFILE                         -->
! <!-- ====================================================================== -->
  
! <makefile>
  
!     <!-- ================================================================== -->
!     <!-- wxLua App : wxLua/apps/wxlua                                       -->
!     <!-- ================================================================== -->
! 
!     <set var="WXLUAAPP_SRC">
          wxlua/src/wxlua.cpp
          wxlua/src/lconsole.cpp
      </set>
!     <set var="WXLUAAPP_HDR">
!         wxlua/src/editor.h
!         wxlua/src/lconsole.h
!         wxlua/src/wxlua.h
!     </set>
! 
! 
!     <!-- ================================================================== -->
!     <!-- wxLuaEditor App : wxLua/apps/wxluaedit                             -->
!     <!-- ================================================================== -->
! 
!     <set var="WXLUAEDITAPP_SRC">
!         wxluaedit/src/wxledit.cpp
!         wxluaedit/src/wxluaedit.cpp
!     </set>
!     <set var="WXLUAEDITAPP_HDR">
!         wxluaedit/src/wxledit.h
      </set>
  
  </makefile>

Index: apps.bkl
===================================================================
RCS file: /cvsroot/wxlua/wxLua/apps/build/bakefiles/apps.bkl,v
retrieving revision 1.6
retrieving revision 1.7
diff -C2 -d -r1.6 -r1.7
*** apps.bkl	23 Nov 2005 20:33:14 -0000	1.6
--- apps.bkl	24 Nov 2005 21:34:16 -0000	1.7
***************
*** 4,16 ****
  <!-- RCS-ID: $Id$      -->
  
! <!--                                                                -->
! <!--                    WXLUA APPS BAKEFILE                         -->
! <!--                                                                -->
  
! <makefile>  
  
      <!-- This file contains the wxLua template                    -->
      <include file="../../../build/bakefiles/wxluabase.bkl"/>
  
      <if cond="TARGETING_WIN32=='1'">
          <!-- Win32 makefiles will be put in BUILD/MSW -->
--- 4,20 ----
  <!-- RCS-ID: $Id$      -->
  
! <!-- ====================================================================== -->
! <!--                    WXLUA APPS BAKEFILE                                 -->
! <!-- ====================================================================== -->
  
! <makefile>
  
      <!-- This file contains the wxLua template                    -->
      <include file="../../../build/bakefiles/wxluabase.bkl"/>
  
+     <!-- ================================================================== -->
+     <!--                               VARIABLES                            -->
+     <!-- ================================================================== -->
+ 
      <if cond="TARGETING_WIN32=='1'">
          <!-- Win32 makefiles will be put in BUILD/MSW -->
***************
*** 23,62 ****
          <set var="WXLUA_APPSDIR">.</set>
      </if>
!     
      <!-- Put all the objects files generated by         -->
      <!-- the compilation in a subfolder of BUILD        -->
!     <if cond="FORMAT!='autoconf'"><set var="BUILDDIR">$(FORMAT)$(WXLUA_LIBPOSTFIX)</set></if> 
!     
!     <!-- modules-specific options -->
!     <include file="../../../modules/build/bakefiles/options.bkl"/>
!     
      <!-- all the sources listed into sources.bkl contain path relative to our wxLua\app dir -->
      <set var="SRCDIR">$(WXLUA_APPSDIR)</set>
      <include file="sources.bkl"/>
!     
!   
!     
!     <!--                                                                     -->
!     <!--                        The WXLUA application target                 -->
!     <!--                                                                     -->
!     <!-- 
!     <action id="wrap">
!         <dependency-of>all</dependency-of>
!         <depends-on-file>..\..\..\bindings\wxwidgets\override.hpp</depends-on-file>
!         <command>..\..\..\bin\lua -e"target=\"msw\"" ..\..\wxlua\src\wrap.lua</command>
!         <command>copy ..\..\..\bindings\wxwidgets\wxluawrap.i ..\..\..\bindings\wxwidgets\wxluawrap.c</command>
!     </action>
! 	-->
!     	
  	<!-- NOTE: we need to use a name different from 'wxlua' since 'wxlua' name is already in use
  	           as a module target... this would lead to problems when creating global DSW file... -->
!     <exe id="app_wxlua" template="wxlua">
!       <!--  <depends>wrap</depends> -->
!         <sources>$(WXLUA_SRC)</sources>
!         <headers>$(WXLUA_HDR)</headers>        
          <dirname>$(WXLUA_BASEDIR)$(DIRSEP)bin</dirname>
  		<exename>wxlua</exename>
          <win32-res>wxlua/src/wxlua.rc</win32-res>
!         
          <!-- Libraries must be put in the right order ! -->
          <wxlua-lib>wxluadebug</wxlua-lib>
--- 27,67 ----
          <set var="WXLUA_APPSDIR">.</set>
      </if>
! 
      <!-- Put all the objects files generated by         -->
      <!-- the compilation in a subfolder of BUILD        -->
!     <if cond="FORMAT!='autoconf'"><set var="BUILDDIR">$(FORMAT)$(WXLUA_LIBPOSTFIX)</set></if>
! 
! 
!     <!-- ================================================================== -->
!     <!--                               SOURCE LIST                          -->
!     <!-- ================================================================== -->
! 
      <!-- all the sources listed into sources.bkl contain path relative to our wxLua\app dir -->
      <set var="SRCDIR">$(WXLUA_APPSDIR)</set>
      <include file="sources.bkl"/>
! 
! 
!     <!-- ================================================================== -->
!     <!--                        The list of wxLua OPTIONS                   -->
!     <!-- ================================================================== -->
! 
!     <!-- apps-specific options -->
!     <include file="options.bkl"/>
!     <!-- <include file="../../../modules/build/bakefiles/options.bkl"/> -->
! 
! 
!     <!-- ================================================================== -->
!     <!--                        The WXLUA application target                -->
!     <!-- ================================================================== -->
! 
  	<!-- NOTE: we need to use a name different from 'wxlua' since 'wxlua' name is already in use
  	           as a module target... this would lead to problems when creating global DSW file... -->
!     <exe id="app_wxlua" template="wxlua" cond="USE_WXLUAAPP=='1'">
!         <sources>$(WXLUAAPP_SRC)</sources>
!         <headers>$(WXLUAAPP_HDR)</headers>
          <dirname>$(WXLUA_BASEDIR)$(DIRSEP)bin</dirname>
  		<exename>wxlua</exename>
          <win32-res>wxlua/src/wxlua.rc</win32-res>
! 
          <!-- Libraries must be put in the right order ! -->
          <wxlua-lib>wxluadebug</wxlua-lib>
***************
*** 67,75 ****
  
          <wx-lib>adv</wx-lib>
!         <wx-lib>base</wx-lib>  
          <wx-lib>core</wx-lib>
!         <wx-lib>html</wx-lib>  
!         <wx-lib>media</wx-lib>  
!         <wx-lib>net</wx-lib>  
          <wx-lib>xml</wx-lib>
          <wx-lib>xrc</wx-lib>
--- 72,80 ----
  
          <wx-lib>adv</wx-lib>
!         <wx-lib>base</wx-lib>
          <wx-lib>core</wx-lib>
!         <wx-lib>html</wx-lib>
!         <wx-lib>media</wx-lib>
!         <wx-lib>net</wx-lib>
          <wx-lib>xml</wx-lib>
          <wx-lib>xrc</wx-lib>
***************
*** 77,81 ****
          <wx-lib>stc</wx-lib>
      </exe>
!     
!     
  </makefile>
--- 82,116 ----
          <wx-lib>stc</wx-lib>
      </exe>
! 
!     <!-- ================================================================== -->
!     <!--                        The WXLUAEDIT application target            -->
!     <!-- ================================================================== -->
! 
!     <exe id="app_wxluaedit" template="wxlua" cond="USE_WXLUAEDITAPP=='1'">
!         <sources>$(WXLUAEDITAPP_SRC)</sources>
!         <headers>$(WXLUAEDITAPP_HDR)</headers>
!         <dirname>$(WXLUA_BASEDIR)$(DIRSEP)bin</dirname>
! 		<exename>wxluaedit</exename>
!         <win32-res>wxlua/src/wxluaedit.rc</win32-res>
! 
!         <!-- Libraries must be put in the right order ! -->
!         <wxlua-lib>wxluadebug</wxlua-lib>
!         <wxlua-lib>wxluasocket</wxlua-lib>
!         <wxlua-lib>wxlua</wxlua-lib>
!         <wxlua-lib>wxbind</wxlua-lib>
!         <wxlua-lib>lua</wxlua-lib>
! 
!         <wx-lib>adv</wx-lib>
!         <wx-lib>base</wx-lib>
!         <wx-lib>core</wx-lib>
!         <wx-lib>html</wx-lib>
!         <wx-lib>media</wx-lib>
!         <wx-lib>net</wx-lib>
!         <wx-lib>xml</wx-lib>
!         <wx-lib>xrc</wx-lib>
! 
!         <wx-lib>stc</wx-lib>
!     </exe>
! 
! 
  </makefile>

[Wxlua-commit] wxLua/build/bakefiles Bakefiles.bkgen,1.2,1.3 utils.bkl,1.2,1.3 wxlua.bkl,1.4,1.5 wxluabase.bkl,1.3,1.4

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

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

Modified Files:
	Bakefiles.bkgen utils.bkl wxlua.bkl wxluabase.bkl 
Log Message:
formatting for bakfiles
added USE_WXLUAAPP, USE_WXLUAEDITAPP


Index: wxluabase.bkl
===================================================================
RCS file: /cvsroot/wxlua/wxLua/build/bakefiles/wxluabase.bkl,v
retrieving revision 1.3
retrieving revision 1.4
diff -C2 -d -r1.3 -r1.4
*** wxluabase.bkl	14 Jun 2005 21:44:40 -0000	1.3
--- wxluabase.bkl	24 Nov 2005 21:34:16 -0000	1.4
***************
*** 5,14 ****
  
  
! <!--                                                                -->
! <!--                     WXLUA GENERIC BAKEFILE                     -->
! <!--                                                                -->
! <!--    This bakefile can be used by all wxLua-based apps and       -->
! <!--    libraries.                                                  -->
! <!--                                                                -->
  
  <makefile>
--- 5,14 ----
  
  
! <!-- ====================================================================== -->
! <!--                     WXLUA GENERIC BAKEFILE                             -->
! <!--                                                                        -->
! <!--    This bakefile can be used by all wxLua-based apps and               -->
! <!--    libraries.                                                          -->
! <!-- ====================================================================== -->
  
  <makefile>
***************
*** 19,31 ****
      <set var="WX_VERSION_DEFAULT">26</set>
      <include file="presets/wx.bkl"/>
!     
      <!-- This one contains some utility targets -->
      <include file="utils.bkl"/>
  
  
! 
!     <!--                                                                -->
!     <!--                            VARIABLES                           -->
!     <!--                                                                -->
  
      <!-- Some infos on the version. -->
--- 19,30 ----
      <set var="WX_VERSION_DEFAULT">26</set>
      <include file="presets/wx.bkl"/>
! 
      <!-- This one contains some utility targets -->
      <include file="utils.bkl"/>
  
  
!     <!-- ================================================================== -->
!     <!--                            VARIABLES                               -->
!     <!-- ================================================================== -->
  
      <!-- Some infos on the version. -->
***************
*** 34,42 ****
      <set var="WXLUA_RELEASE">1</set>
      <set var="WXLUA_VERSION">$(WXLUA_MAJOR).$(WXLUA_MINOR).$(WXLUA_RELEASE)</set>
!             
      <!-- 0.0.0 must be used for stable releases; 1.0.0, 2.0.0 ...
           are used for development releases. -->
      <set var="WXLUA_SOVERSION">0.0.0</set>
!     
      <!-- Same as WXLUA_SOVERSION just without dots -->
      <set var="WXLUA_MACVERSION">0</set>
--- 33,41 ----
      <set var="WXLUA_RELEASE">1</set>
      <set var="WXLUA_VERSION">$(WXLUA_MAJOR).$(WXLUA_MINOR).$(WXLUA_RELEASE)</set>
! 
      <!-- 0.0.0 must be used for stable releases; 1.0.0, 2.0.0 ...
           are used for development releases. -->
      <set var="WXLUA_SOVERSION">0.0.0</set>
! 
      <!-- Same as WXLUA_SOVERSION just without dots -->
      <set var="WXLUA_MACVERSION">0</set>
***************
*** 52,57 ****
          <if cond="FORMAT=='msvc6prj' or FORMAT=='cbuilderx'">1</if>
          <if cond="FORMAT!='msvc6prj' and FORMAT!='cbuilderx'">0</if>
!     </set>    
!     
      <set var="WXLUA_LIBPOSTFIX">
          <!-- Use same naming conventions as for wxWidgets. -->
--- 51,56 ----
          <if cond="FORMAT=='msvc6prj' or FORMAT=='cbuilderx'">1</if>
          <if cond="FORMAT!='msvc6prj' and FORMAT!='cbuilderx'">0</if>
!     </set>
! 
      <set var="WXLUA_LIBPOSTFIX">
          <!-- Use same naming conventions as for wxWidgets. -->
***************
*** 59,65 ****
          <if cond="TARGETING_WIN32=='0'"></if>        <!-- empty in this case... -->
      </set>
!         
      <!-- some path stuff -->
!         
      <if cond="TARGETING_WIN32=='1'">
          <!-- Win32 makefiles will be put in BUILD/MSW -->
--- 58,64 ----
          <if cond="TARGETING_WIN32=='0'"></if>        <!-- empty in this case... -->
      </set>
! 
      <!-- some path stuff -->
! 
      <if cond="TARGETING_WIN32=='1'">
          <!-- Win32 makefiles will be put in BUILD/MSW -->
***************
*** 70,74 ****
          <set var="WXLUA_BASEDIR">.</set>
      </if>
!     
      <set var="WXLUA_LIBOUTPUT_FOLDER">
          <if cond="TARGETING_WIN32=='1'">
--- 69,73 ----
          <set var="WXLUA_BASEDIR">.</set>
      </if>
! 
      <set var="WXLUA_LIBOUTPUT_FOLDER">
          <if cond="TARGETING_WIN32=='1'">
***************
*** 94,98 ****
          <if cond="TARGETING_WIN32=='0'">lib</if>    <!-- shared & static builds go to the same folder -->
      </set>
!     
      <if cond="TARGETING_WIN32=='1'">
          <set var="WARNINGS">
--- 93,97 ----
          <if cond="TARGETING_WIN32=='0'">lib</if>    <!-- shared & static builds go to the same folder -->
      </set>
! 
      <if cond="TARGETING_WIN32=='1'">
          <set var="WARNINGS">
***************
*** 114,124 ****
          <set var="WX_SHAREDDEFINE">
              <if cond="WX_SHARED=='1'">WXUSINGDLL</if>
!         </set>        
  
          <set var="SUBPROJECT_POSTFIX_PATH">build$(DIRSEP)msw</set>
      </if>
      <if cond="TARGETING_WIN32=='0'">
!         <set var="WX_SHAREDDEFINE"/>        
!         
          <if cond="FORMAT=='autoconf'">
              <option name="WX_DEBUG"/>
--- 113,123 ----
          <set var="WX_SHAREDDEFINE">
              <if cond="WX_SHARED=='1'">WXUSINGDLL</if>
!         </set>
  
          <set var="SUBPROJECT_POSTFIX_PATH">build$(DIRSEP)msw</set>
      </if>
      <if cond="TARGETING_WIN32=='0'">
!         <set var="WX_SHAREDDEFINE"/>
! 
          <if cond="FORMAT=='autoconf'">
              <option name="WX_DEBUG"/>
***************
*** 128,141 ****
              <option name="WX_VERSION"/>
          </if>
!         
          <set var="SUBPROJECT_POSTFIX_PATH"/>
      </if>
-         
- 
  
  
!     <!--                                                                -->
!     <!--                            NEW TAGS                            -->
!     <!--                                                                -->
  
      <!-- This defines a tag which includes headers on MSVC          -->
--- 127,138 ----
              <option name="WX_VERSION"/>
          </if>
! 
          <set var="SUBPROJECT_POSTFIX_PATH"/>
      </if>
  
  
!     <!-- ================================================================== -->
!     <!--                            NEW TAGS                                -->
!     <!-- ================================================================== -->
  
      <!-- This defines a tag which includes headers on MSVC          -->
***************
*** 149,153 ****
          </if>
      </define-tag>
!     
      <define-tag name="run-tarball" rules="action">
          <command>tar -cvzf $(value) --exclude-from=$(WXLUA_BASEDIR)$(DIRSEP)build$(DIRSEP)bakefiles$(DIRSEP)excludelist.txt wxLua/*</command>
--- 146,150 ----
          </if>
      </define-tag>
! 
      <define-tag name="run-tarball" rules="action">
          <command>tar -cvzf $(value) --exclude-from=$(WXLUA_BASEDIR)$(DIRSEP)build$(DIRSEP)bakefiles$(DIRSEP)excludelist.txt wxLua/*</command>
***************
*** 158,167 ****
  
  
! 
! 
! 
!     <!--                                                                -->
!     <!--                          TEMPLATES                             -->
!     <!--                                                                -->
  
      <!-- just a placeholder to mark the place where <lua-lib> will be placed,
--- 155,161 ----
  
  
!     <!-- ================================================================== -->
!     <!--                          TEMPLATES                                 -->
!     <!-- ================================================================== -->
  
      <!-- just a placeholder to mark the place where <lua-lib> will be placed,
***************
*** 174,178 ****
           library namings like wx does -->
      <define-tag name="wxlua-lib" rules="exe,dll,module"><sys-lib>$(value)</sys-lib></define-tag>
! 	
  	<!-- this tag includes the wxLua required libraries, it will be defined
  		later in options.bkl -->
--- 168,172 ----
           library namings like wx does -->
      <define-tag name="wxlua-lib" rules="exe,dll,module"><sys-lib>$(value)</sys-lib></define-tag>
! 
  	<!-- this tag includes the wxLua required libraries, it will be defined
  		later in options.bkl -->
***************
*** 183,187 ****
  	<tag-info name="wxlua-req-libs" position="before:__wxlua-libs-point"/>
      <tag-info name="wx-lib" position="after:__wxlua-libs-point"/>
!     
      <!-- the generic template for wxLua-based libs/apps: this does not derive
           from wx or from wx-lib so that these templates can be added later to
--- 177,181 ----
  	<tag-info name="wxlua-req-libs" position="before:__wxlua-libs-point"/>
      <tag-info name="wx-lib" position="after:__wxlua-libs-point"/>
! 
      <!-- the generic template for wxLua-based libs/apps: this does not derive
           from wx or from wx-lib so that these templates can be added later to
***************
*** 190,197 ****
      <template id="wxlua-base">
          <!-- an additional include & link path are required not only on win32 but also
!              on *nix: when compiling the samples or the library the user has not 
!              installed the library yet ! -->        
          <include>$(WXLUA_BASEDIR)$(DIRSEP)modules</include>
!    
          <if cond="TARGETING_WIN32=='1'">
              <warnings>$(WARNINGS)</warnings>
--- 184,191 ----
      <template id="wxlua-base">
          <!-- an additional include & link path are required not only on win32 but also
!              on *nix: when compiling the samples or the library the user has not
!              installed the library yet ! -->
          <include>$(WXLUA_BASEDIR)$(DIRSEP)modules</include>
! 
          <if cond="TARGETING_WIN32=='1'">
              <warnings>$(WARNINGS)</warnings>
***************
*** 201,209 ****
              <threading>multi</threading>
          </if>
!         
          <!-- This is a non-empty variable only when using wxWidgets as a DLL -->
          <define>$(WX_SHAREDDEFINE)</define>
      </template>
!     
      <!-- a template for wxLua-based libraries -->
      <template id="wxlua-lib" template="wx-lib,wxlua-base">
--- 195,203 ----
              <threading>multi</threading>
          </if>
! 
          <!-- This is a non-empty variable only when using wxWidgets as a DLL -->
          <define>$(WX_SHAREDDEFINE)</define>
      </template>
! 
      <!-- a template for wxLua-based libraries -->
      <template id="wxlua-lib" template="wx-lib,wxlua-base">
***************
*** 214,222 ****
      <template id="wxlua" template="wx,wxlua-base">
          <lib-path>$(WXLUA_BASEDIR)$(DIRSEP)$(WXLUA_OUTPUT_FOLDER)</lib-path>
!       
          <!-- same technique used by wx_win32.bkl: this is a placeholder
               for the lua-lib tags so that the library order is always
               the exact one -->
!         <__wxlua-libs-point/>		
      </template>
  
--- 208,216 ----
      <template id="wxlua" template="wx,wxlua-base">
          <lib-path>$(WXLUA_BASEDIR)$(DIRSEP)$(WXLUA_OUTPUT_FOLDER)</lib-path>
! 
          <!-- same technique used by wx_win32.bkl: this is a placeholder
               for the lua-lib tags so that the library order is always
               the exact one -->
!         <__wxlua-libs-point/>
      </template>
  

Index: utils.bkl
===================================================================
RCS file: /cvsroot/wxlua/wxLua/build/bakefiles/utils.bkl,v
retrieving revision 1.2
retrieving revision 1.3
diff -C2 -d -r1.2 -r1.3
*** utils.bkl	20 Jun 2005 09:02:46 -0000	1.2
--- utils.bkl	24 Nov 2005 21:34:16 -0000	1.3
***************
*** 5,21 ****
  <!-- Last revision: 13/5/2005                                       -->
  
! <!--                                                                -->
! <!--             GENERIC BAKEFILE WITH UTILITY TAGS                 -->
! <!--                                                                -->
! <!--    This bakefile provides various new tags for easier          -->
! <!--    target creation (in particular these tags give you          -->
! <!--    the tools required to build INSTALL/UNINSTALL/RPM           -->
! <!--    targets.                                                    -->
  
  <makefile>
  
!     <!--                                                                -->
!     <!--                            NEW TAGS                            -->
!     <!--                                                                -->
  
      <!-- Removes the $(value) file.                                     -->
--- 5,22 ----
  <!-- Last revision: 13/5/2005                                       -->
  
! <!-- ====================================================================== -->
! <!--             GENERIC BAKEFILE WITH UTILITY TAGS                         -->
! <!--                                                                        -->
! <!--    This bakefile provides various new tags for easier                  -->
! <!--    target creation (in particular these tags give you                  -->
! <!--    the tools required to build INSTALL/UNINSTALL/RPM                   -->
! <!--    targets.                                                            -->
! <!-- ====================================================================== -->
  
  <makefile>
  
!     <!-- ================================================================== -->
!     <!--                            NEW TAGS                                -->
!     <!-- ================================================================== -->
  
      <!-- Removes the $(value) file.                                     -->
***************
*** 34,38 ****
          	<!-- The MINGW format needs the "then" keyword... -->
              <command>-if exist $(value) then del /Q $(value)</command>
!         </if>        
      </define-tag>
  
--- 35,39 ----
          	<!-- The MINGW format needs the "then" keyword... -->
              <command>-if exist $(value) then del /Q $(value)</command>
!         </if>
      </define-tag>
  
***************
*** 46,50 ****
          <if cond="TOOLSET=='win32'"><command>-del /S $(value)</command></if>
      </define-tag>
!     
      <!-- Removes the $(value) list of files. Each file should be        -->
      <!-- separed from the previous with a single space.                 -->
--- 47,51 ----
          <if cond="TOOLSET=='win32'"><command>-del /S $(value)</command></if>
      </define-tag>
! 
      <!-- Removes the $(value) list of files. Each file should be        -->
      <!-- separed from the previous with a single space.                 -->
***************
*** 53,57 ****
      <!-- Usage sample:                                                  -->
      <!--          <set var="MYPRJ_HDR">                                 -->
!     <!--                  hdr1.h wx/hdr2.h                              -->             
      <!--          </set>                                                -->
      <!--          <modify-target target="uninstall">                    -->
--- 54,58 ----
      <!-- Usage sample:                                                  -->
      <!--          <set var="MYPRJ_HDR">                                 -->
!     <!--                  hdr1.h wx/hdr2.h                              -->
      <!--          </set>                                                -->
      <!--          <modify-target target="uninstall">                    -->
***************
*** 60,70 ****
      <define-tag name="rmheaders" rules="action">
         	<!-- First of all remove all unnecessary whitespaces and wrap long lines -->
!         <set var="__tmplist">$(wrapLongLine("", value, "\\", "\t", 20))</set> 
!         
          <!-- then put the $(DESTDIR)$(INCLUDEDIR)/ string in front of all files -->
          <set var="__tmplist">$(" " + __tmplist)</set>
          <set var="__tmplist">$(__tmplist.replace(" ", " " + DESTDIR + INCLUDEDIR + DIRSEP))</set>
          <set var="__tmplist">$(__tmplist.replace("\t", "\t" + DESTDIR + INCLUDEDIR + DIRSEP))</set>
!         
          <!-- RM/DEL commands can take also lists of files (thanks Vaclav!) -->
          <rmfile>$(__tmplist)</rmfile>
--- 61,71 ----
      <define-tag name="rmheaders" rules="action">
         	<!-- First of all remove all unnecessary whitespaces and wrap long lines -->
!         <set var="__tmplist">$(wrapLongLine("", value, "\\", "\t", 20))</set>
! 
          <!-- then put the $(DESTDIR)$(INCLUDEDIR)/ string in front of all files -->
          <set var="__tmplist">$(" " + __tmplist)</set>
          <set var="__tmplist">$(__tmplist.replace(" ", " " + DESTDIR + INCLUDEDIR + DIRSEP))</set>
          <set var="__tmplist">$(__tmplist.replace("\t", "\t" + DESTDIR + INCLUDEDIR + DIRSEP))</set>
! 
          <!-- RM/DEL commands can take also lists of files (thanks Vaclav!) -->
          <rmfile>$(__tmplist)</rmfile>
***************
*** 75,79 ****
      <!--          <action id="uninstall-scripts">                       -->
      <!--              <rmdir>$(DATADIR)/myscripts</rmdir>               -->
!     <!--          </action>                                             -->    
      <define-tag name="rmdir" rules="action">
          <if cond="TARGETING_WIN32=='0'">
--- 76,80 ----
      <!--          <action id="uninstall-scripts">                       -->
      <!--              <rmdir>$(DATADIR)/myscripts</rmdir>               -->
!     <!--          </action>                                             -->
      <define-tag name="rmdir" rules="action">
          <if cond="TARGETING_WIN32=='0'">
***************
*** 86,90 ****
          	<!-- The MINGW format needs the "then" keyword... -->
              <command>-if exist $(value) then rmdir /S /Q $(value)</command>
!         </if>                
      </define-tag>
  
--- 87,91 ----
          	<!-- The MINGW format needs the "then" keyword... -->
              <command>-if exist $(value) then rmdir /S /Q $(value)</command>
!         </if>
      </define-tag>
  
***************
*** 96,100 ****
      <!--          <action id="deepclean">                               -->
      <!--              <rmintdir>$(FORMAT)</rmintdir>                    -->
!     <!--          </action>                                             -->    
      <define-tag name="rmintdir" rules="action">
          <rmdir>$(value)</rmdir>
--- 97,101 ----
      <!--          <action id="deepclean">                               -->
      <!--              <rmintdir>$(FORMAT)</rmintdir>                    -->
!     <!--          </action>                                             -->
      <define-tag name="rmintdir" rules="action">
          <rmdir>$(value)</rmdir>
***************
*** 103,107 ****
          <rmdir>$(value)ud</rmdir>
      </define-tag>
!     
      <!-- Removes *all* intermediate files from the given folder         -->
      <!-- recursively.                                                   -->
--- 104,108 ----
          <rmdir>$(value)ud</rmdir>
      </define-tag>
! 
      <!-- Removes *all* intermediate files from the given folder         -->
      <!-- recursively.                                                   -->
***************
*** 111,115 ****
      <!--          </action>                                             -->
      <define-tag name="rmintfiles" rules="action">
!     
          <!-- remove results -->
          <rmfile-rec>$(value)$(DIRSEP)*.a</rmfile-rec>
--- 112,116 ----
      <!--          </action>                                             -->
      <define-tag name="rmintfiles" rules="action">
! 
          <!-- remove results -->
          <rmfile-rec>$(value)$(DIRSEP)*.a</rmfile-rec>
***************
*** 119,124 ****
          <rmfile-rec>$(value)$(DIRSEP)*.exp</rmfile-rec>
          <rmfile-rec>$(value)$(DIRSEP)*.so*</rmfile-rec>
!         <rmfile-rec>$(value)$(DIRSEP)*.exe</rmfile-rec>        
!     
          <!-- various intermediate files for the bakefile-supported compilers -->
  	    <rmfile-rec>$(value)$(DIRSEP)*.obj</rmfile-rec>
--- 120,125 ----
          <rmfile-rec>$(value)$(DIRSEP)*.exp</rmfile-rec>
          <rmfile-rec>$(value)$(DIRSEP)*.so*</rmfile-rec>
!         <rmfile-rec>$(value)$(DIRSEP)*.exe</rmfile-rec>
! 
          <!-- various intermediate files for the bakefile-supported compilers -->
  	    <rmfile-rec>$(value)$(DIRSEP)*.obj</rmfile-rec>
***************
*** 141,147 ****
          <rmfile-rec>$(value)$(DIRSEP)*.il?</rmfile-rec>
          <rmfile-rec>$(value)$(DIRSEP)*.tds</rmfile-rec>
!         <rmfile-rec>$(value)$(DIRSEP)*.idb</rmfile-rec>	   
          <rmfile-rec>$(value)$(DIRSEP)*.map</rmfile-rec>
!          	    
  	    <!-- autoconf -->
          <rmdir>$(value)$(DIRSEP)autom4te.cache</rmdir>
--- 142,148 ----
          <rmfile-rec>$(value)$(DIRSEP)*.il?</rmfile-rec>
          <rmfile-rec>$(value)$(DIRSEP)*.tds</rmfile-rec>
!         <rmfile-rec>$(value)$(DIRSEP)*.idb</rmfile-rec>
          <rmfile-rec>$(value)$(DIRSEP)*.map</rmfile-rec>
! 
  	    <!-- autoconf -->
          <rmdir>$(value)$(DIRSEP)autom4te.cache</rmdir>
***************
*** 154,163 ****
  
  
  
- 
-     <!--                                                                -->
-     <!--                           NEW RULES                            -->
-     <!--                                                                -->
- 	
  	<!-- Forces the presence of the $(id) option into the final makefile; -->
      <!-- this rule (which is really used more like a tag) is a tweaky way -->
--- 155,162 ----
  
  
+     <!-- ================================================================== -->
+     <!--                           NEW RULES                                -->
+     <!-- ================================================================== -->
  
  	<!-- Forces the presence of the $(id) option into the final makefile; -->
      <!-- this rule (which is really used more like a tag) is a tweaky way -->
***************
*** 166,170 ****
      <!-- See bakefile docs for the VARS_DONT_ELIMINATE global switch.     -->
      <!-- Usage sample:                                                    -->
! 	<!--    <force-opt-presence id="MY_USELESS_OPTION"/>                  -->    
  	<define-rule name="force-opt-presence" extends="phony">
  	    <template id="dummytemplate_for_$(id)">
--- 165,169 ----
      <!-- See bakefile docs for the VARS_DONT_ELIMINATE global switch.     -->
      <!-- Usage sample:                                                    -->
! 	<!--    <force-opt-presence id="MY_USELESS_OPTION"/>                  -->
  	<define-rule name="force-opt-presence" extends="phony">
  	    <template id="dummytemplate_for_$(id)">
***************
*** 179,183 ****
      <!--              <cd>..</cd>                                       -->
      <!--              <run>tar -cvzf tarball.tar.gz myproj/*</run>      -->
!     <!--          </cd-and-run>                                         -->    
      <define-rule name="cd-and-run" extends="action">
          <template>
--- 178,182 ----
      <!--              <cd>..</cd>                                       -->
      <!--              <run>tar -cvzf tarball.tar.gz myproj/*</run>      -->
!     <!--          </cd-and-run>                                         -->
      <define-rule name="cd-and-run" extends="action">
          <template>
***************
*** 195,199 ****
              <if cond="FORMAT=='borland' or FORMAT=='watcom'">
  	            <command>-cd $(__cmddir)</command>
! 	            <command>-$(__cmdstr)</command>	            
  	        </if>
          </define-tag>
--- 194,198 ----
              <if cond="FORMAT=='borland' or FORMAT=='watcom'">
  	            <command>-cd $(__cmddir)</command>
! 	            <command>-$(__cmdstr)</command>
  	        </if>
          </define-tag>

Index: Bakefiles.bkgen
===================================================================
RCS file: /cvsroot/wxlua/wxLua/build/bakefiles/Bakefiles.bkgen,v
retrieving revision 1.2
retrieving revision 1.3
diff -C2 -d -r1.2 -r1.3
*** Bakefiles.bkgen	20 Nov 2005 11:35:17 -0000	1.2
--- Bakefiles.bkgen	24 Nov 2005 21:34:16 -0000	1.3
***************
*** 4,8 ****
--- 4,23 ----
  <bakefile-gen>
  
+     <!-- ================================================================== -->
+     <!-- Formats to (not) generate                                          -->
+     <!-- ================================================================== -->
+ 
      <disable-formats>gnu,dmars,cbx_unix,cbuilderx</disable-formats>
+ 
+     <!-- List of output formats to generate: -->
+     <add-formats>
+         autoconf,borland,dmars,mingw,msvc,watcom,cbuilderx,cbx_unix,gnu
+     </add-formats>
+ 
+ 
+     <!-- ================================================================== -->
+     <!-- Input bakefiles                                                    -->
+     <!-- ================================================================== -->
+ 
      <input>
          ./wxlua.bkl
***************
*** 16,23 ****
  
  
!     <!-- List of output formats to generate: -->
!     <add-formats>
!         autoconf,borland,dmars,mingw,msvc,watcom,cbuilderx,cbx_unix,gnu
!     </add-formats>
  
      <!-- Directories where msw makefiles should go: -->
--- 31,37 ----
  
  
!     <!-- ================================================================== -->
!     <!-- Output directories                                                 -->
!     <!-- ================================================================== -->
  
      <!-- Directories where msw makefiles should go: -->

Index: wxlua.bkl
===================================================================
RCS file: /cvsroot/wxlua/wxLua/build/bakefiles/wxlua.bkl,v
retrieving revision 1.4
retrieving revision 1.5
diff -C2 -d -r1.4 -r1.5
*** wxlua.bkl	14 Jun 2005 21:44:40 -0000	1.4
--- wxlua.bkl	24 Nov 2005 21:34:16 -0000	1.5
***************
*** 5,11 ****
  
  
! <!--                                                                    -->
! <!--                           WXLUA MAIN BAKEFILE                      -->
! <!--                                                                    -->
  <makefile>
  
--- 5,12 ----
  
  
! <!-- ====================================================================== -->
! <!--                           WXLUA MAIN BAKEFILE                          -->
! <!-- ====================================================================== -->
! 
  <makefile>
  
***************
*** 25,29 ****
  
      <!-- some dummy vars so that unused vars are not removed from the output:
!          in fact, we do not use WX_DIR/WX_VERSION/... vars directly in this 
           bakefile and so Bakefile would remove them from the final
           makefiles but this must be avoid !
--- 26,30 ----
  
      <!-- some dummy vars so that unused vars are not removed from the output:
!          in fact, we do not use WX_DIR/WX_VERSION/... vars directly in this
           bakefile and so Bakefile would remove them from the final
           makefiles but this must be avoid !
***************
*** 34,42 ****
  	WX_SHARED="$(WX_SHARED)" WX_UNICODE="$(WX_UNICODE)" WX_DEBUG="$(WX_DEBUG)" \
  	WX_VERSION="$(WX_VERSION)" USE_UTIL="$(USE_UTIL)" \
! 	USE_WXLUADEBUG="$(USE_WXLUADEBUG)" USE_WXLUASOCKET="$(USE_WXLUASOCKET)"
!     
           where $(WX_DIR), $(WX_VERSION), ... expand to nothing since they are
           undeclared variables from MAKE's point of view...
!  
      -->
  
--- 35,45 ----
  	WX_SHARED="$(WX_SHARED)" WX_UNICODE="$(WX_UNICODE)" WX_DEBUG="$(WX_DEBUG)" \
  	WX_VERSION="$(WX_VERSION)" USE_UTIL="$(USE_UTIL)" \
! 	USE_WXLUADEBUGLIB="$(USE_WXLUADEBUGLIB)" USE_WXLUASOCKETLIB="$(USE_WXLUASOCKETLIB)" \
! 	USE_WXLUAAPP="$(USE_WXLUAAPP)" USE_WXLUAEDITAPP="$(USE_WXLUAEDITAPP)"
! 
! 
           where $(WX_DIR), $(WX_VERSION), ... expand to nothing since they are
           undeclared variables from MAKE's point of view...
! 
      -->
  
***************
*** 46,66 ****
      <!-- options not tied to a specific module -->
      <if cond="TARGETING_IDE=='0'">
!         
          <option name="USE_UTIL">
              <values>0,1</values>
              <default-value>$(USE_UTIL_DEFAULT)</default-value>
              <description>Does the wxLua utilities should be compiled ?</description>
!         </option>    
          <option name="USE_APPS">
              <values>0,1</values>
              <default-value>$(USE_APPS_DEFAULT)</default-value>
!             <description>Does the wxLua applications should be compiled ?</description>
!         </option>    
  
      </if>
  
      <if cond="TARGETING_IDE=='1'">
!     
!         <!-- IDEs are less flexible; we have to set these as variables with the default 
               values -->
          <set var="USE_UTIL">$(USE_UTIL_DEFAULT)</set>
--- 49,69 ----
      <!-- options not tied to a specific module -->
      <if cond="TARGETING_IDE=='0'">
! 
          <option name="USE_UTIL">
              <values>0,1</values>
              <default-value>$(USE_UTIL_DEFAULT)</default-value>
              <description>Does the wxLua utilities should be compiled ?</description>
!         </option>
          <option name="USE_APPS">
              <values>0,1</values>
              <default-value>$(USE_APPS_DEFAULT)</default-value>
!             <description>Should the wxLua applications be compiled ?</description>
!         </option>
  
      </if>
  
      <if cond="TARGETING_IDE=='1'">
! 
!         <!-- IDEs are less flexible; we have to set these as variables with the default
               values -->
          <set var="USE_UTIL">$(USE_UTIL_DEFAULT)</set>
***************
*** 75,91 ****
          <set var="dummy2"><if cond="WX_VERSION=='dummy'">AAA</if></set>
          <set var="dummy3"><if cond="WX_SHARED=='dummy'">AAA</if></set>
!         <set var="dummy4"><if cond="USE_WXLUASOCKET=='dummy'">AAA</if></set>
!         <set var="dummy5"><if cond="USE_WXLUADEBUG=='dummy'">AAA</if></set>
          <set var="dummy6"><if cond="USE_BIN2C=='dummy'">AAA</if></set>
      </if>
  
  
  
-     <!--                                                            -->
-     <!--                         The utils                          -->
-     <!--                                                            -->
-     
      <subproject id="utils" cond="USE_UTIL=='1'">
!         <dependency-of>all</dependency-of>	
          <dir>$(WXLUA_BASEDIR)$(DIRSEP)util$(DIRSEP)$(SUBPROJECT_POSTFIX_PATH)</dir>
          <target/>
--- 78,95 ----
          <set var="dummy2"><if cond="WX_VERSION=='dummy'">AAA</if></set>
          <set var="dummy3"><if cond="WX_SHARED=='dummy'">AAA</if></set>
!         <set var="dummy4"><if cond="USE_WXLUASOCKETLIB=='dummy'">AAA</if></set>
!         <set var="dummy5"><if cond="USE_WXLUADEBUGLIB=='dummy'">AAA</if></set>
          <set var="dummy6"><if cond="USE_BIN2C=='dummy'">AAA</if></set>
+         <set var="dummy7"><if cond="USE_WXLUAAPP=='dummy'">AAA</if></set>
+         <set var="dummy8"><if cond="USE_WXLUAEDITAPP=='dummy'">AAA</if></set>
      </if>
  
  
+     <!-- ================================================================== -->
+     <!--                         The utils                                  -->
+     <!-- ================================================================== -->
  
      <subproject id="utils" cond="USE_UTIL=='1'">
!         <dependency-of>all</dependency-of>
          <dir>$(WXLUA_BASEDIR)$(DIRSEP)util$(DIRSEP)$(SUBPROJECT_POSTFIX_PATH)</dir>
          <target/>
***************
*** 93,104 ****
  
  
  
- 
-     <!--                                                            -->
-     <!--                The modules libraries & samples             -->
-     <!--                                                            -->
- 	    
      <subproject id="modules">
!         <dependency-of>all</dependency-of>	
          <dir>$(WXLUA_BASEDIR)$(DIRSEP)modules$(DIRSEP)$(SUBPROJECT_POSTFIX_PATH)</dir>
          <target/>
--- 97,106 ----
  
  
+     <!-- ================================================================== -->
+     <!--                The modules libraries & samples                     -->
+     <!-- ================================================================== -->
  
      <subproject id="modules">
!         <dependency-of>all</dependency-of>
          <dir>$(WXLUA_BASEDIR)$(DIRSEP)modules$(DIRSEP)$(SUBPROJECT_POSTFIX_PATH)</dir>
          <target/>
***************
*** 106,117 ****
  
  
  
- 
-     <!--                                                            -->
-     <!--                     The wxLua applications                 -->
-     <!--                                                            -->
- 	    
      <subproject id="apps" cond="USE_APPS=='1'">
!         <dependency-of>all</dependency-of>	
          <dir>$(WXLUA_BASEDIR)$(DIRSEP)apps$(DIRSEP)$(SUBPROJECT_POSTFIX_PATH)</dir>
          <target/>
--- 108,117 ----
  
  
+     <!-- ================================================================== -->
+     <!--                     The wxLua applications                         -->
+     <!-- ================================================================== -->
  
      <subproject id="apps" cond="USE_APPS=='1'">
!         <dependency-of>all</dependency-of>
          <dir>$(WXLUA_BASEDIR)$(DIRSEP)apps$(DIRSEP)$(SUBPROJECT_POSTFIX_PATH)</dir>
          <target/>
***************
*** 119,126 ****
  
  
  
-     <!--                                                            -->
-     <!--                  Miscellaneous utility targets             -->
-     <!--                                                            -->
      <!--
      <action id="docs">
--- 119,126 ----
  
  
+     <!-- ================================================================== -->
+     <!--                  Miscellaneous utility targets                     -->
+     <!-- ================================================================== -->
  
      <!--
      <action id="docs">
***************
*** 132,135 ****
      </action>
      -->
! 	    
  </makefile>
--- 132,135 ----
      </action>
      -->
! 
  </makefile>

[Wxlua-commit] wxLua/util/build/bakefiles options.bkl,1.2,1.3 util.bkl,1.3,1.4

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

Update of /cvsroot/wxlua/wxLua/util/build/bakefiles
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv29076/wxLua/util/build/bakefiles

Modified Files:
	options.bkl util.bkl 
Log Message:
formatting for bakfiles
added USE_WXLUAAPP, USE_WXLUAEDITAPP


Index: options.bkl
===================================================================
RCS file: /cvsroot/wxlua/wxLua/util/build/bakefiles/options.bkl,v
retrieving revision 1.2
retrieving revision 1.3
diff -C2 -d -r1.2 -r1.3
*** options.bkl	14 Jun 2005 21:44:42 -0000	1.2
--- options.bkl	24 Nov 2005 21:34:16 -0000	1.3
***************
*** 5,42 ****
  
  
! <!--                                                                -->
! <!--                WXLUA-UTILITIES OPTIONS BAKEFILE                -->
! <!--                                                                -->
! <makefile>  
  
!     <!--                                                                     -->
!     <!--                The list of wxLua OPTIONS DEFAULTS                   -->
!     <!--                                                                     -->
  
      <set var="USE_BIN2C_DEFAULT">1</set>
-     
-     
  
!     <!--                                                                     -->
!     <!--                        The list of wxArt2d OPTIONS                  -->
!     <!--                                                                     -->
  
      <!-- options not tied to a specific module -->
      <if cond="TARGETING_IDE=='0'">
!         
          <option name="USE_BIN2C">
              <values>0,1</values>
              <default-value>$(USE_BIN2C_DEFAULT)</default-value>
              <description>Does the wxLua utilities should be compiled ?</description>
!         </option>    
  
      </if>
  
      <if cond="TARGETING_IDE=='1'">
!     
!         <!-- IDEs are less flexible; we have to set these as variables with the default 
               values -->
          <set var="USE_BIN2C">$(USE_BIN2C_DEFAULT)</set>
      </if>
!     
  </makefile>
--- 5,42 ----
  
  
! <!-- ====================================================================== -->
! <!--                WXLUA-UTILITIES OPTIONS BAKEFILE                        -->
! <!-- ====================================================================== -->
  
! <makefile>
! 
!     <!-- ================================================================== -->
!     <!--                The list of wxLua OPTIONS DEFAULTS                  -->
!     <!-- ================================================================== -->
  
      <set var="USE_BIN2C_DEFAULT">1</set>
  
! 
!     <!-- ================================================================== -->
!     <!--                        The list of utils OPTIONS                   -->
!     <!-- ================================================================== -->
  
      <!-- options not tied to a specific module -->
      <if cond="TARGETING_IDE=='0'">
! 
          <option name="USE_BIN2C">
              <values>0,1</values>
              <default-value>$(USE_BIN2C_DEFAULT)</default-value>
              <description>Does the wxLua utilities should be compiled ?</description>
!         </option>
  
      </if>
  
      <if cond="TARGETING_IDE=='1'">
! 
!         <!-- IDEs are less flexible; we have to set these as variables with the default
               values -->
          <set var="USE_BIN2C">$(USE_BIN2C_DEFAULT)</set>
      </if>
! 
  </makefile>

Index: util.bkl
===================================================================
RCS file: /cvsroot/wxlua/wxLua/util/build/bakefiles/util.bkl,v
retrieving revision 1.3
retrieving revision 1.4
diff -C2 -d -r1.3 -r1.4
*** util.bkl	20 Jun 2005 09:48:38 -0000	1.3
--- util.bkl	24 Nov 2005 21:34:16 -0000	1.4
***************
*** 5,14 ****
  
  
! <!--                                                                -->
! <!--                    WXLUA-UTILITIES BAKEFILE                    -->
! <!--                                                                -->
  <makefile>
  
!     
      <!-- This is required because it contains the definitions of a lot of utils -->
      <include file="../../../build/bakefiles/wxluabase.bkl"/>
--- 5,15 ----
  
  
! <!-- ====================================================================== -->
! <!--                    WXLUA-UTILITIES BAKEFILE                            -->
! <!-- ====================================================================== -->
! 
  <makefile>
  
! 
      <!-- This is required because it contains the definitions of a lot of utils -->
      <include file="../../../build/bakefiles/wxluabase.bkl"/>
***************
*** 16,24 ****
      <!-- required for copy-files tag -->
      <using module="datafiles"/>
!     
      <!-- our options -->
      <include file="options.bkl"/>
!     
!     
      <!-- our base path -->
      <if cond="TARGETING_WIN32=='1'">
--- 17,32 ----
      <!-- required for copy-files tag -->
      <using module="datafiles"/>
! 
!     <!-- ================================================================== -->
!     <!--                        The list of wxLua util OPTIONS              -->
!     <!-- ================================================================== -->
! 
      <!-- our options -->
      <include file="options.bkl"/>
! 
!     <!-- ================================================================== -->
!     <!--                               VARIABLES                            -->
!     <!-- ================================================================== -->
! 
      <!-- our base path -->
      <if cond="TARGETING_WIN32=='1'">
***************
*** 30,35 ****
      <set var="SRCDIR">$(UTIL_BASEDIR)</set>
      <set var="BUILDDIR">$(FORMAT)</set>
!     
!   
      <!-- our utilities -->
      <exe id="util_bin2c" cond="USE_BIN2C=='1'">
--- 38,46 ----
      <set var="SRCDIR">$(UTIL_BASEDIR)</set>
      <set var="BUILDDIR">$(FORMAT)</set>
! 
!     <!-- ================================================================== -->
!     <!--                        bin2c application target                    -->
!     <!-- ================================================================== -->
! 
      <!-- our utilities -->
      <exe id="util_bin2c" cond="USE_BIN2C=='1'">

[Wxlua-commit] wxLua/apps Makefile.in,1.7,1.8

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

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

Modified Files:
	Makefile.in 
Log Message:
formatting for bakfiles
added USE_WXLUAAPP, USE_WXLUAEDITAPP


Index: Makefile.in
===================================================================
RCS file: /cvsroot/wxlua/wxLua/apps/Makefile.in,v
retrieving revision 1.7
retrieving revision 1.8
diff -C2 -d -r1.7 -r1.8
*** Makefile.in	23 Nov 2005 20:33:14 -0000	1.7
--- Makefile.in	24 Nov 2005 21:34:15 -0000	1.8
***************
*** 30,33 ****
--- 30,38 ----
  	app_wxlua_lconsole.o \
  	$(__app_wxlua___win32rc)
+ APP_WXLUAEDIT_CXXFLAGS = -I../modules $(WX_CXXFLAGS) $(CPPFLAGS) $(CXXFLAGS)
+ APP_WXLUAEDIT_OBJECTS =  \
+ 	app_wxluaedit_wxledit.o \
+ 	app_wxluaedit_wxluaedit.o \
+ 	$(__app_wxluaedit___win32rc)
  
  ### Conditionally set variables: ###
***************
*** 35,45 ****
  @COND_DEPS_TRACKING_1@CXXC = $(top_builddir)./bk-deps $(CXX)
  @COND_DEPS_TRACKING_0@CXXC = $(CXX)
  @COND_PLATFORM_MAC_1@__app_wxlua___mac_setfilecmd = \
  @COND_PLATFORM_MAC_1@	$(SETFILE) -t APPL wxlua$(EXEEXT)
  @COND_PLATFORM_WIN32_1@__app_wxlua___win32rc = app_wxlua_wxlua_rc.o
  
  ### Targets: ###
  
! all: ../bin/wxlua$(EXEEXT)
  
  install: all
--- 40,57 ----
  @COND_DEPS_TRACKING_1@CXXC = $(top_builddir)./bk-deps $(CXX)
  @COND_DEPS_TRACKING_0@CXXC = $(CXX)
+ @COND_USE_WXLUAAPP_1@__app_wxlua___depname = ../bin/wxlua$(EXEEXT)
  @COND_PLATFORM_MAC_1@__app_wxlua___mac_setfilecmd = \
  @COND_PLATFORM_MAC_1@	$(SETFILE) -t APPL wxlua$(EXEEXT)
  @COND_PLATFORM_WIN32_1@__app_wxlua___win32rc = app_wxlua_wxlua_rc.o
+ @COND_USE_WXLUAEDITAPP_1@__app_wxluaedit___depname \
+ @COND_USE_WXLUAEDITAPP_1@	= ../bin/wxluaedit$(EXEEXT)
+ @COND_PLATFORM_MAC_1@__app_wxluaedit___mac_setfilecmd \
+ @COND_PLATFORM_MAC_1@	= $(SETFILE) -t APPL wxluaedit$(EXEEXT)
+ @COND_PLATFORM_WIN32_1@__app_wxluaedit___win32rc = \
+ @COND_PLATFORM_WIN32_1@	app_wxluaedit_wxluaedit_rc.o
  
  ### Targets: ###
  
! all: $(__app_wxlua___depname) $(__app_wxluaedit___depname)
  
  install: all
***************
*** 53,64 ****
  	rm -f ./*.o
  	rm -f ../bin/wxlua$(EXEEXT)
  
  distclean: clean
  	rm -f config.cache config.log config.status bk-deps bk-make-pch shared-ld-sh Makefile
  
! ../bin/wxlua$(EXEEXT): $(APP_WXLUA_OBJECTS) $(__app_wxlua___win32rc)
! 	$(CXX) -o $@ $(APP_WXLUA_OBJECTS) $(LDFLAGS) -L../lib  -lwxluadebug -lwxluasocket -lwxlua -lwxbind -llua $(WX_LIBS)
! 	
! 	$(__app_wxlua___mac_setfilecmd)
  
  app_wxlua_wxlua.o: ./wxlua/src/wxlua.cpp
--- 65,82 ----
  	rm -f ./*.o
  	rm -f ../bin/wxlua$(EXEEXT)
+ 	rm -f ../bin/wxluaedit$(EXEEXT)
  
  distclean: clean
  	rm -f config.cache config.log config.status bk-deps bk-make-pch shared-ld-sh Makefile
  
! @COND_USE_WXLUAAPP_1@../bin/wxlua$(EXEEXT): $(APP_WXLUA_OBJECTS) $(__app_wxlua___win32rc)
! @COND_USE_WXLUAAPP_1@	$(CXX) -o $@ $(APP_WXLUA_OBJECTS) $(LDFLAGS) -L../lib  $(WX_LIBS) -lwxluadebug -lwxluasocket -lwxlua -lwxbind -llua
! @COND_USE_WXLUAAPP_1@	
! @COND_USE_WXLUAAPP_1@	$(__app_wxlua___mac_setfilecmd)
! 
! @COND_USE_WXLUAEDITAPP_1@../bin/wxluaedit$(EXEEXT): $(APP_WXLUAEDIT_OBJECTS) $(__app_wxluaedit___win32rc)
! @COND_USE_WXLUAEDITAPP_1@	$(CXX) -o $@ $(APP_WXLUAEDIT_OBJECTS) $(LDFLAGS) -L../lib  $(WX_LIBS) -lwxluadebug -lwxluasocket -lwxlua -lwxbind -llua
! @COND_USE_WXLUAEDITAPP_1@	
! @COND_USE_WXLUAEDITAPP_1@	$(__app_wxluaedit___mac_setfilecmd)
  
  app_wxlua_wxlua.o: ./wxlua/src/wxlua.cpp
***************
*** 71,74 ****
--- 89,101 ----
  	$(RESCOMP) -i$< -o$@ --include-dir ../modules
  
+ app_wxluaedit_wxledit.o: ./wxluaedit/src/wxledit.cpp
+ 	$(CXXC) -c -o $@ $(APP_WXLUAEDIT_CXXFLAGS) ./wxluaedit/src/wxledit.cpp
+ 
+ app_wxluaedit_wxluaedit.o: ./wxluaedit/src/wxluaedit.cpp
+ 	$(CXXC) -c -o $@ $(APP_WXLUAEDIT_CXXFLAGS) ./wxluaedit/src/wxluaedit.cpp
+ 
+ app_wxluaedit_wxluaedit_rc.o: ./wxlua/src/wxluaedit.rc
+ 	$(RESCOMP) -i$< -o$@ --include-dir ../modules
+ 
  
  # Include dependency info, if present: