wxlua-commit

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

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

Modified Files:
	dservice.h wxldbgio.h wxldserv.h wxldtarg.h wxlhandl.h 
	wxlsock.h 
Added Files:
	wxluasocketdefs.h 
Log Message:
Fixed DLL builds introducing/updating all required WXDLLIMPEXP symbols

Index: wxldserv.h
===================================================================
RCS file: /cvsroot/wxlua/wxLua/modules/wxluasocket/include/wxldserv.h,v
retrieving revision 1.7
retrieving revision 1.8
diff -C2 -d -r1.7 -r1.8
*** wxldserv.h	8 Mar 2006 02:46:37 -0000	1.7
--- wxldserv.h	20 May 2006 19:57:59 -0000	1.8
***************
*** 15,26 ****
  
  #include "wx/process.h"
! #include "wxlua/include/wxldefs.h"
  #include "wxluadebug/include/wxldebug.h"
  #include "wxluasocket/include/wxlsock.h"
  #include "wxluasocket/include/wxldbgio.h"
  
! class WXDLLIMPEXP_WXLUA wxLuaDebugServer;
! class WXDLLIMPEXP_WXLUA wxLuaDebugEvent;
! class WXDLLIMPEXP_WXLUA wxLuaStackDialog;
  
  // ----------------------------------------------------------------------------
--- 15,26 ----
  
  #include "wx/process.h"
! #include "wxluasocket/include/wxluasocketdefs.h"
  #include "wxluadebug/include/wxldebug.h"
  #include "wxluasocket/include/wxlsock.h"
  #include "wxluasocket/include/wxldbgio.h"
  
! class WXDLLIMPEXP_WXLUASOCKET wxLuaDebugServer;
! class WXDLLIMPEXP_WXLUASOCKET wxLuaDebugEvent;
! class WXDLLIMPEXP_WXLUASOCKET wxLuaStackDialog;
  
  // ----------------------------------------------------------------------------
***************
*** 71,75 ****
  // ----------------------------------------------------------------------------
  
