[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();
}