wxlua-commit — CVS commits of wxLua

[Wxlua-commit] wxLua/modules/wxluasocket/include wxldbgio.h,NONE,1.1 wxldserv.h,NONE,1.1 wxldtarg.h,NONE,1.1 wxlsock.h,NONE,1.1 debugio.h,1.3,NONE dserver.h,1.3,NONE dtarget.h,1.4,NONE socket.h,1.3,NONE

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

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

Added Files:
	wxldbgio.h wxldserv.h wxldtarg.h wxlsock.h 
Removed Files:
	debugio.h dserver.h dtarget.h socket.h 
Log Message:
rename wxluasocket files to wxl* for consistency and make it easier to find them


--- NEW FILE: wxldserv.h ---
/////////////////////////////////////////////////////////////////////////////
// Purpose:     Implements the debugger end of wxLua debugging session
// Author:      J. Winwood
// Created:     May 2002
// Copyright:   (c) 2002 Lomtick Software. All rights reserved.
// Licence:     wxWidgets licence
/////////////////////////////////////////////////////////////////////////////

#ifndef WX_LUA_DEBUG_SERVER_H
#define WX_LUA_DEBUG_SERVER_H

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

#include "wx/process.h"
#include "wxlua/include/wxldefs.h"
#include "wxluadebug/include/debug.h"
#include "wxluasocket/include/wxlsock.h"
#include "wxluasocket/include/wxldbgio.h"

class WXDLLIMPEXP_WXLUA wxLuaDebugServer;
class WXDLLIMPEXP_WXLUA wxLuaDebugEvent;
class WXDLLIMPEXP_WXLUA wxLuaStackFrame;

WXDLLIMPEXP_DATA_WXLUA(extern wxString) g_strProgramName;
WXDLLIMPEXP_DATA_WXLUA(extern wxString) g_strNetworkName;

// ----------------------------------------------------------------------------
// wxLuaThread
// ----------------------------------------------------------------------------

class WXDLLIMPEXP_WXLUA wxLuaThread : public wxThread
{
public:
    wxLuaThread(wxLuaDebugServer *pServer) : wxThread(wxTHREAD_JOINABLE)
    {
        m_pServer = pServer;
    }

protected:
    // thread execution starts here
    virtual void *Entry();

    // called when the thread exits
    virtual void OnExit();

private:
    wxLuaDebugServer *m_pServer;
};

// ----------------------------------------------------------------------------
// wxLuaDebugServer
// ----------------------------------------------------------------------------

class WXDLLIMPEXP_WXLUA wxLuaDebugServer : public wxLuaDebuggerBase, public wxLuaDebugIO
{
public:

    wxLuaDebugServer(int portNumber);
    virtual ~wxLuaDebugServer();

    bool StartServer();
    bool StopServer();
    bool StartClient();
    bool StartServerThread();
    bool WaitForConnect(int timeOut);

    bool AddBreakPoint(const wxString &fileName, int lineNumber);
    bool RemoveBreakPoint(const wxString &fileName, int lineNumber);
    bool ClearAllBreakPoints();
    bool Run(const wxString &fileName, const wxString &buffer);
    bool Step();
    bool StepOver();
    bool StepOut();
    bool Continue();
    bool Break();
    bool Reset();
    bool EnumerateStack();
    bool EnumerateStackEntry(int stackEntry);
    bool EnumerateTable(int tableRef, int nIndex, int nItemNode);
    bool CleanupDebugReferences();
    void ThreadFunction();
#if wxCHECK_VERSION(2, 3, 0)
    bool DisplayStackDialog(wxWindow *pParent);
#endif
    bool EvaluateExpr(int exprRef, const wxString &pExpression);

    static bool Compile(const wxString &fileName, const wxString &buffer);

protected:
    wxLuaSocket    *m_serverSocket;
    wxLuaSocket    *m_acceptedSocket;
    int             m_processID;
    int             m_portNumber;
    wxProcess      *m_pProcess;
    wxLuaThread    *m_pThread;
    wxLuaStackFrame  *m_pStackFrameDialog;
    bool            m_fShutdown;

private:
    static void NotifyError(const wxString &msg);
    static int LuaCompileError (lua_State *L);
    DECLARE_CLASS(wxLuaDebugServer)
};

#endif // WX_LUA_DEBUG_SERVER_H

--- NEW FILE: wxldbgio.h ---
/////////////////////////////////////////////////////////////////////////////
// Purpose:     Implements the debugger end of wxLua debugging session
// Author:      J. Winwood
// Created:     April 2002
// Copyright:   (c) 2002 Lomtick Software. All rights reserved.
// Licence:     wxWidgets licence
/////////////////////////////////////////////////////////////////////////////

#ifndef WX_LUA_DEBUG_IO_H
#define WX_LUA_DEBUG_IO_H

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

#include "wxlua/include/wxldefs.h"

class WXDLLIMPEXP_WXLUA wxLuaDebugData;
class WXDLLIMPEXP_WXLUA wxLuaSocket;

// ----------------------------------------------------------------------------
// wxLuaDebugIO
// ----------------------------------------------------------------------------

class WXDLLIMPEXP_WXLUA wxLuaDebugIO
{
protected:

    unsigned char   ReadByte(wxLuaSocket *);
    short           ReadWord(wxLuaSocket *);
    unsigned short  ReadUWord(wxLuaSocket *);
    int             ReadInt(wxLuaSocket *);
    unsigned int    ReadUInt(wxLuaSocket *);
    long            ReadLong(wxLuaSocket *);
    unsigned long   ReadULong(wxLuaSocket *);
    wxString        ReadString(wxLuaSocket *);
    wxLuaDebugData *ReadDebugData(wxLuaSocket *);

    bool WriteByte(wxLuaSocket *,   unsigned char value);
    bool WriteWord(wxLuaSocket *,   short value);
    bool WriteUWord(wxLuaSocket *,  unsigned short value);
    bool WriteInt(wxLuaSocket *,    int value);
    bool WriteUInt(wxLuaSocket *,   unsigned int value);
    bool WriteLong(wxLuaSocket *,   long value);
    bool WriteULong(wxLuaSocket *,  unsigned long value);
    bool WriteString(wxLuaSocket *, const wxString &value);
    bool WriteDebugData(wxLuaSocket *, const wxLuaDebugData *pData);
};

#endif // WX_LUA_DEBUG_IO_H

--- debugio.h DELETED ---

--- dtarget.h DELETED ---

--- dserver.h DELETED ---

--- NEW FILE: wxlsock.h ---
/////////////////////////////////////////////////////////////////////////////
// Name:            wxLuaSocket.h
// Purpose:         wxLua Socket interfaces
// Author:          J. Winwood
// Created:         March 2002
// Copyright:       (c) 2002 Lomtick Software. All rights reserved.
// Licence:         wxWidgets licence.
/////////////////////////////////////////////////////////////////////////////

#ifndef WX_LUA_SOCKET_H_
#define WX_LUA_SOCKET_H_

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

#include "wxlua/include/wxldefs.h"

#ifdef WIN32
    typedef int socklen_t;
    #include <winsock.h>
#else
    #include <unistd.h>
    #include <sys/types.h>
    #include <sys/socket.h>
    #include <netinet/in.h>
    #include <cerrno>
    #include <netdb.h>
    #include <arpa/inet.h>
    #define INVALID_SOCKET -1
    #define SOCKET_ERROR   -1
#endif // !WIN32

#ifndef SD_RECEIVE
    #define SD_RECEIVE      0
    #define SD_SEND         1
    #define SD_BOTH         2
#endif // SD_RECEIVE

// ----------------------------------------------------------------------------
// wxLuaSocket
// ----------------------------------------------------------------------------

class WXDLLIMPEXP_WXLUA wxLuaSocket
{
#ifdef WIN32
    typedef SOCKET socket_type;
#else
    typedef int socket_type;
#endif

    // proxy class for accept
    class wxLuaAcceptedSocket
    {
        public:
            // constructor
            wxLuaAcceptedSocket(socket_type socket, sockaddr_in address);

            wxLuaAcceptedSocket(const wxLuaAcceptedSocket &);
            wxLuaAcceptedSocket& operator=(const wxLuaAcceptedSocket &);

        private:
            socket_type m_sock;
            sockaddr_in m_addr;

            friend class wxLuaSocket;
    };

public:

    enum SocketState
    {
        SOCKET_CLOSED,
        SOCKET_LISTENING,
        SOCKET_ACCEPTING,
        SOCKET_ACCEPTED,
        SOCKET_CONNECTED,
        SOCKET_WRITE_BLOCKED
    };

    // constructors
    wxLuaSocket();
    wxLuaSocket(const wxLuaAcceptedSocket &acceptedSocket);

    // destructor
    ~wxLuaSocket();

    // server: bind and listen for client connections
    void Listen(u_short port, int backLog = 100);

    // server: accept a connection from a client
    wxLuaAcceptedSocket Accept();

    // client: connect a client to a server
    void Connect(const wxString &address, u_short port);

    // Get the socket state
    SocketState GetState() const
    {
        return m_sockstate;
    }

    // Get the socket handle
    int GetSocket() const
    {
        return m_sock;
    }

    // Test if the socket is readable
    bool IsReadable () const
    {
        return (m_sockstate == SOCKET_CONNECTED ||
                m_sockstate == SOCKET_ACCEPTING);
    }

    // Test if the socket is writeable
    bool IsWritable () const
    {
        return (m_sockstate != SOCKET_CONNECTED ||
                m_sockstate == SOCKET_WRITE_BLOCKED);
    }

    // Get the address of the socket
    wxString GetAddress() const;
    // Get the port number of the socket
    int         GetPort() const;

    // Read the whole buffer of size length into buffer buffer from the socket
    int         Read(char *buffer, int length);

    // Write the whole buffer of size length to the socket
    void        Write(const char *buffer, int length);

    // Shutdown the socket
    void        Shutdown(int how);
    // Close the socket
    void        Close();

private:
    // Prevent copying and assignment of this class
    wxLuaSocket(const wxLuaSocket&);
    wxLuaSocket& operator=(const wxLuaSocket&);

    socket_type  m_sock;
    sockaddr_in  m_sockaddress;
    SocketState  m_sockstate;
};

// ----------------------------------------------------------------------------
// wxLuaSocketException
// ----------------------------------------------------------------------------

class WXDLLIMPEXP_WXLUA wxLuaSocketException
{
public:
    enum SocketErrorCode
    {
        SOCKET_NOT_CLOSED,
        SOCKET_NOT_CONNECTED,
        SOCKET_NOT_LISTENING,
        SOCKET_INVALID_SOCKET,
        SOCKET_ADDRESS_NOT_RESOLVED,
        SOCKET_INCOMPATIBLE_TYPE,
        SOCKET_SET_BLOCKING_FAILED,
        SOCKET_ACCEPT_FAILED,
        SOCKET_CONNECT_FAILED,
        SOCKET_BIND_FAILED,
        SOCKET_LISTEN_FAILED,
        SOCKET_SEND_FAILED,
        SOCKET_RECEIVE_FAILED,
        SOCKET_CLOSE_FAILED
    };

    // constructors
    wxLuaSocketException(SocketErrorCode code) : m_code(code)
    {
#ifdef WIN32
        m_errnum = ::WSAGetLastError();
        switch(m_errnum)
        {
        case WSANOTINITIALISED:
            m_description = _("A successful WSAStartup must occur before using this function.");
            break;

        case WSAENETDOWN:
            m_description = _("The network subsystem or the associated service provider has failed.");
            break;

        case WSAEAFNOSUPPORT:
            m_description = _("The specified address family is not supported.");
            break;

        case WSAEINPROGRESS:
            m_description = _("A blocking Windows Sockets 1.1 call is in progress, or the service provider is still processing a callback function.");
            break;

        case WSAEMFILE:
            m_description = _("No more socket descriptors are available.");
            break;

        case WSAENOBUFS:
            m_description = _("No buffer space is available. The socket cannot be created.");
            break;

        case WSAEPROTONOSUPPORT:
            m_description = _("The specified protocol is not supported.");
            break;

        case WSAEPROTOTYPE:
            m_description = _("The specified protocol is the wrong type for this socket.");
            break;

        case WSAESOCKTNOSUPPORT:
            m_description = _("The specified socket type is not supported in this address family.");
            break;
        }
#else
        m_errnum = errno;
#endif
        if (m_description.IsEmpty())
            m_description = _("Socket Error");
    }

    wxLuaSocketException(const wxLuaSocketException &e)
        : m_code(e.m_code), m_errnum(e.m_errnum)
    {
    }

    SocketErrorCode GetCode() const
    {
        return m_code;
    }

    int errnum() const
    {
        return m_errnum;
    }

    const wxString& description() { return m_description; }

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

    SocketErrorCode m_code;
    int             m_errnum;
    wxString        m_description;
};

#endif // WX_LUA_SOCKET_H_

--- NEW FILE: wxldtarg.h ---
/////////////////////////////////////////////////////////////////////////////
// Purpose:     Implements the client end of wxLua debugging session
// Author:      J. Winwood
// Created:     May 2002
// RCS-ID:      $Id: wxldtarg.h,v 1.1 2005/11/25 19:22:58 jrl1 Exp $
// Copyright:   (c) 2002 Lomtick Software. All rights reserved.
// Licence:     wxWindows licence
/////////////////////////////////////////////////////////////////////////////

#ifndef LUA_DEBUG_TARGET_H
#define LUA_DEBUG_TARGET_H

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

#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 "wxluadebug/include/staktree.h"
#include "wxluasocket/include/wxldbgio.h"
#include "wxluasocket/include/wxlsock.h"

// ----------------------------------------------------------------------------
// LuaDebugTarget - Handles Debugger/Debuggee IO
// ----------------------------------------------------------------------------

class LuaDebugTarget : public wxObject, public wxLuaDebugIO
{
private:
    class LuaThread : public wxThread
    {
    public:
        LuaThread(LuaDebugTarget *pTarget) : wxThread(wxTHREAD_JOINABLE),
                                             m_pTarget(pTarget) {}

        bool TestDestroy();

    protected:
        // thread execution starts here
        virtual void *Entry();

        // called when the thread exits
        virtual void OnExit();

    private:
        LuaDebugTarget *m_pTarget;
    };

    class BreakPointObject : public wxObject
    {
        public:
            BreakPointObject(const wxString &fileName,
                             int             lineNumber)
                    : m_fileName(fileName), m_lineNumber(lineNumber) {}

            const wxString &GetFileName() const { return m_fileName; }
            int  GetLineNumber() const { return m_lineNumber; }

        private:
            wxString m_fileName;
            int      m_lineNumber;
    };

public:

    LuaDebugTarget(lua_State      *state,
                   const wxString &serverName,
                   int             portNumber);
    ~LuaDebugTarget();

    bool Run();
    void Stop();

    void ThreadFunction();
    void DisplayError(const wxString &strError);

protected:

    enum debugOperations
    {
        DEBUG_STEP,
        DEBUG_STEPOVER,
        DEBUG_STEPOUT,
        DEBUG_GO
    };

    lua_State          *m_luaState;
    int                 m_portNumber;
    wxString            m_serverName;
    wxSortedArrayString m_breakPointList;
#if wxCHECK_VERSION(2, 3, 3)
    wxMutex             m_debugMutex;
#endif
    wxCondition         m_debugCondition;
    wxLuaSocket         m_clientSocket;
    debugOperations     m_nextOperation;
    bool                m_forceBreak;
    bool                m_resetRequested;
    bool                m_fConnected;
    bool                m_fRunning;
    bool                m_fStopped;
    bool                m_fErrorsSeen;
    int                 m_nFramesUntilBreak;
#if wxCHECK_VERSION(2, 3, 3)
    wxMutex             m_runMutex;
#endif
    wxCondition         m_runCondition;
    wxLuaBufferArray    m_bufferList;
    LuaThread          *m_pThread;
    wxArrayInt          m_references;

    void ExitThread();

    mutable wxCriticalSection m_breakPointListCriticalSection;

    bool AddBreakPoint(const wxString &fileName, int lineNumber);
    bool RemoveBreakPoint(const wxString &fileName, int lineNumber);
    bool ClearAllBreakPoints();
    bool Run(const wxString &fileName, const wxString &buffer);
    bool Step();
    bool StepOver();
    bool StepOut();
    bool Continue();
    bool Break();
    bool Reset();
    bool EnumerateStack();
    bool EnumerateStackEntry(int stackRef);
    bool EnumerateTable(int tableRef, int nIndex, int itemNode);
    bool EvaluateExpr(int exprRef, const wxString &strExpr);

    bool NotifyBreak(const wxString &fileName, int lineNumber);
    bool NotifyPrint(const wxString &errorMsg);
    bool NotifyError(const wxString &errorMsg);
    bool NotifyExit();
    bool NotifyStackEnumeration(wxLuaDebugData *pDebugData);
    bool NotifyStackEntryEnumeration(int stackRef, wxLuaDebugData *pDebugData);
    bool NotifyTableEnumeration(int itemNode, wxLuaDebugData *pDebugData);
    bool NotifyEvaluateExpr(int exprRef, const wxString &strResult);

    bool DebugHook(int event);

private:
    bool WaitForConnect() const;
    bool AtBreakPoint(const wxString &fileName, int lineNumber) const;
    wxString GetTableInfo(int index);
    wxString GetUserDataInfo(int index, bool full = true);
    wxString MakeBoolean(int num);
    wxString MakeNumber(double dnum);
    wxString GetDebugInfo(int &lineNumber) const;

    static void LUACALL LuaDebugHook(lua_State *state, lua_Debug *debug);
    static int  LUACALL LuaPrint (lua_State *L);
};

#endif // LUA_DEBUG_TARGET_H

--- socket.h DELETED ---

[Wxlua-commit] wxLua/modules/wxluasocket/src wxldbgio.cpp,NONE,1.1 wxldserv.cpp,NONE,1.1 wxldtarg.cpp,NONE,1.1 wxlsock.cpp,NONE,1.1 Makefile,1.3,1.4 debugio.cpp,1.3,NONE dserver.cpp,1.6,NONE dtarget.cpp,1.6,NONE socket.cpp,1.2,NONE

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

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

Modified Files:
	Makefile 
Added Files:
	wxldbgio.cpp wxldserv.cpp wxldtarg.cpp wxlsock.cpp 
Removed Files:
	debugio.cpp dserver.cpp dtarget.cpp socket.cpp 
Log Message:
rename wxluasocket files to wxl* for consistency and make it easier to find them


--- NEW FILE: wxldbgio.cpp ---
/////////////////////////////////////////////////////////////////////////////
// Name:        wxLuaDebugIO.cpp
// Purpose:     Debugging I/O functions for wxLua
// Author:      J. Winwood
// Created:     May 2002
// Copyright:   (c) 2002 Lomtick Software. All rights reserved.
// Licence:     wxWidgets licence
/////////////////////////////////////////////////////////////////////////////

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

#include "wx/wxprec.h"

#ifdef __BORLANDC__
    #pragma hdrstop
#endif

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

#include "wxluasocket/include/wxldbgio.h"
#include "wxluasocket/include/wxlsock.h"
#include "wxlua/include/internal.h"
#include "wxluadebug/include/debug.h"

// ----------------------------------------------------------------------------
// wxLuaDebugIO
// ----------------------------------------------------------------------------

unsigned char  wxLuaDebugIO::ReadByte(wxLuaSocket *pSocket)
{
    unsigned char value = 0;
    pSocket->Read((char *) &value, sizeof(value));
    return value;
}

short wxLuaDebugIO::ReadWord(wxLuaSocket *pSocket)
{
    short value = 0;
    pSocket->Read((char *)&value, sizeof(value));
    return value;
}

unsigned short wxLuaDebugIO::ReadUWord(wxLuaSocket *pSocket)
{
    unsigned short value = 0;
    pSocket->Read((char *)&value, sizeof(value));
    return value;
}

int wxLuaDebugIO::ReadInt(wxLuaSocket *pSocket)
{
    int value = 0;
    pSocket->Read((char *) &value, sizeof(value));
    return value;
}

unsigned int wxLuaDebugIO::ReadUInt(wxLuaSocket *pSocket)
{
    unsigned int value = 0;
    pSocket->Read((char *) &value, sizeof(value));
    return value;
}

long wxLuaDebugIO::ReadLong(wxLuaSocket *pSocket)
{
    long value = 0;
    pSocket->Read((char *) &value, sizeof(value));
    return value;
}

unsigned long wxLuaDebugIO::ReadULong(wxLuaSocket *pSocket)
{
    unsigned long value = 0;
    pSocket->Read((char *) &value, sizeof(value));
    return value;
}

wxString wxLuaDebugIO::ReadString(wxLuaSocket *pSocket)
{
    wxString value;
    unsigned int length = ReadInt(pSocket);
    if (length > 0)
    {
        char *buffer = new char[length + 1];
        memset(buffer, 0, length+1);
        pSocket->Read(buffer, length);
        buffer[length] = 0;
        value = lua2wx(buffer);
        delete[] buffer;
    }
    return value;
}

wxLuaDebugData *wxLuaDebugIO::ReadDebugData(wxLuaSocket *pSocket)
{
    wxLuaDebugData *pSortedList = new wxLuaDebugData();

    try
    {
        size_t idx, idxMax;
        pSocket->Read((char *) &idxMax, sizeof(idxMax));

        for (idx = 0; idx < idxMax; ++idx)
        {
            int bufferLength;
            pSocket->Read((char *) &bufferLength, sizeof(bufferLength));
            if (bufferLength > 0)
            {
                char *pBuffer = new char[bufferLength];
                char *pMemory = pBuffer;
                pSocket->Read(pMemory, bufferLength);
                int nReference = *(int *) pMemory;
                pMemory += sizeof(int);
                int nIndex = *(int *) pMemory;
                pMemory += sizeof(int);
                bool fExpanded = (0 != *pMemory++);

                const char *pNamePtr = pMemory;
                pMemory += strlen(pNamePtr) + 1;
                const char *pTypePtr = pMemory;
                pMemory += strlen(pTypePtr) + 1;
                const char *pValuePtr = pMemory;

                wxLuaDebugDataItem *pItem = new wxLuaDebugDataItem(lua2wx(pNamePtr),
                                                 lua2wx(pTypePtr),
                                                 lua2wx(pValuePtr),
                                                 wxEmptyString, // FIXME! What goes here!?
                                                 nReference,
                                                 nIndex,
                                                 fExpanded);
                pSortedList->Add(pItem);

                delete[] pBuffer;
            }
        }
    }
    catch(wxLuaSocketException & /*e*/)
    {
        delete pSortedList;
        pSortedList = NULL;
    }

    return pSortedList;
}

bool wxLuaDebugIO::WriteByte(wxLuaSocket *pSocket, unsigned char value)
{
    bool result = false;
    try
    {
        pSocket->Write((const char *) &value, sizeof(value));
        result = true;
    }
    catch(wxLuaSocketException & /*e*/)
    {
    }
    return result;
}

bool wxLuaDebugIO::WriteWord(wxLuaSocket *pSocket, short value)
{
    bool result = false;
    try
    {
        pSocket->Write((const char *) &value, sizeof(value));
        result = true;
    }
    catch(wxLuaSocketException & /*e*/)
    {
    }
    return result;
}

bool wxLuaDebugIO::WriteUWord(wxLuaSocket *pSocket, unsigned short value)
{
    bool result = false;
    try
    {
        pSocket->Write((const char *) &value, sizeof(value));
        result = true;
    }
    catch(wxLuaSocketException & /*e*/)
    {
    }
    return result;
}

bool wxLuaDebugIO::WriteInt(wxLuaSocket *pSocket, int value)
{
    bool result = false;
    try
    {
        pSocket->Write((const char *) &value, sizeof(value));
        result = true;
    }
    catch(wxLuaSocketException & /*e*/)
    {
    }
    return result;
}

bool wxLuaDebugIO::WriteUInt(wxLuaSocket *pSocket, unsigned int value)
{
    bool result = false;
    try
    {
        pSocket->Write((const char *) &value, sizeof(value));
        result = true;
    }
    catch(wxLuaSocketException & /*e*/)
    {
    }
    return result;
}

bool wxLuaDebugIO::WriteLong(wxLuaSocket *pSocket, long value)
{
    bool result = false;
    try
    {
        pSocket->Write((const char *) &value, sizeof(value));
        result = true;
    }
    catch(wxLuaSocketException & /*e*/)
    {
    }
    return result;
}

bool wxLuaDebugIO::WriteULong(wxLuaSocket *pSocket, unsigned long value)
{
    bool result = false;
    try
    {
        pSocket->Write((const char *) &value, sizeof(value));
        result = true;
    }
    catch(wxLuaSocketException & /*e*/)
    {
    }
    return result;
}

bool wxLuaDebugIO::WriteString(wxLuaSocket *pSocket, const wxString &value)
{
    bool result = FALSE;
    try
    {
        LuaCharBuffer buf(value);
        int buflen = buf.Length();
        pSocket->Write((const char *) &buflen, sizeof(buflen));
        if (buflen > 0)
        {
            pSocket->Write(buf.GetData(), buflen);
        }
        result = TRUE;
    }
    catch(wxLuaSocketException & /*e*/)
    {
    }
    return result;
}

bool wxLuaDebugIO::WriteDebugData(wxLuaSocket *pSocket, const wxLuaDebugData *pSortedList)
{
    bool result = false;
    size_t idx, idxMax = pSortedList->Count();

    pSocket->Write((const char *) &idxMax, sizeof(idxMax));

    for (idx = 0; idx < idxMax; ++idx)
    {
        try
        {
            const wxLuaDebugDataItem *item = pSortedList->Item(idx);

            int nameLength = item->GetName().Length() + 1;
            int typeLength = item->GetType().Length() + 1;
            int valueLength = item->GetValue().Length() + 1;

            int bufferLength = (2 * sizeof(int)) +
                                sizeof(unsigned char) +
                                nameLength +
                                typeLength +
                                valueLength;

            unsigned char *pBuffer = new unsigned char[bufferLength];
            unsigned char *pMemory = pBuffer;

            pSocket->Write((const char *) &bufferLength, sizeof(bufferLength));

            *(int *) pMemory = item->GetReference();
            pMemory += sizeof(int);

            *(int *) pMemory = item->GetIndex();
            pMemory += sizeof(int);

            *pMemory++ = item->IsExpanded();

            memcpy(pMemory, wx2lua(item->GetName()), nameLength);
            pMemory += nameLength;

            memcpy(pMemory, wx2lua(item->GetType()), typeLength);
            pMemory += typeLength;

            memcpy(pMemory, wx2lua(item->GetValue()), valueLength);

            pSocket->Write((const char *) pBuffer, bufferLength);

            delete[] pBuffer;
            result = true;
        }
        catch(wxLuaSocketException & /*e*/)
        {
        }

        if (result == false)
            break;
    }
    return result;
}

--- debugio.cpp DELETED ---

--- socket.cpp DELETED ---

--- NEW FILE: wxldserv.cpp ---
/////////////////////////////////////////////////////////////////////////////
// Name:        wxLuaDebugServer.cpp
// Purpose:     Provide remote debugging support for wxLua.
// Author:      J. Winwood
// Created:     May 2002.
// Copyright:   (c) 2002 Lomtick Software. All rights reserved.
// Licence:     wxWidgets licence
/////////////////////////////////////////////////////////////////////////////

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

#include "wx/wxprec.h"

#ifdef __BORLANDC__
    #pragma hdrstop
#endif

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

#include "wx/thread.h"
#include "wxluasocket/include/wxldserv.h"
#include "wxlua/include/internal.h"
#include "wxluasocket/include/wxlhandl.h"

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

#if !wxCHECK_VERSION(2, 6, 0)
    #define wxMilliSleep wxUsleep
#endif // !wxCHECK_VERSION(2, 6, 0)

wxString g_strProgramName;
wxString g_strNetworkName;

// ----------------------------------------------------------------------------
// wxLuaDebugServer
// ----------------------------------------------------------------------------
IMPLEMENT_CLASS(wxLuaDebugServer, wxLuaDebuggerBase)

wxLuaDebugServer::wxLuaDebugServer(int portNumber) :
    m_serverSocket(NULL),
    m_acceptedSocket(NULL),
    m_processID(-1),
    m_portNumber(portNumber),
    m_pProcess(NULL),
    m_pThread(NULL),
    m_pStackFrameDialog(NULL),
    m_fShutdown(false)
{
    StartServer();
}

bool wxLuaDebugServer::StartServer()
{
    m_serverSocket = new wxLuaSocket;
    if (m_serverSocket != NULL)
    {
        try
        {
            // listen on the specified port
            m_serverSocket->Listen(m_portNumber);
        }
        catch(wxLuaSocketException & e)
        {

            NotifyError(wxString::Format(_("Error while opening listening socket. %s"), e.description().c_str()));
            m_fShutdown = true;
        }
    }

    return (m_serverSocket != NULL);
}

bool wxLuaDebugServer::StartClient()
{
    if ((m_pProcess == NULL) && StartServerThread())
    {
        m_pProcess = new wxProcess();
        wxString command = wxString::Format(wxT("%s -d%s:%u"),
                                            g_strProgramName.c_str(),
#ifdef  __WXMSW__
                                            g_strNetworkName.c_str(),
#else
                                            wxT("localhost"),
#endif
                                            m_portNumber);
        m_processID = wxExecute(command, FALSE, m_pProcess);
        return (m_processID != -1);
    }
    return false;
}

bool wxLuaDebugServer::StartServerThread()
{
    if (!m_fShutdown)
    {
        m_pThread = new wxLuaThread(this);

        return ((m_pThread != NULL)                        &&
                (m_pThread->Create() == wxTHREAD_NO_ERROR) &&
                (m_pThread->Run()    == wxTHREAD_NO_ERROR));
    }
    return false;
}

bool wxLuaDebugServer::StopServer()
{
    // Set the shutdown flag
    m_fShutdown = true;

    // close the session socket
    if (m_acceptedSocket != NULL)
    {
        try
        {
            m_acceptedSocket->Shutdown(SD_BOTH);
        }
        catch(wxLuaSocketException & /*e*/)
        {
            NotifyError(_("Error while shutting down session socket"));
        }

        wxMilliSleep(100);

        wxLuaSocket *acceptedSocket = m_acceptedSocket;
        m_acceptedSocket = NULL;
        delete acceptedSocket;
    }

    // close the server socket
    if (m_serverSocket != NULL)
    {
        // close the server socket by connecting
        // to the socket, thus completing the
        // 'accept'. If a client has not connected,
        // this code will satisfy the accept
        // the m_fShutdown flag will be set
        // so the thread will not loop and instead
        // will just destroy the session socket
        // object and return.
        try
        {
            wxLuaSocket closeSocket;
#ifdef  __WXMSW__
            closeSocket.Connect(g_strNetworkName,
                                m_portNumber);
#else
            closeSocket.Connect(wxT("localhost"),
                                m_portNumber);
#endif
            closeSocket.Shutdown(SD_BOTH);

            wxMilliSleep(100);

            wxLuaSocket *serverSocket = m_serverSocket;
            m_serverSocket = NULL;
            delete serverSocket;
        }
        catch(wxLuaSocketException & /*e*/)
        {
            NotifyError(_("Error while shutting down server socket"));
        }
    }

    // One of the above two operations
    // terminates the thread.
    // Wait for it to stop.
    if (m_pThread != NULL)
        m_pThread->Wait();

    return true;
}

wxLuaDebugServer::~wxLuaDebugServer()
{
    StopServer();

    if (m_pThread != NULL)
        delete m_pThread;

#if wxCHECK_VERSION(2, 3, 0)
    if (m_pProcess != NULL && m_processID != -1)
        m_pProcess->Kill(m_processID, wxSIGKILL);
#endif
}

bool wxLuaDebugServer::AddBreakPoint(const wxString &fileName, int lineNumber)
{
    if (m_acceptedSocket != NULL)
    {
        try
        {
            if (WriteByte(m_acceptedSocket, CMD_ADD_BREAKPOINT) &&
                WriteString(m_acceptedSocket, fileName)         &&
                WriteInt(m_acceptedSocket, lineNumber))
            {
                return true;
            }
        }
        catch(wxLuaSocketException & /*e*/)
        {
        }
    }
    return false;
}

bool wxLuaDebugServer::RemoveBreakPoint(const wxString &fileName, int lineNumber)
{
    if (m_acceptedSocket != NULL)
    {
        try
        {
            if (WriteByte(m_acceptedSocket, CMD_REMOVE_BREAKPOINT) &&
                WriteString(m_acceptedSocket, fileName)            &&
                WriteInt(m_acceptedSocket, lineNumber))
            {
                return true;
            }
        }
        catch(wxLuaSocketException & /*e*/)
        {
        }
    }
    return false;
}

bool wxLuaDebugServer::ClearAllBreakPoints()
{
    if (m_acceptedSocket != NULL)
    {
        try
        {
            if (WriteByte(m_acceptedSocket, CMD_CLEAR_ALL_BREAKPOINTS))
                return true;
        }
        catch(wxLuaSocketException & /*e*/)
        {
        }
    }
    return false;
}