! class WXDLLIMPEXP_WXLUA wxLuaDebugServerInterface : public wxLuaInterface
  {
  public:
--- 71,75 ----
  // ----------------------------------------------------------------------------
  
! class WXDLLIMPEXP_WXLUASOCKET wxLuaDebugServerInterface : public wxLuaInterface
  {
  public:
***************
*** 92,96 ****
  // ----------------------------------------------------------------------------
  
! class WXDLLIMPEXP_WXLUA wxLuaDebugServerThread : public wxThread
  {
  public:
--- 92,96 ----
  // ----------------------------------------------------------------------------
  
! class WXDLLIMPEXP_WXLUASOCKET wxLuaDebugServerThread : public wxThread
  {
  public:
***************
*** 114,118 ****
  // ----------------------------------------------------------------------------
  
! class WXDLLIMPEXP_WXLUA wxLuaDebuggerBase : public wxEvtHandler
  {
  public:
--- 114,118 ----
  // ----------------------------------------------------------------------------
  
! class WXDLLIMPEXP_WXLUASOCKET wxLuaDebuggerBase : public wxEvtHandler
  {
  public:
***************
*** 144,148 ****
  // ----------------------------------------------------------------------------
  
! class WXDLLIMPEXP_WXLUA wxLuaDebugServer : public wxLuaDebuggerBase, public wxLuaDebugIO
  {
  public:
--- 144,148 ----
  // ----------------------------------------------------------------------------
  
! class WXDLLIMPEXP_WXLUASOCKET wxLuaDebugServer : public wxLuaDebuggerBase, public wxLuaDebugIO
  {
  public:
***************
*** 209,213 ****
  // ----------------------------------------------------------------------------
  
! class WXDLLIMPEXP_WXLUA wxLuaDebugEvent : public wxEvent
  {
  public:
--- 209,213 ----
  // ----------------------------------------------------------------------------
  
! class WXDLLIMPEXP_WXLUASOCKET wxLuaDebugEvent : public wxEvent
  {
  public:
***************
*** 248,264 ****
  
  BEGIN_DECLARE_EVENT_TYPES()
!     DECLARE_EXPORTED_EVENT_TYPE(WXDLLIMPEXP_WXLUA, wxEVT_WXLUA_DEBUG_CLIENT_CONNECTED,    2510)
!     DECLARE_EXPORTED_EVENT_TYPE(WXDLLIMPEXP_WXLUA, wxEVT_WXLUA_DEBUG_BREAK,               2511)
!     DECLARE_EXPORTED_EVENT_TYPE(WXDLLIMPEXP_WXLUA, wxEVT_WXLUA_DEBUG_PRINT,               2512)
!     DECLARE_EXPORTED_EVENT_TYPE(WXDLLIMPEXP_WXLUA, wxEVT_WXLUA_DEBUG_ERROR,               2513)
!     DECLARE_EXPORTED_EVENT_TYPE(WXDLLIMPEXP_WXLUA, wxEVT_WXLUA_DEBUG_EXIT,                2514)
!     DECLARE_EXPORTED_EVENT_TYPE(WXDLLIMPEXP_WXLUA, wxEVT_WXLUA_DEBUG_STACK_ENUM,          2515)
!     DECLARE_EXPORTED_EVENT_TYPE(WXDLLIMPEXP_WXLUA, wxEVT_WXLUA_DEBUG_STACK_ENTRY_ENUM,    2516)
!     DECLARE_EXPORTED_EVENT_TYPE(WXDLLIMPEXP_WXLUA, wxEVT_WXLUA_DEBUG_TABLE_ENUM,          2517)
!     DECLARE_EXPORTED_EVENT_TYPE(WXDLLIMPEXP_WXLUA, wxEVT_WXLUA_DEBUG_EVALUATE_EXPR,       2518)
!     DECLARE_EXPORTED_EVENT_TYPE(WXDLLIMPEXP_WXLUA, wxEVT_WXLUA_DEBUG_STARTDEBUGGER,       2519)
!     DECLARE_EXPORTED_EVENT_TYPE(WXDLLIMPEXP_WXLUA, wxEVT_WXLUA_DEBUG_STOPDEBUGGER,        2520)
!     DECLARE_EXPORTED_EVENT_TYPE(WXDLLIMPEXP_WXLUA, wxEVT_WXLUA_DEBUG_BREAKPOINT_ADDED,    2521)
!     DECLARE_EXPORTED_EVENT_TYPE(WXDLLIMPEXP_WXLUA, wxEVT_WXLUA_DEBUG_BREAKPOINT_REMOVED,  2522)
  END_DECLARE_EVENT_TYPES()
  
--- 248,264 ----
  
  BEGIN_DECLARE_EVENT_TYPES()
!     DECLARE_EXPORTED_EVENT_TYPE(WXDLLIMPEXP_WXLUASOCKET, wxEVT_WXLUA_DEBUG_CLIENT_CONNECTED,    2510)
!     DECLARE_EXPORTED_EVENT_TYPE(WXDLLIMPEXP_WXLUASOCKET, wxEVT_WXLUA_DEBUG_BREAK,               2511)
!     DECLARE_EXPORTED_EVENT_TYPE(WXDLLIMPEXP_WXLUASOCKET, wxEVT_WXLUA_DEBUG_PRINT,               2512)
!     DECLARE_EXPORTED_EVENT_TYPE(WXDLLIMPEXP_WXLUASOCKET, wxEVT_WXLUA_DEBUG_ERROR,               2513)
!     DECLARE_EXPORTED_EVENT_TYPE(WXDLLIMPEXP_WXLUASOCKET, wxEVT_WXLUA_DEBUG_EXIT,                2514)
!     DECLARE_EXPORTED_EVENT_TYPE(WXDLLIMPEXP_WXLUASOCKET, wxEVT_WXLUA_DEBUG_STACK_ENUM,          2515)
!     DECLARE_EXPORTED_EVENT_TYPE(WXDLLIMPEXP_WXLUASOCKET, wxEVT_WXLUA_DEBUG_STACK_ENTRY_ENUM,    2516)
!     DECLARE_EXPORTED_EVENT_TYPE(WXDLLIMPEXP_WXLUASOCKET, wxEVT_WXLUA_DEBUG_TABLE_ENUM,          2517)
!     DECLARE_EXPORTED_EVENT_TYPE(WXDLLIMPEXP_WXLUASOCKET, wxEVT_WXLUA_DEBUG_EVALUATE_EXPR,       2518)
!     DECLARE_EXPORTED_EVENT_TYPE(WXDLLIMPEXP_WXLUASOCKET, wxEVT_WXLUA_DEBUG_STARTDEBUGGER,       2519)
!     DECLARE_EXPORTED_EVENT_TYPE(WXDLLIMPEXP_WXLUASOCKET, wxEVT_WXLUA_DEBUG_STOPDEBUGGER,        2520)
!     DECLARE_EXPORTED_EVENT_TYPE(WXDLLIMPEXP_WXLUASOCKET, wxEVT_WXLUA_DEBUG_BREAKPOINT_ADDED,    2521)
!     DECLARE_EXPORTED_EVENT_TYPE(WXDLLIMPEXP_WXLUASOCKET, wxEVT_WXLUA_DEBUG_BREAKPOINT_REMOVED,  2522)
  END_DECLARE_EVENT_TYPES()
  

Index: wxldbgio.h
===================================================================
RCS file: /cvsroot/wxlua/wxLua/modules/wxluasocket/include/wxldbgio.h,v
retrieving revision 1.2
retrieving revision 1.3
diff -C2 -d -r1.2 -r1.3
*** wxldbgio.h	1 Mar 2006 23:12:11 -0000	1.2
--- wxldbgio.h	20 May 2006 19:57:59 -0000	1.3
***************
*** 14,21 ****
  #endif
  
! #include "wxlua/include/wxldefs.h"
  
! class WXDLLIMPEXP_WXLUA wxLuaDebugData;
! class WXDLLIMPEXP_WXLUA wxLuaSocket;
  
  // ----------------------------------------------------------------------------
--- 14,21 ----
  #endif
  
! #include "wxluasocket/include/wxluasocketdefs.h"
  
! class WXDLLIMPEXP_WXLUASOCKET wxLuaDebugData;
! class WXDLLIMPEXP_WXLUASOCKET wxLuaSocket;
  
  // ----------------------------------------------------------------------------
***************
*** 24,28 ****
  // ----------------------------------------------------------------------------
  
! class WXDLLIMPEXP_WXLUA wxLuaDebugIO
  {
  protected:
--- 24,28 ----
  // ----------------------------------------------------------------------------
  
! class WXDLLIMPEXP_WXLUASOCKET wxLuaDebugIO
  {
  protected:

Index: dservice.h
===================================================================
RCS file: /cvsroot/wxlua/wxLua/modules/wxluasocket/include/dservice.h,v
retrieving revision 1.10
retrieving revision 1.11
diff -C2 -d -r1.10 -r1.11
*** dservice.h	8 Apr 2006 18:22:34 -0000	1.10
--- dservice.h	20 May 2006 19:57:59 -0000	1.11
***************
*** 21,25 ****
  #endif
  
! #include "wxlua/include/wxldefs.h"
  
  #include "wx/dynarray.h"
--- 21,25 ----
  #endif
  
! #include "wxluasocket/include/wxluasocketdefs.h"
  
  #include "wx/dynarray.h"
***************
*** 47,52 ****
  #define WXLUA_SOCKET_PORT      1561
  
! class WXDLLIMPEXP_WXLUA wxLuaDebugService;
! class WXDLLIMPEXP_WXLUA wxLuaDebuggee;
  
  // ----------------------------------------------------------------------------
--- 47,52 ----
  #define WXLUA_SOCKET_PORT      1561
  
! class WXDLLIMPEXP_WXLUASOCKET wxLuaDebugService;
! class WXDLLIMPEXP_WXLUASOCKET wxLuaDebuggee;
  
  // ----------------------------------------------------------------------------
***************
*** 54,58 ****
  // ----------------------------------------------------------------------------
  
! class WXDLLIMPEXP_WXLUA wxLuaDebugSocket
  {
  public:
--- 54,58 ----
  // ----------------------------------------------------------------------------
  
! class WXDLLIMPEXP_WXLUASOCKET wxLuaDebugSocket
  {
  public:
***************
*** 119,123 ****
  };
  
! WX_DECLARE_USER_EXPORTED_LIST(wxLuaDebugSocket, wxLuaDebugSocketList, WXDLLIMPEXP_WXLUA);
  
  // ----------------------------------------------------------------------------
--- 119,123 ----
  };
  
! WX_DECLARE_USER_EXPORTED_LIST(wxLuaDebugSocket, wxLuaDebugSocketList, WXDLLIMPEXP_WXLUASOCKET);
  
  // ----------------------------------------------------------------------------
***************
*** 125,129 ****
  // ----------------------------------------------------------------------------
  
! class WXDLLIMPEXP_WXLUA wxLuaBreakPoint : public wxObject
  {
  public:
--- 125,129 ----
  // ----------------------------------------------------------------------------
  
! class WXDLLIMPEXP_WXLUASOCKET wxLuaBreakPoint : public wxObject
  {
  public:
***************
*** 165,169 ****
  };
  
! WX_DECLARE_USER_EXPORTED_LIST(wxLuaBreakPoint, wxLuaBreakPointList, WXDLLIMPEXP_WXLUA);
  
  // ----------------------------------------------------------------------------
--- 165,169 ----
  };
  
! WX_DECLARE_USER_EXPORTED_LIST(wxLuaBreakPoint, wxLuaBreakPointList, WXDLLIMPEXP_WXLUASOCKET);
  
  // ----------------------------------------------------------------------------
***************
*** 171,175 ****
  // ----------------------------------------------------------------------------
  
! class WXDLLIMPEXP_WXLUA wxLuaDebuggee : public wxObject
  {
      friend class wxLuaDebugService;
--- 171,175 ----
  // ----------------------------------------------------------------------------
  
! class WXDLLIMPEXP_WXLUASOCKET wxLuaDebuggee : public wxObject
  {
      friend class wxLuaDebugService;
***************
*** 245,249 ****
  
  
! WX_DECLARE_USER_EXPORTED_LIST(wxLuaDebuggee, wxLuaDebuggeeList, WXDLLIMPEXP_WXLUA);
  
  // ----------------------------------------------------------------------------
--- 245,249 ----
  
  
! WX_DECLARE_USER_EXPORTED_LIST(wxLuaDebuggee, wxLuaDebuggeeList, WXDLLIMPEXP_WXLUASOCKET);
  
  // ----------------------------------------------------------------------------
***************
*** 251,255 ****
  // ----------------------------------------------------------------------------
  
! class WXDLLIMPEXP_WXLUA wxLuaDebugService : public wxEvtHandler
  {
  public:
--- 251,255 ----
  // ----------------------------------------------------------------------------
  
! class WXDLLIMPEXP_WXLUASOCKET wxLuaDebugService : public wxEvtHandler
  {
  public:
***************
*** 309,313 ****
  // ----------------------------------------------------------------------------
  
! class WXDLLIMPEXP_WXLUA wxLuaDebugger : public wxLuaDebuggerBase
  {
  public:
--- 309,313 ----
  // ----------------------------------------------------------------------------
  
! class WXDLLIMPEXP_WXLUASOCKET wxLuaDebugger : public wxLuaDebuggerBase
  {
  public:

--- NEW FILE: wxluasocketdefs.h ---
///////////////////////////////////////////////////////////////////////////////
// Name:        wxluadebugdefs.h
// Purpose:     definitions for wxLuaDebug module
// Author:      Francesco Montorsi
// Modified by:
// Created:     20/5/2006
// RCS-ID:      $Id: wxluasocketdefs.h,v 1.1 2006/05/20 19:57:59 frm Exp $
// Copyright:   (c) Francesco Montorsi
// Licence:     wxWidgets licence
///////////////////////////////////////////////////////////////////////////////

#ifndef __WX_WXLUASOCKETDEFS_H__
#define __WX_WXLUASOCKETDEFS_H__

#include "wx/defs.h"

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

#ifdef WXMAKINGDLL_WXLUASOCKET
    #define WXDLLIMPEXP_WXLUASOCKET WXEXPORT
    #define WXDLLIMPEXP_DATA_WXLUASOCKET(type) WXEXPORT type
#elif defined(WXUSINGDLL)
    #define WXDLLIMPEXP_WXLUASOCKET WXIMPORT
    #define WXDLLIMPEXP_DATA_WXLUASOCKET(type) WXIMPORT type
#else // not making nor using DLL
    #define WXDLLIMPEXP_WXLUASOCKET
    #define WXDLLIMPEXP_DATA_WXLUASOCKET(type) type
#endif

#endif  // __WX_WXLUASOCKETDEFS_H__
Index: wxlsock.h
===================================================================
RCS file: /cvsroot/wxlua/wxLua/modules/wxluasocket/include/wxlsock.h,v
retrieving revision 1.5
retrieving revision 1.6
diff -C2 -d -r1.5 -r1.6
*** wxlsock.h	2 Mar 2006 03:50:40 -0000	1.5
--- wxlsock.h	20 May 2006 19:57:59 -0000	1.6
***************
*** 15,19 ****
  #endif
  
! #include "wxlua/include/wxldefs.h"
  
  #ifdef WIN32
--- 15,19 ----
  #endif
  
! #include "wxluasocket/include/wxluasocketdefs.h"
  
  #ifdef WIN32
***************
*** 42,46 ****
  // ----------------------------------------------------------------------------
  
! class WXDLLIMPEXP_WXLUA wxLuaSocket
  {
  #ifdef WIN32
--- 42,46 ----
  // ----------------------------------------------------------------------------
  
! class WXDLLIMPEXP_WXLUASOCKET wxLuaSocket
  {
  #ifdef WIN32
***************
*** 139,143 ****
  // ----------------------------------------------------------------------------
  
! class WXDLLIMPEXP_WXLUA wxLuaSocketException
  {
  public:
--- 139,143 ----
  // ----------------------------------------------------------------------------
  
! class WXDLLIMPEXP_WXLUASOCKET wxLuaSocketException
  {
  public:

Index: wxldtarg.h
===================================================================
RCS file: /cvsroot/wxlua/wxLua/modules/wxluasocket/include/wxldtarg.h,v
retrieving revision 1.9
retrieving revision 1.10
diff -C2 -d -r1.9 -r1.10
*** wxldtarg.h	8 Apr 2006 18:22:35 -0000	1.9
--- wxldtarg.h	20 May 2006 19:57:59 -0000	1.10
***************
*** 16,20 ****
  
  #include "wx/dynarray.h"
! #include "wxlua/include/wxldefs.h"
  #include "wxlua/include/wxlua.h"
  #include "wxlua/include/internal.h"
--- 16,20 ----
  
  #include "wx/dynarray.h"
! #include "wxluasocket/include/wxluasocketdefs.h"
  #include "wxlua/include/wxlua.h"
  #include "wxlua/include/internal.h"
***************
*** 27,31 ****
  // ----------------------------------------------------------------------------
  
! class WXDLLIMPEXP_WXLUA wxLuaBuffer : public wxObject
  {
  public:
--- 27,31 ----
  // ----------------------------------------------------------------------------
  
! class WXDLLIMPEXP_WXLUASOCKET wxLuaBuffer : public wxObject
  {
  public:
***************
*** 45,49 ****
  
  #if wxCHECK_VERSION(2, 5, 0)
!     WX_DEFINE_USER_EXPORTED_ARRAY_PTR(wxLuaBuffer *, wxLuaBufferArray, class WXDLLIMPEXP_WXLUA);
  #else
      WX_DEFINE_ARRAY(wxLuaBuffer *, wxLuaBufferArray);
--- 45,49 ----
  
  #if wxCHECK_VERSION(2, 5, 0)
!     WX_DEFINE_USER_EXPORTED_ARRAY_PTR(wxLuaBuffer *, wxLuaBufferArray, class WXDLLIMPEXP_WXLUASOCKET);
  #else
      WX_DEFINE_ARRAY(wxLuaBuffer *, wxLuaBufferArray);
***************
*** 55,59 ****
  // ----------------------------------------------------------------------------
  
! class WXDLLIMPEXP_WXLUA wxLuaDebugTarget : public wxObject, public wxLuaDebugIO
  {
  private:
--- 55,59 ----
  // ----------------------------------------------------------------------------
  
! class WXDLLIMPEXP_WXLUASOCKET wxLuaDebugTarget : public wxObject, public wxLuaDebugIO
  {
  private:

Index: wxlhandl.h
===================================================================
RCS file: /cvsroot/wxlua/wxLua/modules/wxluasocket/include/wxlhandl.h,v
retrieving revision 1.4
retrieving revision 1.5
diff -C2 -d -r1.4 -r1.5
*** wxlhandl.h	8 Mar 2006 02:46:37 -0000	1.4
--- wxlhandl.h	20 May 2006 19:57:59 -0000	1.5
***************
*** 16,24 ****
  #endif
  
! #include "wxlua/include/wxldefs.h"
  #include "wx/thread.h"
  
! class WXDLLIMPEXP_WXLUA wxLuaDebugEvent;
! class WXDLLIMPEXP_WXLUA wxLuaStackDialog;
  
  // ----------------------------------------------------------------------------
--- 16,24 ----
  #endif
  
! #include "wxluasocket/include/wxluasocketdefs.h"
  #include "wx/thread.h"
  
! class WXDLLIMPEXP_WXLUASOCKET wxLuaDebugEvent;
! class WXDLLIMPEXP_WXLUASOCKET wxLuaStackDialog;
  
  // ----------------------------------------------------------------------------
***************
*** 26,30 ****
  // ----------------------------------------------------------------------------
  
! class WXDLLIMPEXP_WXLUA wxLuaHandler
  {
  public:
--- 26,30 ----
  // ----------------------------------------------------------------------------
  
! class WXDLLIMPEXP_WXLUASOCKET wxLuaHandler
  {
  public: