[Wxlua-commit] wxLua/modules/wxbind/include wxbind.h,1.29,1.30

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

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

Modified Files:
	wxbind.h 
Log Message:
move the wxLuaDebugSocket bindings to their own dir and out of wxWidgets bindings
fix using more than two bindings with same namespace


Index: wxbind.h
===================================================================
RCS file: /cvsroot/wxlua/wxLua/modules/wxbind/include/wxbind.h,v
retrieving revision 1.29
retrieving revision 1.30
diff -C2 -d -r1.29 -r1.30
*** wxbind.h	20 May 2006 19:40:19 -0000	1.29
--- wxbind.h	24 May 2006 04:50:00 -0000	1.30
***************
*** 446,454 ****
  
  
- #if wxLUA_USE_wxLuaDebugServer
- #include "wxluasocket/include/wxldserv.h"
- #endif
- 
- 
  #if wxLUA_USE_wxLuaHtmlWindow
  #include "wxbind/include/wxlhtmlwin.h"
--- 446,449 ----
***************
*** 875,878 ****
--- 870,874 ----
  extern WXDLLIMPEXP_DATA_WXBIND(int) s_wxluatag_wxSetCursorEvent;
  extern WXDLLIMPEXP_DATA_WXBIND(int) s_wxluatag_wxSizeEvent;
+ extern WXDLLIMPEXP_DATA_WXBIND(int) s_wxluatag_wxString;
  extern WXDLLIMPEXP_DATA_WXBIND(int) s_wxluatag_wxStringClientData;
  extern WXDLLIMPEXP_DATA_WXBIND(int) s_wxluatag_wxSysColourChangedEvent;
***************
*** 1261,1271 ****
  
  
- #if wxLUA_USE_wxLuaDebugServer
- extern WXDLLIMPEXP_DATA_WXBIND(int) s_wxluatag_wxLuaDebugData;
- extern WXDLLIMPEXP_DATA_WXBIND(int) s_wxluatag_wxLuaDebugEvent;
- extern WXDLLIMPEXP_DATA_WXBIND(int) s_wxluatag_wxLuaDebugServer;
- #endif
- 
- 
  #if wxLUA_USE_wxLuaHtmlWindow
  extern WXDLLIMPEXP_DATA_WXBIND(int) s_wxluatag_wxLuaHtmlWinTagEvent;
--- 1257,1260 ----
***************
*** 1858,1861 ****
--- 1847,1852 ----
  extern WXDLLIMPEXP_WXBIND WXLUAMETHOD* wxSizeEvent_methods;
  extern WXDLLIMPEXP_DATA_WXBIND(int) wxSizeEvent_methodCount;
+ extern WXDLLIMPEXP_WXBIND WXLUAMETHOD* wxString_methods;
+ extern WXDLLIMPEXP_DATA_WXBIND(int) wxString_methodCount;
  extern WXDLLIMPEXP_WXBIND WXLUAMETHOD* wxStringClientData_methods;
  extern WXDLLIMPEXP_DATA_WXBIND(int) wxStringClientData_methodCount;
***************
*** 2397,2410 ****
  
  
- #if wxLUA_USE_wxLuaDebugServer
- extern WXDLLIMPEXP_WXBIND WXLUAMETHOD* wxLuaDebugData_methods;
- extern WXDLLIMPEXP_DATA_WXBIND(int) wxLuaDebugData_methodCount;
- extern WXDLLIMPEXP_WXBIND WXLUAMETHOD* wxLuaDebugEvent_methods;
- extern WXDLLIMPEXP_DATA_WXBIND(int) wxLuaDebugEvent_methodCount;
- extern WXDLLIMPEXP_WXBIND WXLUAMETHOD* wxLuaDebugServer_methods;
- extern WXDLLIMPEXP_DATA_WXBIND(int) wxLuaDebugServer_methodCount;
- #endif
- 
- 
  #if wxLUA_USE_wxLuaHtmlWindow
  extern WXDLLIMPEXP_WXBIND WXLUAMETHOD* wxLuaHtmlWinTagEvent_methods;
--- 2388,2391 ----
***************
*** 2834,2837 ****
--- 2815,2819 ----
  wxLUA_DECLARE_ENCAPSULATION(WXDLLIMPEXP_WXBIND, wxBusyCursor)
  wxLUA_DECLARE_ENCAPSULATION(WXDLLIMPEXP_WXBIND, wxProcess)
+ wxLUA_DECLARE_ENCAPSULATION(WXDLLIMPEXP_WXBIND, wxString)
  wxLUA_DECLARE_ENCAPSULATION(WXDLLIMPEXP_WXBIND, wxWindowDisabler)