void wxLuaDebugServer::NotifyError(const wxString &msg)
{
    wxLuaDebugEvent debugEvent(wxEVT_DEBUG_ERROR);

    debugEvent.SetMessage(msg);

    wxLuaHandler::GetHandler().AddPendingEvent(debugEvent);
}

bool wxLuaDebugServer::Compile(const wxString &fileName, const wxString &buffer)
{
    bool       fErrorsSeen = false;
    lua_State *luaState    = lua_open();

    luaopen_base(luaState);
    luaopen_table(luaState);
    luaopen_string(luaState);
    luaopen_math(luaState);
    luaopen_debug(luaState);
    luaopen_io(luaState);
    luaopen_loadlib(luaState);

    LuaCharBuffer charbuf(buffer);
    int status = luaL_loadbuffer(luaState,
                                 charbuf.GetData(),
                                 charbuf.Length(),
                                 wx2lua(fileName));
    switch (status)
    {
        case LUA_ERRRUN:
            NotifyError(_("Error while compiling chunk\n"));
            fErrorsSeen = true;
            break;
        case LUA_ERRSYNTAX:
            {
                wxString strError(_("Syntax error during pre-compilation: "));
                strError += lua2wx(lua_tostring(luaState, -1));
                strError += wxT("\n");
                NotifyError(strError);
            }
            fErrorsSeen = true;
            break;
        case LUA_ERRMEM:
            NotifyError(_("Memory allocation error\n"));
            fErrorsSeen = true;
            break;
        case LUA_ERRERR:
            NotifyError(_("Generic error or an error occurred while running the error handler\n"));
            fErrorsSeen = true;
            break;
        case LUA_ERRFILE:
            {
                wxString strError(_("Error occurred while opening file: "));
                strError += lua2wx(lua_tostring(luaState, -1));
                strError += wxT("\n");
                NotifyError(strError);
            }
            fErrorsSeen = true;
            break;
        default:
            NotifyError(_("Compiled OK\n"));
            break;
    }

    lua_close(luaState);

    return !fErrorsSeen;
}

bool wxLuaDebugServer::Run(const wxString &fileName, const wxString &buffer)
{
    if (m_acceptedSocket != NULL)
    {
        try
        {
            if (WriteByte(m_acceptedSocket, CMD_RUN_BUFFER) &&
                WriteString(m_acceptedSocket, fileName) &&
                WriteString(m_acceptedSocket, buffer))
            {
                return true;
            }
        }
        catch(wxLuaSocketException & /*e*/)
        {
        }
    }
    return false;
}

bool wxLuaDebugServer::Step()
{
    if (m_acceptedSocket != NULL)
    {
        try
        {
            return WriteByte(m_acceptedSocket, CMD_DEBUG_STEP);
        }
        catch(wxLuaSocketException & /*e*/)
        {
        }
    }
    return false;
}

bool wxLuaDebugServer::StepOver()
{
    if (m_acceptedSocket != NULL)
    {
        try
        {
            return WriteByte(m_acceptedSocket, CMD_DEBUG_STEPOVER);
        }
        catch(wxLuaSocketException & /*e*/)
        {
        }
    }
    return false;
}

bool wxLuaDebugServer::StepOut()
{
    if (m_acceptedSocket != NULL)
    {
        try
        {
            return WriteByte(m_acceptedSocket, CMD_DEBUG_STEPOUT);
        }
        catch(wxLuaSocketException & /*e*/)
        {
        }
    }
    return false;
}

bool wxLuaDebugServer::Continue()
{
    if (m_acceptedSocket != NULL)
    {
        try
        {
            return WriteByte(m_acceptedSocket, CMD_DEBUG_CONTINUE);
        }
        catch(wxLuaSocketException & /*e*/)
        {
        }
    }
    return false;
}

bool wxLuaDebugServer::Break()
{
    if (m_acceptedSocket != NULL)
    {
        try
        {
            return WriteByte(m_acceptedSocket, CMD_DEBUG_BREAK);
        }
        catch(wxLuaSocketException & /*e*/)
        {
        }
    }
    return false;
}

bool wxLuaDebugServer::EnumerateStack()
{
    if (m_acceptedSocket != NULL)
    {
        try
        {
            return WriteByte(m_acceptedSocket, CMD_ENUMERATE_STACK);
        }
        catch(wxLuaSocketException & /*e*/)
        {
        }
    }
    return false;
}

bool wxLuaDebugServer::Reset()
{
    if (m_acceptedSocket != NULL)
    {
        try
        {
            return WriteByte(m_acceptedSocket, CMD_RESET);
        }
        catch(wxLuaSocketException & /*e*/)
        {
        }
    }
    return false;
}

bool wxLuaDebugServer::EnumerateStackEntry(int stackEntry)
{
    if (m_acceptedSocket != NULL)
    {
        try
        {
            if (WriteByte(m_acceptedSocket, CMD_ENUMERATE_STACK_ENTRY) &&
                WriteInt(m_acceptedSocket, stackEntry))
            {
                return true;
            }
        }
        catch(wxLuaSocketException & /*e*/)
        {
        }
    }
    return false;
}

bool wxLuaDebugServer::EnumerateTable(int tableRef, int nIndex, int nItemNode)
{
    if (m_acceptedSocket != NULL)
    {
        try
        {
            if (WriteByte(m_acceptedSocket, CMD_ENUMERATE_TABLE_REF) &&
                WriteInt(m_acceptedSocket, tableRef)                 &&
                WriteInt(m_acceptedSocket, nIndex)                   &&
                WriteInt(m_acceptedSocket, nItemNode))
            {
                return true;
            }
        }
        catch(wxLuaSocketException & /*e*/)
        {
        }
    }
    return false;
}

bool wxLuaDebugServer::CleanupDebugReferences()
{
    if (m_acceptedSocket != NULL)
    {
        try
        {
            if (WriteByte(m_acceptedSocket, CMD_CLEAR_DEBUG_REFERENCES))
            {
                return true;
            }
        }
        catch(wxLuaSocketException & /*e*/)
        {
        }
    }
    return false;
}

void *wxLuaThread::Entry()
{
    m_pServer->ThreadFunction();
    return 0;
}

void wxLuaDebugServer::ThreadFunction()
{
    try
    {
        m_acceptedSocket = new wxLuaSocket(m_serverSocket->Accept());
        if (m_acceptedSocket != NULL)
        {
            wxLuaSocket *serverSocket = m_serverSocket;
            m_serverSocket = NULL;
            delete serverSocket;

#if wxCHECK_VERSION(2, 3, 3)
            wxMilliSleep(500);  // why ??
#endif

            // if not shutdown requested
            if (!m_fShutdown)
            {
                try
                {
                    // Notify that a client has connected and we are ready to debug
                    wxLuaDebugEvent debugEvent(wxEVT_DEBUG_CLIENT_CONNECTED);

                    wxLuaHandler::GetHandler().AddPendingEvent(debugEvent);

                    // Enter the debug loop
                    while (!m_fShutdown)
                    {
                        int  debugEvent = ReadByte(m_acceptedSocket);
                        switch((debugEvents) debugEvent)
                        {
                            case EVENT_DEBUG_BREAK:
                                {
                                    wxString fileName   = ReadString(m_acceptedSocket);
                                    int      lineNumber = ReadInt(m_acceptedSocket);

                                    wxLuaDebugEvent debugEvent(wxEVT_DEBUG_BREAK, lineNumber, fileName);

                                    wxLuaHandler::GetHandler().AddPendingEvent(debugEvent);
                                }
                                break;

                            case EVENT_DEBUG_PRINT:
                                {
                                    wxString strMessage = ReadString(m_acceptedSocket);

                                    wxLuaDebugEvent debugEvent(wxEVT_DEBUG_PRINT);
                                    debugEvent.SetMessage(strMessage);

                                    wxLuaHandler::GetHandler().AddPendingEvent(debugEvent);
                                }
                                break;

                            case EVENT_DEBUG_ERROR:
                                {
                                    wxString strMessage = ReadString(m_acceptedSocket);

                                    wxLuaDebugEvent debugEvent(wxEVT_DEBUG_ERROR);
                                    debugEvent.SetMessage(strMessage);

                                    wxLuaHandler::GetHandler().AddPendingEvent(debugEvent);
                                }
                                break;

                            case EVENT_DEBUG_EXIT:
                                {
                                    wxLuaDebugEvent debugEvent(wxEVT_DEBUG_EXIT);
                                    wxLuaHandler::GetHandler().AddPendingEvent(debugEvent);
                                    m_fShutdown = true;
                                }
                                break;

                            case EVENT_DEBUG_STACK_ENUM:
                                {
                                    wxLuaDebugEvent  debugEvent(wxEVT_DEBUG_STACK_ENUM);
                                    wxLuaDebugData     *pDebugData = ReadDebugData(m_acceptedSocket);
                                    if (pDebugData != NULL)
                                        debugEvent.SetDebugData(-1, pDebugData);

                                    wxLuaHandler::GetHandler().AddPendingEvent(debugEvent);
                                }
                                break;

                            case EVENT_DEBUG_STACK_ENTRY_ENUM:
                                {
                                    wxLuaDebugEvent  debugEvent(wxEVT_DEBUG_STACK_ENTRY_ENUM);
                                    int              stackRef   = ReadInt(m_acceptedSocket);
                                    wxLuaDebugData  *pDebugData = ReadDebugData(m_acceptedSocket);
                                    if (pDebugData != NULL)
                                        debugEvent.SetDebugData(stackRef, pDebugData);

                                    wxLuaHandler::GetHandler().AddPendingEvent(debugEvent);
                                }
                                break;

                            case EVENT_DEBUG_TABLE_ENUM:
                                {
                                    wxLuaDebugEvent  debugEvent(wxEVT_DEBUG_TABLE_ENUM);
                                    int              itemNode   = ReadInt(m_acceptedSocket);
                                    wxLuaDebugData  *pDebugData = ReadDebugData(m_acceptedSocket);
                                    if (pDebugData != NULL)
                                        debugEvent.SetDebugData(itemNode, pDebugData);

                                    wxLuaHandler::GetHandler().AddPendingEvent(debugEvent);
                                }
                                break;

                            case EVENT_DEBUG_EVALUATE_EXPR:
                                {
                                    wxLuaDebugEvent  debugEvent(wxEVT_DEBUG_EVALUATE_EXPR);
                                    int              exprRef   = ReadInt(m_acceptedSocket);
                                    wxString         strResult = ReadString(m_acceptedSocket);

                                    debugEvent.SetMessage(strResult);
                                    debugEvent.SetDebugData(exprRef);

                                    wxLuaHandler::GetHandler().AddPendingEvent(debugEvent);
                                }
                                break;
                        case EVENT_DEBUG_BREAKPOINT_ADDED : break;   // FIXME - unused
                        case EVENT_DEBUG_BREAKPOINT_REMOVED : break; // FIXME - unused

                        }
                    }
                }
                catch(wxLuaSocketException & /*e*/)
                {
                }
            }

            // delete the accepted socket
            if (m_acceptedSocket != NULL)
            {
                wxLuaSocket *acceptedSocket = m_acceptedSocket;
                m_acceptedSocket = NULL;
                delete acceptedSocket;
            }
        }
    }
    catch(wxLuaSocketException & /*e*/)
    {
    }
}

void wxLuaThread::OnExit()
{
}

#if wxCHECK_VERSION(2, 3, 0)
bool wxLuaDebugServer::DisplayStackDialog(wxWindow *pParent)
{
    if (m_pStackFrameDialog == NULL)
    {
        m_pStackFrameDialog = new wxLuaStackFrame(pParent,
                                             _("Stack frame"),
                                             wxDefaultPosition,
                                             wxSize(500, 250),
                                             this);
        m_pStackFrameDialog->ShowModal();
        m_pStackFrameDialog->Destroy();
        m_pStackFrameDialog = NULL;
        return true;
    }
    return false;
}
#endif

bool wxLuaDebugServer::EvaluateExpr(int exprRef, const wxString &strExpression)
{
    if (m_acceptedSocket != NULL)
    {
        try
        {
            if (WriteByte(m_acceptedSocket, CMD_EVALUATE_EXPR) &&
                WriteInt(m_acceptedSocket, exprRef)            &&
                WriteString(m_acceptedSocket, strExpression))
            {
                return true;
            }
        }
        catch(wxLuaSocketException & /*e*/)
        {
        }
    }
    return false;
}


--- NEW FILE: wxlsock.cpp ---
/////////////////////////////////////////////////////////////////////////////
// Name:        wxLuaSocket.cpp
// Purpose:     Socket class for wxLua.
// Author:      J. Winwood
// Created:     February 2002
// Copyright:   (c) 2002 Lomtick Software. All rights reserved.
// Licence:     wxWidgets licence
/////////////////////////////////////////////////////////////////////////////

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

#include "wx/wxprec.h"

#ifdef __BORLANDC__
    #pragma hdrstop
#endif

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

#include "wxluasocket/include/wxlsock.h"

#ifdef _MSC_VER
    #pragma warning(push, 4)
#endif

extern const wxCharBuffer wx2lua(const wxString& AppString);
extern wxString lua2wx(const char * wx2lua);

// ----------------------------------------------------------------------------
// wxLuaSocket
// ----------------------------------------------------------------------------

// Default socket constructor.
wxLuaSocket::wxLuaSocket() : m_sockstate(SOCKET_CLOSED)
{
}

// Socket constructor from an accepted socket
wxLuaSocket::wxLuaSocket(const wxLuaSocket::wxLuaAcceptedSocket &acceptedSocket)
    : m_sock(acceptedSocket.m_sock),
      m_sockaddress(acceptedSocket.m_addr),
      m_sockstate(SOCKET_ACCEPTED)
{
}

// Accepted socket constructor
wxLuaSocket::wxLuaAcceptedSocket::wxLuaAcceptedSocket(socket_type sock, sockaddr_in addr)
    : m_sock(sock),
      m_addr(addr)
{
}

// socket destructor: close the socket if not already closed.
wxLuaSocket::~wxLuaSocket()
{
    if (m_sockstate != SOCKET_CLOSED)
    {
#ifdef WIN32
        ::closesocket(m_sock);
#else
        ::close(m_sock);
#endif
    }
}

// Create a listening socket, using the specified port number
void wxLuaSocket::Listen(u_short portNumber, int backLog)
{
    if (m_sockstate != SOCKET_CLOSED)
        throw wxLuaSocketException(wxLuaSocketException::SOCKET_NOT_CLOSED);

    m_sock = ::socket(AF_INET, SOCK_STREAM, 0);

    if (m_sock == INVALID_SOCKET)
        throw wxLuaSocketException(wxLuaSocketException::SOCKET_INVALID_SOCKET);

    sockaddr_in localAddr = { 0 };

    localAddr.sin_family = AF_INET;
    localAddr.sin_port = htons(portNumber);
    localAddr.sin_addr.s_addr = htonl(INADDR_ANY);

    if (::bind(m_sock, (sockaddr *) &localAddr, sizeof(localAddr)) == SOCKET_ERROR)
        throw wxLuaSocketException(wxLuaSocketException::SOCKET_BIND_FAILED);

    if (::listen(m_sock, backLog) == SOCKET_ERROR)
        throw wxLuaSocketException(wxLuaSocketException::SOCKET_LISTEN_FAILED);

    memset(&m_sockaddress, 0, sizeof(m_sockaddress));
    m_sockstate = SOCKET_LISTENING;
}

// Accept a connection, returning an accepted socket.
wxLuaSocket::wxLuaAcceptedSocket wxLuaSocket::Accept()
{
    if (m_sockstate != SOCKET_LISTENING)
        throw wxLuaSocketException(wxLuaSocketException::SOCKET_NOT_LISTENING);

    sockaddr_in fromAddr = { 0 };
    socklen_t length = sizeof(fromAddr);

    socket_type acceptedSocket = ::accept(m_sock, (sockaddr *)&fromAddr, &length);
    if (acceptedSocket == INVALID_SOCKET)
        throw wxLuaSocketException(wxLuaSocketException::SOCKET_ACCEPT_FAILED);

    return wxLuaAcceptedSocket(acceptedSocket, fromAddr);
}

// Connect to a given host and port number
void wxLuaSocket::Connect(const wxString &addr, u_short portNumber)
{
    hostent *pHost = NULL;

    if (m_sockstate != SOCKET_CLOSED)
        throw wxLuaSocketException(wxLuaSocketException::SOCKET_NOT_CLOSED);

    m_sock = ::socket(AF_INET, SOCK_STREAM, 0);
    if (m_sock == INVALID_SOCKET)
        throw wxLuaSocketException(wxLuaSocketException::SOCKET_INVALID_SOCKET);

    unsigned long  address = ::inet_addr(wx2lua(addr));
    if (address != INADDR_NONE)
        pHost = ::gethostbyaddr((const char*) &address, 4, AF_INET);
    else
        pHost = ::gethostbyname(wx2lua(addr));

    if (pHost == NULL)
        throw wxLuaSocketException(wxLuaSocketException::SOCKET_ADDRESS_NOT_RESOLVED);

    if (pHost->h_addrtype != AF_INET)
        throw wxLuaSocketException(wxLuaSocketException::SOCKET_INCOMPATIBLE_TYPE);

    memset(&m_sockaddress, 0, sizeof(m_sockaddress));
    memcpy(&(m_sockaddress.sin_addr), pHost->h_addr_list[0], pHost->h_length);

    m_sockaddress.sin_family = AF_INET;
    m_sockaddress.sin_port   = htons(portNumber);

    if (::connect(m_sock, (sockaddr *) &m_sockaddress, sizeof(m_sockaddress)) == SOCKET_ERROR)
        throw wxLuaSocketException(wxLuaSocketException::SOCKET_CONNECT_FAILED);

    m_sockstate = SOCKET_CONNECTED;
}

// Get the address of an open socket
wxString wxLuaSocket::GetAddress() const
{
    if (m_sockstate != SOCKET_CONNECTED && m_sockstate != SOCKET_ACCEPTED)
        throw wxLuaSocketException(wxLuaSocketException::SOCKET_NOT_CONNECTED);

    return lua2wx(inet_ntoa(m_sockaddress.sin_addr));
}

// Get the port number of an open socket
int wxLuaSocket::GetPort() const
{
    if (m_sockstate != SOCKET_CONNECTED && m_sockstate != SOCKET_ACCEPTED)
        throw wxLuaSocketException(wxLuaSocketException::SOCKET_NOT_CONNECTED);

    return ntohs(m_sockaddress.sin_port);
}

// Write data to an open socket, repeat until all data has been sent.
void wxLuaSocket::Write(const char *buffer, int length)
{
    if (m_sockstate != SOCKET_CONNECTED && m_sockstate != SOCKET_ACCEPTED)
        throw wxLuaSocketException(wxLuaSocketException::SOCKET_NOT_CONNECTED);

    while (length > 0)
    {
        int numWritten = ::send(m_sock, buffer, length, 0);
        if (numWritten == SOCKET_ERROR)
            throw wxLuaSocketException(wxLuaSocketException::SOCKET_SEND_FAILED);

        length -= numWritten;
        buffer += numWritten;
    }
}

// Read data from an open socket, repeat reading until all data has been read
int wxLuaSocket::Read(char *buffer, int length)
{
    if (m_sockstate != SOCKET_CONNECTED && m_sockstate != SOCKET_ACCEPTED)
        throw wxLuaSocketException(wxLuaSocketException::SOCKET_NOT_CONNECTED);

    while (length > 0)
    {
        int numRead = ::recv(m_sock, buffer, length, 0);
        if (numRead == 0)
            return length;

        if (numRead == SOCKET_ERROR)
            throw wxLuaSocketException(wxLuaSocketException::SOCKET_RECEIVE_FAILED);

        length -= numRead;
        buffer += numRead;
    }
    return 0;
}

// Shutdown a socket in an orderly fashion
void wxLuaSocket::Shutdown(int how)
{
    if (m_sockstate != SOCKET_CLOSED)
    {
        ::shutdown(m_sock, how);
    }
}

// Close an open socket
void wxLuaSocket::Close()
{
    if (m_sockstate != SOCKET_CLOSED)
    {
#ifdef WIN32
        if (::closesocket(m_sock) == SOCKET_ERROR)
            throw wxLuaSocketException(wxLuaSocketException::SOCKET_CLOSE_FAILED);
#else
        if (::close(m_sock))
            throw wxLuaSocketException(wxLuaSocketException::SOCKET_CLOSE_FAILED);
#endif
        m_sockstate = SOCKET_CLOSED;
    }
}

Index: Makefile
===================================================================
RCS file: /cvsroot/wxlua/wxLua/modules/wxluasocket/src/Makefile,v
retrieving revision 1.3
retrieving revision 1.4
diff -C2 -d -r1.3 -r1.4
*** Makefile	25 Nov 2005 19:03:29 -0000	1.3
--- Makefile	25 Nov 2005 19:22:58 -0000	1.4
***************
*** 51,65 ****
  
  HEADERS = \
! 	../include/debugio.h \
! 	../include/dserver.h \
! 	../include/dtarget.h \
! 	../include/socket.h \
  	../include/wxlhandl.h
  
  SOURCES = \
! 	debugio.cpp \
! 	dserver.cpp \
! 	dtarget.cpp \
! 	socket.cpp \
  	wxlhandl.cpp
  
--- 51,65 ----
  
  HEADERS = \
! 	../include/wxldbgio.h \
! 	../include/wxldserv.h \
! 	../include/wxldtarg.h \
! 	../include/wxlsock.h \
  	../include/wxlhandl.h
  
  SOURCES = \
! 	wxldbgio.cpp \
! 	wxldserv.cpp \
! 	wxldtarg.cpp \
! 	wxlsock.cpp \
  	wxlhandl.cpp
  

--- dtarget.cpp DELETED ---

--- NEW FILE: wxldtarg.cpp ---
/////////////////////////////////////////////////////////////////////////////
// Purpose:     Implements the client end of wxLua debugging session
// Author:      J. Winwood
// Created:     May 2002
// RCS-ID:      $Id: wxldtarg.cpp,v 1.1 2005/11/25 19:22:58 jrl1 Exp $
// Copyright:   (c) 2002 Lomtick Software. All rights reserved.
// Licence:     wxWindows licence
/////////////////////////////////////////////////////////////////////////////

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

#include "wx/wxprec.h"

#ifdef __BORLANDC__
    #pragma hdrstop
#endif

[...1100 lines suppressed...]
        lua_pushvalue(L, idx);   /* value to print */
        lua_call(L, 1, 1);
        wxString s = lua2wx(lua_tostring(L, -1));  /* get result */
        if (s.IsEmpty())
            return luaL_error(L, "`tostring' must return a string to `print'");
        if (idx > 1)
            stream.Append(wxT("\t"));
        stream.Append(s);
        lua_pop(L, 1);  /* pop result */
    }

    lua_getglobal(L, debugName);
    LuaDebugTarget *pTarget = (LuaDebugTarget *) lua_touserdata(L, -1);
    lua_pop(L, 1);

    if (pTarget != NULL)
        pTarget->NotifyPrint(stream);

    return 0;
}

--- dserver.cpp DELETED ---

[Wxlua-commit] wxLua/modules/build/msw makefile.bcc,1.13,1.14 makefile.gcc,1.13,1.14 makefile.vc,1.11,1.12 makefile.wat,1.11,1.12

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

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

Modified Files:
	makefile.bcc makefile.gcc makefile.vc makefile.wat 
Log Message:
rename wxluasocket files to wxl* for consistency and make it easier to find them


Index: makefile.vc
===================================================================
RCS file: /cvsroot/wxlua/wxLua/modules/build/msw/makefile.vc,v
retrieving revision 1.11
retrieving revision 1.12
diff -C2 -d -r1.11 -r1.12
*** makefile.vc	25 Nov 2005 19:03:28 -0000	1.11
--- makefile.vc	25 Nov 2005 19:22:57 -0000	1.12
***************
*** 232,240 ****
  	$(CXXFLAGS)
  WXLUASOCKET_LIB_OBJECTS =  \
! 	msvc$(WXLIBPOSTFIX)\wxluasocket_lib_debugio.obj \
! 	msvc$(WXLIBPOSTFIX)\wxluasocket_lib_dserver.obj \
! 	msvc$(WXLIBPOSTFIX)\wxluasocket_lib_dtarget.obj \
! 	msvc$(WXLIBPOSTFIX)\wxluasocket_lib_socket.obj \
! 	msvc$(WXLIBPOSTFIX)\wxluasocket_lib_wxlhandl.obj
  WXLUASOCKET_DLL_CXXFLAGS = /MD$(__DEBUGRUNTIME) /DWIN32 \
  	$(__WXUNICODE_DEFINE_p) $(__WXDEBUG_DEFINE_p) /D__WXMSW__ \
--- 232,240 ----
  	$(CXXFLAGS)
  WXLUASOCKET_LIB_OBJECTS =  \
! 	msvc$(WXLIBPOSTFIX)\wxluasocket_lib_wxldbgio.obj \
! 	msvc$(WXLIBPOSTFIX)\wxluasocket_lib_wxldserv.obj \
! 	msvc$(WXLIBPOSTFIX)\wxluasocket_lib_wxldtarg.obj \
! 	msvc$(WXLIBPOSTFIX)\wxluasocket_lib_wxlhandl.obj \
! 	msvc$(WXLIBPOSTFIX)\wxluasocket_lib_wxlsock.obj
  WXLUASOCKET_DLL_CXXFLAGS = /MD$(__DEBUGRUNTIME) /DWIN32 \
  	$(__WXUNICODE_DEFINE_p) $(__WXDEBUG_DEFINE_p) /D__WXMSW__ \
***************
*** 245,253 ****
  	/DA2DWXLUASOCKETMAKINGDLL /GR /EHsc $(CPPFLAGS) $(CXXFLAGS)
  WXLUASOCKET_DLL_OBJECTS =  \
! 	msvc$(WXLIBPOSTFIX)\wxluasocket_dll_debugio.obj \
! 	msvc$(WXLIBPOSTFIX)\wxluasocket_dll_dserver.obj \
! 	msvc$(WXLIBPOSTFIX)\wxluasocket_dll_dtarget.obj \
! 	msvc$(WXLIBPOSTFIX)\wxluasocket_dll_socket.obj \
! 	msvc$(WXLIBPOSTFIX)\wxluasocket_dll_wxlhandl.obj
  
  ### Conditionally set variables: ###
--- 245,253 ----
  	/DA2DWXLUASOCKETMAKINGDLL /GR /EHsc $(CPPFLAGS) $(CXXFLAGS)
  WXLUASOCKET_DLL_OBJECTS =  \
! 	msvc$(WXLIBPOSTFIX)\wxluasocket_dll_wxldbgio.obj \
! 	msvc$(WXLIBPOSTFIX)\wxluasocket_dll_wxldserv.obj \
! 	msvc$(WXLIBPOSTFIX)\wxluasocket_dll_wxldtarg.obj \
! 	msvc$(WXLIBPOSTFIX)\wxluasocket_dll_wxlhandl.obj \
! 	msvc$(WXLIBPOSTFIX)\wxluasocket_dll_wxlsock.obj
  
  ### Conditionally set variables: ###
***************
*** 819,850 ****
  	$(CXX) /c /nologo /TP /Fo$@ $(WXLUADEBUG_DLL_CXXFLAGS) $**
  
! msvc$(WXLIBPOSTFIX)\wxluasocket_lib_debugio.obj: ..\..\wxluasocket\src\debugio.cpp
  	$(CXX) /c /nologo /TP /Fo$@ $(WXLUASOCKET_LIB_CXXFLAGS) $**
  
! msvc$(WXLIBPOSTFIX)\wxluasocket_lib_dserver.obj: ..\..\wxluasocket\src\dserver.cpp
  	$(CXX) /c /nologo /TP /Fo$@ $(WXLUASOCKET_LIB_CXXFLAGS) $**
  
! msvc$(WXLIBPOSTFIX)\wxluasocket_lib_dtarget.obj: ..\..\wxluasocket\src\dtarget.cpp
  	$(CXX) /c /nologo /TP /Fo$@ $(WXLUASOCKET_LIB_CXXFLAGS) $**
  
! msvc$(WXLIBPOSTFIX)\wxluasocket_lib_socket.obj: ..\..\wxluasocket\src\socket.cpp
  	$(CXX) /c /nologo /TP /Fo$@ $(WXLUASOCKET_LIB_CXXFLAGS) $**
  
! msvc$(WXLIBPOSTFIX)\wxluasocket_lib_wxlhandl.obj: ..\..\wxluasocket\src\wxlhandl.cpp
  	$(CXX) /c /nologo /TP /Fo$@ $(WXLUASOCKET_LIB_CXXFLAGS) $**
  
! msvc$(WXLIBPOSTFIX)\wxluasocket_dll_debugio.obj: ..\..\wxluasocket\src\debugio.cpp
  	$(CXX) /c /nologo /TP /Fo$@ $(WXLUASOCKET_DLL_CXXFLAGS) $**
  
! msvc$(WXLIBPOSTFIX)\wxluasocket_dll_dserver.obj: ..\..\wxluasocket\src\dserver.cpp
  	$(CXX) /c /nologo /TP /Fo$@ $(WXLUASOCKET_DLL_CXXFLAGS) $**
  
! msvc$(WXLIBPOSTFIX)\wxluasocket_dll_dtarget.obj: ..\..\wxluasocket\src\dtarget.cpp
  	$(CXX) /c /nologo /TP /Fo$@ $(WXLUASOCKET_DLL_CXXFLAGS) $**
  
! msvc$(WXLIBPOSTFIX)\wxluasocket_dll_socket.obj: ..\..\wxluasocket\src\socket.cpp
  	$(CXX) /c /nologo /TP /Fo$@ $(WXLUASOCKET_DLL_CXXFLAGS) $**
  
! msvc$(WXLIBPOSTFIX)\wxluasocket_dll_wxlhandl.obj: ..\..\wxluasocket\src\wxlhandl.cpp
  	$(CXX) /c /nologo /TP /Fo$@ $(WXLUASOCKET_DLL_CXXFLAGS) $**
  
--- 819,850 ----
  	$(CXX) /c /nologo /TP /Fo$@ $(WXLUADEBUG_DLL_CXXFLAGS) $**
  
! msvc$(WXLIBPOSTFIX)\wxluasocket_lib_wxldbgio.obj: ..\..\wxluasocket\src\wxldbgio.cpp
  	$(CXX) /c /nologo /TP /Fo$@ $(WXLUASOCKET_LIB_CXXFLAGS) $**
  
! msvc$(WXLIBPOSTFIX)\wxluasocket_lib_wxldserv.obj: ..\..\wxluasocket\src\wxldserv.cpp
  	$(CXX) /c /nologo /TP /Fo$@ $(WXLUASOCKET_LIB_CXXFLAGS) $**
  
! msvc$(WXLIBPOSTFIX)\wxluasocket_lib_wxldtarg.obj: ..\..\wxluasocket\src\wxldtarg.cpp
  	$(CXX) /c /nologo /TP /Fo$@ $(WXLUASOCKET_LIB_CXXFLAGS) $**
  
! msvc$(WXLIBPOSTFIX)\wxluasocket_lib_wxlhandl.obj: ..\..\wxluasocket\src\wxlhandl.cpp
  	$(CXX) /c /nologo /TP /Fo$@ $(WXLUASOCKET_LIB_CXXFLAGS) $**
  
! msvc$(WXLIBPOSTFIX)\wxluasocket_lib_wxlsock.obj: ..\..\wxluasocket\src\wxlsock.cpp
  	$(CXX) /c /nologo /TP /Fo$@ $(WXLUASOCKET_LIB_CXXFLAGS) $**
  
! msvc$(WXLIBPOSTFIX)\wxluasocket_dll_wxldbgio.obj: ..\..\wxluasocket\src\wxldbgio.cpp
  	$(CXX) /c /nologo /TP /Fo$@ $(WXLUASOCKET_DLL_CXXFLAGS) $**
  
! msvc$(WXLIBPOSTFIX)\wxluasocket_dll_wxldserv.obj: ..\..\wxluasocket\src\wxldserv.cpp
  	$(CXX) /c /nologo /TP /Fo$@ $(WXLUASOCKET_DLL_CXXFLAGS) $**
  
! msvc$(WXLIBPOSTFIX)\wxluasocket_dll_wxldtarg.obj: ..\..\wxluasocket\src\wxldtarg.cpp
  	$(CXX) /c /nologo /TP /Fo$@ $(WXLUASOCKET_DLL_CXXFLAGS) $**
  
! msvc$(WXLIBPOSTFIX)\wxluasocket_dll_wxlhandl.obj: ..\..\wxluasocket\src\wxlhandl.cpp
  	$(CXX) /c /nologo /TP /Fo$@ $(WXLUASOCKET_DLL_CXXFLAGS) $**
  
