From: Francesco M. <fr...@us...> - 2006-05-20 19:58:05
|
Update of /cvsroot/wxlua/wxLua/modules/wxluadebug/include In directory sc8-pr-cvs9.sourceforge.net:/tmp/cvs-serv1213/modules/wxluadebug/include Modified Files: splttree.h staktree.h wxldebug.h Added Files: wxluadebugdefs.h Log Message: Fixed DLL builds introducing/updating all required WXDLLIMPEXP symbols Index: wxldebug.h =================================================================== RCS file: /cvsroot/wxlua/wxLua/modules/wxluadebug/include/wxldebug.h,v retrieving revision 1.15 retrieving revision 1.16 diff -C2 -d -r1.15 -r1.16 *** wxldebug.h 8 Mar 2006 02:46:37 -0000 1.15 --- wxldebug.h 20 May 2006 19:57:59 -0000 1.16 *************** *** 32,37 **** #include "wxlua/include/wxldefs.h" #include "wxlua/include/wxlstate.h" ! class WXDLLIMPEXP_WXLUA wxLuaDebugData; // ---------------------------------------------------------------------------- --- 32,38 ---- #include "wxlua/include/wxldefs.h" #include "wxlua/include/wxlstate.h" + #include "wxluadebug/include/wxluadebugdefs.h" ! class WXDLLIMPEXP_WXLUADEBUG wxLuaDebugData; // ---------------------------------------------------------------------------- *************** *** 39,43 **** // ---------------------------------------------------------------------------- ! class WXDLLIMPEXP_WXLUA wxLuaDebugDataItem : public wxTreeItemData { public: --- 40,44 ---- // ---------------------------------------------------------------------------- ! class WXDLLIMPEXP_WXLUADEBUG wxLuaDebugDataItem : public wxTreeItemData { public: *************** *** 71,79 **** }; ! #if defined(WXMAKINGDLL_WXLUA) || defined(WXUSINGDLL) ! WX_DEFINE_SORTED_USER_EXPORTED_ARRAY(wxLuaDebugDataItem *, wxLuaDebugDataItemArray, WXDLLIMPEXP_WXLUA ); ! #else // not making nor using DLL ! WX_DEFINE_SORTED_ARRAY(wxLuaDebugDataItem *, wxLuaDebugDataItemArray ); ! #endif // ---------------------------------------------------------------------------- --- 72,76 ---- }; ! WX_DEFINE_SORTED_USER_EXPORTED_ARRAY(wxLuaDebugDataItem *, wxLuaDebugDataItemArray, WXDLLIMPEXP_WXLUADEBUG ); // ---------------------------------------------------------------------------- *************** *** 82,86 **** // ---------------------------------------------------------------------------- ! class WXDLLIMPEXP_WXLUA wxLuaDebugData : public wxLuaDebugDataItemArray { public: --- 79,83 ---- // ---------------------------------------------------------------------------- ! class WXDLLIMPEXP_WXLUADEBUG wxLuaDebugData : public wxLuaDebugDataItemArray { public: *************** *** 115,119 **** // ---------------------------------------------------------------------------- ! class WXDLLIMPEXP_WXLUA wxLuaInterface { public: --- 112,116 ---- // ---------------------------------------------------------------------------- ! class WXDLLIMPEXP_WXLUADEBUG wxLuaInterface { public: Index: splttree.h =================================================================== RCS file: /cvsroot/wxlua/wxLua/modules/wxluadebug/include/splttree.h,v retrieving revision 1.7 retrieving revision 1.8 diff -C2 -d -r1.7 -r1.8 *** splttree.h 15 May 2006 04:48:37 -0000 1.7 --- splttree.h 20 May 2006 19:57:59 -0000 1.8 *************** *** 21,31 **** #include "wxlua/include/wxldefs.h" #include "wx/treectrl.h" #include "wx/splitter.h" #include "wx/scrolwin.h" ! class WXDLLIMPEXP_WXLUA wxRemotelyScrolledTreeCtrl; ! class WXDLLIMPEXP_WXLUA wxThinSplitterWindow; ! class WXDLLIMPEXP_WXLUA wxSplitterScrolledWindow; --- 21,32 ---- #include "wxlua/include/wxldefs.h" + #include "wxluadebug/include/wxluadebugdefs.h" #include "wx/treectrl.h" #include "wx/splitter.h" #include "wx/scrolwin.h" ! class WXDLLIMPEXP_WXLUADEBUG wxRemotelyScrolledTreeCtrl; ! class WXDLLIMPEXP_WXLUADEBUG wxThinSplitterWindow; ! class WXDLLIMPEXP_WXLUADEBUG wxSplitterScrolledWindow; *************** *** 43,47 **** */ ! class WXDLLIMPEXP_WXLUA wxRemotelyScrolledTreeCtrl : public wxTreeCtrl { public: --- 44,48 ---- */ ! class WXDLLIMPEXP_WXLUADEBUG wxRemotelyScrolledTreeCtrl : public wxTreeCtrl { public: *************** *** 143,147 **** */ ! class WXDLLIMPEXP_WXLUA wxTreeCompanionWindow: public wxWindow { public: --- 144,148 ---- */ ! class WXDLLIMPEXP_WXLUADEBUG wxTreeCompanionWindow: public wxWindow { public: *************** *** 191,195 **** */ ! class WXDLLIMPEXP_WXLUA wxThinSplitterWindow : public wxSplitterWindow { public: --- 192,196 ---- */ ! class WXDLLIMPEXP_WXLUADEBUG wxThinSplitterWindow : public wxSplitterWindow { public: *************** *** 226,230 **** */ ! class WXDLLIMPEXP_WXLUA wxSplitterScrolledWindow: public wxScrolledWindow { public: --- 227,231 ---- */ ! class WXDLLIMPEXP_WXLUADEBUG wxSplitterScrolledWindow: public wxScrolledWindow { public: --- NEW FILE: wxluadebugdefs.h --- /////////////////////////////////////////////////////////////////////////////// // Name: wxluadebugdefs.h // Purpose: definitions for wxLuaDebug module // Author: Francesco Montorsi // Modified by: // Created: 20/5/2006 // RCS-ID: $Id: wxluadebugdefs.h,v 1.1 2006/05/20 19:57:59 frm Exp $ // Copyright: (c) Francesco Montorsi // Licence: wxWidgets licence /////////////////////////////////////////////////////////////////////////////// #ifndef __WX_WXLUADEBUGDEFS_H__ #define __WX_WXLUADEBUGDEFS_H__ #include "wx/defs.h" // ---------------------------------------------------------------------------- // WXDLLIMPEXP macros // ---------------------------------------------------------------------------- #ifdef WXMAKINGDLL_WXLUADEBUG #define WXDLLIMPEXP_WXLUADEBUG WXEXPORT #define WXDLLIMPEXP_DATA_WXLUADEBUG(type) WXEXPORT type #elif defined(WXUSINGDLL) #define WXDLLIMPEXP_WXLUADEBUG WXIMPORT #define WXDLLIMPEXP_DATA_WXLUADEBUG(type) WXIMPORT type #else // not making nor using DLL #define WXDLLIMPEXP_WXLUADEBUG #define WXDLLIMPEXP_DATA_WXLUADEBUG(type) type #endif #endif // __WX_WXLUADEBUGDEFS_H__ Index: staktree.h =================================================================== RCS file: /cvsroot/wxlua/wxLua/modules/wxluadebug/include/staktree.h,v retrieving revision 1.7 retrieving revision 1.8 diff -C2 -d -r1.7 -r1.8 *** staktree.h 15 May 2006 04:48:37 -0000 1.7 --- staktree.h 20 May 2006 19:57:59 -0000 1.8 *************** *** 16,25 **** #include "wxlua/include/wxldefs.h" #include "wxluadebug/include/splttree.h" ! class WXDLLIMPEXP_WXLUA wxLuaStackDataWindow; ! class WXDLLIMPEXP_WXLUA wxLuaDebugServer; ! class WXDLLIMPEXP_WXLUA wxLuaInterface; ! class WXDLLIMPEXP_WXLUA wxLuaDebugData; // ---------------------------------------------------------------------------- --- 16,26 ---- #include "wxlua/include/wxldefs.h" + #include "wxluadebug/include/wxluadebugdefs.h" #include "wxluadebug/include/splttree.h" ! class WXDLLIMPEXP_WXLUADEBUG wxLuaStackDataWindow; ! class WXDLLIMPEXP_WXLUADEBUG wxLuaDebugServer; ! class WXDLLIMPEXP_WXLUADEBUG wxLuaInterface; ! class WXDLLIMPEXP_WXLUADEBUG wxLuaDebugData; // ---------------------------------------------------------------------------- *************** *** 41,45 **** // ---------------------------------------------------------------------------- ! class WXDLLIMPEXP_WXLUA wxLuaStackDialog : public wxDialog { public: --- 42,46 ---- // ---------------------------------------------------------------------------- ! class WXDLLIMPEXP_WXLUADEBUG wxLuaStackDialog : public wxDialog { public: *************** *** 99,103 **** // ---------------------------------------------------------------------------- ! class WXDLLIMPEXP_WXLUA wxLuaStackTree : public wxRemotelyScrolledTreeCtrl { public: --- 100,104 ---- // ---------------------------------------------------------------------------- ! class WXDLLIMPEXP_WXLUADEBUG wxLuaStackTree : public wxRemotelyScrolledTreeCtrl { public: *************** *** 119,123 **** // ---------------------------------------------------------------------------- ! class WXDLLIMPEXP_WXLUA wxLuaStackDataWindow : public wxTreeCompanionWindow { public: --- 120,124 ---- // ---------------------------------------------------------------------------- ! class WXDLLIMPEXP_WXLUADEBUG wxLuaStackDataWindow : public wxTreeCompanionWindow { public: |