[Wxlua-commit] wxLua/bindings/wxwidgets appframe.i, 1.28, 1.29 controls.i, 1.31, 1.32 data.i, 1.24, 1.25 datetime.i, 1.23, 1.24 defsutil.i, 1.35, 1.36 file.i, 1.18, 1.19 gdi.i, 1.42, 1.43 image.i, 1.20, 1.21 sizer.i, 1.11, 1.12 windows.i, 1.30, 1.31 wx_datatypes.lua, 1.55, 1.56

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

Update of /cvsroot/wxlua/wxLua/bindings/wxwidgets
In directory sc8-pr-cvs9.sourceforge.net:/tmp/cvs-serv18915/wxLua/bindings/wxwidgets

Modified Files:
	appframe.i controls.i data.i datetime.i defsutil.i file.i 
	gdi.i image.i sizer.i windows.i wx_datatypes.lua 
Log Message:
more updates to wxWidgets 2.8 using headers (up to longlong.h)


Index: wx_datatypes.lua
===================================================================
RCS file: /cvsroot/wxlua/wxLua/bindings/wxwidgets/wx_datatypes.lua,v
retrieving revision 1.55
retrieving revision 1.56
diff -C2 -d -r1.55 -r1.56
*** wx_datatypes.lua	13 Mar 2007 05:01:01 -0000	1.55
--- wx_datatypes.lua	13 Mar 2007 23:01:53 -0000	1.56
***************
*** 16,22 ****
--- 16,24 ----
    wxDouble = "double",
    wxInt32 = "int",
+   wxLogLevel = "unsigned long",
    wxNotebookPage = "wxWindow",
    wxPreviewWindow = "wxScrolledWindow",
    wxTextCoord = "long",
+   wxTraceMask = "unsigned long",
  }
  
***************
*** 1862,1865 ****
--- 1864,1879 ----
      Name = "wxKillError",
    },
+   wxLanguage = {
+     Condition = "wxUSE_INTL",
+     DefType = "enum",
+     IsNumber = true,
+     Name = "wxLanguage",
+   },
+   wxLanguageInfo = {
+     Condition = "wxUSE_INTL",
+     DefType = "struct",
+     IsNumber = false,
+     Name = "wxLanguageInfo",
+   },
    wxLayoutAlgorithm = {
      BaseClass = "wxObject",
***************
*** 1962,1965 ****
--- 1976,2042 ----
      Name = "wxListbookEvent",
    },
+   wxLocale = {
+     Condition = "wxUSE_INTL",
+     DefType = "class",
+     IsNumber = false,
+     Name = "wxLocale",
+   },
+   wxLocaleCategory = {
+     Condition = "wxUSE_INTL",
+     DefType = "enum",
+     IsNumber = true,
+     Name = "wxLocaleCategory",
+   },
+   wxLocaleInfo = {
+     Condition = "wxUSE_INTL",
+     DefType = "enum",
+     IsNumber = true,
+     Name = "wxLocaleInfo",
+   },
+   wxLocaleInitFlags = {
+     Condition = "wxUSE_INTL",
+     DefType = "enum",
+     IsNumber = true,
+     Name = "wxLocaleInitFlags",
+   },
+   wxLog = {
+     Condition = "wxUSE_LOG",
+     DefType = "class",
+     IsNumber = false,
+     Name = "wxLog",
+   },
+   wxLogBuffer = {
+     BaseClass = "wxLog",
+     Condition = "wxUSE_LOG",
+     DefType = "class",
+     IsNumber = false,
+     Name = "wxLogBuffer",
+   },
+   wxLogChain = {
+     BaseClass = "wxLog",
+     Condition = "wxUSE_LOG",
+     DefType = "class",
+     IsNumber = false,
+     Name = "wxLogChain",
+   },
+   wxLogNull = {
+     Condition = "wxUSE_LOG",
+     DefType = "class",
+     IsNumber = false,
+     Name = "wxLogNull",
+   },
+   wxLogPassThrough = {
+     BaseClass = "wxLogChain",
+     Condition = "wxUSE_LOG",
+     DefType = "class",
+     IsNumber = false,
+     Name = "wxLogPassThrough",
+   },
+   wxLongLong = {
+     Condition = "wxUSE_LONGLONG",
+     DefType = "class",
+     IsNumber = false,
+     Name = "wxLongLong",
+   },
    wxLuaHtmlWinTagEvent = {
      BaseClass = "wxEvent",
***************
*** 3028,3031 ****
--- 3105,3115 ----
      Name = "wxSystemSettings",
    },
+   wxTGAHandler = {
+     BaseClass = "wxImageHandler",
+     Condition = "(wxCHECK_VERSION(2,8,0) && wxUSE_TGA) && (wxLUA_USE_wxImage && wxUSE_IMAGE)",
+     DefType = "class",
+     IsNumber = false,
+     Name = "wxTGAHandler",
+   },
    wxTIFFHandler = {
      BaseClass = "wxImageHandler",
***************
*** 3246,3249 ****
--- 3330,3339 ----
      Name = "wxTreeItemIdValue",
    },