! msvc$(WXLIBPOSTFIX)\wxluasocket_dll_wxlsock.obj: ..\..\wxluasocket\src\wxlsock.cpp
  	$(CXX) /c /nologo /TP /Fo$@ $(WXLUASOCKET_DLL_CXXFLAGS) $**
  

Index: makefile.bcc
===================================================================
RCS file: /cvsroot/wxlua/wxLua/modules/build/msw/makefile.bcc,v
retrieving revision 1.13
retrieving revision 1.14
diff -C2 -d -r1.13 -r1.14
*** makefile.bcc	25 Nov 2005 19:03:28 -0000	1.13
--- makefile.bcc	25 Nov 2005 19:22:57 -0000	1.14
***************
*** 252,260 ****
  	$(__WX_SHAREDDEFINE_p) -I$(WX_DIR)\contrib\include $(CPPFLAGS) $(CXXFLAGS)
  WXLUASOCKET_LIB_OBJECTS =  \
! 	borland$(WXLIBPOSTFIX)\wxluasocket_lib_debugio.obj \
! 	borland$(WXLIBPOSTFIX)\wxluasocket_lib_dserver.obj \
! 	borland$(WXLIBPOSTFIX)\wxluasocket_lib_dtarget.obj \
! 	borland$(WXLIBPOSTFIX)\wxluasocket_lib_socket.obj \
! 	borland$(WXLIBPOSTFIX)\wxluasocket_lib_wxlhandl.obj
  WXLUASOCKET_DLL_CXXFLAGS = -I$(BCCDIR)\include $(__WXUNICODE_DEFINE_p) \
  	$(__WXDEBUG_DEFINE_p) -D__WXMSW__ \
--- 252,260 ----
  	$(__WX_SHAREDDEFINE_p) -I$(WX_DIR)\contrib\include $(CPPFLAGS) $(CXXFLAGS)
  WXLUASOCKET_LIB_OBJECTS =  \
! 	borland$(WXLIBPOSTFIX)\wxluasocket_lib_wxldbgio.obj \
! 	borland$(WXLIBPOSTFIX)\wxluasocket_lib_wxldserv.obj \
! 	borland$(WXLIBPOSTFIX)\wxluasocket_lib_wxldtarg.obj \
! 	borland$(WXLIBPOSTFIX)\wxluasocket_lib_wxlhandl.obj \
! 	borland$(WXLIBPOSTFIX)\wxluasocket_lib_wxlsock.obj
  WXLUASOCKET_DLL_CXXFLAGS = -I$(BCCDIR)\include $(__WXUNICODE_DEFINE_p) \
  	$(__WXDEBUG_DEFINE_p) -D__WXMSW__ \
***************
*** 264,272 ****
  	-DA2DWXLUASOCKETMAKINGDLL $(CPPFLAGS) $(CXXFLAGS)
  WXLUASOCKET_DLL_OBJECTS =  \
! 	borland$(WXLIBPOSTFIX)\wxluasocket_dll_debugio.obj \
! 	borland$(WXLIBPOSTFIX)\wxluasocket_dll_dserver.obj \
! 	borland$(WXLIBPOSTFIX)\wxluasocket_dll_dtarget.obj \
! 	borland$(WXLIBPOSTFIX)\wxluasocket_dll_socket.obj \
! 	borland$(WXLIBPOSTFIX)\wxluasocket_dll_wxlhandl.obj
  
  ### Conditionally set variables: ###
--- 264,272 ----
  	-DA2DWXLUASOCKETMAKINGDLL $(CPPFLAGS) $(CXXFLAGS)
  WXLUASOCKET_DLL_OBJECTS =  \
! 	borland$(WXLIBPOSTFIX)\wxluasocket_dll_wxldbgio.obj \
! 	borland$(WXLIBPOSTFIX)\wxluasocket_dll_wxldserv.obj \
! 	borland$(WXLIBPOSTFIX)\wxluasocket_dll_wxldtarg.obj \
! 	borland$(WXLIBPOSTFIX)\wxluasocket_dll_wxlhandl.obj \
! 	borland$(WXLIBPOSTFIX)\wxluasocket_dll_wxlsock.obj
  
  ### Conditionally set variables: ###
***************
*** 833,864 ****
  	$(CXX) -q -c -P -o$@ $(WXLUADEBUG_DLL_CXXFLAGS) $**
  
! borland$(WXLIBPOSTFIX)\wxluasocket_lib_debugio.obj: ..\..\wxluasocket\src\debugio.cpp
  	$(CXX) -q -c -P -o$@ $(WXLUASOCKET_LIB_CXXFLAGS) $**
  
! borland$(WXLIBPOSTFIX)\wxluasocket_lib_dserver.obj: ..\..\wxluasocket\src\dserver.cpp
  	$(CXX) -q -c -P -o$@ $(WXLUASOCKET_LIB_CXXFLAGS) $**
  
! borland$(WXLIBPOSTFIX)\wxluasocket_lib_dtarget.obj: ..\..\wxluasocket\src\dtarget.cpp
  	$(CXX) -q -c -P -o$@ $(WXLUASOCKET_LIB_CXXFLAGS) $**
  
! borland$(WXLIBPOSTFIX)\wxluasocket_lib_socket.obj: ..\..\wxluasocket\src\socket.cpp
  	$(CXX) -q -c -P -o$@ $(WXLUASOCKET_LIB_CXXFLAGS) $**
  
! borland$(WXLIBPOSTFIX)\wxluasocket_lib_wxlhandl.obj: ..\..\wxluasocket\src\wxlhandl.cpp
  	$(CXX) -q -c -P -o$@ $(WXLUASOCKET_LIB_CXXFLAGS) $**
  
! borland$(WXLIBPOSTFIX)\wxluasocket_dll_debugio.obj: ..\..\wxluasocket\src\debugio.cpp
  	$(CXX) -q -c -P -o$@ $(WXLUASOCKET_DLL_CXXFLAGS) $**
  
! borland$(WXLIBPOSTFIX)\wxluasocket_dll_dserver.obj: ..\..\wxluasocket\src\dserver.cpp
  	$(CXX) -q -c -P -o$@ $(WXLUASOCKET_DLL_CXXFLAGS) $**
  
! borland$(WXLIBPOSTFIX)\wxluasocket_dll_dtarget.obj: ..\..\wxluasocket\src\dtarget.cpp
  	$(CXX) -q -c -P -o$@ $(WXLUASOCKET_DLL_CXXFLAGS) $**
  
! borland$(WXLIBPOSTFIX)\wxluasocket_dll_socket.obj: ..\..\wxluasocket\src\socket.cpp
  	$(CXX) -q -c -P -o$@ $(WXLUASOCKET_DLL_CXXFLAGS) $**
  
! borland$(WXLIBPOSTFIX)\wxluasocket_dll_wxlhandl.obj: ..\..\wxluasocket\src\wxlhandl.cpp
  	$(CXX) -q -c -P -o$@ $(WXLUASOCKET_DLL_CXXFLAGS) $**
  
--- 833,864 ----
  	$(CXX) -q -c -P -o$@ $(WXLUADEBUG_DLL_CXXFLAGS) $**
  
! borland$(WXLIBPOSTFIX)\wxluasocket_lib_wxldbgio.obj: ..\..\wxluasocket\src\wxldbgio.cpp
  	$(CXX) -q -c -P -o$@ $(WXLUASOCKET_LIB_CXXFLAGS) $**
  
! borland$(WXLIBPOSTFIX)\wxluasocket_lib_wxldserv.obj: ..\..\wxluasocket\src\wxldserv.cpp
  	$(CXX) -q -c -P -o$@ $(WXLUASOCKET_LIB_CXXFLAGS) $**
  
! borland$(WXLIBPOSTFIX)\wxluasocket_lib_wxldtarg.obj: ..\..\wxluasocket\src\wxldtarg.cpp
  	$(CXX) -q -c -P -o$@ $(WXLUASOCKET_LIB_CXXFLAGS) $**
  
! borland$(WXLIBPOSTFIX)\wxluasocket_lib_wxlhandl.obj: ..\..\wxluasocket\src\wxlhandl.cpp
  	$(CXX) -q -c -P -o$@ $(WXLUASOCKET_LIB_CXXFLAGS) $**
  
! borland$(WXLIBPOSTFIX)\wxluasocket_lib_wxlsock.obj: ..\..\wxluasocket\src\wxlsock.cpp
  	$(CXX) -q -c -P -o$@ $(WXLUASOCKET_LIB_CXXFLAGS) $**
  
! borland$(WXLIBPOSTFIX)\wxluasocket_dll_wxldbgio.obj: ..\..\wxluasocket\src\wxldbgio.cpp
  	$(CXX) -q -c -P -o$@ $(WXLUASOCKET_DLL_CXXFLAGS) $**
  
! borland$(WXLIBPOSTFIX)\wxluasocket_dll_wxldserv.obj: ..\..\wxluasocket\src\wxldserv.cpp
  	$(CXX) -q -c -P -o$@ $(WXLUASOCKET_DLL_CXXFLAGS) $**
  
! borland$(WXLIBPOSTFIX)\wxluasocket_dll_wxldtarg.obj: ..\..\wxluasocket\src\wxldtarg.cpp
  	$(CXX) -q -c -P -o$@ $(WXLUASOCKET_DLL_CXXFLAGS) $**
  
! borland$(WXLIBPOSTFIX)\wxluasocket_dll_wxlhandl.obj: ..\..\wxluasocket\src\wxlhandl.cpp
  	$(CXX) -q -c -P -o$@ $(WXLUASOCKET_DLL_CXXFLAGS) $**
  
! borland$(WXLIBPOSTFIX)\wxluasocket_dll_wxlsock.obj: ..\..\wxluasocket\src\wxlsock.cpp
  	$(CXX) -q -c -P -o$@ $(WXLUASOCKET_DLL_CXXFLAGS) $**
  

Index: makefile.wat
===================================================================
RCS file: /cvsroot/wxlua/wxLua/modules/build/msw/makefile.wat,v
retrieving revision 1.11
retrieving revision 1.12
diff -C2 -d -r1.11 -r1.12
*** makefile.wat	25 Nov 2005 19:03:28 -0000	1.11
--- makefile.wat	25 Nov 2005 19:22:58 -0000	1.12
***************
*** 341,349 ****
  	$(CPPFLAGS) $(CXXFLAGS)
  WXLUASOCKET_LIB_OBJECTS =  &
! 	watcom$(WXLIBPOSTFIX)\wxluasocket_lib_debugio.obj &
! 	watcom$(WXLIBPOSTFIX)\wxluasocket_lib_dserver.obj &
! 	watcom$(WXLIBPOSTFIX)\wxluasocket_lib_dtarget.obj &
! 	watcom$(WXLIBPOSTFIX)\wxluasocket_lib_socket.obj &
! 	watcom$(WXLIBPOSTFIX)\wxluasocket_lib_wxlhandl.obj
  WXLUASOCKET_DLL_CXXFLAGS = -bd $(__WXUNICODE_DEFINE_p) $(__WXDEBUG_DEFINE_p) &
  	-d__WXMSW__ -i=$(WX_DIR)$(__WXLIBPATH_FILENAMES)\msw$(WXLIBPOSTFIX) &
--- 341,349 ----
  	$(CPPFLAGS) $(CXXFLAGS)
  WXLUASOCKET_LIB_OBJECTS =  &
! 	watcom$(WXLIBPOSTFIX)\wxluasocket_lib_wxldbgio.obj &
! 	watcom$(WXLIBPOSTFIX)\wxluasocket_lib_wxldserv.obj &
! 	watcom$(WXLIBPOSTFIX)\wxluasocket_lib_wxldtarg.obj &
! 	watcom$(WXLIBPOSTFIX)\wxluasocket_lib_wxlhandl.obj &
! 	watcom$(WXLIBPOSTFIX)\wxluasocket_lib_wxlsock.obj
  WXLUASOCKET_DLL_CXXFLAGS = -bd $(__WXUNICODE_DEFINE_p) $(__WXDEBUG_DEFINE_p) &
  	-d__WXMSW__ -i=$(WX_DIR)$(__WXLIBPATH_FILENAMES)\msw$(WXLIBPOSTFIX) &
***************
*** 352,360 ****
  	-dA2DWXLUASOCKETMAKINGDLL $(CPPFLAGS) $(CXXFLAGS)
  WXLUASOCKET_DLL_OBJECTS =  &
! 	watcom$(WXLIBPOSTFIX)\wxluasocket_dll_debugio.obj &
! 	watcom$(WXLIBPOSTFIX)\wxluasocket_dll_dserver.obj &
! 	watcom$(WXLIBPOSTFIX)\wxluasocket_dll_dtarget.obj &
! 	watcom$(WXLIBPOSTFIX)\wxluasocket_dll_socket.obj &
! 	watcom$(WXLIBPOSTFIX)\wxluasocket_dll_wxlhandl.obj
  
  
--- 352,360 ----
  	-dA2DWXLUASOCKETMAKINGDLL $(CPPFLAGS) $(CXXFLAGS)
  WXLUASOCKET_DLL_OBJECTS =  &
! 	watcom$(WXLIBPOSTFIX)\wxluasocket_dll_wxldbgio.obj &
! 	watcom$(WXLIBPOSTFIX)\wxluasocket_dll_wxldserv.obj &
! 	watcom$(WXLIBPOSTFIX)\wxluasocket_dll_wxldtarg.obj &
! 	watcom$(WXLIBPOSTFIX)\wxluasocket_dll_wxlhandl.obj &
! 	watcom$(WXLIBPOSTFIX)\wxluasocket_dll_wxlsock.obj
  
  
***************
*** 855,886 ****
  	$(CXX) -zq -fo=$^@ $(WXLUADEBUG_DLL_CXXFLAGS) $<
  
! watcom$(WXLIBPOSTFIX)\wxluasocket_lib_debugio.obj :  .AUTODEPEND ..\..\wxluasocket\src\debugio.cpp
  	$(CXX) -zq -fo=$^@ $(WXLUASOCKET_LIB_CXXFLAGS) $<
  
! watcom$(WXLIBPOSTFIX)\wxluasocket_lib_dserver.obj :  .AUTODEPEND ..\..\wxluasocket\src\dserver.cpp
  	$(CXX) -zq -fo=$^@ $(WXLUASOCKET_LIB_CXXFLAGS) $<
  
! watcom$(WXLIBPOSTFIX)\wxluasocket_lib_dtarget.obj :  .AUTODEPEND ..\..\wxluasocket\src\dtarget.cpp
  	$(CXX) -zq -fo=$^@ $(WXLUASOCKET_LIB_CXXFLAGS) $<
  
! watcom$(WXLIBPOSTFIX)\wxluasocket_lib_socket.obj :  .AUTODEPEND ..\..\wxluasocket\src\socket.cpp
  	$(CXX) -zq -fo=$^@ $(WXLUASOCKET_LIB_CXXFLAGS) $<
  
! watcom$(WXLIBPOSTFIX)\wxluasocket_lib_wxlhandl.obj :  .AUTODEPEND ..\..\wxluasocket\src\wxlhandl.cpp
  	$(CXX) -zq -fo=$^@ $(WXLUASOCKET_LIB_CXXFLAGS) $<
  
! watcom$(WXLIBPOSTFIX)\wxluasocket_dll_debugio.obj :  .AUTODEPEND ..\..\wxluasocket\src\debugio.cpp
  	$(CXX) -zq -fo=$^@ $(WXLUASOCKET_DLL_CXXFLAGS) $<
  
! watcom$(WXLIBPOSTFIX)\wxluasocket_dll_dserver.obj :  .AUTODEPEND ..\..\wxluasocket\src\dserver.cpp
  	$(CXX) -zq -fo=$^@ $(WXLUASOCKET_DLL_CXXFLAGS) $<
  
! watcom$(WXLIBPOSTFIX)\wxluasocket_dll_dtarget.obj :  .AUTODEPEND ..\..\wxluasocket\src\dtarget.cpp
  	$(CXX) -zq -fo=$^@ $(WXLUASOCKET_DLL_CXXFLAGS) $<
  
! watcom$(WXLIBPOSTFIX)\wxluasocket_dll_socket.obj :  .AUTODEPEND ..\..\wxluasocket\src\socket.cpp
  	$(CXX) -zq -fo=$^@ $(WXLUASOCKET_DLL_CXXFLAGS) $<
  
! watcom$(WXLIBPOSTFIX)\wxluasocket_dll_wxlhandl.obj :  .AUTODEPEND ..\..\wxluasocket\src\wxlhandl.cpp
  	$(CXX) -zq -fo=$^@ $(WXLUASOCKET_DLL_CXXFLAGS) $<
  
--- 855,886 ----
  	$(CXX) -zq -fo=$^@ $(WXLUADEBUG_DLL_CXXFLAGS) $<
  
! watcom$(WXLIBPOSTFIX)\wxluasocket_lib_wxldbgio.obj :  .AUTODEPEND ..\..\wxluasocket\src\wxldbgio.cpp
  	$(CXX) -zq -fo=$^@ $(WXLUASOCKET_LIB_CXXFLAGS) $<
  
! watcom$(WXLIBPOSTFIX)\wxluasocket_lib_wxldserv.obj :  .AUTODEPEND ..\..\wxluasocket\src\wxldserv.cpp
  	$(CXX) -zq -fo=$^@ $(WXLUASOCKET_LIB_CXXFLAGS) $<
  
! watcom$(WXLIBPOSTFIX)\wxluasocket_lib_wxldtarg.obj :  .AUTODEPEND ..\..\wxluasocket\src\wxldtarg.cpp
  	$(CXX) -zq -fo=$^@ $(WXLUASOCKET_LIB_CXXFLAGS) $<
  
! watcom$(WXLIBPOSTFIX)\wxluasocket_lib_wxlhandl.obj :  .AUTODEPEND ..\..\wxluasocket\src\wxlhandl.cpp
  	$(CXX) -zq -fo=$^@ $(WXLUASOCKET_LIB_CXXFLAGS) $<
  
! watcom$(WXLIBPOSTFIX)\wxluasocket_lib_wxlsock.obj :  .AUTODEPEND ..\..\wxluasocket\src\wxlsock.cpp
  	$(CXX) -zq -fo=$^@ $(WXLUASOCKET_LIB_CXXFLAGS) $<
  
! watcom$(WXLIBPOSTFIX)\wxluasocket_dll_wxldbgio.obj :  .AUTODEPEND ..\..\wxluasocket\src\wxldbgio.cpp
  	$(CXX) -zq -fo=$^@ $(WXLUASOCKET_DLL_CXXFLAGS) $<
  
! watcom$(WXLIBPOSTFIX)\wxluasocket_dll_wxldserv.obj :  .AUTODEPEND ..\..\wxluasocket\src\wxldserv.cpp
  	$(CXX) -zq -fo=$^@ $(WXLUASOCKET_DLL_CXXFLAGS) $<
  
! watcom$(WXLIBPOSTFIX)\wxluasocket_dll_wxldtarg.obj :  .AUTODEPEND ..\..\wxluasocket\src\wxldtarg.cpp
  	$(CXX) -zq -fo=$^@ $(WXLUASOCKET_DLL_CXXFLAGS) $<
  
! watcom$(WXLIBPOSTFIX)\wxluasocket_dll_wxlhandl.obj :  .AUTODEPEND ..\..\wxluasocket\src\wxlhandl.cpp
  	$(CXX) -zq -fo=$^@ $(WXLUASOCKET_DLL_CXXFLAGS) $<
  
! watcom$(WXLIBPOSTFIX)\wxluasocket_dll_wxlsock.obj :  .AUTODEPEND ..\..\wxluasocket\src\wxlsock.cpp
  	$(CXX) -zq -fo=$^@ $(WXLUASOCKET_DLL_CXXFLAGS) $<
  

Index: makefile.gcc
===================================================================
RCS file: /cvsroot/wxlua/wxLua/modules/build/msw/makefile.gcc,v
retrieving revision 1.13
retrieving revision 1.14
diff -C2 -d -r1.13 -r1.14
*** makefile.gcc	25 Nov 2005 19:03:28 -0000	1.13
--- makefile.gcc	25 Nov 2005 19:22:57 -0000	1.14
***************
*** 225,233 ****
  	$(CPPFLAGS) $(CXXFLAGS)
  WXLUASOCKET_LIB_OBJECTS =  \
! 	mingw$(WXLIBPOSTFIX)\wxluasocket_lib_debugio.o \
! 	mingw$(WXLIBPOSTFIX)\wxluasocket_lib_dserver.o \
! 	mingw$(WXLIBPOSTFIX)\wxluasocket_lib_dtarget.o \
! 	mingw$(WXLIBPOSTFIX)\wxluasocket_lib_socket.o \
! 	mingw$(WXLIBPOSTFIX)\wxluasocket_lib_wxlhandl.o
  WXLUASOCKET_DLL_CXXFLAGS = -DHAVE_W32API_H $(__WXUNICODE_DEFINE_p) \
  	$(__WXDEBUG_DEFINE_p) -D__WXMSW__ \
--- 225,233 ----
  	$(CPPFLAGS) $(CXXFLAGS)
  WXLUASOCKET_LIB_OBJECTS =  \
! 	mingw$(WXLIBPOSTFIX)\wxluasocket_lib_wxldbgio.o \
! 	mingw$(WXLIBPOSTFIX)\wxluasocket_lib_wxldserv.o \
! 	mingw$(WXLIBPOSTFIX)\wxluasocket_lib_wxldtarg.o \
! 	mingw$(WXLIBPOSTFIX)\wxluasocket_lib_wxlhandl.o \
! 	mingw$(WXLIBPOSTFIX)\wxluasocket_lib_wxlsock.o
  WXLUASOCKET_DLL_CXXFLAGS = -DHAVE_W32API_H $(__WXUNICODE_DEFINE_p) \
  	$(__WXDEBUG_DEFINE_p) -D__WXMSW__ \
***************
*** 237,245 ****
  	-DA2DWXLUASOCKETMAKINGDLL $(CPPFLAGS) $(CXXFLAGS)
  WXLUASOCKET_DLL_OBJECTS =  \
! 	mingw$(WXLIBPOSTFIX)\wxluasocket_dll_debugio.o \
! 	mingw$(WXLIBPOSTFIX)\wxluasocket_dll_dserver.o \
! 	mingw$(WXLIBPOSTFIX)\wxluasocket_dll_dtarget.o \
! 	mingw$(WXLIBPOSTFIX)\wxluasocket_dll_socket.o \
! 	mingw$(WXLIBPOSTFIX)\wxluasocket_dll_wxlhandl.o
  
  ### Conditionally set variables: ###
--- 237,245 ----
  	-DA2DWXLUASOCKETMAKINGDLL $(CPPFLAGS) $(CXXFLAGS)
  WXLUASOCKET_DLL_OBJECTS =  \
! 	mingw$(WXLIBPOSTFIX)\wxluasocket_dll_wxldbgio.o \
! 	mingw$(WXLIBPOSTFIX)\wxluasocket_dll_wxldserv.o \
! 	mingw$(WXLIBPOSTFIX)\wxluasocket_dll_wxldtarg.o \
! 	mingw$(WXLIBPOSTFIX)\wxluasocket_dll_wxlhandl.o \
! 	mingw$(WXLIBPOSTFIX)\wxluasocket_dll_wxlsock.o
  
  ### Conditionally set variables: ###
***************
*** 773,804 ****
  	$(CXX) -c -o $@ $(WXLUADEBUG_DLL_CXXFLAGS) $(CPPDEPS) $<
  
! mingw$(WXLIBPOSTFIX)\wxluasocket_lib_debugio.o: ../../wxluasocket/src/debugio.cpp
  	$(CXX) -c -o $@ $(WXLUASOCKET_LIB_CXXFLAGS) $(CPPDEPS) $<
  
! mingw$(WXLIBPOSTFIX)\wxluasocket_lib_dserver.o: ../../wxluasocket/src/dserver.cpp
  	$(CXX) -c -o $@ $(WXLUASOCKET_LIB_CXXFLAGS) $(CPPDEPS) $<
  
! mingw$(WXLIBPOSTFIX)\wxluasocket_lib_dtarget.o: ../../wxluasocket/src/dtarget.cpp
  	$(CXX) -c -o $@ $(WXLUASOCKET_LIB_CXXFLAGS) $(CPPDEPS) $<
  
! mingw$(WXLIBPOSTFIX)\wxluasocket_lib_socket.o: ../../wxluasocket/src/socket.cpp
  	$(CXX) -c -o $@ $(WXLUASOCKET_LIB_CXXFLAGS) $(CPPDEPS) $<
  
! mingw$(WXLIBPOSTFIX)\wxluasocket_lib_wxlhandl.o: ../../wxluasocket/src/wxlhandl.cpp
  	$(CXX) -c -o $@ $(WXLUASOCKET_LIB_CXXFLAGS) $(CPPDEPS) $<
  
! mingw$(WXLIBPOSTFIX)\wxluasocket_dll_debugio.o: ../../wxluasocket/src/debugio.cpp
  	$(CXX) -c -o $@ $(WXLUASOCKET_DLL_CXXFLAGS) $(CPPDEPS) $<
  
! mingw$(WXLIBPOSTFIX)\wxluasocket_dll_dserver.o: ../../wxluasocket/src/dserver.cpp
  	$(CXX) -c -o $@ $(WXLUASOCKET_DLL_CXXFLAGS) $(CPPDEPS) $<
  
! mingw$(WXLIBPOSTFIX)\wxluasocket_dll_dtarget.o: ../../wxluasocket/src/dtarget.cpp
  	$(CXX) -c -o $@ $(WXLUASOCKET_DLL_CXXFLAGS) $(CPPDEPS) $<
  
! mingw$(WXLIBPOSTFIX)\wxluasocket_dll_socket.o: ../../wxluasocket/src/socket.cpp
  	$(CXX) -c -o $@ $(WXLUASOCKET_DLL_CXXFLAGS) $(CPPDEPS) $<
  
! mingw$(WXLIBPOSTFIX)\wxluasocket_dll_wxlhandl.o: ../../wxluasocket/src/wxlhandl.cpp
  	$(CXX) -c -o $@ $(WXLUASOCKET_DLL_CXXFLAGS) $(CPPDEPS) $<
  
--- 773,804 ----
  	$(CXX) -c -o $@ $(WXLUADEBUG_DLL_CXXFLAGS) $(CPPDEPS) $<
  
! mingw$(WXLIBPOSTFIX)\wxluasocket_lib_wxldbgio.o: ../../wxluasocket/src/wxldbgio.cpp
  	$(CXX) -c -o $@ $(WXLUASOCKET_LIB_CXXFLAGS) $(CPPDEPS) $<
  
! mingw$(WXLIBPOSTFIX)\wxluasocket_lib_wxldserv.o: ../../wxluasocket/src/wxldserv.cpp
  	$(CXX) -c -o $@ $(WXLUASOCKET_LIB_CXXFLAGS) $(CPPDEPS) $<
  
! mingw$(WXLIBPOSTFIX)\wxluasocket_lib_wxldtarg.o: ../../wxluasocket/src/wxldtarg.cpp
  	$(CXX) -c -o $@ $(WXLUASOCKET_LIB_CXXFLAGS) $(CPPDEPS) $<
  
! mingw$(WXLIBPOSTFIX)\wxluasocket_lib_wxlhandl.o: ../../wxluasocket/src/wxlhandl.cpp
  	$(CXX) -c -o $@ $(WXLUASOCKET_LIB_CXXFLAGS) $(CPPDEPS) $<
  
! mingw$(WXLIBPOSTFIX)\wxluasocket_lib_wxlsock.o: ../../wxluasocket/src/wxlsock.cpp
  	$(CXX) -c -o $@ $(WXLUASOCKET_LIB_CXXFLAGS) $(CPPDEPS) $<
  
! mingw$(WXLIBPOSTFIX)\wxluasocket_dll_wxldbgio.o: ../../wxluasocket/src/wxldbgio.cpp
  	$(CXX) -c -o $@ $(WXLUASOCKET_DLL_CXXFLAGS) $(CPPDEPS) $<
  
! mingw$(WXLIBPOSTFIX)\wxluasocket_dll_wxldserv.o: ../../wxluasocket/src/wxldserv.cpp
  	$(CXX) -c -o $@ $(WXLUASOCKET_DLL_CXXFLAGS) $(CPPDEPS) $<
  
! mingw$(WXLIBPOSTFIX)\wxluasocket_dll_wxldtarg.o: ../../wxluasocket/src/wxldtarg.cpp
  	$(CXX) -c -o $@ $(WXLUASOCKET_DLL_CXXFLAGS) $(CPPDEPS) $<
  
! mingw$(WXLIBPOSTFIX)\wxluasocket_dll_wxlhandl.o: ../../wxluasocket/src/wxlhandl.cpp
  	$(CXX) -c -o $@ $(WXLUASOCKET_DLL_CXXFLAGS) $(CPPDEPS) $<
  
! mingw$(WXLIBPOSTFIX)\wxluasocket_dll_wxlsock.o: ../../wxluasocket/src/wxlsock.cpp
  	$(CXX) -c -o $@ $(WXLUASOCKET_DLL_CXXFLAGS) $(CPPDEPS) $<
  

[Wxlua-commit] wxLua/apps/wxlua/src wxlua.h,1.3,1.4

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

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

Modified Files:
	wxlua.h 
Log Message:
rename wxluasocket files to wxl* for consistency and make it easier to find them


Index: wxlua.h
===================================================================
RCS file: /cvsroot/wxlua/wxLua/apps/wxlua/src/wxlua.h,v
retrieving revision 1.3
retrieving revision 1.4
diff -C2 -d -r1.3 -r1.4
*** wxlua.h	25 Nov 2005 19:03:26 -0000	1.3
--- wxlua.h	25 Nov 2005 19:22:57 -0000	1.4
***************
*** 24,28 ****
  
  #if wxCHECK_VERSION(2, 3, 0)
!     #include "wxluasocket/include/dtarget.h"
  #endif
  
--- 24,28 ----
  
  #if wxCHECK_VERSION(2, 3, 0)
!     #include "wxluasocket/include/wxldtarg.h"
  #endif
  

[Wxlua-commit] wxLua/modules Makefile.in,1.10,1.11

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

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

Modified Files:
	Makefile.in 
Log Message:
moved wxlhandl.h/cpp to wxluasocket lib (that's where it's used) file was wxLuaLibrary, library


Index: Makefile.in
===================================================================
RCS file: /cvsroot/wxlua/wxLua/modules/Makefile.in,v
retrieving revision 1.10
retrieving revision 1.11
diff -C2 -d -r1.10 -r1.11
*** Makefile.in	25 Nov 2005 03:03:10 -0000	1.10
--- Makefile.in	25 Nov 2005 19:03:28 -0000	1.11
***************
*** 75,79 ****
  	wxlua_lib_wxlbind.o \
  	wxlua_lib_wxlcallb.o \
- 	wxlua_lib_wxlhandl.o \
  	wxlua_lib_wxlintrp.o \
  	wxlua_lib_wxlstate.o
--- 75,78 ----
***************
*** 84,88 ****
  	wxlua_dll_wxlbind.o \
  	wxlua_dll_wxlcallb.o \
- 	wxlua_dll_wxlhandl.o \
  	wxlua_dll_wxlintrp.o \
  	wxlua_dll_wxlstate.o
--- 83,86 ----
***************
*** 183,187 ****
  	wxluasocket_lib_dserver.o \
  	wxluasocket_lib_dtarget.o \
! 	wxluasocket_lib_socket.o
  WXLUASOCKET_DLL_CXXFLAGS = -I./../modules -DA2DWXLUASOCKETMAKINGDLL \
  	$(PIC_FLAG) $(WX_CXXFLAGS) $(CPPFLAGS) $(CXXFLAGS)
--- 181,186 ----
  	wxluasocket_lib_dserver.o \
  	wxluasocket_lib_dtarget.o \
! 	wxluasocket_lib_socket.o \
! 	wxluasocket_lib_wxlhandl.o
  WXLUASOCKET_DLL_CXXFLAGS = -I./../modules -DA2DWXLUASOCKETMAKINGDLL \
  	$(PIC_FLAG) $(WX_CXXFLAGS) $(CPPFLAGS) $(CXXFLAGS)
***************
*** 190,194 ****
  	wxluasocket_dll_dserver.o \
  	wxluasocket_dll_dtarget.o \
! 	wxluasocket_dll_socket.o
  
  ### Conditionally set variables: ###
--- 189,194 ----
  	wxluasocket_dll_dserver.o \
  	wxluasocket_dll_dtarget.o \
! 	wxluasocket_dll_socket.o \
! 	wxluasocket_dll_wxlhandl.o
  
  ### Conditionally set variables: ###
***************
*** 471,477 ****
  	$(CXXC) -c -o $@ $(WXLUA_LIB_CXXFLAGS) ./wxlua/src/wxlcallb.cpp
  
