[Wxlua-commit] wxLua/modules/wxbind/include wxbinddefs.h, 1.5, 1.6 wxcore_wxlprint.h, 1.1, 1.2 wxhtml_wxlhtmlwin.h, 1.1, 1.2

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

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

Modified Files:
	wxbinddefs.h wxcore_wxlprint.h wxhtml_wxlhtmlwin.h 
Log Message:
Fixes for the separation of wxlibs for MSW


Index: wxhtml_wxlhtmlwin.h
===================================================================
RCS file: /cvsroot/wxlua/wxLua/modules/wxbind/include/wxhtml_wxlhtmlwin.h,v
retrieving revision 1.1
retrieving revision 1.2
diff -C2 -d -r1.1 -r1.2
*** wxhtml_wxlhtmlwin.h	16 Jul 2007 19:34:43 -0000	1.1
--- wxhtml_wxlhtmlwin.h	17 Jul 2007 23:09:17 -0000	1.2
***************
*** 14,17 ****
--- 14,18 ----
  
  #include "wxbind/include/wxbinddefs.h"
+ #include "wxluasetup.h"
  
  #if wxLUA_USE_wxHTML

Index: wxcore_wxlprint.h
===================================================================
RCS file: /cvsroot/wxlua/wxLua/modules/wxbind/include/wxcore_wxlprint.h,v
retrieving revision 1.1
retrieving revision 1.2
diff -C2 -d -r1.1 -r1.2
*** wxcore_wxlprint.h	16 Jul 2007 19:34:42 -0000	1.1
--- wxcore_wxlprint.h	17 Jul 2007 23:09:17 -0000	1.2
***************
*** 11,15 ****
--- 11,17 ----
  
  #include "wx/print.h"
+ 
  #include "wxbind/include/wxbinddefs.h"
+ #include "wxluasetup.h"
  
  #if wxLUA_USE_wxLuaPrintout

Index: wxbinddefs.h
===================================================================
RCS file: /cvsroot/wxlua/wxLua/modules/wxbind/include/wxbinddefs.h,v
retrieving revision 1.5
retrieving revision 1.6
diff -C2 -d -r1.5 -r1.6
*** wxbinddefs.h	16 Jul 2007 23:06:52 -0000	1.5
--- wxbinddefs.h	17 Jul 2007 23:09:17 -0000	1.6
***************
*** 150,153 ****
--- 150,170 ----
  #endif
  
+ 
+ // Declare this here to avoid having to include the socket headers when
+ // using WXLUA_DECLARE_BIND_ALL
+ 
+ #ifndef WXDLLIMPEXP_WXLUASOCKET
+     #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 // WXDLLIMPEXP_WXLUASOCKET
+ 
  // ----------------------------------------------------------------------------
  // Macros to initialize the wxWidgets bindings taking the wxUSE_XXX conditions
***************
*** 179,183 ****
  #else
      #define WXLUA_DECLARE_BIND_WXXML
!     #warning "WXLUA_DECLARE_BIND_WXXML is not used since wxUSE_XML=0"
  #endif //wxUSE_XML
  
--- 196,200 ----
  #else
      #define WXLUA_DECLARE_BIND_WXXML
!     //#warning "WXLUA_DECLARE_BIND_WXXML is not used since wxUSE_XML=0"
  #endif //wxUSE_XML
  
***************
*** 186,190 ****
  #else
      #define WXLUA_DECLARE_BIND_WXXRC
!     #warning "WXLUA_DECLARE_BIND_WXXRC is not used since wxUSE_XRC=0"
  #endif //wxUSE_XRC
  
--- 203,207 ----
  #else
      #define WXLUA_DECLARE_BIND_WXXRC
!     //#warning "WXLUA_DECLARE_BIND_WXXRC is not used since wxUSE_XRC=0"
  #endif //wxUSE_XRC
  
***************
*** 193,197 ****
  #else
      #define WXLUA_DECLARE_BIND_WXHTML
!     #warning "WXLUA_DECLARE_BIND_WXHTML is not used since wxUSE_HTML=0"
  #endif //wxUSE_HTML
  
--- 210,214 ----
  #else
      #define WXLUA_DECLARE_BIND_WXHTML
!     //#warning "WXLUA_DECLARE_BIND_WXHTML is not used since wxUSE_HTML=0"
  #endif //wxUSE_HTML
  
***************
*** 200,204 ****
  #else
      #define WXLUA_DECLARE_BIND_WXAUI
!     #warning "WXLUA_DECLARE_BIND_WXAUI is not used since wxUSE_AUI=0"
  #endif //wxUSE_AUI
  
--- 217,221 ----
  #else
      #define WXLUA_DECLARE_BIND_WXAUI
!     //#warning "WXLUA_DECLARE_BIND_WXAUI is not used since wxUSE_AUI=0"
  #endif //wxUSE_AUI
  
***************
*** 234,238 ****
  #else
      #define WXLUA_IMPLEMENT_BIND_WXXML
!     #warning "WXLUA_IMPLEMENT_BIND_WXXML is not used since wxUSE_XML=0"
  #endif //wxUSE_XML
  
--- 251,255 ----
  #else
      #define WXLUA_IMPLEMENT_BIND_WXXML
!     //#warning "WXLUA_IMPLEMENT_BIND_WXXML is not used since wxUSE_XML=0"
  #endif //wxUSE_XML
  
***************
*** 241,245 ****
  #else
      #define WXLUA_IMPLEMENT_BIND_WXXRC
!     #warning "WXLUA_IMPLEMENT_BIND_WXXRC is not used since wxUSE_XRC=0"
  #endif //wxUSE_XRC
  
--- 258,262 ----
  #else
      #define WXLUA_IMPLEMENT_BIND_WXXRC
!     //#warning "WXLUA_IMPLEMENT_BIND_WXXRC is not used since wxUSE_XRC=0"
  #endif //wxUSE_XRC
  
***************
*** 248,252 ****
  #else
      #define WXLUA_IMPLEMENT_BIND_WXHTML
!     #warning "WXLUA_IMPLEMENT_BIND_WXHTML is not used since wxUSE_HTML=0"
  #endif //wxUSE_HTML
  
--- 265,269 ----
  #else
      #define WXLUA_IMPLEMENT_BIND_WXHTML
!     //#warning "WXLUA_IMPLEMENT_BIND_WXHTML is not used since wxUSE_HTML=0"
  #endif //wxUSE_HTML
  
***************
*** 255,259 ****
  #else
      #define WXLUA_IMPLEMENT_BIND_WXAUI
!     #warning "WXLUA_IMPLEMENT_BIND_WXAUI is not used since wxUSE_AUI=0"
  #endif //wxUSE_AUI
  
--- 272,276 ----
  #else
      #define WXLUA_IMPLEMENT_BIND_WXAUI
!     //#warning "WXLUA_IMPLEMENT_BIND_WXAUI is not used since wxUSE_AUI=0"
  #endif //wxUSE_AUI