+   wxULongLong = {
+     Condition = "wxUSE_LONGLONG",
+     DefType = "class",
+     IsNumber = false,
+     Name = "wxULongLong",
+   },
    wxURI = {
      BaseClass = "wxObject",
***************
*** 3837,3840 ****
--- 3927,3931 ----
    wxUSE_TEXTDLG = "wxUSE_TEXTDLG",
    wxUSE_TEXTFILE = "wxUSE_TEXTFILE",
+   wxUSE_TGA = "wxUSE_TGA",
    wxUSE_THREADS = "wxUSE_THREADS",
    wxUSE_TIMEDATE = "wxUSE_TIMEDATE",

Index: appframe.i
===================================================================
RCS file: /cvsroot/wxlua/wxLua/bindings/wxwidgets/appframe.i,v
retrieving revision 1.28
retrieving revision 1.29
diff -C2 -d -r1.28 -r1.29
*** appframe.i	9 Mar 2007 00:15:12 -0000	1.28
--- appframe.i	13 Mar 2007 23:01:53 -0000	1.29
***************
*** 9,28 ****
  
  //-----------------------------------------------------------------------------
! // wxApp
  
! %if wxLUA_USE_wxApp
  
! %include "wx/app.h"
  
! /*
! %if wxUSE_LOG
! %if !%wxchkver_2_5|%wxcompat_2_4
  
- %class %noclassinfo wxLog // FIXME
  %endclass
  
- %endif //!%wxchkver_2_5|%wxcompat_2_4
  %endif //wxUSE_LOG
! */
  
  %function wxApp* wxGetBaseApp() // THIS IS DEPRECATED! use wxGetApp
--- 9,144 ----
  
  //-----------------------------------------------------------------------------
! // wxLog
  
! %if wxUSE_LOG
  
! %include "wx/log.h"
  
! // These functions are in log.h
! %function unsigned long wxSysErrorCode()
! %function wxString wxSysErrorMsg(unsigned long nErrCode = 0)
! 
! %function void wxSafeShowMessage(const wxString& title, const wxString& text)
! 
! %enum
!     wxLOG_FatalError, // program can't continue, abort immediately
!     wxLOG_Error,      // a serious error, user must be informed about it
!     wxLOG_Warning,    // user is normally informed about it but may be ignored
!     wxLOG_Message,    // normal message (i.e. normal output of a non GUI app)
!     wxLOG_Status,     // informational: might go to the status line of GUI app
!     wxLOG_Info,       // informational message (a.k.a. 'Verbose')
!     wxLOG_Debug,      // never shown to the user, disabled in release mode
!     wxLOG_Trace,      // trace messages are also only enabled in debug mode
!     wxLOG_Progress,   // used for progress indicator (not yet)
!     wxLOG_User,       // user defined levels start here
!     wxLOG_Max
! %endenum
! 
! // symbolic trace masks - wxLogTrace("foo", "some trace message...") will be
! // discarded unless the string "foo" has been added to the list of allowed
! // ones with AddTraceMask()
! %define %string wxTRACE_MemAlloc //wxT("memalloc") // trace memory allocation (new/delete)
! %define %string wxTRACE_Messages //wxT("messages") // trace window messages/X callbacks
! %define %string wxTRACE_ResAlloc //wxT("resalloc") // trace GDI resource allocation
! %define %string wxTRACE_RefCount //wxT("refcount") // trace various ref counting operations
! %msw %define %string wxTRACE_OleCalls //wxT("ole") // OLE interface calls
! 
! %typedef wxLogLevel unsigned long
! %typedef wxTraceMask unsigned long
! 
! %class %noclassinfo %encapsulate wxLog
!     wxLog()
! 
!     static bool IsEnabled()
!     static bool EnableLogging(bool doIt = true)
!     virtual void Flush()
!     static void FlushActive()
!     static wxLog *GetActiveTarget()
!     static wxLog *SetActiveTarget(wxLog *pLogger)
!     static void Suspend()
!     static void Resume()
!     static void SetVerbose(bool bVerbose = true)
!     static void SetLogLevel(wxLogLevel logLevel)
!     static void DontCreateOnDemand()
!     %wxchkver_2_8 static void SetRepetitionCounting(bool bRepetCounting = true)
!     %wxchkver_2_8 static bool GetRepetitionCounting()
!     static void SetTraceMask(wxTraceMask ulMask)
!     static void AddTraceMask(const wxString& str)
!     static void RemoveTraceMask(const wxString& str)
!     static void ClearTraceMasks()
!     static const wxArrayString GetTraceMasks()
!     static void SetTimestamp(const wxString& ts)
!     static bool GetVerbose()
!     static wxTraceMask GetTraceMask()
!     static bool IsAllowedTraceMask(const wxString& mask)
!     static wxLogLevel GetLogLevel()
!     static wxString GetTimestamp()
! %endclass
! 
! //-----------------------------------------------------------------------------
! // wxLogBuffer
! 
! %class %noclassinfo %encapsulate wxLogBuffer, wxLog
!     wxLogBuffer()
! 
!     const wxString& GetBuffer() const // get the string contents with all messages logged
! %endclass
! 
! //-----------------------------------------------------------------------------
! // wxLogStderr - FIXME need to implement FILE*
! 
! //%class %noclassinfo %encapsulate wxLogStderr, wxLog
! //    wxLogStderr(FILE *fp = (FILE *) NULL) // redirect log output to a FILE
! //%endclass
! 
! //-----------------------------------------------------------------------------
! // wxLogStream - FIXME need to implement wxSTD ostream*
! 
! //%class %noclassinfo %encapsulate wxLogStream, wxLog
! //    wxLogStream(wxSTD ostream *ostr = NULL); // redirect log output to an ostream
! //%endclass
! 
! //-----------------------------------------------------------------------------
! // wxLogChain
! 
! %class %noclassinfo %encapsulate wxLogChain, wxLog
!     wxLogChain(wxLog *logger)
! 
!     void SetLog(wxLog *logger) // change the new log target
!     // this can be used to temporarily disable (and then reenable) passing
!     // messages to the old logger (by default we do pass them)
!     void PassMessages(bool bDoPass)
!     // are we passing the messages to the previous log target?
!     bool IsPassingMessages() const
!     // return the previous log target (may be NULL)
!     wxLog *GetOldLog() const
! %endclass
! 
! //-----------------------------------------------------------------------------
! // wxLogPassThrough - a chain log target which uses itself as the new logger
! 
! %class %noclassinfo %encapsulate wxLogPassThrough, wxLogChain
!     wxLogPassThrough()
! 
! %endclass
! 
! //-----------------------------------------------------------------------------
! // wxLogNull
! 
! %class %noclassinfo %encapsulate %delete wxLogNull
!     // NOTE: ALWAYS Delete() this when done since lua's gc may not delete it soon enough
!     wxLogNull()
  
  %endclass
  
  %endif //wxUSE_LOG
! 
! 
! //-----------------------------------------------------------------------------
! // wxApp
! 
! %if wxLUA_USE_wxApp
! 
! %include "wx/app.h"
  
  %function wxApp* wxGetBaseApp() // THIS IS DEPRECATED! use wxGetApp

Index: file.i
===================================================================
RCS file: /cvsroot/wxlua/wxLua/bindings/wxwidgets/file.i,v
retrieving revision 1.18
retrieving revision 1.19
diff -C2 -d -r1.18 -r1.19
*** file.i	12 Mar 2007 23:12:31 -0000	1.18
--- file.i	13 Mar 2007 23:01:53 -0000	1.19
***************
*** 205,209 ****
      static wxString  GetPathTerminators(wxPathFormat format = wxPATH_NATIVE)
      wxString GetShortPath() const
!     //%wxchkver_2_8 wxULongLong GetSize() const
      //%wxchkver_2_8 static wxULongLong GetSize(const wxString &file)
      // %override [bool, wxDateTime dtAccess, wxDateTime dtMod, wxDateTime dtCreate] wxFileName::GetTimes()
--- 205,209 ----
      static wxString  GetPathTerminators(wxPathFormat format = wxPATH_NATIVE)
      wxString GetShortPath() const
!     %wxchkver_2_8 wxULongLong GetSize() const
      //%wxchkver_2_8 static wxULongLong GetSize(const wxString &file)
      // %override [bool, wxDateTime dtAccess, wxDateTime dtMod, wxDateTime dtCreate] wxFileName::GetTimes()
***************
*** 409,413 ****
  
      %wxchkver_2_8 static wxString FindFirst(const wxString& dirname, const wxString& filespec, int flags = wxDIR_DEFAULT)
!     //%wxchkver_2_8 static wxULongLong GetTotalSize(const wxString &dir, wxArrayString *filesSkipped = NULL) FIXME override
  
      // We don't need wxDirTraverser, just use wxDir methods GetFirst, GetNext.
--- 409,413 ----
  
      %wxchkver_2_8 static wxString FindFirst(const wxString& dirname, const wxString& filespec, int flags = wxDIR_DEFAULT)
!     %wxchkver_2_8 static wxULongLong GetTotalSize(const wxString &dir) //, wxArrayString *filesSkipped = NULL) FIXME override
  
      // We don't need wxDirTraverser, just use wxDir methods GetFirst, GetNext.

Index: windows.i
===================================================================
RCS file: /cvsroot/wxlua/wxLua/bindings/wxwidgets/windows.i,v
retrieving revision 1.30
retrieving revision 1.31
diff -C2 -d -r1.30 -r1.31
*** windows.i	9 Mar 2007 06:10:16 -0000	1.30
--- windows.i	13 Mar 2007 23:01:53 -0000	1.31
***************
*** 543,547 ****
  
      bool Create(wxWindow* parent, wxWindowID id, const wxPoint& pos = wxDefaultPosition, const wxSize& size = wxDefaultSize, long style = 0, const wxString& name = "wxListbook")
!     bool IsVertical() const
      wxListView* GetListView()
  
--- 543,547 ----
  
      bool Create(wxWindow* parent, wxWindowID id, const wxPoint& pos = wxDefaultPosition, const wxSize& size = wxDefaultSize, long style = 0, const wxString& name = "wxListbook")
!     !%wxchkver_2_8 bool IsVertical() const // in wxBookCtrlBase in 2.8
      wxListView* GetListView()
  
***************
*** 587,591 ****
  
      bool Create(wxWindow* parent, wxWindowID id, const wxPoint& pos = wxDefaultPosition, const wxSize& size = wxDefaultSize, long style = 0, const wxString& name = "wxChoicebook")
!     bool IsVertical() const
      wxChoice* GetChoiceCtrl() const
  
--- 587,591 ----
  
      bool Create(wxWindow* parent, wxWindowID id, const wxPoint& pos = wxDefaultPosition, const wxSize& size = wxDefaultSize, long style = 0, const wxString& name = "wxChoicebook")
!     !%wxchkver_2_8 bool IsVertical() const // in wxBookCtrlBase in 2.8
      wxChoice* GetChoiceCtrl() const
  

Index: image.i
===================================================================
RCS file: /cvsroot/wxlua/wxLua/bindings/wxwidgets/image.i,v
retrieving revision 1.20
retrieving revision 1.21
diff -C2 -d -r1.20 -r1.21
*** image.i	13 Mar 2007 05:01:00 -0000	1.20
--- image.i	13 Mar 2007 23:01:53 -0000	1.21
***************
*** 78,83 ****
  
      // Constants for wxImage::Scale() for determining the level of quality
!     wxIMAGE_QUALITY_NORMAL
!     wxIMAGE_QUALITY_HIGH
  %endenum
  
--- 78,83 ----
  
      // Constants for wxImage::Scale() for determining the level of quality
!     %wxchkver_2_8 wxIMAGE_QUALITY_NORMAL
!     %wxchkver_2_8 wxIMAGE_QUALITY_HIGH
  %endenum
  
***************
*** 392,395 ****
--- 392,408 ----
  
  //-----------------------------------------------------------------------------
+ // wxTGAHandler and friends in imagtga.h
+ 
+ %if %wxchkver_2_8 & wxUSE_TGA
+ 
+ %include "wx/imagtga.h"
+ 
+ %class wxTGAHandler, wxImageHandler
+     wxTGAHandler()
+ %endclass
+ 
+ %endif // %wxchkver_2_8 & wxUSE_TGA
+ 
+ //-----------------------------------------------------------------------------
  // wxXPMHandler and friends in imagxpm.h
  

Index: gdi.i
===================================================================
RCS file: /cvsroot/wxlua/wxLua/bindings/wxwidgets/gdi.i,v
retrieving revision 1.42
retrieving revision 1.43
diff -C2 -d -r1.42 -r1.43
*** gdi.i	13 Mar 2007 05:01:00 -0000	1.42
--- gdi.i	13 Mar 2007 23:01:53 -0000	1.43
***************
*** 1002,1006 ****
      bool LoadFile(const wxString& name, wxBitmapType type)
      bool Ok() const
!     %wxchkver_2_8 virtual wxColour QuantizeColour(const wxColour& colour) const
      //%win static bool RemoveHandler(const wxString& name)
      bool SaveFile(const wxString& name, wxBitmapType type, wxPalette* palette = NULL)
--- 1002,1006 ----
      bool LoadFile(const wxString& name, wxBitmapType type)
      bool Ok() const
!     !%msw&%wxchkver_2_8 virtual wxColour QuantizeColour(const wxColour& colour) const // msw doesn't derive from wxBitmapBase
      //%win static bool RemoveHandler(const wxString& name)
      bool SaveFile(const wxString& name, wxBitmapType type, wxPalette* palette = NULL)

Index: datetime.i
===================================================================
RCS file: /cvsroot/wxlua/wxLua/bindings/wxwidgets/datetime.i,v
retrieving revision 1.23
retrieving revision 1.24
diff -C2 -d -r1.23 -r1.24
*** datetime.i	9 Mar 2007 00:15:12 -0000	1.23
--- datetime.i	13 Mar 2007 23:01:53 -0000	1.24
***************
*** 14,18 ****
  %function long wxGetLocalTime()
  %function long wxGetUTCTime()
! //%function wxLongLong wxGetLocalTimeMillis()
  %wxcompat_2_6 %function void wxStartTimer()                           // deprecated in 2.8 use wxStopWatch
  %wxcompat_2_6 %function long wxGetElapsedTime(bool resetTimer = true) // deprecated in 2.8 use wxStopWatch
--- 14,18 ----
  %function long wxGetLocalTime()
  %function long wxGetUTCTime()
! %function wxLongLong wxGetLocalTimeMillis()
  %wxcompat_2_6 %function void wxStartTimer()                           // deprecated in 2.8 use wxStopWatch
  %wxcompat_2_6 %function long wxGetElapsedTime(bool resetTimer = true) // deprecated in 2.8 use wxStopWatch
***************
*** 248,255 ****
      int GetDays() const
      int GetHours() const
!     //wxLongLong GetMilliseconds() const
      int GetMinutes() const
!     //wxLongLong GetSeconds() const
!     //wxLongLong GetValue() const
      int GetWeeks() const
      static wxTimeSpan  Hours(long hours)
--- 248,255 ----
      int GetDays() const
      int GetHours() const
!     wxLongLong GetMilliseconds() const
      int GetMinutes() const
!     wxLongLong GetSeconds() const
!     wxLongLong GetValue() const
      int GetWeeks() const
      static wxTimeSpan  Hours(long hours)
***************
*** 548,549 ****
--- 548,947 ----
  %endif //wxLUA_USE_wxDatePickerCtrl & wxUSE_DATEPICKCTRL
  
+ 
+ //-----------------------------------------------------------------------------
+ // wxLocale
+ 
+ %include "wx/intl.h"
+ 
+ %if wxUSE_INTL
+ 
+ %enum wxLanguage
+     // user's default/preffered language as got from OS:
+     wxLANGUAGE_DEFAULT,
+     // unknown language, if wxLocale::GetSystemLanguage fails:
+     wxLANGUAGE_UNKNOWN,
+ 
+     wxLANGUAGE_ABKHAZIAN,
+     wxLANGUAGE_AFAR,
+     wxLANGUAGE_AFRIKAANS,
+     wxLANGUAGE_ALBANIAN,
+     wxLANGUAGE_AMHARIC,
+     wxLANGUAGE_ARABIC,
+     wxLANGUAGE_ARABIC_ALGERIA,
+     wxLANGUAGE_ARABIC_BAHRAIN,
+     wxLANGUAGE_ARABIC_EGYPT,
+     wxLANGUAGE_ARABIC_IRAQ,
+     wxLANGUAGE_ARABIC_JORDAN,
+     wxLANGUAGE_ARABIC_KUWAIT,
+     wxLANGUAGE_ARABIC_LEBANON,
+     wxLANGUAGE_ARABIC_LIBYA,
+     wxLANGUAGE_ARABIC_MOROCCO,
+     wxLANGUAGE_ARABIC_OMAN,
+     wxLANGUAGE_ARABIC_QATAR,
+     wxLANGUAGE_ARABIC_SAUDI_ARABIA,
+     wxLANGUAGE_ARABIC_SUDAN,
+     wxLANGUAGE_ARABIC_SYRIA,
+     wxLANGUAGE_ARABIC_TUNISIA,
+     wxLANGUAGE_ARABIC_UAE,
+     wxLANGUAGE_ARABIC_YEMEN,
+     wxLANGUAGE_ARMENIAN,
+     wxLANGUAGE_ASSAMESE,
+     wxLANGUAGE_AYMARA,
+     wxLANGUAGE_AZERI,
+     wxLANGUAGE_AZERI_CYRILLIC,
+     wxLANGUAGE_AZERI_LATIN,
+     wxLANGUAGE_BASHKIR,
+     wxLANGUAGE_BASQUE,
+     wxLANGUAGE_BELARUSIAN,
+     wxLANGUAGE_BENGALI,
+     wxLANGUAGE_BHUTANI,
+     wxLANGUAGE_BIHARI,
+     wxLANGUAGE_BISLAMA,
+     wxLANGUAGE_BRETON,
+     wxLANGUAGE_BULGARIAN,
+     wxLANGUAGE_BURMESE,
+     wxLANGUAGE_CAMBODIAN,
+     wxLANGUAGE_CATALAN,
+     wxLANGUAGE_CHINESE,
+     wxLANGUAGE_CHINESE_SIMPLIFIED,
+     wxLANGUAGE_CHINESE_TRADITIONAL,
+     wxLANGUAGE_CHINESE_HONGKONG,
+     wxLANGUAGE_CHINESE_MACAU,
+     wxLANGUAGE_CHINESE_SINGAPORE,
+     wxLANGUAGE_CHINESE_TAIWAN,
+     wxLANGUAGE_CORSICAN,
+     wxLANGUAGE_CROATIAN,
+     wxLANGUAGE_CZECH,
+     wxLANGUAGE_DANISH,
+     wxLANGUAGE_DUTCH,
+     wxLANGUAGE_DUTCH_BELGIAN,
+     wxLANGUAGE_ENGLISH,
+     wxLANGUAGE_ENGLISH_UK,
+     wxLANGUAGE_ENGLISH_US,
+     wxLANGUAGE_ENGLISH_AUSTRALIA,
+     wxLANGUAGE_ENGLISH_BELIZE,
+     wxLANGUAGE_ENGLISH_BOTSWANA,
+     wxLANGUAGE_ENGLISH_CANADA,
+     wxLANGUAGE_ENGLISH_CARIBBEAN,
+     wxLANGUAGE_ENGLISH_DENMARK,
+     wxLANGUAGE_ENGLISH_EIRE,
+     wxLANGUAGE_ENGLISH_JAMAICA,
+     wxLANGUAGE_ENGLISH_NEW_ZEALAND,
+     wxLANGUAGE_ENGLISH_PHILIPPINES,
+     wxLANGUAGE_ENGLISH_SOUTH_AFRICA,
+     wxLANGUAGE_ENGLISH_TRINIDAD,
+     wxLANGUAGE_ENGLISH_ZIMBABWE,
+     wxLANGUAGE_ESPERANTO,
+     wxLANGUAGE_ESTONIAN,
+     wxLANGUAGE_FAEROESE,
+     wxLANGUAGE_FARSI,
+     wxLANGUAGE_FIJI,
+     wxLANGUAGE_FINNISH,
+     wxLANGUAGE_FRENCH,
+     wxLANGUAGE_FRENCH_BELGIAN,
+     wxLANGUAGE_FRENCH_CANADIAN,
+     wxLANGUAGE_FRENCH_LUXEMBOURG,
+     wxLANGUAGE_FRENCH_MONACO,
+     wxLANGUAGE_FRENCH_SWISS,
+     wxLANGUAGE_FRISIAN,
+     wxLANGUAGE_GALICIAN,
+     wxLANGUAGE_GEORGIAN,
+     wxLANGUAGE_GERMAN,
+     wxLANGUAGE_GERMAN_AUSTRIAN,
+     wxLANGUAGE_GERMAN_BELGIUM,
+     wxLANGUAGE_GERMAN_LIECHTENSTEIN,
+     wxLANGUAGE_GERMAN_LUXEMBOURG,
+     wxLANGUAGE_GERMAN_SWISS,
+     wxLANGUAGE_GREEK,
+     wxLANGUAGE_GREENLANDIC,
+     wxLANGUAGE_GUARANI,
+     wxLANGUAGE_GUJARATI,
+     wxLANGUAGE_HAUSA,
+     wxLANGUAGE_HEBREW,
+     wxLANGUAGE_HINDI,
+     wxLANGUAGE_HUNGARIAN,
+     wxLANGUAGE_ICELANDIC,
+     wxLANGUAGE_INDONESIAN,
+     wxLANGUAGE_INTERLINGUA,
+     wxLANGUAGE_INTERLINGUE,
+     wxLANGUAGE_INUKTITUT,
+     wxLANGUAGE_INUPIAK,
+     wxLANGUAGE_IRISH,
+     wxLANGUAGE_ITALIAN,
+     wxLANGUAGE_ITALIAN_SWISS,
+     wxLANGUAGE_JAPANESE,
+     wxLANGUAGE_JAVANESE,
+     wxLANGUAGE_KANNADA,
+     wxLANGUAGE_KASHMIRI,
+     wxLANGUAGE_KASHMIRI_INDIA,
+     wxLANGUAGE_KAZAKH,
+     wxLANGUAGE_KERNEWEK,
+     wxLANGUAGE_KINYARWANDA,
+     wxLANGUAGE_KIRGHIZ,
+     wxLANGUAGE_KIRUNDI,
+     wxLANGUAGE_KONKANI,
+     wxLANGUAGE_KOREAN,
+     wxLANGUAGE_KURDISH,
+     wxLANGUAGE_LAOTHIAN,
+     wxLANGUAGE_LATIN,
+     wxLANGUAGE_LATVIAN,
+     wxLANGUAGE_LINGALA,
+     wxLANGUAGE_LITHUANIAN,
+     wxLANGUAGE_MACEDONIAN,
+     wxLANGUAGE_MALAGASY,
+     wxLANGUAGE_MALAY,
+     wxLANGUAGE_MALAYALAM,
+     wxLANGUAGE_MALAY_BRUNEI_DARUSSALAM,
+     wxLANGUAGE_MALAY_MALAYSIA,
+     wxLANGUAGE_MALTESE,
+     wxLANGUAGE_MANIPURI,
+     wxLANGUAGE_MAORI,
+     wxLANGUAGE_MARATHI,
+     wxLANGUAGE_MOLDAVIAN,
+     wxLANGUAGE_MONGOLIAN,
+     wxLANGUAGE_NAURU,
+     wxLANGUAGE_NEPALI,
+     wxLANGUAGE_NEPALI_INDIA,
+     wxLANGUAGE_NORWEGIAN_BOKMAL,
+     wxLANGUAGE_NORWEGIAN_NYNORSK,
+     wxLANGUAGE_OCCITAN,
+     wxLANGUAGE_ORIYA,
+     wxLANGUAGE_OROMO,
+     wxLANGUAGE_PASHTO,
+     wxLANGUAGE_POLISH,
+     wxLANGUAGE_PORTUGUESE,
+     wxLANGUAGE_PORTUGUESE_BRAZILIAN,
+     wxLANGUAGE_PUNJABI,
+     wxLANGUAGE_QUECHUA,
+     wxLANGUAGE_RHAETO_ROMANCE,
+     wxLANGUAGE_ROMANIAN,
+     wxLANGUAGE_RUSSIAN,
+     wxLANGUAGE_RUSSIAN_UKRAINE,
+     wxLANGUAGE_SAMOAN,
+     wxLANGUAGE_SANGHO,
+     wxLANGUAGE_SANSKRIT,
+     wxLANGUAGE_SCOTS_GAELIC,
+     wxLANGUAGE_SERBIAN,
+     wxLANGUAGE_SERBIAN_CYRILLIC,
+     wxLANGUAGE_SERBIAN_LATIN,
+     wxLANGUAGE_SERBO_CROATIAN,
+     wxLANGUAGE_SESOTHO,
+     wxLANGUAGE_SETSWANA,
+     wxLANGUAGE_SHONA,
+     wxLANGUAGE_SINDHI,
+     wxLANGUAGE_SINHALESE,
+     wxLANGUAGE_SISWATI,
+     wxLANGUAGE_SLOVAK,
+     wxLANGUAGE_SLOVENIAN,
+     wxLANGUAGE_SOMALI,
+     wxLANGUAGE_SPANISH,
+     wxLANGUAGE_SPANISH_ARGENTINA,
+     wxLANGUAGE_SPANISH_BOLIVIA,
+     wxLANGUAGE_SPANISH_CHILE,
+     wxLANGUAGE_SPANISH_COLOMBIA,
+     wxLANGUAGE_SPANISH_COSTA_RICA,
+     wxLANGUAGE_SPANISH_DOMINICAN_REPUBLIC,
+     wxLANGUAGE_SPANISH_ECUADOR,
+     wxLANGUAGE_SPANISH_EL_SALVADOR,
+     wxLANGUAGE_SPANISH_GUATEMALA,
+     wxLANGUAGE_SPANISH_HONDURAS,
+     wxLANGUAGE_SPANISH_MEXICAN,
+     wxLANGUAGE_SPANISH_MODERN,
+     wxLANGUAGE_SPANISH_NICARAGUA,
+     wxLANGUAGE_SPANISH_PANAMA,
+     wxLANGUAGE_SPANISH_PARAGUAY,
+     wxLANGUAGE_SPANISH_PERU,
+     wxLANGUAGE_SPANISH_PUERTO_RICO,
+     wxLANGUAGE_SPANISH_URUGUAY,
+     wxLANGUAGE_SPANISH_US,
+     wxLANGUAGE_SPANISH_VENEZUELA,
+     wxLANGUAGE_SUNDANESE,
+     wxLANGUAGE_SWAHILI,
+     wxLANGUAGE_SWEDISH,
+     wxLANGUAGE_SWEDISH_FINLAND,
+     wxLANGUAGE_TAGALOG,
+     wxLANGUAGE_TAJIK,
+     wxLANGUAGE_TAMIL,
+     wxLANGUAGE_TATAR,
+     wxLANGUAGE_TELUGU,
+     wxLANGUAGE_THAI,
+     wxLANGUAGE_TIBETAN,
+     wxLANGUAGE_TIGRINYA,
+     wxLANGUAGE_TONGA,
+     wxLANGUAGE_TSONGA,
+     wxLANGUAGE_TURKISH,
+     wxLANGUAGE_TURKMEN,
+     wxLANGUAGE_TWI,
+     wxLANGUAGE_UIGHUR,
+     wxLANGUAGE_UKRAINIAN,
+     wxLANGUAGE_URDU,
+     wxLANGUAGE_URDU_INDIA,
+     wxLANGUAGE_URDU_PAKISTAN,
+     wxLANGUAGE_UZBEK,
+     wxLANGUAGE_UZBEK_CYRILLIC,
+     wxLANGUAGE_UZBEK_LATIN,
+     wxLANGUAGE_VIETNAMESE,
+     wxLANGUAGE_VOLAPUK,
+     wxLANGUAGE_WELSH,
+     wxLANGUAGE_WOLOF,
+     wxLANGUAGE_XHOSA,
+     wxLANGUAGE_YIDDISH,
+     wxLANGUAGE_YORUBA,
+     wxLANGUAGE_ZHUANG,
+     wxLANGUAGE_ZULU,
+ 
+     // for custom, user-defined languages:
+     wxLANGUAGE_USER_DEFINED
+ %endenum
+ 
+ %enum wxLocaleCategory
+     wxLOCALE_CAT_NUMBER,    // (any) numbers
+     wxLOCALE_CAT_DATE,      // date/time
+     wxLOCALE_CAT_MONEY,     // monetary value
+     wxLOCALE_CAT_MAX
+ %endenum
+ 
+ %enum wxLocaleInfo
+     wxLOCALE_THOUSANDS_SEP, // the thounsands separator
+     wxLOCALE_DECIMAL_POINT  // the character used as decimal point
+ %endenum
+ 
+ %enum wxLocaleInitFlags
+     wxLOCALE_LOAD_DEFAULT       // load wxwin.mo?
+     wxLOCALE_CONV_ENCODING      // convert encoding on the fly?
+ %endenum
+ 
+ %struct wxLanguageInfo
+     %member int Language;                   // wxLanguage id
+     %member wxString CanonicalName;         // Canonical name, e.g. fr_FR
+     %member wxString Description;           // human-readable name of the language
+     %wxchkver_2_8 %member wxLayoutDirection LayoutDirection;
+ %endstruct
+ 
+ 
+ %class %noclassinfo %encapsulate wxLocale
+ 
+     // call Init() if you use this ctor
+     //wxLocale()
+ 
+     // the ctor has a side effect of changing current locale
+     // name (for messages),  dir prefix (for msg files), locale (for setlocale), preload wxstd.mo?, convert Win<->Unix if necessary?
+     wxLocale(const wxString& szName, const wxString& szShort = "", const wxString& szLocale = "", bool bLoadDefault = true, bool bConvertEncoding = false)
+ 
+     // wxLanguage id or custom language
+     %constructor wxLocaleFromLanguage(int language, int flags = wxLOCALE_LOAD_DEFAULT | wxLOCALE_CONV_ENCODING)
+ 
+     // the same as a function (returns true on success)
+     //bool Init(const wxChar *szName, const wxChar *szShort = (const wxChar *) NULL, const wxChar *szLocale = (const wxChar *) NULL, bool bLoadDefault = true, bool bConvertEncoding = false)
+ 
+     // same as second ctor (returns true on success)
+     //bool Init(int language = wxLANGUAGE_DEFAULT, int flags = wxLOCALE_LOAD_DEFAULT | wxLOCALE_CONV_ENCODING);
+ 
+     // Try to get user's (or OS's) preferred language setting.
+     // Return wxLANGUAGE_UNKNOWN if language-guessing algorithm failed
+     static int GetSystemLanguage()
+ 
+     // get the encoding used by default for text on this system, returns
+     // wxFONTENCODING_SYSTEM if it couldn't be determined
+     static wxFontEncoding GetSystemEncoding();
+ 
+     // get the string describing the system encoding, return empty string if
+     // couldn't be determined
+     static wxString GetSystemEncodingName();
+ 
+     // get the values of the given locale-dependent datum: the current locale
+     // is used, the US default value is returned if everything else fails
+     static wxString GetInfo(wxLocaleInfo index, wxLocaleCategory cat);
+ 
+     // return true if the locale was set successfully
+     bool IsOk() const
+ 
+     // returns locale name
+     wxString GetLocale() const
+ 
+     // return current locale wxLanguage value
+     int GetLanguage() const
+ 
+     // return locale name to be passed to setlocale()
+     wxString GetSysName() const;
+ 
+     // return 'canonical' name, i.e. in the form of xx[_YY], where xx is
+     // language code according to ISO 639 and YY is country name
+     // as specified by ISO 3166.
+     wxString GetCanonicalName() const
+ 
+     // add a prefix to the catalog lookup path: the message catalog files will be
+     // looked up under prefix/<lang>/LC_MESSAGES, prefix/LC_MESSAGES and prefix
+     // (in this order).
+     //
+     // This only applies to subsequent invocations of AddCatalog()!
+     static void AddCatalogLookupPathPrefix(const wxString& prefix);
+ 
+     // add a catalog: it's searched for in standard places (current directory
+     // first, system one after), but the you may prepend additional directories to
+     // the search path with AddCatalogLookupPathPrefix().
+     //
+     // The loaded catalog will be used for message lookup by GetString().
+     //
+     // Returns 'true' if it was successfully loaded
+     bool AddCatalog(const wxString& szDomain);
+     %rename AddCatalogLanguage bool AddCatalog(const wxString& szDomain, wxLanguage msgIdLanguage, const wxString& msgIdCharset);
+ 
+     // check if the given locale is provided by OS and C run time
+     %wxchkver_2_8 static bool IsAvailable(int lang);
+ 
+     // check if the given catalog is loaded
+     bool IsLoaded(const wxString& szDomain) const;
+ 
+     // Retrieve the language info struct for the given language
+     //
+     // Returns NULL if no info found, pointer must *not* be deleted by caller
+     static const wxLanguageInfo *GetLanguageInfo(int lang);
+ 
+     // Returns language name in English or empty string if the language
+     // is not in database
+     static wxString GetLanguageName(int lang);
+ 
+     // Find the language for the given locale string which may be either a
+     // canonical ISO 2 letter language code ("xx"), a language code followed by
+     // the country code ("xx_XX") or a Windows full language name ("Xxxxx...")
+     //
+     // Returns NULL if no info found, pointer must *not* be deleted by caller
+     static const wxLanguageInfo *FindLanguageInfo(const wxString& locale);
+ 
+     // Add custom language to the list of known languages.
+     // Notes: 1) wxLanguageInfo contains platform-specific data
+     //        2) must be called before Init to have effect
+     static void AddLanguage(const wxLanguageInfo& info);
+ 
+     // retrieve the translation for a string in all loaded domains unless
+     // the szDomain parameter is specified (and then only this domain is
+     // searched)
+     // n - additional parameter for PluralFormsParser
+     //
+     // return original string if translation is not available
+     // (in this case an error message is generated the first time
+     //  a string is not found; use wxLogNull to suppress it)
+     //
+     // domains are searched in the last to first order, i.e. catalogs
+     // added later override those added before.
+     virtual wxString GetString(const wxString& szOrigString, const wxString& szDomain = "") const;
+     // plural form version of the same:
+     %rename GetStringPlural virtual wxString GetString(const wxString& szOrigString, const wxString& szOrigString2, size_t n, const wxString& szDomain = "") const;
+ 
+     // Returns the current short name for the locale
+     const wxString& GetName() const
+ 
+     // return the contents of .po file header
+     wxString GetHeaderValue( const wxString& szHeader, const wxString& szDomain = "" ) const;
+ %endclass
+ 
+ %function wxLocale* wxGetLocale()
+ 
+ %wxchkver_2_8  %function wxString wxGetTranslation(const wxString& sz, const wxString& domain="")
+ !%wxchkver_2_8 %function wxString wxGetTranslation(const wxString& sz)
+ 
+ %wxchkver_2_8  %rename wxGetTranslationPlural %function wxString wxGetTranslation(const wxString& sz1, const wxString& sz2, size_t n, const wxString& domain="")
+ !%wxchkver_2_8 %rename wxGetTranslationPlural %function wxString wxGetTranslation(const wxString& sz1, const wxString& sz2, size_t n)
+ 
+ %endif //wxUSE_INTL

Index: controls.i
===================================================================
RCS file: /cvsroot/wxlua/wxLua/bindings/wxwidgets/controls.i,v
retrieving revision 1.31
retrieving revision 1.32
diff -C2 -d -r1.31 -r1.32
*** controls.i	12 Mar 2007 23:12:30 -0000	1.31
--- controls.i	13 Mar 2007 23:01:53 -0000	1.32
***************
*** 293,296 ****
--- 293,297 ----
      //int      GetSelections(wxArrayInt& selections) const
      int      GetSelections() const
+     %wxchkver_2_8 int HitTest(const wxPoint& point) const
      //void     InsertItems(int nItems, const wxString items[], int pos)
      void     InsertItems(const wxArrayString_FromLuaTable& items, int pos)
***************
*** 346,352 ****
  %define wxLC_SORT_ASCENDING
  %define wxLC_SORT_DESCENDING
! %define wxLC_USER_TEXT
  %define wxLC_VRULES
  
  %define wxLIST_ALIGN_DEFAULT
  %define wxLIST_ALIGN_LEFT
--- 347,358 ----
  %define wxLC_SORT_ASCENDING
  %define wxLC_SORT_DESCENDING
! //%define wxLC_USER_TEXT - deprecated - use wxLC_VIRTUAL
! %define wxLC_VIRTUAL
  %define wxLC_VRULES
  
+ %define wxLC_MASK_TYPE     //  (wxLC_ICON | wxLC_SMALL_ICON | wxLC_LIST | wxLC_REPORT)
+ %define wxLC_MASK_ALIGN    //  (wxLC_ALIGN_TOP | wxLC_ALIGN_LEFT)
+ %define wxLC_MASK_SORT     //  (wxLC_SORT_ASCENDING | wxLC_SORT_DESCENDING)
+ 
  %define wxLIST_ALIGN_DEFAULT
  %define wxLIST_ALIGN_LEFT
***************
*** 390,393 ****
--- 396,401 ----
  %define wxLIST_STATE_SELECTED
  
+ %wxchkver_2_8 %define wxLIST_GETSUBITEMRECT_WHOLEITEM
+ 
  %class wxListCtrl, wxControl
      %constructor wxListCtrlDefault()
***************
*** 476,479 ****
--- 484,488 ----
      wxListItemAttr(const wxColour& colText = wxNullColour, const wxColour& colBack = wxNullColour, const wxFont& font = wxNullFont)
  
+     %wxchkver_2_8 void AssignFrom(const wxListItemAttr& source)
      wxColour GetBackgroundColour()
      wxFont GetFont()

Index: defsutil.i
===================================================================
RCS file: /cvsroot/wxlua/wxLua/bindings/wxwidgets/defsutil.i,v
retrieving revision 1.35
retrieving revision 1.36
diff -C2 -d -r1.35 -r1.36
*** defsutil.i	13 Mar 2007 05:01:00 -0000	1.35
--- defsutil.i	13 Mar 2007 23:01:53 -0000	1.36
***************
*** 161,169 ****
  %endif // !%wxchkver_2_7
  
- // !%wxchkver_2_7 %function long wxGetFreeMemory() FIXME need to add wxLongLong - maybe always return longlong here?
- // %wxchkver_2_7 %function wxMemorySize wxGetFreeMemory()
- 
  %function wxString wxGetEmailAddress()
! //%function wxMemorySize wxGetFreeMemory()
  %function wxString wxGetFullHostName()
  %function wxString wxGetHomeDir()
--- 161,166 ----
  %endif // !%wxchkver_2_7
  
  %function wxString wxGetEmailAddress()
! %function wxLongLong wxGetFreeMemory()
  %function wxString wxGetFullHostName()
  %function wxString wxGetHomeDir()

Index: sizer.i
===================================================================
RCS file: /cvsroot/wxlua/wxLua/bindings/wxwidgets/sizer.i,v
retrieving revision 1.11
retrieving revision 1.12
diff -C2 -d -r1.11 -r1.12
*** sizer.i	9 Mar 2007 00:15:12 -0000	1.11
--- sizer.i	13 Mar 2007 23:01:53 -0000	1.12
***************
*** 374,377 ****
  %endclass
  
! %endif //wxLUA_USE_wxLayoutConstraints
  
--- 374,377 ----
  %endclass
  
! %endif //wxLUA_USE_wxLayoutConstraints&(!%wxchkver_2_6)
  

Index: data.i
===================================================================
RCS file: /cvsroot/wxlua/wxLua/bindings/wxwidgets/data.i,v
retrieving revision 1.24
retrieving revision 1.25
diff -C2 -d -r1.24 -r1.25
*** data.i	9 Mar 2007 00:15:12 -0000	1.24
--- data.i	13 Mar 2007 23:01:53 -0000	1.25
***************
*** 388,404 ****
  //-----------------------------------------------------------------------------
  // wxLongLong - FIXME it's a typedef so %encapsulate fails on class wxLongLong
  
! //%if wxUSE_LONGLONG
  
! //%class %encapsulate %delete %noclassinfo wxLongLong
! //    wxLongLong(long hi = 0, unsigned long lo = 0)
  
! //    wxLongLong Abs() const
! //    wxLongLong& Assign(double d)
! //    long GetHi() const
! //    unsigned long GetLo() const
! //    double ToDouble() const
! //    long ToLong() const
! //    wxString ToString() const
  
      //%operator wxLongLong operator+(const wxLongLong& ll) const
--- 388,407 ----
  //-----------------------------------------------------------------------------
  // wxLongLong - FIXME it's a typedef so %encapsulate fails on class wxLongLong
+ //              Works in GCC
  
! %if wxUSE_LONGLONG
  
! %include "wx/longlong.h"
  
! %class %encapsulate %delete %noclassinfo wxLongLong
!     wxLongLong(long hi = 0, unsigned long lo = 0)
! 
!     wxLongLong Abs() const
!     wxLongLong& Assign(double d)
!     long GetHi() const
!     unsigned long GetLo() const
!     double ToDouble() const
!     long ToLong() const
!     wxString ToString() const
  
      //%operator wxLongLong operator+(const wxLongLong& ll) const
***************
*** 407,411 ****
      //%operator wxLongLong operator-() const
      //%operator wxLongLong operator-(const wxLongLong& ll) const
! //%endclass
  
! //%endif wxUSE_LONGLONG
--- 410,426 ----
      //%operator wxLongLong operator-() const
      //%operator wxLongLong operator-(const wxLongLong& ll) const
! %endclass
  
! //-----------------------------------------------------------------------------
! // wxULongLong
! 
! %class %encapsulate %delete %noclassinfo wxULongLong
!     wxULongLong(unsigned long hi = 0, unsigned long lo = 0)
! 
!     unsigned long GetHi() const
!     unsigned long GetLo() const
!     long ToULong() const
!     wxString ToString() const
! %endclass
! 
! %endif wxUSE_LONGLONG