- wxlua_lib_wxlhandl.o: ./wxlua/src/wxlhandl.cpp
- 	$(CXXC) -c -o $@ $(WXLUA_LIB_CXXFLAGS) ./wxlua/src/wxlhandl.cpp
- 
  wxlua_lib_wxlintrp.o: ./wxlua/src/wxlintrp.cpp
  	$(CXXC) -c -o $@ $(WXLUA_LIB_CXXFLAGS) ./wxlua/src/wxlintrp.cpp
--- 471,474 ----
***************
*** 489,495 ****
  	$(CXXC) -c -o $@ $(WXLUA_DLL_CXXFLAGS) ./wxlua/src/wxlcallb.cpp
  
- wxlua_dll_wxlhandl.o: ./wxlua/src/wxlhandl.cpp
- 	$(CXXC) -c -o $@ $(WXLUA_DLL_CXXFLAGS) ./wxlua/src/wxlhandl.cpp
- 
  wxlua_dll_wxlintrp.o: ./wxlua/src/wxlintrp.cpp
  	$(CXXC) -c -o $@ $(WXLUA_DLL_CXXFLAGS) ./wxlua/src/wxlintrp.cpp
--- 486,489 ----
***************
*** 750,753 ****
--- 744,750 ----
  	$(CXXC) -c -o $@ $(WXLUASOCKET_LIB_CXXFLAGS) ./wxluasocket/src/socket.cpp
  
+ wxluasocket_lib_wxlhandl.o: ./wxluasocket/src/wxlhandl.cpp
+ 	$(CXXC) -c -o $@ $(WXLUASOCKET_LIB_CXXFLAGS) ./wxluasocket/src/wxlhandl.cpp
+ 
  wxluasocket_dll_debugio.o: ./wxluasocket/src/debugio.cpp
  	$(CXXC) -c -o $@ $(WXLUASOCKET_DLL_CXXFLAGS) ./wxluasocket/src/debugio.cpp
***************
*** 762,765 ****
--- 759,765 ----
  	$(CXXC) -c -o $@ $(WXLUASOCKET_DLL_CXXFLAGS) ./wxluasocket/src/socket.cpp
  
+ wxluasocket_dll_wxlhandl.o: ./wxluasocket/src/wxlhandl.cpp
+ 	$(CXXC) -c -o $@ $(WXLUASOCKET_DLL_CXXFLAGS) ./wxluasocket/src/wxlhandl.cpp
+ 
  
  # Include dependency info, if present:

[Wxlua-commit] wxLua/modules/wxluasocket/include wxlhandl.h,NONE,1.1

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

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

Added Files:
	wxlhandl.h 
Log Message:
moved wxlhandl.h/cpp to wxluasocket lib (that's where it's used) file was wxLuaLibrary, library


--- 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/thread.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;
    virtual void DisplayError(const wxString &strError) const = 0;

//#if wxUSE_LUASTACKFRAME FIXME - do we need this? see also wxluadebug/src/staktree.cpp
//    virtual void SetStackFrame(wxLuaStackFrame *pStackFrame) = 0;
//#endif // wxUSE_LUASTACKFRAME

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

    // Get the single global wxLuaHandler
    // note: if sm_luahandler = NULL let this fail hard, it should NEVER happen
    static wxLuaHandler& GetHandler() { return *sm_luahandler; }

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


// Lua App/Debugger Interface - use wxLuaHandler::GetHandler
wxDEPRECATED( wxLuaHandler& wxGetLuaHandler() );

#endif //_WXLHANDL_H_

[Wxlua-commit] wxLua/modules/build/msw makefile.bcc,1.12,1.13 makefile.gcc,1.12,1.13 makefile.vc,1.10,1.11 makefile.wat,1.10,1.11

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

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

Modified Files:
	makefile.bcc makefile.gcc makefile.vc makefile.wat 
Log Message:
moved wxlhandl.h/cpp to wxluasocket lib (that's where it's used) file was wxLuaLibrary, library


Index: makefile.vc
===================================================================
RCS file: /cvsroot/wxlua/wxLua/modules/build/msw/makefile.vc,v
retrieving revision 1.10
retrieving revision 1.11
diff -C2 -d -r1.10 -r1.11
*** makefile.vc	25 Nov 2005 03:03:10 -0000	1.10
--- makefile.vc	25 Nov 2005 19:03:28 -0000	1.11
***************
*** 97,101 ****
  	msvc$(WXLIBPOSTFIX)\wxlua_lib_wxlbind.obj \
  	msvc$(WXLIBPOSTFIX)\wxlua_lib_wxlcallb.obj \
- 	msvc$(WXLIBPOSTFIX)\wxlua_lib_wxlhandl.obj \
  	msvc$(WXLIBPOSTFIX)\wxlua_lib_wxlintrp.obj \
  	msvc$(WXLIBPOSTFIX)\wxlua_lib_wxlstate.obj
--- 97,100 ----
***************
*** 111,115 ****
  	msvc$(WXLIBPOSTFIX)\wxlua_dll_wxlbind.obj \
  	msvc$(WXLIBPOSTFIX)\wxlua_dll_wxlcallb.obj \
- 	msvc$(WXLIBPOSTFIX)\wxlua_dll_wxlhandl.obj \
  	msvc$(WXLIBPOSTFIX)\wxlua_dll_wxlintrp.obj \
  	msvc$(WXLIBPOSTFIX)\wxlua_dll_wxlstate.obj
--- 110,113 ----
***************
*** 237,241 ****
  	msvc$(WXLIBPOSTFIX)\wxluasocket_lib_dserver.obj \
  	msvc$(WXLIBPOSTFIX)\wxluasocket_lib_dtarget.obj \
! 	msvc$(WXLIBPOSTFIX)\wxluasocket_lib_socket.obj
  WXLUASOCKET_DLL_CXXFLAGS = /MD$(__DEBUGRUNTIME) /DWIN32 \
  	$(__WXUNICODE_DEFINE_p) $(__WXDEBUG_DEFINE_p) /D__WXMSW__ \
--- 235,240 ----
  	msvc$(WXLIBPOSTFIX)\wxluasocket_lib_dserver.obj \
  	msvc$(WXLIBPOSTFIX)\wxluasocket_lib_dtarget.obj \
! 	msvc$(WXLIBPOSTFIX)\wxluasocket_lib_socket.obj \
! 	msvc$(WXLIBPOSTFIX)\wxluasocket_lib_wxlhandl.obj
  WXLUASOCKET_DLL_CXXFLAGS = /MD$(__DEBUGRUNTIME) /DWIN32 \
  	$(__WXUNICODE_DEFINE_p) $(__WXDEBUG_DEFINE_p) /D__WXMSW__ \
***************
*** 249,253 ****
  	msvc$(WXLIBPOSTFIX)\wxluasocket_dll_dserver.obj \
  	msvc$(WXLIBPOSTFIX)\wxluasocket_dll_dtarget.obj \
! 	msvc$(WXLIBPOSTFIX)\wxluasocket_dll_socket.obj
  
  ### Conditionally set variables: ###
--- 248,253 ----
  	msvc$(WXLIBPOSTFIX)\wxluasocket_dll_dserver.obj \
  	msvc$(WXLIBPOSTFIX)\wxluasocket_dll_dtarget.obj \
! 	msvc$(WXLIBPOSTFIX)\wxluasocket_dll_socket.obj \
! 	msvc$(WXLIBPOSTFIX)\wxluasocket_dll_wxlhandl.obj
  
  ### Conditionally set variables: ###
***************
*** 558,564 ****
  	$(CXX) /c /nologo /TP /Fo$@ $(WXLUA_LIB_CXXFLAGS) $**
  
- msvc$(WXLIBPOSTFIX)\wxlua_lib_wxlhandl.obj: ..\..\wxlua\src\wxlhandl.cpp
- 	$(CXX) /c /nologo /TP /Fo$@ $(WXLUA_LIB_CXXFLAGS) $**
- 
  msvc$(WXLIBPOSTFIX)\wxlua_lib_wxlintrp.obj: ..\..\wxlua\src\wxlintrp.cpp
  	$(CXX) /c /nologo /TP /Fo$@ $(WXLUA_LIB_CXXFLAGS) $**
--- 558,561 ----
***************
*** 576,582 ****
  	$(CXX) /c /nologo /TP /Fo$@ $(WXLUA_DLL_CXXFLAGS) $**
  
- msvc$(WXLIBPOSTFIX)\wxlua_dll_wxlhandl.obj: ..\..\wxlua\src\wxlhandl.cpp
- 	$(CXX) /c /nologo /TP /Fo$@ $(WXLUA_DLL_CXXFLAGS) $**
- 
  msvc$(WXLIBPOSTFIX)\wxlua_dll_wxlintrp.obj: ..\..\wxlua\src\wxlintrp.cpp
  	$(CXX) /c /nologo /TP /Fo$@ $(WXLUA_DLL_CXXFLAGS) $**
--- 573,576 ----
***************
*** 837,840 ****
--- 831,837 ----
  	$(CXX) /c /nologo /TP /Fo$@ $(WXLUASOCKET_LIB_CXXFLAGS) $**
  
+ msvc$(WXLIBPOSTFIX)\wxluasocket_lib_wxlhandl.obj: ..\..\wxluasocket\src\wxlhandl.cpp
+ 	$(CXX) /c /nologo /TP /Fo$@ $(WXLUASOCKET_LIB_CXXFLAGS) $**
+ 
  msvc$(WXLIBPOSTFIX)\wxluasocket_dll_debugio.obj: ..\..\wxluasocket\src\debugio.cpp
  	$(CXX) /c /nologo /TP /Fo$@ $(WXLUASOCKET_DLL_CXXFLAGS) $**
***************
*** 849,850 ****
--- 846,850 ----
  	$(CXX) /c /nologo /TP /Fo$@ $(WXLUASOCKET_DLL_CXXFLAGS) $**
  
+ msvc$(WXLIBPOSTFIX)\wxluasocket_dll_wxlhandl.obj: ..\..\wxluasocket\src\wxlhandl.cpp
+ 	$(CXX) /c /nologo /TP /Fo$@ $(WXLUASOCKET_DLL_CXXFLAGS) $**
+ 

Index: makefile.bcc
===================================================================
RCS file: /cvsroot/wxlua/wxLua/modules/build/msw/makefile.bcc,v
retrieving revision 1.12
retrieving revision 1.13
diff -C2 -d -r1.12 -r1.13
*** makefile.bcc	25 Nov 2005 03:03:10 -0000	1.12
--- makefile.bcc	25 Nov 2005 19:03:28 -0000	1.13
***************
*** 126,130 ****
  	borland$(WXLIBPOSTFIX)\wxlua_lib_wxlbind.obj \
  	borland$(WXLIBPOSTFIX)\wxlua_lib_wxlcallb.obj \
- 	borland$(WXLIBPOSTFIX)\wxlua_lib_wxlhandl.obj \
  	borland$(WXLIBPOSTFIX)\wxlua_lib_wxlintrp.obj \
  	borland$(WXLIBPOSTFIX)\wxlua_lib_wxlstate.obj
--- 126,129 ----
***************
*** 139,143 ****
  	borland$(WXLIBPOSTFIX)\wxlua_dll_wxlbind.obj \
  	borland$(WXLIBPOSTFIX)\wxlua_dll_wxlcallb.obj \
- 	borland$(WXLIBPOSTFIX)\wxlua_dll_wxlhandl.obj \
  	borland$(WXLIBPOSTFIX)\wxlua_dll_wxlintrp.obj \
  	borland$(WXLIBPOSTFIX)\wxlua_dll_wxlstate.obj
--- 138,141 ----
***************
*** 257,261 ****
  	borland$(WXLIBPOSTFIX)\wxluasocket_lib_dserver.obj \
  	borland$(WXLIBPOSTFIX)\wxluasocket_lib_dtarget.obj \
! 	borland$(WXLIBPOSTFIX)\wxluasocket_lib_socket.obj
  WXLUASOCKET_DLL_CXXFLAGS = -I$(BCCDIR)\include $(__WXUNICODE_DEFINE_p) \
  	$(__WXDEBUG_DEFINE_p) -D__WXMSW__ \
--- 255,260 ----
  	borland$(WXLIBPOSTFIX)\wxluasocket_lib_dserver.obj \
  	borland$(WXLIBPOSTFIX)\wxluasocket_lib_dtarget.obj \
! 	borland$(WXLIBPOSTFIX)\wxluasocket_lib_socket.obj \
! 	borland$(WXLIBPOSTFIX)\wxluasocket_lib_wxlhandl.obj
  WXLUASOCKET_DLL_CXXFLAGS = -I$(BCCDIR)\include $(__WXUNICODE_DEFINE_p) \
  	$(__WXDEBUG_DEFINE_p) -D__WXMSW__ \
***************
*** 268,272 ****
  	borland$(WXLIBPOSTFIX)\wxluasocket_dll_dserver.obj \
  	borland$(WXLIBPOSTFIX)\wxluasocket_dll_dtarget.obj \
! 	borland$(WXLIBPOSTFIX)\wxluasocket_dll_socket.obj
  
  ### Conditionally set variables: ###
--- 267,272 ----
  	borland$(WXLIBPOSTFIX)\wxluasocket_dll_dserver.obj \
  	borland$(WXLIBPOSTFIX)\wxluasocket_dll_dtarget.obj \
! 	borland$(WXLIBPOSTFIX)\wxluasocket_dll_socket.obj \
! 	borland$(WXLIBPOSTFIX)\wxluasocket_dll_wxlhandl.obj
  
  ### Conditionally set variables: ###
***************
*** 572,578 ****
  	$(CXX) -q -c -P -o$@ $(WXLUA_LIB_CXXFLAGS) $**
  
- borland$(WXLIBPOSTFIX)\wxlua_lib_wxlhandl.obj: ..\..\wxlua\src\wxlhandl.cpp
- 	$(CXX) -q -c -P -o$@ $(WXLUA_LIB_CXXFLAGS) $**
- 
  borland$(WXLIBPOSTFIX)\wxlua_lib_wxlintrp.obj: ..\..\wxlua\src\wxlintrp.cpp
  	$(CXX) -q -c -P -o$@ $(WXLUA_LIB_CXXFLAGS) $**
--- 572,575 ----
***************
*** 590,596 ****
  	$(CXX) -q -c -P -o$@ $(WXLUA_DLL_CXXFLAGS) $**
  
- borland$(WXLIBPOSTFIX)\wxlua_dll_wxlhandl.obj: ..\..\wxlua\src\wxlhandl.cpp
- 	$(CXX) -q -c -P -o$@ $(WXLUA_DLL_CXXFLAGS) $**
- 
  borland$(WXLIBPOSTFIX)\wxlua_dll_wxlintrp.obj: ..\..\wxlua\src\wxlintrp.cpp
  	$(CXX) -q -c -P -o$@ $(WXLUA_DLL_CXXFLAGS) $**
--- 587,590 ----
***************
*** 851,854 ****
--- 845,851 ----
  	$(CXX) -q -c -P -o$@ $(WXLUASOCKET_LIB_CXXFLAGS) $**
  
+ borland$(WXLIBPOSTFIX)\wxluasocket_lib_wxlhandl.obj: ..\..\wxluasocket\src\wxlhandl.cpp
+ 	$(CXX) -q -c -P -o$@ $(WXLUASOCKET_LIB_CXXFLAGS) $**
+ 
  borland$(WXLIBPOSTFIX)\wxluasocket_dll_debugio.obj: ..\..\wxluasocket\src\debugio.cpp
  	$(CXX) -q -c -P -o$@ $(WXLUASOCKET_DLL_CXXFLAGS) $**
***************
*** 863,864 ****
--- 860,864 ----
  	$(CXX) -q -c -P -o$@ $(WXLUASOCKET_DLL_CXXFLAGS) $**
  
+ borland$(WXLIBPOSTFIX)\wxluasocket_dll_wxlhandl.obj: ..\..\wxluasocket\src\wxlhandl.cpp
+ 	$(CXX) -q -c -P -o$@ $(WXLUASOCKET_DLL_CXXFLAGS) $**
+ 

Index: makefile.wat
===================================================================
RCS file: /cvsroot/wxlua/wxLua/modules/build/msw/makefile.wat,v
retrieving revision 1.10
retrieving revision 1.11
diff -C2 -d -r1.10 -r1.11
*** makefile.wat	25 Nov 2005 03:03:10 -0000	1.10
--- makefile.wat	25 Nov 2005 19:03:28 -0000	1.11
***************
*** 218,222 ****
  	watcom$(WXLIBPOSTFIX)\wxlua_lib_wxlbind.obj &
  	watcom$(WXLIBPOSTFIX)\wxlua_lib_wxlcallb.obj &
- 	watcom$(WXLIBPOSTFIX)\wxlua_lib_wxlhandl.obj &
  	watcom$(WXLIBPOSTFIX)\wxlua_lib_wxlintrp.obj &
  	watcom$(WXLIBPOSTFIX)\wxlua_lib_wxlstate.obj
--- 218,221 ----
***************
*** 230,234 ****
  	watcom$(WXLIBPOSTFIX)\wxlua_dll_wxlbind.obj &
  	watcom$(WXLIBPOSTFIX)\wxlua_dll_wxlcallb.obj &
- 	watcom$(WXLIBPOSTFIX)\wxlua_dll_wxlhandl.obj &
  	watcom$(WXLIBPOSTFIX)\wxlua_dll_wxlintrp.obj &
  	watcom$(WXLIBPOSTFIX)\wxlua_dll_wxlstate.obj
--- 229,232 ----
***************
*** 346,350 ****
  	watcom$(WXLIBPOSTFIX)\wxluasocket_lib_dserver.obj &
  	watcom$(WXLIBPOSTFIX)\wxluasocket_lib_dtarget.obj &
! 	watcom$(WXLIBPOSTFIX)\wxluasocket_lib_socket.obj
  WXLUASOCKET_DLL_CXXFLAGS = -bd $(__WXUNICODE_DEFINE_p) $(__WXDEBUG_DEFINE_p) &
  	-d__WXMSW__ -i=$(WX_DIR)$(__WXLIBPATH_FILENAMES)\msw$(WXLIBPOSTFIX) &
--- 344,349 ----
  	watcom$(WXLIBPOSTFIX)\wxluasocket_lib_dserver.obj &
  	watcom$(WXLIBPOSTFIX)\wxluasocket_lib_dtarget.obj &
! 	watcom$(WXLIBPOSTFIX)\wxluasocket_lib_socket.obj &
! 	watcom$(WXLIBPOSTFIX)\wxluasocket_lib_wxlhandl.obj
  WXLUASOCKET_DLL_CXXFLAGS = -bd $(__WXUNICODE_DEFINE_p) $(__WXDEBUG_DEFINE_p) &
  	-d__WXMSW__ -i=$(WX_DIR)$(__WXLIBPATH_FILENAMES)\msw$(WXLIBPOSTFIX) &
***************
*** 356,360 ****
  	watcom$(WXLIBPOSTFIX)\wxluasocket_dll_dserver.obj &
  	watcom$(WXLIBPOSTFIX)\wxluasocket_dll_dtarget.obj &
! 	watcom$(WXLIBPOSTFIX)\wxluasocket_dll_socket.obj
  
  
--- 355,360 ----
  	watcom$(WXLIBPOSTFIX)\wxluasocket_dll_dserver.obj &
  	watcom$(WXLIBPOSTFIX)\wxluasocket_dll_dtarget.obj &
! 	watcom$(WXLIBPOSTFIX)\wxluasocket_dll_socket.obj &
! 	watcom$(WXLIBPOSTFIX)\wxluasocket_dll_wxlhandl.obj
  
  
***************
*** 594,600 ****
  	$(CXX) -zq -fo=$^@ $(WXLUA_LIB_CXXFLAGS) $<
  
- watcom$(WXLIBPOSTFIX)\wxlua_lib_wxlhandl.obj :  .AUTODEPEND ..\..\wxlua\src\wxlhandl.cpp
- 	$(CXX) -zq -fo=$^@ $(WXLUA_LIB_CXXFLAGS) $<
- 
  watcom$(WXLIBPOSTFIX)\wxlua_lib_wxlintrp.obj :  .AUTODEPEND ..\..\wxlua\src\wxlintrp.cpp
  	$(CXX) -zq -fo=$^@ $(WXLUA_LIB_CXXFLAGS) $<
--- 594,597 ----
***************
*** 612,618 ****
  	$(CXX) -zq -fo=$^@ $(WXLUA_DLL_CXXFLAGS) $<
  
- watcom$(WXLIBPOSTFIX)\wxlua_dll_wxlhandl.obj :  .AUTODEPEND ..\..\wxlua\src\wxlhandl.cpp
- 	$(CXX) -zq -fo=$^@ $(WXLUA_DLL_CXXFLAGS) $<
- 
  watcom$(WXLIBPOSTFIX)\wxlua_dll_wxlintrp.obj :  .AUTODEPEND ..\..\wxlua\src\wxlintrp.cpp
  	$(CXX) -zq -fo=$^@ $(WXLUA_DLL_CXXFLAGS) $<
--- 609,612 ----
***************
*** 873,876 ****
--- 867,873 ----
  	$(CXX) -zq -fo=$^@ $(WXLUASOCKET_LIB_CXXFLAGS) $<
  
+ watcom$(WXLIBPOSTFIX)\wxluasocket_lib_wxlhandl.obj :  .AUTODEPEND ..\..\wxluasocket\src\wxlhandl.cpp
+ 	$(CXX) -zq -fo=$^@ $(WXLUASOCKET_LIB_CXXFLAGS) $<
+ 
  watcom$(WXLIBPOSTFIX)\wxluasocket_dll_debugio.obj :  .AUTODEPEND ..\..\wxluasocket\src\debugio.cpp
  	$(CXX) -zq -fo=$^@ $(WXLUASOCKET_DLL_CXXFLAGS) $<
***************
*** 885,886 ****
--- 882,886 ----
  	$(CXX) -zq -fo=$^@ $(WXLUASOCKET_DLL_CXXFLAGS) $<
  
+ watcom$(WXLIBPOSTFIX)\wxluasocket_dll_wxlhandl.obj :  .AUTODEPEND ..\..\wxluasocket\src\wxlhandl.cpp
+ 	$(CXX) -zq -fo=$^@ $(WXLUASOCKET_DLL_CXXFLAGS) $<
+ 

Index: makefile.gcc
===================================================================
RCS file: /cvsroot/wxlua/wxLua/modules/build/msw/makefile.gcc,v
retrieving revision 1.12
retrieving revision 1.13
diff -C2 -d -r1.12 -r1.13
*** makefile.gcc	25 Nov 2005 03:03:10 -0000	1.12
--- makefile.gcc	25 Nov 2005 19:03:28 -0000	1.13
***************
*** 96,100 ****
  	mingw$(WXLIBPOSTFIX)\wxlua_lib_wxlbind.o \
  	mingw$(WXLIBPOSTFIX)\wxlua_lib_wxlcallb.o \
- 	mingw$(WXLIBPOSTFIX)\wxlua_lib_wxlhandl.o \
  	mingw$(WXLIBPOSTFIX)\wxlua_lib_wxlintrp.o \
  	mingw$(WXLIBPOSTFIX)\wxlua_lib_wxlstate.o
--- 96,99 ----
***************
*** 109,113 ****
  	mingw$(WXLIBPOSTFIX)\wxlua_dll_wxlbind.o \
  	mingw$(WXLIBPOSTFIX)\wxlua_dll_wxlcallb.o \
- 	mingw$(WXLIBPOSTFIX)\wxlua_dll_wxlhandl.o \
  	mingw$(WXLIBPOSTFIX)\wxlua_dll_wxlintrp.o \
  	mingw$(WXLIBPOSTFIX)\wxlua_dll_wxlstate.o
--- 108,111 ----
***************
*** 230,234 ****
  	mingw$(WXLIBPOSTFIX)\wxluasocket_lib_dserver.o \
  	mingw$(WXLIBPOSTFIX)\wxluasocket_lib_dtarget.o \
! 	mingw$(WXLIBPOSTFIX)\wxluasocket_lib_socket.o
  WXLUASOCKET_DLL_CXXFLAGS = -DHAVE_W32API_H $(__WXUNICODE_DEFINE_p) \
  	$(__WXDEBUG_DEFINE_p) -D__WXMSW__ \
--- 228,233 ----
  	mingw$(WXLIBPOSTFIX)\wxluasocket_lib_dserver.o \
  	mingw$(WXLIBPOSTFIX)\wxluasocket_lib_dtarget.o \
! 	mingw$(WXLIBPOSTFIX)\wxluasocket_lib_socket.o \
! 	mingw$(WXLIBPOSTFIX)\wxluasocket_lib_wxlhandl.o
  WXLUASOCKET_DLL_CXXFLAGS = -DHAVE_W32API_H $(__WXUNICODE_DEFINE_p) \
  	$(__WXDEBUG_DEFINE_p) -D__WXMSW__ \
***************
*** 241,245 ****
  	mingw$(WXLIBPOSTFIX)\wxluasocket_dll_dserver.o \
  	mingw$(WXLIBPOSTFIX)\wxluasocket_dll_dtarget.o \
! 	mingw$(WXLIBPOSTFIX)\wxluasocket_dll_socket.o
  
  ### Conditionally set variables: ###
--- 240,245 ----
  	mingw$(WXLIBPOSTFIX)\wxluasocket_dll_dserver.o \
  	mingw$(WXLIBPOSTFIX)\wxluasocket_dll_dtarget.o \
! 	mingw$(WXLIBPOSTFIX)\wxluasocket_dll_socket.o \
! 	mingw$(WXLIBPOSTFIX)\wxluasocket_dll_wxlhandl.o
  
  ### Conditionally set variables: ###
***************
*** 512,518 ****
  	$(CXX) -c -o $@ $(WXLUA_LIB_CXXFLAGS) $(CPPDEPS) $<
  
- mingw$(WXLIBPOSTFIX)\wxlua_lib_wxlhandl.o: ../../wxlua/src/wxlhandl.cpp
- 	$(CXX) -c -o $@ $(WXLUA_LIB_CXXFLAGS) $(CPPDEPS) $<
- 
  mingw$(WXLIBPOSTFIX)\wxlua_lib_wxlintrp.o: ../../wxlua/src/wxlintrp.cpp
  	$(CXX) -c -o $@ $(WXLUA_LIB_CXXFLAGS) $(CPPDEPS) $<
--- 512,515 ----
***************
*** 530,536 ****
  	$(CXX) -c -o $@ $(WXLUA_DLL_CXXFLAGS) $(CPPDEPS) $<
  
- mingw$(WXLIBPOSTFIX)\wxlua_dll_wxlhandl.o: ../../wxlua/src/wxlhandl.cpp
- 	$(CXX) -c -o $@ $(WXLUA_DLL_CXXFLAGS) $(CPPDEPS) $<
- 
  mingw$(WXLIBPOSTFIX)\wxlua_dll_wxlintrp.o: ../../wxlua/src/wxlintrp.cpp
  	$(CXX) -c -o $@ $(WXLUA_DLL_CXXFLAGS) $(CPPDEPS) $<
--- 527,530 ----
***************
*** 791,794 ****
--- 785,791 ----
  	$(CXX) -c -o $@ $(WXLUASOCKET_LIB_CXXFLAGS) $(CPPDEPS) $<
  
+ mingw$(WXLIBPOSTFIX)\wxluasocket_lib_wxlhandl.o: ../../wxluasocket/src/wxlhandl.cpp
+ 	$(CXX) -c -o $@ $(WXLUASOCKET_LIB_CXXFLAGS) $(CPPDEPS) $<
+ 
  mingw$(WXLIBPOSTFIX)\wxluasocket_dll_debugio.o: ../../wxluasocket/src/debugio.cpp
  	$(CXX) -c -o $@ $(WXLUASOCKET_DLL_CXXFLAGS) $(CPPDEPS) $<
***************
*** 803,806 ****
--- 800,806 ----
  	$(CXX) -c -o $@ $(WXLUASOCKET_DLL_CXXFLAGS) $(CPPDEPS) $<
  
+ mingw$(WXLIBPOSTFIX)\wxluasocket_dll_wxlhandl.o: ../../wxluasocket/src/wxlhandl.cpp
+ 	$(CXX) -c -o $@ $(WXLUASOCKET_DLL_CXXFLAGS) $(CPPDEPS) $<
+ 
  .PHONY: all clean
  

[Wxlua-commit] wxLua/modules/wxlua/include wxlhandl.h,1.2,NONE

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

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

Removed Files:
	wxlhandl.h 
Log Message:
moved wxlhandl.h/cpp to wxluasocket lib (that's where it's used) file was wxLuaLibrary, library


--- wxlhandl.h DELETED ---

[Wxlua-commit] wxLua/modules/wxluasocket/src wxlhandl.cpp,NONE,1.1 Makefile,1.2,1.3 dserver.cpp,1.5,1.6 dtarget.cpp,1.5,1.6

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

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

Modified Files:
	Makefile dserver.cpp dtarget.cpp 
Added Files:
	wxlhandl.cpp 
Log Message:
moved wxlhandl.h/cpp to wxluasocket lib (that's where it's used) file was wxLuaLibrary, library


Index: dtarget.cpp
===================================================================
RCS file: /cvsroot/wxlua/wxLua/modules/wxluasocket/src/dtarget.cpp,v
retrieving revision 1.5
retrieving revision 1.6
diff -C2 -d -r1.5 -r1.6
*** dtarget.cpp	25 Nov 2005 18:52:22 -0000	1.5
--- dtarget.cpp	25 Nov 2005 19:03:29 -0000	1.6
***************
*** 23,27 ****
  
  #include "wxluasocket/include/dtarget.h"
! #include "wxlua/include/wxlhandl.h"
  
  #if !wxCHECK_VERSION(2, 6, 0)
--- 23,27 ----
  
  #include "wxluasocket/include/dtarget.h"
! #include "wxluasocket/include/wxlhandl.h"
  
  #if !wxCHECK_VERSION(2, 6, 0)

Index: dserver.cpp
===================================================================
RCS file: /cvsroot/wxlua/wxLua/modules/wxluasocket/src/dserver.cpp,v
retrieving revision 1.5
retrieving revision 1.6
diff -C2 -d -r1.5 -r1.6
*** dserver.cpp	25 Nov 2005 18:52:22 -0000	1.5
--- dserver.cpp	25 Nov 2005 19:03:29 -0000	1.6
***************
*** 25,29 ****
  #include "wxluasocket/include/dserver.h"
  #include "wxlua/include/internal.h"
! #include "wxlua/include/wxlhandl.h"
  
  #if wxCHECK_VERSION(2, 3, 0)
--- 25,29 ----
  #include "wxluasocket/include/dserver.h"
  #include "wxlua/include/internal.h"
! #include "wxluasocket/include/wxlhandl.h"
  
  #if wxCHECK_VERSION(2, 3, 0)

Index: Makefile
===================================================================
RCS file: /cvsroot/wxlua/wxLua/modules/wxluasocket/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 19:03:29 -0000	1.3
***************
*** 54,58 ****
  	../include/dserver.h \
  	../include/dtarget.h \
! 	../include/socket.h
  
  SOURCES = \
--- 54,59 ----
  	../include/dserver.h \
  	../include/dtarget.h \
! 	../include/socket.h \
! 	../include/wxlhandl.h
  
  SOURCES = \
***************
*** 60,64 ****
  	dserver.cpp \
  	dtarget.cpp \
! 	socket.cpp
  
  OBJECTS=$(SOURCES:.cpp=.o)
--- 61,66 ----
  	dserver.cpp \
  	dtarget.cpp \
! 	socket.cpp \
! 	wxlhandl.cpp
  
  OBJECTS=$(SOURCES:.cpp=.o)

--- 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 "wxluasocket/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_MSG(!sm_luahandler, wxT("There can only be one wxLuaHandler"));
    sm_luahandler = this;
}

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

wxLuaHandler& wxGetLuaHandler()
{
    return wxLuaHandler::GetHandler();
}

[Wxlua-commit] wxLua/modules/wxlua/src Makefile,1.3,1.4 internal.cpp,1.8,1.9 wxlhandl.cpp,1.2,NONE

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

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

Modified Files:
	Makefile internal.cpp 
Removed Files:
	wxlhandl.cpp 
Log Message:
moved wxlhandl.h/cpp to wxluasocket lib (that's where it's used) file was wxLuaLibrary, library


Index: internal.cpp
===================================================================
RCS file: /cvsroot/wxlua/wxLua/modules/wxlua/src/internal.cpp,v
retrieving revision 1.8
retrieving revision 1.9
diff -C2 -d -r1.8 -r1.9
*** internal.cpp	25 Nov 2005 18:52:21 -0000	1.8
--- internal.cpp	25 Nov 2005 19:03:28 -0000	1.9
***************
*** 52,58 ****
  extern int s_wxBitmap;
  
! #if defined(__WXGTK__) || defined(__WXMAC__) || defined(__WXMOTIF__)
!     #include "../../../art/wxlua.xpm"
! #endif
  
  #include "wxlua/include/wxlintrp.h"
--- 52,58 ----
  extern int s_wxBitmap;
  
