[Wxlua-commit] wxLua/modules/wxbind/include wxbind.h,1.59,1.60

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

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

Modified Files:
	wxbind.h 
Log Message:
more updates to wxWidgets 2.8 using headers (up to longlong.h)


Index: wxbind.h
===================================================================
RCS file: /cvsroot/wxlua/wxLua/modules/wxbind/include/wxbind.h,v
retrieving revision 1.59
retrieving revision 1.60
diff -C2 -d -r1.59 -r1.60
*** wxbind.h	13 Mar 2007 05:01:01 -0000	1.59
--- wxbind.h	13 Mar 2007 23:01:54 -0000	1.60
***************
*** 112,115 ****
--- 112,119 ----
  #endif // (wxCHECK_VERSION(2,7,0)) && (wxLUA_USE_wxHTML && wxUSE_HTML)
  
+ #if (wxCHECK_VERSION(2,8,0) && wxUSE_TGA) && (wxLUA_USE_wxImage && wxUSE_IMAGE)
+     #include "wx/imagtga.h"
+ #endif // (wxCHECK_VERSION(2,8,0) && wxUSE_TGA) && (wxLUA_USE_wxImage && wxUSE_IMAGE)
+ 
  #if (wxCHECK_VERSION(2,8,0)) && (wxLUA_USE_wxClipboard && wxUSE_CLIPBOARD)
      #include "wx/event.h"
***************
*** 175,178 ****
--- 179,183 ----
  #include "wx/event.h"
  #include "wx/filefn.h"
+ #include "wx/intl.h"
  #include "wx/process.h"
  #include "wx/timer.h"
***************
*** 649,652 ****
--- 654,665 ----
  #endif // wxUSE_FONTDLG && wxLUA_USE_wxFontDialog
  
+ #if wxUSE_LOG
+     #include "wx/log.h"
+ #endif // wxUSE_LOG
+ 
+ #if wxUSE_LONGLONG
+     #include "wx/longlong.h"
+ #endif // wxUSE_LONGLONG
+ 
  #if wxUSE_PROGRESSDLG && wxLUA_USE_wxProgressDialog
      #include "wx/generic/progdlgg.h"
***************
*** 708,711 ****
--- 721,728 ----
  #endif // (wxCHECK_VERSION(2,7,0)) && (wxLUA_USE_wxHTML && wxUSE_HTML)
  
+ #if (wxCHECK_VERSION(2,8,0) && wxUSE_TGA) && (wxLUA_USE_wxImage && wxUSE_IMAGE)
+     extern WXDLLIMPEXP_DATA_WXBIND(int) s_wxluatag_wxTGAHandler;
+ #endif // (wxCHECK_VERSION(2,8,0) && wxUSE_TGA) && (wxLUA_USE_wxImage && wxUSE_IMAGE)
+ 
  #if (wxCHECK_VERSION(2,8,0)) && (wxLUA_USE_wxClipboard && wxUSE_CLIPBOARD)
      extern WXDLLIMPEXP_DATA_WXBIND(int) s_wxluatag_wxClipboardTextEvent;
***************
*** 1524,1527 ****
--- 1541,1562 ----
  #endif // wxUSE_FONTDLG && wxLUA_USE_wxFontDialog
  
+ #if wxUSE_INTL
+     extern WXDLLIMPEXP_DATA_WXBIND(int) s_wxluatag_wxLanguageInfo;
+     extern WXDLLIMPEXP_DATA_WXBIND(int) s_wxluatag_wxLocale;
+ #endif // wxUSE_INTL
+ 
+ #if wxUSE_LOG
+     extern WXDLLIMPEXP_DATA_WXBIND(int) s_wxluatag_wxLog;
+     extern WXDLLIMPEXP_DATA_WXBIND(int) s_wxluatag_wxLogBuffer;
+     extern WXDLLIMPEXP_DATA_WXBIND(int) s_wxluatag_wxLogChain;
+     extern WXDLLIMPEXP_DATA_WXBIND(int) s_wxluatag_wxLogNull;
+     extern WXDLLIMPEXP_DATA_WXBIND(int) s_wxluatag_wxLogPassThrough;
+ #endif // wxUSE_LOG
+ 
+ #if wxUSE_LONGLONG
+     extern WXDLLIMPEXP_DATA_WXBIND(int) s_wxluatag_wxLongLong;
+     extern WXDLLIMPEXP_DATA_WXBIND(int) s_wxluatag_wxULongLong;
+ #endif // wxUSE_LONGLONG
+ 
  #if wxUSE_PROGRESSDLG && wxLUA_USE_wxProgressDialog
      extern WXDLLIMPEXP_DATA_WXBIND(int) s_wxluatag_wxProgressDialog;
***************
*** 1607,1610 ****
--- 1642,1650 ----
  #endif // (wxCHECK_VERSION(2,7,0)) && (wxLUA_USE_wxHTML && wxUSE_HTML)
  