! //#if defined(__WXGTK__) || defined(__WXMAC__) || defined(__WXMOTIF__)
! //    #include "../../../art/wxlua.xpm"
! //#endif
  
  #include "wxlua/include/wxlintrp.h"

Index: Makefile
===================================================================
RCS file: /cvsroot/wxlua/wxLua/modules/wxlua/src/Makefile,v
retrieving revision 1.3
retrieving revision 1.4
diff -C2 -d -r1.3 -r1.4
*** Makefile	25 Nov 2005 02:43:02 -0000	1.3
--- Makefile	25 Nov 2005 19:03:28 -0000	1.4
***************
*** 56,60 ****
  	../include/wxlbind.h \
  	../include/wxlcallb.h \
- 	../include/wxlhandl.h \
  	../include/wxlintrp.h \
  	../include/wxlstate.h
--- 56,59 ----
***************
*** 64,68 ****
  	wxlbind.cpp \
  	wxlcallb.cpp \
- 	wxlhandl.cpp \
  	wxlintrp.cpp \
  	wxlstate.cpp
--- 63,66 ----

--- wxlhandl.cpp DELETED ---

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

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

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

Modified Files:
	sources.bkl 
Log Message:
moved wxlhandl.h/cpp to wxluasocket lib (that's where it's used) file was wxLuaLibrary, library


Index: sources.bkl
===================================================================
RCS file: /cvsroot/wxlua/wxLua/modules/build/bakefiles/sources.bkl,v
retrieving revision 1.8
retrieving revision 1.9
diff -C2 -d -r1.8 -r1.9
*** sources.bkl	25 Nov 2005 02:43:01 -0000	1.8
--- sources.bkl	25 Nov 2005 19:03:28 -0000	1.9
***************
*** 128,132 ****
          wxlua/src/wxlbind.cpp
          wxlua/src/wxlcallb.cpp
-         wxlua/src/wxlhandl.cpp
          wxlua/src/wxlintrp.cpp
          wxlua/src/wxlstate.cpp
--- 128,131 ----
***************
*** 138,142 ****
           wxlua/include/wxldefs.h
           wxlua/include/wxlcallb.h
-          wxlua/include/wxlhandl.h
           wxlua/include/wxlintrp.h
           wxlua/include/wxlstate.h
--- 137,140 ----
***************
*** 169,172 ****
--- 167,171 ----
          wxluasocket/src/dtarget.cpp
          wxluasocket/src/socket.cpp
+         wxluasocket/src/wxlhandl.cpp
      </set>
  
***************
*** 176,179 ****
--- 175,179 ----
           wxluasocket/include/dtarget.h
           wxluasocket/include/socket.h
+          wxluasocket/include/wxlhandl.h
      </set>
  

[Wxlua-commit] wxLua/apps/wxlua/src wxlua.h,1.2,1.3

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

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

Modified Files:
	wxlua.h 
Log Message:
moved wxlhandl.h/cpp to wxluasocket lib (that's where it's used) file was wxLuaLibrary, library


Index: wxlua.h
===================================================================
RCS file: /cvsroot/wxlua/wxLua/apps/wxlua/src/wxlua.h,v
retrieving revision 1.2
retrieving revision 1.3
diff -C2 -d -r1.2 -r1.3
*** wxlua.h	25 Nov 2005 02:43:01 -0000	1.2
--- wxlua.h	25 Nov 2005 19:03:26 -0000	1.3
***************
*** 17,21 ****
  #endif
  
! #include "wxlua/include/wxlhandl.h"
  
  #ifdef __WXMSW__
--- 17,21 ----
  #endif
  
! #include "wxluasocket/include/wxlhandl.h"
  
  #ifdef __WXMSW__

[Wxlua-commit] wxLua/modules/wxluasocket/src debugio.cpp,1.2,1.3 dserver.cpp,1.4,1.5 dservice.cpp,1.1,1.2 dtarget.cpp,1.4,1.5

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

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

Modified Files:
	debugio.cpp dserver.cpp dservice.cpp dtarget.cpp 
Log Message:
initialize vars in debugio.cpp
add static function in wxLuaHandler to get the global handler, deprecate global function
code cleaning


Index: dtarget.cpp
===================================================================
RCS file: /cvsroot/wxlua/wxLua/modules/wxluasocket/src/dtarget.cpp,v
retrieving revision 1.4
retrieving revision 1.5
diff -C2 -d -r1.4 -r1.5
*** dtarget.cpp	25 Nov 2005 02:43:02 -0000	1.4
--- dtarget.cpp	25 Nov 2005 18:52:22 -0000	1.5
***************
*** 65,69 ****
      lua_setglobal(m_luaState, "print");
  
!     wxGetLuaHandler().EnterLuaCriticalSection();
  }
  
--- 65,69 ----
      lua_setglobal(m_luaState, "print");
  
!     wxLuaHandler::GetHandler().EnterLuaCriticalSection();
  }
  
***************
*** 73,77 ****
          delete m_pThread;
  
!     wxGetLuaHandler().LeaveLuaCriticalSection();
  }
  
--- 73,77 ----
          delete m_pThread;
  
!     wxLuaHandler::GetHandler().LeaveLuaCriticalSection();
  }
  
***************
*** 414,418 ****
          lua_Debug luaDebug;
  
!         wxGetLuaHandler().EnterLuaCriticalSection();
  
          while (lua_getstack(m_luaState, nIndex, &luaDebug) != 0)
--- 414,418 ----
          lua_Debug luaDebug;
  
!         wxLuaHandler::GetHandler().EnterLuaCriticalSection();
  
          while (lua_getstack(m_luaState, nIndex, &luaDebug) != 0)
***************
*** 444,448 ****
              ++nIndex;
          }
!         wxGetLuaHandler().LeaveLuaCriticalSection();
      }
      return NotifyStackEnumeration(pSortedList);
--- 444,448 ----
              ++nIndex;
          }
!         wxLuaHandler::GetHandler().LeaveLuaCriticalSection();
      }
      return NotifyStackEnumeration(pSortedList);
***************
*** 454,458 ****
      if (pSortedList != NULL)
      {
!         wxGetLuaHandler().EnterLuaCriticalSection();
          {
              lua_Debug luaDebug;
--- 454,458 ----
      if (pSortedList != NULL)
      {
!         wxLuaHandler::GetHandler().EnterLuaCriticalSection();
          {
              lua_Debug luaDebug;
***************
*** 541,545 ****
              }
          }
!         wxGetLuaHandler().LeaveLuaCriticalSection();
      }
      return NotifyStackEntryEnumeration(stackRef, pSortedList);
--- 541,545 ----
              }
          }
!         wxLuaHandler::GetHandler().LeaveLuaCriticalSection();
      }
      return NotifyStackEntryEnumeration(stackRef, pSortedList);
***************
*** 551,555 ****
      if (pSortedList != NULL)
      {
!         wxGetLuaHandler().EnterLuaCriticalSection();
          {
              if (tableRef == -1)
--- 551,555 ----
      if (pSortedList != NULL)
      {
!         wxLuaHandler::GetHandler().EnterLuaCriticalSection();
          {
              if (tableRef == -1)
***************
*** 700,704 ****
              }
          }
!         wxGetLuaHandler().LeaveLuaCriticalSection();
      }
      return NotifyTableEnumeration(nItemNode, pSortedList);
--- 700,704 ----
              }
          }
!         wxLuaHandler::GetHandler().LeaveLuaCriticalSection();
      }
      return NotifyTableEnumeration(nItemNode, pSortedList);
***************
*** 710,714 ****
      int      nReference = LUA_NOREF;
  
!     wxGetLuaHandler().EnterLuaCriticalSection();
      {
          if (wxStrpbrk(strExpr.c_str(), wxT(" ~=<>+-*/%(){}[]:;,.\"'")) != NULL)
--- 710,714 ----
      int      nReference = LUA_NOREF;
  
!     wxLuaHandler::GetHandler().EnterLuaCriticalSection();
      {
          if (wxStrpbrk(strExpr.c_str(), wxT(" ~=<>+-*/%(){}[]:;,.\"'")) != NULL)
***************
*** 838,842 ****
          }
      }
!     wxGetLuaHandler().LeaveLuaCriticalSection();
  
      return NotifyEvaluateExpr(exprRef, strResult);
--- 838,842 ----
          }
      }
!     wxLuaHandler::GetHandler().LeaveLuaCriticalSection();
  
      return NotifyEvaluateExpr(exprRef, strResult);
***************
*** 1078,1086 ****
          // release the critical section so
          // the other thread can access LUA
!         wxGetLuaHandler().LeaveLuaCriticalSection();
          // Wait for a command
          m_debugCondition.Wait();
          // acquire the critical section again
!         wxGetLuaHandler().EnterLuaCriticalSection();
      }
      m_fStopped = false;
--- 1078,1086 ----
          // release the critical section so
          // the other thread can access LUA
!         wxLuaHandler::GetHandler().LeaveLuaCriticalSection();
          // Wait for a command
          m_debugCondition.Wait();
          // acquire the critical section again
!         wxLuaHandler::GetHandler().EnterLuaCriticalSection();
      }
      m_fStopped = false;

Index: dserver.cpp
===================================================================
RCS file: /cvsroot/wxlua/wxLua/modules/wxluasocket/src/dserver.cpp,v
retrieving revision 1.4
retrieving revision 1.5
diff -C2 -d -r1.4 -r1.5
*** dserver.cpp	25 Nov 2005 02:43:02 -0000	1.4
--- dserver.cpp	25 Nov 2005 18:52:22 -0000	1.5
***************
*** 252,256 ****
      debugEvent.SetMessage(msg);
  
!     wxGetLuaHandler().AddPendingEvent(debugEvent);
  }
  
--- 252,256 ----
      debugEvent.SetMessage(msg);
  
!     wxLuaHandler::GetHandler().AddPendingEvent(debugEvent);
  }
  
***************
*** 527,531 ****
                      wxLuaDebugEvent debugEvent(wxEVT_DEBUG_CLIENT_CONNECTED);
  
!                     wxGetLuaHandler().AddPendingEvent(debugEvent);
  
                      // Enter the debug loop
--- 527,531 ----
                      wxLuaDebugEvent debugEvent(wxEVT_DEBUG_CLIENT_CONNECTED);
  
!                     wxLuaHandler::GetHandler().AddPendingEvent(debugEvent);
  
                      // Enter the debug loop
***************
*** 542,546 ****
                                      wxLuaDebugEvent debugEvent(wxEVT_DEBUG_BREAK, lineNumber, fileName);
  
!                                     wxGetLuaHandler().AddPendingEvent(debugEvent);
                                  }
                                  break;
--- 542,546 ----
                                      wxLuaDebugEvent debugEvent(wxEVT_DEBUG_BREAK, lineNumber, fileName);
  
!                                     wxLuaHandler::GetHandler().AddPendingEvent(debugEvent);
                                  }
                                  break;
***************
*** 553,557 ****
                                      debugEvent.SetMessage(strMessage);
  
!                                     wxGetLuaHandler().AddPendingEvent(debugEvent);
                                  }
                                  break;
--- 553,557 ----
                                      debugEvent.SetMessage(strMessage);
  
!                                     wxLuaHandler::GetHandler().AddPendingEvent(debugEvent);
                                  }
                                  break;
***************
*** 564,568 ****
                                      debugEvent.SetMessage(strMessage);
  
!                                     wxGetLuaHandler().AddPendingEvent(debugEvent);
                                  }
                                  break;
--- 564,568 ----
                                      debugEvent.SetMessage(strMessage);
  
!                                     wxLuaHandler::GetHandler().AddPendingEvent(debugEvent);
                                  }
                                  break;
***************
*** 571,575 ****
                                  {
                                      wxLuaDebugEvent debugEvent(wxEVT_DEBUG_EXIT);
!                                     wxGetLuaHandler().AddPendingEvent(debugEvent);
                                      m_fShutdown = true;
                                  }
--- 571,575 ----
                                  {
                                      wxLuaDebugEvent debugEvent(wxEVT_DEBUG_EXIT);
!                                     wxLuaHandler::GetHandler().AddPendingEvent(debugEvent);
                                      m_fShutdown = true;
                                  }
***************
*** 583,587 ****
                                          debugEvent.SetDebugData(-1, pDebugData);
  
!                                     wxGetLuaHandler().AddPendingEvent(debugEvent);
                                  }
                                  break;
--- 583,587 ----
                                          debugEvent.SetDebugData(-1, pDebugData);
  
!                                     wxLuaHandler::GetHandler().AddPendingEvent(debugEvent);
                                  }
                                  break;
***************
*** 595,599 ****
                                          debugEvent.SetDebugData(stackRef, pDebugData);
  
!                                     wxGetLuaHandler().AddPendingEvent(debugEvent);
                                  }
                                  break;
--- 595,599 ----
                                          debugEvent.SetDebugData(stackRef, pDebugData);
  
!                                     wxLuaHandler::GetHandler().AddPendingEvent(debugEvent);
                                  }
                                  break;
***************
*** 607,611 ****
                                          debugEvent.SetDebugData(itemNode, pDebugData);
  
!                                     wxGetLuaHandler().AddPendingEvent(debugEvent);
                                  }
                                  break;
--- 607,611 ----
                                          debugEvent.SetDebugData(itemNode, pDebugData);
  
!                                     wxLuaHandler::GetHandler().AddPendingEvent(debugEvent);
                                  }
                                  break;
***************
*** 620,624 ****
                                      debugEvent.SetDebugData(exprRef);
  
!                                     wxGetLuaHandler().AddPendingEvent(debugEvent);
                                  }
                                  break;
--- 620,624 ----
                                      debugEvent.SetDebugData(exprRef);
  
!                                     wxLuaHandler::GetHandler().AddPendingEvent(debugEvent);
                                  }
                                  break;

Index: dservice.cpp
===================================================================
RCS file: /cvsroot/wxlua/wxLua/modules/wxluasocket/src/dservice.cpp,v
retrieving revision 1.1
retrieving revision 1.2
diff -C2 -d -r1.1 -r1.2
*** dservice.cpp	20 Nov 2005 20:10:41 -0000	1.1
--- dservice.cpp	25 Nov 2005 18:52:22 -0000	1.2
***************
*** 596,600 ****
  
              wxLuaDebugEvent debugEvent(wxEVT_DEBUG_STOPDEBUGGER);
!             wxGetLuaHandler().ProcessEvent(debugEvent);
          }
  
--- 596,600 ----
  
              wxLuaDebugEvent debugEvent(wxEVT_DEBUG_STOPDEBUGGER);
!             wxLuaHandler::GetHandler().ProcessEvent(debugEvent);
          }
  
***************
*** 660,664 ****
  
          // started debug process
!         if (!wxGetLuaHandler().ProcessEvent(debugEvent))
              return false;
  
--- 660,664 ----
  
          // started debug process
!         if (!wxLuaHandler::GetHandler().ProcessEvent(debugEvent))
              return false;
  
***************
*** 987,991 ****
                  wxLuaDebugEvent debugEvent(wxEVT_DEBUG_BREAK, lineNumber, fileName);
  
!                 wxGetLuaHandler().AddPendingEvent(debugEvent);
              }
              break;
--- 987,991 ----
                  wxLuaDebugEvent debugEvent(wxEVT_DEBUG_BREAK, lineNumber, fileName);
  
!                 wxLuaHandler::GetHandler().AddPendingEvent(debugEvent);
              }
              break;
***************
*** 998,1002 ****
                  debugEvent.SetMessage(strMessage);
  
!                 wxGetLuaHandler().AddPendingEvent(debugEvent);
              }
              break;
--- 998,1002 ----
                  debugEvent.SetMessage(strMessage);
  
!                 wxLuaHandler::GetHandler().AddPendingEvent(debugEvent);
              }
              break;
***************
*** 1009,1013 ****
                  debugEvent.SetMessage(strMessage);
  
!                 wxGetLuaHandler().AddPendingEvent(debugEvent);
              }
              break;
--- 1009,1013 ----
                  debugEvent.SetMessage(strMessage);
  
!                 wxLuaHandler::GetHandler().AddPendingEvent(debugEvent);
              }
              break;
***************
*** 1016,1020 ****
              {
                  wxLuaDebugEvent debugEvent(wxEVT_DEBUG_EXIT);
!                 wxGetLuaHandler().AddPendingEvent(debugEvent);
              }
              break;
--- 1016,1020 ----
              {
                  wxLuaDebugEvent debugEvent(wxEVT_DEBUG_EXIT);
!                 wxLuaHandler::GetHandler().AddPendingEvent(debugEvent);
              }
              break;
***************
*** 1027,1031 ****
                      debugEvent.SetDebugData(-1, pDebugData);
  
!                 wxGetLuaHandler().AddPendingEvent(debugEvent);
              }
              break;
--- 1027,1031 ----
                      debugEvent.SetDebugData(-1, pDebugData);
  
!                 wxLuaHandler::GetHandler().AddPendingEvent(debugEvent);
              }
              break;
***************
*** 1039,1043 ****
                      debugEvent.SetDebugData(stackRef, pDebugData);
  
!                 wxGetLuaHandler().AddPendingEvent(debugEvent);
              }
              break;
--- 1039,1043 ----
                      debugEvent.SetDebugData(stackRef, pDebugData);
  
!                 wxLuaHandler::GetHandler().AddPendingEvent(debugEvent);
              }
              break;
***************
*** 1051,1055 ****
                      debugEvent.SetDebugData(itemNode, pDebugData);
  
!                 wxGetLuaHandler().AddPendingEvent(debugEvent);
              }
              break;
--- 1051,1055 ----
                      debugEvent.SetDebugData(itemNode, pDebugData);
  
!                 wxLuaHandler::GetHandler().AddPendingEvent(debugEvent);
              }
              break;
***************
*** 1064,1068 ****
                  debugEvent.SetDebugData(exprRef);
  
!                 wxGetLuaHandler().AddPendingEvent(debugEvent);
              }
              break;
--- 1064,1068 ----
                  debugEvent.SetDebugData(exprRef);
  
!                 wxLuaHandler::GetHandler().AddPendingEvent(debugEvent);
              }
              break;
***************
*** 1075,1079 ****
  
                  wxLuaDebugEvent  debugEvent(wxEVT_DEBUG_BREAKPOINT_ADDED, line, fileName, enabled);
!                 wxGetLuaHandler().AddPendingEvent(debugEvent);
              }
              break;
--- 1075,1079 ----
  
                  wxLuaDebugEvent  debugEvent(wxEVT_DEBUG_BREAKPOINT_ADDED, line, fileName, enabled);
!                 wxLuaHandler::GetHandler().AddPendingEvent(debugEvent);
              }
              break;
***************
*** 1085,1089 ****
  
                  wxLuaDebugEvent  debugEvent(wxEVT_DEBUG_BREAKPOINT_REMOVED, line, fileName);
!                 wxGetLuaHandler().AddPendingEvent(debugEvent);
              }
              break;
--- 1085,1089 ----
  
                  wxLuaDebugEvent  debugEvent(wxEVT_DEBUG_BREAKPOINT_REMOVED, line, fileName);
!                 wxLuaHandler::GetHandler().AddPendingEvent(debugEvent);
              }
              break;
***************
*** 1250,1254 ****
      debugEvent.SetMessage(msg);
  
!     wxGetLuaHandler().AddPendingEvent(debugEvent);
  }
  
--- 1250,1254 ----
      debugEvent.SetMessage(msg);
  
!     wxLuaHandler::GetHandler().AddPendingEvent(debugEvent);
  }
  
***************
*** 1277,1281 ****
      lua_setglobal(m_luaState, "print");
  
!     wxGetLuaHandler().EnterLuaCriticalSection();
  }
  
--- 1277,1281 ----
      lua_setglobal(m_luaState, "print");
  
!     wxLuaHandler::GetHandler().EnterLuaCriticalSection();
  }
  
***************
*** 1295,1299 ****
      }
  
!     wxGetLuaHandler().LeaveLuaCriticalSection();
  
      // Unhook
--- 1295,1299 ----
      }
  
!     wxLuaHandler::GetHandler().LeaveLuaCriticalSection();
  
      // Unhook
***************
*** 1400,1404 ****
          // release the critical section so
          // the other thread can access LUA
!         wxGetLuaHandler().LeaveLuaCriticalSection();
  
          // Wait for Debugger To Send Command
--- 1400,1404 ----
          // release the critical section so
          // the other thread can access LUA
!         wxLuaHandler::GetHandler().LeaveLuaCriticalSection();
  
          // Wait for Debugger To Send Command
***************
*** 1417,1421 ****
  
          // acquire the critical section again
!         wxGetLuaHandler().EnterLuaCriticalSection();
      }
  
--- 1417,1421 ----
  
          // acquire the critical section again
!         wxLuaHandler::GetHandler().EnterLuaCriticalSection();
      }
  
***************
*** 1473,1477 ****
  #endif
  
!         wxGetLuaHandler().AddPendingEvent(debugEvent);
      }
  }
--- 1473,1477 ----
  #endif
  
!         wxLuaHandler::GetHandler().AddPendingEvent(debugEvent);
      }
  }
***************
*** 1499,1503 ****
          wxLuaDebugEvent  debugEvent(wxEVT_DEBUG_BREAKPOINT_REMOVED, lineNumber, fileName);
  #endif
!         wxGetLuaHandler().AddPendingEvent(debugEvent);
  
          delete breakPoint;
--- 1499,1503 ----
          wxLuaDebugEvent  debugEvent(wxEVT_DEBUG_BREAKPOINT_REMOVED, lineNumber, fileName);
  #endif
!         wxLuaHandler::GetHandler().AddPendingEvent(debugEvent);
  
          delete breakPoint;
***************
*** 1590,1594 ****
          lua_Debug luaDebug;
  
!         wxGetLuaHandler().EnterLuaCriticalSection();
  
          while (lua_getstack(m_luaState, nIndex, &luaDebug) != 0)
--- 1590,1594 ----
          lua_Debug luaDebug;
  
!         wxLuaHandler::GetHandler().EnterLuaCriticalSection();
  
          while (lua_getstack(m_luaState, nIndex, &luaDebug) != 0)
***************
*** 1623,1627 ****
              ++nIndex;
          }
!         wxGetLuaHandler().LeaveLuaCriticalSection();
      }
  
--- 1623,1627 ----
              ++nIndex;
          }
!         wxLuaHandler::GetHandler().LeaveLuaCriticalSection();
      }
  
***************
*** 1634,1638 ****
      if (pSortedList != NULL)
      {
!         wxGetLuaHandler().EnterLuaCriticalSection();
          {
              lua_Debug luaDebug;
--- 1634,1638 ----
      if (pSortedList != NULL)
      {
!         wxLuaHandler::GetHandler().EnterLuaCriticalSection();
          {
              lua_Debug luaDebug;
***************
*** 1722,1726 ****
              }
          }
!         wxGetLuaHandler().LeaveLuaCriticalSection();
      }
  
--- 1722,1726 ----
              }
          }
!         wxLuaHandler::GetHandler().LeaveLuaCriticalSection();
      }
  
***************
*** 1733,1737 ****
      if (pSortedList != NULL)
      {
!         wxGetLuaHandler().EnterLuaCriticalSection();
          {
              if (tableRef == -1)
--- 1733,1737 ----
      if (pSortedList != NULL)
      {
!         wxLuaHandler::GetHandler().EnterLuaCriticalSection();
          {
              if (tableRef == -1)
***************
*** 1883,1887 ****
              }
          }
!         wxGetLuaHandler().LeaveLuaCriticalSection();
      }
  
--- 1883,1887 ----
              }
          }
!         wxLuaHandler::GetHandler().LeaveLuaCriticalSection();
      }
  
***************
*** 1894,1898 ****
      int      nReference = LUA_NOREF;
  
!     wxGetLuaHandler().EnterLuaCriticalSection();
      {
          if (wxStrpbrk(strExpr.c_str(), wxT(" ~=<>+-*/%(){}[]:;,.\"'")) != NULL)
--- 1894,1898 ----
      int      nReference = LUA_NOREF;
  
!     wxLuaHandler::GetHandler().EnterLuaCriticalSection();
      {
          if (wxStrpbrk(strExpr.c_str(), wxT(" ~=<>+-*/%(){}[]:;,.\"'")) != NULL)
***************
*** 2042,2046 ****
          }
      }
!     wxGetLuaHandler().LeaveLuaCriticalSection();
  
      return m_debugService->NotifyEvaluateExpr(exprRef, strResult);
--- 2042,2046 ----
          }
      }
!     wxLuaHandler::GetHandler().LeaveLuaCriticalSection();
  
      return m_debugService->NotifyEvaluateExpr(exprRef, strResult);

Index: debugio.cpp
===================================================================
RCS file: /cvsroot/wxlua/wxLua/modules/wxluasocket/src/debugio.cpp,v
retrieving revision 1.2
retrieving revision 1.3
diff -C2 -d -r1.2 -r1.3
*** debugio.cpp	7 Jun 2005 04:17:41 -0000	1.2
--- debugio.cpp	25 Nov 2005 18:52:22 -0000	1.3
***************
*** 33,37 ****
  unsigned char  wxLuaDebugIO::ReadByte(wxLuaSocket *pSocket)
  {
!     unsigned char value;
      pSocket->Read((char *) &value, sizeof(value));
      return value;
--- 33,37 ----
  unsigned char  wxLuaDebugIO::ReadByte(wxLuaSocket *pSocket)
  {
!     unsigned char value = 0;
      pSocket->Read((char *) &value, sizeof(value));
      return value;
***************
*** 40,44 ****
  short wxLuaDebugIO::ReadWord(wxLuaSocket *pSocket)
  {
!     short value;
      pSocket->Read((char *)&value, sizeof(value));
      return value;
--- 40,44 ----
  short wxLuaDebugIO::ReadWord(wxLuaSocket *pSocket)
  {
!     short value = 0;
      pSocket->Read((char *)&value, sizeof(value));
      return value;
***************
*** 47,51 ****
  unsigned short wxLuaDebugIO::ReadUWord(wxLuaSocket *pSocket)
  {
!     unsigned short value;
      pSocket->Read((char *)&value, sizeof(value));
      return value;
--- 47,51 ----
  unsigned short wxLuaDebugIO::ReadUWord(wxLuaSocket *pSocket)
  {
!     unsigned short value = 0;
      pSocket->Read((char *)&value, sizeof(value));
      return value;
***************
*** 54,58 ****
  int wxLuaDebugIO::ReadInt(wxLuaSocket *pSocket)
  {
!     int value;
      pSocket->Read((char *) &value, sizeof(value));
      return value;
--- 54,58 ----
  int wxLuaDebugIO::ReadInt(wxLuaSocket *pSocket)
  {
!     int value = 0;
      pSocket->Read((char *) &value, sizeof(value));
      return value;
***************
*** 61,65 ****
  unsigned int wxLuaDebugIO::ReadUInt(wxLuaSocket *pSocket)
  {
!     unsigned int value;
      pSocket->Read((char *) &value, sizeof(value));
      return value;
--- 61,65 ----
  unsigned int wxLuaDebugIO::ReadUInt(wxLuaSocket *pSocket)
  {
!     unsigned int value = 0;
      pSocket->Read((char *) &value, sizeof(value));
      return value;
***************
*** 68,72 ****
  long wxLuaDebugIO::ReadLong(wxLuaSocket *pSocket)
  {
!     long value;
      pSocket->Read((char *) &value, sizeof(value));
      return value;
--- 68,72 ----
  long wxLuaDebugIO::ReadLong(wxLuaSocket *pSocket)
  {
!     long value = 0;
      pSocket->Read((char *) &value, sizeof(value));
      return value;
***************
*** 75,79 ****
  unsigned long wxLuaDebugIO::ReadULong(wxLuaSocket *pSocket)
  {
!     unsigned long value;
      pSocket->Read((char *) &value, sizeof(value));
      return value;
--- 75,79 ----
  unsigned long wxLuaDebugIO::ReadULong(wxLuaSocket *pSocket)
  {
!     unsigned long value = 0;
      pSocket->Read((char *) &value, sizeof(value));
      return value;
***************
*** 87,90 ****
--- 87,91 ----
      {
          char *buffer = new char[length + 1];
+         memset(buffer, 0, length+1);
          pSocket->Read(buffer, length);
          buffer[length] = 0;

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

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

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

Modified Files:
	debug.cpp staktree.cpp 
Log Message:
initialize vars in debugio.cpp
add static function in wxLuaHandler to get the global handler, deprecate global function
code cleaning


Index: debug.cpp
===================================================================
RCS file: /cvsroot/wxlua/wxLua/modules/wxluadebug/src/debug.cpp,v
retrieving revision 1.2
retrieving revision 1.3
diff -C2 -d -r1.2 -r1.3
*** debug.cpp	7 Jun 2005 04:17:40 -0000	1.2
--- debug.cpp	25 Nov 2005 18:52:22 -0000	1.3
***************
*** 7,11 ****
  // Licence:     wxWidgets licence
  /////////////////////////////////////////////////////////////////////////////
! // Ray Gilbert 
  
  #if defined(__GNUG__) && !defined(NO_GCC_PRAGMA)
--- 7,11 ----
  // Licence:     wxWidgets licence
  /////////////////////////////////////////////////////////////////////////////
! // Ray Gilbert
  
  #if defined(__GNUG__) && !defined(NO_GCC_PRAGMA)
***************
*** 53,57 ****
  
  // ----------------------------------------------------------------------------
! // wxLuaBuffer
  // ----------------------------------------------------------------------------
  
--- 53,57 ----
  
  // ----------------------------------------------------------------------------
! // wxLuaDebuggerBase
  // ----------------------------------------------------------------------------
  
***************
*** 75,79 ****
  {
      SetEventType(eventType);
!     
      m_fHasMessage = false;
      m_pDebugData  = NULL;
--- 75,79 ----
  {
      SetEventType(eventType);
! 
      m_fHasMessage = false;
      m_pDebugData  = NULL;
***************
*** 83,97 ****
  
  wxLuaDebugEvent::wxLuaDebugEvent(int         eventType,
!                                  int         lineNumber,    
                                   const wxString &file,
                                   bool        enabledFlag)
  {
      SetEventType(eventType);
!     
      m_lineNumber  = lineNumber;
      m_fileName    = file;
      m_fHasMessage = false;
      m_nReference  = -1;
!     m_pDebugData  = NULL;  
      m_fEnabledFlag = enabledFlag;
  }
--- 83,97 ----
  
  wxLuaDebugEvent::wxLuaDebugEvent(int         eventType,
!                                  int         lineNumber,
                                   const wxString &file,
                                   bool        enabledFlag)
  {
      SetEventType(eventType);
! 
      m_lineNumber  = lineNumber;
      m_fileName    = file;
      m_fHasMessage = false;
      m_nReference  = -1;
!     m_pDebugData  = NULL;
      m_fEnabledFlag = enabledFlag;
  }
***************
*** 164,168 ****
  
  // ----------------------------------------------------------------------------
! // wxLuaDebugDataItem 
  // ----------------------------------------------------------------------------
  wxLuaDebugDataItem::wxLuaDebugDataItem(const wxString &itemName,
--- 164,168 ----
  
  // ----------------------------------------------------------------------------
! // wxLuaDebugDataItem
  // ----------------------------------------------------------------------------
  wxLuaDebugDataItem::wxLuaDebugDataItem(const wxString &itemName,

Index: staktree.cpp
===================================================================
RCS file: /cvsroot/wxlua/wxLua/modules/wxluadebug/src/staktree.cpp,v
retrieving revision 1.4
retrieving revision 1.5
diff -C2 -d -r1.4 -r1.5
*** staktree.cpp	25 Nov 2005 02:43:02 -0000	1.4
--- staktree.cpp	25 Nov 2005 18:52:22 -0000	1.5
***************
*** 135,139 ****
  
  //    if (m_pServer != NULL)
! //        wxGetLuaHandler().SetStackFrame(NULL);
  }
  
--- 135,139 ----
  
  //    if (m_pServer != NULL)
! //        wxLuaHandler::GetHandler().SetStackFrame(NULL);
  }
  
***************
*** 148,152 ****
  
  //    if (m_pServer != NULL)
! //        wxGetLuaHandler().SetStackFrame(this);
  
      m_stackComboBox = new wxComboBox( this,
--- 148,152 ----
  
  //    if (m_pServer != NULL)
! //        wxLuaHandler::GetHandler().SetStackFrame(this);
  
      m_stackComboBox = new wxComboBox( this,

[Wxlua-commit] wxLua/modules/wxluasocket/include dservice.h,1.2,1.3 dtarget.h,1.3,1.4

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

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

Modified Files:
	dservice.h dtarget.h 
Log Message:
initialize vars in debugio.cpp
add static function in wxLuaHandler to get the global handler, deprecate global function
code cleaning


Index: dtarget.h
===================================================================
RCS file: /cvsroot/wxlua/wxLua/modules/wxluasocket/include/dtarget.h,v
retrieving revision 1.3
retrieving revision 1.4
diff -C2 -d -r1.3 -r1.4
*** dtarget.h	25 Nov 2005 02:43:02 -0000	1.3
--- dtarget.h	25 Nov 2005 18:52:22 -0000	1.4
***************
*** 34,42 ****
      {
      public:
!         LuaThread(LuaDebugTarget *pTarget) :
!             wxThread(wxTHREAD_JOINABLE)
!         {
!             m_pTarget = pTarget;
!         }
  
          bool TestDestroy();
--- 34,39 ----
      {
      public:
!         LuaThread(LuaDebugTarget *pTarget) : wxThread(wxTHREAD_JOINABLE),
!                                              m_pTarget(pTarget) {}
  
          bool TestDestroy();
***************
*** 58,65 ****
              BreakPointObject(const wxString &fileName,
                               int             lineNumber)
!                 :   m_fileName(fileName),
!                     m_lineNumber(lineNumber)
!             {
!             }
  
              const wxString &GetFileName() const { return m_fileName; }
--- 55,59 ----
              BreakPointObject(const wxString &fileName,
                               int             lineNumber)
!                     : m_fileName(fileName), m_lineNumber(lineNumber) {}
  
              const wxString &GetFileName() const { return m_fileName; }

Index: dservice.h
===================================================================
RCS file: /cvsroot/wxlua/wxLua/modules/wxluasocket/include/dservice.h,v
retrieving revision 1.2
retrieving revision 1.3
diff -C2 -d -r1.2 -r1.3
*** dservice.h	25 Nov 2005 02:43:02 -0000	1.2
--- dservice.h	25 Nov 2005 18:52:22 -0000	1.3
***************
*** 57,74 ****
  {
  public:
!     wxLuaDebugSocket(const wxLuaDebugSocket& debugSocket)
!     {
!         m_Socket = debugSocket.m_Socket;
!     }
! 
!     wxLuaDebugSocket(wxSocketBase* sock)
!     {
!         m_Socket = sock;
!     }
! 
!     wxLuaDebugSocket()
!     {
!         m_Socket = NULL;
!     }
  
      ~wxLuaDebugSocket()
--- 57,63 ----
  {
  public:
!     wxLuaDebugSocket(const wxLuaDebugSocket& debugSocket) : m_Socket(debugSocket.m_Socket) {}
!     wxLuaDebugSocket(wxSocketBase* sock) : m_Socket(sock) {}
!     wxLuaDebugSocket() : m_Socket(NULL) {}
  
      ~wxLuaDebugSocket()
***************
*** 111,123 ****
  
      // Read Data
!     unsigned char  ReadByte();
!     short ReadWord();
!     unsigned short ReadUWord();
!     int ReadInt();
!     unsigned int ReadUInt();
!     long ReadLong();
!     unsigned long ReadULong();
!     wxString ReadString();
!     wxLuaDebugData *ReadDebugData();
  
      // Write Data
--- 100,112 ----
  
      // Read Data
!     unsigned char   ReadByte();
!     short           ReadWord();
!     unsigned short  ReadUWord();
!     int             ReadInt();
!     unsigned int    ReadUInt();
!     long            ReadLong();
!     unsigned long   ReadULong();
!     wxString        ReadString();
!     wxLuaDebugData* ReadDebugData();
  
      // Write Data

[Wxlua-commit] wxLua/modules/wxluadebug/include debug.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-serv15042/wxLua/modules/wxluadebug/include

Modified Files:
	debug.h 
Log Message:
initialize vars in debugio.cpp
add static function in wxLuaHandler to get the global handler, deprecate global function
code cleaning


Index: debug.h
===================================================================
RCS file: /cvsroot/wxlua/wxLua/modules/wxluadebug/include/debug.h,v
retrieving revision 1.3
retrieving revision 1.4
diff -C2 -d -r1.3 -r1.4
*** debug.h	25 Nov 2005 02:43:02 -0000	1.3
--- debug.h	25 Nov 2005 18:52:21 -0000	1.4
***************
*** 28,32 ****
  
  #include "wx/dynarray.h"
! #include "wx/treectrl.h"
  
  #include "wxlua/include/wxldefs.h"
--- 28,32 ----
  
  #include "wx/dynarray.h"
! #include "wx/treectrl.h" // for wxTreeItemData
  
  #include "wxlua/include/wxldefs.h"

[Wxlua-commit] wxLua/modules/wxlua/src internal.cpp,1.7,1.8 wxlhandl.cpp,1.1,1.2 wxlstate.cpp,1.2,1.3

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

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

Modified Files:
	internal.cpp wxlhandl.cpp wxlstate.cpp 
Log Message:
initialize vars in debugio.cpp
add static function in wxLuaHandler to get the global handler, deprecate global function
code cleaning


Index: internal.cpp
===================================================================
RCS file: /cvsroot/wxlua/wxLua/modules/wxlua/src/internal.cpp,v
retrieving revision 1.7
retrieving revision 1.8
diff -C2 -d -r1.7 -r1.8
*** internal.cpp	25 Nov 2005 10:09:11 -0000	1.7
--- internal.cpp	25 Nov 2005 18:52:21 -0000	1.8
***************
*** 1930,1934 ****
  #else
      #define LUAERROR_OUTPUT(msg) \
!         wxGetLuaHandler().DisplayError(msg);
  #endif
  
--- 1930,1934 ----
  #else
      #define LUAERROR_OUTPUT(msg) \
!         wxLuaHandler::GetHandler().DisplayError(msg);
  #endif
  

Index: wxlstate.cpp
===================================================================
RCS file: /cvsroot/wxlua/wxLua/modules/wxlua/src/wxlstate.cpp,v
retrieving revision 1.2
retrieving revision 1.3
diff -C2 -d -r1.2 -r1.3
*** wxlstate.cpp	25 Nov 2005 10:09:11 -0000	1.2
--- wxlstate.cpp	25 Nov 2005 18:52:21 -0000	1.3
***************
*** 1362,1366 ****
  #else
      #define LUAERROR_OUTPUT(msg) \
!         wxGetLuaHandler().DisplayError(msg);
  #endif
  
--- 1362,1366 ----
  #else
      #define LUAERROR_OUTPUT(msg) \
!         wxLuaHandler::GetHandler().DisplayError(msg);
  #endif
  

Index: wxlhandl.cpp
===================================================================
RCS file: /cvsroot/wxlua/wxLua/modules/wxlua/src/wxlhandl.cpp,v
retrieving revision 1.1
retrieving revision 1.2
diff -C2 -d -r1.1 -r1.2
*** wxlhandl.cpp	25 Nov 2005 02:46:53 -0000	1.1
--- wxlhandl.cpp	25 Nov 2005 18:52:21 -0000	1.2
***************
*** 35,40 ****
  wxLuaHandler::wxLuaHandler()
  {
!     wxASSERT(!sm_luahandler);
! 
      sm_luahandler = this;
  }
--- 35,39 ----
  wxLuaHandler::wxLuaHandler()
  {
!     wxASSERT_MSG(!sm_luahandler, wxT("There can only be one wxLuaHandler"));
      sm_luahandler = this;
  }
***************
*** 47,50 ****
  wxLuaHandler& wxGetLuaHandler()
  {
!     return *wxLuaHandler::sm_luahandler;
  }
--- 46,49 ----
  wxLuaHandler& wxGetLuaHandler()
  {
!     return wxLuaHandler::GetHandler();
  }

[Wxlua-commit] wxLua/modules/wxlua/include wxlhandl.h,1.1,1.2

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

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

Modified Files:
	wxlhandl.h 
Log Message:
initialize vars in debugio.cpp
add static function in wxLuaHandler to get the global handler, deprecate global function
code cleaning


Index: wxlhandl.h
===================================================================
RCS file: /cvsroot/wxlua/wxLua/modules/wxlua/include/wxlhandl.h,v
retrieving revision 1.1
retrieving revision 1.2
diff -C2 -d -r1.1 -r1.2
*** wxlhandl.h	25 Nov 2005 02:46:53 -0000	1.1
--- wxlhandl.h	25 Nov 2005 18:52:21 -0000	1.2
***************
*** 17,22 ****
  
  #include "wxlua/include/wxldefs.h"
! #include "wx/utils.h"
! #include "wx/app.h"
  
  class WXDLLIMPEXP_WXLUA wxLuaDebugEvent;
--- 17,21 ----
  
  #include "wxlua/include/wxldefs.h"
! #include "wx/thread.h"
  
  class WXDLLIMPEXP_WXLUA wxLuaDebugEvent;
***************
*** 34,57 ****
  
      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;
--- 33,51 ----
  
      virtual void AddPendingEvent(wxEvent& event) = 0;
      virtual bool ProcessEvent(wxEvent& event) = 0;
+     virtual void DisplayError(const wxString &strError) const = 0;
  
! //#if wxUSE_LUASTACKFRAME FIXME - do we need this? see also wxluadebug/src/staktree.cpp
  //    virtual void SetStackFrame(wxLuaStackFrame *pStackFrame) = 0;
  //#endif // wxUSE_LUASTACKFRAME
  
!     void EnterLuaCriticalSection() { m_luaCriticalSection.Enter(); }
!     void LeaveLuaCriticalSection() { m_luaCriticalSection.Leave(); }
  
!     // Get the single global wxLuaHandler
!     // note: if sm_luahandler = NULL let this fail hard, it should NEVER happen
!     static wxLuaHandler& GetHandler() { return *sm_luahandler; }
  
! protected:
      static wxLuaHandler* sm_luahandler;
      wxCriticalSection  m_luaCriticalSection;
***************
*** 59,64 ****
  
  
! // Lua App/Debugger Interface
! wxLuaHandler& wxGetLuaHandler();
  
  #endif //_WXLHANDL_H_
--- 53,58 ----
  
  
! // Lua App/Debugger Interface - use wxLuaHandler::GetHandler
! wxDEPRECATED( wxLuaHandler& wxGetLuaHandler() );
  
  #endif //_WXLHANDL_H_

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

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

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

Modified Files:
	options.bkl 
Log Message:
added WXLUASETUP_DIR and WXLUABINDLIB_DIR options

Index: options.bkl
===================================================================
RCS file: /cvsroot/wxlua/wxLua/modules/build/bakefiles/options.bkl,v
retrieving revision 1.3
retrieving revision 1.4
diff -C2 -d -r1.3 -r1.4
*** options.bkl	24 Nov 2005 21:34:16 -0000	1.3
--- options.bkl	25 Nov 2005 17:30:29 -0000	1.4
***************
*** 19,22 ****
--- 19,29 ----
      <set var="USE_WXLUASOCKETLIB_DEFAULT">1</set>
  
+     <!-- the default path for the wxluasetup.h file -->
+     <set var="WXLUASETUP_DIR_DEFAULT">$(nativePaths(WXLUA_BASEDIR + '/modules/wxbind/src'))</set>
+ 
+     <!-- the default output path for wxLuaBind library -->
+     <set var="WXLUABINDLIB_DIR_DEFAULT">$(nativePaths(WXLUA_BASEDIR + '/lib'))</set>
+ 
+ 
  
      <!-- ================================================================== -->
***************
*** 50,52 ****
--- 57,69 ----
  
  
+     <option name="WXLUASETUP_DIR" category="path">
+         <default-value>$(WXLUASETUP_DIR_DEFAULT)</default-value>
+         <description>The folder where wxluasetup.h is searched</description>
+     </option>
+ 
+     <option name="WXLUABINDLIB_DIR" category="path">
+         <default-value>$(WXLUABINDLIB_DIR_DEFAULT)</default-value>
+         <description>The folder where wxLuaBind library is sent</description>
+     </option>
+ 
  </makefile>

[Wxlua-commit] wxLua/modules/wxlua/include internal.h,1.5,1.6 wxlintrp.h,1.1,1.2 wxlstate.h,1.1,1.2

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

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

Modified Files:
	internal.h wxlintrp.h wxlstate.h 
Log Message:
flesh out the wxLuaState
SmartString/IntArray to wxLuaSmartXXX
TRUE/FALSE - true/false


Index: wxlintrp.h
===================================================================
RCS file: /cvsroot/wxlua/wxLua/modules/wxlua/include/wxlintrp.h,v
retrieving revision 1.1
retrieving revision 1.2
diff -C2 -d -r1.1 -r1.2
*** wxlintrp.h	25 Nov 2005 02:46:53 -0000	1.1
--- wxlintrp.h	25 Nov 2005 10:09:11 -0000	1.2
***************
*** 109,113 ****
      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; }
--- 109,113 ----
      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; }

Index: wxlstate.h
===================================================================
RCS file: /cvsroot/wxlua/wxLua/modules/wxlua/include/wxlstate.h,v
retrieving revision 1.1
retrieving revision 1.2
diff -C2 -d -r1.1 -r1.2
*** wxlstate.h	25 Nov 2005 02:46:53 -0000	1.1
--- wxlstate.h	25 Nov 2005 10:09:11 -0000	1.2
***************
*** 7,10 ****
--- 7,27 ----
  /////////////////////////////////////////////////////////////////////////////
  
+ /* ****************************************************************************
+ 
+ Portions of code in this file have been taken from LuaPlus.
+ LuaPlus was written and maintained by Joshua Jensen (jj...@wo...)
+ and resides as http://wwhiz.com/LuaPlus/index.html . LuaPlus is distributed
+ with the Lua Licence as described below.
+ 
+ Lua License
+ -----------
+ Lua is licensed under the terms of the MIT license reproduced below.
+ This mean that Lua is free software and can be used for both academic and
+ commercial purposes at absolutely no cost.
+ 
+ For details, see http://www.lua.org/license.html .
+ 
+ **************************************************************************** */
+ 
  #ifndef _WXLSTATE_H_
  #define _WXLSTATE_H_
***************
*** 29,35 ****
  
  class WXDLLIMPEXP_WXLUA wxLuaState;
  
  #include "wx/hashmap.h"
! WX_DECLARE_VOIDPTR_HASH_MAP( wxLuaState *, wxHashMapLuaState );
  
  //----------------------------------------------------------------------------
--- 46,53 ----
  
  class WXDLLIMPEXP_WXLUA wxLuaState;
+ class WXDLLIMPEXP_WXLUA wxLuaStateRefData;
  
  #include "wx/hashmap.h"
! WX_DECLARE_VOIDPTR_HASH_MAP( wxLuaStateRefData *, wxHashMapLuaStateRefData );
  
  //----------------------------------------------------------------------------
***************
*** 44,51 ****
--- 62,74 ----
      virtual ~wxLuaStateRefData();
  
+     // destroy and cleanup the lua_State, returns sucess
+     // if 'force' then make sure all wxWindows are destroyed.
+     bool Destroy(bool force);
+ 
      // clear all wxLuaCallbacks on destruction
      void ClearCallbacks();
  
      lua_State *m_lua_State;
+     bool       m_lua_State_static;
  
      wxLuaBindingList m_bindings;    // A list of generated lua bindings
***************
*** 71,76 ****
      wxArrayInt  m_usedIndexes;
  
! 
!     static wxHashMapLuaState s_wxHashMapLuaState;
  
  private:
--- 94,99 ----
      wxArrayInt  m_usedIndexes;
  
!     static wxLuaStateRefData* FindLuaStateRefData(lua_State* L);
!     static wxHashMapLuaStateRefData s_wxHashMapLuaStateRefData;
  
  private:
***************
*** 82,90 ****
  //----------------------------------------------------------------------------
  
  class WXDLLIMPEXP_WXLUA wxLuaState : public wxObject
  {
  public:
      wxLuaState() : wxObject() {}
!     wxLuaState( const wxLuaState& wxlState ) { Create(wxlState); }
  
      virtual ~wxLuaState() {}
--- 105,122 ----
  //----------------------------------------------------------------------------
  
+ enum wxLuaState_Type
+ {
+     WXLUASTATE_CREATE   = 1, // Create a new lua_State
+     WXLUASTATE_ATTACH   = 2, // Attach to c currently created lua_State
+     WXLUASTATE_SETSTATE = 3  // Merely set the lua_State and don't close it
+                              //   when destroyed
+ };
+ 
  class WXDLLIMPEXP_WXLUA wxLuaState : public wxObject
  {
  public:
      wxLuaState() : wxObject() {}
!     wxLuaState(lua_State* L, wxLuaState_Type type) { Create(L, type); }
!     wxLuaState(const wxLuaState& wxlState) { Create(wxlState); }
  
      virtual ~wxLuaState() {}
***************
*** 92,102 ****
      // 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);
--- 124,142 ----
      // Destroy the refed data
      void Destroy() { UnRef(); }
+ 
+     // Ref the given wxLuaState
+     void Create(const wxLuaState& wxlState);
+     // Create a new lua_State if L = NULL or just attach to the
+     //   input lua_State
+     bool Create(lua_State* L = NULL, wxLuaState_Type type = WXLUASTATE_CREATE);
+ 
      // Is this wxLuaState valid, has refed data
      bool Ok() const { return m_refData != NULL; }
  
!     // Get the lua_State
!     lua_State* GetLuaState() const;
  
+     // -----------------------------------------------------------------------
+     // Binding functions
  
      void LUACALL RegisterBindings(bool registerTypes);
***************
*** 112,123 ****
--- 152,296 ----
      const WXLUAEVENT * GetLuaEvent(wxEvent *pEvent);
  
+     // -----------------------------------------------------------------------
+     // wxLua Lua Registry Table Functions
+ 
+     // create a reference to the object at index iParam in the Lua index
+     int tinsert(int iParam);
+     // push onto the top of the stack the object referenced by iReference
+     bool tget(int iReference);
+     // remove a Lua reference
+     bool tremove(int iReference);
+     // Get the number of items in the reference table
+     int tgetn();
+     // Display an error message
+     void terror(const char *errorMsg);
+     // push onto the top of the stack an userdata object containing u using tag to set the metatable
+     void tpushusertag(const void *u, int tag);
+     // get the tag of the object at index
+     int ttag(int index);
+     // return the user data in the userdata object at index, if reset is true clear the user data
+     void* ttouserdata(int index, bool reset = false);
+     // allocate a new metatable return its reference
+     int tnewtag();
+     int tnewweaktag(bool fWeakKey, bool fWeakData);
+     // set the metatable of the object at top of stack from the reference tag
+     void tsettag(int tag);
+     // set a metamethod for the metatable referenced by tag with the supplied name and function.
+     // if pClass is non-null set the upvalue of the function to the supplied class
+     bool tsettagmethod(int tag, const char *method, lua_CFunction func, void *pClass = NULL);
+ 
+     // -----------------------------------------------------------------------
+     // wxLua get data type
+ 
+     // Return a pointer to the object that corresponds to the specified stack
+     // index and tag
+     // get a user data type (either allocated by us if the tag is iTagS otherwise
+     // system allocated iTagP. if the data type does not have the correct tag,
+     // or if the parameter iParam is nil, NULL is returned.
+     // otherwise an error occurs
+     void* getuserdatatype(int iParam, int iTag);
+     // set a user data type
+     void pushuserdatatype(int iTag, const void *data);
+ 
+     // helper functions to get numbers, booleans and strings safer
+     const char* getstringtype(int iParam);
+     bool   getbooleantype(int iParam);
+     long   getenumerationtype(int iParam);
+     double getnumbertype(int iParam);
+ 
+     // convert a parameter which is presumably a table into a string array.
+     // returns the number of strings in the array in count.
+     // the return value may need to be deleted.
+     wxString* tostringarray(int iParam, int &count);
+     // convert a parameter which is presumably a table into a character pointer array.
+     // returns the number of character strings in the array in count.
+     // the return value may need to be deleted.
+     const char** tochararray(int iParam, int &count);
+ 
+     // convert a parameter which is presumably a wxArrayString reference a string array.
+     // returns the table containing the strings on the Lua stack.
+     // returns the number of items in the table
+     int tostringtable(wxArrayString &files);
+     int tointtable(const wxArrayInt &table);
+ 
+     // convert a parameter which is presumably a table into a integer array.
+     // returns the number of ints in the array in count.
+     // the return value may need to be deleted.
+     int* tointarray(int iParam, int &count);
+     int  toarrayint(int iParam, wxArrayInt &intArray);
+ 
+     // Given a lua tag, return the corresponding tag name
+     const char* LUACALL GetLuaTagName(int nTag);
+ 
+     // get the method or 'get' property for the class at cpIndex
+     WXLUAMETHOD* getLuaMethod(const WXLUACLASS *pClass, const char *cpIndex, bool &isProperty);
+     // get the property for the class at cpIndex
+     WXLUAMETHOD* getLuaProperty(const WXLUACLASS *pClass, const char *cpIndex, bool isSet);
+ 
+     // get the derived method for the class cpIndex
+     lua_State* getDerivedMethod(void *pObject, const char *method, lua_State *L = NULL);
+ 
+     int LuaError(int status, int top);
+     int LuaCall(int narg, int clear);
+     int LuaDoFile(const wxString &file);
+     int LuaDoBuffer(const char *buffer, size_t len, const char *name);
+ 
+     // Check the return value of LuaDoFile, LuaDoBuffer, lua_dostring, lua_dofile
+     //   returns true for no error, if error fills msg with a useful message if !NULL
+     bool CheckRunError(int ret_val, wxString *msg);
+ 
+     // -----------------------------------------------------------------------
+     // Raw lua Stack functions.
  
+     // FIXME LuaStackObject Stack(int index)                         {  return LuaStackObject(this, index);  }
+     int GetTop();
+     void SetTop(int index);
+     void PushValue(int index);
+     // FIXME void PushValue(LuaStackObject object);
+     void Remove(int index);
+     void Insert(int index);
+     void Replace(int index);
+     int CheckStack(int size);
+     void XMove(const wxLuaState& to, int n);
+     int Equal(int index1, int index2);
+     int RawEqual(int index1, int index2);
+     int LessThan(int index1, int index2);
  
+     // -----------------------------------------------------------------------
+     // Raw lua Arg functions.
  
+     int TypeError(int narg, const char* tname);
+     int ArgError(int narg, const char* extramsg);
+     const char* CheckLString(int numArg, size_t* len);
+     const char* OptLString(int numArg, const char *def, size_t* len);
+     lua_Number CheckNumber(int numArg);
+     lua_Number OptNumber(int nArg, lua_Number def);
+     void ArgCheck(bool condition, int numarg, const char* extramsg);
+     const char* CheckString(int numArg);
+     const char* OptString(int numArg, const char* def);
+     int CheckInt(int numArg);
+     long CheckLong(int numArg);
+     int OptInt(int numArg, int def);
+     long OptLong(int numArg, int def);
+     void CheckStack(int sz, const char* msg);
+     void CheckType(int narg, int t);
+     void CheckAny(int narg);
+     void* CheckUData(int ud, const char* tname);
  
+     // -----------------------------------------------------------------------
+     // Raw lua Debug functions.
  
+     int GetStack(int level, lua_Debug* ar);
+     int GetInfo(const char* what, lua_Debug* ar);
+     const char* GetLocal(const lua_Debug* ar, int n);
+     const char* SetLocal(const lua_Debug* ar, int n);
  
+     int SetHook(lua_Hook func, int mask, int count);
+     lua_Hook GetHook();
+     unsigned long GetHookMask();
  
+     // -----------------------------------------------------------------------
      // operators
+ 
      bool operator == (const wxLuaState& wxlState) const
          { return m_refData == wxlState.m_refData; }
***************
*** 138,142 ****
  
      DECLARE_DYNAMIC_CLASS(wxLuaState)
- 
  };
  
--- 311,314 ----

Index: internal.h
===================================================================
RCS file: /cvsroot/wxlua/wxLua/modules/wxlua/include/internal.h,v
retrieving revision 1.5
retrieving revision 1.6
diff -C2 -d -r1.5 -r1.6
*** internal.h	25 Nov 2005 02:43:02 -0000	1.5
--- internal.h	25 Nov 2005 10:09:11 -0000	1.6
***************
*** 111,124 ****
  
  // ----------------------------------------------------------------------------
! // SmartStringArray - A class to wrap an array of wxStrings with an
! //                    automatic destructor for making binding easier
  // ----------------------------------------------------------------------------
! class WXDLLIMPEXP_WXLUA SmartStringArray
  {
  public:
!     SmartStringArray() : m_choices(NULL) { }
!     ~SmartStringArray() { if (m_choices != NULL) delete[] m_choices; }
  
!     void operator =(wxString *choices) { m_choices = choices; }
  
  private:
--- 111,124 ----
  
  // ----------------------------------------------------------------------------
! // wxLuaSmartStringArray - Wraps a "new" array of wxStrings with an automatic
! //                         destructor that "deletes" them to make binding easier
  // ----------------------------------------------------------------------------
! class WXDLLIMPEXP_WXLUA wxLuaSmartStringArray
  {
  public:
!     wxLuaSmartStringArray() : m_choices(NULL) { }
!     ~wxLuaSmartStringArray() { if (m_choices != NULL) delete[] m_choices; }
  
!     void operator = (wxString *choices) { m_choices = choices; }
  
  private:
***************
*** 127,140 ****
  
  // ----------------------------------------------------------------------------
! // SmartIntArray - A class to wrap an array of ints with an
! //                 automatic destructor for making binding easier
  // ----------------------------------------------------------------------------
! class WXDLLIMPEXP_WXLUA SmartIntArray
  {
  public:
!     SmartIntArray() : m_choices(NULL) { }
!     ~SmartIntArray() { if (m_choices != NULL) delete[] m_choices; }
  
!     void operator =(int *choices) { m_choices = choices; }
  
  private:
--- 127,140 ----
  
  // ----------------------------------------------------------------------------
! // wxLuaSmartIntArray - A class to wrap a "new" array of ints with an automatic
! //                      destructor that "deletes" them to make binding easier.
  // ----------------------------------------------------------------------------
! class WXDLLIMPEXP_WXLUA wxLuaSmartIntArray
  {
  public:
!     wxLuaSmartIntArray() : m_choices(NULL) { }
!     ~wxLuaSmartIntArray() { if (m_choices != NULL) delete[] m_choices; }
  
!     void operator = (int *choices) { m_choices = choices; }
  
  private:
***************
*** 244,253 ****
  // ----------------------------------------------------------------------------
  
- // Lua Registry Table Functions
- int LUACALL tinsert(lua_State *L, int iParam);
- bool LUACALL tremove(lua_State *L, int iIndex);
- bool LUACALL tget(lua_State *L, int iIndex);
- int LUACALL tgetn (lua_State *L);
- 
  // get a user data type (either allocated by us if the tag is iTagS otherwise
  // system allocated iTagP. if the data type does not have the correct tag,
--- 244,247 ----
***************
*** 283,299 ****
  int   LUACALL toarrayint(lua_State *L, int iParam, wxArrayInt &intArray);
  
!  // register non-generated functions and types
! void LUACALL registerOthers(lua_State *L, bool registerTypes);
! 
! // free memory associated with the lua call class.
  int LUACALL functionGarbageCollect(lua_State *L);
  
! // memory deallocation function
  int LUACALL garbageCollect(lua_State *L);
! // lua 'set table' tag method handler
  int LUACALL setTableFunc(lua_State *L);
! // lua 'get table' tag method handler
  int LUACALL getTableFunc(lua_State *L);
! // call a Lua function
  int LUACALL callFunction(lua_State *L);
  
--- 277,290 ----
  int   LUACALL toarrayint(lua_State *L, int iParam, wxArrayInt &intArray);
  
! // free memory associated with the lua call class, lua's __gc
  int LUACALL functionGarbageCollect(lua_State *L);
  
! // memory deallocation function, lua's __gc
  int LUACALL garbageCollect(lua_State *L);
! // lua 'set table' tag method handler, lua's __newindex
  int LUACALL setTableFunc(lua_State *L);
! // lua 'get table' tag method handler, lua's __index
  int LUACALL getTableFunc(lua_State *L);
! // call a Lua function, lua's __call
  int LUACALL callFunction(lua_State *L);
  
***************
*** 302,307 ****
  
  // global function in Lua for wiring
! int LUACALL ConnectEvent(lua_State *L);
! int LUACALL DisconnectEvent(lua_State *L);
  
  // get the method or 'get' property for the class at cpIndex
--- 293,298 ----
  
  // global function in Lua for wiring
! int LUACALL wxEvtHandler_ConnectEvent(lua_State *L);
! //int LUACALL wxEvtHandler_DisconnectEvent(lua_State *L);
  
  // get the method or 'get' property for the class at cpIndex
***************
*** 318,322 ****
  
  // Check the return value of LuaDoFile, LuaDoBuffer, lua_dostring, lua_dofile
! //   returns TRUE for no error, if error fills msg with a useful message if !NULL
  bool wxLuaCheckRunError(int ret_val, wxString *msg);
  
--- 309,313 ----
  
  // Check the return value of LuaDoFile, LuaDoBuffer, lua_dostring, lua_dofile
! //   returns true for no error, if error fills msg with a useful message if !NULL
  bool wxLuaCheckRunError(int ret_val, wxString *msg);
  

[Wxlua-commit] wxLua/modules/wxlua/src internal.cpp,1.6,1.7 wxlbind.cpp,1.1,1.2 wxlintrp.cpp,1.1,1.2 wxlstate.cpp,1.1,1.2

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

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

Modified Files:
	internal.cpp wxlbind.cpp wxlintrp.cpp wxlstate.cpp 
Log Message:
flesh out the wxLuaState
SmartString/IntArray to wxLuaSmartXXX
TRUE/FALSE - true/false


Index: internal.cpp
===================================================================
RCS file: /cvsroot/wxlua/wxLua/modules/wxlua/src/internal.cpp,v
retrieving revision 1.6
retrieving revision 1.7
diff -C2 -d -r1.6 -r1.7
*** internal.cpp	25 Nov 2005 02:43:02 -0000	1.6
--- internal.cpp	25 Nov 2005 10:09:11 -0000	1.7
***************
*** 488,492 ****
  {
      tpushliteralstring(L, wxLuaReferences);
!     lua_rawget(L, LUA_REGISTRYINDEX);        // pop key, push result (refs table)
  
      lua_pushliteral(L, "n");
--- 488,492 ----
  {
      tpushliteralstring(L, wxLuaReferences);
!     lua_rawget(L, LUA_REGISTRYINDEX);       // pop key, push result (refs table)
  
      lua_pushliteral(L, "n");

Index: wxlstate.cpp
===================================================================
RCS file: /cvsroot/wxlua/wxLua/modules/wxlua/src/wxlstate.cpp,v
retrieving revision 1.1
retrieving revision 1.2
diff -C2 -d -r1.1 -r1.2
*** wxlstate.cpp	25 Nov 2005 02:46:53 -0000	1.1
--- wxlstate.cpp	25 Nov 2005 10:09:11 -0000	1.2
***************
*** 7,10 ****
--- 7,27 ----
  /////////////////////////////////////////////////////////////////////////////
  
+ /* ****************************************************************************
+ 
+ Portions of code in this file have been taken from LuaPlus.
+ LuaPlus was written and maintained by Joshua Jensen (jj...@wo...)
+ and resides as http://wwhiz.com/LuaPlus/index.html . LuaPlus is distributed
+ with the Lua Licence as described below.
+ 
[...1538 lines suppressed...]
+ {
+     wxCHECK_MSG(Ok(), NULL, wxT("Invalid wxLuaState"));
+     return lua_setlocal(M_WXLSTATEDATA->m_lua_State, ar, n);
+ }
+ 
+ int wxLuaState::SetHook(lua_Hook func, int mask, int count)
+ {
+     wxCHECK_MSG(Ok(), 0, wxT("Invalid wxLuaState"));
+     return lua_sethook(M_WXLSTATEDATA->m_lua_State, func, mask, count);
+ }
+ lua_Hook wxLuaState::GetHook()
+ {
+     wxCHECK_MSG(Ok(), 0, wxT("Invalid wxLuaState"));
+     return lua_gethook(M_WXLSTATEDATA->m_lua_State);
+ }
+ unsigned long wxLuaState::GetHookMask()
+ {
+     wxCHECK_MSG(Ok(), 0, wxT("Invalid wxLuaState"));
+     return lua_gethookmask(M_WXLSTATEDATA->m_lua_State);
+ }

Index: wxlbind.cpp
===================================================================
RCS file: /cvsroot/wxlua/wxLua/modules/wxlua/src/wxlbind.cpp,v
retrieving revision 1.1
retrieving revision 1.2
diff -C2 -d -r1.1 -r1.2
*** wxlbind.cpp	25 Nov 2005 02:46:53 -0000	1.1
--- wxlbind.cpp	25 Nov 2005 10:09:11 -0000	1.2
***************
*** 97,102 ****
  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");
--- 97,100 ----
***************
*** 133,138 ****
  void LUACALL wxLuaBinding::RegisterGeneratedClasses(lua_State *L, int tableOffset, bool registerTypes)
  {
-     GET_LUASTATEVARS_RET(L)
- 
      static const luaL_reg funcTable[] =
      {
--- 131,134 ----

Index: wxlintrp.cpp
===================================================================
RCS file: /cvsroot/wxlua/wxLua/modules/wxlua/src/wxlintrp.cpp,v
retrieving revision 1.1
retrieving revision 1.2
diff -C2 -d -r1.1 -r1.2
*** wxlintrp.cpp	25 Nov 2005 02:46:53 -0000	1.1
--- wxlintrp.cpp	25 Nov 2005 10:09:11 -0000	1.2
***************
*** 31,34 ****
--- 31,35 ----
  
  extern int s_wxLuaInterpreter;
+ extern bool wxLuaCleanupWindows(wxList *list, bool only_check); // in wxlstate.cpp
  
  wxHashMapLuaInterpreter s_wxHashMapLuaInterpreter;
***************
*** 117,245 ****
  
  // ----------------------------------------------------------------------------
- // 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
  // ----------------------------------------------------------------------------
--- 118,121 ----
***************
*** 485,489 ****
      m_luaInterpreter = interpreter;
      m_lua_Debug = NULL;
!     m_stop_interpreter = FALSE;
  }
  
--- 361,365 ----
      m_luaInterpreter = interpreter;
      m_lua_Debug = NULL;
!     m_stop_interpreter = false;
  }
  
***************
*** 509,514 ****
  #endif //WXLUA_THREAD_INTERCEPTION
  
!     m_is_running = FALSE;
!     m_user_break = FALSE;
  
      m_last_debug_hook_time = wxGetLocalTimeMillis().GetLo();
--- 385,390 ----
  #endif //WXLUA_THREAD_INTERCEPTION
  
!     m_is_running = false;
!     m_user_break = false;
  
      m_last_debug_hook_time = wxGetLocalTimeMillis().GetLo();
***************
*** 522,526 ****
      m_lua_debug_hook_count = 100;
      m_lua_debug_hook_yield = 50;
!     m_lua_debug_hook_send_evt = FALSE;
      m_lua_debug_hook = 0;
  }
--- 398,402 ----
      m_lua_debug_hook_count = 100;
      m_lua_debug_hook_yield = 50;
!     m_lua_debug_hook_send_evt = false;
      m_lua_debug_hook = 0;
  }
***************
*** 605,615 ****
  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
--- 481,491 ----
  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
***************
*** 626,630 ****
  
          if (ret == wxCANCEL)
!             return FALSE;
  
          //wxPrintf(wxT("Deleting windows\n"));
--- 502,506 ----
  
          if (ret == wxCANCEL)
!             return false;
  
          //wxPrintf(wxT("Deleting windows\n"));
***************
*** 632,636 ****
          // 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();
--- 508,512 ----
          // 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();
***************
*** 646,650 ****
      m_evtHandler = NULL;
  
!     return TRUE;
  }
  
--- 522,526 ----
      m_evtHandler = NULL;
  
!     return true;
  }
  
***************
*** 663,676 ****
      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;
  }
--- 539,552 ----
      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;
  }
***************
*** 680,689 ****
      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
--- 556,565 ----
      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
***************
*** 691,695 ****
          (void)CheckRunError(ret_val);
  
!     m_user_break = FALSE;
      return ret_val;
  }
--- 567,571 ----
          (void)CheckRunError(ret_val);
  
!     m_user_break = false;
      return ret_val;
  }
***************
*** 699,713 ****
      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;
  }
--- 575,589 ----
      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;
  }
***************
*** 722,728 ****
  
      m_break_msg = msg;
!     m_user_break = TRUE;
!     SetLuaDebugHook(1, -1, FALSE);
!     m_is_running = FALSE;
  }
  
--- 598,604 ----
  
      m_break_msg = msg;
!     m_user_break = true;
!     SetLuaDebugHook(1, -1, false);
!     m_is_running = false;
  }
  
***************
*** 787,793 ****
          event.SetInt(-1); // don't know what line the error occured
          SendEvent( event );
!         return FALSE;
      }
!     return TRUE;
  }
  
--- 663,669 ----
          event.SetInt(-1); // don't know what line the error occured
          SendEvent( event );
!         return false;
      }
!     return true;
  }
  

[Wxlua-commit] wxLua/bindings/wxwidgets override.hpp,1.3,1.4

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

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

Modified Files:
	override.hpp 
Log Message:
flesh out the wxLuaState
SmartString/IntArray to wxLuaSmartXXX
TRUE/FALSE - true/false


Index: override.hpp
===================================================================
RCS file: /cvsroot/wxlua/wxLua/bindings/wxwidgets/override.hpp,v
retrieving revision 1.3
retrieving revision 1.4
diff -C2 -d -r1.3 -r1.4
*** override.hpp	17 Nov 2005 05:51:20 -0000	1.3
--- override.hpp	25 Nov 2005 10:09:10 -0000	1.4
***************
*** 100,104 ****
      long style = (argCount >= 6 ? (long) lua_tonumber(L, 6) : 0);
      // const wxString choices[] = NULL
!     int count = 0; SmartStringArray ptr; wxString *choices; ptr = choices = (argCount >= 5 ? tostringarray(L, 5, count) : NULL);
      // const wxSize& size = wxDefaultSize
      const wxSize *size = (argCount >= 4 ? (wxSize *) getuserdatatype(L, 4, s_wxSize) : &wxDefaultSize);
--- 100,104 ----
      long style = (argCount >= 6 ? (long) lua_tonumber(L, 6) : 0);
      // const wxString choices[] = NULL
!     int count = 0; wxLuaSmartStringArray ptr; wxString *choices; ptr = choices = (argCount >= 5 ? tostringarray(L, 5, count) : NULL);
      // const wxSize& size = wxDefaultSize
      const wxSize *size = (argCount >= 4 ? (wxSize *) getuserdatatype(L, 4, s_wxSize) : &wxDefaultSize);
***************
*** 132,136 ****
      long style = (argCount >= 7 ? (long) lua_tonumber(L, 7) : 0);
      // const wxString choices[] = NULL
!     int count = 0; SmartStringArray ptr; wxString *choices; ptr = choices = (argCount >= 6 ? tostringarray(L, 6, count) : NULL);
      // const wxSize& size = wxDefaultSize
      const wxSize *size = (argCount >= 5 ? (wxSize *) getuserdatatype(L, 5, s_wxSize) : &wxDefaultSize);
--- 132,136 ----
      long style = (argCount >= 7 ? (long) lua_tonumber(L, 7) : 0);
      // const wxString choices[] = NULL
!     int count = 0; wxLuaSmartStringArray ptr; wxString *choices; ptr = choices = (argCount >= 6 ? tostringarray(L, 6, count) : NULL);
      // const wxSize& size = wxDefaultSize
      const wxSize *size = (argCount >= 5 ? (wxSize *) getuserdatatype(L, 5, s_wxSize) : &wxDefaultSize);
***************
*** 166,170 ****
      long style = (argCount >= 7 ? (long) lua_tonumber(L, 7) : 0);
      // const wxString choices[] = NULL
!     int count = 0; SmartStringArray ptr; wxString *choices; ptr = choices = (argCount >= 6 ? tostringarray(L, 6, count) : NULL);
      // const wxSize& size = wxDefaultSize
      const wxSize *size = (argCount >= 5 ? (wxSize *) getuserdatatype(L, 5, s_wxSize) : &wxDefaultSize);
--- 166,170 ----
      long style = (argCount >= 7 ? (long) lua_tonumber(L, 7) : 0);
      // const wxString choices[] = NULL
!     int count = 0; wxLuaSmartStringArray ptr; wxString *choices; ptr = choices = (argCount >= 6 ? tostringarray(L, 6, count) : NULL);
      // const wxSize& size = wxDefaultSize
      const wxSize *size = (argCount >= 5 ? (wxSize *) getuserdatatype(L, 5, s_wxSize) : &wxDefaultSize);
***************
*** 200,204 ****
      long style = (argCount >= 8 ? (long) lua_tonumber(L, 8) : 0);
      // const wxString choices[] = NULL
!     int count = 0; SmartStringArray ptr; wxString *choices; ptr = choices = (argCount >= 7 ? tostringarray(L, 7, count) : NULL);
      // const wxSize& size = wxDefaultSize
      const wxSize *size = (argCount >= 6 ? (wxSize *) getuserdatatype(L, 6, s_wxSize) : &wxDefaultSize);
--- 200,204 ----
      long style = (argCount >= 8 ? (long) lua_tonumber(L, 8) : 0);
      // const wxString choices[] = NULL
!     int count = 0; wxLuaSmartStringArray ptr; wxString *choices; ptr = choices = (argCount >= 7 ? tostringarray(L, 7, count) : NULL);
      // const wxSize& size = wxDefaultSize
      const wxSize *size = (argCount >= 6 ? (wxSize *) getuserdatatype(L, 6, s_wxSize) : &wxDefaultSize);
***************
*** 236,240 ****
      long style = (argCount >= 6 ? (long) lua_tonumber(L, 6) : 0);
      // const wxString choices[] = NULL
!     int count = 0; SmartStringArray ptr; wxString *choices; ptr = choices = (argCount >= 5 ? tostringarray(L, 5, count) : NULL);
      // const wxSize& size = wxDefaultSize
      const wxSize *size = (argCount >= 4 ? (wxSize *) getuserdatatype(L, 4, s_wxSize) : &wxDefaultSize);
--- 236,240 ----
      long style = (argCount >= 6 ? (long) lua_tonumber(L, 6) : 0);
      // const wxString choices[] = NULL
!     int count = 0; wxLuaSmartStringArray ptr; wxString *choices; ptr = choices = (argCount >= 5 ? tostringarray(L, 5, count) : NULL);
      // const wxSize& size = wxDefaultSize
      const wxSize *size = (argCount >= 4 ? (wxSize *) getuserdatatype(L, 4, s_wxSize) : &wxDefaultSize);
***************
*** 268,272 ****
      long style = (argCount >= 7 ? (long) lua_tonumber(L, 7) : 0);
      // const wxString choices[] = NULL
!     int count = 0; SmartStringArray ptr; wxString *choices; ptr = choices = (argCount >= 6 ? tostringarray(L, 6, count) : NULL);
      // const wxSize& size = wxDefaultSize
      const wxSize *size = (argCount >= 5 ? (wxSize *) getuserdatatype(L, 5, s_wxSize) : &wxDefaultSize);
--- 268,272 ----
      long style = (argCount >= 7 ? (long) lua_tonumber(L, 7) : 0);
      // const wxString choices[] = NULL
!     int count = 0; wxLuaSmartStringArray ptr; wxString *choices; ptr = choices = (argCount >= 6 ? tostringarray(L, 6, count) : NULL);
      // const wxSize& size = wxDefaultSize
      const wxSize *size = (argCount >= 5 ? (wxSize *) getuserdatatype(L, 5, s_wxSize) : &wxDefaultSize);
***************
*** 302,306 ****
      long style = (argCount >= 6 ? (long) lua_tonumber(L, 6) : 0);
      // const wxString choices[] = NULL
!     int count = 0; SmartStringArray ptr; wxString *choices; ptr = choices = (argCount >= 5 ? tostringarray(L, 5, count) : NULL);
      // const wxSize& size = wxDefaultSize
      const wxSize *size = (argCount >= 4 ? (wxSize *) getuserdatatype(L, 4, s_wxSize) : &wxDefaultSize);
--- 302,306 ----
      long style = (argCount >= 6 ? (long) lua_tonumber(L, 6) : 0);
      // const wxString choices[] = NULL
!     int count = 0; wxLuaSmartStringArray ptr; wxString *choices; ptr = choices = (argCount >= 5 ? tostringarray(L, 5, count) : NULL);
      // const wxSize& size = wxDefaultSize
      const wxSize *size = (argCount >= 4 ? (wxSize *) getuserdatatype(L, 4, s_wxSize) : &wxDefaultSize);
***************
*** 336,340 ****
      int majorDimension = (argCount >= 7 ? (int) lua_tonumber(L, 7) : 0);
      // const wxString choices[] = NULL
!     int count = 0; SmartStringArray ptr; wxString *choices; ptr = choices = (argCount >= 6 ? tostringarray(L, 6, count) : NULL);
      // const wxSize& size = wxDefaultSize
      const wxSize *size = (argCount >= 5 ? (wxSize *) getuserdatatype(L, 5, s_wxSize) : &wxDefaultSize);
--- 336,340 ----
      int majorDimension = (argCount >= 7 ? (int) lua_tonumber(L, 7) : 0);
      // const wxString choices[] = NULL
!     int count = 0; wxLuaSmartStringArray ptr; wxString *choices; ptr = choices = (argCount >= 6 ? tostringarray(L, 6, count) : NULL);
      // const wxSize& size = wxDefaultSize
      const wxSize *size = (argCount >= 5 ? (wxSize *) getuserdatatype(L, 5, s_wxSize) : &wxDefaultSize);
***************
*** 873,877 ****
  static int LUACALL wxFrame_SetStatusWidths(lua_State *L)
  {
!     int count = 0; SmartIntArray ptr; int *choices; ptr = choices = tointarray(L, 2, count);
      // get this
      wxFrame *self = ( wxFrame * ) getuserdatatype(L, 1, s_wxFrame );
--- 873,877 ----
  static int LUACALL wxFrame_SetStatusWidths(lua_State *L)
  {
!     int count = 0; wxLuaSmartIntArray ptr; int *choices; ptr = choices = tointarray(L, 2, count);
      // get this
      wxFrame *self = ( wxFrame * ) getuserdatatype(L, 1, s_wxFrame );
***************
*** 887,891 ****
  static int LUACALL wxStatusBar_SetStatusWidths(lua_State *L)
  {
!     int count = 0; SmartIntArray ptr; int *choices; ptr = choices = tointarray(L, 2, count);
      // get this
      wxStatusBar *self = ( wxStatusBar * ) getuserdatatype(L, 1, s_wxStatusBar );
--- 887,891 ----
  static int LUACALL wxStatusBar_SetStatusWidths(lua_State *L)
  {
!     int count = 0; wxLuaSmartIntArray ptr; int *choices; ptr = choices = tointarray(L, 2, count);
      // get this
      wxStatusBar *self = ( wxStatusBar * ) getuserdatatype(L, 1, s_wxStatusBar );
***************
*** 1569,1573 ****
      int *widths = NULL;
  
!     SmartIntArray ptr;
  
      if (lua_istable(L, 2))
--- 1569,1573 ----
      int *widths = NULL;
  
!     wxLuaSmartIntArray ptr;
  
      if (lua_istable(L, 2))
***************
*** 1680,1684 ****
  #if wxCHECK_VERSION(2, 5, 0)
      wxTreeItemIdValue cookie = 0;
! #else    
      // long& cookie
      long cookie = 0;
--- 1680,1684 ----
  #if wxCHECK_VERSION(2, 5, 0)
      wxTreeItemIdValue cookie = 0;
! #else
      // long& cookie
      long cookie = 0;
***************
*** 1697,1701 ****
  #if wxCHECK_VERSION(2, 5, 0)
      pushuserdatatype(L, s_wxTreeItemIdValue, cookie );
! #else    
      // push the cookie
      lua_pushnumber(L, cookie);
--- 1697,1701 ----
  #if wxCHECK_VERSION(2, 5, 0)
      pushuserdatatype(L, s_wxTreeItemIdValue, cookie );
! #else
      // push the cookie
      lua_pushnumber(L, cookie);
***************
*** 1711,1718 ****
  {
      wxTreeItemId *returns;
!     
  #if wxCHECK_VERSION(2, 5, 0)
      wxTreeItemIdValue cookie = ( wxTreeItemIdValue * ) getuserdatatype(L, 1, s_wxTreeItemIdValue );
! #else    
      // long& cookie
      long cookie = (long) lua_tonumber(L, 3);
--- 1711,1718 ----
  {
      wxTreeItemId *returns;
! 
  #if wxCHECK_VERSION(2, 5, 0)
      wxTreeItemIdValue cookie = ( wxTreeItemIdValue * ) getuserdatatype(L, 1, s_wxTreeItemIdValue );
! #else
      // long& cookie
      long cookie = (long) lua_tonumber(L, 3);
***************
*** 1731,1735 ****
  #if wxCHECK_VERSION(2, 5, 0)
      pushuserdatatype(L, s_wxTreeItemIdValue, cookie );
! #else    
      // push the cookie
      lua_pushnumber(L, cookie);
--- 1731,1735 ----
  #if wxCHECK_VERSION(2, 5, 0)
      pushuserdatatype(L, s_wxTreeItemIdValue, cookie );
! #else
      // push the cookie
      lua_pushnumber(L, cookie);
***************
*** 2599,2603 ****
          if (argCount == 1 && lua_istable(L, 1))
          {
!             int count = 0; SmartStringArray ptr; wxString *choices; ptr = choices = tostringarray(L, 1, count);
              for (idx = 0; idx < count; ++idx)
                  returns->Add(choices[idx]);
--- 2599,2603 ----
          if (argCount == 1 && lua_istable(L, 1))
          {
!             int count = 0; wxLuaSmartStringArray ptr; wxString *choices; ptr = choices = tostringarray(L, 1, count);
              for (idx = 0; idx < count; ++idx)
                  returns->Add(choices[idx]);
***************
*** 3309,3314 ****
  // bool GetFirstGroup(wxString& str, long& index) const
  static int LUACALL wxConfigBase_GetFirstGroup(lua_State *L)
! {    
!     bool returns;    
      // long& index
      long index = (long) getnumbertype(L, 3);
--- 3309,3314 ----
  // bool GetFirstGroup(wxString& str, long& index) const
  static int LUACALL wxConfigBase_GetFirstGroup(lua_State *L)
! {
!     bool returns;
      // long& index
      long index = (long) getnumbertype(L, 3);
***************
*** 3330,3335 ****
  // bool GetFirstEntry(wxString& str, long& index) const
  static int LUACALL wxConfigBase_GetFirstEntry(lua_State *L)
! {    
!     bool returns;    
      // long& index
      long index = (long) getnumbertype(L, 3);
--- 3330,3335 ----
  // bool GetFirstEntry(wxString& str, long& index) const
  static int LUACALL wxConfigBase_GetFirstEntry(lua_State *L)
! {
!     bool returns;
      // long& index
      long index = (long) getnumbertype(L, 3);
***************
*** 3351,3356 ****
  // bool GetNextGroup(wxString& str, long& index) const
  static int LUACALL wxConfigBase_GetNextGroup(lua_State *L)
! {    
!     bool returns;    
      // long& index
      long index = (long) getnumbertype(L, 3);
--- 3351,3356 ----
  // bool GetNextGroup(wxString& str, long& index) const
  static int LUACALL wxConfigBase_GetNextGroup(lua_State *L)
! {
!     bool returns;
      // long& index
      long index = (long) getnumbertype(L, 3);
***************
*** 3372,3377 ****
  // bool GetNextEntry(wxString& str, long& index) const
  static int LUACALL wxConfigBase_GetNextEntry(lua_State *L)
! {    
!     bool returns;    
      // long& index
      long index = (long) getnumbertype(L, 3);
--- 3372,3377 ----
  // bool GetNextEntry(wxString& str, long& index) const
  static int LUACALL wxConfigBase_GetNextEntry(lua_State *L)
! {
!     bool returns;
      // long& index
      long index = (long) getnumbertype(L, 3);
***************
*** 3823,3827 ****
      wxWindow *parent = (argCount >= 5 ? (wxWindow *) getuserdatatype(L, 4, s_wxWindow) : NULL);
      // const wxString& choices[]
!     int count = 0; SmartStringArray ptr; wxString *choices; ptr = choices = tostringarray(L, 3, count);
      // const wxString& caption
      wxString caption = lua2wx(getstringtype(L, 2));
--- 3823,3827 ----
      wxWindow *parent = (argCount >= 5 ? (wxWindow *) getuserdatatype(L, 4, s_wxWindow) : NULL);
      // const wxString& choices[]
!     int count = 0; wxLuaSmartStringArray ptr; wxString *choices; ptr = choices = tostringarray(L, 3, count);
      // const wxString& caption
      wxString caption = lua2wx(getstringtype(L, 2));
***************
*** 3857,3861 ****
      wxWindow *parent = (argCount >= 5 ? (wxWindow *) getuserdatatype(L, 5, s_wxWindow) : (wxWindow *) NULL);
      // const wxString& choices[]
!     int count = 0; SmartStringArray ptr; wxString *choices; ptr = choices = tostringarray(L, 4, count);
      // const wxString& caption
      wxString caption = lua2wx(getstringtype(L, 3));
--- 3857,3861 ----
      wxWindow *parent = (argCount >= 5 ? (wxWindow *) getuserdatatype(L, 5, s_wxWindow) : (wxWindow *) NULL);
      // const wxString& choices[]
!     int count = 0; wxLuaSmartStringArray ptr; wxString *choices; ptr = choices = tostringarray(L, 4, count);
      // const wxString& caption
      wxString caption = lua2wx(getstringtype(L, 3));
***************
*** 3956,3961 ****
  // wxInputStream& Read(void *buffer, size_t size)
  static int LUACALL wxInputStream_Read(lua_State *L)
! {    
!     wxInputStream *returns;    
      // size_t size
      size_t size = (size_t) getnumbertype(L, 2);
--- 3956,3961 ----
  // wxInputStream& Read(void *buffer, size_t size)
  static int LUACALL wxInputStream_Read(lua_State *L)
! {
!     wxInputStream *returns;
      // size_t size
      size_t size = (size_t) getnumbertype(L, 2);
***************
*** 3981,3986 ****
  // %rename ReadStream wxInputStream& Read(wxOutputStream& stream_in)
  static int LUACALL wxInputStream_ReadStream(lua_State *L)
! {    
!     wxInputStream *returns;    
      // wxOutputStream& stream_in
      wxOutputStream *stream_in = (wxOutputStream *) getuserdatatype(L, 2, s_wxOutputStream);
--- 3981,3986 ----
  // %rename ReadStream wxInputStream& Read(wxOutputStream& stream_in)
  static int LUACALL wxInputStream_ReadStream(lua_State *L)
! {
!     wxInputStream *returns;
      // wxOutputStream& stream_in
      wxOutputStream *stream_in = (wxOutputStream *) getuserdatatype(L, 2, s_wxOutputStream);
***************
*** 3999,4004 ****
  // wxOutputStream& Write(const void *buffer, size_t size)
  static int LUACALL wxOutputStream_Write(lua_State *L)
! {    
!     wxOutputStream *returns;    
      // size_t size
      size_t size = (size_t) getnumbertype(L, 3);
--- 3999,4004 ----
  // wxOutputStream& Write(const void *buffer, size_t size)
  static int LUACALL wxOutputStream_Write(lua_State *L)
! {
!     wxOutputStream *returns;
      // size_t size
      size_t size = (size_t) getnumbertype(L, 3);
***************
*** 4019,4024 ****
  // %rename WriteStream wxOutputStream& Write(wxInputStream& stream_in)
  static int LUACALL wxOutputStream_WriteStream(lua_State *L)
! {    
!     wxOutputStream *returns;    
      // wxInputStream& stream_in
      wxInputStream *stream_in = (wxInputStream *) getuserdatatype(L, 2, s_wxInputStream);
--- 4019,4024 ----
  // %rename WriteStream wxOutputStream& Write(wxInputStream& stream_in)
  static int LUACALL wxOutputStream_WriteStream(lua_State *L)
! {
!     wxOutputStream *returns;
      // wxInputStream& stream_in
      wxInputStream *stream_in = (wxInputStream *) getuserdatatype(L, 2, s_wxInputStream);
***************
*** 4037,4042 ****
  // bool SetTransferMode(wxFTP::TransferMode mode)
  static int LUACALL wxFTP_SetTransferMode(lua_State *L)
! {    
!     bool returns;    
      // wxFTP::TransferMode mode
      wxFTP::TransferMode mode = (wxFTP::TransferMode)(int) getnumbertype(L, 2);
--- 4037,4042 ----
  // bool SetTransferMode(wxFTP::TransferMode mode)
  static int LUACALL wxFTP_SetTransferMode(lua_State *L)
! {
!     bool returns;
      // wxFTP::TransferMode mode
      wxFTP::TransferMode mode = (wxFTP::TransferMode)(int) getnumbertype(L, 2);
***************
*** 4055,4060 ****
  // %rename Unget size_t Ungetch(const char* buffer, size_t size)
  static int LUACALL wxInputStream_Unget(lua_State *L)
! {    
!     size_t returns;    
      // size_t size
      size_t size = (size_t) getnumbertype(L, 3);
--- 4055,4060 ----
  // %rename Unget size_t Ungetch(const char* buffer, size_t size)
  static int LUACALL wxInputStream_Unget(lua_State *L)
! {
!     size_t returns;
      // size_t size
      size_t size = (size_t) getnumbertype(L, 3);
***************
*** 4075,4085 ****
  // wxGLCanvas(wxWindow* parent, wxWindowID id = -1, const wxPoint& pos, const wxSize& size, long style=0, const wxString& name="GLCanvas", int* attribList = 0, const wxPalette& palette = wxNullPalette)
  static int LUACALL wxGLCanvas_constructor(lua_State *L)
! {    
!     SmartIntArray ptr; 
!     int *attribList = NULL; 
!     int count = 0; 
      wxGLCanvas *returns;
      // get number of arguments
!     int argCount = lua_gettop(L);    
      // const wxPalette& palette = wxNullPalette
      const wxPalette *palette = (argCount >= 8 ? (wxPalette *) getuserdatatype(L, 8, s_wxPalette) : &wxNullPalette);
--- 4075,4085 ----
  // wxGLCanvas(wxWindow* parent, wxWindowID id = -1, const wxPoint& pos, const wxSize& size, long style=0, const wxString& name="GLCanvas", int* attribList = 0, const wxPalette& palette = wxNullPalette)
  static int LUACALL wxGLCanvas_constructor(lua_State *L)
! {
!     wxLuaSmartIntArray ptr;
!     int *attribList = NULL;
!     int count = 0;
      wxGLCanvas *returns;
      // get number of arguments
!     int argCount = lua_gettop(L);
      // const wxPalette& palette = wxNullPalette
      const wxPalette *palette = (argCount >= 8 ? (wxPalette *) getuserdatatype(L, 8, s_wxPalette) : &wxNullPalette);
***************
*** 4113,4117 ****
  // double  GetValue() const;
  static int LUACALL wxTreeItemId_GetValue(lua_State *L)
! {    
      double returns;
      // get this
--- 4113,4117 ----
  // double  GetValue() const;
  static int LUACALL wxTreeItemId_GetValue(lua_State *L)
! {
      double returns;
      // get this
***************
*** 4129,4133 ****
  // void SetValue(double value);
  static int LUACALL wxTreeItemId_SetValue(lua_State *L)
! {        
      // double value
      long value = (long) getnumbertype(L, 2);
--- 4129,4133 ----
  // void SetValue(double value);
  static int LUACALL wxTreeItemId_SetValue(lua_State *L)
! {
      // double value
      long value = (long) getnumbertype(L, 2);

[Wxlua-commit] wxLua/bindings genwxbind.lua,1.6,1.7

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

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

Modified Files:
	genwxbind.lua 
Log Message:
flesh out the wxLuaState
SmartString/IntArray to wxLuaSmartXXX
TRUE/FALSE - true/false


Index: genwxbind.lua
===================================================================
RCS file: /cvsroot/wxlua/wxLua/bindings/genwxbind.lua,v
retrieving revision 1.6
retrieving revision 1.7
diff -C2 -d -r1.6 -r1.7
*** genwxbind.lua	24 Nov 2005 03:38:05 -0000	1.6
--- genwxbind.lua	25 Nov 2005 10:09:10 -0000	1.7
***************
*** 2818,2822 ****
  
                              argItem = "tostringarray(L, "..argNum..", count)"
!                             declare = "int count = 0; SmartStringArray ptr; "..argTypeWithAttrib.." "..argName.."; ptr = "
                          elseif not intrinsic then
                              argItem = "("..argTypeWithAttrib..") getuserdatatype(L, "..argNum..", s_"..MakeClassVar(argType)..")"
--- 2818,2822 ----
  
                              argItem = "tostringarray(L, "..argNum..", count)"
!                             declare = "int count = 0; wxLuaSmartStringArray ptr; "..argTypeWithAttrib.." "..argName.."; ptr = "
                          elseif not intrinsic then
                              argItem = "("..argTypeWithAttrib..") getuserdatatype(L, "..argNum..", s_"..MakeClassVar(argType)..")"
***************
*** 3003,3007 ****
                      table.insert(codeList, "// "..interface.lineData[member.LineNumber].Line.."\n")
                  end
!                 
                  table.insert(codeList, "static int LUACALL "..funcName.."(lua_State *L)\n{\n")
  
--- 3003,3007 ----
                      table.insert(codeList, "// "..interface.lineData[member.LineNumber].Line.."\n")
                  end
! 
                  table.insert(codeList, "static int LUACALL "..funcName.."(lua_State *L)\n{\n")
  

[Wxlua-commit] wxLua/modules/build/msw makefile.bcc,1.11,1.12 makefile.gcc,1.11,1.12 makefile.vc,1.9,1.10 makefile.wat,1.9,1.10

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

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

Modified Files:
	makefile.bcc makefile.gcc makefile.vc makefile.wat 
Log Message:
rebaked files for new files created from internal.cpp


Index: makefile.vc
===================================================================
RCS file: /cvsroot/wxlua/wxLua/modules/build/msw/makefile.vc,v
retrieving revision 1.9
retrieving revision 1.10
diff -C2 -d -r1.9 -r1.10
*** makefile.vc	23 Nov 2005 20:33:15 -0000	1.9
--- makefile.vc	25 Nov 2005 03:03:10 -0000	1.10
***************
*** 95,100 ****
  WXLUA_LIB_OBJECTS =  \
  	msvc$(WXLIBPOSTFIX)\wxlua_lib_internal.obj \
! 	msvc$(WXLIBPOSTFIX)\wxlua_lib_interp.obj \
! 	msvc$(WXLIBPOSTFIX)\wxlua_lib_library.obj
  WXLUA_DLL_CXXFLAGS = /MD$(__DEBUGRUNTIME) /DWIN32 $(__WXUNICODE_DEFINE_p) \
  	$(__WXDEBUG_DEFINE_p) /D__WXMSW__ \
--- 95,103 ----
  WXLUA_LIB_OBJECTS =  \
  	msvc$(WXLIBPOSTFIX)\wxlua_lib_internal.obj \
! 	msvc$(WXLIBPOSTFIX)\wxlua_lib_wxlbind.obj \
! 	msvc$(WXLIBPOSTFIX)\wxlua_lib_wxlcallb.obj \
! 	msvc$(WXLIBPOSTFIX)\wxlua_lib_wxlhandl.obj \
! 	msvc$(WXLIBPOSTFIX)\wxlua_lib_wxlintrp.obj \
! 	msvc$(WXLIBPOSTFIX)\wxlua_lib_wxlstate.obj
  WXLUA_DLL_CXXFLAGS = /MD$(__DEBUGRUNTIME) /DWIN32 $(__WXUNICODE_DEFINE_p) \
  	$(__WXDEBUG_DEFINE_p) /D__WXMSW__ \
***************
*** 106,111 ****
  WXLUA_DLL_OBJECTS =  \
  	msvc$(WXLIBPOSTFIX)\wxlua_dll_internal.obj \
! 	msvc$(WXLIBPOSTFIX)\wxlua_dll_interp.obj \
! 	msvc$(WXLIBPOSTFIX)\wxlua_dll_library.obj
  WXBIND_LIB_CXXFLAGS = /MD$(__DEBUGRUNTIME) /DWIN32 $(__WXUNICODE_DEFINE_p) \
  	$(__WXDEBUG_DEFINE_p) /D__WXMSW__ \
--- 109,117 ----
  WXLUA_DLL_OBJECTS =  \
  	msvc$(WXLIBPOSTFIX)\wxlua_dll_internal.obj \
! 	msvc$(WXLIBPOSTFIX)\wxlua_dll_wxlbind.obj \
! 	msvc$(WXLIBPOSTFIX)\wxlua_dll_wxlcallb.obj \
! 	msvc$(WXLIBPOSTFIX)\wxlua_dll_wxlhandl.obj \
! 	msvc$(WXLIBPOSTFIX)\wxlua_dll_wxlintrp.obj \
! 	msvc$(WXLIBPOSTFIX)\wxlua_dll_wxlstate.obj
  WXBIND_LIB_CXXFLAGS = /MD$(__DEBUGRUNTIME) /DWIN32 $(__WXUNICODE_DEFINE_p) \
  	$(__WXDEBUG_DEFINE_p) /D__WXMSW__ \
***************
*** 546,553 ****
  	$(CXX) /c /nologo /TP /Fo$@ $(WXLUA_LIB_CXXFLAGS) $**
  
! msvc$(WXLIBPOSTFIX)\wxlua_lib_interp.obj: ..\..\wxlua\src\interp.cpp
  	$(CXX) /c /nologo /TP /Fo$@ $(WXLUA_LIB_CXXFLAGS) $**
  
! msvc$(WXLIBPOSTFIX)\wxlua_lib_library.obj: ..\..\wxlua\src\library.cpp
  	$(CXX) /c /nologo /TP /Fo$@ $(WXLUA_LIB_CXXFLAGS) $**
  
--- 552,568 ----
  	$(CXX) /c /nologo /TP /Fo$@ $(WXLUA_LIB_CXXFLAGS) $**
  
! msvc$(WXLIBPOSTFIX)\wxlua_lib_wxlbind.obj: ..\..\wxlua\src\wxlbind.cpp
  	$(CXX) /c /nologo /TP /Fo$@ $(WXLUA_LIB_CXXFLAGS) $**
  
! msvc$(WXLIBPOSTFIX)\wxlua_lib_wxlcallb.obj: ..\..\wxlua\src\wxlcallb.cpp
! 	$(CXX) /c /nologo /TP /Fo$@ $(WXLUA_LIB_CXXFLAGS) $**
! 
! msvc$(WXLIBPOSTFIX)\wxlua_lib_wxlhandl.obj: ..\..\wxlua\src\wxlhandl.cpp
! 	$(CXX) /c /nologo /TP /Fo$@ $(WXLUA_LIB_CXXFLAGS) $**
! 
! msvc$(WXLIBPOSTFIX)\wxlua_lib_wxlintrp.obj: ..\..\wxlua\src\wxlintrp.cpp
! 	$(CXX) /c /nologo /TP /Fo$@ $(WXLUA_LIB_CXXFLAGS) $**
! 
! msvc$(WXLIBPOSTFIX)\wxlua_lib_wxlstate.obj: ..\..\wxlua\src\wxlstate.cpp
  	$(CXX) /c /nologo /TP /Fo$@ $(WXLUA_LIB_CXXFLAGS) $**
  
***************
*** 555,562 ****
  	$(CXX) /c /nologo /TP /Fo$@ $(WXLUA_DLL_CXXFLAGS) $**
  
! msvc$(WXLIBPOSTFIX)\wxlua_dll_interp.obj: ..\..\wxlua\src\interp.cpp
  	$(CXX) /c /nologo /TP /Fo$@ $(WXLUA_DLL_CXXFLAGS) $**
  
! msvc$(WXLIBPOSTFIX)\wxlua_dll_library.obj: ..\..\wxlua\src\library.cpp
  	$(CXX) /c /nologo /TP /Fo$@ $(WXLUA_DLL_CXXFLAGS) $**
  
--- 570,586 ----
  	$(CXX) /c /nologo /TP /Fo$@ $(WXLUA_DLL_CXXFLAGS) $**
  
! msvc$(WXLIBPOSTFIX)\wxlua_dll_wxlbind.obj: ..\..\wxlua\src\wxlbind.cpp
  	$(CXX) /c /nologo /TP /Fo$@ $(WXLUA_DLL_CXXFLAGS) $**
  
! msvc$(WXLIBPOSTFIX)\wxlua_dll_wxlcallb.obj: ..\..\wxlua\src\wxlcallb.cpp
! 	$(CXX) /c /nologo /TP /Fo$@ $(WXLUA_DLL_CXXFLAGS) $**
! 
! msvc$(WXLIBPOSTFIX)\wxlua_dll_wxlhandl.obj: ..\..\wxlua\src\wxlhandl.cpp
! 	$(CXX) /c /nologo /TP /Fo$@ $(WXLUA_DLL_CXXFLAGS) $**
! 
! msvc$(WXLIBPOSTFIX)\wxlua_dll_wxlintrp.obj: ..\..\wxlua\src\wxlintrp.cpp
! 	$(CXX) /c /nologo /TP /Fo$@ $(WXLUA_DLL_CXXFLAGS) $**
! 
! msvc$(WXLIBPOSTFIX)\wxlua_dll_wxlstate.obj: ..\..\wxlua\src\wxlstate.cpp
  	$(CXX) /c /nologo /TP /Fo$@ $(WXLUA_DLL_CXXFLAGS) $**
  

Index: makefile.bcc
===================================================================
RCS file: /cvsroot/wxlua/wxLua/modules/build/msw/makefile.bcc,v
retrieving revision 1.11
retrieving revision 1.12
diff -C2 -d -r1.11 -r1.12
*** makefile.bcc	23 Nov 2005 20:33:15 -0000	1.11
--- makefile.bcc	25 Nov 2005 03:03:10 -0000	1.12
***************
*** 124,129 ****
  WXLUA_LIB_OBJECTS =  \
  	borland$(WXLIBPOSTFIX)\wxlua_lib_internal.obj \
! 	borland$(WXLIBPOSTFIX)\wxlua_lib_interp.obj \
! 	borland$(WXLIBPOSTFIX)\wxlua_lib_library.obj
  WXLUA_DLL_CXXFLAGS = -I$(BCCDIR)\include $(__WXUNICODE_DEFINE_p) \
  	$(__WXDEBUG_DEFINE_p) -D__WXMSW__ \
--- 124,132 ----
  WXLUA_LIB_OBJECTS =  \
  	borland$(WXLIBPOSTFIX)\wxlua_lib_internal.obj \
! 	borland$(WXLIBPOSTFIX)\wxlua_lib_wxlbind.obj \
! 	borland$(WXLIBPOSTFIX)\wxlua_lib_wxlcallb.obj \
! 	borland$(WXLIBPOSTFIX)\wxlua_lib_wxlhandl.obj \
! 	borland$(WXLIBPOSTFIX)\wxlua_lib_wxlintrp.obj \
! 	borland$(WXLIBPOSTFIX)\wxlua_lib_wxlstate.obj
  WXLUA_DLL_CXXFLAGS = -I$(BCCDIR)\include $(__WXUNICODE_DEFINE_p) \
  	$(__WXDEBUG_DEFINE_p) -D__WXMSW__ \
***************
*** 134,139 ****
  WXLUA_DLL_OBJECTS =  \
  	borland$(WXLIBPOSTFIX)\wxlua_dll_internal.obj \
! 	borland$(WXLIBPOSTFIX)\wxlua_dll_interp.obj \
! 	borland$(WXLIBPOSTFIX)\wxlua_dll_library.obj
  WXBIND_LIB_CXXFLAGS = -I$(BCCDIR)\include $(__WXUNICODE_DEFINE_p) \
  	$(__WXDEBUG_DEFINE_p) -D__WXMSW__ \
--- 137,145 ----
  WXLUA_DLL_OBJECTS =  \
  	borland$(WXLIBPOSTFIX)\wxlua_dll_internal.obj \
! 	borland$(WXLIBPOSTFIX)\wxlua_dll_wxlbind.obj \
! 	borland$(WXLIBPOSTFIX)\wxlua_dll_wxlcallb.obj \
! 	borland$(WXLIBPOSTFIX)\wxlua_dll_wxlhandl.obj \
! 	borland$(WXLIBPOSTFIX)\wxlua_dll_wxlintrp.obj \
! 	borland$(WXLIBPOSTFIX)\wxlua_dll_wxlstate.obj
  WXBIND_LIB_CXXFLAGS = -I$(BCCDIR)\include $(__WXUNICODE_DEFINE_p) \
  	$(__WXDEBUG_DEFINE_p) -D__WXMSW__ \
***************
*** 560,567 ****
  	$(CXX) -q -c -P -o$@ $(WXLUA_LIB_CXXFLAGS) $**
  
! borland$(WXLIBPOSTFIX)\wxlua_lib_interp.obj: ..\..\wxlua\src\interp.cpp
  	$(CXX) -q -c -P -o$@ $(WXLUA_LIB_CXXFLAGS) $**
  
! borland$(WXLIBPOSTFIX)\wxlua_lib_library.obj: ..\..\wxlua\src\library.cpp
  	$(CXX) -q -c -P -o$@ $(WXLUA_LIB_CXXFLAGS) $**
  
--- 566,582 ----
  	$(CXX) -q -c -P -o$@ $(WXLUA_LIB_CXXFLAGS) $**
  
! borland$(WXLIBPOSTFIX)\wxlua_lib_wxlbind.obj: ..\..\wxlua\src\wxlbind.cpp
  	$(CXX) -q -c -P -o$@ $(WXLUA_LIB_CXXFLAGS) $**
  
! borland$(WXLIBPOSTFIX)\wxlua_lib_wxlcallb.obj: ..\..\wxlua\src\wxlcallb.cpp
! 	$(CXX) -q -c -P -o$@ $(WXLUA_LIB_CXXFLAGS) $**
! 
! borland$(WXLIBPOSTFIX)\wxlua_lib_wxlhandl.obj: ..\..\wxlua\src\wxlhandl.cpp
! 	$(CXX) -q -c -P -o$@ $(WXLUA_LIB_CXXFLAGS) $**
! 
! borland$(WXLIBPOSTFIX)\wxlua_lib_wxlintrp.obj: ..\..\wxlua\src\wxlintrp.cpp
! 	$(CXX) -q -c -P -o$@ $(WXLUA_LIB_CXXFLAGS) $**
! 
! borland$(WXLIBPOSTFIX)\wxlua_lib_wxlstate.obj: ..\..\wxlua\src\wxlstate.cpp
  	$(CXX) -q -c -P -o$@ $(WXLUA_LIB_CXXFLAGS) $**
  
***************
*** 569,576 ****
  	$(CXX) -q -c -P -o$@ $(WXLUA_DLL_CXXFLAGS) $**
  
! borland$(WXLIBPOSTFIX)\wxlua_dll_interp.obj: ..\..\wxlua\src\interp.cpp
  	$(CXX) -q -c -P -o$@ $(WXLUA_DLL_CXXFLAGS) $**
  
! borland$(WXLIBPOSTFIX)\wxlua_dll_library.obj: ..\..\wxlua\src\library.cpp
  	$(CXX) -q -c -P -o$@ $(WXLUA_DLL_CXXFLAGS) $**
  
--- 584,600 ----
  	$(CXX) -q -c -P -o$@ $(WXLUA_DLL_CXXFLAGS) $**
  
! borland$(WXLIBPOSTFIX)\wxlua_dll_wxlbind.obj: ..\..\wxlua\src\wxlbind.cpp
  	$(CXX) -q -c -P -o$@ $(WXLUA_DLL_CXXFLAGS) $**
  
! borland$(WXLIBPOSTFIX)\wxlua_dll_wxlcallb.obj: ..\..\wxlua\src\wxlcallb.cpp
! 	$(CXX) -q -c -P -o$@ $(WXLUA_DLL_CXXFLAGS) $**
! 
! borland$(WXLIBPOSTFIX)\wxlua_dll_wxlhandl.obj: ..\..\wxlua\src\wxlhandl.cpp
! 	$(CXX) -q -c -P -o$@ $(WXLUA_DLL_CXXFLAGS) $**
! 
! borland$(WXLIBPOSTFIX)\wxlua_dll_wxlintrp.obj: ..\..\wxlua\src\wxlintrp.cpp
! 	$(CXX) -q -c -P -o$@ $(WXLUA_DLL_CXXFLAGS) $**
! 
! borland$(WXLIBPOSTFIX)\wxlua_dll_wxlstate.obj: ..\..\wxlua\src\wxlstate.cpp
  	$(CXX) -q -c -P -o$@ $(WXLUA_DLL_CXXFLAGS) $**
  

Index: makefile.wat
===================================================================
RCS file: /cvsroot/wxlua/wxLua/modules/build/msw/makefile.wat,v
retrieving revision 1.9
retrieving revision 1.10
diff -C2 -d -r1.9 -r1.10
*** makefile.wat	23 Nov 2005 20:33:15 -0000	1.9
--- makefile.wat	25 Nov 2005 03:03:10 -0000	1.10
***************
*** 216,221 ****
  WXLUA_LIB_OBJECTS =  &
  	watcom$(WXLIBPOSTFIX)\wxlua_lib_internal.obj &
! 	watcom$(WXLIBPOSTFIX)\wxlua_lib_interp.obj &
! 	watcom$(WXLIBPOSTFIX)\wxlua_lib_library.obj
  WXLUA_DLL_CXXFLAGS = -bd $(__WXUNICODE_DEFINE_p) $(__WXDEBUG_DEFINE_p) &
  	-d__WXMSW__ -i=$(WX_DIR)$(__WXLIBPATH_FILENAMES)\msw$(WXLIBPOSTFIX) &
--- 216,224 ----
  WXLUA_LIB_OBJECTS =  &
  	watcom$(WXLIBPOSTFIX)\wxlua_lib_internal.obj &
! 	watcom$(WXLIBPOSTFIX)\wxlua_lib_wxlbind.obj &
! 	watcom$(WXLIBPOSTFIX)\wxlua_lib_wxlcallb.obj &
! 	watcom$(WXLIBPOSTFIX)\wxlua_lib_wxlhandl.obj &
! 	watcom$(WXLIBPOSTFIX)\wxlua_lib_wxlintrp.obj &
! 	watcom$(WXLIBPOSTFIX)\wxlua_lib_wxlstate.obj
  WXLUA_DLL_CXXFLAGS = -bd $(__WXUNICODE_DEFINE_p) $(__WXDEBUG_DEFINE_p) &
  	-d__WXMSW__ -i=$(WX_DIR)$(__WXLIBPATH_FILENAMES)\msw$(WXLIBPOSTFIX) &
***************
*** 225,230 ****
  WXLUA_DLL_OBJECTS =  &
  	watcom$(WXLIBPOSTFIX)\wxlua_dll_internal.obj &
! 	watcom$(WXLIBPOSTFIX)\wxlua_dll_interp.obj &
! 	watcom$(WXLIBPOSTFIX)\wxlua_dll_library.obj
  WXBIND_LIB_CXXFLAGS = $(__WXUNICODE_DEFINE_p) $(__WXDEBUG_DEFINE_p) &
  	-d__WXMSW__ -i=$(WX_DIR)$(__WXLIBPATH_FILENAMES)\msw$(WXLIBPOSTFIX) &
--- 228,236 ----
  WXLUA_DLL_OBJECTS =  &
  	watcom$(WXLIBPOSTFIX)\wxlua_dll_internal.obj &
! 	watcom$(WXLIBPOSTFIX)\wxlua_dll_wxlbind.obj &
! 	watcom$(WXLIBPOSTFIX)\wxlua_dll_wxlcallb.obj &
! 	watcom$(WXLIBPOSTFIX)\wxlua_dll_wxlhandl.obj &
! 	watcom$(WXLIBPOSTFIX)\wxlua_dll_wxlintrp.obj &
! 	watcom$(WXLIBPOSTFIX)\wxlua_dll_wxlstate.obj
  WXBIND_LIB_CXXFLAGS = $(__WXUNICODE_DEFINE_p) $(__WXDEBUG_DEFINE_p) &
  	-d__WXMSW__ -i=$(WX_DIR)$(__WXLIBPATH_FILENAMES)\msw$(WXLIBPOSTFIX) &
***************
*** 582,589 ****
  	$(CXX) -zq -fo=$^@ $(WXLUA_LIB_CXXFLAGS) $<
  
! watcom$(WXLIBPOSTFIX)\wxlua_lib_interp.obj :  .AUTODEPEND ..\..\wxlua\src\interp.cpp
  	$(CXX) -zq -fo=$^@ $(WXLUA_LIB_CXXFLAGS) $<
  
! watcom$(WXLIBPOSTFIX)\wxlua_lib_library.obj :  .AUTODEPEND ..\..\wxlua\src\library.cpp
  	$(CXX) -zq -fo=$^@ $(WXLUA_LIB_CXXFLAGS) $<
  
--- 588,604 ----
  	$(CXX) -zq -fo=$^@ $(WXLUA_LIB_CXXFLAGS) $<
  
! watcom$(WXLIBPOSTFIX)\wxlua_lib_wxlbind.obj :  .AUTODEPEND ..\..\wxlua\src\wxlbind.cpp
  	$(CXX) -zq -fo=$^@ $(WXLUA_LIB_CXXFLAGS) $<
  
! watcom$(WXLIBPOSTFIX)\wxlua_lib_wxlcallb.obj :  .AUTODEPEND ..\..\wxlua\src\wxlcallb.cpp
! 	$(CXX) -zq -fo=$^@ $(WXLUA_LIB_CXXFLAGS) $<
! 
! watcom$(WXLIBPOSTFIX)\wxlua_lib_wxlhandl.obj :  .AUTODEPEND ..\..\wxlua\src\wxlhandl.cpp
! 	$(CXX) -zq -fo=$^@ $(WXLUA_LIB_CXXFLAGS) $<
! 
! watcom$(WXLIBPOSTFIX)\wxlua_lib_wxlintrp.obj :  .AUTODEPEND ..\..\wxlua\src\wxlintrp.cpp
! 	$(CXX) -zq -fo=$^@ $(WXLUA_LIB_CXXFLAGS) $<
! 
! watcom$(WXLIBPOSTFIX)\wxlua_lib_wxlstate.obj :  .AUTODEPEND ..\..\wxlua\src\wxlstate.cpp
  	$(CXX) -zq -fo=$^@ $(WXLUA_LIB_CXXFLAGS) $<
  
***************
*** 591,598 ****
  	$(CXX) -zq -fo=$^@ $(WXLUA_DLL_CXXFLAGS) $<
  
! watcom$(WXLIBPOSTFIX)\wxlua_dll_interp.obj :  .AUTODEPEND ..\..\wxlua\src\interp.cpp
  	$(CXX) -zq -fo=$^@ $(WXLUA_DLL_CXXFLAGS) $<
  
! watcom$(WXLIBPOSTFIX)\wxlua_dll_library.obj :  .AUTODEPEND ..\..\wxlua\src\library.cpp
  	$(CXX) -zq -fo=$^@ $(WXLUA_DLL_CXXFLAGS) $<
  
--- 606,622 ----
  	$(CXX) -zq -fo=$^@ $(WXLUA_DLL_CXXFLAGS) $<
  
! watcom$(WXLIBPOSTFIX)\wxlua_dll_wxlbind.obj :  .AUTODEPEND ..\..\wxlua\src\wxlbind.cpp
  	$(CXX) -zq -fo=$^@ $(WXLUA_DLL_CXXFLAGS) $<
  
! watcom$(WXLIBPOSTFIX)\wxlua_dll_wxlcallb.obj :  .AUTODEPEND ..\..\wxlua\src\wxlcallb.cpp
! 	$(CXX) -zq -fo=$^@ $(WXLUA_DLL_CXXFLAGS) $<
! 
! watcom$(WXLIBPOSTFIX)\wxlua_dll_wxlhandl.obj :  .AUTODEPEND ..\..\wxlua\src\wxlhandl.cpp
! 	$(CXX) -zq -fo=$^@ $(WXLUA_DLL_CXXFLAGS) $<
! 
! watcom$(WXLIBPOSTFIX)\wxlua_dll_wxlintrp.obj :  .AUTODEPEND ..\..\wxlua\src\wxlintrp.cpp
! 	$(CXX) -zq -fo=$^@ $(WXLUA_DLL_CXXFLAGS) $<
! 
! watcom$(WXLIBPOSTFIX)\wxlua_dll_wxlstate.obj :  .AUTODEPEND ..\..\wxlua\src\wxlstate.cpp
  	$(CXX) -zq -fo=$^@ $(WXLUA_DLL_CXXFLAGS) $<
  

Index: makefile.gcc
===================================================================
RCS file: /cvsroot/wxlua/wxLua/modules/build/msw/makefile.gcc,v
retrieving revision 1.11
retrieving revision 1.12
diff -C2 -d -r1.11 -r1.12
*** makefile.gcc	23 Nov 2005 20:33:15 -0000	1.11
--- makefile.gcc	25 Nov 2005 03:03:10 -0000	1.12
***************
*** 94,99 ****
  WXLUA_LIB_OBJECTS =  \
  	mingw$(WXLIBPOSTFIX)\wxlua_lib_internal.o \
! 	mingw$(WXLIBPOSTFIX)\wxlua_lib_interp.o \
! 	mingw$(WXLIBPOSTFIX)\wxlua_lib_library.o
  WXLUA_DLL_CXXFLAGS = -DHAVE_W32API_H $(__WXUNICODE_DEFINE_p) \
  	$(__WXDEBUG_DEFINE_p) -D__WXMSW__ \
--- 94,102 ----
  WXLUA_LIB_OBJECTS =  \
  	mingw$(WXLIBPOSTFIX)\wxlua_lib_internal.o \
! 	mingw$(WXLIBPOSTFIX)\wxlua_lib_wxlbind.o \
! 	mingw$(WXLIBPOSTFIX)\wxlua_lib_wxlcallb.o \
! 	mingw$(WXLIBPOSTFIX)\wxlua_lib_wxlhandl.o \
! 	mingw$(WXLIBPOSTFIX)\wxlua_lib_wxlintrp.o \
! 	mingw$(WXLIBPOSTFIX)\wxlua_lib_wxlstate.o
  WXLUA_DLL_CXXFLAGS = -DHAVE_W32API_H $(__WXUNICODE_DEFINE_p) \
  	$(__WXDEBUG_DEFINE_p) -D__WXMSW__ \
***************
*** 104,109 ****
  WXLUA_DLL_OBJECTS =  \
  	mingw$(WXLIBPOSTFIX)\wxlua_dll_internal.o \
! 	mingw$(WXLIBPOSTFIX)\wxlua_dll_interp.o \
! 	mingw$(WXLIBPOSTFIX)\wxlua_dll_library.o
  WXBIND_LIB_CXXFLAGS = -DHAVE_W32API_H $(__WXUNICODE_DEFINE_p) \
  	$(__WXDEBUG_DEFINE_p) -D__WXMSW__ \
--- 107,115 ----
  WXLUA_DLL_OBJECTS =  \
  	mingw$(WXLIBPOSTFIX)\wxlua_dll_internal.o \
! 	mingw$(WXLIBPOSTFIX)\wxlua_dll_wxlbind.o \
! 	mingw$(WXLIBPOSTFIX)\wxlua_dll_wxlcallb.o \
! 	mingw$(WXLIBPOSTFIX)\wxlua_dll_wxlhandl.o \
! 	mingw$(WXLIBPOSTFIX)\wxlua_dll_wxlintrp.o \
! 	mingw$(WXLIBPOSTFIX)\wxlua_dll_wxlstate.o
  WXBIND_LIB_CXXFLAGS = -DHAVE_W32API_H $(__WXUNICODE_DEFINE_p) \
  	$(__WXDEBUG_DEFINE_p) -D__WXMSW__ \
***************
*** 500,507 ****
  	$(CXX) -c -o $@ $(WXLUA_LIB_CXXFLAGS) $(CPPDEPS) $<
  
! mingw$(WXLIBPOSTFIX)\wxlua_lib_interp.o: ../../wxlua/src/interp.cpp
  	$(CXX) -c -o $@ $(WXLUA_LIB_CXXFLAGS) $(CPPDEPS) $<
  
! mingw$(WXLIBPOSTFIX)\wxlua_lib_library.o: ../../wxlua/src/library.cpp
  	$(CXX) -c -o $@ $(WXLUA_LIB_CXXFLAGS) $(CPPDEPS) $<
  
--- 506,522 ----
  	$(CXX) -c -o $@ $(WXLUA_LIB_CXXFLAGS) $(CPPDEPS) $<
  
! mingw$(WXLIBPOSTFIX)\wxlua_lib_wxlbind.o: ../../wxlua/src/wxlbind.cpp
  	$(CXX) -c -o $@ $(WXLUA_LIB_CXXFLAGS) $(CPPDEPS) $<
  
! mingw$(WXLIBPOSTFIX)\wxlua_lib_wxlcallb.o: ../../wxlua/src/wxlcallb.cpp
! 	$(CXX) -c -o $@ $(WXLUA_LIB_CXXFLAGS) $(CPPDEPS) $<
! 
! mingw$(WXLIBPOSTFIX)\wxlua_lib_wxlhandl.o: ../../wxlua/src/wxlhandl.cpp
! 	$(CXX) -c -o $@ $(WXLUA_LIB_CXXFLAGS) $(CPPDEPS) $<
! 
! mingw$(WXLIBPOSTFIX)\wxlua_lib_wxlintrp.o: ../../wxlua/src/wxlintrp.cpp
! 	$(CXX) -c -o $@ $(WXLUA_LIB_CXXFLAGS) $(CPPDEPS) $<
! 
! mingw$(WXLIBPOSTFIX)\wxlua_lib_wxlstate.o: ../../wxlua/src/wxlstate.cpp
  	$(CXX) -c -o $@ $(WXLUA_LIB_CXXFLAGS) $(CPPDEPS) $<
  
***************
*** 509,516 ****
  	$(CXX) -c -o $@ $(WXLUA_DLL_CXXFLAGS) $(CPPDEPS) $<
  
! mingw$(WXLIBPOSTFIX)\wxlua_dll_interp.o: ../../wxlua/src/interp.cpp
  	$(CXX) -c -o $@ $(WXLUA_DLL_CXXFLAGS) $(CPPDEPS) $<
  
! mingw$(WXLIBPOSTFIX)\wxlua_dll_library.o: ../../wxlua/src/library.cpp
  	$(CXX) -c -o $@ $(WXLUA_DLL_CXXFLAGS) $(CPPDEPS) $<
  
--- 524,540 ----
  	$(CXX) -c -o $@ $(WXLUA_DLL_CXXFLAGS) $(CPPDEPS) $<
  
! mingw$(WXLIBPOSTFIX)\wxlua_dll_wxlbind.o: ../../wxlua/src/wxlbind.cpp
  	$(CXX) -c -o $@ $(WXLUA_DLL_CXXFLAGS) $(CPPDEPS) $<
  
! mingw$(WXLIBPOSTFIX)\wxlua_dll_wxlcallb.o: ../../wxlua/src/wxlcallb.cpp
! 	$(CXX) -c -o $@ $(WXLUA_DLL_CXXFLAGS) $(CPPDEPS) $<
! 
! mingw$(WXLIBPOSTFIX)\wxlua_dll_wxlhandl.o: ../../wxlua/src/wxlhandl.cpp
! 	$(CXX) -c -o $@ $(WXLUA_DLL_CXXFLAGS) $(CPPDEPS) $<
! 
! mingw$(WXLIBPOSTFIX)\wxlua_dll_wxlintrp.o: ../../wxlua/src/wxlintrp.cpp
! 	$(CXX) -c -o $@ $(WXLUA_DLL_CXXFLAGS) $(CPPDEPS) $<
! 
! mingw$(WXLIBPOSTFIX)\wxlua_dll_wxlstate.o: ../../wxlua/src/wxlstate.cpp
  	$(CXX) -c -o $@ $(WXLUA_DLL_CXXFLAGS) $(CPPDEPS) $<
  

[Wxlua-commit] wxLua/modules Makefile.in,1.9,1.10

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

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

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


Index: Makefile.in
===================================================================
RCS file: /cvsroot/wxlua/wxLua/modules/Makefile.in,v
retrieving revision 1.9
retrieving revision 1.10
diff -C2 -d -r1.9 -r1.10
*** Makefile.in	23 Nov 2005 20:33:15 -0000	1.9
--- Makefile.in	25 Nov 2005 03:03:10 -0000	1.10
***************
*** 73,84 ****
  WXLUA_LIB_OBJECTS =  \
  	wxlua_lib_internal.o \
! 	wxlua_lib_interp.o \
! 	wxlua_lib_library.o
  WXLUA_DLL_CXXFLAGS = -I./../modules -DA2DWXLUAMAKINGDLL $(PIC_FLAG) \
  	$(WX_CXXFLAGS) $(CPPFLAGS) $(CXXFLAGS)
  WXLUA_DLL_OBJECTS =  \
  	wxlua_dll_internal.o \
! 	wxlua_dll_interp.o \
! 	wxlua_dll_library.o
  WXBIND_LIB_CXXFLAGS = -I./../modules $(WX_CXXFLAGS) $(CPPFLAGS) $(CXXFLAGS)
  WXBIND_LIB_OBJECTS =  \
--- 73,90 ----
  WXLUA_LIB_OBJECTS =  \
  	wxlua_lib_internal.o \
! 	wxlua_lib_wxlbind.o \
! 	wxlua_lib_wxlcallb.o \
! 	wxlua_lib_wxlhandl.o \
! 	wxlua_lib_wxlintrp.o \
! 	wxlua_lib_wxlstate.o
  WXLUA_DLL_CXXFLAGS = -I./../modules -DA2DWXLUAMAKINGDLL $(PIC_FLAG) \
  	$(WX_CXXFLAGS) $(CPPFLAGS) $(CXXFLAGS)
  WXLUA_DLL_OBJECTS =  \
  	wxlua_dll_internal.o \
! 	wxlua_dll_wxlbind.o \
! 	wxlua_dll_wxlcallb.o \
! 	wxlua_dll_wxlhandl.o \
! 	wxlua_dll_wxlintrp.o \
! 	wxlua_dll_wxlstate.o
  WXBIND_LIB_CXXFLAGS = -I./../modules $(WX_CXXFLAGS) $(CPPFLAGS) $(CXXFLAGS)
  WXBIND_LIB_OBJECTS =  \
***************
*** 459,476 ****
  	$(CXXC) -c -o $@ $(WXLUA_LIB_CXXFLAGS) ./wxlua/src/internal.cpp
  
! wxlua_lib_interp.o: ./wxlua/src/interp.cpp
! 	$(CXXC) -c -o $@ $(WXLUA_LIB_CXXFLAGS) ./wxlua/src/interp.cpp
  
! wxlua_lib_library.o: ./wxlua/src/library.cpp
! 	$(CXXC) -c -o $@ $(WXLUA_LIB_CXXFLAGS) ./wxlua/src/library.cpp
  
  wxlua_dll_internal.o: ./wxlua/src/internal.cpp
  	$(CXXC) -c -o $@ $(WXLUA_DLL_CXXFLAGS) ./wxlua/src/internal.cpp
  
! wxlua_dll_interp.o: ./wxlua/src/interp.cpp
! 	$(CXXC) -c -o $@ $(WXLUA_DLL_CXXFLAGS) ./wxlua/src/interp.cpp
  
! wxlua_dll_library.o: ./wxlua/src/library.cpp
! 	$(CXXC) -c -o $@ $(WXLUA_DLL_CXXFLAGS) ./wxlua/src/library.cpp
  
  wxbind_lib_appframe.o: ./wxbind/src/appframe.cpp
--- 465,500 ----
  	$(CXXC) -c -o $@ $(WXLUA_LIB_CXXFLAGS) ./wxlua/src/internal.cpp
  
! wxlua_lib_wxlbind.o: ./wxlua/src/wxlbind.cpp
! 	$(CXXC) -c -o $@ $(WXLUA_LIB_CXXFLAGS) ./wxlua/src/wxlbind.cpp
  
! wxlua_lib_wxlcallb.o: ./wxlua/src/wxlcallb.cpp
! 	$(CXXC) -c -o $@ $(WXLUA_LIB_CXXFLAGS) ./wxlua/src/wxlcallb.cpp
! 
! wxlua_lib_wxlhandl.o: ./wxlua/src/wxlhandl.cpp
! 	$(CXXC) -c -o $@ $(WXLUA_LIB_CXXFLAGS) ./wxlua/src/wxlhandl.cpp
! 
! wxlua_lib_wxlintrp.o: ./wxlua/src/wxlintrp.cpp
! 	$(CXXC) -c -o $@ $(WXLUA_LIB_CXXFLAGS) ./wxlua/src/wxlintrp.cpp
! 
! wxlua_lib_wxlstate.o: ./wxlua/src/wxlstate.cpp
! 	$(CXXC) -c -o $@ $(WXLUA_LIB_CXXFLAGS) ./wxlua/src/wxlstate.cpp
  
  wxlua_dll_internal.o: ./wxlua/src/internal.cpp
  	$(CXXC) -c -o $@ $(WXLUA_DLL_CXXFLAGS) ./wxlua/src/internal.cpp
  
! wxlua_dll_wxlbind.o: ./wxlua/src/wxlbind.cpp
! 	$(CXXC) -c -o $@ $(WXLUA_DLL_CXXFLAGS) ./wxlua/src/wxlbind.cpp
  
! wxlua_dll_wxlcallb.o: ./wxlua/src/wxlcallb.cpp
! 	$(CXXC) -c -o $@ $(WXLUA_DLL_CXXFLAGS) ./wxlua/src/wxlcallb.cpp
! 
! wxlua_dll_wxlhandl.o: ./wxlua/src/wxlhandl.cpp
! 	$(CXXC) -c -o $@ $(WXLUA_DLL_CXXFLAGS) ./wxlua/src/wxlhandl.cpp
! 
! wxlua_dll_wxlintrp.o: ./wxlua/src/wxlintrp.cpp
! 	$(CXXC) -c -o $@ $(WXLUA_DLL_CXXFLAGS) ./wxlua/src/wxlintrp.cpp
! 
! wxlua_dll_wxlstate.o: ./wxlua/src/wxlstate.cpp
! 	$(CXXC) -c -o $@ $(WXLUA_DLL_CXXFLAGS) ./wxlua/src/wxlstate.cpp
  
  wxbind_lib_appframe.o: ./wxbind/src/appframe.cpp