+ #if (wxCHECK_VERSION(2,8,0) && wxUSE_TGA) && (wxLUA_USE_wxImage && wxUSE_IMAGE)
+     extern WXDLLIMPEXP_WXBIND WXLUAMETHOD wxTGAHandler_methods[];
+     extern WXDLLIMPEXP_DATA_WXBIND(int) wxTGAHandler_methodCount;
+ #endif // (wxCHECK_VERSION(2,8,0) && wxUSE_TGA) && (wxLUA_USE_wxImage && wxUSE_IMAGE)
+ 
  #if (wxCHECK_VERSION(2,8,0)) && (wxLUA_USE_wxClipboard && wxUSE_CLIPBOARD)
      extern WXDLLIMPEXP_WXBIND WXLUAMETHOD wxClipboardTextEvent_methods[];
***************
*** 2794,2797 ****
--- 2834,2864 ----
  #endif // wxUSE_FONTDLG && wxLUA_USE_wxFontDialog
  
+ #if wxUSE_INTL
+     extern WXDLLIMPEXP_WXBIND WXLUAMETHOD wxLanguageInfo_methods[];
+     extern WXDLLIMPEXP_DATA_WXBIND(int) wxLanguageInfo_methodCount;
+     extern WXDLLIMPEXP_WXBIND WXLUAMETHOD wxLocale_methods[];
+     extern WXDLLIMPEXP_DATA_WXBIND(int) wxLocale_methodCount;
+ #endif // wxUSE_INTL
+ 
+ #if wxUSE_LOG
+     extern WXDLLIMPEXP_WXBIND WXLUAMETHOD wxLog_methods[];
+     extern WXDLLIMPEXP_DATA_WXBIND(int) wxLog_methodCount;
+     extern WXDLLIMPEXP_WXBIND WXLUAMETHOD wxLogBuffer_methods[];
+     extern WXDLLIMPEXP_DATA_WXBIND(int) wxLogBuffer_methodCount;
+     extern WXDLLIMPEXP_WXBIND WXLUAMETHOD wxLogChain_methods[];
+     extern WXDLLIMPEXP_DATA_WXBIND(int) wxLogChain_methodCount;
+     extern WXDLLIMPEXP_WXBIND WXLUAMETHOD wxLogNull_methods[];
+     extern WXDLLIMPEXP_DATA_WXBIND(int) wxLogNull_methodCount;
+     extern WXDLLIMPEXP_WXBIND WXLUAMETHOD wxLogPassThrough_methods[];
+     extern WXDLLIMPEXP_DATA_WXBIND(int) wxLogPassThrough_methodCount;
+ #endif // wxUSE_LOG
+ 
+ #if wxUSE_LONGLONG
+     extern WXDLLIMPEXP_WXBIND WXLUAMETHOD wxLongLong_methods[];
+     extern WXDLLIMPEXP_DATA_WXBIND(int) wxLongLong_methodCount;
+     extern WXDLLIMPEXP_WXBIND WXLUAMETHOD wxULongLong_methods[];
+     extern WXDLLIMPEXP_DATA_WXBIND(int) wxULongLong_methodCount;
+ #endif // wxUSE_LONGLONG
+ 
  #if wxUSE_PROGRESSDLG && wxLUA_USE_wxProgressDialog
      extern WXDLLIMPEXP_WXBIND WXLUAMETHOD wxProgressDialog_methods[];
***************
*** 3031,3034 ****
--- 3098,3118 ----
  #endif // wxLUA_USE_wxXMLResource && wxUSE_XML
  
+ #if wxUSE_INTL
+     wxLUA_DECLARE_ENCAPSULATION(WXDLLIMPEXP_WXBIND, wxLocale, wxLocale)
+ #endif // wxUSE_INTL
+ 
+ #if wxUSE_LOG
+     wxLUA_DECLARE_ENCAPSULATION(WXDLLIMPEXP_WXBIND, wxLog, wxLog)
+     wxLUA_DECLARE_ENCAPSULATION(WXDLLIMPEXP_WXBIND, wxLogBuffer, wxLogBuffer)
+     wxLUA_DECLARE_ENCAPSULATION(WXDLLIMPEXP_WXBIND, wxLogChain, wxLogChain)
+     wxLUA_DECLARE_ENCAPSULATION(WXDLLIMPEXP_WXBIND, wxLogNull, wxLogNull)
+     wxLUA_DECLARE_ENCAPSULATION(WXDLLIMPEXP_WXBIND, wxLogPassThrough, wxLogPassThrough)
+ #endif // wxUSE_LOG
+ 
+ #if wxUSE_LONGLONG
+     wxLUA_DECLARE_ENCAPSULATION(WXDLLIMPEXP_WXBIND, wxLongLong, wxLongLong)
+     wxLUA_DECLARE_ENCAPSULATION(WXDLLIMPEXP_WXBIND, wxULongLong, wxULongLong)
+ #endif // wxUSE_LONGLONG
+ 
  
  #endif // __HOOK_WXLUA_wx_H__