wxlua-commit — CVS commits of wxLua

[Wxlua-commit] wxLua/bindings/wxwidgets controls.i, 1.30, 1.31 defsutil.i, 1.33, 1.34 dialogs.i, 1.25, 1.26 file.i, 1.17, 1.18 gdi.i, 1.40, 1.41 help.i, 1.11, 1.12 html.i, 1.14, 1.15 image.i, 1.18, 1.19 wx_datatypes.lua, 1.53, 1.54

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

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

Modified Files:
	controls.i defsutil.i dialogs.i file.i gdi.i help.i html.i 
	image.i wx_datatypes.lua 
Log Message:
update bindings to wxWidgets 2.8 using headers


Index: wx_datatypes.lua
===================================================================
RCS file: /cvsroot/wxlua/wxLua/bindings/wxwidgets/wx_datatypes.lua,v
retrieving revision 1.53
retrieving revision 1.54
diff -C2 -d -r1.53 -r1.54
*** wx_datatypes.lua	9 Mar 2007 06:10:16 -0000	1.53
--- wx_datatypes.lua	12 Mar 2007 23:12:31 -0000	1.54
***************
*** 1018,1021 ****
--- 1018,1027 ----
      Name = "wxFile::OpenMode",
    },
+   ["wxFile::dummy"] = {
+     Condition = "wxLUA_USE_wxFile && wxUSE_FILE",
+     DefType = "enum",
+     IsNumber = true,
+     Name = "wxFile::dummy",
+   },
    wxFileConfig = {
      BaseClass = "wxConfigBase",
***************
*** 1704,1707 ****
--- 1710,1719 ----
      Name = "wxIconBundle",
    },
+   wxIconLocation = {
+     Condition = "wxLUA_USE_wxIcon",
+     DefType = "class",
+     IsNumber = false,
+     Name = "wxIconLocation",
+   },
    wxIconizeEvent = {
      BaseClass = "wxEvent",
***************
*** 2157,2160 ****
--- 2169,2178 ----
      Name = "wxMultiChoiceDialog",
    },
+   wxNativeFontInfo = {
+     Condition = "wxLUA_USE_wxFont",
+     DefType = "class",
+     IsNumber = false,
+     Name = "wxNativeFontInfo",
+   },
    wxNavigationKeyEvent = {
      BaseClass = "wxEvent",
***************
*** 2317,2320 ****
--- 2335,2344 ----
      Name = "wxPathFormat",
    },
+   wxPathList = {
+     BaseClass = "wxArrayString",
+     DefType = "class",
+     IsNumber = false,
+     Name = "wxPathList",
+   },
    wxPathNormalize = {
      Condition = "wxLUA_USE_wxFileName",
***************
*** 2673,2676 ****
--- 2697,2707 ----
      Name = "wxSimpleHelpProvider",
    },
+   wxSimpleHtmlListBox = {
+     BaseClass = "wxHtmlWindowInterface",
+     Condition = "(wxCHECK_VERSION(2,7,0)) && (wxLUA_USE_wxHTML && wxUSE_HTML)",
+     DefType = "class",
+     IsNumber = false,
+     Name = "wxSimpleHtmlListBox",
+   },
    wxSingleChoiceDialog = {
      BaseClass = "wxDialog",
***************
*** 2890,2893 ****
--- 2921,2936 ----
      Name = "wxStdDialogButtonSizer",
    },
+   wxStockGDI = {
+     Condition = "(wxCHECK_VERSION(2,8,0)) && (wxLUA_USE_wxColourPenBrush)",
+     DefType = "class",
+     IsNumber = false,
+     Name = "wxStockGDI",
+   },
+   ["wxStockGDI::Item"] = {
+     Condition = "(wxCHECK_VERSION(2,8,0)) && (wxLUA_USE_wxColourPenBrush)",
+     DefType = "enum",
+     IsNumber = true,
+     Name = "wxStockGDI::Item",
+   },
    wxStreamBase = {
      Condition = "wxUSE_STREAMS",
***************
*** 3002,3005 ****
--- 3045,3054 ----
      Name = "wxTaskBarIconEvent",
    },
+   wxTempFile = {
+     Condition = "wxLUA_USE_wxFile && wxUSE_FILE",
+     DefType = "class",
+     IsNumber = false,
+     Name = "wxTempFile",
+   },
    wxTextAttr = {
      Condition = "wxLUA_USE_wxTextCtrl && wxUSE_TEXTCTRL",

Index: file.i
===================================================================
RCS file: /cvsroot/wxlua/wxLua/bindings/wxwidgets/file.i,v
retrieving revision 1.17
retrieving revision 1.18
diff -C2 -d -r1.17 -r1.18
*** file.i	9 Mar 2007 00:15:12 -0000	1.17
--- file.i	12 Mar 2007 23:12:31 -0000	1.18
***************
*** 26,30 ****
  %function wxString wxGetOSDirectory()
  %function bool wxIsAbsolutePath(const wxString& filename)
- %function bool wxDirExists(const wxString& dirname)
  %function wxString wxPathOnly(const wxString& path)
  // %override [new lua string] wxUnix2DosFilename(lua string)
--- 26,29 ----
***************
*** 38,46 ****
  %function bool wxMkdir(const wxString& dir, int perm = 0777)
  //int wxParseCommonDialogsFilter(const wxString& wildCard, wxArrayString& descriptions, wxArrayString& filters)
  %function bool wxRemoveFile(const wxString& file)
! %function bool wxRenameFile(const wxString& file1, const wxString& file2)
  %function bool wxRmdir(const wxString& dir, int flags=0)
  %function bool wxSetWorkingDirectory(const wxString& dir)
  
  // These two methods are for wxLua
  // %override wxFILE_SEP_PATH wxFileSeparator() - returns either / or \ depending on platform
--- 37,51 ----
  %function bool wxMkdir(const wxString& dir, int perm = 0777)
  //int wxParseCommonDialogsFilter(const wxString& wildCard, wxArrayString& descriptions, wxArrayString& filters)
+ %wxchkver_2_8  %function wxString wxRealPath(const wxString& path)
  %function bool wxRemoveFile(const wxString& file)
! !%wxchkver_2_8 %function bool wxRenameFile(const wxString& file1, const wxString& file2)
! %wxchkver_2_8  %function bool wxRenameFile(const wxString& file1, const wxString& file2, bool overwrite = true)
  %function bool wxRmdir(const wxString& dir, int flags=0)
  %function bool wxSetWorkingDirectory(const wxString& dir)
  
+ %wxchkver_2_8 %function bool wxIsWritable(const wxString &path)
+ %wxchkver_2_8 %function bool wxIsReadable(const wxString &path)
+ %wxchkver_2_8 %function bool wxIsExecutable(const wxString &path)
+ 
  // These two methods are for wxLua
  // %override wxFILE_SEP_PATH wxFileSeparator() - returns either / or \ depending on platform
***************
*** 49,54 ****
--- 54,117 ----
  %function long wxFileSize(const wxString& fileName)
  
+ // wxLua only has storage for wxChar* in bindings, wxFILE_SEP_XXX are #defined
+ //   as wxChar wxT('.'), so we just redefine them to be wxT(".") or wxChar*
+ %define %string wxFILE_SEP_EXT       wxT(".")
+ %define %string wxFILE_SEP_DSK       wxT(":")
+ %define %string wxFILE_SEP_PATH_DOS  wxT("\\")
+ %define %string wxFILE_SEP_PATH_UNIX wxT("/")
+ %define %string wxFILE_SEP_PATH_MAC  wxT(":")
+ %define %string wxFILE_SEP_PATH_VMS  wxT(".") // VMS also uses '[' and ']'
+ 
+ %if defined(__UNIX__) && !defined(__OS2__)
+     // CYGWIN also uses UNIX settings
+     %define %string wxFILE_SEP_PATH     wxT("/") // wxFILE_SEP_PATH_UNIX
+ %endif
+ %if defined(__MAC__)
+     %define %string wxFILE_SEP_PATH     wxT(":") // wxFILE_SEP_PATH_MAC
+ %endif
+ %if !(defined(__UNIX__) && !defined(__OS2__)) && !defined(__MAC__) // Windows and OS/2
+     %define %string wxFILE_SEP_PATH     wxT("\\") // wxFILE_SEP_PATH_DOS
+ %endif  // Unix/Windows
+ 
+ %define %string wxPATH_SEP_DOS       // wxT(";")
+ %define %string wxPATH_SEP_UNIX      // wxT(":")
+ %define %string wxPATH_SEP_MAC       // wxT(";")
+ %define %string wxPATH_SEP           // wxPATH_SEP_XXX
+ 
+ %define wxARE_FILENAMES_CASE_SENSITIVE // bool 1/0
+ 
+ //%function bool wxIsPathSeparator(wxChar c) FIXME
+ //%function bool wxEndsWithPathSeparator(const wxChar *pszFileName)
+ 
+ 
+ //-----------------------------------------------------------------------------
+ // wxPathList
+ 
+ %include "wx/filefn.h"
+ 
+ %class %delete %encapsulate %noclassinfo wxPathList, wxArrayString
+     wxPathList()
+     //wxPathList(const wxArrayString &arr)
+ 
+     // Adds all paths in environment variable
+     void AddEnvList(const wxString& envVariable)
+     // Adds given path to this list
+     !%wxchkver_2_8 void Add(const wxString& path)
+     %wxchkver_2_8 bool Add(const wxString& path)
+     %wxchkver_2_8 %rename AddArray void Add(const wxArrayString_FromLuaTable& paths)
+     // Find the first full path for which the file exists
+     wxString FindValidPath(const wxString& filename) const
+     // Find the first full path for which the file exists; ensure it's an
+     // absolute path that gets returned.
+     wxString FindAbsoluteValidPath(const wxString& filename) const
+     // Given full path and filename, add path to list
+     !%wxchkver_2_8 void EnsureFileAccessible(const wxString& path)
+     %wxchkver_2_8 bool EnsureFileAccessible(const wxString& path)
+ %endclass
+ 
  //-----------------------------------------------------------------------------
  // wxFileName
+ //    Note: Most of the static methods are not implemented since it is just as
+ //          easy to create a wxFileName object and call functions on it.
  
  %if wxLUA_USE_wxFileName
***************
*** 104,111 ****
      void AssignDir(const wxString& dir, wxPathFormat format = wxPATH_NATIVE)
      void AssignHomeDir()
!     void AssignTempFileName(const wxString& prefix, wxFile *fileTemp = NULL)
      void Clear()
      void ClearExt()
!     static wxString CreateTempFileName(const wxString& prefix, wxFile *fileTemp = NULL)
      bool DirExists()
      %rename DirExistsName static bool DirExists(const wxString& dir)
--- 167,181 ----
      void AssignDir(const wxString& dir, wxPathFormat format = wxPATH_NATIVE)
      void AssignHomeDir()
!     !%wxchkver_2_8 void AssignTempFileName(const wxString& prefix, wxFile *fileTemp = NULL)
!     %wxchkver_2_8&&(wxUSE_FILE||wxUSE_FFILE) %rename AssignTempFileNameGetName void AssignTempFileName(const wxString& prefix)
!     %wxchkver_2_8&&wxUSE_FILE void AssignTempFileName(const wxString& prefix, wxFile *fileTemp)
!     //%wxchkver_2_8&&wxUSE_FFILE void AssignTempFileName(const wxString& prefix, wxFFile *fileTemp)
      void Clear()
      void ClearExt()
!     // Use AssignTempFileName(...) equivalents
!     //!%wxchkver_2_8 static wxString CreateTempFileName(const wxString& prefix, wxFile *fileTemp = NULL)
!     //%wxchkver_2_8&&(wxUSE_FILE||wxUSE_FFILE) static wxString CreateTempFileName(const wxString& prefix)
!     //%wxchkver_2_8&&wxUSE_FILE static wxString CreateTempFileName(const wxString& prefix, wxFile *fileTemp)
!     //%wxchkver_2_8&&wxUSE_FFILE static wxString CreateTempFileName(const wxString& prefix, wxFFile *fileTemp);
      bool DirExists()
      %rename DirExistsName static bool DirExists(const wxString& dir)
***************
*** 124,127 ****
--- 194,200 ----
      wxString GetFullPath(wxPathFormat format = wxPATH_NATIVE) const
      static wxString GetHomeDir()
+     %wxchkver_2_8 wxString GetHumanReadableSize(const wxString &nullsize = "Not available", int precision = 1) const
+     //%wxchkver_2_8 wxString GetHumanReadableSize(const wxString &nullsize = wxGetTranslation(_T("Not available")), int precision = 1) const
+     //%wxchkver_2_8 static wxString GetHumanReadableSize(const wxULongLong &sz, const wxString &nullsize = wxGetTranslation(_T("Not available")), int precision = 1)
      wxString GetLongPath() const
      wxDateTime GetModificationTime() const
***************
*** 132,135 ****
--- 205,210 ----
      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()
      bool GetTimes(wxDateTime* dtAccess, wxDateTime* dtMod, wxDateTime* dtCreate) const
***************
*** 146,149 ****
--- 221,234 ----
      bool IsRelative(wxPathFormat format = wxPATH_NATIVE)
      bool IsDir() const
+     %wxchkver_2_8 bool IsDirWritable() const
+     //%wxchkver_2_8 static bool IsDirWritable(const wxString &path)
+     %wxchkver_2_8 bool IsDirReadable() const
+     //%wxchkver_2_8 static bool IsDirReadable(const wxString &path)
+     %wxchkver_2_8 bool IsFileWritable() const
+     //%wxchkver_2_8 static bool IsFileWritable(const wxString &path)
+     %wxchkver_2_8 bool IsFileReadable() const
+     //%wxchkver_2_8 static bool IsFileReadable(const wxString &path)
+     %wxchkver_2_8 bool IsFileExecutable() const
+     //%wxchkver_2_8 static bool IsFileExecutable(const wxString &path)
      //static bool MacFindDefaultTypeAndCreator(const wxString& ext, wxUint32* type, wxUint32* creator)
      //bool MacSetDefaultTypeAndCreator()
***************
*** 198,201 ****
--- 283,293 ----
  %endenum
  
+ %enum wxFile::dummy
+     fd_invalid // = -1
+     fd_stdin
+     fd_stdout
+     fd_stderr
+ %endenum
+ 
  %enum wxSeekMode
      wxFromStart
***************
*** 248,252 ****
      //size_t Write(const void* buffer, unsigned int count)
      size_t Write(const wxString& buffer, unsigned int count)
!     %rename WriteString size_t Write(const wxString &str)
  %endclass
  
--- 340,377 ----
      //size_t Write(const void* buffer, unsigned int count)
      size_t Write(const wxString& buffer, unsigned int count)
!     %rename WriteString size_t Write(const wxString &str) //, const wxMBConv& conv = wxConvUTF8)
! %endclass
! 
! //-----------------------------------------------------------------------------
! // wxTempFile
! 
! %include "wx/file.h"
! 
! %class %noclassinfo %encapsulate %delete wxTempFile
!     %constructor wxTempFileDefault()
!     // associates the temp file with the file to be replaced and opens it
!     wxTempFile(const wxString& strName)
! 
!     // open the temp file (strName is the name of file to be replaced)
!     bool Open(const wxString& strName)
! 
!     // is the file opened?
!     bool IsOpened() const
!     // get current file length
!     wxFileOffset Length() const
!     // move ptr ofs bytes related to start/current offset/end of file
!     wxFileOffset Seek(wxFileOffset ofs, wxSeekMode mode = wxFromStart)
!     // get current offset
!     wxFileOffset Tell() const
! 
!     // I/O (both functions return true on success, false on failure)
!     //bool Write(const void *p, size_t n)
!     bool Write(const wxString& str) //, const wxMBConv& conv = wxConvUTF8)
! 
!     // validate changes and delete the old file of name m_strName
!     bool Commit()
!     // discard changes
!     void Discard();
! 
  %endclass
  

Index: help.i
===================================================================
RCS file: /cvsroot/wxlua/wxLua/bindings/wxwidgets/help.i,v
retrieving revision 1.11
retrieving revision 1.12
diff -C2 -d -r1.11 -r1.12
*** help.i	9 Mar 2007 00:15:12 -0000	1.11
--- help.i	12 Mar 2007 23:12:31 -0000	1.12
***************
*** 89,92 ****
--- 89,94 ----
  %include "wx/help.h"
  
+ %define wxHELP_NETSCAPE  // Flags for SetViewer
+ 
  %enum wxHelpSearchMode
      wxHELP_SEARCH_INDEX
***************
*** 97,100 ****
--- 99,103 ----
  %class %delete wxHelpController, wxObject
      wxHelpController()
+     //%wxchkver_2_8 wxHelpController(wxWindow* parentWindow = NULL) wxHTMLHelpController takes different params
  
      virtual void Initialize(const wxString& file)
***************
*** 108,115 ****
--- 111,120 ----
      // %override [wxFrame*, wxSize* size = NULL, wxPoint* pos = NULL, bool *newFrameEachTime = NULL] wxHelpController::GetFrameParameters()
      virtual wxFrame* GetFrameParameters(wxSize* size = NULL, wxPoint* pos = NULL, bool *newFrameEachTime = NULL)
+     %wxchkver_2_8 virtual wxWindow* GetParentWindow() const
      virtual bool KeywordSearch(const wxString& keyWord, wxHelpSearchMode mode = wxHELP_SEARCH_ALL)
      virtual bool LoadFile(const wxString& file = "")
      //virtual bool OnQuit()
      virtual void SetFrameParameters(const wxString& title, const wxSize& size, const wxPoint& pos = wxDefaultPosition, bool newFrameEachTime = false)
+     %wxchkver_2_8 virtual void SetParentWindow(wxWindow* win)
      virtual void SetViewer(const wxString& viewer, long flags)
      virtual bool Quit()

Index: image.i
===================================================================
RCS file: /cvsroot/wxlua/wxLua/bindings/wxwidgets/image.i,v
retrieving revision 1.18
retrieving revision 1.19
diff -C2 -d -r1.18 -r1.19
*** image.i	9 Mar 2007 00:15:12 -0000	1.18
--- image.i	12 Mar 2007 23:12:31 -0000	1.19
***************
*** 47,50 ****
--- 47,53 ----
      wxBITMAP_TYPE_ICON
      wxBITMAP_TYPE_ICON_RESOURCE
+     wxBITMAP_TYPE_ANI
+     wxBITMAP_TYPE_IFF
+     %wxchkver_2_8 wxBITMAP_TYPE_TGA
      wxBITMAP_TYPE_MACCURSOR
      wxBITMAP_TYPE_MACCURSOR_RESOURCE

Index: gdi.i
===================================================================
RCS file: /cvsroot/wxlua/wxLua/bindings/wxwidgets/gdi.i,v
retrieving revision 1.40
retrieving revision 1.41
diff -C2 -d -r1.40 -r1.41
*** gdi.i	9 Mar 2007 00:15:12 -0000	1.40
--- gdi.i	12 Mar 2007 23:12:31 -0000	1.41
***************
*** 43,46 ****
--- 43,56 ----
  
  //-----------------------------------------------------------------------------
+ // wxRealPoint - Used nowhere in wxWidgets
+ 
+ //%class %delete %noclassinfo %encapsulate wxRealPoint
+ //    wxRealPoint(double xx = 0, double yy = 0)
+ //
+ //    %rename X %member double x // GetX() and SetX(int x)
+ //    %rename Y %member double y // GetY() and SetY(int y)
+ //%endclass
+ 
+ //-----------------------------------------------------------------------------
  // wxSize
  
***************
*** 51,59 ****
--- 61,76 ----
      %overload %constructor wxSizeCopy(const wxSize& size)
  
+     %wxchkver_2_8 void DecBy(int dx, int dy)
+     //%wxchkver_2_8 void DecBy(const wxSize& sz)
+     //%wxchkver_2_8 void DecBy(int d)
      void DecTo(const wxSize& sz)
      bool IsFullySpecified() const
      int GetHeight() const
      int GetWidth() const
+     %wxchkver_2_8 void IncBy(int dx, int dy)
+     //%wxchkver_2_8 void IncBy(const wxSize& sz)
+     //%wxchkver_2_8 void IncBy(int d)
      void IncTo(const wxSize& sz)
+     %wxchkver_2_8 wxSize& Scale(float xscale, float yscale)
      void Set(int width, int height)
      void SetDefaults(const wxSize& size)
***************
*** 75,78 ****
--- 92,96 ----
      %overload %constructor wxRectFromSize(const wxSize& size)
  
+     %wxchkver_2_8 wxRect CentreIn(const wxRect& r, int dir = wxBOTH) const // CenterIn
      %wxchkver_2_7 %overload bool Contains(wxCoord dx, wxCoord dy) const
      %wxchkver_2_7 %overload %rename ContainsPoint bool Contains(const wxPoint& pt) const
***************
*** 83,88 ****
      int     GetLeft()
      wxPoint GetPosition()
!     wxPoint GetTopLeft() const            //wxPoint GetLeftTop() const
!     wxPoint GetBottomRight() const        //wxPoint GetRightBottom() const
      int     GetRight()
      wxSize  GetSize()
--- 101,108 ----
      int     GetLeft()
      wxPoint GetPosition()
!     wxPoint GetTopLeft() const                  // GetLeftTop
!     %wxchkver_2_8 wxPoint GetTopRight() const   // GetRightTop
!     wxPoint GetBottomRight() const              // GetRightBottom
!     %wxchkver_2_8 wxPoint GetBottomLeft() const // GetLeftBottom
      int     GetRight()
      wxSize  GetSize()
***************
*** 100,108 ****
      void    SetLeft(int left)
      void    SetPosition(const wxPoint &p)
!     void    SetBottomRight(const wxPoint &p)
!     void    SetRightBottom(const wxPoint &p)
      void    SetRight(int right)
      void    SetSize(const wxSize &s)
      void    SetTop(int top)
      void    SetWidth(int width)
      void    SetX(int X)
--- 120,129 ----
      void    SetLeft(int left)
      void    SetPosition(const wxPoint &p)
!     %wxchkver_2_8 void    SetBottomLeft(const wxPoint &p)   // SetLeftBottom
!     void    SetBottomRight(const wxPoint &p)                // SetRightBottom
      void    SetRight(int right)
      void    SetSize(const wxSize &s)
      void    SetTop(int top)
+     %wxchkver_2_8 void    SetTopRight(const wxPoint &p)     // SetRightTop
      void    SetWidth(int width)
      void    SetX(int X)
***************
*** 128,132 ****
  
  %class %delete wxGDIObject, wxObject
!     //wxGDIObject()
      //bool GetVisible()       these are NOT USED and have been removed in 2.7
      //void SetVisible(bool visible)
--- 149,154 ----
  
  %class %delete wxGDIObject, wxObject
!     //wxGDIObject() - base class, no constructor since it doesn't do anything
! 
      //bool GetVisible()       these are NOT USED and have been removed in 2.7
      //void SetVisible(bool visible)
***************
*** 274,321 ****
  
  %enum wxFontEncoding
!     wxFONTENCODING_SYSTEM
!     wxFONTENCODING_DEFAULT
!     wxFONTENCODING_ISO8859_1
!     wxFONTENCODING_ISO8859_2
!     wxFONTENCODING_ISO8859_3
!     wxFONTENCODING_ISO8859_4
!     wxFONTENCODING_ISO8859_5
!     wxFONTENCODING_ISO8859_6
!     wxFONTENCODING_ISO8859_7
!     wxFONTENCODING_ISO8859_8
!     wxFONTENCODING_ISO8859_9
!     wxFONTENCODING_ISO8859_10
!     wxFONTENCODING_ISO8859_11
!     wxFONTENCODING_ISO8859_12
!     wxFONTENCODING_ISO8859_13
!     wxFONTENCODING_ISO8859_14
!     wxFONTENCODING_ISO8859_15
      wxFONTENCODING_ISO8859_MAX
!     wxFONTENCODING_KOI8
!     wxFONTENCODING_ALTERNATIVE
!     wxFONTENCODING_BULGARIAN
!     wxFONTENCODING_CP437
!     wxFONTENCODING_CP850
!     wxFONTENCODING_CP852
!     wxFONTENCODING_CP855
!     wxFONTENCODING_CP866
!     wxFONTENCODING_CP874
!     wxFONTENCODING_CP932
!     wxFONTENCODING_CP936
!     wxFONTENCODING_CP949
!     wxFONTENCODING_CP950
!     wxFONTENCODING_CP1250
!     wxFONTENCODING_CP1251
!     wxFONTENCODING_CP1252
!     wxFONTENCODING_CP1253
!     wxFONTENCODING_CP1254
!     wxFONTENCODING_CP1255
!     wxFONTENCODING_CP1256
!     wxFONTENCODING_CP1257
      wxFONTENCODING_CP12_MAX
!     wxFONTENCODING_UTF7
!     wxFONTENCODING_UTF8
      wxFONTENCODING_UNICODE
!     wxFONTENCODING_MAX
  %endenum
  
--- 296,420 ----
  
  %enum wxFontEncoding
!     wxFONTENCODING_SYSTEM           // system default
!     wxFONTENCODING_DEFAULT         // current default encoding
! 
!     // ISO8859 standard defines a number of single-byte charsets
!     wxFONTENCODING_ISO8859_1       // West European (Latin1)
!     wxFONTENCODING_ISO8859_2       // Central and East European (Latin2)
!     wxFONTENCODING_ISO8859_3       // Esperanto (Latin3)
!     wxFONTENCODING_ISO8859_4       // Baltic (old) (Latin4)
!     wxFONTENCODING_ISO8859_5       // Cyrillic
!     wxFONTENCODING_ISO8859_6       // Arabic
!     wxFONTENCODING_ISO8859_7       // Greek
!     wxFONTENCODING_ISO8859_8       // Hebrew
!     wxFONTENCODING_ISO8859_9       // Turkish (Latin5)
!     wxFONTENCODING_ISO8859_10      // Variation of Latin4 (Latin6)
!     wxFONTENCODING_ISO8859_11      // Thai
!     wxFONTENCODING_ISO8859_12      // doesn't exist currently, but put it
!                                     // here anyhow to make all ISO8859
!                                     // consecutive numbers
!     wxFONTENCODING_ISO8859_13      // Baltic (Latin7)
!     wxFONTENCODING_ISO8859_14      // Latin8
!     wxFONTENCODING_ISO8859_15      // Latin9 (a.k.a. Latin0, includes euro)
      wxFONTENCODING_ISO8859_MAX
! 
!     // Cyrillic charset soup (see http://czyborra.com/charsets/cyrillic.html)
!     wxFONTENCODING_KOI8            // KOI8 Russian
!     wxFONTENCODING_KOI8_U          // KOI8 Ukrainian
!     wxFONTENCODING_ALTERNATIVE     // same as MS-DOS CP866
!     wxFONTENCODING_BULGARIAN       // used under Linux in Bulgaria
! 
!     // what would we do without Microsoft? They have their own encodings
!         // for DOS
!     wxFONTENCODING_CP437           // original MS-DOS codepage
!     wxFONTENCODING_CP850           // CP437 merged with Latin1
!     wxFONTENCODING_CP852           // CP437 merged with Latin2
!     wxFONTENCODING_CP855           // another cyrillic encoding
!     wxFONTENCODING_CP866           // and another one
!         // and for Windows
!     wxFONTENCODING_CP874           // WinThai
!     wxFONTENCODING_CP932           // Japanese (shift-JIS)
!     wxFONTENCODING_CP936           // Chinese simplified (GB)
!     wxFONTENCODING_CP949           // Korean (Hangul charset)
!     wxFONTENCODING_CP950           // Chinese (traditional - Big5)
!     wxFONTENCODING_CP1250          // WinLatin2
!     wxFONTENCODING_CP1251          // WinCyrillic
!     wxFONTENCODING_CP1252          // WinLatin1
!     wxFONTENCODING_CP1253          // WinGreek (8859-7)
!     wxFONTENCODING_CP1254          // WinTurkish
!     wxFONTENCODING_CP1255          // WinHebrew
!     wxFONTENCODING_CP1256          // WinArabic
!     wxFONTENCODING_CP1257          // WinBaltic (same as Latin 7)
      wxFONTENCODING_CP12_MAX
! 
!     wxFONTENCODING_UTF7            // UTF-7 Unicode encoding
!     wxFONTENCODING_UTF8            // UTF-8 Unicode encoding
!     wxFONTENCODING_EUC_JP          // Extended Unix Codepage for Japanese
!     wxFONTENCODING_UTF16BE         // UTF-16 Big Endian Unicode encoding
!     wxFONTENCODING_UTF16LE         // UTF-16 Little Endian Unicode encoding
!     wxFONTENCODING_UTF32BE         // UTF-32 Big Endian Unicode encoding
!     wxFONTENCODING_UTF32LE         // UTF-32 Little Endian Unicode encoding
! 
!     wxFONTENCODING_MACROMAN        // the standard mac encodings
!     wxFONTENCODING_MACJAPANESE
!     wxFONTENCODING_MACCHINESETRAD
!     wxFONTENCODING_MACKOREAN
!     wxFONTENCODING_MACARABIC
!     wxFONTENCODING_MACHEBREW
!     wxFONTENCODING_MACGREEK
!     wxFONTENCODING_MACCYRILLIC
!     wxFONTENCODING_MACDEVANAGARI
!     wxFONTENCODING_MACGURMUKHI
!     wxFONTENCODING_MACGUJARATI
!     wxFONTENCODING_MACORIYA
!     wxFONTENCODING_MACBENGALI
!     wxFONTENCODING_MACTAMIL
!     wxFONTENCODING_MACTELUGU
!     wxFONTENCODING_MACKANNADA
!     wxFONTENCODING_MACMALAJALAM
!     wxFONTENCODING_MACSINHALESE
!     wxFONTENCODING_MACBURMESE
!     wxFONTENCODING_MACKHMER
!     wxFONTENCODING_MACTHAI
!     wxFONTENCODING_MACLAOTIAN
!     wxFONTENCODING_MACGEORGIAN
!     wxFONTENCODING_MACARMENIAN
!     wxFONTENCODING_MACCHINESESIMP
!     wxFONTENCODING_MACTIBETAN
!     wxFONTENCODING_MACMONGOLIAN
!     wxFONTENCODING_MACETHIOPIC
!     wxFONTENCODING_MACCENTRALEUR
!     wxFONTENCODING_MACVIATNAMESE
!     wxFONTENCODING_MACARABICEXT
!     wxFONTENCODING_MACSYMBOL
!     wxFONTENCODING_MACDINGBATS
!     wxFONTENCODING_MACTURKISH
!     wxFONTENCODING_MACCROATIAN
!     wxFONTENCODING_MACICELANDIC
!     wxFONTENCODING_MACROMANIAN
!     wxFONTENCODING_MACCELTIC
!     wxFONTENCODING_MACGAELIC
!     wxFONTENCODING_MACKEYBOARD
! 
!     wxFONTENCODING_MAX             // highest enumerated encoding value
! 
!     wxFONTENCODING_MACMIN //= wxFONTENCODING_MACROMAN ,
!     wxFONTENCODING_MACMAX //= wxFONTENCODING_MACKEYBOARD ,
! 
!     // aliases for endian-dependent UTF encodings
!     wxFONTENCODING_UTF16   // native UTF-16
!     wxFONTENCODING_UTF32   // native UTF-32
! 
!     // alias for the native Unicode encoding on this platform
!     // (this is used by wxEncodingConverter and wxUTFFile only for now)
      wxFONTENCODING_UNICODE
! 
!     // alternative names for Far Eastern encodings
!         // Chinese
!     wxFONTENCODING_GB2312  // Simplified Chinese
!     wxFONTENCODING_BIG5    // Traditional Chinese
! 
!         // Japanese (see http://zsigri.tripod.com/fontboard/cjk/jis.html)
!     wxFONTENCODING_SHIFT_JIS // Shift JIS
  %endenum
  
***************
*** 348,354 ****
      bool Ok()
      static void SetDefaultEncoding(wxFontEncoding encoding)
!     void     SetFaceName(const wxString& faceName)
      void     SetFamily(int family)
      void     SetNativeFontInfo(const wxString& info)
      void     SetPointSize(int pointSize)
      void     SetStyle(int style)
--- 447,456 ----
      bool Ok()
      static void SetDefaultEncoding(wxFontEncoding encoding)
!     !%wxchkver_2_8 void SetFaceName(const wxString& faceName)
!     %wxchkver_2_8 bool SetFaceName(const wxString& faceName)
      void     SetFamily(int family)
      void     SetNativeFontInfo(const wxString& info)
+     %wxchkver_2_8 %rename SetNativeFontInfoString bool SetNativeFontInfo(const wxString& info)
+     %wxchkver_2_8 bool SetNativeFontInfoUserDesc(const wxString& info)
      void     SetPointSize(int pointSize)
      void     SetStyle(int style)
***************
*** 365,368 ****
--- 467,517 ----
  %endclass
  
+ //-----------------------------------------------------------------------------
+ // wxNativeFontInfo
+ 
+ %include "wx/fontutil.h"
+ 
+ %class %noclassinfo %encapsulate wxNativeFontInfo
+     wxNativeFontInfo()
+     %constructor wxNativeFontInfoCopy(const wxNativeFontInfo& info)
+ 
+     // accessors and modifiers for the font elements
+     int GetPointSize() const
+     wxSize GetPixelSize() const
+     wxFontStyle GetStyle() const
+     wxFontWeight GetWeight() const
+     bool GetUnderlined() const
+     wxString GetFaceName() const
+     wxFontFamily GetFamily() const
+     wxFontEncoding GetEncoding() const
+ 
+     void SetPointSize(int pointsize)
+     void SetPixelSize(const wxSize& pixelSize)
+     void SetStyle(wxFontStyle style)
+     void SetWeight(wxFontWeight weight)
+     void SetUnderlined(bool underlined)
+     %wxchkver_2_8 bool SetFaceName(const wxString& facename)
+     !%wxchkver_2_8 void SetFaceName(const wxString& facename)
+     void SetFamily(wxFontFamily family)
+     void SetEncoding(wxFontEncoding encoding)
+ 
+     // sets the first facename in the given array which is found
+     // to be valid. If no valid facename is given, sets the
+     // first valid facename returned by wxFontEnumerator::GetFacenames().
+     // Does not return a bool since it cannot fail.
+     %wxchkver_2_8 %rename SetFaceNameFromArray void SetFaceName(const wxArrayString_FromLuaTable& facenames)
+ 
+     // it is important to be able to serialize wxNativeFontInfo objects to be
+     // able to store them (in config file, for example)
+     bool FromString(const wxString& s);
+     wxString ToString() const
+ 
+     // we also want to present the native font descriptions to the user in some
+     // human-readable form (it is not platform independent neither, but can
+     // hopefully be understood by the user)
+     bool FromUserString(const wxString& s)
+     wxString ToUserString() const
+ %endclass
+ 
  %endif //wxLUA_USE_wxFont
  
***************
*** 380,388 ****
      virtual bool EnumerateEncodings( const wxString &font = "" )
  
!     %wxchkver_2_7 static wxArrayString GetEncodings()
!     %wxchkver_2_7 static wxArrayString GetFacenames()
      !%wxchkver_2_7 wxArrayString* GetEncodings()
      !%wxchkver_2_7 wxArrayString* GetFacenames()
  
      %win %property=Encodings, read
      %win %property=Facenames, read
--- 529,541 ----
      virtual bool EnumerateEncodings( const wxString &font = "" )
  
!     %wxchkver_2_7 static wxArrayString GetEncodings(const wxString& facename = "")
!     %wxchkver_2_7 static wxArrayString GetFacenames(wxFontEncoding encoding = wxFONTENCODING_SYSTEM, bool fixedWidthOnly = false)
      !%wxchkver_2_7 wxArrayString* GetEncodings()
      !%wxchkver_2_7 wxArrayString* GetFacenames()
  
+     // Use GetEncodings/Facenames after calling EnumerateXXX
+     //virtual bool OnFacename(const wxString& facename)
+     //virtual bool OnFontEncoding(const wxString& facename, const wxString& encoding)
+ 
      %win %property=Encodings, read
      %win %property=Facenames, read
***************
*** 399,403 ****
      %define %pointer wxTheFontList
  
!     // Only use FindOrCreateFont - deprecated in >2.7
      //void AddFont(wxFont* font)
      wxFont* FindOrCreateFont(int pointSize, int family, int style, int weight, bool underline = false, const wxString &faceName = "", wxFontEncoding encoding = wxFONTENCODING_DEFAULT)
--- 552,556 ----
      %define %pointer wxTheFontList
  
!     // Only use FindOrCreateFont - others deprecated in >2.7
      //void AddFont(wxFont* font)
      wxFont* FindOrCreateFont(int pointSize, int family, int style, int weight, bool underline = false, const wxString &faceName = "", wxFontEncoding encoding = wxFONTENCODING_DEFAULT)
***************
*** 418,425 ****
  
      wxFontEncoding CharsetToEncoding(const wxString &charset, bool interactive = true)
!     static wxFontMapper *Get()
      // %override [bool, wxFontEncoding *altEncoding] GetAltForEncoding(wxFontEncoding encoding, const wxString &faceName = "", bool interactive = true)
      bool GetAltForEncoding(wxFontEncoding encoding, wxFontEncoding *altEncoding, const wxString &faceName = "", bool interactive = true)
      // %rename GetAltForEncodingInternal bool GetAltForEncoding(wxFontEncoding encoding, wxNativeEncodingInfo *info, const wxString &faceName = "", bool interactive = true)
      static wxFontEncoding GetEncoding(size_t n)
      static wxString GetEncodingDescription(wxFontEncoding encoding)
--- 571,579 ----
  
      wxFontEncoding CharsetToEncoding(const wxString &charset, bool interactive = true)
!     %staticonly wxFontMapper *Get()
      // %override [bool, wxFontEncoding *altEncoding] GetAltForEncoding(wxFontEncoding encoding, const wxString &faceName = "", bool interactive = true)
      bool GetAltForEncoding(wxFontEncoding encoding, wxFontEncoding *altEncoding, const wxString &faceName = "", bool interactive = true)
      // %rename GetAltForEncodingInternal bool GetAltForEncoding(wxFontEncoding encoding, wxNativeEncodingInfo *info, const wxString &faceName = "", bool interactive = true)
+     static wxString GetDefaultConfigPath()
      static wxFontEncoding GetEncoding(size_t n)
      static wxString GetEncodingDescription(wxFontEncoding encoding)
***************
*** 428,431 ****
--- 582,586 ----
      static size_t GetSupportedEncodingsCount()
      bool IsEncodingAvailable(wxFontEncoding encoding, const wxString &facename = "")
+     %wxchkver_2_8 static void Reset()
      void SetDialogParent(wxWindow *parent)
      void SetDialogTitle(const wxString &title)
***************
*** 641,644 ****
--- 796,861 ----
  
  %endif //wxLUA_USE_wxBrushList
+ 
+ 
+ //-----------------------------------------------------------------------------
+ // wxStockGDI
+ 
+ %include "wx/gdicmn.h"
+ 
+ %if %wxchkver_2_8
+ 
+ %enum wxStockGDI::Item
+         BRUSH_BLACK
+         BRUSH_BLUE
+         BRUSH_CYAN
+         BRUSH_GREEN
+         BRUSH_GREY
+         BRUSH_LIGHTGREY
+         BRUSH_MEDIUMGREY
+         BRUSH_RED
+         BRUSH_TRANSPARENT
+         BRUSH_WHITE
+         COLOUR_BLACK
+         COLOUR_BLUE
+         COLOUR_CYAN
+         COLOUR_GREEN
+         COLOUR_LIGHTGREY
+         COLOUR_RED
+         COLOUR_WHITE
+         CURSOR_CROSS
+         CURSOR_HOURGLASS
+         CURSOR_STANDARD
+         FONT_ITALIC
+         FONT_NORMAL
+         FONT_SMALL
+         FONT_SWISS
+         PEN_BLACK
+         PEN_BLACKDASHED
+         PEN_CYAN
+         PEN_GREEN
+         PEN_GREY
+         PEN_LIGHTGREY
+         PEN_MEDIUMGREY
+         PEN_RED
+         PEN_TRANSPARENT
+         PEN_WHITE
+         ITEMCOUNT
+ %endenum
+ 
+ %class %noclassinfo %encapsulate wxStockGDI
+     wxStockGDI()
+ 
+     //static void DeleteAll()
+     %staticonly wxStockGDI& instance()
+ 
+     static const wxBrush* GetBrush(wxStockGDI::Item item)
+     static const wxColour* GetColour(wxStockGDI::Item item)
+     static const wxCursor* GetCursor(wxStockGDI::Item item)
+     // Can be overridden by platform-specific derived classes
+     virtual const wxFont* GetFont(wxStockGDI::Item item)
+     static const wxPen* GetPen(wxStockGDI::Item item)
+ %endclass
+ 
+ %endif // %wxchkver_2_8
  %endif //wxLUA_USE_wxColourPenBrush
  
***************
*** 700,703 ****
--- 917,922 ----
  // wxIconBundle
  
+ %include "wx/iconbndl.h"
+ 
  %class %delete %noclassinfo %encapsulate wxIconBundle
      %constructor wxDefaultIconBundle()
***************
*** 714,717 ****
--- 933,958 ----
  %endclass
  
+ //-----------------------------------------------------------------------------
+ // wxIconLocation
+ 
+ %include "wx/iconloc.h"
+ 
+ %class %noclassinfo %encapsulate wxIconLocation
+     // ctor takes the name of the file where the icon is
+     !%msw wxIconLocation(const wxString& filename = "")
+     %msw wxIconLocation(const wxString& file = "", int num = 0)
+ 
+     // returns true if this object is valid/initialized
+     bool IsOk() const
+ 
+     // set/get the icon file name
+     void SetFileName(const wxString& filename)
+     const wxString& GetFileName() const
+ 
+     // set/get the icon index
+     %msw void SetIndex(int num)
+     %msw int GetIndex() const
+ %endclass
+ 
  %endif //wxLUA_USE_wxIcon
  
***************
*** 819,823 ****
      wxCURSOR_DEFAULT
      %mac wxCURSOR_COPY_ARROW
!     // FIXME some missing wxCURSOR_XXX for X11
      wxCURSOR_ARROWWAIT
      wxCURSOR_MAX
--- 1060,1072 ----
      wxCURSOR_DEFAULT
      %mac wxCURSOR_COPY_ARROW
! 
!     %if defined(__X__)
!         // Not yet implemented for Windows
!         wxCURSOR_CROSS_REVERSE,
!         wxCURSOR_DOUBLE_ARROW,
!         wxCURSOR_BASED_ARROW_UP,
!         wxCURSOR_BASED_ARROW_DOWN,
!     %endif // X11
! 
      wxCURSOR_ARROWWAIT
      wxCURSOR_MAX
***************
*** 1293,1296 ****
--- 1542,1547 ----
  %if wxLUA_USE_wxGLCanvas & wxUSE_GLCANVAS
  
+ // FIXME : Need to wrap wxGLApp?
+ 
  %include "wx/glcanvas.h"
  

Index: html.i
===================================================================
RCS file: /cvsroot/wxlua/wxLua/bindings/wxwidgets/html.i,v
retrieving revision 1.14
retrieving revision 1.15
diff -C2 -d -r1.14 -r1.15
*** html.i	9 Mar 2007 00:15:12 -0000	1.14
--- html.i	12 Mar 2007 23:12:31 -0000	1.15
***************
*** 321,325 ****
  %endclass
  
! %endif
  
  //-----------------------------------------------------------------------------
--- 321,352 ----
  %endclass
  
! // ----------------------------------------------------------------------------
! // wxSimpleHtmlListBox - Use this instead of having to override virtual functions in wxHtmlListBox
! 
! %include "wx/htmllbox.h"
! 
! %define wxHLB_DEFAULT_STYLE
! %define wxHLB_MULTIPLE
! 
! %class wxSimpleHtmlListBox, wxHtmlWindowInterface //: public wxHtmlListBox, public wxItemContainer
!     %constructor wxSimpleHtmlListBoxDefault()
!     wxSimpleHtmlListBox(wxWindow *parent, wxWindowID id, const wxPoint& pos, const wxSize& size, const wxArrayString_FromLuaTable& choices, long style = wxHLB_DEFAULT_STYLE, const wxValidator& validator = wxDefaultValidator, const wxString& name = "wxSimpleHtmlListBox")
! 
!     bool Create(wxWindow *parent, wxWindowID id, const wxPoint& pos, const wxSize& size, const wxArrayString_FromLuaTable& choices, long style = wxHLB_DEFAULT_STYLE, const wxValidator& validator = wxDefaultValidator, const wxString& name = "wxSimpleHtmlListBox")
!     void SetSelection(int n)
!     int GetSelection() const
!     virtual unsigned int GetCount() const
!     virtual wxString GetString(unsigned int n) const
!     wxArrayString GetStrings() const
!     virtual void SetString(unsigned int n, const wxString& s)
!     virtual void Clear()
!     virtual void Delete(unsigned int n)
!     %rename AppendStrings void Append(const wxArrayString_FromLuaTable& strings)
!     int Append(const wxString& item)
!     //int Append(const wxString& item, void *clientData)
!     //int Append(const wxString& item, wxClientData *clientData)
! %endclass
! 
! %endif //%wxchkver_2_7
  
  //-----------------------------------------------------------------------------

Index: dialogs.i
===================================================================
RCS file: /cvsroot/wxlua/wxLua/bindings/wxwidgets/dialogs.i,v
retrieving revision 1.25
retrieving revision 1.26
diff -C2 -d -r1.25 -r1.26
*** dialogs.i	9 Mar 2007 00:15:12 -0000	1.25
--- dialogs.i	12 Mar 2007 23:12:31 -0000	1.26
***************
*** 19,22 ****
--- 19,23 ----
  %define wxICON_WARNING
  
+ %if %wxcompat_2_6
  %enum    // for wxFileSelector and wxFileDialog
      wxOPEN
***************
*** 28,31 ****
--- 29,47 ----
      wxCHANGE_DIR
  %endenum
+ %endif //%wxcompat_2_6
+ 
+ %if %wxchkver_2_8
+ %enum
+     wxFD_OPEN
+     wxFD_SAVE
+     wxFD_OVERWRITE_PROMPT
+     wxFD_FILE_MUST_EXIST
+     wxFD_MULTIPLE
+     wxFD_CHANGE_DIR
+     wxFD_PREVIEW
+ 
+     wxFD_DEFAULT_STYLE
+ %endenum
+ %endif //%wxchkver_2_8
  
  //-----------------------------------------------------------------------------
***************
*** 41,45 ****
  wxUSE_COLOURDLG&&!%wxchkver_2_8 %function wxColour wxGetColourFromUser(wxWindow *parent, const wxColour& colInit)
  wxUSE_COLOURDLG&&%wxchkver_2_8 %function wxColour wxGetColourFromUser(wxWindow *parent, const wxColour& colInit, const wxString& caption = "")
! wxUSE_FONTDLG %function wxFont wxGetFontFromUser(wxWindow *parent, const wxFont& fontInit)
  // %override [int, lua int table] wxGetMultipleChoices(const wxString& message, const wxString& caption, lua string table, wxWindow *parent = NULL, int x = -1, int y = -1, bool centre = true, int width=150, int height=200)
  wxUSE_CHOICEDLG %function int wxGetMultipleChoices(const wxString& message, const wxString& caption, int n, const wxString choices[], int nsel, int *selection, wxWindow *parent = NULL, int x = -1, int y = -1, bool centre = true, int width=150, int height=200)
--- 57,62 ----
  wxUSE_COLOURDLG&&!%wxchkver_2_8 %function wxColour wxGetColourFromUser(wxWindow *parent, const wxColour& colInit)
  wxUSE_COLOURDLG&&%wxchkver_2_8 %function wxColour wxGetColourFromUser(wxWindow *parent, const wxColour& colInit, const wxString& caption = "")
! !%wxchkver_2_8&&wxUSE_FONTDLG %function wxFont wxGetFontFromUser(wxWindow *parent, const wxFont& fontInit)
! %wxchkver_2_8&&wxUSE_FONTDLG %function wxFont wxGetFontFromUser(wxWindow *parent = NULL, const wxFont& fontInit = wxNullFont, const wxString& caption = "")
  // %override [int, lua int table] wxGetMultipleChoices(const wxString& message, const wxString& caption, lua string table, wxWindow *parent = NULL, int x = -1, int y = -1, bool centre = true, int width=150, int height=200)
  wxUSE_CHOICEDLG %function int wxGetMultipleChoices(const wxString& message, const wxString& caption, int n, const wxString choices[], int nsel, int *selection, wxWindow *parent = NULL, int x = -1, int y = -1, bool centre = true, int width=150, int height=200)
***************
*** 220,225 ****
  
  %class wxFileDialog, wxDialog
!     wxFileDialog(wxWindow* parent, const wxString& message = "Choose a file", const wxString& defaultDir = "", const wxString& defaultFile = "", const wxString& wildcard = "*.*", long style = 0, const wxPoint& pos = wxDefaultPosition)
  
      wxString GetDirectory() const
      wxString GetFilename() const
--- 237,245 ----
  
  %class wxFileDialog, wxDialog
!     %constructor wxFileDialogDefault()
!     !%wxchkver_2_8 wxFileDialog(wxWindow* parent, const wxString& message = "Choose a file", const wxString& defaultDir = "", const wxString& defaultFile = "", const wxString& wildcard = "*.*", long style = 0, const wxPoint& pos = wxDefaultPosition)
!     %wxchkver_2_8 wxFileDialog(wxWindow *parent, const wxString& message = wxFileSelectorPromptStr, const wxString& defaultDir = "", const wxString& defaultFile = "", const wxString& wildCard = wxFileSelectorDefaultWildcardStr, long style = wxFD_DEFAULT_STYLE, const wxPoint& pos = wxDefaultPosition, const wxSize& sz = wxDefaultSize, const wxString& name = "wxFileDialog")
  
+     %wxchkver_2_8 bool Create(wxWindow *parent, const wxString& message = wxFileSelectorPromptStr, const wxString& defaultDir = "", const wxString& defaultFile = "", const wxString& wildCard = wxFileSelectorDefaultWildcardStr, long style = wxFD_DEFAULT_STYLE, const wxPoint& pos = wxDefaultPosition, const wxSize& sz = wxDefaultSize, const wxString& name = "wxFileDialog")
      wxString GetDirectory() const
      wxString GetFilename() const

Index: controls.i
===================================================================
RCS file: /cvsroot/wxlua/wxLua/bindings/wxwidgets/controls.i,v
retrieving revision 1.30
retrieving revision 1.31
diff -C2 -d -r1.30 -r1.31
*** controls.i	9 Mar 2007 06:10:15 -0000	1.30
--- controls.i	12 Mar 2007 23:12:30 -0000	1.31
***************
*** 240,244 ****
  
  %define wxGA_HORIZONTAL
! %define wxGA_PROGRESSBAR
  %define wxGA_SMOOTH
  %define wxGA_VERTICAL
--- 240,244 ----
  
  %define wxGA_HORIZONTAL
! %wxcompat_2_6 %define wxGA_PROGRESSBAR
  %define wxGA_SMOOTH
  %define wxGA_VERTICAL
***************
*** 254,257 ****
--- 254,258 ----
      int      GetValue() const
      bool     IsVertical() const
+     %wxchkver_2_8 void Pulse()
      void     SetBezelFace(int width)
      void     SetRange(int range)

Index: defsutil.i
===================================================================
RCS file: /cvsroot/wxlua/wxLua/bindings/wxwidgets/defsutil.i,v
retrieving revision 1.33
retrieving revision 1.34
diff -C2 -d -r1.33 -r1.34
*** defsutil.i	9 Mar 2007 00:15:12 -0000	1.33
--- defsutil.i	12 Mar 2007 23:12:31 -0000	1.34
***************
*** 196,205 ****
--- 196,209 ----
  // %override [int x, int y, int width, int height] wxClientDisplayRect()
  %function void wxClientDisplayRect(int *x, int *y, int *width, int *height)
+ %function wxRect wxGetClientDisplayRect()
  %function bool wxColourDisplay()
  %function int wxDisplayDepth()
  // %override [int width, int height] wxDisplaySize()
  %function void wxDisplaySize(int *width, int *height)
+ %function wxSize wxGetDisplaySize()
  // %override [int width, int height] wxDisplaySizeMM()
  %function void wxDisplaySizeMM(int *width, int *height)
+ %function wxSize wxGetDisplaySizeMM()
+ 
  %function void wxSetCursor(const wxCursor &cursor)
  // %function wxIconOrCursor wxDROP_ICON(wxString name)

[Wxlua-commit] wxLua/modules/wxbind/include wxbind.h,1.57,1.58

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

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

Modified Files:
	wxbind.h 
Log Message:
update bindings to wxWidgets 2.8 using headers


Index: wxbind.h
===================================================================
RCS file: /cvsroot/wxlua/wxLua/modules/wxbind/include/wxbind.h,v
retrieving revision 1.57
retrieving revision 1.58
diff -C2 -d -r1.57 -r1.58
*** wxbind.h	9 Mar 2007 06:10:17 -0000	1.57
--- wxbind.h	12 Mar 2007 23:12:34 -0000	1.58
***************
*** 108,111 ****
--- 108,115 ----
  #endif // (wxCHECK_VERSION(2,6,0) && wxUSE_SOUND) && (wxLUA_USE_wxWave)
  
+ #if (wxCHECK_VERSION(2,7,0)) && (wxLUA_USE_wxHTML && wxUSE_HTML)
+     #include "wx/htmllbox.h"
+ #endif // (wxCHECK_VERSION(2,7,0)) && (wxLUA_USE_wxHTML && wxUSE_HTML)
+ 
  #if (wxCHECK_VERSION(2,8,0)) && (wxLUA_USE_wxClipboard && wxUSE_CLIPBOARD)
      #include "wx/event.h"
***************
*** 365,368 ****
--- 369,373 ----
  #if wxLUA_USE_wxFont
      #include "wx/font.h"
+     #include "wx/fontutil.h"
  #endif // wxLUA_USE_wxFont
  
***************
*** 412,415 ****
--- 417,425 ----
  #endif // wxLUA_USE_wxHelpController && wxUSE_HELP
  
+ #if wxLUA_USE_wxIcon
+     #include "wx/iconbndl.h"
+     #include "wx/iconloc.h"
+ #endif // wxLUA_USE_wxIcon
+ 
  #if wxLUA_USE_wxImage && wxUSE_IMAGE
      #include "wx/imagbmp.h"
***************
*** 695,698 ****
--- 705,709 ----
  #if (wxCHECK_VERSION(2,7,0)) && (wxLUA_USE_wxHTML && wxUSE_HTML)
      extern WXDLLIMPEXP_DATA_WXBIND(int) s_wxluatag_wxHtmlWindowInterface;
+     extern WXDLLIMPEXP_DATA_WXBIND(int) s_wxluatag_wxSimpleHtmlListBox;
  #endif // (wxCHECK_VERSION(2,7,0)) && (wxLUA_USE_wxHTML && wxUSE_HTML)
  
***************
*** 701,704 ****
--- 712,719 ----
  #endif // (wxCHECK_VERSION(2,8,0)) && (wxLUA_USE_wxClipboard && wxUSE_CLIPBOARD)
  
+ #if (wxCHECK_VERSION(2,8,0)) && (wxLUA_USE_wxColourPenBrush)
+     extern WXDLLIMPEXP_DATA_WXBIND(int) s_wxluatag_wxStockGDI;
+ #endif // (wxCHECK_VERSION(2,8,0)) && (wxLUA_USE_wxColourPenBrush)
+ 
  #if (wxCHECK_VERSION(2,8,0)) && (wxLUA_USE_wxDC)
      extern WXDLLIMPEXP_DATA_WXBIND(int) s_wxluatag_wxAutoBufferedPaintDC;
***************
*** 851,854 ****
--- 866,870 ----
  extern WXDLLIMPEXP_DATA_WXBIND(int) s_wxluatag_wxPaletteChangedEvent;
  extern WXDLLIMPEXP_DATA_WXBIND(int) s_wxluatag_wxPanel;
+ extern WXDLLIMPEXP_DATA_WXBIND(int) s_wxluatag_wxPathList;
  extern WXDLLIMPEXP_DATA_WXBIND(int) s_wxluatag_wxProcessEvent;
  extern WXDLLIMPEXP_DATA_WXBIND(int) s_wxluatag_wxPropagateOnce;
***************
*** 1080,1083 ****
--- 1096,1100 ----
  #if wxLUA_USE_wxFile && wxUSE_FILE
      extern WXDLLIMPEXP_DATA_WXBIND(int) s_wxluatag_wxFile;
+     extern WXDLLIMPEXP_DATA_WXBIND(int) s_wxluatag_wxTempFile;
  #endif // wxLUA_USE_wxFile && wxUSE_FILE
  
***************
*** 1096,1099 ****
--- 1113,1117 ----
  #if wxLUA_USE_wxFont
      extern WXDLLIMPEXP_DATA_WXBIND(int) s_wxluatag_wxFont;
+     extern WXDLLIMPEXP_DATA_WXBIND(int) s_wxluatag_wxNativeFontInfo;
  #endif // wxLUA_USE_wxFont
  
***************
*** 1187,1190 ****
--- 1205,1209 ----
      extern WXDLLIMPEXP_DATA_WXBIND(int) s_wxluatag_wxIcon;
      extern WXDLLIMPEXP_DATA_WXBIND(int) s_wxluatag_wxIconBundle;
+     extern WXDLLIMPEXP_DATA_WXBIND(int) s_wxluatag_wxIconLocation;
  #endif // wxLUA_USE_wxIcon
  
***************
*** 1581,1584 ****
--- 1600,1605 ----
      extern WXDLLIMPEXP_WXBIND WXLUAMETHOD wxHtmlWindowInterface_methods[];
      extern WXDLLIMPEXP_DATA_WXBIND(int) wxHtmlWindowInterface_methodCount;
+     extern WXDLLIMPEXP_WXBIND WXLUAMETHOD wxSimpleHtmlListBox_methods[];
+     extern WXDLLIMPEXP_DATA_WXBIND(int) wxSimpleHtmlListBox_methodCount;
  #endif // (wxCHECK_VERSION(2,7,0)) && (wxLUA_USE_wxHTML && wxUSE_HTML)
  
***************
*** 1588,1591 ****
--- 1609,1617 ----
  #endif // (wxCHECK_VERSION(2,8,0)) && (wxLUA_USE_wxClipboard && wxUSE_CLIPBOARD)
  
+ #if (wxCHECK_VERSION(2,8,0)) && (wxLUA_USE_wxColourPenBrush)
+     extern WXDLLIMPEXP_WXBIND WXLUAMETHOD wxStockGDI_methods[];
+     extern WXDLLIMPEXP_DATA_WXBIND(int) wxStockGDI_methodCount;
+ #endif // (wxCHECK_VERSION(2,8,0)) && (wxLUA_USE_wxColourPenBrush)
+ 
  #if (wxCHECK_VERSION(2,8,0)) && (wxLUA_USE_wxDC)
      extern WXDLLIMPEXP_WXBIND WXLUAMETHOD wxAutoBufferedPaintDC_methods[];
***************
*** 1801,1804 ****
--- 1827,1832 ----
  extern WXDLLIMPEXP_WXBIND WXLUAMETHOD wxPanel_methods[];
  extern WXDLLIMPEXP_DATA_WXBIND(int) wxPanel_methodCount;
+ extern WXDLLIMPEXP_WXBIND WXLUAMETHOD wxPathList_methods[];
+ extern WXDLLIMPEXP_DATA_WXBIND(int) wxPathList_methodCount;
  extern WXDLLIMPEXP_WXBIND WXLUAMETHOD wxProcessEvent_methods[];
  extern WXDLLIMPEXP_DATA_WXBIND(int) wxProcessEvent_methodCount;
***************
*** 2137,2140 ****
--- 2165,2170 ----
      extern WXDLLIMPEXP_WXBIND WXLUAMETHOD wxFile_methods[];
      extern WXDLLIMPEXP_DATA_WXBIND(int) wxFile_methodCount;
+     extern WXDLLIMPEXP_WXBIND WXLUAMETHOD wxTempFile_methods[];
+     extern WXDLLIMPEXP_DATA_WXBIND(int) wxTempFile_methodCount;
  #endif // wxLUA_USE_wxFile && wxUSE_FILE
  
***************
*** 2157,2160 ****
--- 2187,2192 ----
      extern WXDLLIMPEXP_WXBIND WXLUAMETHOD wxFont_methods[];
      extern WXDLLIMPEXP_DATA_WXBIND(int) wxFont_methodCount;
+     extern WXDLLIMPEXP_WXBIND WXLUAMETHOD wxNativeFontInfo_methods[];
+     extern WXDLLIMPEXP_DATA_WXBIND(int) wxNativeFontInfo_methodCount;
  #endif // wxLUA_USE_wxFont
  
***************
*** 2303,2306 ****
--- 2335,2340 ----
      extern WXDLLIMPEXP_WXBIND WXLUAMETHOD wxIconBundle_methods[];
      extern WXDLLIMPEXP_DATA_WXBIND(int) wxIconBundle_methodCount;
+     extern WXDLLIMPEXP_WXBIND WXLUAMETHOD wxIconLocation_methods[];
+     extern WXDLLIMPEXP_DATA_WXBIND(int) wxIconLocation_methodCount;
  #endif // wxLUA_USE_wxIcon
  
***************
*** 2797,2804 ****
--- 2831,2843 ----
  // ---------------------------------------------------------------------------
  
+ #if (wxCHECK_VERSION(2,8,0)) && (wxLUA_USE_wxColourPenBrush)
+     wxLUA_DECLARE_ENCAPSULATION(WXDLLIMPEXP_WXBIND, wxStockGDI, wxStockGDI)
+ #endif // (wxCHECK_VERSION(2,8,0)) && (wxLUA_USE_wxColourPenBrush)
+ 
  #if (wxCHECK_VERSION(2,8,0)) && (wxLUA_USE_wxDataObject && wxUSE_DATAOBJ)
      wxLUA_DECLARE_ENCAPSULATION(WXDLLIMPEXP_WXBIND, wxURLDataObject, wxURLDataObject)
  #endif // (wxCHECK_VERSION(2,8,0)) && (wxLUA_USE_wxDataObject && wxUSE_DATAOBJ)
  
+ wxLUA_DECLARE_ENCAPSULATION(WXDLLIMPEXP_WXBIND, wxPathList, wxPathList)
  wxLUA_DECLARE_ENCAPSULATION(WXDLLIMPEXP_WXBIND, wxPropagateOnce, wxPropagateOnce)
  wxLUA_DECLARE_ENCAPSULATION(WXDLLIMPEXP_WXBIND, wxPropagationDisabler, wxPropagationDisabler)
***************
*** 2906,2909 ****
--- 2945,2949 ----
  #if wxLUA_USE_wxFile && wxUSE_FILE
      wxLUA_DECLARE_ENCAPSULATION(WXDLLIMPEXP_WXBIND, wxFile, wxFile)
+     wxLUA_DECLARE_ENCAPSULATION(WXDLLIMPEXP_WXBIND, wxTempFile, wxTempFile)
  #endif // wxLUA_USE_wxFile && wxUSE_FILE
  
***************
*** 2912,2915 ****
--- 2952,2959 ----
  #endif // wxLUA_USE_wxFileName
  
+ #if wxLUA_USE_wxFont
+     wxLUA_DECLARE_ENCAPSULATION(WXDLLIMPEXP_WXBIND, wxNativeFontInfo, wxNativeFontInfo)
+ #endif // wxLUA_USE_wxFont
+ 
  #if wxLUA_USE_wxFontEnumerator
      wxLUA_DECLARE_ENCAPSULATION(WXDLLIMPEXP_WXBIND, wxFontEnumerator, wxFontEnumerator)
***************
*** 2928,2931 ****
--- 2972,2976 ----
  #if wxLUA_USE_wxIcon
      wxLUA_DECLARE_ENCAPSULATION(WXDLLIMPEXP_WXBIND, wxIconBundle, wxIconBundle)
+     wxLUA_DECLARE_ENCAPSULATION(WXDLLIMPEXP_WXBIND, wxIconLocation, wxIconLocation)
  #endif // wxLUA_USE_wxIcon
  

[Wxlua-commit] wxLua/modules/wxbind/src controls.cpp, 1.46, 1.47 dialogs.cpp, 1.30, 1.31 file.cpp, 1.35, 1.36 gdi.cpp, 1.51, 1.52 help.cpp, 1.25, 1.26 html.cpp, 1.30, 1.31 wx_bind.cpp, 1.84, 1.85

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

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

Modified Files:
	controls.cpp dialogs.cpp file.cpp gdi.cpp help.cpp html.cpp 
	wx_bind.cpp 
Log Message:
update bindings to wxWidgets 2.8 using headers


Index: controls.cpp
===================================================================
RCS file: /cvsroot/wxlua/wxLua/modules/wxbind/src/controls.cpp,v
retrieving revision 1.46
retrieving revision 1.47
diff -C2 -d -r1.46 -r1.47
*** controls.cpp	9 Mar 2007 06:10:17 -0000	1.46
--- controls.cpp	12 Mar 2007 23:12:34 -0000	1.47
***************
*** 1988,1991 ****
--- 1988,2007 ----
  #endif // ((wxLUA_USE_wxValidator && wxUSE_VALIDATORS) && (wxLUA_USE_wxPointSizeRect)) && (wxLUA_USE_wxGauge && wxUSE_GAUGE)
  
+ 
+ #if (wxCHECK_VERSION(2,8,0)) && (wxLUA_USE_wxGauge && wxUSE_GAUGE)
+ //     %wxchkver_2_8 void Pulse()
+ static int LUACALL wxLua_wxGauge_Pulse(lua_State *L)
+ {
+     wxLuaState wxlState(L);
+     // get this
+     wxGauge * self = (wxGauge *)wxlState.GetUserDataType(1, s_wxluatag_wxGauge);
+     // call Pulse
+     self->Pulse();
+ 
+     return 0;
+ }
+ 
+ #endif // (wxCHECK_VERSION(2,8,0)) && (wxLUA_USE_wxGauge && wxUSE_GAUGE)
+ 
  //     %constructor wxGaugeDefault()
  static int LUACALL wxLua_wxGaugeDefault_constructor(lua_State *L)
***************
*** 2154,2157 ****
--- 2170,2178 ----
  #endif  // ((wxLUA_USE_wxValidator && wxUSE_VALIDATORS) && (wxLUA_USE_wxPointSizeRect)) && (wxLUA_USE_wxGauge && wxUSE_GAUGE)
  
+ 
+ #if (wxCHECK_VERSION(2,8,0)) && (wxLUA_USE_wxGauge && wxUSE_GAUGE)
+     { LuaMethod, "Pulse", wxLua_wxGauge_Pulse, 0, 0, s_wxluaargArray_None },
+ #endif  // (wxCHECK_VERSION(2,8,0)) && (wxLUA_USE_wxGauge && wxUSE_GAUGE)
+ 
      { LuaConstructor, "wxGaugeDefault", wxLua_wxGaugeDefault_constructor, 0, 0, s_wxluaargArray_None },
      { LuaMethod, "GetBezelFace", wxLua_wxGauge_GetBezelFace, 0, 0, s_wxluaargArray_None },

Index: file.cpp
===================================================================
RCS file: /cvsroot/wxlua/wxLua/modules/wxbind/src/file.cpp,v
retrieving revision 1.35
retrieving revision 1.36
diff -C2 -d -r1.35 -r1.36
*** file.cpp	9 Mar 2007 00:15:15 -0000	1.35
--- file.cpp	12 Mar 2007 23:12:35 -0000	1.36
***************
*** 26,29 ****
--- 26,243 ----
  
  
+ // ---------------------------------------------------------------------------
+ // Bind class wxPathList
+ // ---------------------------------------------------------------------------
+ 
+ // Lua MetaTable Tag for Class 'wxPathList'
+ int s_wxluatag_wxPathList = -1;
+ 
+ 
+ #if !wxCHECK_VERSION(2,8,0)
+ static wxLuaArgTag s_wxluatagArray_wxLua_wxPathList_Add[] = { &s_wxluaarg_String, 0 };
+ //     !%wxchkver_2_8 void Add(const wxString& path)
+ static int LUACALL wxLua_wxPathList_Add(lua_State *L)
+ {
+     wxLuaState wxlState(L);
+     // const wxString path
+     const wxString path = wxlState.GetwxStringType(2);
+     // get this
+     wxPathList * self = (wxPathList *)wxlState.GetUserDataType(1, s_wxluatag_wxPathList);
+     // call Add
+     self->Add(path);
+ 
+     return 0;
+ }
+ 
+ static wxLuaArgTag s_wxluatagArray_wxLua_wxPathList_EnsureFileAccessible[] = { &s_wxluaarg_String, 0 };
+ //     !%wxchkver_2_8 void EnsureFileAccessible(const wxString& path)
+ static int LUACALL wxLua_wxPathList_EnsureFileAccessible(lua_State *L)
+ {
+     wxLuaState wxlState(L);
+     // const wxString path
+     const wxString path = wxlState.GetwxStringType(2);
+     // get this
+     wxPathList * self = (wxPathList *)wxlState.GetUserDataType(1, s_wxluatag_wxPathList);
+     // call EnsureFileAccessible
+     self->EnsureFileAccessible(path);
+ 
+     return 0;
+ }
+ 
+ #endif // !wxCHECK_VERSION(2,8,0)
+ 
+ //     wxPathList()
+ static int LUACALL wxLua_wxPathList_constructor(lua_State *L)
+ {
+     wxLuaState wxlState(L);
+     wxPathList *returns;
+     // call constructor
+     returns = new wxPathList();
+     // add to tracked memory list
+     wxLua_AddTrackedObject(wxlState, (wxPathList *)returns);
+     // push the constructed class pointer
+     wxlState.PushUserDataType(s_wxluatag_wxPathList, returns);
+ 
+     return 1;
+ }
+ 
+ static wxLuaArgTag s_wxluatagArray_wxLua_wxPathList_AddEnvList[] = { &s_wxluaarg_String, 0 };
+ //     void AddEnvList(const wxString& envVariable)
+ static int LUACALL wxLua_wxPathList_AddEnvList(lua_State *L)
+ {
+     wxLuaState wxlState(L);
+     // const wxString envVariable
+     const wxString envVariable = wxlState.GetwxStringType(2);
+     // get this
+     wxPathList * self = (wxPathList *)wxlState.GetUserDataType(1, s_wxluatag_wxPathList);
+     // call AddEnvList
+     self->AddEnvList(envVariable);
+ 
+     return 0;
+ }
+ 
+ static wxLuaArgTag s_wxluatagArray_wxLua_wxPathList_FindValidPath[] = { &s_wxluaarg_String, 0 };
+ //     wxString FindValidPath(const wxString& filename) const
+ static int LUACALL wxLua_wxPathList_FindValidPath(lua_State *L)
+ {
+     wxLuaState wxlState(L);
+     wxString returns;
+     // const wxString filename
+     const wxString filename = wxlState.GetwxStringType(2);
+     // get this
+     wxPathList * self = (wxPathList *)wxlState.GetUserDataType(1, s_wxluatag_wxPathList);
+     // call FindValidPath
+     returns = self->FindValidPath(filename);
+     // push the result string
+     wxlState.lua_PushString(returns);
+ 
+     return 1;
+ }
+ 
+ static wxLuaArgTag s_wxluatagArray_wxLua_wxPathList_FindAbsoluteValidPath[] = { &s_wxluaarg_String, 0 };
+ //     wxString FindAbsoluteValidPath(const wxString& filename) const
+ static int LUACALL wxLua_wxPathList_FindAbsoluteValidPath(lua_State *L)
+ {
+     wxLuaState wxlState(L);
+     wxString returns;
+     // const wxString filename
+     const wxString filename = wxlState.GetwxStringType(2);
+     // get this
+     wxPathList * self = (wxPathList *)wxlState.GetUserDataType(1, s_wxluatag_wxPathList);
+     // call FindAbsoluteValidPath
+     returns = self->FindAbsoluteValidPath(filename);
+     // push the result string
+     wxlState.lua_PushString(returns);
+ 
+     return 1;
+ }
+ 
+ static int LUACALL wxLua_wxPathList_destructor(lua_State *L)
+ {
+     wxLuaState wxlState(L);
+     wxPathList * self = (wxPathList *)wxlState.GetUserDataType(1, s_wxluatag_wxPathList);
+ 
+     // remove from tracked memory list
+     if (self != 0)
+         wxlState.RemoveTrackedObject(self);
+     return 0;
+ }
+ 
+ static int LUACALL wxLua_wxPathList_Delete(lua_State *L)
+ {
+     wxLuaState wxlState(L);
+     wxPathList * self = (wxPathList *)wxlState.GetUserDataType(1, s_wxluatag_wxPathList);
+     // remove from tracked memory list
+     if (self != 0)
+         if (wxlState.RemoveTrackedObject(self))
+         {   // if removed, reset the tag so that gc() is not called on this object.
+             lua_pushnil(L);
+             lua_setmetatable(L, -2);
+         }
+     return 0;
+ }
+ 
+ 
+ #if wxCHECK_VERSION(2,8,0)
+ static wxLuaArgTag s_wxluatagArray_wxLua_wxPathList_Add[] = { &s_wxluaarg_String, 0 };
+ //     %wxchkver_2_8 bool Add(const wxString& path)
+ static int LUACALL wxLua_wxPathList_Add(lua_State *L)
+ {
+     wxLuaState wxlState(L);
+     bool returns;
+     // const wxString path
+     const wxString path = wxlState.GetwxStringType(2);
+     // get this
+     wxPathList * self = (wxPathList *)wxlState.GetUserDataType(1, s_wxluatag_wxPathList);
+     // call Add
+     returns = self->Add(path);
+     // push the result flag
+     lua_pushboolean(L, returns);
+ 
+     return 1;
+ }
+ 
+ static wxLuaArgTag s_wxluatagArray_wxLua_wxPathList_AddArray[] = { &s_wxluaarg_LuaTable, 0 };
+ //     %wxchkver_2_8 %rename AddArray void Add(const wxArrayString_FromLuaTable& paths)
+ static int LUACALL wxLua_wxPathList_AddArray(lua_State *L)
+ {
+     wxLuaState wxlState(L);
+     // const wxArrayString_FromLuaTable paths
+     wxArrayString  paths = wxArrayString(); wxlState.GetwxArrayString(2, paths);
+     // get this
+     wxPathList * self = (wxPathList *)wxlState.GetUserDataType(1, s_wxluatag_wxPathList);
+     // call Add
+     self->Add(paths);
+ 
+     return 0;
+ }
+ 
+ static wxLuaArgTag s_wxluatagArray_wxLua_wxPathList_EnsureFileAccessible[] = { &s_wxluaarg_String, 0 };
+ //     %wxchkver_2_8 bool EnsureFileAccessible(const wxString& path)
+ static int LUACALL wxLua_wxPathList_EnsureFileAccessible(lua_State *L)
+ {
+     wxLuaState wxlState(L);
+     bool returns;
+     // const wxString path
+     const wxString path = wxlState.GetwxStringType(2);
+     // get this
+     wxPathList * self = (wxPathList *)wxlState.GetUserDataType(1, s_wxluatag_wxPathList);
+     // call EnsureFileAccessible
+     returns = self->EnsureFileAccessible(path);
+     // push the result flag
+     lua_pushboolean(L, returns);
+ 
+     return 1;
+ }
+ 
+ #endif // wxCHECK_VERSION(2,8,0)
+ 
+ 
+ 
+ // Map Lua Class Methods to C Binding Functions
+ WXLUAMETHOD wxPathList_methods[] = {
+ 
+ #if !wxCHECK_VERSION(2,8,0)
+     { LuaMethod, "Add", wxLua_wxPathList_Add, 1, 1, s_wxluatagArray_wxLua_wxPathList_Add },
+     { LuaMethod, "EnsureFileAccessible", wxLua_wxPathList_EnsureFileAccessible, 1, 1, s_wxluatagArray_wxLua_wxPathList_EnsureFileAccessible },
+ #endif  // !wxCHECK_VERSION(2,8,0)
+ 
+     { LuaConstructor, "wxPathList", wxLua_wxPathList_constructor, 0, 0, s_wxluaargArray_None },
+     { LuaMethod, "AddEnvList", wxLua_wxPathList_AddEnvList, 1, 1, s_wxluatagArray_wxLua_wxPathList_AddEnvList },
+     { LuaMethod, "FindValidPath", wxLua_wxPathList_FindValidPath, 1, 1, s_wxluatagArray_wxLua_wxPathList_FindValidPath },
+     { LuaMethod, "FindAbsoluteValidPath", wxLua_wxPathList_FindAbsoluteValidPath, 1, 1, s_wxluatagArray_wxLua_wxPathList_FindAbsoluteValidPath },
+     { LuaDelete, "wxPathList", wxLua_wxPathList_destructor, 0, 0, s_wxluaargArray_None },
+     { LuaMethod, "Delete", wxLua_wxPathList_Delete, 0, 0, s_wxluaargArray_None },
+ 
+ #if wxCHECK_VERSION(2,8,0)
+     { LuaMethod, "Add", wxLua_wxPathList_Add, 1, 1, s_wxluatagArray_wxLua_wxPathList_Add },
+     { LuaMethod, "AddArray", wxLua_wxPathList_AddArray, 1, 1, s_wxluatagArray_wxLua_wxPathList_AddArray },
+     { LuaMethod, "EnsureFileAccessible", wxLua_wxPathList_EnsureFileAccessible, 1, 1, s_wxluatagArray_wxLua_wxPathList_EnsureFileAccessible },
+ #endif  // wxCHECK_VERSION(2,8,0)
+ 
+ };
+ 
+ int wxPathList_methodCount = sizeof(wxPathList_methods)/sizeof(wxPathList_methods[0]);
+ 
  
  #if wxLUA_USE_wxFileName
***************
*** 36,39 ****
--- 250,396 ----
  
  
+ #if ((!wxCHECK_VERSION(2,8,0)) && (wxLUA_USE_wxFileName)) && (wxLUA_USE_wxFile && wxUSE_FILE)
+ static wxLuaArgTag s_wxluatagArray_wxLua_wxFileName_AssignTempFileName[] = { &s_wxluaarg_String, &s_wxluatag_wxFile, 0 };
+ //     !%wxchkver_2_8 void AssignTempFileName(const wxString& prefix, wxFile *fileTemp = NULL)
+ static int LUACALL wxLua_wxFileName_AssignTempFileName(lua_State *L)
+ {
+     wxLuaState wxlState(L);
+     // get number of arguments
+     int argCount = lua_gettop(L);
+     // wxFile fileTemp = NULL
+     wxFile * fileTemp = (argCount >= 3 ? (wxFile *)wxlState.GetUserDataType(3, s_wxluatag_wxFile) : NULL);
+     // const wxString prefix
+     const wxString prefix = wxlState.GetwxStringType(2);
+     // get this
+     wxFileName * self = (wxFileName *)wxlState.GetUserDataType(1, s_wxluatag_wxFileName);
+     // call AssignTempFileName
+     self->AssignTempFileName(prefix, fileTemp);
+ 
+     return 0;
+ }
+ 
+ #endif // ((!wxCHECK_VERSION(2,8,0)) && (wxLUA_USE_wxFileName)) && (wxLUA_USE_wxFile && wxUSE_FILE)
+ 
+ 
+ #if (wxCHECK_VERSION(2,8,0) && (wxUSE_FILE || wxUSE_FFILE )) && (wxLUA_USE_wxFileName)
+ static wxLuaArgTag s_wxluatagArray_wxLua_wxFileName_AssignTempFileNameGetName[] = { &s_wxluaarg_String, 0 };
+ //     %wxchkver_2_8&&(wxUSE_FILE||wxUSE_FFILE) %rename AssignTempFileNameGetName void AssignTempFileName(const wxString& prefix)
+ static int LUACALL wxLua_wxFileName_AssignTempFileNameGetName(lua_State *L)
+ {
+     wxLuaState wxlState(L);
+     // const wxString prefix
+     const wxString prefix = wxlState.GetwxStringType(2);
+     // get this
+     wxFileName * self = (wxFileName *)wxlState.GetUserDataType(1, s_wxluatag_wxFileName);
+     // call AssignTempFileName
+     self->AssignTempFileName(prefix);
+ 
+     return 0;
+ }
+ 
+ #endif // (wxCHECK_VERSION(2,8,0) && (wxUSE_FILE || wxUSE_FFILE )) && (wxLUA_USE_wxFileName)
+ 
+ 
+ #if (wxCHECK_VERSION(2,8,0)) && (wxLUA_USE_wxFileName)
+ static wxLuaArgTag s_wxluatagArray_wxLua_wxFileName_GetHumanReadableSize[] = { &s_wxluaarg_String, &s_wxluaarg_Number, 0 };
+ //     %wxchkver_2_8 wxString GetHumanReadableSize(const wxString &nullsize = "Not available", int precision = 1) const
+ static int LUACALL wxLua_wxFileName_GetHumanReadableSize(lua_State *L)
+ {
+     wxLuaState wxlState(L);
+     wxString returns;
+     // get number of arguments
+     int argCount = lua_gettop(L);
+     // int precision = 1
+     int precision = (argCount >= 3 ? (int)wxlState.GetNumberType(3) : 1);
+     // const wxString nullsize = "Not available"
+     const wxString nullsize = (argCount >= 2 ? wxlState.GetwxStringType(2) : wxString(wxT("Not available")));
+     // get this
+     wxFileName * self = (wxFileName *)wxlState.GetUserDataType(1, s_wxluatag_wxFileName);
+     // call GetHumanReadableSize
+     returns = self->GetHumanReadableSize(nullsize, precision);
+     // push the result string
+     wxlState.lua_PushString(returns);
+ 
+     return 1;
+ }
+ 
+ //     %wxchkver_2_8 bool IsDirWritable() const
+ static int LUACALL wxLua_wxFileName_IsDirWritable(lua_State *L)
+ {
+     wxLuaState wxlState(L);
+     bool returns;
+     // get this
+     wxFileName * self = (wxFileName *)wxlState.GetUserDataType(1, s_wxluatag_wxFileName);
+     // call IsDirWritable
+     returns = self->IsDirWritable();
+     // push the result flag
+     lua_pushboolean(L, returns);
+ 
+     return 1;
+ }
+ 
+ //     %wxchkver_2_8 bool IsDirReadable() const
+ static int LUACALL wxLua_wxFileName_IsDirReadable(lua_State *L)
+ {
+     wxLuaState wxlState(L);
+     bool returns;
+     // get this
+     wxFileName * self = (wxFileName *)wxlState.GetUserDataType(1, s_wxluatag_wxFileName);
+     // call IsDirReadable
+     returns = self->IsDirReadable();
+     // push the result flag
+     lua_pushboolean(L, returns);
+ 
+     return 1;
+ }
+ 
+ //     %wxchkver_2_8 bool IsFileWritable() const
+ static int LUACALL wxLua_wxFileName_IsFileWritable(lua_State *L)
+ {
+     wxLuaState wxlState(L);
+     bool returns;
+     // get this
+     wxFileName * self = (wxFileName *)wxlState.GetUserDataType(1, s_wxluatag_wxFileName);
+     // call IsFileWritable
+     returns = self->IsFileWritable();
+     // push the result flag
+     lua_pushboolean(L, returns);
+ 
+     return 1;
+ }
+ 
+ //     %wxchkver_2_8 bool IsFileReadable() const
+ static int LUACALL wxLua_wxFileName_IsFileReadable(lua_State *L)
+ {
+     wxLuaState wxlState(L);
+     bool returns;
+     // get this
+     wxFileName * self = (wxFileName *)wxlState.GetUserDataType(1, s_wxluatag_wxFileName);
+     // call IsFileReadable
+     returns = self->IsFileReadable();
+     // push the result flag
+     lua_pushboolean(L, returns);
+ 
+     return 1;
+ }
+ 
+ //     %wxchkver_2_8 bool IsFileExecutable() const
+ static int LUACALL wxLua_wxFileName_IsFileExecutable(lua_State *L)
+ {
+     wxLuaState wxlState(L);
+     bool returns;
+     // get this
+     wxFileName * self = (wxFileName *)wxlState.GetUserDataType(1, s_wxluatag_wxFileName);
+     // call IsFileExecutable
+     returns = self->IsFileExecutable();
+     // push the result flag
+     lua_pushboolean(L, returns);
+ 
+     return 1;
+ }
+ 
+ #endif // (wxCHECK_VERSION(2,8,0)) && (wxLUA_USE_wxFileName)
+ 
+ 
  #if (wxLUA_USE_wxArrayString) && (wxLUA_USE_wxFileName)
  // %override wxLua_wxFileName_GetDirs
***************
*** 128,141 ****
  
  
! #if (wxLUA_USE_wxFile && wxUSE_FILE) && (wxLUA_USE_wxFileName)
  static wxLuaArgTag s_wxluatagArray_wxLua_wxFileName_AssignTempFileName[] = { &s_wxluaarg_String, &s_wxluatag_wxFile, 0 };
! //     void AssignTempFileName(const wxString& prefix, wxFile *fileTemp = NULL)
  static int LUACALL wxLua_wxFileName_AssignTempFileName(lua_State *L)
  {
      wxLuaState wxlState(L);
!     // get number of arguments
!     int argCount = lua_gettop(L);
!     // wxFile fileTemp = NULL
!     wxFile * fileTemp = (argCount >= 3 ? (wxFile *)wxlState.GetUserDataType(3, s_wxluatag_wxFile) : NULL);
      // const wxString prefix
      const wxString prefix = wxlState.GetwxStringType(2);
--- 485,496 ----
  
  
! #if (wxLUA_USE_wxFile && wxUSE_FILE) && ((wxCHECK_VERSION(2,8,0) && wxUSE_FILE) && (wxLUA_USE_wxFileName))
  static wxLuaArgTag s_wxluatagArray_wxLua_wxFileName_AssignTempFileName[] = { &s_wxluaarg_String, &s_wxluatag_wxFile, 0 };
! //     %wxchkver_2_8&&wxUSE_FILE void AssignTempFileName(const wxString& prefix, wxFile *fileTemp)
  static int LUACALL wxLua_wxFileName_AssignTempFileName(lua_State *L)
  {
      wxLuaState wxlState(L);
!     // wxFile fileTemp
!     wxFile * fileTemp = (wxFile *)wxlState.GetUserDataType(3, s_wxluatag_wxFile);
      // const wxString prefix
      const wxString prefix = wxlState.GetwxStringType(2);
***************
*** 148,172 ****
  }
  
! static wxLuaArgTag s_wxluatagArray_wxLua_wxFileName_CreateTempFileName[] = { &s_wxluaarg_String, &s_wxluatag_wxFile, 0 };
! //     static wxString CreateTempFileName(const wxString& prefix, wxFile *fileTemp = NULL)
! static int LUACALL wxLua_wxFileName_CreateTempFileName(lua_State *L)
! {
!     wxLuaState wxlState(L);
!     wxString returns;
!     // get number of arguments
!     int argCount = lua_gettop(L);
!     // wxFile fileTemp = NULL
!     wxFile * fileTemp = (argCount >= 3 ? (wxFile *)wxlState.GetUserDataType(3, s_wxluatag_wxFile) : NULL);
!     // const wxString prefix
!     const wxString prefix = wxlState.GetwxStringType(2);
!     // call CreateTempFileName
!     returns = wxFileName::CreateTempFileName(prefix, fileTemp);
!     // push the result string
!     wxlState.lua_PushString(returns);
! 
!     return 1;
! }
! 
! #endif // (wxLUA_USE_wxFile && wxUSE_FILE) && (wxLUA_USE_wxFileName)
  
  //     %constructor wxFileNameDefault()
--- 503,507 ----
  }
  
! #endif // (wxLUA_USE_wxFile && wxUSE_FILE) && ((wxCHECK_VERSION(2,8,0) && wxUSE_FILE) && (wxLUA_USE_wxFileName))
  
  //     %constructor wxFileNameDefault()
***************
*** 1500,1503 ****
--- 1835,1858 ----
  WXLUAMETHOD wxFileName_methods[] = {
  
+ #if ((!wxCHECK_VERSION(2,8,0)) && (wxLUA_USE_wxFileName)) && (wxLUA_USE_wxFile && wxUSE_FILE)
+     { LuaMethod, "AssignTempFileName", wxLua_wxFileName_AssignTempFileName, 2, 1, s_wxluatagArray_wxLua_wxFileName_AssignTempFileName },
+ #endif  // ((!wxCHECK_VERSION(2,8,0)) && (wxLUA_USE_wxFileName)) && (wxLUA_USE_wxFile && wxUSE_FILE)
+ 
+ 
+ #if (wxCHECK_VERSION(2,8,0) && (wxUSE_FILE || wxUSE_FFILE )) && (wxLUA_USE_wxFileName)
+     { LuaMethod, "AssignTempFileNameGetName", wxLua_wxFileName_AssignTempFileNameGetName, 1, 1, s_wxluatagArray_wxLua_wxFileName_AssignTempFileNameGetName },
+ #endif  // (wxCHECK_VERSION(2,8,0) && (wxUSE_FILE || wxUSE_FFILE )) && (wxLUA_USE_wxFileName)
+ 
+ 
+ #if (wxCHECK_VERSION(2,8,0)) && (wxLUA_USE_wxFileName)
+     { LuaMethod, "GetHumanReadableSize", wxLua_wxFileName_GetHumanReadableSize, 2, 0, s_wxluatagArray_wxLua_wxFileName_GetHumanReadableSize },
+     { LuaMethod, "IsDirWritable", wxLua_wxFileName_IsDirWritable, 0, 0, s_wxluaargArray_None },
+     { LuaMethod, "IsDirReadable", wxLua_wxFileName_IsDirReadable, 0, 0, s_wxluaargArray_None },
+     { LuaMethod, "IsFileWritable", wxLua_wxFileName_IsFileWritable, 0, 0, s_wxluaargArray_None },
+     { LuaMethod, "IsFileReadable", wxLua_wxFileName_IsFileReadable, 0, 0, s_wxluaargArray_None },
+     { LuaMethod, "IsFileExecutable", wxLua_wxFileName_IsFileExecutable, 0, 0, s_wxluaargArray_None },
+ #endif  // (wxCHECK_VERSION(2,8,0)) && (wxLUA_USE_wxFileName)
+ 
+ 
  #if (wxLUA_USE_wxArrayString) && (wxLUA_USE_wxFileName)
      { LuaMethod, "GetDirs", wxLua_wxFileName_GetDirs, 0, 0, s_wxluaargArray_None },
***************
*** 1512,1519 ****
  
  
! #if (wxLUA_USE_wxFile && wxUSE_FILE) && (wxLUA_USE_wxFileName)
!     { LuaMethod, "AssignTempFileName", wxLua_wxFileName_AssignTempFileName, 2, 1, s_wxluatagArray_wxLua_wxFileName_AssignTempFileName },
!     { LuaMethod, "CreateTempFileName", wxLua_wxFileName_CreateTempFileName, 2, 1, s_wxluatagArray_wxLua_wxFileName_CreateTempFileName },
! #endif  // (wxLUA_USE_wxFile && wxUSE_FILE) && (wxLUA_USE_wxFileName)
  
      { LuaConstructor, "wxFileNameDefault", wxLua_wxFileNameDefault_constructor, 0, 0, s_wxluaargArray_None },
--- 1867,1873 ----
  
  
! #if (wxLUA_USE_wxFile && wxUSE_FILE) && ((wxCHECK_VERSION(2,8,0) && wxUSE_FILE) && (wxLUA_USE_wxFileName))
!     { LuaMethod, "AssignTempFileName", wxLua_wxFileName_AssignTempFileName, 2, 2, s_wxluatagArray_wxLua_wxFileName_AssignTempFileName },
! #endif  // (wxLUA_USE_wxFile && wxUSE_FILE) && ((wxCHECK_VERSION(2,8,0) && wxUSE_FILE) && (wxLUA_USE_wxFileName))
  
      { LuaConstructor, "wxFileNameDefault", wxLua_wxFileNameDefault_constructor, 0, 0, s_wxluaargArray_None },
***************
*** 1959,1963 ****
  
  static wxLuaArgTag s_wxluatagArray_wxLua_wxFile_WriteString[] = { &s_wxluaarg_String, 0 };
! //     %rename WriteString size_t Write(const wxString &str)
  static int LUACALL wxLua_wxFile_WriteString(lua_State *L)
  {
--- 2313,2317 ----
  
  static wxLuaArgTag s_wxluatagArray_wxLua_wxFile_WriteString[] = { &s_wxluaarg_String, 0 };
! //     %rename WriteString size_t Write(const wxString &str) //, const wxMBConv& conv = wxConvUTF8)
  static int LUACALL wxLua_wxFile_WriteString(lua_State *L)
  {
***************
*** 2034,2037 ****
--- 2388,2609 ----
  
  
+ #if wxLUA_USE_wxFile && wxUSE_FILE
+ // ---------------------------------------------------------------------------
+ // Bind class wxTempFile
+ // ---------------------------------------------------------------------------
+ 
+ // Lua MetaTable Tag for Class 'wxTempFile'
+ int s_wxluatag_wxTempFile = -1;
+ 
+ //     %constructor wxTempFileDefault()
+ static int LUACALL wxLua_wxTempFileDefault_constructor(lua_State *L)
+ {
+     wxLuaState wxlState(L);
+     wxTempFile *returns;
+     // call constructor
+     returns = new wxTempFile();
+     // add to tracked memory list
+     wxLua_AddTrackedObject(wxlState, (wxTempFile *)returns);
+     // push the constructed class pointer
+     wxlState.PushUserDataType(s_wxluatag_wxTempFile, returns);
+ 
+     return 1;
+ }
+ 
+ static wxLuaArgTag s_wxluatagArray_wxLua_wxTempFile_constructor[] = { &s_wxluaarg_String, 0 };
+ //     wxTempFile(const wxString& strName)
+ static int LUACALL wxLua_wxTempFile_constructor(lua_State *L)
+ {
+     wxLuaState wxlState(L);
+     wxTempFile *returns;
+     // const wxString strName
+     const wxString strName = wxlState.GetwxStringType(1);
+     // call constructor
+     returns = new wxTempFile(strName);
+     // add to tracked memory list
+     wxLua_AddTrackedObject(wxlState, (wxTempFile *)returns);
+     // push the constructed class pointer
+     wxlState.PushUserDataType(s_wxluatag_wxTempFile, returns);
+ 
+     return 1;
+ }
+ 
+ static wxLuaArgTag s_wxluatagArray_wxLua_wxTempFile_Open[] = { &s_wxluaarg_String, 0 };
+ //     bool Open(const wxString& strName)
+ static int LUACALL wxLua_wxTempFile_Open(lua_State *L)
+ {
+     wxLuaState wxlState(L);
+     bool returns;
+     // const wxString strName
+     const wxString strName = wxlState.GetwxStringType(2);
+     // get this
+     wxTempFile * self = (wxTempFile *)wxlState.GetUserDataType(1, s_wxluatag_wxTempFile);
+     // call Open
+     returns = self->Open(strName);
+     // push the result flag
+     lua_pushboolean(L, returns);
+ 
+     return 1;
+ }
+ 
+ //     bool IsOpened() const
+ static int LUACALL wxLua_wxTempFile_IsOpened(lua_State *L)
+ {
+     wxLuaState wxlState(L);
+     bool returns;
+     // get this
+     wxTempFile * self = (wxTempFile *)wxlState.GetUserDataType(1, s_wxluatag_wxTempFile);
+     // call IsOpened
+     returns = self->IsOpened();
+     // push the result flag
+     lua_pushboolean(L, returns);
+ 
+     return 1;
+ }
+ 
+ //     wxFileOffset Length() const
+ static int LUACALL wxLua_wxTempFile_Length(lua_State *L)
+ {
+     wxLuaState wxlState(L);
+     wxFileOffset returns;
+     // get this
+     wxTempFile * self = (wxTempFile *)wxlState.GetUserDataType(1, s_wxluatag_wxTempFile);
+     // call Length
+     returns = self->Length();
+     // push the result number
+     lua_pushnumber(L, returns);
+ 
+     return 1;
+ }
+ 
+ static wxLuaArgTag s_wxluatagArray_wxLua_wxTempFile_Seek[] = { &s_wxluaarg_Number, &s_wxluaarg_Enumeration, 0 };
+ //     wxFileOffset Seek(wxFileOffset ofs, wxSeekMode mode = wxFromStart)
+ static int LUACALL wxLua_wxTempFile_Seek(lua_State *L)
+ {
+     wxLuaState wxlState(L);
+     wxFileOffset returns;
+     // get number of arguments
+     int argCount = lua_gettop(L);
+     // wxSeekMode mode = wxFromStart
+     wxSeekMode mode = (argCount >= 3 ? (wxSeekMode)wxlState.GetEnumerationType(3) : wxFromStart);
+     // wxFileOffset ofs
+     wxFileOffset ofs = (wxFileOffset)wxlState.GetNumberType(2);
+     // get this
+     wxTempFile * self = (wxTempFile *)wxlState.GetUserDataType(1, s_wxluatag_wxTempFile);
+     // call Seek
+     returns = self->Seek(ofs, mode);
+     // push the result number
+     lua_pushnumber(L, returns);
+ 
+     return 1;
+ }
+ 
+ //     wxFileOffset Tell() const
+ static int LUACALL wxLua_wxTempFile_Tell(lua_State *L)
+ {
+     wxLuaState wxlState(L);
+     wxFileOffset returns;
+     // get this
+     wxTempFile * self = (wxTempFile *)wxlState.GetUserDataType(1, s_wxluatag_wxTempFile);
+     // call Tell
+     returns = self->Tell();
+     // push the result number
+     lua_pushnumber(L, returns);
+ 
+     return 1;
+ }
+ 
+ static wxLuaArgTag s_wxluatagArray_wxLua_wxTempFile_Write[] = { &s_wxluaarg_String, 0 };
+ //     bool Write(const wxString& str) //, const wxMBConv& conv = wxConvUTF8)
+ static int LUACALL wxLua_wxTempFile_Write(lua_State *L)
+ {
+     wxLuaState wxlState(L);
+     bool returns;
+     // const wxString str
+     const wxString str = wxlState.GetwxStringType(2);
+     // get this
+     wxTempFile * self = (wxTempFile *)wxlState.GetUserDataType(1, s_wxluatag_wxTempFile);
+     // call Write
+     returns = self->Write(str);
+     // push the result flag
+     lua_pushboolean(L, returns);
+ 
+     return 1;
+ }
+ 
+ //     bool Commit()
+ static int LUACALL wxLua_wxTempFile_Commit(lua_State *L)
+ {
+     wxLuaState wxlState(L);
+     bool returns;
+     // get this
+     wxTempFile * self = (wxTempFile *)wxlState.GetUserDataType(1, s_wxluatag_wxTempFile);
+     // call Commit
+     returns = self->Commit();
+     // push the result flag
+     lua_pushboolean(L, returns);
+ 
+     return 1;
+ }
+ 
+ //     void Discard();
+ static int LUACALL wxLua_wxTempFile_Discard(lua_State *L)
+ {
+     wxLuaState wxlState(L);
+     // get this
+     wxTempFile * self = (wxTempFile *)wxlState.GetUserDataType(1, s_wxluatag_wxTempFile);
+     // call Discard
+     self->Discard();
+ 
+     return 0;
+ }
+ 
+ static int LUACALL wxLua_wxTempFile_destructor(lua_State *L)
+ {
+     wxLuaState wxlState(L);
+     wxTempFile * self = (wxTempFile *)wxlState.GetUserDataType(1, s_wxluatag_wxTempFile);
+ 
+     // remove from tracked memory list
+     if (self != 0)
+         wxlState.RemoveTrackedObject(self);
+     return 0;
+ }
+ 
+ static int LUACALL wxLua_wxTempFile_Delete(lua_State *L)
+ {
+     wxLuaState wxlState(L);
+     wxTempFile * self = (wxTempFile *)wxlState.GetUserDataType(1, s_wxluatag_wxTempFile);
+     // remove from tracked memory list
+     if (self != 0)
+         if (wxlState.RemoveTrackedObject(self))
+         {   // if removed, reset the tag so that gc() is not called on this object.
+             lua_pushnil(L);
+             lua_setmetatable(L, -2);
+         }
+     return 0;
+ }
+ 
+ 
+ 
+ // Map Lua Class Methods to C Binding Functions
+ WXLUAMETHOD wxTempFile_methods[] = {
+     { LuaConstructor, "wxTempFileDefault", wxLua_wxTempFileDefault_constructor, 0, 0, s_wxluaargArray_None },
+     { LuaConstructor, "wxTempFile", wxLua_wxTempFile_constructor, 1, 1, s_wxluatagArray_wxLua_wxTempFile_constructor },
+     { LuaMethod, "Open", wxLua_wxTempFile_Open, 1, 1, s_wxluatagArray_wxLua_wxTempFile_Open },
+     { LuaMethod, "IsOpened", wxLua_wxTempFile_IsOpened, 0, 0, s_wxluaargArray_None },
+     { LuaMethod, "Length", wxLua_wxTempFile_Length, 0, 0, s_wxluaargArray_None },
+     { LuaMethod, "Seek", wxLua_wxTempFile_Seek, 2, 1, s_wxluatagArray_wxLua_wxTempFile_Seek },
+     { LuaMethod, "Tell", wxLua_wxTempFile_Tell, 0, 0, s_wxluaargArray_None },
+     { LuaMethod, "Write", wxLua_wxTempFile_Write, 1, 1, s_wxluatagArray_wxLua_wxTempFile_Write },
+     { LuaMethod, "Commit", wxLua_wxTempFile_Commit, 0, 0, s_wxluaargArray_None },
+     { LuaMethod, "Discard", wxLua_wxTempFile_Discard, 0, 0, s_wxluaargArray_None },
+     { LuaDelete, "wxTempFile", wxLua_wxTempFile_destructor, 0, 0, s_wxluaargArray_None },
+     { LuaMethod, "Delete", wxLua_wxTempFile_Delete, 0, 0, s_wxluaargArray_None },
+ };
+ 
+ int wxTempFile_methodCount = sizeof(wxTempFile_methods)/sizeof(wxTempFile_methods[0]);
+ #endif  // wxLUA_USE_wxFile && wxUSE_FILE
+ 
+ 
  #if wxLUA_USE_wxDir
  // ---------------------------------------------------------------------------

Index: help.cpp
===================================================================
RCS file: /cvsroot/wxlua/wxLua/modules/wxbind/src/help.cpp,v
retrieving revision 1.25
retrieving revision 1.26
diff -C2 -d -r1.25 -r1.26
*** help.cpp	9 Mar 2007 00:15:16 -0000	1.25
--- help.cpp	12 Mar 2007 23:12:36 -0000	1.26
***************
*** 481,484 ****
--- 481,518 ----
  
  
+ #if (wxCHECK_VERSION(2,8,0)) && (wxLUA_USE_wxHelpController && wxUSE_HELP)
+ //     %wxchkver_2_8 virtual wxWindow* GetParentWindow() const
+ static int LUACALL wxLua_wxHelpController_GetParentWindow(lua_State *L)
+ {
+     wxLuaState wxlState(L);
+     wxWindow *returns;
+     // get this
+     wxHelpController * self = (wxHelpController *)wxlState.GetUserDataType(1, s_wxluatag_wxHelpController);
+     // call GetParentWindow
+     returns = (wxWindow *)self->GetParentWindow();
+     // push the result datatype
+     wxlState.PushUserDataType(s_wxluatag_wxWindow, returns);
+ 
+     return 1;
+ }
+ 
+ static wxLuaArgTag s_wxluatagArray_wxLua_wxHelpController_SetParentWindow[] = { &s_wxluatag_wxWindow, 0 };
+ //     %wxchkver_2_8 virtual void SetParentWindow(wxWindow* win)
+ static int LUACALL wxLua_wxHelpController_SetParentWindow(lua_State *L)
+ {
+     wxLuaState wxlState(L);
+     // wxWindow win
+     wxWindow * win = (wxWindow *)wxlState.GetUserDataType(2, s_wxluatag_wxWindow);
+     // get this
+     wxHelpController * self = (wxHelpController *)wxlState.GetUserDataType(1, s_wxluatag_wxHelpController);
+     // call SetParentWindow
+     self->SetParentWindow(win);
+ 
+     return 0;
+ }
+ 
+ #endif // (wxCHECK_VERSION(2,8,0)) && (wxLUA_USE_wxHelpController && wxUSE_HELP)
+ 
+ 
  #if (wxLUA_USE_wxHelpController && wxUSE_HELP) && (wxLUA_USE_wxPointSizeRect)
  static wxLuaArgTag s_wxluatagArray_wxLua_wxHelpController_DisplayTextPopup[] = { &s_wxluaarg_String, &s_wxluatag_wxPoint, 0 };
***************
*** 753,756 ****
--- 787,796 ----
  
  
+ #if (wxCHECK_VERSION(2,8,0)) && (wxLUA_USE_wxHelpController && wxUSE_HELP)
+     { LuaMethod, "GetParentWindow", wxLua_wxHelpController_GetParentWindow, 0, 0, s_wxluaargArray_None },
+     { LuaMethod, "SetParentWindow", wxLua_wxHelpController_SetParentWindow, 1, 1, s_wxluatagArray_wxLua_wxHelpController_SetParentWindow },
+ #endif  // (wxCHECK_VERSION(2,8,0)) && (wxLUA_USE_wxHelpController && wxUSE_HELP)
+ 
+ 
  #if (wxLUA_USE_wxHelpController && wxUSE_HELP) && (wxLUA_USE_wxPointSizeRect)
      { LuaMethod, "DisplayTextPopup", wxLua_wxHelpController_DisplayTextPopup, 2, 2, s_wxluatagArray_wxLua_wxHelpController_DisplayTextPopup },

Index: dialogs.cpp
===================================================================
RCS file: /cvsroot/wxlua/wxLua/modules/wxbind/src/dialogs.cpp,v
retrieving revision 1.30
retrieving revision 1.31
diff -C2 -d -r1.30 -r1.31
*** dialogs.cpp	9 Mar 2007 00:15:14 -0000	1.30
--- dialogs.cpp	12 Mar 2007 23:12:35 -0000	1.31
***************
*** 1394,1397 ****
--- 1394,1475 ----
  
  
+ #if (((wxCHECK_VERSION(2,8,0)) && (wxLUA_USE_wxFileDialog && wxUSE_FILEDLG)) && (wxLUA_USE_wxPointSizeRect)) && (wxLUA_USE_wxFileDialog && wxUSE_FILEDLG)
+ static wxLuaArgTag s_wxluatagArray_wxLua_wxFileDialog_constructor[] = { &s_wxluatag_wxWindow, &s_wxluaarg_String, &s_wxluaarg_String, &s_wxluaarg_String, &s_wxluaarg_String, &s_wxluaarg_Number, &s_wxluatag_wxPoint, &s_wxluatag_wxSize, &s_wxluaarg_String, 0 };
+ //     %wxchkver_2_8 wxFileDialog(wxWindow *parent, const wxString& message = wxFileSelectorPromptStr, const wxString& defaultDir = "", const wxString& defaultFile = "", const wxString& wildCard = wxFileSelectorDefaultWildcardStr, long style = wxFD_DEFAULT_STYLE, const wxPoint& pos = wxDefaultPosition, const wxSize& sz = wxDefaultSize, const wxString& name = "wxFileDialog")
+ static int LUACALL wxLua_wxFileDialog_constructor(lua_State *L)
+ {
+     wxLuaState wxlState(L);
+     wxFileDialog *returns;
+     // get number of arguments
+     int argCount = lua_gettop(L);
+     // const wxString name = "wxFileDialog"
+     const wxString name = (argCount >= 9 ? wxlState.GetwxStringType(9) : wxString(wxT("wxFileDialog")));
+     // const wxSize sz = wxDefaultSize
+     const wxSize * sz = (argCount >= 8 ? (const wxSize *)wxlState.GetUserDataType(8, s_wxluatag_wxSize) : &wxDefaultSize);
+     // const wxPoint pos = wxDefaultPosition
+     const wxPoint * pos = (argCount >= 7 ? (const wxPoint *)wxlState.GetUserDataType(7, s_wxluatag_wxPoint) : &wxDefaultPosition);
+     // long style = wxFD_DEFAULT_STYLE
+     long style = (argCount >= 6 ? (long)wxlState.GetNumberType(6) : wxFD_DEFAULT_STYLE);
+     // const wxString wildCard = wxFileSelectorDefaultWildcardStr
+     const wxString wildCard = (argCount >= 5 ? wxlState.GetwxStringType(5) : wxString(wxFileSelectorDefaultWildcardStr));
+     // const wxString defaultFile = ""
+     const wxString defaultFile = (argCount >= 4 ? wxlState.GetwxStringType(4) : wxString(wxEmptyString));
+     // const wxString defaultDir = ""
+     const wxString defaultDir = (argCount >= 3 ? wxlState.GetwxStringType(3) : wxString(wxEmptyString));
+     // const wxString message = wxFileSelectorPromptStr
+     const wxString message = (argCount >= 2 ? wxlState.GetwxStringType(2) : wxString(wxFileSelectorPromptStr));
+     // wxWindow parent
+     wxWindow * parent = (wxWindow *)wxlState.GetUserDataType(1, s_wxluatag_wxWindow);
+     // call constructor
+     returns = new wxFileDialog(parent, message, defaultDir, defaultFile, wildCard, style, *pos, *sz, name);
+     // add to tracked window list
+     if (returns && returns->IsKindOf(CLASSINFO(wxWindow)))
+         wxlState.AddTrackedWindow((wxWindow*)returns);
+     // push the constructed class pointer
+     wxlState.PushUserDataType(s_wxluatag_wxFileDialog, returns);
+ 
+     return 1;
+ }
+ 
+ #endif // (((wxCHECK_VERSION(2,8,0)) && (wxLUA_USE_wxFileDialog && wxUSE_FILEDLG)) && (wxLUA_USE_wxPointSizeRect)) && (wxLUA_USE_wxFileDialog && wxUSE_FILEDLG)
+ 
+ 
+ #if ((wxLUA_USE_wxPointSizeRect) && ((!wxCHECK_VERSION(2,8,0)) && (wxLUA_USE_wxFileDialog && wxUSE_FILEDLG))) && (wxLUA_USE_wxFileDialog && wxUSE_FILEDLG)
+ static wxLuaArgTag s_wxluatagArray_wxLua_wxFileDialog_constructor[] = { &s_wxluatag_wxWindow, &s_wxluaarg_String, &s_wxluaarg_String, &s_wxluaarg_String, &s_wxluaarg_String, &s_wxluaarg_Number, &s_wxluatag_wxPoint, 0 };
+ //     !%wxchkver_2_8 wxFileDialog(wxWindow* parent, const wxString& message = "Choose a file", const wxString& defaultDir = "", const wxString& defaultFile = "", const wxString& wildcard = "*.*", long style = 0, const wxPoint& pos = wxDefaultPosition)
+ static int LUACALL wxLua_wxFileDialog_constructor(lua_State *L)
+ {
+     wxLuaState wxlState(L);
+     wxFileDialog *returns;
+     // get number of arguments
+     int argCount = lua_gettop(L);
+     // const wxPoint pos = wxDefaultPosition
+     const wxPoint * pos = (argCount >= 7 ? (const wxPoint *)wxlState.GetUserDataType(7, s_wxluatag_wxPoint) : &wxDefaultPosition);
+     // long style = 0
+     long style = (argCount >= 6 ? (long)wxlState.GetNumberType(6) : 0);
+     // const wxString wildcard = "*.*"
+     const wxString wildcard = (argCount >= 5 ? wxlState.GetwxStringType(5) : wxString(wxT("*.*")));
+     // const wxString defaultFile = ""
+     const wxString defaultFile = (argCount >= 4 ? wxlState.GetwxStringType(4) : wxString(wxEmptyString));
+     // const wxString defaultDir = ""
+     const wxString defaultDir = (argCount >= 3 ? wxlState.GetwxStringType(3) : wxString(wxEmptyString));
+     // const wxString message = "Choose a file"
+     const wxString message = (argCount >= 2 ? wxlState.GetwxStringType(2) : wxString(wxT("Choose a file")));
+     // wxWindow parent
+     wxWindow * parent = (wxWindow *)wxlState.GetUserDataType(1, s_wxluatag_wxWindow);
+     // call constructor
+     returns = new wxFileDialog(parent, message, defaultDir, defaultFile, wildcard, style, *pos);
+     // add to tracked window list
+     if (returns && returns->IsKindOf(CLASSINFO(wxWindow)))
+         wxlState.AddTrackedWindow((wxWindow*)returns);
+     // push the constructed class pointer
+     wxlState.PushUserDataType(s_wxluatag_wxFileDialog, returns);
+ 
+     return 1;
+ }
+ 
+ #endif // ((wxLUA_USE_wxPointSizeRect) && ((!wxCHECK_VERSION(2,8,0)) && (wxLUA_USE_wxFileDialog && wxUSE_FILEDLG))) && (wxLUA_USE_wxFileDialog && wxUSE_FILEDLG)
+ 
+ 
  #if (wxLUA_USE_wxArrayString) && (wxLUA_USE_wxFileDialog && wxUSE_FILEDLG)
  static wxLuaArgTag s_wxluatagArray_wxLua_wxFileDialog_GetFilenames[] = { &s_wxluatag_wxArrayString, 0 };
***************
*** 1430,1458 ****
  
  
! #if (wxLUA_USE_wxPointSizeRect) && (wxLUA_USE_wxFileDialog && wxUSE_FILEDLG)
! static wxLuaArgTag s_wxluatagArray_wxLua_wxFileDialog_constructor[] = { &s_wxluatag_wxWindow, &s_wxluaarg_String, &s_wxluaarg_String, &s_wxluaarg_String, &s_wxluaarg_String, &s_wxluaarg_Number, &s_wxluatag_wxPoint, 0 };
! //     wxFileDialog(wxWindow* parent, const wxString& message = "Choose a file", const wxString& defaultDir = "", const wxString& defaultFile = "", const wxString& wildcard = "*.*", long style = 0, const wxPoint& pos = wxDefaultPosition)
! static int LUACALL wxLua_wxFileDialog_constructor(lua_State *L)
  {
      wxLuaState wxlState(L);
!     wxFileDialog *returns;
      // get number of arguments
      int argCount = lua_gettop(L);
      // const wxPoint pos = wxDefaultPosition
!     const wxPoint * pos = (argCount >= 7 ? (const wxPoint *)wxlState.GetUserDataType(7, s_wxluatag_wxPoint) : &wxDefaultPosition);
!     // long style = 0
!     long style = (argCount >= 6 ? (long)wxlState.GetNumberType(6) : 0);
!     // const wxString wildcard = "*.*"
!     const wxString wildcard = (argCount >= 5 ? wxlState.GetwxStringType(5) : wxString(wxT("*.*")));
      // const wxString defaultFile = ""
!     const wxString defaultFile = (argCount >= 4 ? wxlState.GetwxStringType(4) : wxString(wxEmptyString));
      // const wxString defaultDir = ""
!     const wxString defaultDir = (argCount >= 3 ? wxlState.GetwxStringType(3) : wxString(wxEmptyString));
!     // const wxString message = "Choose a file"
!     const wxString message = (argCount >= 2 ? wxlState.GetwxStringType(2) : wxString(wxT("Choose a file")));
      // wxWindow parent
!     wxWindow * parent = (wxWindow *)wxlState.GetUserDataType(1, s_wxluatag_wxWindow);
      // call constructor
!     returns = new wxFileDialog(parent, message, defaultDir, defaultFile, wildcard, style, *pos);
      // add to tracked window list
      if (returns && returns->IsKindOf(CLASSINFO(wxWindow)))
--- 1508,1557 ----
  
  
! #if (wxLUA_USE_wxPointSizeRect) && ((wxCHECK_VERSION(2,8,0)) && (wxLUA_USE_wxFileDialog && wxUSE_FILEDLG))
! static wxLuaArgTag s_wxluatagArray_wxLua_wxFileDialog_Create[] = { &s_wxluatag_wxWindow, &s_wxluaarg_String, &s_wxluaarg_String, &s_wxluaarg_String, &s_wxluaarg_String, &s_wxluaarg_Number, &s_wxluatag_wxPoint, &s_wxluatag_wxSize, &s_wxluaarg_String, 0 };
! //     %wxchkver_2_8 bool Create(wxWindow *parent, const wxString& message = wxFileSelectorPromptStr, const wxString& defaultDir = "", const wxString& defaultFile = "", const wxString& wildCard = wxFileSelectorDefaultWildcardStr, long style = wxFD_DEFAULT_STYLE, const wxPoint& pos = wxDefaultPosition, const wxSize& sz = wxDefaultSize, const wxString& name = "wxFileDialog")
! static int LUACALL wxLua_wxFileDialog_Create(lua_State *L)
  {
      wxLuaState wxlState(L);
!     bool returns;
      // get number of arguments
      int argCount = lua_gettop(L);
+     // const wxString name = "wxFileDialog"
+     const wxString name = (argCount >= 10 ? wxlState.GetwxStringType(10) : wxString(wxT("wxFileDialog")));
+     // const wxSize sz = wxDefaultSize
+     const wxSize * sz = (argCount >= 9 ? (const wxSize *)wxlState.GetUserDataType(9, s_wxluatag_wxSize) : &wxDefaultSize);
      // const wxPoint pos = wxDefaultPosition
!     const wxPoint * pos = (argCount >= 8 ? (const wxPoint *)wxlState.GetUserDataType(8, s_wxluatag_wxPoint) : &wxDefaultPosition);
!     // long style = wxFD_DEFAULT_STYLE
!     long style = (argCount >= 7 ? (long)wxlState.GetNumberType(7) : wxFD_DEFAULT_STYLE);
!     // const wxString wildCard = wxFileSelectorDefaultWildcardStr
!     const wxString wildCard = (argCount >= 6 ? wxlState.GetwxStringType(6) : wxString(wxFileSelectorDefaultWildcardStr));
      // const wxString defaultFile = ""
!     const wxString defaultFile = (argCount >= 5 ? wxlState.GetwxStringType(5) : wxString(wxEmptyString));
      // const wxString defaultDir = ""
!     const wxString defaultDir = (argCount >= 4 ? wxlState.GetwxStringType(4) : wxString(wxEmptyString));
!     // const wxString message = wxFileSelectorPromptStr
!     const wxString message = (argCount >= 3 ? wxlState.GetwxStringType(3) : wxString(wxFileSelectorPromptStr));
      // wxWindow parent
!     wxWindow * parent = (wxWindow *)wxlState.GetUserDataType(2, s_wxluatag_wxWindow);
!     // get this
!     wxFileDialog * self = (wxFileDialog *)wxlState.GetUserDataType(1, s_wxluatag_wxFileDialog);
!     // call Create
!     returns = self->Create(parent, message, defaultDir, defaultFile, wildCard, style, *pos, *sz, name);
!     // push the result flag
!     lua_pushboolean(L, returns);
! 
!     return 1;
! }
! 
! #endif // (wxLUA_USE_wxPointSizeRect) && ((wxCHECK_VERSION(2,8,0)) && (wxLUA_USE_wxFileDialog && wxUSE_FILEDLG))
! 
! //     %constructor wxFileDialogDefault()
! static int LUACALL wxLua_wxFileDialogDefault_constructor(lua_State *L)
! {
!     wxLuaState wxlState(L);
!     wxFileDialog *returns;
      // call constructor
!     returns = new wxFileDialog();
      // add to tracked window list
      if (returns && returns->IsKindOf(CLASSINFO(wxWindow)))
***************
*** 1464,1469 ****
  }
  
- #endif // (wxLUA_USE_wxPointSizeRect) && (wxLUA_USE_wxFileDialog && wxUSE_FILEDLG)
- 
  //     wxString GetDirectory() const
  static int LUACALL wxLua_wxFileDialog_GetDirectory(lua_State *L)
--- 1563,1566 ----
***************
*** 1664,1667 ****
--- 1761,1774 ----
  
  
+ #if (((wxCHECK_VERSION(2,8,0)) && (wxLUA_USE_wxFileDialog && wxUSE_FILEDLG)) && (wxLUA_USE_wxPointSizeRect)) && (wxLUA_USE_wxFileDialog && wxUSE_FILEDLG)
+     { LuaConstructor, "wxFileDialog", wxLua_wxFileDialog_constructor, 9, 1, s_wxluatagArray_wxLua_wxFileDialog_constructor },
+ #endif  // (((wxCHECK_VERSION(2,8,0)) && (wxLUA_USE_wxFileDialog && wxUSE_FILEDLG)) && (wxLUA_USE_wxPointSizeRect)) && (wxLUA_USE_wxFileDialog && wxUSE_FILEDLG)
+ 
+ 
+ #if ((wxLUA_USE_wxPointSizeRect) && ((!wxCHECK_VERSION(2,8,0)) && (wxLUA_USE_wxFileDialog && wxUSE_FILEDLG))) && (wxLUA_USE_wxFileDialog && wxUSE_FILEDLG)
+     { LuaConstructor, "wxFileDialog", wxLua_wxFileDialog_constructor, 7, 1, s_wxluatagArray_wxLua_wxFileDialog_constructor },
+ #endif  // ((wxLUA_USE_wxPointSizeRect) && ((!wxCHECK_VERSION(2,8,0)) && (wxLUA_USE_wxFileDialog && wxUSE_FILEDLG))) && (wxLUA_USE_wxFileDialog && wxUSE_FILEDLG)
+ 
+ 
  #if (wxLUA_USE_wxArrayString) && (wxLUA_USE_wxFileDialog && wxUSE_FILEDLG)
      { LuaMethod, "GetFilenames", wxLua_wxFileDialog_GetFilenames, 1, 1, s_wxluatagArray_wxLua_wxFileDialog_GetFilenames },
***************
*** 1670,1677 ****
  
  
! #if (wxLUA_USE_wxPointSizeRect) && (wxLUA_USE_wxFileDialog && wxUSE_FILEDLG)
!     { LuaConstructor, "wxFileDialog", wxLua_wxFileDialog_constructor, 7, 1, s_wxluatagArray_wxLua_wxFileDialog_constructor },
! #endif  // (wxLUA_USE_wxPointSizeRect) && (wxLUA_USE_wxFileDialog && wxUSE_FILEDLG)
  
      { LuaMethod, "GetDirectory", wxLua_wxFileDialog_GetDirectory, 0, 0, s_wxluaargArray_None },
      { LuaMethod, "GetFilename", wxLua_wxFileDialog_GetFilename, 0, 0, s_wxluaargArray_None },
--- 1777,1785 ----
  
  
! #if (wxLUA_USE_wxPointSizeRect) && ((wxCHECK_VERSION(2,8,0)) && (wxLUA_USE_wxFileDialog && wxUSE_FILEDLG))
!     { LuaMethod, "Create", wxLua_wxFileDialog_Create, 9, 1, s_wxluatagArray_wxLua_wxFileDialog_Create },
! #endif  // (wxLUA_USE_wxPointSizeRect) && ((wxCHECK_VERSION(2,8,0)) && (wxLUA_USE_wxFileDialog && wxUSE_FILEDLG))
  
+     { LuaConstructor, "wxFileDialogDefault", wxLua_wxFileDialogDefault_constructor, 0, 0, s_wxluaargArray_None },
      { LuaMethod, "GetDirectory", wxLua_wxFileDialog_GetDirectory, 0, 0, s_wxluaargArray_None },
      { LuaMethod, "GetFilename", wxLua_wxFileDialog_GetFilename, 0, 0, s_wxluaargArray_None },

Index: html.cpp
===================================================================
RCS file: /cvsroot/wxlua/wxLua/modules/wxbind/src/html.cpp,v
retrieving revision 1.30
retrieving revision 1.31
diff -C2 -d -r1.30 -r1.31
*** html.cpp	9 Mar 2007 00:15:16 -0000	1.30
--- html.cpp	12 Mar 2007 23:12:37 -0000	1.31
***************
*** 2781,2784 ****
--- 2781,3080 ----
  
  
+ #if (wxCHECK_VERSION(2,7,0)) && (wxLUA_USE_wxHTML && wxUSE_HTML)
+ // ---------------------------------------------------------------------------
+ // Bind class wxSimpleHtmlListBox
+ // ---------------------------------------------------------------------------
+ 
+ // Lua MetaTable Tag for Class 'wxSimpleHtmlListBox'
+ int s_wxluatag_wxSimpleHtmlListBox = -1;
+ 
+ 
+ #if ((wxCHECK_VERSION(2,7,0)) && (wxLUA_USE_wxHTML && wxUSE_HTML)) && (wxLUA_USE_wxArrayString)
+ //     wxArrayString GetStrings() const
+ static int LUACALL wxLua_wxSimpleHtmlListBox_GetStrings(lua_State *L)
+ {
+     wxLuaState wxlState(L);
+     wxArrayString *returns;
+     // get this
+     wxSimpleHtmlListBox * self = (wxSimpleHtmlListBox *)wxlState.GetUserDataType(1, s_wxluatag_wxSimpleHtmlListBox);
+     // call GetStrings
+     // allocate a new object using the copy constructor
+     returns = new wxArrayString(self->GetStrings());
+     // add the new object to the tracked memory list
+     wxLua_AddTrackedObject(wxlState, (wxArrayString *)returns);
+     // push the result datatype
+     wxlState.PushUserDataType(s_wxluatag_wxArrayString, returns);
+ 
+     return 1;
+ }
+ 
+ #endif // ((wxCHECK_VERSION(2,7,0)) && (wxLUA_USE_wxHTML && wxUSE_HTML)) && (wxLUA_USE_wxArrayString)
+ 
+ 
+ #if ((wxLUA_USE_wxValidator && wxUSE_VALIDATORS) && ((wxCHECK_VERSION(2,7,0)) && (wxLUA_USE_wxHTML && wxUSE_HTML))) && (wxLUA_USE_wxPointSizeRect)
+ static wxLuaArgTag s_wxluatagArray_wxLua_wxSimpleHtmlListBox_constructor[] = { &s_wxluatag_wxWindow, &s_wxluaarg_Number, &s_wxluatag_wxPoint, &s_wxluatag_wxSize, &s_wxluaarg_LuaTable, &s_wxluaarg_Number, &s_wxluatag_wxValidator, &s_wxluaarg_String, 0 };
+ //     wxSimpleHtmlListBox(wxWindow *parent, wxWindowID id, const wxPoint& pos, const wxSize& size, const wxArrayString_FromLuaTable& choices, long style = wxHLB_DEFAULT_STYLE, const wxValidator& validator = wxDefaultValidator, const wxString& name = "wxSimpleHtmlListBox")
+ static int LUACALL wxLua_wxSimpleHtmlListBox_constructor(lua_State *L)
+ {
+     wxLuaState wxlState(L);
+     wxSimpleHtmlListBox *returns;
+     // get number of arguments
+     int argCount = lua_gettop(L);
+     // const wxString name = "wxSimpleHtmlListBox"
+     const wxString name = (argCount >= 8 ? wxlState.GetwxStringType(8) : wxString(wxT("wxSimpleHtmlListBox")));
+     // const wxValidator validator = wxDefaultValidator
+     const wxValidator * validator = (argCount >= 7 ? (const wxValidator *)wxlState.GetUserDataType(7, s_wxluatag_wxValidator) : &wxDefaultValidator);
+     // long style = wxHLB_DEFAULT_STYLE
+     long style = (argCount >= 6 ? (long)wxlState.GetNumberType(6) : wxHLB_DEFAULT_STYLE);
+     // const wxArrayString_FromLuaTable choices
+     wxArrayString  choices = wxArrayString(); wxlState.GetwxArrayString(5, choices);
+     // const wxSize size
+     const wxSize * size = (const wxSize *)wxlState.GetUserDataType(4, s_wxluatag_wxSize);
+     // const wxPoint pos
+     const wxPoint * pos = (const wxPoint *)wxlState.GetUserDataType(3, s_wxluatag_wxPoint);
+     // wxWindowID id
+     wxWindowID id = (wxWindowID)wxlState.GetNumberType(2);
+     // wxWindow parent
+     wxWindow * parent = (wxWindow *)wxlState.GetUserDataType(1, s_wxluatag_wxWindow);
+     // call constructor
+     returns = new wxSimpleHtmlListBox(parent, id, *pos, *size, choices, style, *validator, name);
+     // add to tracked window list
+     if (returns && returns->IsKindOf(CLASSINFO(wxWindow)))
+         wxlState.AddTrackedWindow((wxWindow*)returns);
+     // push the constructed class pointer
+     wxlState.PushUserDataType(s_wxluatag_wxSimpleHtmlListBox, returns);
+ 
+     return 1;
+ }
+ 
+ static wxLuaArgTag s_wxluatagArray_wxLua_wxSimpleHtmlListBox_Create[] = { &s_wxluatag_wxWindow, &s_wxluaarg_Number, &s_wxluatag_wxPoint, &s_wxluatag_wxSize, &s_wxluaarg_LuaTable, &s_wxluaarg_Number, &s_wxluatag_wxValidator, &s_wxluaarg_String, 0 };
+ //     bool Create(wxWindow *parent, wxWindowID id, const wxPoint& pos, const wxSize& size, const wxArrayString_FromLuaTable& choices, long style = wxHLB_DEFAULT_STYLE, const wxValidator& validator = wxDefaultValidator, const wxString& name = "wxSimpleHtmlListBox")
+ static int LUACALL wxLua_wxSimpleHtmlListBox_Create(lua_State *L)
+ {
+     wxLuaState wxlState(L);
+     bool returns;
+     // get number of arguments
+     int argCount = lua_gettop(L);
+     // const wxString name = "wxSimpleHtmlListBox"
+     const wxString name = (argCount >= 9 ? wxlState.GetwxStringType(9) : wxString(wxT("wxSimpleHtmlListBox")));
+     // const wxValidator validator = wxDefaultValidator
+     const wxValidator * validator = (argCount >= 8 ? (const wxValidator *)wxlState.GetUserDataType(8, s_wxluatag_wxValidator) : &wxDefaultValidator);
+     // long style = wxHLB_DEFAULT_STYLE
+     long style = (argCount >= 7 ? (long)wxlState.GetNumberType(7) : wxHLB_DEFAULT_STYLE);
+     // const wxArrayString_FromLuaTable choices
+     wxArrayString  choices = wxArrayString(); wxlState.GetwxArrayString(6, choices);
+     // const wxSize size
+     const wxSize * size = (const wxSize *)wxlState.GetUserDataType(5, s_wxluatag_wxSize);
+     // const wxPoint pos
+     const wxPoint * pos = (const wxPoint *)wxlState.GetUserDataType(4, s_wxluatag_wxPoint);
+     // wxWindowID id
+     wxWindowID id = (wxWindowID)wxlState.GetNumberType(3);
+     // wxWindow parent
+     wxWindow * parent = (wxWindow *)wxlState.GetUserDataType(2, s_wxluatag_wxWindow);
+     // get this
+     wxSimpleHtmlListBox * self = (wxSimpleHtmlListBox *)wxlState.GetUserDataType(1, s_wxluatag_wxSimpleHtmlListBox);
+     // call Create
+     returns = self->Create(parent, id, *pos, *size, choices, style, *validator, name);
+     // push the result flag
+     lua_pushboolean(L, returns);
+ 
+     return 1;
+ }
+ 
+ #endif // ((wxLUA_USE_wxValidator && wxUSE_VALIDATORS) && ((wxCHECK_VERSION(2,7,0)) && (wxLUA_USE_wxHTML && wxUSE_HTML))) && (wxLUA_USE_wxPointSizeRect)
+ 
+ //     %constructor wxSimpleHtmlListBoxDefault()
+ static int LUACALL wxLua_wxSimpleHtmlListBoxDefault_constructor(lua_State *L)
+ {
+     wxLuaState wxlState(L);
+     wxSimpleHtmlListBox *returns;
+     // call constructor
+     returns = new wxSimpleHtmlListBox();
+     // add to tracked window list
+     if (returns && returns->IsKindOf(CLASSINFO(wxWindow)))
+         wxlState.AddTrackedWindow((wxWindow*)returns);
+     // push the constructed class pointer
+     wxlState.PushUserDataType(s_wxluatag_wxSimpleHtmlListBox, returns);
+ 
+     return 1;
+ }
+ 
+ static wxLuaArgTag s_wxluatagArray_wxLua_wxSimpleHtmlListBox_SetSelection[] = { &s_wxluaarg_Number, 0 };
+ //     void SetSelection(int n)
+ static int LUACALL wxLua_wxSimpleHtmlListBox_SetSelection(lua_State *L)
+ {
+     wxLuaState wxlState(L);
+     // int n
+     int n = (int)wxlState.GetNumberType(2);
+     // get this
+     wxSimpleHtmlListBox * self = (wxSimpleHtmlListBox *)wxlState.GetUserDataType(1, s_wxluatag_wxSimpleHtmlListBox);
+     // call SetSelection
+     self->SetSelection(n);
+ 
+     return 0;
+ }
+ 
+ //     int GetSelection() const
+ static int LUACALL wxLua_wxSimpleHtmlListBox_GetSelection(lua_State *L)
+ {
+     wxLuaState wxlState(L);
+     int returns;
+     // get this
+     wxSimpleHtmlListBox * self = (wxSimpleHtmlListBox *)wxlState.GetUserDataType(1, s_wxluatag_wxSimpleHtmlListBox);
+     // call GetSelection
+     returns = self->GetSelection();
+     // push the result number
+     lua_pushnumber(L, returns);
+ 
+     return 1;
+ }
+ 
+ //     virtual unsigned int GetCount() const
+ static int LUACALL wxLua_wxSimpleHtmlListBox_GetCount(lua_State *L)
+ {
+     wxLuaState wxlState(L);
+     unsigned int returns;
+     // get this
+     wxSimpleHtmlListBox * self = (wxSimpleHtmlListBox *)wxlState.GetUserDataType(1, s_wxluatag_wxSimpleHtmlListBox);
+     // call GetCount
+     returns = self->GetCount();
+     // push the result number
+     lua_pushnumber(L, returns);
+ 
+     return 1;
+ }
+ 
+ static wxLuaArgTag s_wxluatagArray_wxLua_wxSimpleHtmlListBox_GetString[] = { &s_wxluaarg_Number, 0 };
+ //     virtual wxString GetString(unsigned int n) const
+ static int LUACALL wxLua_wxSimpleHtmlListBox_GetString(lua_State *L)
+ {
+     wxLuaState wxlState(L);
+     wxString returns;
+     // unsigned int n
+     unsigned int n = (int)wxlState.GetNumberType(2);
+     // get this
+     wxSimpleHtmlListBox * self = (wxSimpleHtmlListBox *)wxlState.GetUserDataType(1, s_wxluatag_wxSimpleHtmlListBox);
+     // call GetString
+     returns = self->GetString(n);
+     // push the result string
+     wxlState.lua_PushString(returns);
+ 
+     return 1;
+ }
+ 
+ static wxLuaArgTag s_wxluatagArray_wxLua_wxSimpleHtmlListBox_SetString[] = { &s_wxluaarg_Number, &s_wxluaarg_String, 0 };
+ //     virtual void SetString(unsigned int n, const wxString& s)
+ static int LUACALL wxLua_wxSimpleHtmlListBox_SetString(lua_State *L)
+ {
+     wxLuaState wxlState(L);
+     // const wxString s
+     const wxString s = wxlState.GetwxStringType(3);
+     // unsigned int n
+     unsigned int n = (int)wxlState.GetNumberType(2);
+     // get this
+     wxSimpleHtmlListBox * self = (wxSimpleHtmlListBox *)wxlState.GetUserDataType(1, s_wxluatag_wxSimpleHtmlListBox);
+     // call SetString
+     self->SetString(n, s);
+ 
+     return 0;
+ }
+ 
+ //     virtual void Clear()
+ static int LUACALL wxLua_wxSimpleHtmlListBox_Clear(lua_State *L)
+ {
+     wxLuaState wxlState(L);
+     // get this
+     wxSimpleHtmlListBox * self = (wxSimpleHtmlListBox *)wxlState.GetUserDataType(1, s_wxluatag_wxSimpleHtmlListBox);
+     // call Clear
+     self->Clear();
+ 
+     return 0;
+ }
+ 
+ static wxLuaArgTag s_wxluatagArray_wxLua_wxSimpleHtmlListBox_Delete[] = { &s_wxluaarg_Number, 0 };
+ //     virtual void Delete(unsigned int n)
+ static int LUACALL wxLua_wxSimpleHtmlListBox_Delete(lua_State *L)
+ {
+     wxLuaState wxlState(L);
+     // unsigned int n
+     unsigned int n = (int)wxlState.GetNumberType(2);
+     // get this
+     wxSimpleHtmlListBox * self = (wxSimpleHtmlListBox *)wxlState.GetUserDataType(1, s_wxluatag_wxSimpleHtmlListBox);
+     // call Delete
+     self->Delete(n);
+ 
+     return 0;
+ }
+ 
+ static wxLuaArgTag s_wxluatagArray_wxLua_wxSimpleHtmlListBox_AppendStrings[] = { &s_wxluaarg_LuaTable, 0 };
+ //     %rename AppendStrings void Append(const wxArrayString_FromLuaTable& strings)
+ static int LUACALL wxLua_wxSimpleHtmlListBox_AppendStrings(lua_State *L)
+ {
+     wxLuaState wxlState(L);
+     // const wxArrayString_FromLuaTable strings
+     wxArrayString  strings = wxArrayString(); wxlState.GetwxArrayString(2, strings);
+     // get this
+     wxSimpleHtmlListBox * self = (wxSimpleHtmlListBox *)wxlState.GetUserDataType(1, s_wxluatag_wxSimpleHtmlListBox);
+     // call Append
+     self->Append(strings);
+ 
+     return 0;
+ }
+ 
+ static wxLuaArgTag s_wxluatagArray_wxLua_wxSimpleHtmlListBox_Append[] = { &s_wxluaarg_String, 0 };
+ //     int Append(const wxString& item)
+ static int LUACALL wxLua_wxSimpleHtmlListBox_Append(lua_State *L)
+ {
+     wxLuaState wxlState(L);
+     int returns;
+     // const wxString item
+     const wxString item = wxlState.GetwxStringType(2);
+     // get this
+     wxSimpleHtmlListBox * self = (wxSimpleHtmlListBox *)wxlState.GetUserDataType(1, s_wxluatag_wxSimpleHtmlListBox);
+     // call Append
+     returns = self->Append(item);
+     // push the result number
+     lua_pushnumber(L, returns);
+ 
+     return 1;
+ }
+ 
+ static int LUACALL wxLua_wxSimpleHtmlListBox_destructor(lua_State *)
+ {
+     return 0;
+ }
+ 
+ 
+ 
+ // Map Lua Class Methods to C Binding Functions
+ WXLUAMETHOD wxSimpleHtmlListBox_methods[] = {
+ 
+ #if ((wxCHECK_VERSION(2,7,0)) && (wxLUA_USE_wxHTML && wxUSE_HTML)) && (wxLUA_USE_wxArrayString)
+     { LuaMethod, "GetStrings", wxLua_wxSimpleHtmlListBox_GetStrings, 0, 0, s_wxluaargArray_None },
+ #endif  // ((wxCHECK_VERSION(2,7,0)) && (wxLUA_USE_wxHTML && wxUSE_HTML)) && (wxLUA_USE_wxArrayString)
+ 
+ 
+ #if ((wxLUA_USE_wxValidator && wxUSE_VALIDATORS) && ((wxCHECK_VERSION(2,7,0)) && (wxLUA_USE_wxHTML && wxUSE_HTML))) && (wxLUA_USE_wxPointSizeRect)
+     { LuaConstructor, "wxSimpleHtmlListBox", wxLua_wxSimpleHtmlListBox_constructor, 8, 5, s_wxluatagArray_wxLua_wxSimpleHtmlListBox_constructor },
+     { LuaMethod, "Create", wxLua_wxSimpleHtmlListBox_Create, 8, 5, s_wxluatagArray_wxLua_wxSimpleHtmlListBox_Create },
+ #endif  // ((wxLUA_USE_wxValidator && wxUSE_VALIDATORS) && ((wxCHECK_VERSION(2,7,0)) && (wxLUA_USE_wxHTML && wxUSE_HTML))) && (wxLUA_USE_wxPointSizeRect)
+ 
+     { LuaConstructor, "wxSimpleHtmlListBoxDefault", wxLua_wxSimpleHtmlListBoxDefault_constructor, 0, 0, s_wxluaargArray_None },
+     { LuaMethod, "SetSelection", wxLua_wxSimpleHtmlListBox_SetSelection, 1, 1, s_wxluatagArray_wxLua_wxSimpleHtmlListBox_SetSelection },
+     { LuaMethod, "GetSelection", wxLua_wxSimpleHtmlListBox_GetSelection, 0, 0, s_wxluaargArray_None },
+     { LuaMethod, "GetCount", wxLua_wxSimpleHtmlListBox_GetCount, 0, 0, s_wxluaargArray_None },
+     { LuaMethod, "GetString", wxLua_wxSimpleHtmlListBox_GetString, 1, 1, s_wxluatagArray_wxLua_wxSimpleHtmlListBox_GetString },
+     { LuaMethod, "SetString", wxLua_wxSimpleHtmlListBox_SetString, 2, 2, s_wxluatagArray_wxLua_wxSimpleHtmlListBox_SetString },
+     { LuaMethod, "Clear", wxLua_wxSimpleHtmlListBox_Clear, 0, 0, s_wxluaargArray_None },
+     { LuaMethod, "Delete", wxLua_wxSimpleHtmlListBox_Delete, 1, 1, s_wxluatagArray_wxLua_wxSimpleHtmlListBox_Delete },
+     { LuaMethod, "AppendStrings", wxLua_wxSimpleHtmlListBox_AppendStrings, 1, 1, s_wxluatagArray_wxLua_wxSimpleHtmlListBox_AppendStrings },
+     { LuaMethod, "Append", wxLua_wxSimpleHtmlListBox_Append, 1, 1, s_wxluatagArray_wxLua_wxSimpleHtmlListBox_Append },
+     { LuaDelete, "wxSimpleHtmlListBox", wxLua_wxSimpleHtmlListBox_destructor, 0, 0, s_wxluaargArray_None },
+ };
+ 
+ int wxSimpleHtmlListBox_methodCount = sizeof(wxSimpleHtmlListBox_methods)/sizeof(wxSimpleHtmlListBox_methods[0]);
+ #endif  // (wxCHECK_VERSION(2,7,0)) && (wxLUA_USE_wxHTML && wxUSE_HTML)
+ 
+ 
  #if wxLUA_USE_wxHTML && wxUSE_HTML
  // ---------------------------------------------------------------------------

Index: wx_bind.cpp
===================================================================
RCS file: /cvsroot/wxlua/wxLua/modules/wxbind/src/wx_bind.cpp,v
retrieving revision 1.84
retrieving revision 1.85
diff -C2 -d -r1.84 -r1.85
*** wx_bind.cpp	9 Mar 2007 06:10:18 -0000	1.84
--- wx_bind....
 
[truncated message content]

[Wxlua-commit] wxLua/docs wxluaref.html,1.15,1.16

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

Update of /cvsroot/wxlua/wxLua/docs
In directory sc8-pr-cvs9.sourceforge.net:/tmp/cvs-serv19777/wxLua/docs

Modified Files:
	wxluaref.html 
Log Message:
Update reference docs


Index: wxluaref.html
===================================================================
RCS file: /cvsroot/wxlua/wxLua/docs/wxluaref.html,v
retrieving revision 1.15
retrieving revision 1.16
diff -C2 -d -r1.15 -r1.16
*** wxluaref.html	23 Feb 2007 04:35:30 -0000	1.15
--- wxluaref.html	9 Mar 2007 06:16:38 -0000	1.16
***************
*** 28,31 ****
--- 28,32 ----
  <a href="#wxArrayVideoModes">wxArrayVideoModes</a> - (Not in wxWidgets reference manual)<br>
  <a href="#wxArtProvider">wxArtProvider</a><br>
+ <a href="#wxAutoBufferedPaintDC">wxAutoBufferedPaintDC</a> - (Not in wxWidgets reference manual)<br>
  wxAutomationObject - (Not wrapped)<br>
  <a href="#wxBMPHandler">wxBMPHandler</a> - (Not in wxWidgets reference manual)<br>
***************
*** 45,48 ****
--- 46,50 ----
  <a href="#wxBufferedPaintDC">wxBufferedPaintDC</a><br>
[...3308 lines suppressed...]
--- 17208,17213 ----
  <font color=#000077>    <i>%property</i>=MaxLineState, read</font><br>
  <font color=#000077>    <i>%property</i>=CaretLineVisible, read, write</font><br>
! <font color=#000077>    !<i>%wxchkver_2_7_1</i> <i>%property</i>=CaretLineBack, read, write</font><br>
! <font color=#000077>    <i>%wxchkver_2_7_1</i> <i>%property</i>=CaretLineBackground, read, write</font><br>
  <font color=#000077>    <i>%property</i>=Indent, read, write</font><br>
  <font color=#000077>    <i>%property</i>=UseTabs, read, write</font><br>
***************
*** 16655,16659 ****
  <font color=#557700>    <i>%define</i> <i>%event</i> wxEVT_STC_MARGINCLICK</font><br>
  <font color=#557700>    <i>%define</i> <i>%event</i> wxEVT_STC_NEEDSHOWN</font><br>
! <font color=#557700>    !<i>%wxchkver25</i> <i>%define</i> <i>%event</i> wxEVT_STC_POSCHANGED</font><br>
  <font color=#557700>    <i>%define</i> <i>%event</i> wxEVT_STC_PAINTED</font><br>
  <font color=#557700>    <i>%define</i> <i>%event</i> wxEVT_STC_USERLISTSELECTION</font><br>
--- 17278,17282 ----
  <font color=#557700>    <i>%define</i> <i>%event</i> wxEVT_STC_MARGINCLICK</font><br>
  <font color=#557700>    <i>%define</i> <i>%event</i> wxEVT_STC_NEEDSHOWN</font><br>
! <font color=#557700>    !<i>%wxchkver_2_5</i> <i>%define</i> <i>%event</i> wxEVT_STC_POSCHANGED</font><br>
  <font color=#557700>    <i>%define</i> <i>%event</i> wxEVT_STC_PAINTED</font><br>
  <font color=#557700>    <i>%define</i> <i>%event</i> wxEVT_STC_USERLISTSELECTION</font><br>

[Wxlua-commit] wxLua/modules/wxbind/include wxbind.h,1.56,1.57

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

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

Modified Files:
	wxbind.h 
Log Message:
update to wxWidgets 2.8 using C++ headers
Make wxConfig::Read return [bool, value] not the other way around


Index: wxbind.h
===================================================================
RCS file: /cvsroot/wxlua/wxLua/modules/wxbind/include/wxbind.h,v
retrieving revision 1.56
retrieving revision 1.57
diff -C2 -d -r1.56 -r1.57
*** wxbind.h	9 Mar 2007 00:15:13 -0000	1.56
--- wxbind.h	9 Mar 2007 06:10:17 -0000	1.57
***************
*** 852,855 ****
--- 852,857 ----
  extern WXDLLIMPEXP_DATA_WXBIND(int) s_wxluatag_wxPanel;
  extern WXDLLIMPEXP_DATA_WXBIND(int) s_wxluatag_wxProcessEvent;
+ extern WXDLLIMPEXP_DATA_WXBIND(int) s_wxluatag_wxPropagateOnce;
+ extern WXDLLIMPEXP_DATA_WXBIND(int) s_wxluatag_wxPropagationDisabler;
  extern WXDLLIMPEXP_DATA_WXBIND(int) s_wxluatag_wxQueryNewPaletteEvent;
  extern WXDLLIMPEXP_DATA_WXBIND(int) s_wxluatag_wxScrollEvent;
***************
*** 1801,1804 ****
--- 1803,1810 ----
  extern WXDLLIMPEXP_WXBIND WXLUAMETHOD wxProcessEvent_methods[];
  extern WXDLLIMPEXP_DATA_WXBIND(int) wxProcessEvent_methodCount;
+ extern WXDLLIMPEXP_WXBIND WXLUAMETHOD wxPropagateOnce_methods[];
+ extern WXDLLIMPEXP_DATA_WXBIND(int) wxPropagateOnce_methodCount;
+ extern WXDLLIMPEXP_WXBIND WXLUAMETHOD wxPropagationDisabler_methods[];
+ extern WXDLLIMPEXP_DATA_WXBIND(int) wxPropagationDisabler_methodCount;
  extern WXDLLIMPEXP_WXBIND WXLUAMETHOD wxQueryNewPaletteEvent_methods[];
  extern WXDLLIMPEXP_DATA_WXBIND(int) wxQueryNewPaletteEvent_methodCount;
***************
*** 2795,2798 ****
--- 2801,2806 ----
  #endif // (wxCHECK_VERSION(2,8,0)) && (wxLUA_USE_wxDataObject && wxUSE_DATAOBJ)
  
+ wxLUA_DECLARE_ENCAPSULATION(WXDLLIMPEXP_WXBIND, wxPropagateOnce, wxPropagateOnce)
+ wxLUA_DECLARE_ENCAPSULATION(WXDLLIMPEXP_WXBIND, wxPropagationDisabler, wxPropagationDisabler)
  wxLUA_DECLARE_ENCAPSULATION(WXDLLIMPEXP_WXBIND, wxString, wxString)
  wxLUA_DECLARE_ENCAPSULATION(WXDLLIMPEXP_WXBIND, wxWindowDisabler, wxWindowDisabler)

[Wxlua-commit] wxLua/bindings/wxwidgets config.i, 1.16, 1.17 controls.i, 1.29, 1.30 event.i, 1.19, 1.20 override.hpp, 1.61, 1.62 windows.i, 1.29, 1.30 wx_datatypes.lua, 1.52, 1.53

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

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

Modified Files:
	config.i controls.i event.i override.hpp windows.i 
	wx_datatypes.lua 
Log Message:
update to wxWidgets 2.8 using C++ headers
Make wxConfig::Read return [bool, value] not the other way around


Index: config.i
===================================================================
RCS file: /cvsroot/wxlua/wxLua/bindings/wxwidgets/config.i,v
retrieving revision 1.16
retrieving revision 1.17
diff -C2 -d -r1.16 -r1.17
*** config.i	9 Mar 2007 00:15:12 -0000	1.16
--- config.i	9 Mar 2007 06:10:15 -0000	1.17
***************
*** 24,28 ****
      wxCONFIG_USE_RELATIVE_PATH
      wxCONFIG_USE_NO_ESCAPE_CHARACTERS
!     %wxchkver_2_8 wxCONFIG_USE_SUBDIR
  %endenum
  
--- 24,28 ----
      wxCONFIG_USE_RELATIVE_PATH
      wxCONFIG_USE_NO_ESCAPE_CHARACTERS
!     %wxchkver_2_8_1 wxCONFIG_USE_SUBDIR
  %endenum
  
***************
*** 82,92 ****
  
      // Note: wxConfigBase::Read naming convention is same as wxPython, int is long, float is double
!     // %override [string, bool] wxConfigBase::Read(const wxString& key, const wxString& defaultVal = "")
      //bool Read(const wxString& key, wxString* str, const wxString& defaultVal = "") const
      bool Read(const wxString& key, const wxString& defaultVal = "") const
!     // %override [int, bool] wxConfigBase::ReadInt(const wxString& key, long defaultVal = 0)
      //%rename ReadInt bool Read(const wxString&  key, long* l, long defaultVal = 0) const
      %rename ReadInt bool Read(const wxString&  key, long defaultVal = 0) const
!     // %override [double, bool] wxConfigBase::ReadFloat(const wxString& key, double defaultVal = 0)
      //%rename ReadFloat bool Read(const wxString&  key, double* d, double defaultVal = 0) const
      %rename ReadFloat bool Read(const wxString&  key, double defaultVal = 0) const
--- 82,92 ----
  
      // Note: wxConfigBase::Read naming convention is same as wxPython, int is long, float is double
!     // %override [bool, string] wxConfigBase::Read(const wxString& key, const wxString& defaultVal = "")
      //bool Read(const wxString& key, wxString* str, const wxString& defaultVal = "") const
      bool Read(const wxString& key, const wxString& defaultVal = "") const
!     // %override [bool, int] wxConfigBase::ReadInt(const wxString& key, long defaultVal = 0)
      //%rename ReadInt bool Read(const wxString&  key, long* l, long defaultVal = 0) const
      %rename ReadInt bool Read(const wxString&  key, long defaultVal = 0) const
!     // %override [bool, double] wxConfigBase::ReadFloat(const wxString& key, double defaultVal = 0)
      //%rename ReadFloat bool Read(const wxString&  key, double* d, double defaultVal = 0) const
      %rename ReadFloat bool Read(const wxString&  key, double defaultVal = 0) const

Index: wx_datatypes.lua
===================================================================
RCS file: /cvsroot/wxlua/wxLua/bindings/wxwidgets/wx_datatypes.lua,v
retrieving revision 1.52
retrieving revision 1.53
diff -C2 -d -r1.52 -r1.53
*** wx_datatypes.lua	9 Mar 2007 00:15:12 -0000	1.52
--- wx_datatypes.lua	9 Mar 2007 06:10:16 -0000	1.53
***************
*** 77,80 ****
--- 77,85 ----
      Name = "PVOID",
    },
+   Propagation_state = {
+     DefType = "enum",
+     IsNumber = true,
+     Name = "Propagation_state",
+   },
    WXTYPE = {
      DefType = "number",
***************
*** 2471,2474 ****
--- 2476,2489 ----
      Name = "wxProgressDialog",
    },
+   wxPropagateOnce = {
+     DefType = "class",
+     IsNumber = false,
+     Name = "wxPropagateOnce",
+   },
+   wxPropagationDisabler = {
+     DefType = "class",
+     IsNumber = false,
+     Name = "wxPropagationDisabler",
+   },
    wxProtocol = {
      BaseClass = "wxSocketClient",
***************
*** 3467,3470 ****
--- 3482,3486 ----
    ["%wxchkver_2_7"] = "wxCHECK_VERSION(2,7,0)",
    ["%wxchkver_2_8"] = "wxCHECK_VERSION(2,8,0)",
+   ["%wxchkver_2_8_1"] = "wxCHECK_VERSION(2,8,1)",
    ["%wxcompat_2_4"] = "(defined(WXWIN_COMPATIBILITY_2_4) && WXWIN_COMPATIBILITY_2_4)",
    ["%wxcompat_2_6"] = "(defined(WXWIN_COMPATIBILITY_2_6) && WXWIN_COMPATIBILITY_2_6)",

Index: windows.i
===================================================================
RCS file: /cvsroot/wxlua/wxLua/bindings/wxwidgets/windows.i,v
retrieving revision 1.29
retrieving revision 1.30
diff -C2 -d -r1.29 -r1.30
*** windows.i	9 Mar 2007 00:15:12 -0000	1.29
--- windows.i	9 Mar 2007 06:10:16 -0000	1.30
***************
*** 8,11 ****
--- 8,14 ----
  // ============================================================================
  
+ 
+ %wxchkver_2_8 %function wxWindow* wxFindFocusDescendant(wxWindow* ancestor)
+ 
  //-----------------------------------------------------------------------------
  // wxWindowDisabler

Index: override.hpp
===================================================================
RCS file: /cvsroot/wxlua/wxLua/bindings/wxwidgets/override.hpp,v
retrieving revision 1.61
retrieving revision 1.62
diff -C2 -d -r1.61 -r1.62
*** override.hpp	2 Mar 2007 05:44:22 -0000	1.61
--- override.hpp	9 Mar 2007 06:10:15 -0000	1.62
***************
*** 474,481 ****
      // call Read
      bool ret = self->Read(key, &returns, defaultVal);
-     // push the result number
-     wxlState.lua_PushString(returns);
      // push the result bool
      lua_pushboolean(L, ret);
      // return the number of parameters
      return 2;
--- 474,481 ----
      // call Read
      bool ret = self->Read(key, &returns, defaultVal);
      // push the result bool
      lua_pushboolean(L, ret);
+     // push the result string
+     wxlState.lua_PushString(returns);
      // return the number of parameters
      return 2;
***************
*** 499,506 ****
      // call Read
      bool ret = self->Read(key, &returns, defaultVal);
-     // push the result number
-     lua_pushnumber(L, returns);
      // push the result bool
      lua_pushboolean(L, ret);
      // return the number of parameters
      return 2;
--- 499,506 ----
      // call Read
      bool ret = self->Read(key, &returns, defaultVal);
      // push the result bool
      lua_pushboolean(L, ret);
+     // push the result number
+     lua_pushnumber(L, returns);
      // return the number of parameters
      return 2;
***************
*** 524,531 ****
      // call Read
      bool ret = self->Read(key, &returns, defaultVal);
-     // push the result number
-     lua_pushnumber(L, returns);
      // push the result bool
      lua_pushboolean(L, ret);
      // return the number of parameters
      return 2;
--- 524,531 ----
      // call Read
      bool ret = self->Read(key, &returns, defaultVal);
      // push the result bool
      lua_pushboolean(L, ret);
+     // push the result number
+     lua_pushnumber(L, returns);
      // return the number of parameters
      return 2;
***************
*** 637,660 ****
  // ----------------------------------------------------------------------------
  
- 
- %override wxLua_wxControlWithItems_GetStringClientObject
- //     %rename GetStringClientObject wxStringClientData* GetClientObject(int n) const
- static int LUACALL wxLua_wxControlWithItems_GetStringClientObject(lua_State *L)
- {
-     wxLuaState wxlState(L);
-     wxStringClientData *returns;
-     // int n
-     int n = (int)wxlState.GetNumberType(2);
-     // get this
-     wxControlWithItems * self = (wxControlWithItems *)wxlState.GetUserDataType(1, s_wxluatag_wxControlWithItems);
-     // call GetClientObject
-     returns = (wxStringClientData*)self->GetClientObject(n);
-     // push the result datatype
-     wxlState.PushUserDataType(s_wxluatag_wxStringClientData, returns);
- 
-     return 1;
- }
- %end
- 
  %override wxLua_wxListBox_GetSelections
  //     int      GetSelections(wxArrayInt& selections) const
--- 637,640 ----
***************
*** 703,720 ****
  %override wxLua_wxListCtrl_SortItems
  
! static int wxLua_LCF_tag = -1;
! static wxLuaState wxLua_LCF_wxlState;
  
  int wxCALLBACK wxLua_ListCompareFunction(long item1, long item2, long sortData)
  {
!     lua_State *L = wxLua_LCF_wxlState.GetLuaState();
!     lua_rawgeti(L, LUA_REGISTRYINDEX, wxLua_LCF_tag);
      lua_pushnumber(L, item1);
      lua_pushnumber(L, item2);
!     lua_pushnumber(L, sortData);
!     wxLua_LCF_wxlState.LuaCall(3, 1);
  
!     int returns = (int)wxLua_LCF_wxlState.GetNumberType(1);
!     return returns;
  }
  
--- 683,706 ----
  %override wxLua_wxListCtrl_SortItems
  
! 
! struct wxLua_LCF_data // wrap up the wxLuaState, lua_tag, and the compare data
! {
!     wxLuaState* wxlState;
!     int lua_tag;
!     long data;
! };
  
  int wxCALLBACK wxLua_ListCompareFunction(long item1, long item2, long sortData)
  {
!     wxLua_LCF_data* LCF_data = (wxLua_LCF_data*)sortData;
! 
!     lua_State *L = LCF_data->wxlState->GetLuaState();
!     lua_rawgeti(L, LUA_REGISTRYINDEX, LCF_data->lua_tag);
      lua_pushnumber(L, item1);
      lua_pushnumber(L, item2);
!     lua_pushnumber(L, LCF_data->data);
!     LCF_data->wxlState->LuaCall(3, 1);
  
!     return (int)LCF_data->wxlState->GetNumberType(1);
  }
  
***************
*** 723,730 ****
  {
      wxLuaState wxlState(L);
-     wxLua_LCF_wxlState = wxlState;
      long returns;
      // long data
      long data = (long)wxlState.GetNumberType(3);
      // get this
      wxListCtrl *self = (wxListCtrl *)wxlState.GetUserDataType(1, s_wxluatag_wxListCtrl);
--- 709,716 ----
  {
      wxLuaState wxlState(L);
      long returns;
      // long data
      long data = (long)wxlState.GetNumberType(3);
+     wxLua_LCF_data LCF_data = { &wxlState, -1, data };
      // get this
      wxListCtrl *self = (wxListCtrl *)wxlState.GetUserDataType(1, s_wxluatag_wxListCtrl);
***************
*** 733,745 ****
      // lua sort function, was index 2 is now index 1
      if (lua_isfunction (L, 1))
!         wxLua_LCF_tag = luaL_ref(L, LUA_REGISTRYINDEX); // pops it from stack
      else
!         wxlState.terror(wxString::Format(_("wxLua: Expected lua function for parameter %d, but got '%s'."),
                                          2, wxlState.lua_TypeNameIndex(1).c_str()));
  
      // call SortItems
!     returns = self->SortItems(wxLua_ListCompareFunction, data);
!     wxLua_LCF_wxlState.Destroy();
!     wxLua_LCF_tag = -1;
      // push the result number
      lua_pushnumber(L, returns);
--- 719,729 ----
      // lua sort function, was index 2 is now index 1
      if (lua_isfunction (L, 1))
!         LCF_data.lua_tag = luaL_ref(L, LUA_REGISTRYINDEX); // pops it from stack
      else
!         wxlState.terror(wxString::Format(_("wxLua: Expected lua function(long item1, long item2, long data) for parameter %d, but got '%s'."),
                                          2, wxlState.lua_TypeNameIndex(1).c_str()));
  
      // call SortItems
!     returns = self->SortItems(wxLua_ListCompareFunction, (long)&LCF_data);
      // push the result number
      lua_pushnumber(L, returns);
***************
*** 1071,1075 ****
          }
  
-     private:
          wxString valString;
  };
--- 1055,1058 ----

Index: controls.i
===================================================================
RCS file: /cvsroot/wxlua/wxLua/bindings/wxwidgets/controls.i,v
retrieving revision 1.29
retrieving revision 1.30
diff -C2 -d -r1.29 -r1.30
*** controls.i	9 Mar 2007 00:15:12 -0000	1.29
--- controls.i	9 Mar 2007 06:10:15 -0000	1.30
***************
*** 145,150 ****
      //void* GetClientData(unsigned int n) const
      wxClientData* GetClientObject(unsigned int n) const
-     // Get the wxStringClientData if and only if you have called SetClientObject with a wxStringClientData
-     // %override %rename GetStringClientObject wxStringClientData* GetClientObject(int n) const
      %rename GetStringClientObject wxStringClientData* GetClientObject(int n) const
      int GetCount() const
--- 145,148 ----

Index: event.i
===================================================================
RCS file: /cvsroot/wxlua/wxLua/bindings/wxwidgets/event.i,v
retrieving revision 1.19
retrieving revision 1.20
diff -C2 -d -r1.19 -r1.20
*** event.i	9 Mar 2007 00:15:12 -0000	1.19
--- event.i	9 Mar 2007 06:10:15 -0000	1.20
***************
*** 50,53 ****
--- 50,58 ----
  %include "wx/event.h"
  
+ %enum Propagation_state
+     wxEVENT_PROPAGATE_NONE // don't propagate it at all
+     wxEVENT_PROPAGATE_MAX  // propagate it until it is processed
+ %endenum
+ 
  %class %delete wxEvent, wxObject
      // wxEvent(int id = 0, wxEventType eventType = wxEVT_NULL) virtual base class
***************
*** 75,78 ****
--- 80,105 ----
  
  //-----------------------------------------------------------------------------
+ // wxPropagationDisabler
+ 
+ %include "wx/event.h"
+ 
+ %class %noclassinfo %encapsulate %delete wxPropagationDisabler
+     // NOTE: ALWAYS Delete() this when done since lua's gc may not delete it soon enough
+     wxPropagationDisabler(wxEvent& event)
+ 
+ %endclass
+ 
+ //-----------------------------------------------------------------------------
+ // wxPropagateOnce
+ 
+ %include "wx/event.h"
+ 
+ %class %noclassinfo %encapsulate %delete wxPropagateOnce
+     // NOTE: ALWAYS Delete() this when done since lua's gc may not delete it soon enough
+     wxPropagateOnce(wxEvent& event)
+ 
+ %endclass
+ 
+ //-----------------------------------------------------------------------------
  // wxCommandEvent
  
***************
*** 120,125 ****
      wxCommandEvent(wxEventType commandEventType = wxEVT_NULL, int id = 0)
  
!     wxObject* GetClientData() // FIXME does this really work?
      wxClientData* GetClientObject()
      long GetExtraLong()
      int GetInt()
--- 147,153 ----
      wxCommandEvent(wxEventType commandEventType = wxEVT_NULL, int id = 0)
  
!     wxObject* GetClientData()
      wxClientData* GetClientObject()
+     %rename GetStringClientObject wxStringClientData* GetClientObject()
      long GetExtraLong()
      int GetInt()
***************
*** 832,837 ****
--- 860,867 ----
      bool GetChecked() const
      bool GetEnabled() const
+     %wxchkver_2_8 bool GetShown() const
      bool GetSetChecked() const
      bool GetSetEnabled() const
+     %wxchkver_2_8 bool GetSetShown() const
      bool GetSetText() const
      wxString GetText() const
***************
*** 842,845 ****
--- 872,876 ----
      void SetText(const wxString& text)
      static void SetUpdateInterval(long updateInterval)
+     %wxchkver_2_8 void Show(bool show)
  
      %property=Checked, read
***************
*** 869,878 ****
      %define %event wxEVT_CONTEXT_MENU
  
!     wxHelpEvent(wxEventType type = wxEVT_NULL, wxWindowID id = 0, const wxPoint& pt = wxDefaultPosition)
  
      wxString GetLink()
      wxPoint  GetPosition()
      wxString GetTarget()
      void SetLink(const wxString& link)
      void SetPosition(const wxPoint& pos)
      void SetTarget(const wxString& target)
--- 900,912 ----
      %define %event wxEVT_CONTEXT_MENU
  
!     !%wxchkver_2_8 wxHelpEvent(wxEventType type = wxEVT_NULL, wxWindowID id = 0, const wxPoint& pt = wxDefaultPosition)
!     %wxchkver_2_8 wxHelpEvent(wxEventType type = wxEVT_NULL, wxWindowID id = 0, const wxPoint& pt = wxDefaultPosition, wxHelpEvent::Origin origin = wxHelpEvent::Origin_Unknown)
  
      wxString GetLink()
+     %wxchkver_2_8 wxHelpEvent::Origin GetOrigin() const
      wxPoint  GetPosition()
      wxString GetTarget()
      void SetLink(const wxString& link)
+     %wxchkver_2_8 void SetOrigin(wxHelpEvent::Origin origin)
      void SetPosition(const wxPoint& pos)
      void SetTarget(const wxString& target)

[Wxlua-commit] wxLua/bindings/wxstc wxstc_datatypes.lua,1.46,1.47

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

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

Modified Files:
	wxstc_datatypes.lua 
Log Message:
update to wxWidgets 2.8 using C++ headers
Make wxConfig::Read return [bool, value] not the other way around


Index: wxstc_datatypes.lua
===================================================================
RCS file: /cvsroot/wxlua/wxLua/bindings/wxstc/wxstc_datatypes.lua,v
retrieving revision 1.46
retrieving revision 1.47
diff -C2 -d -r1.46 -r1.47
*** wxstc_datatypes.lua	9 Mar 2007 00:15:11 -0000	1.46
--- wxstc_datatypes.lua	9 Mar 2007 06:10:14 -0000	1.47
***************
*** 77,80 ****
--- 77,85 ----
      Name = "PVOID",
    },
+   Propagation_state = {
+     DefType = "enum",
+     IsNumber = true,
+     Name = "Propagation_state",
+   },
    WXTYPE = {
      DefType = "number",
***************
*** 2471,2474 ****
--- 2476,2489 ----
      Name = "wxProgressDialog",
    },
+   wxPropagateOnce = {
+     DefType = "class",
+     IsNumber = false,
+     Name = "wxPropagateOnce",
+   },
+   wxPropagationDisabler = {
+     DefType = "class",
+     IsNumber = false,
+     Name = "wxPropagationDisabler",
+   },
    wxProtocol = {
      BaseClass = "wxSocketClient",
***************
*** 3480,3483 ****
--- 3495,3499 ----
    ["%wxchkver_2_7_1"] = "wxCHECK_VERSION(2,7,1)",
    ["%wxchkver_2_8"] = "wxCHECK_VERSION(2,8,0)",
+   ["%wxchkver_2_8_1"] = "wxCHECK_VERSION(2,8,1)",
    ["%wxcompat_2_4"] = "(defined(WXWIN_COMPATIBILITY_2_4) && WXWIN_COMPATIBILITY_2_4)",
    ["%wxcompat_2_6"] = "(defined(WXWIN_COMPATIBILITY_2_6) && WXWIN_COMPATIBILITY_2_6)",

[Wxlua-commit] wxLua/apps/wxluacan/src wxluacan.cpp, 1.21, 1.22 wxluacan_bind.cpp, 1.14, 1.15

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

Update of /cvsroot/wxlua/wxLua/apps/wxluacan/src
In directory sc8-pr-cvs9.sourceforge.net:/tmp/cvs-serv16936/wxLua/apps/wxluacan/src

Modified Files:
	wxluacan.cpp wxluacan_bind.cpp 
Log Message:
update to wxWidgets 2.8 using C++ headers
Make wxConfig::Read return [bool, value] not the other way around


Index: wxluacan.cpp
===================================================================
RCS file: /cvsroot/wxlua/wxLua/apps/wxluacan/src/wxluacan.cpp,v
retrieving revision 1.21
retrieving revision 1.22
diff -C2 -d -r1.21 -r1.22
*** wxluacan.cpp	26 Feb 2007 01:57:00 -0000	1.21
--- wxluacan.cpp	9 Mar 2007 06:10:13 -0000	1.22
***************
*** 417,421 ****
      wxlCan * self = (wxlCan *)wxlState.GetUserDataType(1, s_wxluatag_wxlCan);
      // call GetCmdh
!     returns = self->GetCmdh();
      // push the result datatype
      wxlState.PushUserDataType(s_wxluatag_wxlLuaCanCmd, returns);
--- 417,421 ----
      wxlCan * self = (wxlCan *)wxlState.GetUserDataType(1, s_wxluatag_wxlCan);
      // call GetCmdh
!     returns = (wxlLuaCanCmd *)self->GetCmdh();
      // push the result datatype
      wxlState.PushUserDataType(s_wxluatag_wxlLuaCanCmd, returns);

Index: wxluacan_bind.cpp
===================================================================
RCS file: /cvsroot/wxlua/wxLua/apps/wxluacan/src/wxluacan_bind.cpp,v
retrieving revision 1.14
retrieving revision 1.15
diff -C2 -d -r1.14 -r1.15
*** wxluacan_bind.cpp	26 Feb 2007 01:57:00 -0000	1.14
--- wxluacan_bind.cpp	9 Mar 2007 06:10:13 -0000	1.15
***************
*** 100,104 ****
      wxlCan *returns;
      // call GetCan
!     returns = GetCan();
      // push the result datatype
      wxlState.PushUserDataType(s_wxluatag_wxlCan, returns);
--- 100,104 ----
      wxlCan *returns;
      // call GetCan
!     returns = (wxlCan *)GetCan();
      // push the result datatype
      wxlState.PushUserDataType(s_wxluatag_wxlCan, returns);
***************
*** 113,117 ****
      wxlLuaCanCmd *returns;
      // call GetCmdhMain
!     returns = GetCmdhMain();
      // push the result datatype
      wxlState.PushUserDataType(s_wxluatag_wxlLuaCanCmd, returns);
--- 113,117 ----
      wxlLuaCanCmd *returns;
      // call GetCmdhMain
!     returns = (wxlLuaCanCmd *)GetCmdhMain();
      // push the result datatype
      wxlState.PushUserDataType(s_wxluatag_wxlLuaCanCmd, returns);

[Wxlua-commit] wxLua/samples editor.wx.lua, 1.44, 1.45 wxluasudoku.wx.lua, 1.65, 1.66

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

Update of /cvsroot/wxlua/wxLua/samples
In directory sc8-pr-cvs9.sourceforge.net:/tmp/cvs-serv16936/wxLua/samples

Modified Files:
	editor.wx.lua wxluasudoku.wx.lua 
Log Message:
update to wxWidgets 2.8 using C++ headers
Make wxConfig::Read return [bool, value] not the other way around


Index: wxluasudoku.wx.lua
===================================================================
RCS file: /cvsroot/wxlua/wxLua/samples/wxluasudoku.wx.lua,v
retrieving revision 1.65
retrieving revision 1.66
diff -C2 -d -r1.65 -r1.66
*** wxluasudoku.wx.lua	1 Mar 2007 05:27:47 -0000	1.65
--- wxluasudoku.wx.lua	9 Mar 2007 06:10:21 -0000	1.66
***************
*** 4292,4296 ****
      if config then
          local dispX, dispY, dispW, dispH = wx.wxClientDisplayRect()
!         local str = config:Read("wxLuaSudoku/Frame")
          local x, y, w, h, max = string.match(str, "x:(%d+) y:(%d+) w:(%d+) h:(%d+) maximized:(%d+)")
          if (x ~= nil) and (y ~= nil) and (w ~= nil) and (h ~= nil) and (max ~= nil) then
--- 4292,4296 ----
      if config then
          local dispX, dispY, dispW, dispH = wx.wxClientDisplayRect()
!         local _, str = config:Read("wxLuaSudoku/Frame")
          local x, y, w, h, max = string.match(str, "x:(%d+) y:(%d+) w:(%d+) h:(%d+) maximized:(%d+)")
          if (x ~= nil) and (y ~= nil) and (w ~= nil) and (h ~= nil) and (max ~= nil) then
***************
*** 4354,4358 ****
          if read then
              if config:HasEntry(key) then
!                 local str = config:Read(key)
                  local r, g, b = string.match(str, "r:(%d+) g:(%d+) b:(%d+)")
                  if (r == nil) or (g == nil) or (b == nil) then return end
--- 4354,4358 ----
          if read then
              if config:HasEntry(key) then
!                 local _, str = config:Read(key)
                  local r, g, b = string.match(str, "r:(%d+) g:(%d+) b:(%d+)")
                  if (r == nil) or (g == nil) or (b == nil) then return end
***************
*** 4371,4375 ****
          if read then
              if config:HasEntry(key) then
!                 local str = config:Read(key)
                  local face, family, style, underlined, weight = string.match(str, "face:(\"[%w ]+\") family:(%d+) style:(%d+) underlined:(%d+) weight:(%d+)")
                  if (face == nil) or (family == nil) or (style == nil) or (underlined == nil) or (weight == nil) then return end
--- 4371,4375 ----
          if read then
              if config:HasEntry(key) then
!                 local _, str = config:Read(key)
                  local face, family, style, underlined, weight = string.match(str, "face:(\"[%w ]+\") family:(%d+) style:(%d+) underlined:(%d+) weight:(%d+)")
                  if (face == nil) or (family == nil) or (style == nil) or (underlined == nil) or (weight == nil) then return end
***************
*** 4406,4417 ****
  
      if read then
          if config:HasEntry(path.."/LastOpenedFilepath") then
!             sudokuGUI.filePath   = config:Read(path.."/LastOpenedFilepath")
          end
          if config:HasEntry(path.."/LastOpenedFilename") then
!             sudokuGUI.fileName   = config:Read(path.."/LastOpenedFilename")
          end
          if config:HasEntry(path.."/GenerateDifficulty") then
!             sudokuGUI.difficulty = config:ReadInt(path.."/GenerateDifficulty")
          end
      else
--- 4406,4418 ----
  
      if read then
+         local _
          if config:HasEntry(path.."/LastOpenedFilepath") then
!             _, sudokuGUI.filePath   = config:Read(path.."/LastOpenedFilepath")
          end
          if config:HasEntry(path.."/LastOpenedFilename") then
!             _, sudokuGUI.fileName   = config:Read(path.."/LastOpenedFilename")
          end
          if config:HasEntry(path.."/GenerateDifficulty") then
!             _, sudokuGUI.difficulty = config:ReadInt(path.."/GenerateDifficulty")
          end
      else
***************
*** 4442,4447 ****
          if read then
              if config:HasEntry(key) then
!                 local v = inttobool(config:ReadInt(key))
!                 sudokuGUI.CheckMenuItem(pref, v)
              end
          else
--- 4443,4448 ----
          if read then
              if config:HasEntry(key) then
!                 local _, v = config:ReadInt(key)
!                 sudokuGUI.CheckMenuItem(pref, inttobool(v))
              end
          else

Index: editor.wx.lua
===================================================================
RCS file: /cvsroot/wxlua/wxLua/samples/editor.wx.lua,v
retrieving revision 1.44
retrieving revision 1.45
diff -C2 -d -r1.44 -r1.45
*** editor.wx.lua	22 Feb 2007 05:40:54 -0000	1.44
--- editor.wx.lua	9 Mar 2007 06:10:20 -0000	1.45
***************
*** 241,249 ****
      config:SetPath("/"..windowName)
  
!     local s = config:ReadInt("s", -1)
!     local x = config:ReadInt("x", 0)
!     local y = config:ReadInt("y", 0)
!     local w = config:ReadInt("w", 0)
!     local h = config:ReadInt("h", 0)
  
      if (s ~= -1) and (s ~= 2) then
--- 241,249 ----
      config:SetPath("/"..windowName)
  
!     local _, s = config:ReadInt("s", -1)
!     local _, x = config:ReadInt("x", 0)
!     local _, y = config:ReadInt("y", 0)
!     local _, w = config:ReadInt("w", 0)
!     local _, h = config:ReadInt("h", 0)
  
      if (s ~= -1) and (s ~= 2) then

[Wxlua-commit] wxLua/modules/wxbind/src config.cpp, 1.29, 1.30 controls.cpp, 1.45, 1.46 data.cpp, 1.36, 1.37 event.cpp, 1.36, 1.37 wx_bind.cpp, 1.83, 1.84

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

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

Modified Files:
	config.cpp controls.cpp data.cpp event.cpp wx_bind.cpp 
Log Message:
update to wxWidgets 2.8 using C++ headers
Make wxConfig::Read return [bool, value] not the other way around


Index: event.cpp
===================================================================
RCS file: /cvsroot/wxlua/wxLua/modules/wxbind/src/event.cpp,v
retrieving revision 1.36
retrieving revision 1.37
diff -C2 -d -r1.36 -r1.37
*** event.cpp	9 Mar 2007 00:15:15 -0000	1.36
--- event.cpp	9 Mar 2007 06:10:18 -0000	1.37
***************
*** 667,670 ****
--- 667,792 ----
  
  // ---------------------------------------------------------------------------
+ // Bind class wxPropagationDisabler
+ // ---------------------------------------------------------------------------
+ 
+ // Lua MetaTable Tag for Class 'wxPropagationDisabler'
+ int s_wxluatag_wxPropagationDisabler = -1;
+ 
+ static wxLuaArgTag s_wxluatagArray_wxLua_wxPropagationDisabler_constructor[] = { &s_wxluatag_wxEvent, 0 };
+ //     wxPropagationDisabler(wxEvent& event)
+ static int LUACALL wxLua_wxPropagationDisabler_constructor(lua_State *L)
+ {
+     wxLuaState wxlState(L);
+     wxPropagationDisabler *returns;
+     // wxEvent event
+     wxEvent * event = (wxEvent *)wxlState.GetUserDataType(1, s_wxluatag_wxEvent);
+     // call constructor
+     returns = new wxPropagationDisabler(*event);
+     // add to tracked memory list
+     wxLua_AddTrackedObject(wxlState, (wxPropagationDisabler *)returns);
+     // push the constructed class pointer
+     wxlState.PushUserDataType(s_wxluatag_wxPropagationDisabler, returns);
+ 
+     return 1;
+ }
+ 
+ static int LUACALL wxLua_wxPropagationDisabler_destructor(lua_State *L)
+ {
+     wxLuaState wxlState(L);
+     wxPropagationDisabler * self = (wxPropagationDisabler *)wxlState.GetUserDataType(1, s_wxluatag_wxPropagationDisabler);
+ 
+     // remove from tracked memory list
+     if (self != 0)
+         wxlState.RemoveTrackedObject(self);
+     return 0;
+ }
+ 
+ static int LUACALL wxLua_wxPropagationDisabler_Delete(lua_State *L)
+ {
+     wxLuaState wxlState(L);
+     wxPropagationDisabler * self = (wxPropagationDisabler *)wxlState.GetUserDataType(1, s_wxluatag_wxPropagationDisabler);
+     // remove from tracked memory list
+     if (self != 0)
+         if (wxlState.RemoveTrackedObject(self))
+         {   // if removed, reset the tag so that gc() is not called on this object.
+             lua_pushnil(L);
+             lua_setmetatable(L, -2);
+         }
+     return 0;
+ }
+ 
+ 
+ 
+ // Map Lua Class Methods to C Binding Functions
+ WXLUAMETHOD wxPropagationDisabler_methods[] = {
+     { LuaConstructor, "wxPropagationDisabler", wxLua_wxPropagationDisabler_constructor, 1, 1, s_wxluatagArray_wxLua_wxPropagationDisabler_constructor },
+     { LuaDelete, "wxPropagationDisabler", wxLua_wxPropagationDisabler_destructor, 0, 0, s_wxluaargArray_None },
+     { LuaMethod, "Delete", wxLua_wxPropagationDisabler_Delete, 0, 0, s_wxluaargArray_None },
+ };
+ 
+ int wxPropagationDisabler_methodCount = sizeof(wxPropagationDisabler_methods)/sizeof(wxPropagationDisabler_methods[0]);
+ 
+ // ---------------------------------------------------------------------------
+ // Bind class wxPropagateOnce
+ // ---------------------------------------------------------------------------
+ 
+ // Lua MetaTable Tag for Class 'wxPropagateOnce'
+ int s_wxluatag_wxPropagateOnce = -1;
+ 
+ static wxLuaArgTag s_wxluatagArray_wxLua_wxPropagateOnce_constructor[] = { &s_wxluatag_wxEvent, 0 };
+ //     wxPropagateOnce(wxEvent& event)
+ static int LUACALL wxLua_wxPropagateOnce_constructor(lua_State *L)
+ {
+     wxLuaState wxlState(L);
+     wxPropagateOnce *returns;
+     // wxEvent event
+     wxEvent * event = (wxEvent *)wxlState.GetUserDataType(1, s_wxluatag_wxEvent);
+     // call constructor
+     returns = new wxPropagateOnce(*event);
+     // add to tracked memory list
+     wxLua_AddTrackedObject(wxlState, (wxPropagateOnce *)returns);
+     // push the constructed class pointer
+     wxlState.PushUserDataType(s_wxluatag_wxPropagateOnce, returns);
+ 
+     return 1;
+ }
+ 
+ static int LUACALL wxLua_wxPropagateOnce_destructor(lua_State *L)
+ {
+     wxLuaState wxlState(L);
+     wxPropagateOnce * self = (wxPropagateOnce *)wxlState.GetUserDataType(1, s_wxluatag_wxPropagateOnce);
+ 
+     // remove from tracked memory list
+     if (self != 0)
+         wxlState.RemoveTrackedObject(self);
+     return 0;
+ }
+ 
+ static int LUACALL wxLua_wxPropagateOnce_Delete(lua_State *L)
+ {
+     wxLuaState wxlState(L);
+     wxPropagateOnce * self = (wxPropagateOnce *)wxlState.GetUserDataType(1, s_wxluatag_wxPropagateOnce);
+     // remove from tracked memory list
+     if (self != 0)
+         if (wxlState.RemoveTrackedObject(self))
+         {   // if removed, reset the tag so that gc() is not called on this object.
+             lua_pushnil(L);
+             lua_setmetatable(L, -2);
+         }
+     return 0;
+ }
+ 
+ 
+ 
+ // Map Lua Class Methods to C Binding Functions
+ WXLUAMETHOD wxPropagateOnce_methods[] = {
+     { LuaConstructor, "wxPropagateOnce", wxLua_wxPropagateOnce_constructor, 1, 1, s_wxluatagArray_wxLua_wxPropagateOnce_constructor },
+     { LuaDelete, "wxPropagateOnce", wxLua_wxPropagateOnce_destructor, 0, 0, s_wxluaargArray_None },
+     { LuaMethod, "Delete", wxLua_wxPropagateOnce_Delete, 0, 0, s_wxluaargArray_None },
+ };
+ 
+ int wxPropagateOnce_methodCount = sizeof(wxPropagateOnce_methods)/sizeof(wxPropagateOnce_methods[0]);
+ 
+ // ---------------------------------------------------------------------------
  // Bind class wxCommandEvent
  // ---------------------------------------------------------------------------
***************
*** 710,713 ****
--- 832,850 ----
  }
  
+ //     %rename GetStringClientObject wxStringClientData* GetClientObject()
+ static int LUACALL wxLua_wxCommandEvent_GetStringClientObject(lua_State *L)
+ {
+     wxLuaState wxlState(L);
+     wxStringClientData *returns;
+     // get this
+     wxCommandEvent * self = (wxCommandEvent *)wxlState.GetUserDataType(1, s_wxluatag_wxCommandEvent);
+     // call GetClientObject
+     returns = (wxStringClientData *)self->GetClientObject();
+     // push the result datatype
+     wxlState.PushUserDataType(s_wxluatag_wxStringClientData, returns);
+ 
+     return 1;
+ }
+ 
  //     long GetExtraLong()
  static int LUACALL wxLua_wxCommandEvent_GetExtraLong(lua_State *L)
***************
*** 911,914 ****
--- 1048,1052 ----
      { LuaConstructor, "wxCommandEvent", wxLua_wxCommandEvent_constructor, 2, 0, s_wxluatagArray_wxLua_wxCommandEvent_constructor },
      { LuaMethod, "GetClientObject", wxLua_wxCommandEvent_GetClientObject, 0, 0, s_wxluaargArray_None },
+     { LuaMethod, "GetStringClientObject", wxLua_wxCommandEvent_GetStringClientObject, 0, 0, s_wxluaargArray_None },
      { LuaMethod, "GetExtraLong", wxLua_wxCommandEvent_GetExtraLong, 0, 0, s_wxluaargArray_None },
      { LuaMethod, "GetInt", wxLua_wxCommandEvent_GetInt, 0, 0, s_wxluaargArray_None },
***************
*** 4684,4687 ****
--- 4822,4874 ----
  
  
+ #if wxCHECK_VERSION(2,8,0)
+ //     %wxchkver_2_8 bool GetShown() const
+ static int LUACALL wxLua_wxUpdateUIEvent_GetShown(lua_State *L)
+ {
+     wxLuaState wxlState(L);
+     bool returns;
+     // get this
+     wxUpdateUIEvent * self = (wxUpdateUIEvent *)wxlState.GetUserDataType(1, s_wxluatag_wxUpdateUIEvent);
+     // call GetShown
+     returns = self->GetShown();
+     // push the result flag
+     lua_pushboolean(L, returns);
+ 
+     return 1;
+ }
+ 
+ //     %wxchkver_2_8 bool GetSetShown() const
+ static int LUACALL wxLua_wxUpdateUIEvent_GetSetShown(lua_State *L)
+ {
+     wxLuaState wxlState(L);
+     bool returns;
+     // get this
+     wxUpdateUIEvent * self = (wxUpdateUIEvent *)wxlState.GetUserDataType(1, s_wxluatag_wxUpdateUIEvent);
+     // call GetSetShown
+     returns = self->GetSetShown();
+     // push the result flag
+     lua_pushboolean(L, returns);
+ 
+     return 1;
+ }
+ 
+ static wxLuaArgTag s_wxluatagArray_wxLua_wxUpdateUIEvent_Show[] = { &s_wxluaarg_Boolean, 0 };
+ //     %wxchkver_2_8 void Show(bool show)
+ static int LUACALL wxLua_wxUpdateUIEvent_Show(lua_State *L)
+ {
+     wxLuaState wxlState(L);
+     // bool show
+     bool show = wxlState.GetBooleanType(2);
+     // get this
+     wxUpdateUIEvent * self = (wxUpdateUIEvent *)wxlState.GetUserDataType(1, s_wxluatag_wxUpdateUIEvent);
+     // call Show
+     self->Show(show);
+ 
+     return 0;
+ }
+ 
+ #endif // wxCHECK_VERSION(2,8,0)
+ 
+ 
  
  // Map Lua Class Methods to C Binding Functions
***************
*** 4712,4715 ****
--- 4899,4909 ----
      { LuaDelete, "wxUpdateUIEvent", wxLua_wxUpdateUIEvent_destructor, 0, 0, s_wxluaargArray_None },
      { LuaMethod, "Delete", wxLua_wxUpdateUIEvent_Delete, 0, 0, s_wxluaargArray_None },
+ 
+ #if wxCHECK_VERSION(2,8,0)
+     { LuaMethod, "GetShown", wxLua_wxUpdateUIEvent_GetShown, 0, 0, s_wxluaargArray_None },
+     { LuaMethod, "GetSetShown", wxLua_wxUpdateUIEvent_GetSetShown, 0, 0, s_wxluaargArray_None },
+     { LuaMethod, "Show", wxLua_wxUpdateUIEvent_Show, 1, 1, s_wxluatagArray_wxLua_wxUpdateUIEvent_Show },
+ #endif  // wxCHECK_VERSION(2,8,0)
+ 
  };
  
***************
*** 4723,4726 ****
--- 4917,4978 ----
  int s_wxluatag_wxHelpEvent = -1;
  
+ 
+ #if (!wxCHECK_VERSION(2,8,0)) && (wxLUA_USE_wxPointSizeRect)
+ static wxLuaArgTag s_wxluatagArray_wxLua_wxHelpEvent_constructor[] = { &s_wxluaarg_Number, &s_wxluaarg_Number, &s_wxluatag_wxPoint, 0 };
+ //     !%wxchkver_2_8 wxHelpEvent(wxEventType type = wxEVT_NULL, wxWindowID id = 0, const wxPoint& pt = wxDefaultPosition)
+ static int LUACALL wxLua_wxHelpEvent_constructor(lua_State *L)
+ {
+     wxLuaState wxlState(L);
+     wxHelpEvent *returns;
+     // get number of arguments
+     int argCount = lua_gettop(L);
+     // const wxPoint pt = wxDefaultPosition
+     const wxPoint * pt = (argCount >= 3 ? (const wxPoint *)wxlState.GetUserDataType(3, s_wxluatag_wxPoint) : &wxDefaultPosition);
+     // wxWindowID id = 0
+     wxWindowID id = (argCount >= 2 ? (wxWindowID)wxlState.GetNumberType(2) : 0);
+     // wxEventType type = wxEVT_NULL
+     wxEventType type = (argCount >= 1 ? (wxEventType)wxlState.GetNumberType(1) : wxEVT_NULL);
+     // call constructor
+     returns = new wxHelpEvent(type, id, *pt);
+     // add to tracked memory list
+     wxLua_AddTrackedObject(wxlState, (wxHelpEvent *)returns);
+     // push the constructed class pointer
+     wxlState.PushUserDataType(s_wxluatag_wxHelpEvent, returns);
+ 
+     return 1;
+ }
+ 
+ #endif // (!wxCHECK_VERSION(2,8,0)) && (wxLUA_USE_wxPointSizeRect)
+ 
+ 
+ #if (wxLUA_USE_wxPointSizeRect) && (wxCHECK_VERSION(2,8,0))
+ static wxLuaArgTag s_wxluatagArray_wxLua_wxHelpEvent_constructor[] = { &s_wxluaarg_Number, &s_wxluaarg_Number, &s_wxluatag_wxPoint, &s_wxluaarg_Enumeration, 0 };
+ //     %wxchkver_2_8 wxHelpEvent(wxEventType type = wxEVT_NULL, wxWindowID id = 0, const wxPoint& pt = wxDefaultPosition, wxHelpEvent::Origin origin = wxHelpEvent::Origin_Unknown)
+ static int LUACALL wxLua_wxHelpEvent_constructor(lua_State *L)
+ {
+     wxLuaState wxlState(L);
+     wxHelpEvent *returns;
+     // get number of arguments
+     int argCount = lua_gettop(L);
+     // wxHelpEvent::Origin origin = wxHelpEvent::Origin_Unknown
+     wxHelpEvent::Origin origin = (argCount >= 4 ? (wxHelpEvent::Origin)wxlState.GetEnumerationType(4) : wxHelpEvent::Origin_Unknown);
+     // const wxPoint pt = wxDefaultPosition
+     const wxPoint * pt = (argCount >= 3 ? (const wxPoint *)wxlState.GetUserDataType(3, s_wxluatag_wxPoint) : &wxDefaultPosition);
+     // wxWindowID id = 0
+     wxWindowID id = (argCount >= 2 ? (wxWindowID)wxlState.GetNumberType(2) : 0);
+     // wxEventType type = wxEVT_NULL
+     wxEventType type = (argCount >= 1 ? (wxEventType)wxlState.GetNumberType(1) : wxEVT_NULL);
+     // call constructor
+     returns = new wxHelpEvent(type, id, *pt, origin);
+     // add to tracked memory list
+     wxLua_AddTrackedObject(wxlState, (wxHelpEvent *)returns);
+     // push the constructed class pointer
+     wxlState.PushUserDataType(s_wxluatag_wxHelpEvent, returns);
+ 
+     return 1;
+ }
+ 
+ #endif // (wxLUA_USE_wxPointSizeRect) && (wxCHECK_VERSION(2,8,0))
+ 
  //     wxString GetLink()
  static int LUACALL wxLua_wxHelpEvent_GetLink(lua_State *L)
***************
*** 4809,4837 ****
  
  
! #if wxLUA_USE_wxPointSizeRect
! static wxLuaArgTag s_wxluatagArray_wxLua_wxHelpEvent_constructor[] = { &s_wxluaarg_Number, &s_wxluaarg_Number, &s_wxluatag_wxPoint, 0 };
! //     wxHelpEvent(wxEventType type = wxEVT_NULL, wxWindowID id = 0, const wxPoint& pt = wxDefaultPosition)
! static int LUACALL wxLua_wxHelpEvent_constructor(lua_State *L)
  {
      wxLuaState wxlState(L);
!     wxHelpEvent *returns;
!     // get number of arguments
!     int argCount = lua_gettop(L);
!     // const wxPoint pt = wxDefaultPosition
!     const wxPoint * pt = (argCount >= 3 ? (const wxPoint *)wxlState.GetUserDataType(3, s_wxluatag_wxPoint) : &wxDefaultPosition);
!     // wxWindowID id = 0
!     wxWindowID id = (argCount >= 2 ? (wxWindowID)wxlState.GetNumberType(2) : 0);
!     // wxEventType type = wxEVT_NULL
!     wxEventType type = (argCount >= 1 ? (wxEventType)wxlState.GetNumberType(1) : wxEVT_NULL);
!     // call constructor
!     returns = new wxHelpEvent(type, id, *pt);
!     // add to tracked memory list
!     wxLua_AddTrackedObject(wxlState, (wxHelpEvent *)returns);
!     // push the constructed class pointer
!     wxlState.PushUserDataType(s_wxluatag_wxHelpEvent, returns);
  
      return 1;
  }
  
  //     wxPoint  GetPosition()
  static int LUACALL wxLua_wxHelpEvent_GetPosition(lua_State *L)
--- 5061,5099 ----
  
  
! #if wxCHECK_VERSION(2,8,0)
! //     %wxchkver_2_8 wxHelpEvent::Origin GetOrigin() const
! static int LUACALL wxLua_wxHelpEvent_GetOrigin(lua_State *L)
  {
      wxLuaState wxlState(L);
!     wxHelpEvent::Origin returns;
!     // get this
!     wxHelpEvent * self = (wxHelpEvent *)wxlState.GetUserDataType(1, s_wxluatag_wxHelpEvent);
!     // call GetOrigin
!     returns = self->GetOrigin();
!     // push the result number
!     lua_pushnumber(L, returns);
  
      return 1;
  }
  
+ static wxLuaArgTag s_wxluatagArray_wxLua_wxHelpEvent_SetOrigin[] = { &s_wxluaarg_Enumeration, 0 };
+ //     %wxchkver_2_8 void SetOrigin(wxHelpEvent::Origin origin)
+ static int LUACALL wxLua_wxHelpEvent_SetOrigin(lua_State *L)
+ {
+     wxLuaState wxlState(L);
+     // wxHelpEvent::Origin origin
+     wxHelpEvent::Origin origin = (wxHelpEvent::Origin)wxlState.GetEnumerationType(2);
+     // get this
+     wxHelpEvent * self = (wxHelpEvent *)wxlState.GetUserDataType(1, s_wxluatag_wxHelpEvent);
+     // call SetOrigin
+     self->SetOrigin(origin);
+ 
+     return 0;
+ }
+ 
+ #endif // wxCHECK_VERSION(2,8,0)
+ 
+ 
+ #if wxLUA_USE_wxPointSizeRect
  //     wxPoint  GetPosition()
  static int LUACALL wxLua_wxHelpEvent_GetPosition(lua_State *L)
***************
*** 4873,4876 ****
--- 5135,5148 ----
  // Map Lua Class Methods to C Binding Functions
  WXLUAMETHOD wxHelpEvent_methods[] = {
+ 
+ #if (!wxCHECK_VERSION(2,8,0)) && (wxLUA_USE_wxPointSizeRect)
+     { LuaConstructor, "wxHelpEvent", wxLua_wxHelpEvent_constructor, 3, 0, s_wxluatagArray_wxLua_wxHelpEvent_constructor },
+ #endif  // (!wxCHECK_VERSION(2,8,0)) && (wxLUA_USE_wxPointSizeRect)
+ 
+ 
+ #if (wxLUA_USE_wxPointSizeRect) && (wxCHECK_VERSION(2,8,0))
+     { LuaConstructor, "wxHelpEvent", wxLua_wxHelpEvent_constructor, 4, 0, s_wxluatagArray_wxLua_wxHelpEvent_constructor },
+ #endif  // (wxLUA_USE_wxPointSizeRect) && (wxCHECK_VERSION(2,8,0))
+ 
      { LuaMethod, "GetLink", wxLua_wxHelpEvent_GetLink, 0, 0, s_wxluaargArray_None },
      { LuaMethod, "GetTarget", wxLua_wxHelpEvent_GetTarget, 0, 0, s_wxluaargArray_None },
***************
*** 4884,4889 ****
      { LuaMethod, "Delete", wxLua_wxHelpEvent_Delete, 0, 0, s_wxluaargArray_None },
  
  #if wxLUA_USE_wxPointSizeRect
-     { LuaConstructor, "wxHelpEvent", wxLua_wxHelpEvent_constructor, 3, 0, s_wxluatagArray_wxLua_wxHelpEvent_constructor },
      { LuaMethod, "GetPosition", wxLua_wxHelpEvent_GetPosition, 0, 0, s_wxluaargArray_None },
      { LuaMethod, "SetPosition", wxLua_wxHelpEvent_SetPosition, 1, 1, s_wxluatagArray_wxLua_wxHelpEvent_SetPosition },
--- 5156,5166 ----
      { LuaMethod, "Delete", wxLua_wxHelpEvent_Delete, 0, 0, s_wxluaargArray_None },
  
+ #if wxCHECK_VERSION(2,8,0)
+     { LuaMethod, "GetOrigin", wxLua_wxHelpEvent_GetOrigin, 0, 0, s_wxluaargArray_None },
+     { LuaMethod, "SetOrigin", wxLua_wxHelpEvent_SetOrigin, 1, 1, s_wxluatagArray_wxLua_wxHelpEvent_SetOrigin },
+ #endif  // wxCHECK_VERSION(2,8,0)
+ 
+ 
  #if wxLUA_USE_wxPointSizeRect
      { LuaMethod, "GetPosition", wxLua_wxHelpEvent_GetPosition, 0, 0, s_wxluaargArray_None },
      { LuaMethod, "SetPosition", wxLua_wxHelpEvent_SetPosition, 1, 1, s_wxluatagArray_wxLua_wxHelpEvent_SetPosition },

Index: data.cpp
===================================================================
RCS file: /cvsroot/wxlua/wxLua/modules/wxbind/src/data.cpp,v
retrieving revision 1.36
retrieving revision 1.37
diff -C2 -d -r1.36 -r1.37
*** data.cpp	9 Mar 2007 00:15:14 -0000	1.36
--- data.cpp	9 Mar 2007 06:10:18 -0000	1.37
***************
*** 808,812 ****
          }
  
-     private:
          wxString valString;
  };
--- 808,811 ----

Index: wx_bind.cpp
===================================================================
RCS file: /cvsroot/wxlua/wxLua/modules/wxbind/src/wx_bind.cpp,v
retrieving revision 1.83
retrieving revision 1.84
diff -C2 -d -r1.83 -r1.84
*** wx_bind.cpp	9 Mar 2007 00:15:17 -0000	1.83
--- wx_bind.cpp	9 Mar 2007 06:10:18 -0000	1.84
***************
*** 1426,1433 ****
  #endif // (wxCHECK_VERSION(2,8,0)) && (wxLUA_USE_wxAcceleratorTable && wxUSE_ACCEL)
  
- #if (wxCHECK_VERSION(2,8,0)) && (wxLUA_USE_wxConfig && wxUSE_CONFIG)
-         { "wxCONFIG_USE_SUBDIR", wxCONFIG_USE_SUBDIR },
- #endif // (wxCHECK_VERSION(2,8,0)) && (wxLUA_USE_wxConfig && wxUSE_CONFIG)
- 
  #if (wxCHECK_VERSION(2,8,0)) && (wxLUA_USE_wxDC)
          { "wxLayout_Default", wxLayout_Default },
--- 1426,1429 ----
***************
*** 1457,1460 ****
--- 1453,1460 ----
  #endif // (wxCHECK_VERSION(2,8,0)) && (wxUSE_HOTKEY)
  
+ #if (wxCHECK_VERSION(2,8,1)) && (wxLUA_USE_wxConfig && wxUSE_CONFIG)
+         { "wxCONFIG_USE_SUBDIR", wxCONFIG_USE_SUBDIR },
+ #endif // (wxCHECK_VERSION(2,8,1)) && (wxLUA_USE_wxConfig && wxUSE_CONFIG)
+ 
  #if (wxLUA_USE_wxLuaPrintout) && (wxLUA_USE_wxPrint && wxUSE_PRINTING_ARCHITECTURE)
          { "wxPRINTER_CANCELLED", wxPRINTER_CANCELLED },
***************
*** 1666,1669 ****
--- 1666,1671 ----
          { "wxDOWN", wxDOWN },
          { "wxEAST", wxEAST },
+         { "wxEVENT_PROPAGATE_MAX", wxEVENT_PROPAGATE_MAX },
+         { "wxEVENT_PROPAGATE_NONE", wxEVENT_PROPAGATE_NONE },
          { "wxEXPAND", wxEXPAND },
          { "wxFILE_MUST_EXIST", wxFILE_MUST_EXIST },
***************
*** 4667,4670 ****
--- 4669,4692 ----
  #endif // wxCHECK_VERSION(2,7,0)
  
+ #if wxCHECK_VERSION(2,8,0)
+ 
+ static wxLuaArgTag s_wxluatagArray_wxLua_function_wxFindFocusDescendant[] = { &s_wxluatag_wxWindow, 0 };
+ // %wxchkver_2_8 %function wxWindow* wxFindFocusDescendant(wxWindow* ancestor)
+ static int LUACALL wxLua_function_wxFindFocusDescendant(lua_State *L)
+ {
+     wxLuaState wxlState(L);
+     wxWindow *returns;
+     // wxWindow ancestor
+     wxWindow * ancestor = (wxWindow *)wxlState.GetUserDataType(1, s_wxluatag_wxWindow);
+     // call wxFindFocusDescendant
+     returns = (wxWindow *)wxFindFocusDescendant(ancestor);
+     // push the result datatype
+     wxlState.PushUserDataType(s_wxluatag_wxWindow, returns);
+ 
+     return 1;
+ }
+ 
+ #endif // wxCHECK_VERSION(2,8,0)
+ 
  #if wxCHECK_VERSION(2,8,0) && wxUSE_ABOUTDLG && wxLUA_USE_wxAboutDialog
  
***************
*** 5572,5575 ****
--- 5594,5602 ----
  
  
+ #if wxCHECK_VERSION(2,8,0)
+         { LuaGlobal, "wxFindFocusDescendant", wxLua_function_wxFindFocusDescendant, 1, 1, s_wxluatagArray_wxLua_function_wxFindFocusDescendant },
+ #endif // wxCHECK_VERSION(2,8,0)
+ 
+ 
  #if wxCHECK_VERSION(2,8,0) && wxUSE_ABOUTDLG && wxLUA_USE_wxAboutDialog
          { LuaGlobal, "wxAboutBox", wxLua_function_wxAboutBox, 1, 1, s_wxluatagArray_wxLua_function_wxAboutBox },
***************
*** 5920,5923 ****
--- 5947,5952 ----
          { "wxPanel", wxPanel_methods, wxPanel_methodCount, CLASSINFO(wxPanel), &s_wxluatag_wxPanel, "wxWindow", NULL }, 
          { "wxProcessEvent", wxProcessEvent_methods, wxProcessEvent_methodCount, CLASSINFO(wxProcessEvent), &s_wxluatag_wxProcessEvent, "wxEvent", NULL }, 
+         { "wxPropagateOnce", wxPropagateOnce_methods, wxPropagateOnce_methodCount, NULL, &s_wxluatag_wxPropagateOnce, NULL, NULL }, 
+         { "wxPropagationDisabler", wxPropagationDisabler_methods, wxPropagationDisabler_methodCount, NULL, &s_wxluatag_wxPropagationDisabler, NULL, NULL }, 
          { "wxQueryNewPaletteEvent", wxQueryNewPaletteEvent_methods, wxQueryNewPaletteEvent_methodCount, CLASSINFO(wxQueryNewPaletteEvent), &s_wxluatag_wxQueryNewPaletteEvent, "wxEvent", NULL }, 
          { "wxScrollEvent", wxScrollEvent_methods, wxScrollEvent_methodCount, CLASSINFO(wxScrollEvent), &s_wxluatag_wxScrollEvent, "wxCommandEvent", NULL }, 
***************
*** 6846,6849 ****
--- 6875,6880 ----
  #endif // (wxCHECK_VERSION(2,8,0)) && (wxLUA_USE_wxDataObject && wxUSE_DATAOBJ)
  
+ wxLUA_IMPLEMENT_ENCAPSULATION(wxPropagateOnce, wxPropagateOnce)
+ wxLUA_IMPLEMENT_ENCAPSULATION(wxPropagationDisabler, wxPropagationDisabler)
  wxLUA_IMPLEMENT_ENCAPSULATION(wxString, wxString)
  wxLUA_IMPLEMENT_ENCAPSULATION(wxWindowDisabler, wxWindowDisabler)

Index: controls.cpp
===================================================================
RCS file: /cvsroot/wxlua/wxLua/modules/wxbind/src/controls.cpp,v
retrieving revision 1.45
retrieving revision 1.46
diff -C2 -d -r1.45 -r1.46
*** controls.cpp	9 Mar 2007 00:15:13 -0000	1.45
--- controls.cpp	9 Mar 2007 06:10:17 -0000	1.46
***************
*** 1020,1024 ****
  
  static wxLuaArgTag s_wxluatagArray_wxLua_wxControlWithItems_GetStringClientObject[] = { &s_wxluaarg_Number, 0 };
- // %override wxLua_wxControlWithItems_GetStringClientObject
  //     %rename GetStringClientObject wxStringClientData* GetClientObject(int n) const
  static int LUACALL wxLua_wxControlWithItems_GetStringClientObject(lua_State *L)
--- 1020,1023 ----
***************
*** 1031,1035 ****
      wxControlWithItems * self = (wxControlWithItems *)wxlState.GetUserDataType(1, s_wxluatag_wxControlWithItems);
      // call GetClientObject
!     returns = (wxStringClientData*)self->GetClientObject(n);
      // push the result datatype
      wxlState.PushUserDataType(s_wxluatag_wxStringClientData, returns);
--- 1030,1034 ----
      wxControlWithItems * self = (wxControlWithItems *)wxlState.GetUserDataType(1, s_wxluatag_wxControlWithItems);
      // call GetClientObject
!     returns = (wxStringClientData *)self->GetClientObject(n);
      // push the result datatype
      wxlState.PushUserDataType(s_wxluatag_wxStringClientData, returns);
***************
*** 3776,3793 ****
  // %override wxLua_wxListCtrl_SortItems
  
! static int wxLua_LCF_tag = -1;
! static wxLuaState wxLua_LCF_wxlState;
  
  int wxCALLBACK wxLua_ListCompareFunction(long item1, long item2, long sortData)
  {
!     lua_State *L = wxLua_LCF_wxlState.GetLuaState();
!     lua_rawgeti(L, LUA_REGISTRYINDEX, wxLua_LCF_tag);
      lua_pushnumber(L, item1);
      lua_pushnumber(L, item2);
!     lua_pushnumber(L, sortData);
!     wxLua_LCF_wxlState.LuaCall(3, 1);
  
!     int returns = (int)wxLua_LCF_wxlState.GetNumberType(1);
!     return returns;
  }
  
--- 3775,3798 ----
  // %override wxLua_wxListCtrl_SortItems
  
! 
! struct wxLua_LCF_data // wrap up the wxLuaState, lua_tag, and the compare data
! {
!     wxLuaState* wxlState;
!     int lua_tag;
!     long data;
! };
  
  int wxCALLBACK wxLua_ListCompareFunction(long item1, long item2, long sortData)
  {
!     wxLua_LCF_data* LCF_data = (wxLua_LCF_data*)sortData;
! 
!     lua_State *L = LCF_data->wxlState->GetLuaState();
!     lua_rawgeti(L, LUA_REGISTRYINDEX, LCF_data->lua_tag);
      lua_pushnumber(L, item1);
      lua_pushnumber(L, item2);
!     lua_pushnumber(L, LCF_data->data);
!     LCF_data->wxlState->LuaCall(3, 1);
  
!     return (int)LCF_data->wxlState->GetNumberType(1);
  }
  
***************
*** 3796,3803 ****
  {
      wxLuaState wxlState(L);
-     wxLua_LCF_wxlState = wxlState;
      long returns;
      // long data
      long data = (long)wxlState.GetNumberType(3);
      // get this
      wxListCtrl *self = (wxListCtrl *)wxlState.GetUserDataType(1, s_wxluatag_wxListCtrl);
--- 3801,3808 ----
  {
      wxLuaState wxlState(L);
      long returns;
      // long data
      long data = (long)wxlState.GetNumberType(3);
+     wxLua_LCF_data LCF_data = { &wxlState, -1, data };
      // get this
      wxListCtrl *self = (wxListCtrl *)wxlState.GetUserDataType(1, s_wxluatag_wxListCtrl);
***************
*** 3806,3818 ****
      // lua sort function, was index 2 is now index 1
      if (lua_isfunction (L, 1))
!         wxLua_LCF_tag = luaL_ref(L, LUA_REGISTRYINDEX); // pops it from stack
      else
!         wxlState.terror(wxString::Format(_("wxLua: Expected lua function for parameter %d, but got '%s'."),
                                          2, wxlState.lua_TypeNameIndex(1).c_str()));
  
      // call SortItems
!     returns = self->SortItems(wxLua_ListCompareFunction, data);
!     wxLua_LCF_wxlState.Destroy();
!     wxLua_LCF_tag = -1;
      // push the result number
      lua_pushnumber(L, returns);
--- 3811,3821 ----
      // lua sort function, was index 2 is now index 1
      if (lua_isfunction (L, 1))
!         LCF_data.lua_tag = luaL_ref(L, LUA_REGISTRYINDEX); // pops it from stack
      else
!         wxlState.terror(wxString::Format(_("wxLua: Expected lua function(long item1, long item2, long data) for parameter %d, but got '%s'."),
                                          2, wxlState.lua_TypeNameIndex(1).c_str()));
  
      // call SortItems
!     returns = self->SortItems(wxLua_ListCompareFunction, (long)&LCF_data);
      // push the result number
      lua_pushnumber(L, returns);

Index: config.cpp
===================================================================
RCS file: /cvsroot/wxlua/wxLua/modules/wxbind/src/config.cpp,v
retrieving revision 1.29
retrieving revision 1.30
diff -C2 -d -r1.29 -r1.30
*** config.cpp	9 Mar 2007 00:15:13 -0000	1.29
--- config.cpp	9 Mar 2007 06:10:17 -0000	1.30
***************
*** 508,515 ****
      // call Read
      bool ret = self->Read(key, &returns, defaultVal);
-     // push the result number
-     wxlState.lua_PushString(returns);
      // push the result bool
      lua_pushboolean(L, ret);
      // return the number of parameters
      return 2;
--- 508,515 ----
      // call Read
      bool ret = self->Read(key, &returns, defaultVal);
      // push the result bool
      lua_pushboolean(L, ret);
+     // push the result string
+     wxlState.lua_PushString(returns);
      // return the number of parameters
      return 2;
***************
*** 533,540 ****
      // call Read
      bool ret = self->Read(key, &returns, defaultVal);
-     // push the result number
-     lua_pushnumber(L, returns);
      // push the result bool
      lua_pushboolean(L, ret);
      // return the number of parameters
      return 2;
--- 533,540 ----
      // call Read
      bool ret = self->Read(key, &returns, defaultVal);
      // push the result bool
      lua_pushboolean(L, ret);
+     // push the result number
+     lua_pushnumber(L, returns);
      // return the number of parameters
      return 2;
***************
*** 558,565 ****
      // call Read
      bool ret = self->Read(key, &returns, defaultVal);
-     // push the result number
-     lua_pushnumber(L, returns);
      // push the result bool
      lua_pushboolean(L, ret);
      // return the number of parameters
      return 2;
--- 558,565 ----
      // call Read
      bool ret = self->Read(key, &returns, defaultVal);
      // push the result bool
      lua_pushboolean(L, ret);
+     // push the result number
+     lua_pushnumber(L, returns);
      // return the number of parameters
      return 2;

[Wxlua-commit] wxLua/docs binding.html,1.14,1.15

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

Update of /cvsroot/wxlua/wxLua/docs
In directory sc8-pr-cvs9.sourceforge.net:/tmp/cvs-serv507/docs

Modified Files:
	binding.html 
Log Message:
deprecate %wxchkver2X and %wxcompat2X, use %wxchkver_X_Y_Z and %wxcompat_XY


Index: binding.html
===================================================================
RCS file: /cvsroot/wxlua/wxLua/docs/binding.html,v
retrieving revision 1.14
retrieving revision 1.15
diff -C2 -d -r1.14 -r1.15
*** binding.html	7 Feb 2007 04:56:24 -0000	1.14
--- binding.html	9 Mar 2007 00:16:18 -0000	1.15
***************
*** 3,12 ****
  <head>
  
    <meta content="text/html; charset=ISO-8859-1" http-equiv="content-type">
-   <title>wxLua Binding HowTo</title>
  
  
-   <meta content="John Labenski" name="author">
  
  </head>
  
[...1891 lines suppressed...]
  %__WXX11__<br>
  
+ 
  %__WXWINE__<br>
  
+ 
  %__WXUNIVERSAL__<br>
  
+ 
  %__X__<br>
  
+ 
  %__WXWINCE__<br>
  
+ 
  <br>
  
+ 
  </body>
  </html>

[Wxlua-commit] wxLua/bindings/wxwidgets appframe.i, 1.27, 1.28 clipdrag.i, 1.22, 1.23 config.i, 1.15, 1.16 controls.i, 1.28, 1.29 data.i, 1.23, 1.24 datetime.i, 1.22, 1.23 defsutil.i, 1.32, 1.33 dialogs.i, 1.24, 1.25 event.i, 1.18, 1.19 file.i, 1.16, 1.17 gdi.i, 1.39, 1.40 help.i, 1.10, 1.11 html.i, 1.13, 1.14 image.i, 1.17, 1.18 mdi.i, 1.10, 1.11 menutool.i, 1.12, 1.13 print.i, 1.13, 1.14 sizer.i, 1.10, 1.11 wave.i, 1.14, 1.15 windows.i, 1.28, 1.29 wx_datatypes.lua, 1.51, 1.52 xml.i, 1.6, 1.7

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

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

Modified Files:
	appframe.i clipdrag.i config.i controls.i data.i datetime.i 
	defsutil.i dialogs.i event.i file.i gdi.i help.i html.i 
	image.i mdi.i menutool.i print.i sizer.i wave.i windows.i 
	wx_datatypes.lua xml.i 
Log Message:
update to 2.8 using C++ header files


Index: wave.i
===================================================================
RCS file: /cvsroot/wxlua/wxLua/bindings/wxwidgets/wave.i,v
retrieving revision 1.14
retrieving revision 1.15
diff -C2 -d -r1.14 -r1.15
*** wave.i	2 Mar 2007 05:44:22 -0000	1.14
--- wave.i	9 Mar 2007 00:15:12 -0000	1.15
***************
*** 13,17 ****
  //  wxSound
  
! %if %wxchkver26 & wxUSE_SOUND
  
  %include "wx/sound.h"
--- 13,17 ----
  //  wxSound
  
! %if %wxchkver_2_6 & wxUSE_SOUND
  
  %include "wx/sound.h"
***************
*** 35,44 ****
  %endclass
  
! %endif // %wxchkver26 & wxUSE_SOUND
  
  //-----------------------------------------------------------------------------
  //  wxWave
  
! %if %msw & !%wxchkver25 & wxUSE_WAVE
  
  %include "wx/wave.h"
--- 35,44 ----
  %endclass
  
! %endif // %wxchkver_2_6 & wxUSE_SOUND
  
  //-----------------------------------------------------------------------------
  //  wxWave
  
! %if %msw & !%wxchkver_2_5 & wxUSE_WAVE
  
  %include "wx/wave.h"
***************
*** 53,61 ****
      bool Create(const wxString& fileName, bool isResource = false)
      bool IsOk() const
!     !%wxchkver25 bool Play(bool async = true, bool looped = false) const
!     %wxchkver25 bool Play(unsigned int flags = wxSOUND_ASYNC) const
  %endclass
  
! %endif // %msw & !%wxchkver25 & wxUSE_WAVE
  
  %endif //wxLUA_USE_wxWave
--- 53,61 ----
      bool Create(const wxString& fileName, bool isResource = false)
      bool IsOk() const
!     !%wxchkver_2_5 bool Play(bool async = true, bool looped = false) const
!     %wxchkver_2_5 bool Play(unsigned int flags = wxSOUND_ASYNC) const
  %endclass
  
! %endif // %msw & !%wxchkver_2_5 & wxUSE_WAVE
  
  %endif //wxLUA_USE_wxWave

Index: menutool.i
===================================================================
RCS file: /cvsroot/wxlua/wxLua/bindings/wxwidgets/menutool.i,v
retrieving revision 1.12
retrieving revision 1.13
diff -C2 -d -r1.12 -r1.13
*** menutool.i	23 Feb 2007 04:35:30 -0000	1.12
--- menutool.i	9 Mar 2007 00:15:12 -0000	1.13
***************
*** 172,176 ****
      %define %event wxEVT_MENU_OPEN
      %define %event wxEVT_MENU_CLOSE
-     %define %event wxEVT_MENU_HIGHLIGHT
  
      wxMenuEvent(wxEventType type = wxEVT_NULL, int id = 0, wxMenu* menu = NULL)
--- 172,175 ----
***************
*** 276,280 ****
  // wxToolBarSimple
  
! %if !%wxchkver25
  
  %include "wx/tbarsmpl.h"
--- 275,279 ----
  // wxToolBarSimple
  
! %if !%wxchkver_2_5
  
  %include "wx/tbarsmpl.h"
***************
*** 287,291 ****
  %endclass
  
! %endif // !%wxchkver25
  
  //-----------------------------------------------------------------------------
--- 286,290 ----
  %endclass
  
! %endif // !%wxchkver_2_5
  
  //-----------------------------------------------------------------------------

Index: clipdrag.i
===================================================================
RCS file: /cvsroot/wxlua/wxLua/bindings/wxwidgets/clipdrag.i,v
retrieving revision 1.22
retrieving revision 1.23
diff -C2 -d -r1.22 -r1.23
*** clipdrag.i	2 Mar 2007 05:44:21 -0000	1.22
--- clipdrag.i	9 Mar 2007 00:15:12 -0000	1.23
***************
*** 16,21 ****
  
  %class wxClipboard, wxObject
!     !%wxchkver25 %define %pointer wxTheClipboard
!     %wxchkver25 %staticonly wxClipboard *Get()
  
      // wxClipboard() use global clipboard only
--- 16,21 ----
  
  %class wxClipboard, wxObject
!     !%wxchkver_2_5 %define %pointer wxTheClipboard
!     %wxchkver_2_5 %staticonly wxClipboard *Get()
  
      // wxClipboard() use global clipboard only
***************
*** 40,43 ****
--- 40,61 ----
  // does in C++.
  
+ //-----------------------------------------------------------------------------
+ // wxClipboardTextEvent
+ 
+ %if %wxchkver_2_8
+ 
+ %include "wx/event.h"
+ 
+ %class %delete wxClipboardTextEvent, wxCommandEvent
+     %define %event wxEVT_COMMAND_TEXT_COPY
+     %define %event wxEVT_COMMAND_TEXT_CUT
+     %define %event wxEVT_COMMAND_TEXT_PASTE
+ 
+     wxClipboardTextEvent(wxEventType type = wxEVT_NULL, wxWindowID winid = 0)
+ 
+ %endclass
+ 
+ %endif //%wxchkver_2_8
+ 
  %endif //wxLUA_USE_wxClipboard & wxUSE_CLIPBOARD
  
***************
*** 189,192 ****
--- 207,224 ----
  //%endclass
  
+ //-----------------------------------------------------------------------------
+ // wxURLDataObject - is simply wxTextDataObject with a different name
+ 
+ %if %wxchkver_2_8
+ 
+ %class %noclassinfo %encapsulate wxURLDataObject, wxTextDataObject
+     wxURLDataObject(const wxString& url = "")
+ 
+     wxString GetURL() const
+     void SetURL(const wxString& url)
+ %endclass
+ 
+ %endif //%wxchkver_2_8
+ 
  %endif //wxLUA_USE_wxDataObject & wxUSE_DATAOBJ
  
***************
*** 216,222 ****
  
  %class %noclassinfo wxDropTarget // FIXME implement virtual
-     //wxDropTarget(wxDataObject* data = NULL) pure virtual functions in MSW
  
!     virtual void GetData()
      //virtual wxDragResult OnData(wxCoord x, wxCoord y, wxDragResult def)
      //virtual bool OnDrop(wxCoord x, wxCoord y)
--- 248,255 ----
  
  %class %noclassinfo wxDropTarget // FIXME implement virtual
  
!     //wxDropTarget(wxDataObject* data = NULL) pure virtual functions in MSW
!     virtual bool GetData()
!     //wxDragResult GetDefaultAction()
      //virtual wxDragResult OnData(wxCoord x, wxCoord y, wxDragResult def)
      //virtual bool OnDrop(wxCoord x, wxCoord y)
***************
*** 224,228 ****
      //virtual wxDragResult OnDragOver(wxCoord x, wxCoord y, wxDragResult def)
      //virtual void OnLeave()
!     void SetDataObject(wxDataObject* data)
  %endclass
  
--- 257,262 ----
      //virtual wxDragResult OnDragOver(wxCoord x, wxCoord y, wxDragResult def)
      //virtual void OnLeave()
!     //void SetDataObject(wxDataObject* data)
!     //void SetDefaultAction(wxDragResult action)
  %endclass
  
***************
*** 232,235 ****
--- 266,270 ----
  //%class %noclassinfo wxFileDropTarget, wxDropTarget // FIXME implement virtual
  //    wxFileDropTarget()
+ //    virtual wxDragResult OnData(wxCoord x, wxCoord y, wxDragResult def)
  //    virtual bool OnDrop(long x, long y, const void *data, size_t size)
  //    virtual bool OnDropFiles(wxCoord x, wxCoord y,const wxArrayString& filenames)
***************
*** 242,245 ****
--- 277,281 ----
  //    wxTextDropTarget()
  //    virtual bool OnDropText(wxCoord x, wxCoord y, const wxString& text)
+ //    virtual wxDragResult OnData(wxCoord x, wxCoord y, wxDragResult def)
  //%endclass
  

Index: data.i
===================================================================
RCS file: /cvsroot/wxlua/wxLua/bindings/wxwidgets/data.i,v
retrieving revision 1.23
retrieving revision 1.24
diff -C2 -d -r1.23 -r1.24
*** data.i	7 Mar 2007 23:56:41 -0000	1.23
--- data.i	9 Mar 2007 00:15:12 -0000	1.24
***************
*** 139,158 ****
      wxTextValidator(long style = wxFILTER_NONE, wxString *valPtr = NULL)
  
!     %wxchkver25 wxArrayString& GetExcludes()
!     %wxchkver25 wxArrayString& GetIncludes()
      long GetStyle() const
      void SetStyle(long style)
!     %wxchkver25 void SetIncludes(const wxArrayString& includes)
!     %wxchkver25 void SetExcludes(const wxArrayString& excludes)
  
!     //!%wxchkver25|%wxcompat24 wxStringList& GetExcludeList() const
!     //!%wxchkver25|%wxcompat24 wxStringList& GetIncludeList() const
!     //!%wxchkver25|%wxcompat24 void SetExcludeList(const wxStringList& stringList)
!     //!%wxchkver25|%wxcompat24 void SetIncludeList(const wxStringList& stringList)
!     //!%wxchkver25|%wxcompat24 %property=ExcludeList, read, write
!     //!%wxchkver25|%wxcompat24 %property=IncludeList, read, write
  
!     %wxchkver25 %property=Excludes, read, write
!     %wxchkver25 %property=Includes, read, write
      %property=Style, read, write
  %endclass
--- 139,158 ----
      wxTextValidator(long style = wxFILTER_NONE, wxString *valPtr = NULL)
  
!     %wxchkver_2_5 wxArrayString& GetExcludes()
!     %wxchkver_2_5 wxArrayString& GetIncludes()
      long GetStyle() const
      void SetStyle(long style)
!     %wxchkver_2_5 void SetIncludes(const wxArrayString& includes)
!     %wxchkver_2_5 void SetExcludes(const wxArrayString& excludes)
  
!     //!%wxchkver_2_5|%wxcompat_2_4 wxStringList& GetExcludeList() const
!     //!%wxchkver_2_5|%wxcompat_2_4 wxStringList& GetIncludeList() const
!     //!%wxchkver_2_5|%wxcompat_2_4 void SetExcludeList(const wxStringList& stringList)
!     //!%wxchkver_2_5|%wxcompat_2_4 void SetIncludeList(const wxStringList& stringList)
!     //!%wxchkver_2_5|%wxcompat_2_4 %property=ExcludeList, read, write
!     //!%wxchkver_2_5|%wxcompat_2_4 %property=IncludeList, read, write
  
!     %wxchkver_2_5 %property=Excludes, read, write
!     %wxchkver_2_5 %property=Includes, read, write
      %property=Style, read, write
  %endclass
***************
*** 361,365 ****
  //%include "wx/hash.h"
  
! //%if %wxchkver25
  //%class %noclassinfo wxHashTable::Node
  //%endclass
--- 361,365 ----
  //%include "wx/hash.h"
  
! //%if %wxchkver_2_5
  //%class %noclassinfo wxHashTable::Node
  //%endclass
***************
*** 367,372 ****
  
  //%class %noclassinfo wxHashTable, wxObject
! //    !%wxchkver25 wxHashTable(unsigned int key_type, int size = 1000)
! //    %wxchkver25 wxHashTable(wxKeyType key_type, int size = 1000)
  //    void BeginFind()
  //    void Clear()
--- 367,372 ----
  
  //%class %noclassinfo wxHashTable, wxObject
! //    !%wxchkver_2_5 wxHashTable(unsigned int key_type, int size = 1000)
! //    %wxchkver_2_5 wxHashTable(wxKeyType key_type, int size = 1000)
  //    void BeginFind()
  //    void Clear()
***************
*** 376,381 ****
  //    %rename GetStringKey wxObject * Get(const wxString &key)
  //    long MakeKey(const wxString& string)
! //    !%wxchkver25 wxNode * Next()
! //    %wxchkver25 wxHashTable::Node * Next()
  //    %rename PutNumKey void Put(long key, wxObject *object)
  //    %rename PutStringKey void Put(const wxString & key, wxObject *object)
--- 376,381 ----
  //    %rename GetStringKey wxObject * Get(const wxString &key)
  //    long MakeKey(const wxString& string)
! //    !%wxchkver_2_5 wxNode * Next()
! //    %wxchkver_2_5 wxHashTable::Node * Next()
  //    %rename PutNumKey void Put(long key, wxObject *object)
  //    %rename PutStringKey void Put(const wxString & key, wxObject *object)

Index: wx_datatypes.lua
===================================================================
RCS file: /cvsroot/wxlua/wxLua/bindings/wxwidgets/wx_datatypes.lua,v
retrieving revision 1.51
retrieving revision 1.52
diff -C2 -d -r1.51 -r1.52
*** wx_datatypes.lua	7 Mar 2007 23:56:41 -0000	1.51
--- wx_datatypes.lua	9 Mar 2007 00:15:12 -0000	1.52
***************
*** 385,388 ****
--- 385,394 ----
      Name = "wxBusyCursor",
    },
+   wxBusyCursorSuspender = {
+     Condition = "wxLUA_USE_wxBusyCursor",
+     DefType = "class",
+     IsNumber = false,
+     Name = "wxBusyCursorSuspender",
+   },
    wxBusyInfo = {
      BaseClass = "wxObject",
***************
*** 456,459 ****
--- 462,471 ----
      Name = "wxCaret",
    },
+   wxCaretSuspend = {
+     Condition = "wxLUA_USE_wxCaret && wxUSE_CARET",
+     DefType = "class",
+     IsNumber = false,
+     Name = "wxCaretSuspend",
+   },
    wxChar = {
      DefType = "number",
***************
*** 481,484 ****
--- 493,502 ----
      Name = "wxCheckListBox",
    },
+   wxChildFocusEvent = {
+     BaseClass = "wxCommandEvent",
+     DefType = "class",
+     IsNumber = false,
+     Name = "wxChildFocusEvent",
+   },
    wxChoice = {
      BaseClass = "wxControlWithItems",
***************
*** 533,536 ****
--- 551,561 ----
      Name = "wxClipboard",
    },
+   wxClipboardTextEvent = {
+     BaseClass = "wxCommandEvent",
+     Condition = "(wxCHECK_VERSION(2,8,0)) && (wxLUA_USE_wxClipboard && wxUSE_CLIPBOARD)",
+     DefType = "class",
+     IsNumber = false,
+     Name = "wxClipboardTextEvent",
+   },
    wxCloseEvent = {
      BaseClass = "wxEvent",
***************
*** 612,615 ****
--- 637,660 ----
      Name = "wxConfigBase::EntryType",
    },
+   wxConfigPathChanger = {
+     Condition = "wxLUA_USE_wxConfig && wxUSE_CONFIG",
+     DefType = "class",
+     IsNumber = false,
+     Name = "wxConfigPathChanger",
+   },
+   wxContextHelp = {
+     BaseClass = "wxObject",
+     Condition = "wxLUA_USE_wxHelpController && wxUSE_HELP",
+     DefType = "class",
+     IsNumber = false,
+     Name = "wxContextHelp",
+   },
+   wxContextHelpButton = {
+     BaseClass = "wxBitmapButton",
+     Condition = "(wxLUA_USE_wxBitmapButton && wxUSE_BMPBUTTON) && (wxLUA_USE_wxHelpController && wxUSE_HELP)",
+     DefType = "class",
+     IsNumber = false,
+     Name = "wxContextHelpButton",
+   },
    wxControl = {
      BaseClass = "wxWindow",
***************
*** 818,821 ****
--- 863,872 ----
      Name = "wxDisplay",
    },
+   wxDisplayChangedEvent = {
+     BaseClass = "wxEvent",
+     DefType = "class",
+     IsNumber = false,
+     Name = "wxDisplayChangedEvent",
+   },
    wxDocChildFrame = {
      BaseClass = "wxFrame",
***************
*** 901,904 ****
--- 952,961 ----
      Name = "wxEdge",
    },
+   wxEffects = {
+     BaseClass = "wxObject",
+     DefType = "class",
+     IsNumber = false,
+     Name = "wxEffects",
+   },
    wxEraseEvent = {
      BaseClass = "wxEvent",
***************
*** 1465,1468 ****
--- 1522,1532 ----
      Name = "wxHelpController",
    },
+   wxHelpControllerHelpProvider = {
+     BaseClass = "wxSimpleHelpProvider",
+     Condition = "wxLUA_USE_wxHelpController && wxUSE_HELP",
+     DefType = "class",
+     IsNumber = false,
+     Name = "wxHelpControllerHelpProvider",
+   },
    wxHelpEvent = {
      BaseClass = "wxCommandEvent",
***************
*** 1471,1474 ****
--- 1535,1550 ----
      Name = "wxHelpEvent",
    },
+   ["wxHelpEvent::Origin"] = {
+     Condition = "wxCHECK_VERSION(2,8,0)",
+     DefType = "enum",
+     IsNumber = true,
+     Name = "wxHelpEvent::Origin",
+   },
+   wxHelpProvider = {
+     Condition = "wxLUA_USE_wxHelpController && wxUSE_HELP",
+     DefType = "class",
+     IsNumber = false,
+     Name = "wxHelpProvider",
+   },
    wxHelpSearchMode = {
      Condition = "wxLUA_USE_wxHelpController && wxUSE_HELP",
***************
*** 2044,2047 ****
--- 2120,2130 ----
      Name = "wxMouseCaptureChangedEvent",
    },
+   wxMouseCaptureLostEvent = {
+     BaseClass = "wxEvent",
+     Condition = "wxCHECK_VERSION(2,8,0)",
+     DefType = "class",
+     IsNumber = false,
+     Name = "wxMouseCaptureLostEvent",
+   },
    wxMouseEvent = {
      BaseClass = "wxEvent",
***************
*** 2069,2072 ****
--- 2152,2166 ----
      Name = "wxMultiChoiceDialog",
    },
+   wxNavigationKeyEvent = {
+     BaseClass = "wxEvent",
+     DefType = "class",
+     IsNumber = false,
+     Name = "wxNavigationKeyEvent",
+   },
+   ["wxNavigationKeyEvent::dummy"] = {
+     DefType = "enum",
+     IsNumber = true,
+     Name = "wxNavigationKeyEvent::dummy",
+   },
    wxNode = {
      Condition = "wxLUA_USE_wxList",
***************
*** 2187,2190 ****
--- 2281,2290 ----
      Name = "wxPalette",
    },
+   wxPaletteChangedEvent = {
+     BaseClass = "wxEvent",
+     DefType = "class",
+     IsNumber = false,
+     Name = "wxPaletteChangedEvent",
+   },
    wxPanel = {
      BaseClass = "wxWindow",
***************
*** 2391,2394 ****
--- 2491,2500 ----
      Name = "wxQueryLayoutInfoEvent",
    },
+   wxQueryNewPaletteEvent = {
+     BaseClass = "wxEvent",
+     DefType = "class",
+     IsNumber = false,
+     Name = "wxQueryNewPaletteEvent",
+   },
    wxRadioBox = {
      BaseClass = "wxControl",
***************
*** 2533,2536 ****
--- 2639,2648 ----
      Name = "wxSetCursorEvent",
    },
+   wxShowEvent = {
+     BaseClass = "wxEvent",
+     DefType = "class",
+     IsNumber = false,
+     Name = "wxShowEvent",
+   },
    wxSignal = {
      Condition = "wxLUA_USE_wxProcess",
***************
*** 2539,2542 ****
--- 2651,2661 ----
      Name = "wxSignal",
    },
+   wxSimpleHelpProvider = {
+     BaseClass = "wxHelpProvider",
+     Condition = "wxLUA_USE_wxHelpController && wxUSE_HELP",
+     DefType = "class",
+     IsNumber = false,
+     Name = "wxSimpleHelpProvider",
+   },
    wxSingleChoiceDialog = {
      BaseClass = "wxDialog",
***************
*** 3077,3080 ****
--- 3196,3206 ----
      Name = "wxURL",
    },
+   wxURLDataObject = {
+     BaseClass = "wxTextDataObject",
+     Condition = "(wxCHECK_VERSION(2,8,0)) && (wxLUA_USE_wxDataObject && wxUSE_DATAOBJ)",
+     DefType = "class",
+     IsNumber = false,
+     Name = "wxURLDataObject",
+   },
    wxURLError = {
      Condition = "(wxUSE_URL) && (wxLUA_USE_wxSocket && wxUSE_SOCKETS)",
***************
*** 3336,3359 ****
    ["%win"] = "defined(__WXMSW__)",
    ["%wince"] = "defined(__WXWINCE__)",
!   ["%wxchkver22"] = "wxCHECK_VERSION(2,2,0)",
!   ["%wxchkver23"] = "wxCHECK_VERSION(2,3,0)",
!   ["%wxchkver24"] = "wxCHECK_VERSION(2,4,0)",
!   ["%wxchkver25"] = "wxCHECK_VERSION(2,5,0)",
!   ["%wxchkver26"] = "wxCHECK_VERSION(2,6,0)",
!   ["%wxchkver261"] = "wxCHECK_VERSION(2,6,1)",
!   ["%wxchkver262"] = "wxCHECK_VERSION(2,6,2)",
!   ["%wxchkver263"] = "wxCHECK_VERSION(2,6,2)",
!   ["%wxchkver264"] = "wxCHECK_VERSION(2,6,4)",
!   ["%wxchkver265"] = "wxCHECK_VERSION(2,6,5)",
!   ["%wxchkver27"] = "wxCHECK_VERSION(2,7,0)",
!   ["%wxchkver271"] = "wxCHECK_VERSION(2,7,1)",
!   ["%wxchkver272"] = "wxCHECK_VERSION(2,7,2)",
!   ["%wxchkver28"] = "wxCHECK_VERSION(2,8,0)",
    ["%wxchkver_2_8"] = "wxCHECK_VERSION(2,8,0)",
!   ["%wxcompat20"] = "(defined(WXWIN_COMPATIBILITY_2) && WXWIN_COMPATIBILITY_2)",
!   ["%wxcompat22"] = "(defined(WXWIN_COMPATIBILITY_2_2) && WXWIN_COMPATIBILITY_2_2)",
!   ["%wxcompat24"] = "(defined(WXWIN_COMPATIBILITY_2_4) && WXWIN_COMPATIBILITY_2_4)",
!   ["%wxcompat26"] = "(defined(WXWIN_COMPATIBILITY_2_6) && WXWIN_COMPATIBILITY_2_6)",
!   ["%wxcompat28"] = "(defined(WXWIN_COMPATIBILITY_2_8) && WXWIN_COMPATIBILITY_2_8)",
    ["%x11"] = "defined(__WXX11__)",
    WXWIN_COMPATIBILITY_2 = "(defined(WXWIN_COMPATIBILITY_2) && WXWIN_COMPATIBILITY_2)",
--- 3462,3472 ----
    ["%win"] = "defined(__WXMSW__)",
    ["%wince"] = "defined(__WXWINCE__)",
!   ["%wxchkver_2_4"] = "wxCHECK_VERSION(2,4,0)",
!   ["%wxchkver_2_5"] = "wxCHECK_VERSION(2,5,0)",
!   ["%wxchkver_2_6"] = "wxCHECK_VERSION(2,6,0)",
!   ["%wxchkver_2_7"] = "wxCHECK_VERSION(2,7,0)",
    ["%wxchkver_2_8"] = "wxCHECK_VERSION(2,8,0)",
!   ["%wxcompat_2_4"] = "(defined(WXWIN_COMPATIBILITY_2_4) && WXWIN_COMPATIBILITY_2_4)",
!   ["%wxcompat_2_6"] = "(defined(WXWIN_COMPATIBILITY_2_6) && WXWIN_COMPATIBILITY_2_6)",
    ["%x11"] = "defined(__WXX11__)",
    WXWIN_COMPATIBILITY_2 = "(defined(WXWIN_COMPATIBILITY_2) && WXWIN_COMPATIBILITY_2)",

Index: print.i
===================================================================
RCS file: /cvsroot/wxlua/wxLua/bindings/wxwidgets/print.i,v
retrieving revision 1.13
retrieving revision 1.14
diff -C2 -d -r1.13 -r1.14
*** print.i	2 Mar 2007 05:44:22 -0000	1.13
--- print.i	9 Mar 2007 00:15:12 -0000	1.14
***************
*** 218,222 ****
  %endenum
  
! %if %wxchkver25
  %enum wxPrintBin
      wxPRINTBIN_DEFAULT
--- 218,222 ----
  %endenum
  
! %if %wxchkver_2_5
  %enum wxPrintBin
      wxPRINTBIN_DEFAULT
***************
*** 280,301 ****
  
      // these are all WXWIN_COMPATIBILITY_2_4 and for postscript printing only
!     //!%wxchkver27 wxString GetPrinterCommand()
!     //!%wxchkver27 wxString GetPrinterOptions()
!     //!%wxchkver27 wxString GetPreviewCommand()
!     //!%wxchkver27 const wxString& GetFontMetricPath()
!     //!%wxchkver27 double GetPrinterScaleX()
!     //!%wxchkver27 double GetPrinterScaleY()
!     //!%wxchkver27 long GetPrinterTranslateX()
!     //!%wxchkver27 long GetPrinterTranslateY()
!     //!%wxchkver27 void SetPrinterCommand(const wxString& command)
!     //!%wxchkver27 void SetPrinterOptions(const wxString& options)
!     //!%wxchkver27 void SetPreviewCommand(const wxString& command)
!     //!%wxchkver27 void SetFontMetricPath(const wxString& path)
!     //!%wxchkver27 void SetPrinterScaleX(double x)
!     //!%wxchkver27 void SetPrinterScaleY(double y)
!     //!%wxchkver27 void SetPrinterScaling(double x, double y)
!     //!%wxchkver27 void SetPrinterTranslateX(long x)
!     //!%wxchkver27 void SetPrinterTranslateY(long y)
!     //!%wxchkver27 void SetPrinterTranslation(long x, long y)
  
      %property=Collate, read, write
--- 280,301 ----
  
      // these are all WXWIN_COMPATIBILITY_2_4 and for postscript printing only
!     //!%wxchkver_2_7 wxString GetPrinterCommand()
!     //!%wxchkver_2_7 wxString GetPrinterOptions()
!     //!%wxchkver_2_7 wxString GetPreviewCommand()
!     //!%wxchkver_2_7 const wxString& GetFontMetricPath()
!     //!%wxchkver_2_7 double GetPrinterScaleX()
!     //!%wxchkver_2_7 double GetPrinterScaleY()
!     //!%wxchkver_2_7 long GetPrinterTranslateX()
!     //!%wxchkver_2_7 long GetPrinterTranslateY()
!     //!%wxchkver_2_7 void SetPrinterCommand(const wxString& command)
!     //!%wxchkver_2_7 void SetPrinterOptions(const wxString& options)
!     //!%wxchkver_2_7 void SetPreviewCommand(const wxString& command)
!     //!%wxchkver_2_7 void SetFontMetricPath(const wxString& path)
!     //!%wxchkver_2_7 void SetPrinterScaleX(double x)
!     //!%wxchkver_2_7 void SetPrinterScaleY(double y)
!     //!%wxchkver_2_7 void SetPrinterScaling(double x, double y)
!     //!%wxchkver_2_7 void SetPrinterTranslateX(long x)
!     //!%wxchkver_2_7 void SetPrinterTranslateY(long y)
!     //!%wxchkver_2_7 void SetPrinterTranslation(long x, long y)
  
      %property=Collate, read, write
***************
*** 311,322 ****
      %property=Quality, read, write
  
!     //!%wxchkver27 %property=FontMetricPath, read, write
!     //!%wxchkver27 %property=PreviewCommand, read, write
!     //!%wxchkver27 %property=PrinterCommand, read, write
!     //!%wxchkver27 %property=PrinterOptions, read, write
!     //!%wxchkver27 %property=PrinterScaleX, read, write
!     //!%wxchkver27 %property=PrinterScaleY, read, write
!     //!%wxchkver27 %property=PrinterTranslateX, read, write
!     //!%wxchkver27 %property=PrinterTranslateY, read, write
  
  %endclass
--- 311,322 ----
      %property=Quality, read, write
  
!     //!%wxchkver_2_7 %property=FontMetricPath, read, write
!     //!%wxchkver_2_7 %property=PreviewCommand, read, write
!     //!%wxchkver_2_7 %property=PrinterCommand, read, write
!     //!%wxchkver_2_7 %property=PrinterOptions, read, write
!     //!%wxchkver_2_7 %property=PrinterScaleX, read, write
!     //!%wxchkver_2_7 %property=PrinterScaleY, read, write
!     //!%wxchkver_2_7 %property=PrinterTranslateX, read, write
!     //!%wxchkver_2_7 %property=PrinterTranslateY, read, write
  
  %endclass

Index: file.i
===================================================================
RCS file: /cvsroot/wxlua/wxLua/bindings/wxwidgets/file.i,v
retrieving revision 1.16
retrieving revision 1.17
diff -C2 -d -r1.16 -r1.17
*** file.i	8 Mar 2007 06:26:43 -0000	1.16
--- file.i	9 Mar 2007 00:15:12 -0000	1.17
***************
*** 283,288 ****
      bool Open(const wxString& dir)
  
!     %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);
  
      // We don't need wxDirTraverser, just use wxDir methods GetFirst, GetNext.
--- 283,288 ----
      bool Open(const wxString& dir)
  
!     %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.
***************
*** 320,324 ****
      // wxStreamBase() this is only a base class
  
!     %wxchkver25 wxFileOffset GetLength() const
      wxStreamError GetLastError() const
      size_t GetSize() const
--- 320,324 ----
      // wxStreamBase() this is only a base class
  
!     %wxchkver_2_5 wxFileOffset GetLength() const
      wxStreamError GetLastError() const
      size_t GetSize() const

Index: dialogs.i
===================================================================
RCS file: /cvsroot/wxlua/wxLua/bindings/wxwidgets/dialogs.i,v
retrieving revision 1.24
retrieving revision 1.25
diff -C2 -d -r1.24 -r1.25
*** dialogs.i	8 Mar 2007 06:26:43 -0000	1.24
--- dialogs.i	9 Mar 2007 00:15:12 -0000	1.25
***************
*** 23,27 ****
      wxSAVE
      wxOVERWRITE_PROMPT
!     %wxcompat24 wxHIDE_READONLY
      wxFILE_MUST_EXIST
      wxMULTIPLE
--- 23,27 ----
      wxSAVE
      wxOVERWRITE_PROMPT
!     %wxcompat_2_4 wxHIDE_READONLY
      wxFILE_MUST_EXIST
      wxMULTIPLE
***************
*** 45,49 ****
  wxUSE_CHOICEDLG %function int wxGetMultipleChoices(const wxString& message, const wxString& caption, int n, const wxString choices[], int nsel, int *selection, wxWindow *parent = NULL, int x = -1, int y = -1, bool centre = true, int width=150, int height=200)
  %if wxUSE_NUMBERDLG
! %wxchkver25 %include "wx/numdlg.h" // FIXME not in 2.4
  %function long wxGetNumberFromUser(const wxString& message, const wxString& prompt, const wxString& caption, long value, long min = 0, long max = 100, wxWindow *parent = NULL, const wxPoint& pos = wxDefaultPosition)
  %endif // wxUSE_NUMBERDLG
--- 45,49 ----
  wxUSE_CHOICEDLG %function int wxGetMultipleChoices(const wxString& message, const wxString& caption, int n, const wxString choices[], int nsel, int *selection, wxWindow *parent = NULL, int x = -1, int y = -1, bool centre = true, int width=150, int height=200)
  %if wxUSE_NUMBERDLG
! %wxchkver_2_5 %include "wx/numdlg.h" // FIXME not in 2.4
  %function long wxGetNumberFromUser(const wxString& message, const wxString& prompt, const wxString& caption, long value, long min = 0, long max = 100, wxWindow *parent = NULL, const wxPoint& pos = wxDefaultPosition)
  %endif // wxUSE_NUMBERDLG
***************
*** 78,83 ****
      void Centre(int direction = wxBOTH)
      bool Create(wxWindow* parent, wxWindowID id, const wxString& title, const wxPoint& pos = wxDefaultPosition, const wxSize& size = wxDefaultSize, long style = wxDEFAULT_DIALOG_STYLE, const wxString& name = "wxDialog")
!     wxSizer* CreateButtonSizer(long flags)
!     //wxStdDialogButtonSizer* CreateStdDialogButtonSizer(long flags)
      // virtual bool DoOK() - pocketpc only
      void EndModal(int retCode)
--- 78,85 ----
      void Centre(int direction = wxBOTH)
      bool Create(wxWindow* parent, wxWindowID id, const wxString& title, const wxPoint& pos = wxDefaultPosition, const wxSize& size = wxDefaultSize, long style = wxDEFAULT_DIALOG_STYLE, const wxString& name = "wxDialog")
!     wxUSE_BUTTON wxSizer* CreateButtonSizer(long flags)
!     %wxchkver_2_8&wxUSE_BUTTON wxSizer *CreateSeparatedButtonSizer(long flags)
!     wxUSE_BUTTON wxStdDialogButtonSizer* CreateStdDialogButtonSizer(long flags)
!     wxUSE_STATTEXT wxSizer *CreateTextSizer( const wxString &message )
      // virtual bool DoOK() - pocketpc only
      void EndModal(int retCode)
***************
*** 88,91 ****
--- 90,94 ----
      //bool IsIconized() const - in wxToplevelWindow
      bool IsModal() const
+     //void SetAffirmativeId(int affirmativeId)
      // void SetIcon(const wxIcon& icon) - in wxToplevelWindow
      // void SetModal(const bool flag) - deprecated
***************
*** 228,232 ****
      // %override [lua string table] wxFileDialog::GetPaths()
      void GetPaths(wxArrayString& paths) const
!     !%wxchkver27 long GetStyle() const
      wxString GetWildcard() const
      void SetDirectory(const wxString& directory)
--- 231,235 ----
      // %override [lua string table] wxFileDialog::GetPaths()
      void GetPaths(wxArrayString& paths) const
!     !%wxchkver_2_7 long GetStyle() const
      wxString GetWildcard() const
      void SetDirectory(const wxString& directory)
***************
*** 235,239 ****
      void SetMessage(const wxString& message)
      void SetPath(const wxString& path)
!     !%wxchkver27 void SetStyle(long style)
      void SetWildcard(const wxString& wildCard)
      // int ShowModal() - in wxDialog
--- 238,242 ----
      void SetMessage(const wxString& message)
      void SetPath(const wxString& path)
!     !%wxchkver_2_7 void SetStyle(long style)
      void SetWildcard(const wxString& wildCard)
      // int ShowModal() - in wxDialog
***************
*** 244,248 ****
      %property=Message, read, write
      %property=Path, read, write
!     !%wxchkver27 %property=Style, read, write
      %property=Wildcard, read, write
  %endclass
--- 247,251 ----
      %property=Message, read, write
      %property=Path, read, write
!     !%wxchkver_2_7 %property=Style, read, write
      %property=Wildcard, read, write
  %endclass
***************
*** 267,279 ****
      wxString GetPath() const
      wxString GetMessage() const
!     !%wxchkver27 long GetStyle() const
      void SetMessage(const wxString& message)
      void SetPath(const wxString& path)
!     !%wxchkver27 void SetStyle(long style)
      // int ShowModal() - in wxDialog
  
      %property=Message, read, write
      %property=Path, read, write
!     !%wxchkver27 %property=Style, read, write
  %endclass
  
--- 270,282 ----
      wxString GetPath() const
      wxString GetMessage() const
!     !%wxchkver_2_7 long GetStyle() const
      void SetMessage(const wxString& message)
      void SetPath(const wxString& path)
!     !%wxchkver_2_7 void SetStyle(long style)
      // int ShowModal() - in wxDialog
  
      %property=Message, read, write
      %property=Path, read, write
!     !%wxchkver_2_7 %property=Style, read, write
  %endclass
  

Index: appframe.i
===================================================================
RCS file: /cvsroot/wxlua/wxLua/bindings/wxwidgets/appframe.i,v
retrieving revision 1.27
retrieving revision 1.28
diff -C2 -d -r1.27 -r1.28
*** appframe.i	1 Mar 2007 23:12:31 -0000	1.27
--- appframe.i	9 Mar 2007 00:15:12 -0000	1.28
***************
*** 17,26 ****
  /*
  %if wxUSE_LOG
! %if !%wxchkver_2_5|%wxcompat24
  
  %class %noclassinfo wxLog // FIXME
  %endclass
  
! %endif //!%wxchkver25|%wxcompat24
  %endif //wxUSE_LOG
  */
--- 17,26 ----
  /*
  %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
  */
***************
*** 36,45 ****
      // wxChar** wxApp::argv
  
!     //!%wxchkver25|%wxcompat24 virtual wxLog* CreateLogTarget()
      void Dispatch()
      void ExitMainLoop()
      // virtual int FilterEvent(wxEvent& event) too dangerous, use ConnectEvent
      wxString GetAppName() const
!     //!%wxchkver25&%win bool GetAuto3D() const
      wxString GetClassName() const
      bool GetExitOnFrameDelete() const
--- 36,45 ----
      // wxChar** wxApp::argv
  
!     //!%wxchkver_2_5|%wxcompat_2_4 virtual wxLog* CreateLogTarget()
      void Dispatch()
      void ExitMainLoop()
      // virtual int FilterEvent(wxEvent& event) too dangerous, use ConnectEvent
      wxString GetAppName() const
!     //!%wxchkver_2_5&%win bool GetAuto3D() const
      wxString GetClassName() const
      bool GetExitOnFrameDelete() const
***************
*** 56,63 ****
      // virtual int OnRun() nothing we can do here
      bool Pending()
!     // !%wxchkver25 bool SendIdleEvents()
!     %wxchkver25 bool SendIdleEvents(wxWindow* win, wxIdleEvent& event)
      void SetAppName(const wxString& name)
!     //!%wxchkver24&(%win|%mac) void SetAuto3D(const bool auto3D)
      void SetClassName(const wxString& name)
      void SetExitOnFrameDelete(bool flag)
--- 56,63 ----
      // virtual int OnRun() nothing we can do here
      bool Pending()
!     // !%wxchkver_2_5 bool SendIdleEvents()
!     %wxchkver_2_5 bool SendIdleEvents(wxWindow* win, wxIdleEvent& event)
      void SetAppName(const wxString& name)
!     //!%wxchkver_2_4&(%win|%mac) void SetAuto3D(const bool auto3D)
      void SetClassName(const wxString& name)
      void SetExitOnFrameDelete(bool flag)
***************
*** 69,73 ****
  
      %property=AppName, read, write
!     //!%wxchkver24&(%win|%mac) %property=Auto3D, read, write
      %property=ClassName, read, write
      %property=ExitOnFrameDelete, read, write
--- 69,73 ----
  
      %property=AppName, read, write
!     //!%wxchkver_2_4&(%win|%mac) %property=Auto3D, read, write
      %property=ClassName, read, write
      %property=ExitOnFrameDelete, read, write
***************
*** 103,111 ****
      // No constructors, virtual base class, use wxFrame or wxDialog
  
!     %wxchkver27 wxWindow* GetDefaultItem() const
      wxIcon GetIcon() const
      //const wxIconBundle& GetIcons() const
      wxString GetTitle() const
!     %wxchkver27 wxWindow* GetTmpDefaultItem() const
      bool IsActive() const
      void Iconize(bool iconize)
--- 103,111 ----
      // No constructors, virtual base class, use wxFrame or wxDialog
  
!     %wxchkver_2_7 wxWindow* GetDefaultItem() const
      wxIcon GetIcon() const
      //const wxIconBundle& GetIcons() const
      wxString GetTitle() const
!     %wxchkver_2_7 wxWindow* GetTmpDefaultItem() const
      bool IsActive() const
      void Iconize(bool iconize)
***************
*** 115,119 ****
      void Maximize(bool maximize)
      void RequestUserAttention(int flags = wxUSER_ATTENTION_INFO)
!     %wxchkver27 wxWindow* SetDefaultItem(wxWindow *win)
      void SetIcon(const wxIcon& icon)
      void SetIcons(const wxIconBundle& icons)
--- 115,119 ----
      void Maximize(bool maximize)
      void RequestUserAttention(int flags = wxUSER_ATTENTION_INFO)
!     %wxchkver_2_7 wxWindow* SetDefaultItem(wxWindow *win)
      void SetIcon(const wxIcon& icon)
      void SetIcons(const wxIconBundle& icons)
***************
*** 122,130 ****
      bool SetShape(const wxRegion& region)
      virtual void SetTitle(const wxString& title)
!     %wxchkver27 wxWindow* SetTmpDefaultItem(wxWindow *win)
      %win bool ShowFullScreen(bool show, long style = wxFULLSCREEN_ALL)
  
!     %wxchkver27 %property=DefaultItem, read, write
!     %wxchkver27 %property=TmpDefaultItem, read, write
      %property=Title, read, write
  %endclass
--- 122,130 ----
      bool SetShape(const wxRegion& region)
      virtual void SetTitle(const wxString& title)
!     %wxchkver_2_7 wxWindow* SetTmpDefaultItem(wxWindow *win)
      %win bool ShowFullScreen(bool show, long style = wxFULLSCREEN_ALL)
  
!     %wxchkver_2_7 %property=DefaultItem, read, write
!     %wxchkver_2_7 %property=TmpDefaultItem, read, write
      %property=Title, read, write
  %endclass
***************
*** 146,150 ****
  %define wxMAXIMIZE
  %define wxMAXIMIZE_BOX
! %wxchkver25 %define wxCLOSE_BOX
  %define wxSTAY_ON_TOP
  %define wxSYSTEM_MENU
--- 146,150 ----
  %define wxMAXIMIZE
  %define wxMAXIMIZE_BOX
! %wxchkver_2_5 %define wxCLOSE_BOX
  %define wxSTAY_ON_TOP
  %define wxSYSTEM_MENU
***************
*** 156,161 ****
  %define wxFRAME_FLOAT_ON_PARENT
  %define wxFRAME_EX_CONTEXTHELP
! %wxchkver25 %define wxFRAME_SHAPED
! %wxchkver25 %define wxFRAME_EX_METAL
  %define wxTHICK_FRAME
  
--- 156,161 ----
  %define wxFRAME_FLOAT_ON_PARENT
  %define wxFRAME_EX_CONTEXTHELP
! %wxchkver_2_5 %define wxFRAME_SHAPED
! %wxchkver_2_5 %define wxFRAME_EX_METAL
  %define wxTHICK_FRAME
  
***************
*** 174,179 ****
      wxToolBar* GetToolBar() const
  
!     %wxchkver24 void ProcessCommand(int id)
!     //!%wxchkver24 void Command(int id)
  
      void SendSizeEvent()
--- 174,179 ----
      wxToolBar* GetToolBar() const
  
!     %wxchkver_2_4 void ProcessCommand(int id)
!     //!%wxchkver_2_4 void Command(int id)
  
      void SendSizeEvent()
***************
*** 297,301 ****
  // wxAcceleratorEntry
  
! %wxcompat26 %function wxAcceleratorEntry* wxGetAccelFromString(const wxString& label) // deprecated in 2.8 use wxAcceleratorEntry::Create() or FromString()
  
  %enum
--- 297,301 ----
  // wxAcceleratorEntry
  
! %wxcompat_2_6 %function wxAcceleratorEntry* wxGetAccelFromString(const wxString& label) // deprecated in 2.8 use wxAcceleratorEntry::Create() or FromString()
  
  %enum
***************
*** 347,351 ****
      // virtual wxMenu*  CreatePopupMenu()
      bool IsIconInstalled()
!     %wxchkver24 bool IsOk()
      // virtual bool PopupMenu(wxMenu* menu)
      bool RemoveIcon()
--- 347,351 ----
      // virtual wxMenu*  CreatePopupMenu()
      bool IsIconInstalled()
!     %wxchkver_2_4 bool IsOk()
      // virtual bool PopupMenu(wxMenu* menu)
      bool RemoveIcon()

Index: windows.i
===================================================================
RCS file: /cvsroot/wxlua/wxLua/bindings/wxwidgets/windows.i,v
retrieving revision 1.28
retrieving revision 1.29
diff -C2 -d -r1.28 -r1.29
*** windows.i	2 Mar 2007 05:44:22 -0000	1.28
--- windows.i	9 Mar 2007 00:15:12 -0000	1.29
***************
*** 78,87 ****
      void Center(int direction = wxBOTH)
      void CenterOnParent(int direction = wxBOTH)
!     !%wxchkver27 void CenterOnScreen(int direction = wxBOTH)
      void Centre(int direction = wxBOTH)
      void CentreOnParent(int direction = wxBOTH)
!     !%wxchkver27 void CentreOnScreen(int direction = wxBOTH)
!     !%wxchkver25 void Clear()
!     %wxchkver25 void ClearBackground()
      // %override [int x, int y] ClientToScreenXY(int x, int y) const
      %overload %rename ClientToScreenXY virtual void ClientToScreen(int x, int y) const //(int* x, int* y) const
--- 78,87 ----
      void Center(int direction = wxBOTH)
      void CenterOnParent(int direction = wxBOTH)
!     !%wxchkver_2_7 void CenterOnScreen(int direction = wxBOTH)
      void Centre(int direction = wxBOTH)
      void CentreOnParent(int direction = wxBOTH)
!     !%wxchkver_2_7 void CentreOnScreen(int direction = wxBOTH)
!     !%wxchkver_2_5 void Clear()
!     %wxchkver_2_5 void ClearBackground()
      // %override [int x, int y] ClientToScreenXY(int x, int y) const
      %overload %rename ClientToScreenXY virtual void ClientToScreen(int x, int y) const //(int* x, int* y) const
***************
*** 110,114 ****
      wxAcceleratorTable* GetAcceleratorTable() const
      //wxAccessible* GetAccessible()
!     !%wxchkver27 wxSize GetAdjustedBestSize() const
      virtual wxColour GetBackgroundColour() const
      virtual wxBackgroundStyle GetBackgroundStyle() const
--- 110,114 ----
      wxAcceleratorTable* GetAcceleratorTable() const
      //wxAccessible* GetAccessible()
!     !%wxchkver_2_7 wxSize GetAdjustedBestSize() const
      virtual wxColour GetBackgroundColour() const
      virtual wxBackgroundStyle GetBackgroundStyle() const
***************
*** 124,132 ****
      virtual void GetClientSize(int* width, int* height) const
      // wxSize GetClientSize() const FIXME
!     !%wxchkver26 wxLayoutConstraints* GetConstraints() const // deprecated use sizers
      const wxSizer* GetContainingSizer() const
      wxCursor GetCursor() const
      //virtual wxVisualAttributes GetDefaultAttributes() const
!     !%wxchkver27 wxWindow* GetDefaultItem() const
      wxDropTarget* GetDropTarget() const
      wxEvtHandler* GetEventHandler() const
--- 124,132 ----
      virtual void GetClientSize(int* width, int* height) const
      // wxSize GetClientSize() const FIXME
!     !%wxchkver_2_6 wxLayoutConstraints* GetConstraints() const // deprecated use sizers
      const wxSizer* GetContainingSizer() const
      wxCursor GetCursor() const
      //virtual wxVisualAttributes GetDefaultAttributes() const
!     !%wxchkver_2_7 wxWindow* GetDefaultItem() const
      wxDropTarget* GetDropTarget() const
      wxEvtHandler* GetEventHandler() const
***************
*** 157,161 ****
      // Note: Cannot use use16 from lua, virtual void GetTextExtent(const wxString& string, int* x, int* y, int* descent = NULL, int* externalLeading = NULL, const wxFont* font = NULL, bool use16 = false) const
      virtual void GetTextExtent(const wxString& string, int* x, int* y, int* descent = NULL, int* externalLeading = NULL, const wxFont* font = NULL ) const
!     !%wxchkver27 virtual wxString GetTitle()
      wxToolTip* GetToolTip() const
      virtual wxRegion GetUpdateRegion() const
--- 157,161 ----
      // Note: Cannot use use16 from lua, virtual void GetTextExtent(const wxString& string, int* x, int* y, int* descent = NULL, int* externalLeading = NULL, const wxFont* font = NULL, bool use16 = false) const
      virtual void GetTextExtent(const wxString& string, int* x, int* y, int* descent = NULL, int* externalLeading = NULL, const wxFont* font = NULL ) const
!     !%wxchkver_2_7 virtual wxString GetTitle()
      wxToolTip* GetToolTip() const
      virtual wxRegion GetUpdateRegion() const
***************
*** 166,170 ****
      long GetWindowStyleFlag() const
      wxWindowVariant GetWindowVariant() const
!     %wxchkver24 bool HasCapture() const
      virtual bool HasScrollbar(int orient) const
      virtual bool HasTransparentBackground() const
--- 166,170 ----
      long GetWindowStyleFlag() const
      wxWindowVariant GetWindowVariant() const
!     %wxchkver_2_4 bool HasCapture() const
      virtual bool HasScrollbar(int orient) const
      virtual bool HasTransparentBackground() const
***************
*** 218,223 ****
      void SetContainingSizer(wxSizer* sizer)
      virtual void SetCursor(const wxCursor& cursor)
!     !%wxchkver26 void SetConstraints(wxLayoutConstraints* constraints)
!     !%wxchkver27 wxWindow* SetDefaultItem(wxWindow *win)
      // virtual void SetInitialBestSize(const wxSize& size) protected
      void SetMaxSize(const wxSize& size)
--- 218,223 ----
      void SetContainingSizer(wxSizer* sizer)
      virtual void SetCursor(const wxCursor& cursor)
!     !%wxchkver_2_6 void SetConstraints(wxLayoutConstraints* constraints)
!     !%wxchkver_2_7 wxWindow* SetDefaultItem(wxWindow *win)
      // virtual void SetInitialBestSize(const wxSize& size) protected
      void SetMaxSize(const wxSize& size)
***************
*** 249,253 ****
      void SetSizer(wxSizer* sizer, bool deleteOld=true)
      void SetSizerAndFit(wxSizer* sizer, bool deleteOld=true)
!     !%wxchkver27 virtual void SetTitle(const wxString& title)
      virtual void SetThemeEnabled(bool enable)
      %overload %rename SetToolTipString void SetToolTip(const wxString& tip)
--- 249,253 ----
      void SetSizer(wxSizer* sizer, bool deleteOld=true)
      void SetSizerAndFit(wxSizer* sizer, bool deleteOld=true)
!     !%wxchkver_2_7 virtual void SetTitle(const wxString& title)
      virtual void SetThemeEnabled(bool enable)
      %overload %rename SetToolTipString void SetToolTip(const wxString& tip)
***************
*** 279,283 ****
      %property=ClientSize, read, write
      %property=Constraints, read, write
!     !%wxchkver27 %property=DefaultItem, read, write
      %property=DropTarget, read, write
      %property=EventHandler, read, write
--- 279,283 ----
      %property=ClientSize, read, write
      %property=Constraints, read, write
!     !%wxchkver_2_7 %property=DefaultItem, read, write
      %property=DropTarget, read, write
      %property=EventHandler, read, write
***************
*** 288,292 ****
      %property=Id, read, write
      %property=Name, read, write
!     !%wxchkver27 %property=Title, read, write
      %property=ToolTip, read, write
      %property=Validator, read, write
--- 288,292 ----
      %property=Id, read, write
      %property=Name, read, write
!     !%wxchkver_2_7 %property=Title, read, write
      %property=ToolTip, read, write
      %property=Validator, read, write
***************
*** 322,328 ****
  
      bool Create(wxWindow* parent, wxWindowID id, const wxPoint& pos = wxDefaultPosition, const wxSize& size = wxDefaultSize, long style = wxTAB_TRAVERSAL, const wxString& name = "wxPanel")
!     //!%wxchkver27 wxWindow* GetDefaultItem() const - see wxWindow
      void InitDialog()
!     //!%wxchkver27 wxWindow* SetDefaultItem(wxWindow *win) - see wxWindow
      //virtual void SetFocus() - see wxWindow
      virtual void SetFocusIgnoringChildren()
--- 322,328 ----
  
      bool Create(wxWindow* parent, wxWindowID id, const wxPoint& pos = wxDefaultPosition, const wxSize& size = wxDefaultSize, long style = wxTAB_TRAVERSAL, const wxString& name = "wxPanel")
!     //!%wxchkver_2_7 wxWindow* GetDefaultItem() const - see wxWindow
      void InitDialog()
!     //!%wxchkver_2_7 wxWindow* SetDefaultItem(wxWindow *win) - see wxWindow
      //virtual void SetFocus() - see wxWindow
      virtual void SetFocusIgnoringChildren()
***************
*** 340,350 ****
      bool Create(wxWindow *parent, wxWindowID id, const wxPoint& pos = wxDefaultPosition, const wxSize& size = wxDefaultSize, long style = 0, const wxValidator& validator = wxDefaultValidator, const wxString& name = "wxControl")
      void Command(wxCommandEvent& event)
!     !%wxchkver26 wxString GetLabel()                      // see wxWindow
!     !%wxchkver26 void     SetLabel(const wxString& label) // see wxWindow
  
      //static wxString GetLabelText(const wxString& label) translates arbitrary string, removes mnemonic characters ('&')
      %wxchkver_2_8 wxString GetLabelText() const
  
!     !%wxchkver26 %property=Label, read, write
  %endclass
  
--- 340,350 ----
      bool Create(wxWindow *parent, wxWindowID id, const wxPoint& pos = wxDefaultPosition, const wxSize& size = wxDefaultSize, long style = 0, const wxValidator& validator = wxDefaultValidator, const wxString& name = "wxControl")
      void Command(wxCommandEvent& event)
!     !%wxchkver_2_6 wxString GetLabel()                      // see wxWindow
!     !%wxchkver_2_6 void     SetLabel(const wxString& label) // see wxWindow
  
      //static wxString GetLabelText(const wxString& label) translates arbitrary string, removes mnemonic characters ('&')
      %wxchkver_2_8 wxString GetLabelText() const
  
!     !%wxchkver_2_6 %property=Label, read, write
  %endclass
  
***************
*** 357,361 ****
  %include "wx/bookctrl.h"
  
! %if %wxchkver28
      %define wxBK_DEFAULT
      %define wxBK_TOP
--- 357,361 ----
  %include "wx/bookctrl.h"
  
! %if %wxchkver_2_8
      %define wxBK_DEFAULT
      %define wxBK_TOP
***************
*** 372,376 ****
          wxBK_HITTEST_ONPAGE
      %endenum
! %endif // %wxchkver28
  
  %class wxBookCtrlBase, wxControl
--- 372,376 ----
          wxBK_HITTEST_ONPAGE
      %endenum
! %endif // %wxchkver_2_8
  
  %class wxBookCtrlBase, wxControl
***************
*** 407,413 ****
          bool GetFitToCurrentPage() const
  
!         // virtual int ChangeSelection(size_t n) = 0; FIXME pure virtual
  
!         //virtual int HitTest(const wxPoint& pt, long* flags = NULL) const
          //virtual bool HasMultiplePages() const - FIXME do we need this?
  
--- 407,413 ----
          bool GetFitToCurrentPage() const
  
!         %wxchkver_2_8 virtual int ChangeSelection(size_t n)
  
!         //virtual int HitTest(const wxPoint& pt, long* flags = NULL) const FIXME add this
          //virtual bool HasMultiplePages() const - FIXME do we need this?
  
***************
*** 447,451 ****
  %define wxNB_MULTILINE
  
! %if !%wxchkver27|%wxcompat26
      %define wxNB_TOP  // use wxBK_XXX after 2.6
      %define wxNB_LEFT
--- 447,451 ----
  %define wxNB_MULTILINE
  
! %if !%wxchkver_2_7|%wxcompat_2_6
      %define wxNB_TOP  // use wxBK_XXX after 2.6
      %define wxNB_LEFT
***************
*** 455,459 ****
      %define wxNB_MULTILINE
      %define wxNB_NOPAGETHEME
! %endif // !%wxchkver27|%wxcompat26
  
  %enum
--- 455,459 ----
      %define wxNB_MULTILINE
      %define wxNB_NOPAGETHEME
! %endif // !%wxchkver_2_7|%wxcompat_2_6
  
  %enum
***************
*** 610,614 ****
  // wxTabCtrl
  
! %if %wxchkver24 & %msw & wxLUA_USE_wxTabCtrl & wxUSE_TAB_DIALOG // note: wxUSE_TAB_DIALOG is correct
  
  %include "wx/tabctrl.h"
--- 610,614 ----
  // wxTabCtrl
  
! %if %wxchkver_2_4 & %msw & wxLUA_USE_wxTabCtrl & wxUSE_TAB_DIALOG // note: wxUSE_TAB_DIALOG is correct
  
  %include "wx/tabctrl.h"
***************
*** 664,668 ****
  %endclass
  
! %endif //%wxchkver24 & %msw & wxLUA_USE_wxTabCtrl & wxUSE_TAB_DIALOG
  
  //-----------------------------------------------------------------------------
--- 664,668 ----
  %endclass
  
! %endif //%wxchkver_2_4 & %msw & wxLUA_USE_wxTabCtrl & wxUSE_TAB_DIALOG
  
  //-----------------------------------------------------------------------------
***************
*** 884,888 ****
  %define wxSP_FULLSASH
  %define wxSP_3D
! %wxchkver24 %define wxSP_NO_XP_THEME
  %define wxSP_SASH_AQUA
  
--- 884,888 ----
  %define wxSP_FULLSASH
  %define wxSP_3D
! %wxchkver_2_4 %define wxSP_NO_XP_THEME
  %define wxSP_SASH_AQUA
  

Index: gdi.i
===================================================================
RCS file: /cvsroot/wxlua/wxLua/bindings/wxwidgets/gdi.i,v
retrieving revision 1.39
retrieving revision 1.40
diff -C2 -d -r1.39 -r1.40
*** gdi.i	2 Mar 2007 05:44:22 -0000	1.39
--- gdi.i	9 Mar 2007 00:15:12 -0000	1.40
***************
*** 75,81 ****
      %overload %constructor wxRectFromSize(const wxSize& size)
  
!     %wxchkver27 %overload bool Contains(wxCoord dx, wxCoord dy) const
!     %wxchkver27 %overload %rename ContainsPoint bool Contains(const wxPoint& pt) const
!     %wxchkver27 %overload %rename ContainsRect bool Contains(const wxRect& rect) const
      wxRect  Deflate(wxCoord dx, wxCoord dy) const //wxRect& Deflate(wxCoord dx, wxCoord dy)
      int     GetBottom()
--- 75,81 ----
      %overload %constructor wxRectFromSize(const wxSize& size)
  
!     %wxchkver_2_7 %overload bool Contains(wxCoord dx, wxCoord dy) const
!     %wxchkver_2_7 %overload %rename ContainsPoint bool Contains(const wxPoint& pt) const
!     %wxchkver_2_7 %overload %rename ContainsRect bool Contains(const wxRect& rect) const
      wxRect  Deflate(wxCoord dx, wxCoord dy) const //wxRect& Deflate(wxCoord dx, wxCoord dy)
      int     GetBottom()
***************
*** 92,96 ****
      int     GetY()
      wxRect  Inflate(wxCoord dx, wxCoord dy) const //wxRect& Inflate(wxCoord dx, wxCoord dy)
!     %wxcompat26 bool    Inside(wxCoord cx, wxCoord cy)
      bool    Intersects(const wxRect& rect) const
      bool    IsEmpty() const
--- 92,96 ----
      int     GetY()
      wxRect  Inflate(wxCoord dx, wxCoord dy) const //wxRect& Inflate(wxCoord dx, wxCoord dy)
!     %wxcompat_2_6 bool    Inside(wxCoord cx, wxCoord cy)
      bool    Intersects(const wxRect& rect) const
      bool    IsEmpty() const
***************
*** 380,387 ****
      virtual bool EnumerateEncodings( const wxString &font = "" )
  
!     %wxchkver27 static wxArrayString GetEncodings()
!     %wxchkver27 static wxArrayString GetFacenames()
!     !%wxchkver27 wxArrayString* GetEncodings()
!     !%wxchkver27 wxArrayString* GetFacenames()
  
      %win %property=Encodings, read
--- 380,387 ----
      virtual bool EnumerateEncodings( const wxString &font = "" )
  
!     %wxchkver_2_7 static wxArrayString GetEncodings()
!     %wxchkver_2_7 static wxArrayString GetFacenames()
!     !%wxchkver_2_7 wxArrayString* GetEncodings()
!     !%wxchkver_2_7 wxArrayString* GetFacenames()
  
      %win %property=Encodings, read
***************
*** 431,435 ****
      void SetDialogTitle(const wxString &title)
      static wxFontMapper *Set(wxFontMapper *mapper)
!     !%wxchkver27 void SetConfig(wxConfigBase *config = NULL)
      void SetConfigPath(const wxString &prefix)
  %endclass
--- 431,435 ----
      void SetDialogTitle(const wxString &title)
      static wxFontMapper *Set(wxFontMapper *mapper)
!     !%wxchkver_2_7 void SetConfig(wxConfigBase *config = NULL)
      void SetConfigPath(const wxString &prefix)
  %endclass
***************
*** 679,683 ****
      %constructor wxDefaultIcon()
  
!     %win|%mac|%wxchkver25 void CopyFromBitmap(const wxBitmap& bmp)
      int     GetDepth()
      int     GetHeight()
--- 679,683 ----
      %constructor wxDefaultIcon()
  
!     %win|%mac|%wxchkver_2_5 void CopyFromBitmap(const wxBitmap& bmp)
      int     GetDepth()
      int     GetHeight()
***************
*** 727,731 ****
  %win %class %noclassinfo wxGDIImageHandler
  %endclass
! %wxchkver25&%win %class %noclassinfo wxGDIImageHandlerList, wxList
  %endclass
  
--- 727,731 ----
  %win %class %noclassinfo wxGDIImageHandler
  %endclass
! %wxchkver_2_5&%win %class %noclassinfo wxGDIImageHandlerList, wxList
  %endclass
  
***************
*** 750,755 ****
      //static wxBitmapHandler* FindHandler(wxBitmapType bitmapType)
      int GetDepth() const
!     //%wxchkver25&%win static wxGDIImageHandlerList& GetHandlers()
!     //!%wxchkver25&%win static wxList& GetHandlers()
      int GetHeight() const
      wxPalette* GetPalette() const
--- 750,755 ----
      //static wxBitmapHandler* FindHandler(wxBitmapType bitmapType)
      int GetDepth() const
!     //%wxchkver_2_5&%win static wxGDIImageHandlerList& GetHandlers()
!     //!%wxchkver_2_5&%win static wxList& GetHandlers()
      int GetHeight() const
      wxPalette* GetPalette() const
***************
*** 1130,1133 ****
--- 1130,1135 ----
      wxMemoryDC()
      void SelectObject(wxBitmap& bitmap) // not const in >=2.8
+ 
+     %wxchkver_2_8 virtual void SelectObjectAsSource(const wxBitmap& bmp)
  %endclass
  
***************
*** 1274,1279 ****
  %endclass
  
! %endif //wxLUA_USE_wxCaret & wxUSE_CARET
  
  
  //-----------------------------------------------------------------------------
--- 1276,1290 ----
  %endclass
  
! //-----------------------------------------------------------------------------
! // wxCaretSuspend
  
+ %include "wx/caret.h"
+ 
+ %class %delete %noclassinfo %encapsulate wxCaretSuspend
+     // NOTE: ALWAYS Delete() this when done since lua's gc may not delete it soon enough
+     wxCaretSuspend(wxWindow *win = NULL)
+ %endclass
+ 
+ %endif //wxLUA_USE_wxCaret & wxUSE_CARET
  
  //-----------------------------------------------------------------------------
***************
*** 1311,1315 ****
      wxGLContext* GetContext() const
      void SetCurrent()
!     %wxchkver28 %rename SetCurrentContext void SetCurrent(const wxGLContext& RC) const
      void SetColour(const wxString& colour)
      void SwapBuffers()
--- 1322,1326 ----
      wxGLContext* GetContext() const
      void SetCurrent()
!     %wxchkver_2_8 %rename SetCurrentContext void SetCurrent(const wxGLContext& RC) const
      void SetColour(const wxString& colour)
      void SwapBuffers()
***************
*** 1319,1335 ****
  %class wxGLContext, wxObject
      // for <= 2.6
!     !%wxchkver28 wxGLContext(bool isRGB, wxGLCanvas* win, const wxPalette& palette = wxNullPalette)
!     !%wxchkver28 %constructor wxGLContextOther wxGLContext(bool isRGB, wxGLCanvas* win, const wxPalette& palette = wxNullPalette, const wxGLContext* other)
  
!     !%wxchkver28 const wxWindow*  GetWindow()
!     !%wxchkver28 void SetCurrent()
!     !%wxchkver28 void SetColour(const wxString& colour)
!     !%wxchkver28 void SwapBuffers()
  
      // for >= 2.8
  
!     %wxchkver28 wxGLContext(wxGLCanvas *win, const wxGLContext* other = NULL )
  
!     %wxchkver28 void SetCurrent(const wxGLCanvas& win) const
  
  %endclass
--- 1330,1346 ----
  %class wxGLContext, wxObject
      // for <= 2.6
!     !%wxchkver_2_8 wxGLContext(bool isRGB, wxGLCanvas* win, const wxPalette& palette = wxNullPalette)
!     !%wxchkver_2_8 %constructor wxGLContextOther wxGLContext(bool isRGB, wxGLCanvas* win, const wxPalette& palette = wxNullPalette, const wxGLContext* other)
  
!     !%wxchkver_2_8 const wxWindow*  GetWindow()
!     !%wxchkver_2_8 void SetCurrent()
!     !%wxchkver_2_8 void SetColour(const wxString& colour)
!     !%wxchkver_2_8 void SwapBuffers()
  
      // for >= 2.8
  
!     %wxchkver_2_8 wxGLContext(wxGLCanvas *win, const wxGLContext* other = NULL )
  
!     %wxchkver_2_8 void SetCurrent(const wxGLCanvas& win) const
  
  %endclass
***************
*** 1399,1400 ****
--- 1410,1439 ----
  
  %endif //wxLUA_USE_wxDisplay & wxUSE_DISPLAY
+ 
+ //-----------------------------------------------------------------------------
+ // wxEffects
+ 
+ %include "wx/effects.h"
+ 
+ %class wxEffects, wxObject
+     %constructor wxEffectsDefault() // use system default colours
+     wxEffects(const wxColour& highlightColour, const wxColour& lightShadow, const wxColour& faceColour, const wxColour& mediumShadow, const wxColour& darkShadow)
+ 
+     wxColour GetHighlightColour() const
+     wxColour GetLightShadow() const
+     wxColour GetFaceColour() const
+     wxColour GetMediumShadow() const
+     wxColour GetDarkShadow() const
+ 
+     void SetHighlightColour(const wxColour& c)
+     void SetLightShadow(const wxColour& c)
+     void SetFaceColour(const wxColour& c)
+     void SetMediumShadow(const wxColour& c)
+     void SetDarkShadow(const wxColour& c)
+ 
+     void Set(const wxColour& highlightColour, const wxColour& lightShadow, const wxColour& faceColour, const wxColour& mediumShadow, const wxColour& darkShadow)
+ 
+     void DrawSunkenEdge(wxDC& dc, const wxRect& rect, int borderSize = 1)
+     bool TileBitmap(const wxRect& rect, wxDC& dc, wxBitmap& bitmap)
+ 
+ %endclass

Index: html.i
===================================================================
RCS file: /cvsroot/wxlua/wxLua/bindings/wxwidgets/html.i,v
retrieving revision 1.13
retrieving revision 1.14
diff -C2 -d -r1.13 -r1.14
*** html.i	23 Feb 2007 04:35:30 -0000	1.13
--- html.i	9 Mar 2007 00:15:12 -0000	1.14
***************
*** 23,28 ****
  
      // %override [bool, int pagebreak] wxHtmlCell::AdjustPagebreak(int pagebreak)
!     !%wxchkver27 virtual bool AdjustPagebreak(int pagebreak) // int* known_pagebreaks, int number_of_pages)
!     %wxchkver27 virtual bool AdjustPagebreak(int pagebreak, wxArrayInt& known_pagebreaks)
      //virtual void Draw(wxDC& dc, int x, int y, int view_y1, int view_y2, wxHtmlRenderingInfo& info)
      //virtual void DrawInvisible(wxDC& dc, int x, int y, wxHtmlRenderingInfo& info)
--- 23,28 ----
  
      // %override [bool, int pagebreak] wxHtmlCell::AdjustPagebreak(int pagebreak)
!     !%wxchkver_2_7 virtual bool AdjustPagebreak(int pagebreak) // int* known_pagebreaks, int number_of_pages)
!     %wxchkver_2_7 virtual bool AdjustPagebreak(int pagebreak, wxArrayInt& known_pagebreaks)
      //virtual void Draw(wxDC& dc, int x, int y, int view_y1, int view_y2, wxHtmlRenderingInfo& info)
      //virtual void DrawInvisible(wxDC& dc, int x, int y, wxHtmlRenderingInfo& info)
***************
*** 153,162 ****
      %rename SetWidthFloatFromTag void SetWidthFloat(const wxHtmlTag& tag, double pixel_scale = 1.0)
  
!     %wxchkver25 wxHtmlCell* GetFirstChild()
!     !%wxchkver25 wxHtmlCell* GetFirstCell()
  
      %property=AlignHor, read, write
      %property=AlignVer, read, write
!     !%wxchkver25 %property=FirstCell, read
  %endclass
  
--- 153,162 ----
      %rename SetWidthFloatFromTag void SetWidthFloat(const wxHtmlTag& tag, double pixel_scale = 1.0)
  
!     %wxchkver_2_5 wxHtmlCell* GetFirstChild()
!     !%wxchkver_2_5 wxHtmlCell* GetFirstCell()
  
      %property=AlignHor, read, write
      %property=AlignVer, read, write
!     !%wxchkver_2_5 %property=FirstCell, read
  %endclass
  
***************
*** 262,267 ****
      wxColour GetLinkColor() const
      //wxFontEncoding GetOutputEncoding() const
!     %wxchkver27 wxHtmlWindowInterface *GetWindowInterface()
!     !%wxchkver27 wxWindow* GetWindow()
      wxHtmlContainerCell* OpenContainer()
      void SetActualColor(const wxColour& clr)
--- 262,267 ----
      wxColour GetLinkColor() const
      //wxFontEncoding GetOutputEncoding() const
!     %wxchkver_2_7 wxHtmlWindowInterface *GetWindowInterface()
!     !%wxchkver_2_7 wxWindow* GetWindow()
      wxHtmlContainerCell* OpenContainer()
      void SetActualColor(const wxColour& clr)
***************
*** 280,284 ****
      void SetLinkColor(const wxColour& clr)
  
!     !%wxchkver27 %property=Window, read
      %property=ActualColor, read, write
      %property=Align, read, write
--- 280,284 ----
      void SetLinkColor(const wxColour& clr)
  
!     !%wxchkver_2_7 %property=Window, read
      %property=ActualColor, read, write
      %property=Align, read, write
***************
*** 299,303 ****
  // wxHtmlWindowInterface
  
! %if %wxchkver27
  
  %enum wxHtmlWindowInterface::HTMLCursor
--- 299,303 ----
  // wxHtmlWindowInterface
  
! %if %wxchkver_2_7
  
  %enum wxHtmlWindowInterface::HTMLCursor
***************
*** 335,340 ****
      void SetSize(int width, int height)
      void SetHtmlText(const wxString& html, const wxS...
 
[truncated message content]

[Wxlua-commit] wxLua/modules/wxbind/include wxbind.h,1.55,1.56

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

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

Modified Files:
	wxbind.h 
Log Message:
update to 2.8 using C++ header files


Index: wxbind.h
===================================================================
RCS file: /cvsroot/wxlua/wxLua/modules/wxbind/include/wxbind.h,v
retrieving revision 1.55
retrieving revision 1.56
diff -C2 -d -r1.55 -r1.56
*** wxbind.h	7 Mar 2007 23:56:42 -0000	1.55
--- wxbind.h	9 Mar 2007 00:15:13 -0000	1.56
***************
*** 108,115 ****
--- 108,123 ----
  #endif // (wxCHECK_VERSION(2,6,0) && wxUSE_SOUND) && (wxLUA_USE_wxWave)
  
+ #if (wxCHECK_VERSION(2,8,0)) && (wxLUA_USE_wxClipboard && wxUSE_CLIPBOARD)
+     #include "wx/event.h"
+ #endif // (wxCHECK_VERSION(2,8,0)) && (wxLUA_USE_wxClipboard && wxUSE_CLIPBOARD)
+ 
  #if (wxLUA_USE_wxBitmapButton && wxUSE_BMPBUTTON) && (wxLUA_USE_wxButton && wxUSE_BUTTON)
      #include "wx/bmpbuttn.h"
  #endif // (wxLUA_USE_wxBitmapButton && wxUSE_BMPBUTTON) && (wxLUA_USE_wxButton && wxUSE_BUTTON)
  
+ #if (wxLUA_USE_wxBitmapButton && wxUSE_BMPBUTTON) && (wxLUA_USE_wxHelpController && wxUSE_HELP)
+     #include "wx/cshelp.h"
+ #endif // (wxLUA_USE_wxBitmapButton && wxUSE_BMPBUTTON) && (wxLUA_USE_wxHelpController && wxUSE_HELP)
+ 
  #if (wxLUA_USE_wxCheckListBox && wxUSE_CHECKLISTBOX) && (wxLUA_USE_wxListBox && wxUSE_LISTBOX)
      #include "wx/checklst.h"
***************
*** 160,163 ****
--- 168,172 ----
  #include "wx/control.h"
  #include "wx/defs.h"
+ #include "wx/effects.h"
  #include "wx/event.h"
  #include "wx/filefn.h"
***************
*** 175,178 ****
--- 184,191 ----
  #endif // wxCHECK_VERSION(2,4,0) && defined(__WXMSW__) && wxLUA_USE_wxTabCtrl && wxUSE_TAB_DIALOG
  
+ #if wxCHECK_VERSION(2,8,0)
+     #include "wx/event.h"
+ #endif // wxCHECK_VERSION(2,8,0)
+ 
  #if wxCHECK_VERSION(2,8,0) && wxUSE_ABOUTDLG && wxLUA_USE_wxAboutDialog
      #include "wx/aboutdlg.h"
***************
*** 395,398 ****
--- 408,412 ----
  
  #if wxLUA_USE_wxHelpController && wxUSE_HELP
+     #include "wx/cshelp.h"
      #include "wx/help.h"
  #endif // wxLUA_USE_wxHelpController && wxUSE_HELP
***************
*** 683,694 ****
--- 697,720 ----
  #endif // (wxCHECK_VERSION(2,7,0)) && (wxLUA_USE_wxHTML && wxUSE_HTML)
  
+ #if (wxCHECK_VERSION(2,8,0)) && (wxLUA_USE_wxClipboard && wxUSE_CLIPBOARD)
+     extern WXDLLIMPEXP_DATA_WXBIND(int) s_wxluatag_wxClipboardTextEvent;
+ #endif // (wxCHECK_VERSION(2,8,0)) && (wxLUA_USE_wxClipboard && wxUSE_CLIPBOARD)
+ 
  #if (wxCHECK_VERSION(2,8,0)) && (wxLUA_USE_wxDC)
      extern WXDLLIMPEXP_DATA_WXBIND(int) s_wxluatag_wxAutoBufferedPaintDC;
  #endif // (wxCHECK_VERSION(2,8,0)) && (wxLUA_USE_wxDC)
  
+ #if (wxCHECK_VERSION(2,8,0)) && (wxLUA_USE_wxDataObject && wxUSE_DATAOBJ)
+     extern WXDLLIMPEXP_DATA_WXBIND(int) s_wxluatag_wxURLDataObject;
+ #endif // (wxCHECK_VERSION(2,8,0)) && (wxLUA_USE_wxDataObject && wxUSE_DATAOBJ)
+ 
  #if (wxLUA_USE_wxBitmapButton && wxUSE_BMPBUTTON) && (wxLUA_USE_wxButton && wxUSE_BUTTON)
      extern WXDLLIMPEXP_DATA_WXBIND(int) s_wxluatag_wxBitmapButton;
  #endif // (wxLUA_USE_wxBitmapButton && wxUSE_BMPBUTTON) && (wxLUA_USE_wxButton && wxUSE_BUTTON)
  
+ #if (wxLUA_USE_wxBitmapButton && wxUSE_BMPBUTTON) && (wxLUA_USE_wxHelpController && wxUSE_HELP)
+     extern WXDLLIMPEXP_DATA_WXBIND(int) s_wxluatag_wxContextHelpButton;
+ #endif // (wxLUA_USE_wxBitmapButton && wxUSE_BMPBUTTON) && (wxLUA_USE_wxHelpController && wxUSE_HELP)
+ 
  #if (wxLUA_USE_wxBrushList) && (wxLUA_USE_wxColourPenBrush)
      extern WXDLLIMPEXP_DATA_WXBIND(int) s_wxluatag_wxBrushList;
***************
*** 797,804 ****
--- 823,833 ----
  
  extern WXDLLIMPEXP_DATA_WXBIND(int) s_wxluatag_wxActivateEvent;
+ extern WXDLLIMPEXP_DATA_WXBIND(int) s_wxluatag_wxChildFocusEvent;
  extern WXDLLIMPEXP_DATA_WXBIND(int) s_wxluatag_wxClientData;
  extern WXDLLIMPEXP_DATA_WXBIND(int) s_wxluatag_wxCloseEvent;
  extern WXDLLIMPEXP_DATA_WXBIND(int) s_wxluatag_wxCommandEvent;
  extern WXDLLIMPEXP_DATA_WXBIND(int) s_wxluatag_wxControl;
+ extern WXDLLIMPEXP_DATA_WXBIND(int) s_wxluatag_wxDisplayChangedEvent;
+ extern WXDLLIMPEXP_DATA_WXBIND(int) s_wxluatag_wxEffects;
  extern WXDLLIMPEXP_DATA_WXBIND(int) s_wxluatag_wxEraseEvent;
  extern WXDLLIMPEXP_DATA_WXBIND(int) s_wxluatag_wxEvent;
***************
*** 817,827 ****
--- 846,860 ----
  extern WXDLLIMPEXP_DATA_WXBIND(int) s_wxluatag_wxMouseEvent;
  extern WXDLLIMPEXP_DATA_WXBIND(int) s_wxluatag_wxMoveEvent;
+ extern WXDLLIMPEXP_DATA_WXBIND(int) s_wxluatag_wxNavigationKeyEvent;
  extern WXDLLIMPEXP_DATA_WXBIND(int) s_wxluatag_wxNotifyEvent;
  extern WXDLLIMPEXP_DATA_WXBIND(int) s_wxluatag_wxPaintEvent;
+ extern WXDLLIMPEXP_DATA_WXBIND(int) s_wxluatag_wxPaletteChangedEvent;
  extern WXDLLIMPEXP_DATA_WXBIND(int) s_wxluatag_wxPanel;
  extern WXDLLIMPEXP_DATA_WXBIND(int) s_wxluatag_wxProcessEvent;
+ extern WXDLLIMPEXP_DATA_WXBIND(int) s_wxluatag_wxQueryNewPaletteEvent;
  extern WXDLLIMPEXP_DATA_WXBIND(int) s_wxluatag_wxScrollEvent;
  extern WXDLLIMPEXP_DATA_WXBIND(int) s_wxluatag_wxScrollWinEvent;
  extern WXDLLIMPEXP_DATA_WXBIND(int) s_wxluatag_wxSetCursorEvent;
+ extern WXDLLIMPEXP_DATA_WXBIND(int) s_wxluatag_wxShowEvent;
  extern WXDLLIMPEXP_DATA_WXBIND(int) s_wxluatag_wxSizeEvent;
  extern WXDLLIMPEXP_DATA_WXBIND(int) s_wxluatag_wxString;
***************
*** 844,847 ****
--- 877,884 ----
  #endif // wxCHECK_VERSION(2,7,0)
  
+ #if wxCHECK_VERSION(2,8,0)
+     extern WXDLLIMPEXP_DATA_WXBIND(int) s_wxluatag_wxMouseCaptureLostEvent;
+ #endif // wxCHECK_VERSION(2,8,0)
+ 
  #if wxCHECK_VERSION(2,8,0) && wxUSE_ABOUTDLG && wxLUA_USE_wxAboutDialog
      extern WXDLLIMPEXP_DATA_WXBIND(int) s_wxluatag_wxAboutDialogInfo;
***************
*** 895,898 ****
--- 932,936 ----
  #if wxLUA_USE_wxBusyCursor
      extern WXDLLIMPEXP_DATA_WXBIND(int) s_wxluatag_wxBusyCursor;
+     extern WXDLLIMPEXP_DATA_WXBIND(int) s_wxluatag_wxBusyCursorSuspender;
  #endif // wxLUA_USE_wxBusyCursor
  
***************
*** 914,917 ****
--- 952,956 ----
  #if wxLUA_USE_wxCaret && wxUSE_CARET
      extern WXDLLIMPEXP_DATA_WXBIND(int) s_wxluatag_wxCaret;
+     extern WXDLLIMPEXP_DATA_WXBIND(int) s_wxluatag_wxCaretSuspend;
  #endif // wxLUA_USE_wxCaret && wxUSE_CARET
  
***************
*** 956,959 ****
--- 995,999 ----
      extern WXDLLIMPEXP_DATA_WXBIND(int) s_wxluatag_wxConfig;
      extern WXDLLIMPEXP_DATA_WXBIND(int) s_wxluatag_wxConfigBase;
+     extern WXDLLIMPEXP_DATA_WXBIND(int) s_wxluatag_wxConfigPathChanger;
      extern WXDLLIMPEXP_DATA_WXBIND(int) s_wxluatag_wxFileConfig;
  #endif // wxLUA_USE_wxConfig && wxUSE_CONFIG
***************
*** 1135,1139 ****
--- 1175,1183 ----
  
  #if wxLUA_USE_wxHelpController && wxUSE_HELP
+     extern WXDLLIMPEXP_DATA_WXBIND(int) s_wxluatag_wxContextHelp;
      extern WXDLLIMPEXP_DATA_WXBIND(int) s_wxluatag_wxHelpController;
+     extern WXDLLIMPEXP_DATA_WXBIND(int) s_wxluatag_wxHelpControllerHelpProvider;
+     extern WXDLLIMPEXP_DATA_WXBIND(int) s_wxluatag_wxHelpProvider;
+     extern WXDLLIMPEXP_DATA_WXBIND(int) s_wxluatag_wxSimpleHelpProvider;
  #endif // wxLUA_USE_wxHelpController && wxUSE_HELP
  
***************
*** 1537,1540 ****
--- 1581,1589 ----
  #endif // (wxCHECK_VERSION(2,7,0)) && (wxLUA_USE_wxHTML && wxUSE_HTML)
  
+ #if (wxCHECK_VERSION(2,8,0)) && (wxLUA_USE_wxClipboard && wxUSE_CLIPBOARD)
+     extern WXDLLIMPEXP_WXBIND WXLUAMETHOD wxClipboardTextEvent_methods[];
+     extern WXDLLIMPEXP_DATA_WXBIND(int) wxClipboardTextEvent_methodCount;
+ #endif // (wxCHECK_VERSION(2,8,0)) && (wxLUA_USE_wxClipboard && wxUSE_CLIPBOARD)
+ 
  #if (wxCHECK_VERSION(2,8,0)) && (wxLUA_USE_wxDC)
      extern WXDLLIMPEXP_WXBIND WXLUAMETHOD wxAutoBufferedPaintDC_methods[];
***************
*** 1542,1545 ****
--- 1591,1599 ----
  #endif // (wxCHECK_VERSION(2,8,0)) && (wxLUA_USE_wxDC)
  
+ #if (wxCHECK_VERSION(2,8,0)) && (wxLUA_USE_wxDataObject && wxUSE_DATAOBJ)
+     extern WXDLLIMPEXP_WXBIND WXLUAMETHOD wxURLDataObject_methods[];
+     extern WXDLLIMPEXP_DATA_WXBIND(int) wxURLDataObject_methodCount;
+ #endif // (wxCHECK_VERSION(2,8,0)) && (wxLUA_USE_wxDataObject && wxUSE_DATAOBJ)
+ 
  #if (wxLUA_USE_wxBitmapButton && wxUSE_BMPBUTTON) && (wxLUA_USE_wxButton && wxUSE_BUTTON)
      extern WXDLLIMPEXP_WXBIND WXLUAMETHOD wxBitmapButton_methods[];
***************
*** 1547,1550 ****
--- 1601,1609 ----
  #endif // (wxLUA_USE_wxBitmapButton && wxUSE_BMPBUTTON) && (wxLUA_USE_wxButton && wxUSE_BUTTON)
  
+ #if (wxLUA_USE_wxBitmapButton && wxUSE_BMPBUTTON) && (wxLUA_USE_wxHelpController && wxUSE_HELP)
+     extern WXDLLIMPEXP_WXBIND WXLUAMETHOD wxContextHelpButton_methods[];
+     extern WXDLLIMPEXP_DATA_WXBIND(int) wxContextHelpButton_methodCount;
+ #endif // (wxLUA_USE_wxBitmapButton && wxUSE_BMPBUTTON) && (wxLUA_USE_wxHelpController && wxUSE_HELP)
+ 
  #if (wxLUA_USE_wxBrushList) && (wxLUA_USE_wxColourPenBrush)
      extern WXDLLIMPEXP_WXBIND WXLUAMETHOD wxBrushList_methods[];
***************
*** 1684,1687 ****
--- 1743,1748 ----
  extern WXDLLIMPEXP_WXBIND WXLUAMETHOD wxActivateEvent_methods[];
  extern WXDLLIMPEXP_DATA_WXBIND(int) wxActivateEvent_methodCount;
+ extern WXDLLIMPEXP_WXBIND WXLUAMETHOD wxChildFocusEvent_methods[];
+ extern WXDLLIMPEXP_DATA_WXBIND(int) wxChildFocusEvent_methodCount;
  extern WXDLLIMPEXP_WXBIND WXLUAMETHOD wxClientData_methods[];
  extern WXDLLIMPEXP_DATA_WXBIND(int) wxClientData_methodCount;
***************
*** 1692,1695 ****
--- 1753,1760 ----
  extern WXDLLIMPEXP_WXBIND WXLUAMETHOD wxControl_methods[];
  extern WXDLLIMPEXP_DATA_WXBIND(int) wxControl_methodCount;
+ extern WXDLLIMPEXP_WXBIND WXLUAMETHOD wxDisplayChangedEvent_methods[];
+ extern WXDLLIMPEXP_DATA_WXBIND(int) wxDisplayChangedEvent_methodCount;
+ extern WXDLLIMPEXP_WXBIND WXLUAMETHOD wxEffects_methods[];
+ extern WXDLLIMPEXP_DATA_WXBIND(int) wxEffects_methodCount;
  extern WXDLLIMPEXP_WXBIND WXLUAMETHOD wxEraseEvent_methods[];
  extern WXDLLIMPEXP_DATA_WXBIND(int) wxEraseEvent_methodCount;
***************
*** 1724,1735 ****
--- 1789,1806 ----
  extern WXDLLIMPEXP_WXBIND WXLUAMETHOD wxMoveEvent_methods[];
  extern WXDLLIMPEXP_DATA_WXBIND(int) wxMoveEvent_methodCount;
+ extern WXDLLIMPEXP_WXBIND WXLUAMETHOD wxNavigationKeyEvent_methods[];
+ extern WXDLLIMPEXP_DATA_WXBIND(int) wxNavigationKeyEvent_methodCount;
  extern WXDLLIMPEXP_WXBIND WXLUAMETHOD wxNotifyEvent_methods[];
  extern WXDLLIMPEXP_DATA_WXBIND(int) wxNotifyEvent_methodCount;
  extern WXDLLIMPEXP_WXBIND WXLUAMETHOD wxPaintEvent_methods[];
  extern WXDLLIMPEXP_DATA_WXBIND(int) wxPaintEvent_methodCount;
+ extern WXDLLIMPEXP_WXBIND WXLUAMETHOD wxPaletteChangedEvent_methods[];
+ extern WXDLLIMPEXP_DATA_WXBIND(int) wxPaletteChangedEvent_methodCount;
  extern WXDLLIMPEXP_WXBIND WXLUAMETHOD wxPanel_methods[];
  extern WXDLLIMPEXP_DATA_WXBIND(int) wxPanel_methodCount;
  extern WXDLLIMPEXP_WXBIND WXLUAMETHOD wxProcessEvent_methods[];
  extern WXDLLIMPEXP_DATA_WXBIND(int) wxProcessEvent_methodCount;
+ extern WXDLLIMPEXP_WXBIND WXLUAMETHOD wxQueryNewPaletteEvent_methods[];
+ extern WXDLLIMPEXP_DATA_WXBIND(int) wxQueryNewPaletteEvent_methodCount;
  extern WXDLLIMPEXP_WXBIND WXLUAMETHOD wxScrollEvent_methods[];
  extern WXDLLIMPEXP_DATA_WXBIND(int) wxScrollEvent_methodCount;
***************
*** 1738,1741 ****
--- 1809,1814 ----
  extern WXDLLIMPEXP_WXBIND WXLUAMETHOD wxSetCursorEvent_methods[];
  extern WXDLLIMPEXP_DATA_WXBIND(int) wxSetCursorEvent_methodCount;
+ extern WXDLLIMPEXP_WXBIND WXLUAMETHOD wxShowEvent_methods[];
+ extern WXDLLIMPEXP_DATA_WXBIND(int) wxShowEvent_methodCount;
  extern WXDLLIMPEXP_WXBIND WXLUAMETHOD wxSizeEvent_methods[];
  extern WXDLLIMPEXP_DATA_WXBIND(int) wxSizeEvent_methodCount;
***************
*** 1771,1774 ****
--- 1844,1852 ----
  #endif // wxCHECK_VERSION(2,7,0)
  
+ #if wxCHECK_VERSION(2,8,0)
+     extern WXDLLIMPEXP_WXBIND WXLUAMETHOD wxMouseCaptureLostEvent_methods[];
+     extern WXDLLIMPEXP_DATA_WXBIND(int) wxMouseCaptureLostEvent_methodCount;
+ #endif // wxCHECK_VERSION(2,8,0)
+ 
  #if wxCHECK_VERSION(2,8,0) && wxUSE_ABOUTDLG && wxLUA_USE_wxAboutDialog
      extern WXDLLIMPEXP_WXBIND WXLUAMETHOD wxAboutDialogInfo_methods[];
***************
*** 1845,1848 ****
--- 1923,1928 ----
      extern WXDLLIMPEXP_WXBIND WXLUAMETHOD wxBusyCursor_methods[];
      extern WXDLLIMPEXP_DATA_WXBIND(int) wxBusyCursor_methodCount;
+     extern WXDLLIMPEXP_WXBIND WXLUAMETHOD wxBusyCursorSuspender_methods[];
+     extern WXDLLIMPEXP_DATA_WXBIND(int) wxBusyCursorSuspender_methodCount;
  #endif // wxLUA_USE_wxBusyCursor
  
***************
*** 1871,1874 ****
--- 1951,1956 ----
      extern WXDLLIMPEXP_WXBIND WXLUAMETHOD wxCaret_methods[];
      extern WXDLLIMPEXP_DATA_WXBIND(int) wxCaret_methodCount;
+     extern WXDLLIMPEXP_WXBIND WXLUAMETHOD wxCaretSuspend_methods[];
+     extern WXDLLIMPEXP_DATA_WXBIND(int) wxCaretSuspend_methodCount;
  #endif // wxLUA_USE_wxCaret && wxUSE_CARET
  
***************
*** 1928,1931 ****
--- 2010,2015 ----
      extern WXDLLIMPEXP_WXBIND WXLUAMETHOD wxConfigBase_methods[];
      extern WXDLLIMPEXP_DATA_WXBIND(int) wxConfigBase_methodCount;
+     extern WXDLLIMPEXP_WXBIND WXLUAMETHOD wxConfigPathChanger_methods[];
+     extern WXDLLIMPEXP_DATA_WXBIND(int) wxConfigPathChanger_methodCount;
      extern WXDLLIMPEXP_WXBIND WXLUAMETHOD wxFileConfig_methods[];
      extern WXDLLIMPEXP_DATA_WXBIND(int) wxFileConfig_methodCount;
***************
*** 2196,2201 ****
--- 2280,2293 ----
  
  #if wxLUA_USE_wxHelpController && wxUSE_HELP
+     extern WXDLLIMPEXP_WXBIND WXLUAMETHOD wxContextHelp_methods[];
+     extern WXDLLIMPEXP_DATA_WXBIND(int) wxContextHelp_methodCount;
      extern WXDLLIMPEXP_WXBIND WXLUAMETHOD wxHelpController_methods[];
      extern WXDLLIMPEXP_DATA_WXBIND(int) wxHelpController_methodCount;
+     extern WXDLLIMPEXP_WXBIND WXLUAMETHOD wxHelpControllerHelpProvider_methods[];
+     extern WXDLLIMPEXP_DATA_WXBIND(int) wxHelpControllerHelpProvider_methodCount;
+     extern WXDLLIMPEXP_WXBIND WXLUAMETHOD wxHelpProvider_methods[];
+     extern WXDLLIMPEXP_DATA_WXBIND(int) wxHelpProvider_methodCount;
+     extern WXDLLIMPEXP_WXBIND WXLUAMETHOD wxSimpleHelpProvider_methods[];
+     extern WXDLLIMPEXP_DATA_WXBIND(int) wxSimpleHelpProvider_methodCount;
  #endif // wxLUA_USE_wxHelpController && wxUSE_HELP
  
***************
*** 2699,2702 ****
--- 2791,2798 ----
  // ---------------------------------------------------------------------------
  
+ #if (wxCHECK_VERSION(2,8,0)) && (wxLUA_USE_wxDataObject && wxUSE_DATAOBJ)
+     wxLUA_DECLARE_ENCAPSULATION(WXDLLIMPEXP_WXBIND, wxURLDataObject, wxURLDataObject)
+ #endif // (wxCHECK_VERSION(2,8,0)) && (wxLUA_USE_wxDataObject && wxUSE_DATAOBJ)
+ 
  wxLUA_DECLARE_ENCAPSULATION(WXDLLIMPEXP_WXBIND, wxString, wxString)
  wxLUA_DECLARE_ENCAPSULATION(WXDLLIMPEXP_WXBIND, wxWindowDisabler, wxWindowDisabler)
***************
*** 2732,2735 ****
--- 2828,2832 ----
  #if wxLUA_USE_wxBusyCursor
      wxLUA_DECLARE_ENCAPSULATION(WXDLLIMPEXP_WXBIND, wxBusyCursor, wxBusyCursor)
+     wxLUA_DECLARE_ENCAPSULATION(WXDLLIMPEXP_WXBIND, wxBusyCursorSuspender, wxBusyCursorSuspender)
  #endif // wxLUA_USE_wxBusyCursor
  
***************
*** 2738,2745 ****
--- 2835,2850 ----
  #endif // wxLUA_USE_wxCalendarCtrl && wxUSE_CALENDARCTRL
  
+ #if wxLUA_USE_wxCaret && wxUSE_CARET
+     wxLUA_DECLARE_ENCAPSULATION(WXDLLIMPEXP_WXBIND, wxCaretSuspend, wxCaretSuspend)
+ #endif // wxLUA_USE_wxCaret && wxUSE_CARET
+ 
  #if wxLUA_USE_wxColourPenBrush
      wxLUA_DECLARE_ENCAPSULATION(WXDLLIMPEXP_WXBIND, wxColourDatabase, wxColourDatabase)
  #endif // wxLUA_USE_wxColourPenBrush
  
+ #if wxLUA_USE_wxConfig && wxUSE_CONFIG
+     wxLUA_DECLARE_ENCAPSULATION(WXDLLIMPEXP_WXBIND, wxConfigPathChanger, wxConfigPathChanger)
+ #endif // wxLUA_USE_wxConfig && wxUSE_CONFIG
+ 
  #if wxLUA_USE_wxCriticalSection && wxUSE_THREADS
      wxLUA_DECLARE_ENCAPSULATION(WXDLLIMPEXP_WXBIND, wxCriticalSection, wxCriticalSection)
***************
*** 2807,2810 ****
--- 2912,2921 ----
  #endif // wxLUA_USE_wxGrid && wxUSE_GRID
  
+ #if wxLUA_USE_wxHelpController && wxUSE_HELP
+     wxLUA_DECLARE_ENCAPSULATION(WXDLLIMPEXP_WXBIND, wxHelpControllerHelpProvider, wxHelpControllerHelpProvider)
+     wxLUA_DECLARE_ENCAPSULATION(WXDLLIMPEXP_WXBIND, wxHelpProvider, wxHelpProvider)
+     wxLUA_DECLARE_ENCAPSULATION(WXDLLIMPEXP_WXBIND, wxSimpleHelpProvider, wxSimpleHelpProvider)
+ #endif // wxLUA_USE_wxHelpController && wxUSE_HELP
+ 
  #if wxLUA_USE_wxIcon
      wxLUA_DECLARE_ENCAPSULATION(WXDLLIMPEXP_WXBIND, wxIconBundle, wxIconBundle)

[Wxlua-commit] wxLua/bindings/wxstc stc.i, 1.7, 1.8 wxstc_datatypes.lua, 1.45, 1.46

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

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

Modified Files:
	stc.i wxstc_datatypes.lua 
Log Message:
update to 2.8 using C++ header files


Index: stc.i
===================================================================
RCS file: /cvsroot/wxlua/wxLua/bindings/wxstc/stc.i,v
retrieving revision 1.7
retrieving revision 1.8
diff -C2 -d -r1.7 -r1.8
*** stc.i	11 Oct 2006 03:24:01 -0000	1.7
--- stc.i	9 Mar 2007 00:15:11 -0000	1.8
***************
*** 341,346 ****
  
  // These are deprecated, STC_LEX_HTML should be used instead.
! !%wxchkver27 %define wxSTC_LEX_ASP
! !%wxchkver27 %define wxSTC_LEX_PHP
  
  // When a lexer specifies its language as SCLEX_AUTOMATIC it receives a
--- 341,346 ----
  
  // These are deprecated, STC_LEX_HTML should be used instead.
! !%wxchkver_2_7 %define wxSTC_LEX_ASP
! !%wxchkver_2_7 %define wxSTC_LEX_PHP
  
  // When a lexer specifies its language as SCLEX_AUTOMATIC it receives a
***************
*** 825,865 ****
  
  // Lexical states for SCLEX_SCRIPTOL
! !%wxchkver25 %define wxSTC_SCRIPTOL_DEFAULT
! !%wxchkver25 %define wxSTC_SCRIPTOL_COMMENT
! !%wxchkver25 %define wxSTC_SCRIPTOL_COMMENTLINE
! !%wxchkver25 %define wxSTC_SCRIPTOL_COMMENTDOC
! !%wxchkver25 %define wxSTC_SCRIPTOL_NUMBER
! !%wxchkver25 %define wxSTC_SCRIPTOL_WORD
! !%wxchkver25 %define wxSTC_SCRIPTOL_STRING
! !%wxchkver25 %define wxSTC_SCRIPTOL_CHARACTER
! !%wxchkver25 %define wxSTC_SCRIPTOL_UUID
! !%wxchkver25 %define wxSTC_SCRIPTOL_PREPROCESSOR
! !%wxchkver25 %define wxSTC_SCRIPTOL_OPERATOR
! !%wxchkver25 %define wxSTC_SCRIPTOL_IDENTIFIER
! !%wxchkver25 %define wxSTC_SCRIPTOL_STRINGEOL
! !%wxchkver25 %define wxSTC_SCRIPTOL_VERBATIM
! !%wxchkver25 %define wxSTC_SCRIPTOL_REGEX
! !%wxchkver25 %define wxSTC_SCRIPTOL_COMMENTLINEDOC
! !%wxchkver25 %define wxSTC_SCRIPTOL_WORD2
! !%wxchkver25 %define wxSTC_SCRIPTOL_COMMENTDOCKEYWORD
! !%wxchkver25 %define wxSTC_SCRIPTOL_COMMENTDOCKEYWORDERROR
! !%wxchkver25 %define wxSTC_SCRIPTOL_COMMENTBASIC
  
! %wxchkver25 %define wxSTC_SCRIPTOL_DEFAULT
! %wxchkver25 %define wxSTC_SCRIPTOL_WHITE
! %wxchkver25 %define wxSTC_SCRIPTOL_COMMENTLINE
! %wxchkver25 %define wxSTC_SCRIPTOL_PERSISTENT
! %wxchkver25 %define wxSTC_SCRIPTOL_CSTYLE
! %wxchkver25 %define wxSTC_SCRIPTOL_COMMENTBLOCK
! %wxchkver25 %define wxSTC_SCRIPTOL_NUMBER
! %wxchkver25 %define wxSTC_SCRIPTOL_STRING
! %wxchkver25 %define wxSTC_SCRIPTOL_CHARACTER
! %wxchkver25 %define wxSTC_SCRIPTOL_STRINGEOL
! %wxchkver25 %define wxSTC_SCRIPTOL_KEYWORD
! %wxchkver25 %define wxSTC_SCRIPTOL_OPERATOR
! %wxchkver25 %define wxSTC_SCRIPTOL_IDENTIFIER
! %wxchkver25 %define wxSTC_SCRIPTOL_TRIPLE
! %wxchkver25 %define wxSTC_SCRIPTOL_CLASSNAME
! %wxchkver25 %define wxSTC_SCRIPTOL_PREPROCESSOR
  
  // Lexical states for SCLEX_ASM
--- 825,865 ----
  
  // Lexical states for SCLEX_SCRIPTOL
! !%wxchkver_2_5 %define wxSTC_SCRIPTOL_DEFAULT
! !%wxchkver_2_5 %define wxSTC_SCRIPTOL_COMMENT
! !%wxchkver_2_5 %define wxSTC_SCRIPTOL_COMMENTLINE
! !%wxchkver_2_5 %define wxSTC_SCRIPTOL_COMMENTDOC
! !%wxchkver_2_5 %define wxSTC_SCRIPTOL_NUMBER
! !%wxchkver_2_5 %define wxSTC_SCRIPTOL_WORD
! !%wxchkver_2_5 %define wxSTC_SCRIPTOL_STRING
! !%wxchkver_2_5 %define wxSTC_SCRIPTOL_CHARACTER
! !%wxchkver_2_5 %define wxSTC_SCRIPTOL_UUID
! !%wxchkver_2_5 %define wxSTC_SCRIPTOL_PREPROCESSOR
! !%wxchkver_2_5 %define wxSTC_SCRIPTOL_OPERATOR
! !%wxchkver_2_5 %define wxSTC_SCRIPTOL_IDENTIFIER
! !%wxchkver_2_5 %define wxSTC_SCRIPTOL_STRINGEOL
! !%wxchkver_2_5 %define wxSTC_SCRIPTOL_VERBATIM
! !%wxchkver_2_5 %define wxSTC_SCRIPTOL_REGEX
! !%wxchkver_2_5 %define wxSTC_SCRIPTOL_COMMENTLINEDOC
! !%wxchkver_2_5 %define wxSTC_SCRIPTOL_WORD2
! !%wxchkver_2_5 %define wxSTC_SCRIPTOL_COMMENTDOCKEYWORD
! !%wxchkver_2_5 %define wxSTC_SCRIPTOL_COMMENTDOCKEYWORDERROR
! !%wxchkver_2_5 %define wxSTC_SCRIPTOL_COMMENTBASIC
  
! %wxchkver_2_5 %define wxSTC_SCRIPTOL_DEFAULT
! %wxchkver_2_5 %define wxSTC_SCRIPTOL_WHITE
! %wxchkver_2_5 %define wxSTC_SCRIPTOL_COMMENTLINE
! %wxchkver_2_5 %define wxSTC_SCRIPTOL_PERSISTENT
! %wxchkver_2_5 %define wxSTC_SCRIPTOL_CSTYLE
! %wxchkver_2_5 %define wxSTC_SCRIPTOL_COMMENTBLOCK
! %wxchkver_2_5 %define wxSTC_SCRIPTOL_NUMBER
! %wxchkver_2_5 %define wxSTC_SCRIPTOL_STRING
! %wxchkver_2_5 %define wxSTC_SCRIPTOL_CHARACTER
! %wxchkver_2_5 %define wxSTC_SCRIPTOL_STRINGEOL
! %wxchkver_2_5 %define wxSTC_SCRIPTOL_KEYWORD
! %wxchkver_2_5 %define wxSTC_SCRIPTOL_OPERATOR
! %wxchkver_2_5 %define wxSTC_SCRIPTOL_IDENTIFIER
! %wxchkver_2_5 %define wxSTC_SCRIPTOL_TRIPLE
! %wxchkver_2_5 %define wxSTC_SCRIPTOL_CLASSNAME
! %wxchkver_2_5 %define wxSTC_SCRIPTOL_PREPROCESSOR
  
  // Lexical states for SCLEX_ASM
***************
*** 2017,2026 ****
  
      // Get the colour of the background of the line containing the caret.
!     !%wxchkver271 wxColour GetCaretLineBack();
!     %wxchkver271  wxColour GetCaretLineBackground();
  
      // Set the colour of the background of the line containing the caret.
!     !%wxchkver271 void SetCaretLineBack(const wxColour& back);
!     %wxchkver271  void SetCaretLineBackground(const wxColour& back);
  
      // Set a style to be changeable or not (read only).
--- 2017,2026 ----
  
      // Get the colour of the background of the line containing the caret.
!     !%wxchkver_2_7_1 wxColour GetCaretLineBack();
!     %wxchkver_2_7_1  wxColour GetCaretLineBackground();
  
      // Set the colour of the background of the line containing the caret.
!     !%wxchkver_2_7_1 void SetCaretLineBack(const wxColour& back);
!     %wxchkver_2_7_1  void SetCaretLineBackground(const wxColour& back);
  
      // Set a style to be changeable or not (read only).
***************
*** 3204,3209 ****
      %property=MaxLineState, read
      %property=CaretLineVisible, read, write
!     !%wxchkver271 %property=CaretLineBack, read, write
!     %wxchkver271 %property=CaretLineBackground, read, write
      %property=Indent, read, write
      %property=UseTabs, read, write
--- 3204,3209 ----
      %property=MaxLineState, read
      %property=CaretLineVisible, read, write
!     !%wxchkver_2_7_1 %property=CaretLineBack, read, write
!     %wxchkver_2_7_1 %property=CaretLineBackground, read, write
      %property=Indent, read, write
      %property=UseTabs, read, write
***************
*** 3274,3278 ****
      %define %event wxEVT_STC_MARGINCLICK
      %define %event wxEVT_STC_NEEDSHOWN
!     !%wxchkver25 %define %event wxEVT_STC_POSCHANGED
      %define %event wxEVT_STC_PAINTED
      %define %event wxEVT_STC_USERLISTSELECTION
--- 3274,3278 ----
      %define %event wxEVT_STC_MARGINCLICK
      %define %event wxEVT_STC_NEEDSHOWN
!     !%wxchkver_2_5 %define %event wxEVT_STC_POSCHANGED
      %define %event wxEVT_STC_PAINTED
      %define %event wxEVT_STC_USERLISTSELECTION

Index: wxstc_datatypes.lua
===================================================================
RCS file: /cvsroot/wxlua/wxLua/bindings/wxstc/wxstc_datatypes.lua,v
retrieving revision 1.45
retrieving revision 1.46
diff -C2 -d -r1.45 -r1.46
*** wxstc_datatypes.lua	2 Mar 2007 05:44:21 -0000	1.45
--- wxstc_datatypes.lua	9 Mar 2007 00:15:11 -0000	1.46
***************
*** 385,388 ****
--- 385,394 ----
      Name = "wxBusyCursor",
    },
+   wxBusyCursorSuspender = {
+     Condition = "wxLUA_USE_wxBusyCursor",
+     DefType = "class",
+     IsNumber = false,
+     Name = "wxBusyCursorSuspender",
+   },
    wxBusyInfo = {
      BaseClass = "wxObject",
***************
*** 456,459 ****
--- 462,471 ----
      Name = "wxCaret",
    },
+   wxCaretSuspend = {
+     Condition = "wxLUA_USE_wxCaret && wxUSE_CARET",
+     DefType = "class",
+     IsNumber = false,
+     Name = "wxCaretSuspend",
+   },
    wxChar = {
      DefType = "number",
***************
*** 481,484 ****
--- 493,502 ----
      Name = "wxCheckListBox",
    },
+   wxChildFocusEvent = {
+     BaseClass = "wxCommandEvent",
+     DefType = "class",
+     IsNumber = false,
+     Name = "wxChildFocusEvent",
+   },
    wxChoice = {
      BaseClass = "wxControlWithItems",
***************
*** 533,536 ****
--- 551,561 ----
      Name = "wxClipboard",
    },
+   wxClipboardTextEvent = {
+     BaseClass = "wxCommandEvent",
+     Condition = "(wxCHECK_VERSION(2,8,0)) && (wxLUA_USE_wxClipboard && wxUSE_CLIPBOARD)",
+     DefType = "class",
+     IsNumber = false,
+     Name = "wxClipboardTextEvent",
+   },
    wxCloseEvent = {
      BaseClass = "wxEvent",
***************
*** 612,615 ****
--- 637,660 ----
      Name = "wxConfigBase::EntryType",
    },
+   wxConfigPathChanger = {
+     Condition = "wxLUA_USE_wxConfig && wxUSE_CONFIG",
+     DefType = "class",
+     IsNumber = false,
+     Name = "wxConfigPathChanger",
+   },
+   wxContextHelp = {
+     BaseClass = "wxObject",
+     Condition = "wxLUA_USE_wxHelpController && wxUSE_HELP",
+     DefType = "class",
+     IsNumber = false,
+     Name = "wxContextHelp",
+   },
+   wxContextHelpButton = {
+     BaseClass = "wxBitmapButton",
+     Condition = "(wxLUA_USE_wxBitmapButton && wxUSE_BMPBUTTON) && (wxLUA_USE_wxHelpController && wxUSE_HELP)",
+     DefType = "class",
+     IsNumber = false,
+     Name = "wxContextHelpButton",
+   },
    wxControl = {
      BaseClass = "wxWindow",
***************
*** 818,821 ****
--- 863,872 ----
      Name = "wxDisplay",
    },
+   wxDisplayChangedEvent = {
+     BaseClass = "wxEvent",
+     DefType = "class",
+     IsNumber = false,
+     Name = "wxDisplayChangedEvent",
+   },
    wxDocChildFrame = {
      BaseClass = "wxFrame",
***************
*** 901,904 ****
--- 952,961 ----
      Name = "wxEdge",
    },
+   wxEffects = {
+     BaseClass = "wxObject",
+     DefType = "class",
+     IsNumber = false,
+     Name = "wxEffects",
+   },
    wxEraseEvent = {
      BaseClass = "wxEvent",
***************
*** 1465,1468 ****
--- 1522,1532 ----
      Name = "wxHelpController",
    },
+   wxHelpControllerHelpProvider = {
+     BaseClass = "wxSimpleHelpProvider",
+     Condition = "wxLUA_USE_wxHelpController && wxUSE_HELP",
+     DefType = "class",
+     IsNumber = false,
+     Name = "wxHelpControllerHelpProvider",
+   },
    wxHelpEvent = {
      BaseClass = "wxCommandEvent",
***************
*** 1471,1474 ****
--- 1535,1550 ----
      Name = "wxHelpEvent",
    },
+   ["wxHelpEvent::Origin"] = {
+     Condition = "wxCHECK_VERSION(2,8,0)",
+     DefType = "enum",
+     IsNumber = true,
+     Name = "wxHelpEvent::Origin",
+   },
+   wxHelpProvider = {
+     Condition = "wxLUA_USE_wxHelpController && wxUSE_HELP",
+     DefType = "class",
+     IsNumber = false,
+     Name = "wxHelpProvider",
+   },
    wxHelpSearchMode = {
      Condition = "wxLUA_USE_wxHelpController && wxUSE_HELP",
***************
*** 2044,2047 ****
--- 2120,2130 ----
      Name = "wxMouseCaptureChangedEvent",
    },
+   wxMouseCaptureLostEvent = {
+     BaseClass = "wxEvent",
+     Condition = "wxCHECK_VERSION(2,8,0)",
+     DefType = "class",
+     IsNumber = false,
+     Name = "wxMouseCaptureLostEvent",
+   },
    wxMouseEvent = {
      BaseClass = "wxEvent",
***************
*** 2069,2072 ****
--- 2152,2166 ----
      Name = "wxMultiChoiceDialog",
    },
+   wxNavigationKeyEvent = {
+     BaseClass = "wxEvent",
+     DefType = "class",
+     IsNumber = false,
+     Name = "wxNavigationKeyEvent",
+   },
+   ["wxNavigationKeyEvent::dummy"] = {
+     DefType = "enum",
+     IsNumber = true,
+     Name = "wxNavigationKeyEvent::dummy",
+   },
    wxNode = {
      Condition = "wxLUA_USE_wxList",
***************
*** 2187,2190 ****
--- 2281,2290 ----
      Name = "wxPalette",
    },
+   wxPaletteChangedEvent = {
+     BaseClass = "wxEvent",
+     DefType = "class",
+     IsNumber = false,
+     Name = "wxPaletteChangedEvent",
+   },
    wxPanel = {
      BaseClass = "wxWindow",
***************
*** 2391,2394 ****
--- 2491,2500 ----
      Name = "wxQueryLayoutInfoEvent",
    },
+   wxQueryNewPaletteEvent = {
+     BaseClass = "wxEvent",
+     DefType = "class",
+     IsNumber = false,
+     Name = "wxQueryNewPaletteEvent",
+   },
    wxRadioBox = {
      BaseClass = "wxControl",
***************
*** 2533,2536 ****
--- 2639,2648 ----
      Name = "wxSetCursorEvent",
    },
+   wxShowEvent = {
+     BaseClass = "wxEvent",
+     DefType = "class",
+     IsNumber = false,
+     Name = "wxShowEvent",
+   },
    wxSignal = {
      Condition = "wxLUA_USE_wxProcess",
***************
*** 2539,2542 ****
--- 2651,2661 ----
      Name = "wxSignal",
    },
+   wxSimpleHelpProvider = {
+     BaseClass = "wxHelpProvider",
+     Condition = "wxLUA_USE_wxHelpController && wxUSE_HELP",
+     DefType = "class",
+     IsNumber = false,
+     Name = "wxSimpleHelpProvider",
+   },
    wxSingleChoiceDialog = {
      BaseClass = "wxDialog",
***************
*** 2644,2647 ****
--- 2763,2773 ----
      Name = "wxSocketType",
    },
+   wxSortedArrayString = {
+     BaseClass = "wxArrayString",
+     Condition = "wxLUA_USE_wxArrayString",
+     DefType = "class",
+     IsNumber = false,
+     Name = "wxSortedArrayString",
+   },
    wxSound = {
      BaseClass = "wxObject",
***************
*** 3082,3085 ****
--- 3208,3218 ----
      Name = "wxURL",
    },
+   wxURLDataObject = {
+     BaseClass = "wxTextDataObject",
+     Condition = "(wxCHECK_VERSION(2,8,0)) && (wxLUA_USE_wxDataObject && wxUSE_DATAOBJ)",
+     DefType = "class",
+     IsNumber = false,
+     Name = "wxURLDataObject",
+   },
    wxURLError = {
      Condition = "(wxUSE_URL) && (wxLUA_USE_wxSocket && wxUSE_SOCKETS)",
***************
*** 3341,3364 ****
    ["%win"] = "defined(__WXMSW__)",
    ["%wince"] = "defined(__WXWINCE__)",
!   ["%wxchkver22"] = "wxCHECK_VERSION(2,2,0)",
!   ["%wxchkver23"] = "wxCHECK_VERSION(2,3,0)",
!   ["%wxchkver24"] = "wxCHECK_VERSION(2,4,0)",
!   ["%wxchkver25"] = "wxCHECK_VERSION(2,5,0)",
!   ["%wxchkver26"] = "wxCHECK_VERSION(2,6,0)",
!   ["%wxchkver261"] = "wxCHECK_VERSION(2,6,1)",
!   ["%wxchkver262"] = "wxCHECK_VERSION(2,6,2)",
!   ["%wxchkver263"] = "wxCHECK_VERSION(2,6,2)",
!   ["%wxchkver264"] = "wxCHECK_VERSION(2,6,4)",
!   ["%wxchkver265"] = "wxCHECK_VERSION(2,6,5)",
!   ["%wxchkver27"] = "wxCHECK_VERSION(2,7,0)",
!   ["%wxchkver271"] = "wxCHECK_VERSION(2,7,1)",
!   ["%wxchkver272"] = "wxCHECK_VERSION(2,7,2)",
!   ["%wxchkver28"] = "wxCHECK_VERSION(2,8,0)",
    ["%wxchkver_2_8"] = "wxCHECK_VERSION(2,8,0)",
!   ["%wxcompat20"] = "(defined(WXWIN_COMPATIBILITY_2) && WXWIN_COMPATIBILITY_2)",
!   ["%wxcompat22"] = "(defined(WXWIN_COMPATIBILITY_2_2) && WXWIN_COMPATIBILITY_2_2)",
!   ["%wxcompat24"] = "(defined(WXWIN_COMPATIBILITY_2_4) && WXWIN_COMPATIBILITY_2_4)",
!   ["%wxcompat26"] = "(defined(WXWIN_COMPATIBILITY_2_6) && WXWIN_COMPATIBILITY_2_6)",
!   ["%wxcompat28"] = "(defined(WXWIN_COMPATIBILITY_2_8) && WXWIN_COMPATIBILITY_2_8)",
    ["%x11"] = "defined(__WXX11__)",
    WXWIN_COMPATIBILITY_2 = "(defined(WXWIN_COMPATIBILITY_2) && WXWIN_COMPATIBILITY_2)",
--- 3474,3485 ----
    ["%win"] = "defined(__WXMSW__)",
    ["%wince"] = "defined(__WXWINCE__)",
!   ["%wxchkver_2_4"] = "wxCHECK_VERSION(2,4,0)",
!   ["%wxchkver_2_5"] = "wxCHECK_VERSION(2,5,0)",
!   ["%wxchkver_2_6"] = "wxCHECK_VERSION(2,6,0)",
!   ["%wxchkver_2_7"] = "wxCHECK_VERSION(2,7,0)",
!   ["%wxchkver_2_7_1"] = "wxCHECK_VERSION(2,7,1)",
    ["%wxchkver_2_8"] = "wxCHECK_VERSION(2,8,0)",
!   ["%wxcompat_2_4"] = "(defined(WXWIN_COMPATIBILITY_2_4) && WXWIN_COMPATIBILITY_2_4)",
!   ["%wxcompat_2_6"] = "(defined(WXWIN_COMPATIBILITY_2_6) && WXWIN_COMPATIBILITY_2_6)",
    ["%x11"] = "defined(__WXX11__)",
    WXWIN_COMPATIBILITY_2 = "(defined(WXWIN_COMPATIBILITY_2) && WXWIN_COMPATIBILITY_2)",

[Wxlua-commit] wxLua/bindings genwxbind.lua,1.102,1.103

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

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

Modified Files:
	genwxbind.lua 
Log Message:
update to 2.8 using C++ header files


Index: genwxbind.lua
===================================================================
RCS file: /cvsroot/wxlua/wxLua/bindings/genwxbind.lua,v
retrieving revision 1.102
retrieving revision 1.103
diff -C2 -d -r1.102 -r1.103
*** genwxbind.lua	26 Feb 2007 01:57:00 -0000	1.102
--- genwxbind.lua	9 Mar 2007 00:15:11 -0000	1.103
***************
*** 569,572 ****
--- 569,574 ----
          result = string.format("wxCHECK_VERSION(%d,%d,%d)", ver[1], ver[2], ver[3])
          preprocConditionTable[condition] = result -- cache result
+     elseif string.find(condition, "%wxchkver2", 1, 1) then
+         assert(false, "ERROR: %wxchkverXYZ has been replaced by %wxchkver_X_Y_Z, please update your bindings.")
      elseif string.find(condition, "%wxcompat_", 1, 1) then
          -- check for conditions like %wxcompat_1_2 = WXWIN_COMPATIBILITY_1_2
***************
*** 576,579 ****
--- 578,583 ----
          result = "(defined("..result..") && "..result..")"
          preprocConditionTable[condition] = result -- cache result
+     elseif string.find(condition, "%wxcompat2", 1, 1) then
+         assert(false, "ERROR: %wxcompatXY has been replaced by %wxcompat_X_Y, please update your bindings.")
      elseif string.find(condition, "wxLUA_USE_", 1, 1) then
          print("Warning unknown wxLUA_USE_XXX tag, maybe a missing condition? '"..condition.."'")
***************
*** 635,660 ****
  -- ---------------------------------------------------------------------------
  function InitKeywords()
-     -- wxWidgets version checks
-     preprocConditionTable["%wxchkver22"] = "wxCHECK_VERSION(2,2,0)"
-     preprocConditionTable["%wxchkver23"] = "wxCHECK_VERSION(2,3,0)"
-     preprocConditionTable["%wxchkver24"] = "wxCHECK_VERSION(2,4,0)"
-     preprocConditionTable["%wxchkver25"] = "wxCHECK_VERSION(2,5,0)"
-     preprocConditionTable["%wxchkver26"] = "wxCHECK_VERSION(2,6,0)"
-     preprocConditionTable["%wxchkver26"] = "wxCHECK_VERSION(2,6,0)"
-     preprocConditionTable["%wxchkver261"] = "wxCHECK_VERSION(2,6,1)"
-     preprocConditionTable["%wxchkver262"] = "wxCHECK_VERSION(2,6,2)"
-     preprocConditionTable["%wxchkver263"] = "wxCHECK_VERSION(2,6,2)"
-     preprocConditionTable["%wxchkver264"] = "wxCHECK_VERSION(2,6,4)"
-     preprocConditionTable["%wxchkver265"] = "wxCHECK_VERSION(2,6,5)"
-     preprocConditionTable["%wxchkver27"] = "wxCHECK_VERSION(2,7,0)"
-     preprocConditionTable["%wxchkver271"] = "wxCHECK_VERSION(2,7,1)"
-     preprocConditionTable["%wxchkver272"] = "wxCHECK_VERSION(2,7,2)"
-     preprocConditionTable["%wxchkver28"] = "wxCHECK_VERSION(2,8,0)"
-     -- wxWidgets version compatibility checks
-     preprocConditionTable["%wxcompat20"] = "(defined(WXWIN_COMPATIBILITY_2) && WXWIN_COMPATIBILITY_2)"
-     preprocConditionTable["%wxcompat22"] = "(defined(WXWIN_COMPATIBILITY_2_2) && WXWIN_COMPATIBILITY_2_2)"
-     preprocConditionTable["%wxcompat24"] = "(defined(WXWIN_COMPATIBILITY_2_4) && WXWIN_COMPATIBILITY_2_4)"
-     preprocConditionTable["%wxcompat26"] = "(defined(WXWIN_COMPATIBILITY_2_6) && WXWIN_COMPATIBILITY_2_6)"
-     preprocConditionTable["%wxcompat28"] = "(defined(WXWIN_COMPATIBILITY_2_8) && WXWIN_COMPATIBILITY_2_8)"
  
      preprocConditionTable["WXWIN_COMPATIBILITY_2"]   = "(defined(WXWIN_COMPATIBILITY_2) && WXWIN_COMPATIBILITY_2)"
--- 639,642 ----
***************
*** 3562,3565 ****
--- 3544,3549 ----
                          elseif (not member.IsOperator) and (memberPtr == "&") and (memberType ~= "wxString") then
                              table.insert(codeList, "    returns = &"..functor..";\n")
+                         elseif (memberPtr == "*") then
+                             table.insert(codeList, "    returns = ("..memberTypeWithAttrib..")"..functor..";\n")
                          else
                              table.insert(codeList, "    returns = "..functor..";\n")

[Wxlua-commit] wxLua/modules/wxbind/src appframe.cpp, 1.36, 1.37 clipdrag.cpp, 1.32, 1.33 config.cpp, 1.28, 1.29 controls.cpp, 1.44, 1.45 data.cpp, 1.35, 1.36 datetime.cpp, 1.29, 1.30 defsutil.cpp, 1.25, 1.26 dialogs.cpp, 1.29, 1.30 event.cpp, 1.35, 1.36 file.cpp, 1.34, 1.35 gdi.cpp, 1.50, 1.51 grid.cpp, 1.27, 1.28 help.cpp, 1.24, 1.25 html.cpp, 1.29, 1.30 image.cpp, 1.28, 1.29 mdi.cpp, 1.26, 1.27 menutool.cpp, 1.28, 1.29 print.cpp, 1.29, 1.30 sizer.cpp, 1.24, 1.25 socket.cpp, 1.28, 1.29 wave.cpp, 1.28, 1.29 windows.cpp, 1.41, 1.42 wx_bind.cpp, 1.82, 1.83 wxlua.cpp, 1.29, 1.30 xml.cpp, 1.23, 1.24

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

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

Modified Files:
	appframe.cpp clipdrag.cpp config.cpp controls.cpp data.cpp 
	datetime.cpp defsutil.cpp dialogs.cpp event.cpp file.cpp 
	gdi.cpp grid.cpp help.cpp html.cpp image.cpp mdi.cpp 
	menutool.cpp print.cpp sizer.cpp socket.cpp wave.cpp 
	windows.cpp wx_bind.cpp wxlua.cpp xml.cpp 
Log Message:
update to 2.8 using C++ header files


Index: xml.cpp
===================================================================
RCS file: /cvsroot/wxlua/wxLua/modules/wxbind/src/xml.cpp,v
retrieving revision 1.23
retrieving revision 1.24
diff -C2 -d -r1.23 -r1.24
*** xml.cpp	26 Feb 2007 01:57:05 -0000	1.23
--- xml.cpp	9 Mar 2007 00:15:18 -0000	1.24
***************
*** 240,244 ****
      wxXmlNode * self = (wxXmlNode *)wxlState.GetUserDataType(1, s_wxluatag_wxXmlNode);
      // call GetParent
!     returns = self->GetParent();
      // push the result datatype
      wxlState.PushUserDataType(s_wxluatag_wxXmlNode, returns);
--- 240,244 ----
      wxXmlNode * self = (wxXmlNode *)wxlState.GetUserDataType(1, s_wxluatag_wxXmlNode);
      // call GetParent
!     returns = (wxXmlNode *)self->GetParent();
      // push the result datatype
      wxlState.PushUserDataType(s_wxluatag_wxXmlNode, returns);
***************
*** 255,259 ****
      wxXmlNode * self = (wxXmlNode *)wxlState.GetUserDataType(1, s_wxluatag_wxXmlNode);
      // call GetNext
!     returns = self->GetNext();
      // push the result datatype
      wxlState.PushUserDataType(s_wxluatag_wxXmlNode, returns);
--- 255,259 ----
      wxXmlNode * self = (wxXmlNode *)wxlState.GetUserDataType(1, s_wxluatag_wxXmlNode);
      // call GetNext
!     returns = (wxXmlNode *)self->GetNext();
      // push the result datatype
      wxlState.PushUserDataType(s_wxluatag_wxXmlNode, returns);
***************
*** 270,274 ****
      wxXmlNode * self = (wxXmlNode *)wxlState.GetUserDataType(1, s_wxluatag_wxXmlNode);
      // call GetChildren
!     returns = self->GetChildren();
      // push the result datatype
      wxlState.PushUserDataType(s_wxluatag_wxXmlNode, returns);
--- 270,274 ----
      wxXmlNode * self = (wxXmlNode *)wxlState.GetUserDataType(1, s_wxluatag_wxXmlNode);
      // call GetChildren
!     returns = (wxXmlNode *)self->GetChildren();
      // push the result datatype
      wxlState.PushUserDataType(s_wxluatag_wxXmlNode, returns);
***************
*** 285,289 ****
      wxXmlNode * self = (wxXmlNode *)wxlState.GetUserDataType(1, s_wxluatag_wxXmlNode);
      // call GetProperties
!     returns = self->GetProperties();
      // push the result datatype
      wxlState.PushUserDataType(s_wxluatag_wxXmlProperty, returns);
--- 285,289 ----
      wxXmlNode * self = (wxXmlNode *)wxlState.GetUserDataType(1, s_wxluatag_wxXmlNode);
      // call GetProperties
!     returns = (wxXmlProperty *)self->GetProperties();
      // push the result datatype
      wxlState.PushUserDataType(s_wxluatag_wxXmlProperty, returns);
***************
*** 633,637 ****
      wxXmlProperty * self = (wxXmlProperty *)wxlState.GetUserDataType(1, s_wxluatag_wxXmlProperty);
      // call GetNext
!     returns = self->GetNext();
      // push the result datatype
      wxlState.PushUserDataType(s_wxluatag_wxXmlProperty, returns);
--- 633,637 ----
      wxXmlProperty * self = (wxXmlProperty *)wxlState.GetUserDataType(1, s_wxluatag_wxXmlProperty);
      // call GetNext
!     returns = (wxXmlProperty *)self->GetNext();
      // push the result datatype
      wxlState.PushUserDataType(s_wxluatag_wxXmlProperty, returns);
***************
*** 844,848 ****
      wxXmlDocument * self = (wxXmlDocument *)wxlState.GetUserDataType(1, s_wxluatag_wxXmlDocument);
      // call GetRoot
!     returns = self->GetRoot();
      // push the result datatype
      wxlState.PushUserDataType(s_wxluatag_wxXmlNode, returns);
--- 844,848 ----
      wxXmlDocument * self = (wxXmlDocument *)wxlState.GetUserDataType(1, s_wxluatag_wxXmlDocument);
      // call GetRoot
!     returns = (wxXmlNode *)self->GetRoot();
      // push the result datatype
      wxlState.PushUserDataType(s_wxluatag_wxXmlNode, returns);
***************
*** 1052,1056 ****
      wxXmlResource * self = (wxXmlResource *)wxlState.GetUserDataType(1, s_wxluatag_wxXmlResource);
      // call LoadDialog
!     returns = self->LoadDialog(parent, name);
      // push the result datatype
      wxlState.PushUserDataType(s_wxluatag_wxDialog, returns);
--- 1052,1056 ----
      wxXmlResource * self = (wxXmlResource *)wxlState.GetUserDataType(1, s_wxluatag_wxXmlResource);
      // call LoadDialog
!     returns = (wxDialog *)self->LoadDialog(parent, name);
      // push the result datatype
      wxlState.PushUserDataType(s_wxluatag_wxDialog, returns);
***************
*** 1199,1203 ****
      wxXmlResource * self = (wxXmlResource *)wxlState.GetUserDataType(1, s_wxluatag_wxXmlResource);
      // call LoadMenu
!     returns = self->LoadMenu(name);
      // push the result datatype
      wxlState.PushUserDataType(s_wxluatag_wxMenu, returns);
--- 1199,1203 ----
      wxXmlResource * self = (wxXmlResource *)wxlState.GetUserDataType(1, s_wxluatag_wxXmlResource);
      // call LoadMenu
!     returns = (wxMenu *)self->LoadMenu(name);
      // push the result datatype
      wxlState.PushUserDataType(s_wxluatag_wxMenu, returns);
***************
*** 1219,1223 ****
      wxXmlResource * self = (wxXmlResource *)wxlState.GetUserDataType(1, s_wxluatag_wxXmlResource);
      // call LoadMenuBar
!     returns = self->LoadMenuBar(parent, name);
      // push the result datatype
      wxlState.PushUserDataType(s_wxluatag_wxMenuBar, returns);
--- 1219,1223 ----
      wxXmlResource * self = (wxXmlResource *)wxlState.GetUserDataType(1, s_wxluatag_wxXmlResource);
      // call LoadMenuBar
!     returns = (wxMenuBar *)self->LoadMenuBar(parent, name);
      // push the result datatype
      wxlState.PushUserDataType(s_wxluatag_wxMenuBar, returns);
***************
*** 1237,1241 ****
      wxXmlResource * self = (wxXmlResource *)wxlState.GetUserDataType(1, s_wxluatag_wxXmlResource);
      // call LoadMenuBar
!     returns = self->LoadMenuBar(name);
      // push the result datatype
      wxlState.PushUserDataType(s_wxluatag_wxMenuBar, returns);
--- 1237,1241 ----
      wxXmlResource * self = (wxXmlResource *)wxlState.GetUserDataType(1, s_wxluatag_wxXmlResource);
      // call LoadMenuBar
!     returns = (wxMenuBar *)self->LoadMenuBar(name);
      // push the result datatype
      wxlState.PushUserDataType(s_wxluatag_wxMenuBar, returns);
***************
*** 1261,1265 ****
      wxXmlResource * self = (wxXmlResource *)wxlState.GetUserDataType(1, s_wxluatag_wxXmlResource);
      // call LoadToolBar
!     returns = self->LoadToolBar(parent, name);
      // push the result datatype
      wxlState.PushUserDataType(s_wxluatag_wxToolBar, returns);
--- 1261,1265 ----
      wxXmlResource * self = (wxXmlResource *)wxlState.GetUserDataType(1, s_wxluatag_wxXmlResource);
      // call LoadToolBar
!     returns = (wxToolBar *)self->LoadToolBar(parent, name);
      // push the result datatype
      wxlState.PushUserDataType(s_wxluatag_wxToolBar, returns);
***************
*** 1490,1494 ****
      wxXmlResource * self = (wxXmlResource *)wxlState.GetUserDataType(1, s_wxluatag_wxXmlResource);
      // call LoadPanel
!     returns = self->LoadPanel(parent, name);
      // push the result datatype
      wxlState.PushUserDataType(s_wxluatag_wxPanel, returns);
--- 1490,1494 ----
      wxXmlResource * self = (wxXmlResource *)wxlState.GetUserDataType(1, s_wxluatag_wxXmlResource);
      // call LoadPanel
!     returns = (wxPanel *)self->LoadPanel(parent, name);
      // push the result datatype
      wxlState.PushUserDataType(s_wxluatag_wxPanel, returns);

Index: defsutil.cpp
===================================================================
RCS file: /cvsroot/wxlua/wxLua/modules/wxbind/src/defsutil.cpp,v
retrieving revision 1.25
retrieving revision 1.26
diff -C2 -d -r1.25 -r1.26
*** defsutil.cpp	26 Feb 2007 01:57:02 -0000	1.25
--- defsutil.cpp	9 Mar 2007 00:15:14 -0000	1.26
***************
*** 45,49 ****
      wxProcess * self = (wxProcess *)wxlState.GetUserDataType(1, s_wxluatag_wxProcess);
      // call GetErrorStream
!     returns = self->GetErrorStream();
      // push the result datatype
      wxlState.PushUserDataType(s_wxluatag_wxInputStream, returns);
--- 45,49 ----
      wxProcess * self = (wxProcess *)wxlState.GetUserDataType(1, s_wxluatag_wxProcess);
      // call GetErrorStream
!     returns = (wxInputStream *)self->GetErrorStream();
      // push the result datatype
      wxlState.PushUserDataType(s_wxluatag_wxInputStream, returns);
***************
*** 60,64 ****
      wxProcess * self = (wxProcess *)wxlState.GetUserDataType(1, s_wxluatag_wxProcess);
      // call GetInputStream
!     returns = self->GetInputStream();
      // push the result datatype
      wxlState.PushUserDataType(s_wxluatag_wxInputStream, returns);
--- 60,64 ----
      wxProcess * self = (wxProcess *)wxlState.GetUserDataType(1, s_wxluatag_wxProcess);
      // call GetInputStream
!     returns = (wxInputStream *)self->GetInputStream();
      // push the result datatype
      wxlState.PushUserDataType(s_wxluatag_wxInputStream, returns);
***************
*** 75,79 ****
      wxProcess * self = (wxProcess *)wxlState.GetUserDataType(1, s_wxluatag_wxProcess);
      // call GetOutputStream
!     returns = self->GetOutputStream();
      // push the result datatype
      wxlState.PushUserDataType(s_wxluatag_wxOutputStream, returns);
--- 75,79 ----
      wxProcess * self = (wxProcess *)wxlState.GetUserDataType(1, s_wxluatag_wxProcess);
      // call GetOutputStream
!     returns = (wxOutputStream *)self->GetOutputStream();
      // push the result datatype
      wxlState.PushUserDataType(s_wxluatag_wxOutputStream, returns);
***************
*** 249,253 ****
      const wxString cmd = wxlState.GetwxStringType(2);
      // call Open
!     returns = wxProcess::Open(cmd, flags);
      // push the result datatype
      wxlState.PushUserDataType(s_wxluatag_wxProcess, returns);
--- 249,253 ----
      const wxString cmd = wxlState.GetwxStringType(2);
      // call Open
!     returns = (wxProcess *)wxProcess::Open(cmd, flags);
      // push the result datatype
      wxlState.PushUserDataType(s_wxluatag_wxProcess, returns);
***************
*** 785,788 ****
--- 785,849 ----
  
  
+ #if wxLUA_USE_wxBusyCursor
+ // ---------------------------------------------------------------------------
+ // Bind class wxBusyCursorSuspender
+ // ---------------------------------------------------------------------------
+ 
+ // Lua MetaTable Tag for Class 'wxBusyCursorSuspender'
+ int s_wxluatag_wxBusyCursorSuspender = -1;
+ 
+ //     wxBusyCursorSuspender()
+ static int LUACALL wxLua_wxBusyCursorSuspender_constructor(lua_State *L)
+ {
+     wxLuaState wxlState(L);
+     wxBusyCursorSuspender *returns;
+     // call constructor
+     returns = new wxBusyCursorSuspender();
+     // add to tracked memory list
+     wxLua_AddTrackedObject(wxlState, (wxBusyCursorSuspender *)returns);
+     // push the constructed class pointer
+     wxlState.PushUserDataType(s_wxluatag_wxBusyCursorSuspender, returns);
+ 
+     return 1;
+ }
+ 
+ static int LUACALL wxLua_wxBusyCursorSuspender_destructor(lua_State *L)
+ {
+     wxLuaState wxlState(L);
+     wxBusyCursorSuspender * self = (wxBusyCursorSuspender *)wxlState.GetUserDataType(1, s_wxluatag_wxBusyCursorSuspender);
+ 
+     // remove from tracked memory list
+     if (self != 0)
+         wxlState.RemoveTrackedObject(self);
+     return 0;
+ }
+ 
+ static int LUACALL wxLua_wxBusyCursorSuspender_Delete(lua_State *L)
+ {
+     wxLuaState wxlState(L);
+     wxBusyCursorSuspender * self = (wxBusyCursorSuspender *)wxlState.GetUserDataType(1, s_wxluatag_wxBusyCursorSuspender);
+     // remove from tracked memory list
+     if (self != 0)
+         if (wxlState.RemoveTrackedObject(self))
+         {   // if removed, reset the tag so that gc() is not called on this object.
+             lua_pushnil(L);
+             lua_setmetatable(L, -2);
+         }
+     return 0;
+ }
+ 
+ 
+ 
+ // Map Lua Class Methods to C Binding Functions
+ WXLUAMETHOD wxBusyCursorSuspender_methods[] = {
+     { LuaConstructor, "wxBusyCursorSuspender", wxLua_wxBusyCursorSuspender_constructor, 0, 0, s_wxluaargArray_None },
+     { LuaDelete, "wxBusyCursorSuspender", wxLua_wxBusyCursorSuspender_destructor, 0, 0, s_wxluaargArray_None },
+     { LuaMethod, "Delete", wxLua_wxBusyCursorSuspender_Delete, 0, 0, s_wxluaargArray_None },
+ };
+ 
+ int wxBusyCursorSuspender_methodCount = sizeof(wxBusyCursorSuspender_methods)/sizeof(wxBusyCursorSuspender_methods[0]);
+ #endif  // wxLUA_USE_wxBusyCursor
+ 
+ 
  #if wxLUA_USE_wxBusyInfo && wxUSE_BUSYINFO
  // ---------------------------------------------------------------------------

Index: wxlua.cpp
===================================================================
RCS file: /cvsroot/wxlua/wxLua/modules/wxbind/src/wxlua.cpp,v
retrieving revision 1.29
retrieving revision 1.30
diff -C2 -d -r1.29 -r1.30
*** wxlua.cpp	26 Feb 2007 01:57:05 -0000	1.29
--- wxlua.cpp	9 Mar 2007 00:15:18 -0000	1.30
***************
*** 255,259 ****
      wxLuaPrintout * self = (wxLuaPrintout *)wxlState.GetUserDataType(1, s_wxluatag_wxLuaPrintout);
      // call GetID
!     returns = self->GetID();
      // push the result datatype
      wxlState.PushUserDataType(s_wxluatag_wxLuaObject, returns);
--- 255,259 ----
      wxLuaPrintout * self = (wxLuaPrintout *)wxlState.GetUserDataType(1, s_wxluatag_wxLuaPrintout);
      // call GetID
!     returns = (wxLuaObject *)self->GetID();
      // push the result datatype
      wxlState.PushUserDataType(s_wxluatag_wxLuaObject, returns);
***************
*** 408,412 ****
      wxLuaHtmlWinTagEvent * self = (wxLuaHtmlWinTagEvent *)wxlState.GetUserDataType(1, s_wxluatag_wxLuaHtmlWinTagEvent);
      // call GetHtmlTag
!     returns = self->GetHtmlTag();
      // push the result datatype
      wxlState.PushUserDataType(s_wxluatag_wxHtmlTag, returns);
--- 408,412 ----
      wxLuaHtmlWinTagEvent * self = (wxLuaHtmlWinTagEvent *)wxlState.GetUserDataType(1, s_wxluatag_wxLuaHtmlWinTagEvent);
      // call GetHtmlTag
!     returns = (const wxHtmlTag *)self->GetHtmlTag();
      // push the result datatype
      wxlState.PushUserDataType(s_wxluatag_wxHtmlTag, returns);
***************
*** 423,427 ****
      wxLuaHtmlWinTagEvent * self = (wxLuaHtmlWinTagEvent *)wxlState.GetUserDataType(1, s_wxluatag_wxLuaHtmlWinTagEvent);
      // call GetHtmlParser
!     returns = self->GetHtmlParser();
      // push the result datatype
      wxlState.PushUserDataType(s_wxluatag_wxHtmlWinParser, returns);
--- 423,427 ----
      wxLuaHtmlWinTagEvent * self = (wxLuaHtmlWinTagEvent *)wxlState.GetUserDataType(1, s_wxluatag_wxLuaHtmlWinTagEvent);
      // call GetHtmlParser
!     returns = (wxHtmlWinParser *)self->GetHtmlParser();
      // push the result datatype
      wxlState.PushUserDataType(s_wxluatag_wxHtmlWinParser, returns);

Index: image.cpp
===================================================================
RCS file: /cvsroot/wxlua/wxLua/modules/wxbind/src/image.cpp,v
retrieving revision 1.28
retrieving revision 1.29
diff -C2 -d -r1.28 -r1.29
*** image.cpp	2 Mar 2007 05:44:27 -0000	1.28
--- image.cpp	9 Mar 2007 00:15:16 -0000	1.29
***************
*** 537,541 ****
      const wxString name = wxlState.GetwxStringType(2);
      // call FindHandler
!     returns = wxImage::FindHandler(name);
      // push the result datatype
      wxlState.PushUserDataType(s_wxluatag_wxImageHandler, returns);
--- 537,541 ----
      const wxString name = wxlState.GetwxStringType(2);
      // call FindHandler
!     returns = (wxImageHandler *)wxImage::FindHandler(name);
      // push the result datatype
      wxlState.PushUserDataType(s_wxluatag_wxImageHandler, returns);
***************
*** 555,559 ****
      const wxString extension = wxlState.GetwxStringType(2);
      // call FindHandler
!     returns = wxImage::FindHandler(extension, imageType);
      // push the result datatype
      wxlState.PushUserDataType(s_wxluatag_wxImageHandler, returns);
--- 555,559 ----
      const wxString extension = wxlState.GetwxStringType(2);
      // call FindHandler
!     returns = (wxImageHandler *)wxImage::FindHandler(extension, imageType);
      // push the result datatype
      wxlState.PushUserDataType(s_wxluatag_wxImageHandler, returns);
***************
*** 571,575 ****
      long imageType = (long)wxlState.GetNumberType(2);
      // call FindHandler
!     returns = wxImage::FindHandler(imageType);
      // push the result datatype
      wxlState.PushUserDataType(s_wxluatag_wxImageHandler, returns);
--- 571,575 ----
      long imageType = (long)wxlState.GetNumberType(2);
      // call FindHandler
!     returns = (wxImageHandler *)wxImage::FindHandler(imageType);
      // push the result datatype
      wxlState.PushUserDataType(s_wxluatag_wxImageHandler, returns);
***************
*** 587,591 ****
      const wxString mimetype = wxlState.GetwxStringType(2);
      // call FindHandlerMime
!     returns = wxImage::FindHandlerMime(mimetype);
      // push the result datatype
      wxlState.PushUserDataType(s_wxluatag_wxImageHandler, returns);
--- 587,591 ----
      const wxString mimetype = wxlState.GetwxStringType(2);
      // call FindHandlerMime
!     returns = (wxImageHandler *)wxImage::FindHandlerMime(mimetype);
      // push the result datatype
      wxlState.PushUserDataType(s_wxluatag_wxImageHandler, returns);

Index: mdi.cpp
===================================================================
RCS file: /cvsroot/wxlua/wxLua/modules/wxbind/src/mdi.cpp,v
retrieving revision 1.26
retrieving revision 1.27
diff -C2 -d -r1.26 -r1.27
*** mdi.cpp	26 Feb 2007 01:57:03 -0000	1.26
--- mdi.cpp	9 Mar 2007 00:15:16 -0000	1.27
***************
*** 69,73 ****
      wxMDIParentFrame * self = (wxMDIParentFrame *)wxlState.GetUserDataType(1, s_wxluatag_wxMDIParentFrame);
      // call GetWindowMenu
!     returns = self->GetWindowMenu();
      // push the result datatype
      wxlState.PushUserDataType(s_wxluatag_wxMenu, returns);
--- 69,73 ----
      wxMDIParentFrame * self = (wxMDIParentFrame *)wxlState.GetUserDataType(1, s_wxluatag_wxMDIParentFrame);
      // call GetWindowMenu
!     returns = (wxMenu *)self->GetWindowMenu();
      // push the result datatype
      wxlState.PushUserDataType(s_wxluatag_wxMenu, returns);
***************
*** 270,274 ****
      wxMDIParentFrame * self = (wxMDIParentFrame *)wxlState.GetUserDataType(1, s_wxluatag_wxMDIParentFrame);
      // call GetActiveChild
!     returns = self->GetActiveChild();
      // push the result datatype
      wxlState.PushUserDataType(s_wxluatag_wxMDIChildFrame, returns);
--- 270,274 ----
      wxMDIParentFrame * self = (wxMDIParentFrame *)wxlState.GetUserDataType(1, s_wxluatag_wxMDIParentFrame);
      // call GetActiveChild
!     returns = (wxMDIChildFrame *)self->GetActiveChild();
      // push the result datatype
      wxlState.PushUserDataType(s_wxluatag_wxMDIChildFrame, returns);
***************
*** 285,289 ****
      wxMDIParentFrame * self = (wxMDIParentFrame *)wxlState.GetUserDataType(1, s_wxluatag_wxMDIParentFrame);
      // call GetClientWindow
!     returns = self->GetClientWindow();
      // push the result datatype
      wxlState.PushUserDataType(s_wxluatag_wxMDIClientWindow, returns);
--- 285,289 ----
      wxMDIParentFrame * self = (wxMDIParentFrame *)wxlState.GetUserDataType(1, s_wxluatag_wxMDIParentFrame);
      // call GetClientWindow
!     returns = (wxMDIClientWindow *)self->GetClientWindow();
      // push the result datatype
      wxlState.PushUserDataType(s_wxluatag_wxMDIClientWindow, returns);
***************
*** 300,304 ****
      wxMDIParentFrame * self = (wxMDIParentFrame *)wxlState.GetUserDataType(1, s_wxluatag_wxMDIParentFrame);
      // call GetToolBar
!     returns = self->GetToolBar();
      // push the result datatype
      wxlState.PushUserDataType(s_wxluatag_wxWindow, returns);
--- 300,304 ----
      wxMDIParentFrame * self = (wxMDIParentFrame *)wxlState.GetUserDataType(1, s_wxluatag_wxMDIParentFrame);
      // call GetToolBar
!     returns = (wxWindow *)self->GetToolBar();
      // push the result datatype
      wxlState.PushUserDataType(s_wxluatag_wxWindow, returns);
***************
*** 593,597 ****
      wxDocChildFrame * self = (wxDocChildFrame *)wxlState.GetUserDataType(1, s_wxluatag_wxDocChildFrame);
      // call GetDocument
!     returns = self->GetDocument();
      // push the result datatype
      wxlState.PushUserDataType(s_wxluatag_wxDocument, returns);
--- 593,597 ----
      wxDocChildFrame * self = (wxDocChildFrame *)wxlState.GetUserDataType(1, s_wxluatag_wxDocChildFrame);
      // call GetDocument
!     returns = (wxDocument *)self->GetDocument();
      // push the result datatype
      wxlState.PushUserDataType(s_wxluatag_wxDocument, returns);
***************
*** 608,612 ****
      wxDocChildFrame * self = (wxDocChildFrame *)wxlState.GetUserDataType(1, s_wxluatag_wxDocChildFrame);
      // call GetView
!     returns = self->GetView();
      // push the result datatype
      wxlState.PushUserDataType(s_wxluatag_wxView, returns);
--- 608,612 ----
      wxDocChildFrame * self = (wxDocChildFrame *)wxlState.GetUserDataType(1, s_wxluatag_wxDocChildFrame);
      // call GetView
!     returns = (wxView *)self->GetView();
      // push the result datatype
      wxlState.PushUserDataType(s_wxluatag_wxView, returns);
***************
*** 682,686 ****
  
  #if (!wxCHECK_VERSION(2,6,0)) && (wxLUA_USE_MDI && wxUSE_MDI && wxUSE_DOC_VIEW_ARCHITECTURE)
! //     !%wxchkver26 int GetNoHistoryFiles()
  static int LUACALL wxLua_wxDocManager_GetNoHistoryFiles(lua_State *L)
  {
--- 682,686 ----
  
  #if (!wxCHECK_VERSION(2,6,0)) && (wxLUA_USE_MDI && wxUSE_MDI && wxUSE_DOC_VIEW_ARCHITECTURE)
! //     !%wxchkver_2_6 int GetNoHistoryFiles()
  static int LUACALL wxLua_wxDocManager_GetNoHistoryFiles(lua_State *L)
  {
***************
*** 702,706 ****
  #if ((wxCHECK_VERSION(2,5,0)) && (wxLUA_USE_MDI && wxUSE_MDI && wxUSE_DOC_VIEW_ARCHITECTURE)) && (wxLUA_USE_MDI && wxUSE_MDI && wxUSE_DOC_VIEW_ARCHITECTURE)
  static wxLuaArgTag s_wxluatagArray_wxLua_wxDocManager_ActivateView[] = { &s_wxluatag_wxView, &s_wxluaarg_Boolean, 0 };
! //     %wxchkver25 void ActivateView(wxView* view, bool activate)
  static int LUACALL wxLua_wxDocManager_ActivateView(lua_State *L)
  {
--- 702,706 ----
  #if ((wxCHECK_VERSION(2,5,0)) && (wxLUA_USE_MDI && wxUSE_MDI && wxUSE_DOC_VIEW_ARCHITECTURE)) && (wxLUA_USE_MDI && wxUSE_MDI && wxUSE_DOC_VIEW_ARCHITECTURE)
  static wxLuaArgTag s_wxluatagArray_wxLua_wxDocManager_ActivateView[] = { &s_wxluatag_wxView, &s_wxluaarg_Boolean, 0 };
! //     %wxchkver_2_5 void ActivateView(wxView* view, bool activate)
  static int LUACALL wxLua_wxDocManager_ActivateView(lua_State *L)
  {
***************
*** 722,726 ****
  
  #if (wxCHECK_VERSION(2,6,0)) && (wxLUA_USE_MDI && wxUSE_MDI && wxUSE_DOC_VIEW_ARCHITECTURE)
! //     %wxchkver26 size_t GetHistoryFilesCount() const
  static int LUACALL wxLua_wxDocManager_GetHistoryFilesCount(lua_State *L)
  {
--- 722,726 ----
  
  #if (wxCHECK_VERSION(2,6,0)) && (wxLUA_USE_MDI && wxUSE_MDI && wxUSE_DOC_VIEW_ARCHITECTURE)
! //     %wxchkver_2_6 size_t GetHistoryFilesCount() const
  static int LUACALL wxLua_wxDocManager_GetHistoryFilesCount(lua_State *L)
  {
***************
*** 742,746 ****
  #if (wxLUA_USE_MDI && wxUSE_MDI && wxUSE_DOC_VIEW_ARCHITECTURE) && ((!wxCHECK_VERSION(2,5,0)) && (wxLUA_USE_MDI && wxUSE_MDI && wxUSE_DOC_VIEW_ARCHITECTURE))
  static wxLuaArgTag s_wxluatagArray_wxLua_wxDocManager_ActivateView[] = { &s_wxluatag_wxView, &s_wxluaarg_Boolean, &s_wxluaarg_Boolean, 0 };
! //     !%wxchkver25 void ActivateView(wxView* view, bool activate, bool deleting)
  static int LUACALL wxLua_wxDocManager_ActivateView(lua_State *L)
  {
--- 742,746 ----
  #if (wxLUA_USE_MDI && wxUSE_MDI && wxUSE_DOC_VIEW_ARCHITECTURE) && ((!wxCHECK_VERSION(2,5,0)) && (wxLUA_USE_MDI && wxUSE_MDI && wxUSE_DOC_VIEW_ARCHITECTURE))
  static wxLuaArgTag s_wxluatagArray_wxLua_wxDocManager_ActivateView[] = { &s_wxluatag_wxView, &s_wxluaarg_Boolean, &s_wxluaarg_Boolean, 0 };
! //     !%wxchkver_2_5 void ActivateView(wxView* view, bool activate, bool deleting)
  static int LUACALL wxLua_wxDocManager_ActivateView(lua_State *L)
  {
***************
*** 806,810 ****
      wxDocManager * self = (wxDocManager *)wxlState.GetUserDataType(1, s_wxluatag_wxDocManager);
      // call GetFileHistory
!     returns = self->GetFileHistory();
      // push the result datatype
      wxlState.PushUserDataType(s_wxluatag_wxFileHistory, returns);
--- 806,810 ----
      wxDocManager * self = (wxDocManager *)wxlState.GetUserDataType(1, s_wxluatag_wxDocManager);
      // call GetFileHistory
!     returns = (wxFileHistory *)self->GetFileHistory();
      // push the result datatype
      wxlState.PushUserDataType(s_wxluatag_wxFileHistory, returns);
***************
*** 821,825 ****
      wxDocManager * self = (wxDocManager *)wxlState.GetUserDataType(1, s_wxluatag_wxDocManager);
      // call OnCreateFileHistory
!     returns = self->OnCreateFileHistory();
      // push the result datatype
      wxlState.PushUserDataType(s_wxluatag_wxFileHistory, returns);
--- 821,825 ----
      wxDocManager * self = (wxDocManager *)wxlState.GetUserDataType(1, s_wxluatag_wxDocManager);
      // call OnCreateFileHistory
!     returns = (wxFileHistory *)self->OnCreateFileHistory();
      // push the result datatype
      wxlState.PushUserDataType(s_wxluatag_wxFileHistory, returns);
***************
*** 1018,1022 ****
      wxDocManager * self = (wxDocManager *)wxlState.GetUserDataType(1, s_wxluatag_wxDocManager);
      // call CreateDocument
!     returns = self->CreateDocument(path, flags);
      // push the result datatype
      wxlState.PushUserDataType(s_wxluatag_wxDocument, returns);
--- 1018,1022 ----
      wxDocManager * self = (wxDocManager *)wxlState.GetUserDataType(1, s_wxluatag_wxDocManager);
      // call CreateDocument
!     returns = (wxDocument *)self->CreateDocument(path, flags);
      // push the result datatype
      wxlState.PushUserDataType(s_wxluatag_wxDocument, returns);
***************
*** 1038,1042 ****
      wxDocManager * self = (wxDocManager *)wxlState.GetUserDataType(1, s_wxluatag_wxDocManager);
      // call CreateView
!     returns = self->CreateView(doc, flags);
      // push the result datatype
      wxlState.PushUserDataType(s_wxluatag_wxView, returns);
--- 1038,1042 ----
      wxDocManager * self = (wxDocManager *)wxlState.GetUserDataType(1, s_wxluatag_wxDocManager);
      // call CreateView
!     returns = (wxView *)self->CreateView(doc, flags);
      // push the result datatype
      wxlState.PushUserDataType(s_wxluatag_wxView, returns);
***************
*** 1083,1087 ****
      wxDocManager * self = (wxDocManager *)wxlState.GetUserDataType(1, s_wxluatag_wxDocManager);
      // call FindTemplateForPath
!     returns = self->FindTemplateForPath(path);
      // push the result datatype
      wxlState.PushUserDataType(s_wxluatag_wxDocTemplate, returns);
--- 1083,1087 ----
      wxDocManager * self = (wxDocManager *)wxlState.GetUserDataType(1, s_wxluatag_wxDocManager);
      // call FindTemplateForPath
!     returns = (wxDocTemplate *)self->FindTemplateForPath(path);
      // push the result datatype
      wxlState.PushUserDataType(s_wxluatag_wxDocTemplate, returns);
***************
*** 1098,1102 ****
      wxDocManager * self = (wxDocManager *)wxlState.GetUserDataType(1, s_wxluatag_wxDocManager);
      // call GetCurrentDocument
!     returns = self->GetCurrentDocument();
      // push the result datatype
      wxlState.PushUserDataType(s_wxluatag_wxDocument, returns);
--- 1098,1102 ----
      wxDocManager * self = (wxDocManager *)wxlState.GetUserDataType(1, s_wxluatag_wxDocManager);
      // call GetCurrentDocument
!     returns = (wxDocument *)self->GetCurrentDocument();
      // push the result datatype
      wxlState.PushUserDataType(s_wxluatag_wxDocument, returns);
***************
*** 1113,1117 ****
      wxDocManager * self = (wxDocManager *)wxlState.GetUserDataType(1, s_wxluatag_wxDocManager);
      // call GetCurrentView
!     returns = self->GetCurrentView();
      // push the result datatype
      wxlState.PushUserDataType(s_wxluatag_wxView, returns);
--- 1113,1117 ----
      wxDocManager * self = (wxDocManager *)wxlState.GetUserDataType(1, s_wxluatag_wxDocManager);
      // call GetCurrentView
!     returns = (wxView *)self->GetCurrentView();
      // push the result datatype
      wxlState.PushUserDataType(s_wxluatag_wxView, returns);
***************
*** 1560,1564 ****
      wxDocTemplate * self = (wxDocTemplate *)wxlState.GetUserDataType(1, s_wxluatag_wxDocTemplate);
      // call CreateDocument
!     returns = self->CreateDocument(path, flags);
      // push the result datatype
      wxlState.PushUserDataType(s_wxluatag_wxDocument, returns);
--- 1560,1564 ----
      wxDocTemplate * self = (wxDocTemplate *)wxlState.GetUserDataType(1, s_wxluatag_wxDocTemplate);
      // call CreateDocument
!     returns = (wxDocument *)self->CreateDocument(path, flags);
      // push the result datatype
      wxlState.PushUserDataType(s_wxluatag_wxDocument, returns);
***************
*** 1582,1586 ****
      wxDocTemplate * self = (wxDocTemplate *)wxlState.GetUserDataType(1, s_wxluatag_wxDocTemplate);
      // call CreateView
!     returns = self->CreateView(doc, flags);
      // push the result datatype
      wxlState.PushUserDataType(s_wxluatag_wxView, returns);
--- 1582,1586 ----
      wxDocTemplate * self = (wxDocTemplate *)wxlState.GetUserDataType(1, s_wxluatag_wxDocTemplate);
      // call CreateView
!     returns = (wxView *)self->CreateView(doc, flags);
      // push the result datatype
      wxlState.PushUserDataType(s_wxluatag_wxView, returns);
***************
*** 1642,1646 ****
      wxDocTemplate * self = (wxDocTemplate *)wxlState.GetUserDataType(1, s_wxluatag_wxDocTemplate);
      // call GetDocumentManager
!     returns = self->GetDocumentManager();
      // push the result datatype
      wxlState.PushUserDataType(s_wxluatag_wxDocManager, returns);
--- 1642,1646 ----
      wxDocTemplate * self = (wxDocTemplate *)wxlState.GetUserDataType(1, s_wxluatag_wxDocTemplate);
      // call GetDocumentManager
!     returns = (wxDocManager *)self->GetDocumentManager();
      // push the result datatype
      wxlState.PushUserDataType(s_wxluatag_wxDocManager, returns);
***************
*** 1907,1911 ****
      wxDocument * self = (wxDocument *)wxlState.GetUserDataType(1, s_wxluatag_wxDocument);
      // call GetCommandProcessor
!     returns = self->GetCommandProcessor();
      // push the result datatype
      wxlState.PushUserDataType(s_wxluatag_wxCommandProcessor, returns);
--- 1907,1911 ----
      wxDocument * self = (wxDocument *)wxlState.GetUserDataType(1, s_wxluatag_wxDocument);
      // call GetCommandProcessor
!     returns = (wxCommandProcessor *)self->GetCommandProcessor();
      // push the result datatype
      wxlState.PushUserDataType(s_wxluatag_wxCommandProcessor, returns);
***************
*** 1922,1926 ****
      wxDocument * self = (wxDocument *)wxlState.GetUserDataType(1, s_wxluatag_wxDocument);
      // call OnCreateCommandProcessor
!     returns = self->OnCreateCommandProcessor();
      // push the result datatype
      wxlState.PushUserDataType(s_wxluatag_wxCommandProcessor, returns);
--- 1922,1926 ----
      wxDocument * self = (wxDocument *)wxlState.GetUserDataType(1, s_wxluatag_wxDocument);
      // call OnCreateCommandProcessor
!     returns = (wxCommandProcessor *)self->OnCreateCommandProcessor();
      // push the result datatype
      wxlState.PushUserDataType(s_wxluatag_wxCommandProcessor, returns);
***************
*** 2062,2066 ****
      wxDocument * self = (wxDocument *)wxlState.GetUserDataType(1, s_wxluatag_wxDocument);
      // call GetDocumentTemplate
!     returns = self->GetDocumentTemplate();
      // push the result datatype
      wxlState.PushUserDataType(s_wxluatag_wxDocTemplate, returns);
--- 2062,2066 ----
      wxDocument * self = (wxDocument *)wxlState.GetUserDataType(1, s_wxluatag_wxDocument);
      // call GetDocumentTemplate
!     returns = (wxDocTemplate *)self->GetDocumentTemplate();
      // push the result datatype
      wxlState.PushUserDataType(s_wxluatag_wxDocTemplate, returns);
***************
*** 2077,2081 ****
      wxDocument * self = (wxDocument *)wxlState.GetUserDataType(1, s_wxluatag_wxDocument);
      // call GetDocumentManager
!     returns = self->GetDocumentManager();
      // push the result datatype
      wxlState.PushUserDataType(s_wxluatag_wxDocManager, returns);
--- 2077,2081 ----
      wxDocument * self = (wxDocument *)wxlState.GetUserDataType(1, s_wxluatag_wxDocument);
      // call GetDocumentManager
!     returns = (wxDocManager *)self->GetDocumentManager();
      // push the result datatype
      wxlState.PushUserDataType(s_wxluatag_wxDocManager, returns);
***************
*** 2107,2111 ****
      wxDocument * self = (wxDocument *)wxlState.GetUserDataType(1, s_wxluatag_wxDocument);
      // call GetDocumentWindow
!     returns = self->GetDocumentWindow();
      // push the result datatype
      wxlState.PushUserDataType(s_wxluatag_wxWindow, returns);
--- 2107,2111 ----
      wxDocument * self = (wxDocument *)wxlState.GetUserDataType(1, s_wxluatag_wxDocument);
      // call GetDocumentWindow
!     returns = (wxWindow *)self->GetDocumentWindow();
      // push the result datatype
      wxlState.PushUserDataType(s_wxluatag_wxWindow, returns);
***************
*** 2137,2141 ****
      wxDocument * self = (wxDocument *)wxlState.GetUserDataType(1, s_wxluatag_wxDocument);
      // call GetFirstView
!     returns = self->GetFirstView();
      // push the result datatype
      wxlState.PushUserDataType(s_wxluatag_wxView, returns);
--- 2137,2141 ----
      wxDocument * self = (wxDocument *)wxlState.GetUserDataType(1, s_wxluatag_wxDocument);
      // call GetFirstView
!     returns = (wxView *)self->GetFirstView();
      // push the result datatype
      wxlState.PushUserDataType(s_wxluatag_wxView, returns);
***************
*** 2558,2562 ****
      wxView * self = (wxView *)wxlState.GetUserDataType(1, s_wxluatag_wxView);
      // call OnCreatePrintout
!     returns = self->OnCreatePrintout();
      // push the result datatype
      wxlState.PushUserDataType(s_wxluatag_wxPrintout, returns);
--- 2558,2562 ----
      wxView * self = (wxView *)wxlState.GetUserDataType(1, s_wxluatag_wxView);
      // call OnCreatePrintout
!     returns = (wxPrintout *)self->OnCreatePrintout();
      // push the result datatype
      wxlState.PushUserDataType(s_wxluatag_wxPrintout, returns);
***************
*** 2610,2614 ****
      wxView * self = (wxView *)wxlState.GetUserDataType(1, s_wxluatag_wxView);
      // call GetDocument
!     returns = self->GetDocument();
      // push the result datatype
      wxlState.PushUserDataType(s_wxluatag_wxDocument, returns);
--- 2610,2614 ----
      wxView * self = (wxView *)wxlState.GetUserDataType(1, s_wxluatag_wxView);
      // call GetDocument
!     returns = (wxDocument *)self->GetDocument();
      // push the result datatype
      wxlState.PushUserDataType(s_wxluatag_wxDocument, returns);
***************
*** 2625,2629 ****
      wxView * self = (wxView *)wxlState.GetUserDataType(1, s_wxluatag_wxView);
      // call GetDocumentManager
!     returns = self->GetDocumentManager();
      // push the result datatype
      wxlState.PushUserDataType(s_wxluatag_wxDocManager, returns);
--- 2625,2629 ----
      wxView * self = (wxView *)wxlState.GetUserDataType(1, s_wxluatag_wxView);
      // call GetDocumentManager
!     returns = (wxDocManager *)self->GetDocumentManager();
      // push the result datatype
      wxlState.PushUserDataType(s_wxluatag_wxDocManager, returns);
***************
*** 2640,2644 ****
      wxView * self = (wxView *)wxlState.GetUserDataType(1, s_wxluatag_wxView);
      // call GetFrame
!     returns = self->GetFrame();
      // push the result datatype
      wxlState.PushUserDataType(s_wxluatag_wxWindow, returns);
--- 2640,2644 ----
      wxView * self = (wxView *)wxlState.GetUserDataType(1, s_wxluatag_wxView);
      // call GetFrame
!     returns = (wxWindow *)self->GetFrame();
      // push the result datatype
      wxlState.PushUserDataType(s_wxluatag_wxWindow, returns);
***************
*** 2849,2853 ****
      wxCommandProcessor * self = (wxCommandProcessor *)wxlState.GetUserDataType(1, s_wxluatag_wxCommandProcessor);
      // call GetEditMenu
!     returns = self->GetEditMenu();
      // push the result datatype
      wxlState.PushUserDataType(s_wxluatag_wxMenu, returns);
--- 2849,2853 ----
      wxCommandProcessor * self = (wxCommandProcessor *)wxlState.GetUserDataType(1, s_wxluatag_wxCommandProcessor);
      // call GetEditMenu
!     returns = (wxMenu *)self->GetEditMenu();
      // push the result datatype
      wxlState.PushUserDataType(s_wxluatag_wxMenu, returns);
***************
*** 3167,3171 ****
      wxCommandProcessor * self = (wxCommandProcessor *)wxlState.GetUserDataType(1, s_wxluatag_wxCommandProcessor);
      // call GetCurrentCommand
!     returns = self->GetCurrentCommand();
      // push the result datatype
      wxlState.PushUserDataType(s_wxluatag_wxCommand, returns);
--- 3167,3171 ----
      wxCommandProcessor * self = (wxCommandProcessor *)wxlState.GetUserDataType(1, s_wxluatag_wxCommandProcessor);
      // call GetCurrentCommand
!     returns = (wxCommand *)self->GetCurrentCommand();
      // push the result datatype
      wxlState.PushUserDataType(s_wxluatag_wxCommand, returns);
***************
*** 3229,3233 ****
  int s_wxluatag_wxCommand = -1;
  
! //     bool CanUndo()
  static int LUACALL wxLua_wxCommand_CanUndo(lua_State *L)
  {
--- 3229,3233 ----
  int s_wxluatag_wxCommand = -1;
  
! //     virtual bool CanUndo()
  static int LUACALL wxLua_wxCommand_CanUndo(lua_State *L)
  {
***************
*** 3244,3248 ****
  }
  
! //     bool Do()
  static int LUACALL wxLua_wxCommand_Do(lua_State *L)
  {
--- 3244,3248 ----
  }
  
! //     virtual bool Do() // pure virtual
  static int LUACALL wxLua_wxCommand_Do(lua_State *L)
  {
***************
*** 3259,3263 ****
  }
  
! //     wxString GetName()
  static int LUACALL wxLua_wxCommand_GetName(lua_State *L)
  {
--- 3259,3263 ----
  }
  
! //     virtual wxString GetName()
  static int LUACALL wxLua_wxCommand_GetName(lua_State *L)
  {
***************
*** 3274,3278 ****
  }
  
! //     bool Undo()
  static int LUACALL wxLua_wxCommand_Undo(lua_State *L)
  {
--- 3274,3278 ----
  }
  
! //     virtual bool Undo() // pure virtual
  static int LUACALL wxLua_wxCommand_Undo(lua_State *L)
  {

Index: config.cpp
===================================================================
RCS file: /cvsroot/wxlua/wxLua/modules/wxbind/src/config.cpp,v
retrieving revision 1.28
retrieving revision 1.29
diff -C2 -d -r1.28 -r1.29
*** config.cpp	26 Feb 2007 01:57:01 -0000	1.28
--- config.cpp	9 Mar 2007 00:15:13 -0000	1.29
***************
*** 115,119 ****
      wxConfigBase *returns;
      // call Create
!     returns = wxConfigBase::Create();
      // push the result datatype
      wxlState.PushUserDataType(s_wxluatag_wxConfigBase, returns);
--- 115,119 ----
      wxConfigBase *returns;
      // call Create
!     returns = (wxConfigBase *)wxConfigBase::Create();
      // push the result datatype
      wxlState.PushUserDataType(s_wxluatag_wxConfigBase, returns);
***************
*** 617,621 ****
      wxConfigBase * pConfig = (argCount >= 2 ? (wxConfigBase *)wxlState.GetUserDataType(2, s_wxluatag_wxConfigBase) : NULL);
      // call Set
!     returns = wxConfigBase::Set(pConfig);
      // push the result datatype
      wxlState.PushUserDataType(s_wxluatag_wxConfigBase, returns);
--- 617,621 ----
      wxConfigBase * pConfig = (argCount >= 2 ? (wxConfigBase *)wxlState.GetUserDataType(2, s_wxluatag_wxConfigBase) : NULL);
      // call Set
!     returns = (wxConfigBase *)wxConfigBase::Set(pConfig);
      // push the result datatype
      wxlState.PushUserDataType(s_wxluatag_wxConfigBase, returns);
***************
*** 907,908 ****
--- 907,988 ----
  #endif  // wxLUA_USE_wxConfig && wxUSE_CONFIG
  
+ 
+ #if wxLUA_USE_wxConfig && wxUSE_CONFIG
+ // ---------------------------------------------------------------------------
+ // Bind class wxConfigPathChanger
+ // ---------------------------------------------------------------------------
+ 
+ // Lua MetaTable Tag for Class 'wxConfigPathChanger'
+ int s_wxluatag_wxConfigPathChanger = -1;
+ 
+ 
+ #if (wxCHECK_VERSION(2,8,0)) && (wxLUA_USE_wxConfig && wxUSE_CONFIG)
+ //     %wxchkver_2_8 void UpdateIfDeleted()
+ static int LUACALL wxLua_wxConfigPathChanger_UpdateIfDeleted(lua_State *L)
+ {
+     wxLuaState wxlState(L);
+     // get this
+     wxConfigPathChanger * self = (wxConfigPathChanger *)wxlState.GetUserDataType(1, s_wxluatag_wxConfigPathChanger);
+     // call UpdateIfDeleted
+     self->UpdateIfDeleted();
+ 
+     return 0;
+ }
+ 
+ #endif // (wxCHECK_VERSION(2,8,0)) && (wxLUA_USE_wxConfig && wxUSE_CONFIG)
+ 
+ static wxLuaArgTag s_wxluatagArray_wxLua_wxConfigPathChanger_constructor[] = { &s_wxluatag_wxConfigBase, &s_wxluaarg_String, 0 };
+ //     wxConfigPathChanger(const wxConfigBase *pContainer, const wxString& strEntry)
+ static int LUACALL wxLua_wxConfigPathChanger_constructor(lua_State *L)
+ {
+     wxLuaState wxlState(L);
+     wxConfigPathChanger *returns;
+     // const wxString strEntry
+     const wxString strEntry = wxlState.GetwxStringType(2);
+     // const wxConfigBase pContainer
+     const wxConfigBase * pContainer = (const wxConfigBase *)wxlState.GetUserDataType(1, s_wxluatag_wxConfigBase);
+     // call constructor
+     returns = new wxConfigPathChanger(pContainer, strEntry);
+     // push the constructed class pointer
+     wxlState.PushUserDataType(s_wxluatag_wxConfigPathChanger, returns);
+ 
+     return 1;
+ }
+ 
+ //     wxString Name() const
+ static int LUACALL wxLua_wxConfigPathChanger_Name(lua_State *L)
+ {
+     wxLuaState wxlState(L);
+     wxString returns;
+     // get this
+     wxConfigPathChanger * self = (wxConfigPathChanger *)wxlState.GetUserDataType(1, s_wxluatag_wxConfigPathChanger);
+     // call Name
+     returns = self->Name();
+     // push the result string
+     wxlState.lua_PushString(returns);
+ 
+     return 1;
+ }
+ 
+ static int LUACALL wxLua_wxConfigPathChanger_destructor(lua_State *)
+ {
+     return 0;
+ }
+ 
+ 
+ 
+ // Map Lua Class Methods to C Binding Functions
+ WXLUAMETHOD wxConfigPathChanger_methods[] = {
+ 
+ #if (wxCHECK_VERSION(2,8,0)) && (wxLUA_USE_wxConfig && wxUSE_CONFIG)
+     { LuaMethod, "UpdateIfDeleted", wxLua_wxConfigPathChanger_UpdateIfDeleted, 0, 0, s_wxluaargArray_None },
+ #endif  // (wxCHECK_VERSION(2,8,0)) && (wxLUA_USE_wxConfig && wxUSE_CONFIG)
+ 
+     { LuaConstructor, "wxConfigPathChanger", wxLua_wxConfigPathChanger_constructor, 2, 2, s_wxluatagArray_wxLua_wxConfigPathChanger_constructor },
+     { LuaMethod, "Name", wxLua_wxConfigPathChanger_Name, 0, 0, s_wxluaargArray_None },
+     { LuaDelete, "wxConfigPathChanger", wxLua_wxConfigPathChanger_destructor, 0, 0, s_wxluaargArray_None },
+ };
+ 
+ int wxConfigPathChanger_methodCount = sizeof(wxConfigPathChanger_methods)/sizeof(wxConfigPathChanger_methods[0]);
+ #endif  // wxLUA_USE_wxConfig && wxUSE_CONFIG
+ 

Index: grid.cpp
===================================================================
RCS file: /cvsroot/wxlua/wxLua/modules/wxbind/src/grid.cpp,v
retrieving revision 1.27
retrieving revision 1.28
diff -C2 -d -r1.27 -r1.28
*** grid.cpp	26 Feb 2007 01:57:02 -0000	1.27
--- grid.cpp	9 Mar 2007 00:15:15 -0000	1.28
***************
*** 575,579 ****
      wxGridCellEditor * self = (wxGridCellEditor *)wxlState.GetUserDataType(1, s_wxluatag_wxGridCellEditor);
      // call GetControl
!     returns = self->GetControl();
      // push the result datatype
      wxlState.PushUserDataType(s_wxluatag_wxControl, returns);
--- 575,579 ----
      wxGridCellEditor * self = (wxGridCellEditor *)wxlState.GetUserDataType(1, s_wxluatag_wxGridCellEditor);
      // call GetControl
!     returns = (wxControl *)self->GetControl();
      // push the result datatype
      wxlState.PushUserDataType(s_wxluatag_wxControl, returns);
***************
*** 605,609 ****
      wxGridCellEditor * self = (wxGridCellEditor *)wxlState.GetUserDataType(1, s_wxluatag_wxGridCellEditor);
      // call GetCellAttr
!     returns = self->GetCellAttr();
      // push the result datatype
      wxlState.PushUserDataType(s_wxluatag_wxGridCellAttr, returns);
--- 605,609 ----
      wxGridCellEditor * self = (wxGridCellEditor *)wxlState.GetUserDataType(1, s_wxluatag_wxGridCellEditor);
      // call GetCellAttr
!     returns = (wxGridCellAttr *)self->GetCellAttr();
      // push the result datatype
      wxlState.PushUserDataType(s_wxluatag_wxGridCellAttr, returns);
***************
*** 1632,1636 ****
      wxGridCellAttr * self = (wxGridCellAttr *)wxlState.GetUserDataType(1, s_wxluatag_wxGridCellAttr);
      // call GetRenderer
!     returns = self->GetRenderer(grid, row, col);
      // push the result datatype
      wxlState.PushUserDataType(s_wxluatag_wxGridCellRenderer, returns);
--- 1632,1636 ----
      wxGridCellAttr * self = (wxGridCellAttr *)wxlState.GetUserDataType(1, s_wxluatag_wxGridCellAttr);
      // call GetRenderer
!     returns = (wxGridCellRenderer *)self->GetRenderer(grid, row, col);
      // push the result datatype
      wxlState.PushUserDataType(s_wxluatag_wxGridCellRenderer, returns);
***************
*** 1654,1658 ****
      wxGridCellAttr * self = (wxGridCellAttr *)wxlState.GetUserDataType(1, s_wxluatag_wxGridCellAttr);
      // call GetEditor
!     returns = self->GetEditor(grid, row, col);
      // push the result datatype
      wxlState.PushUserDataType(s_wxluatag_wxGridCellEditor, returns);
--- 1654,1658 ----
      wxGridCellAttr * self = (wxGridCellAttr *)wxlState.GetUserDataType(1, s_wxluatag_wxGridCellAttr);
      // call GetEditor
!     returns = (wxGridCellEditor *)self->GetEditor(grid, row, col);
      // push the result datatype
      wxlState.PushUserDataType(s_wxluatag_wxGridCellEditor, returns);
***************
*** 1811,1815 ****
      wxGridCellAttrProvider * self = (wxGridCellAttrProvider *)wxlState.GetUserDataType(1, s_wxluatag_wxGridCellAttrProvider);
      // call GetAttr
!     returns = self->GetAttr(row, col, kind);
      // push the result datatype
      wxlState.PushUserDataType(s_wxluatag_wxGridCellAttr, returns);
--- 1811,1815 ----
      wxGridCellAttrProvider * self = (wxGridCellAttrProvider *)wxlState.GetUserDataType(1, s_wxluatag_wxGridCellAttrProvider);
      // call GetAttr
!     returns = (wxGridCellAttr *)self->GetAttr(row, col, kind);
      // push the result datatype
      wxlState.PushUserDataType(s_wxluatag_wxGridCellAttr, returns);
***************
*** 2229,2233 ****
      wxGridTableBase * self = (wxGridTableBase *)wxlState.GetUserDataType(1, s_wxluatag_wxGridTableBase);
      // call GetView
!     returns = self->GetView();
      // push the result datatype
      wxlState.PushUserDataType(s_wxluatag_wxGrid, returns);
--- 2229,2233 ----
      wxGridTableBase * self = (wxGridTableBase *)wxlState.GetUserDataType(1, s_wxluatag_wxGridTableBase);
      // call GetView
!     returns = (wxGrid *)self->GetView();
      // push the result datatype
      wxlState.PushUserDataType(s_wxluatag_wxGrid, returns);
***************
*** 2469,2473 ****
      wxGridTableBase * self = (wxGridTableBase *)wxlState.GetUserDataType(1, s_wxluatag_wxGridTableBase);
      // call GetAttrProvider
!     returns = self->GetAttrProvider();
      // push the result datatype
      wxlState.PushUserDataType(s_wxluatag_wxGridCellAttrProvider, returns);
--- 2469,2473 ----
      wxGridTableBase * self = (wxGridTableBase *)wxlState.GetUserDataType(1, s_wxluatag_wxGridTableBase);
      // call GetAttrProvider
!     returns = (wxGridCellAttrProvider *)self->GetAttrProvider();
      // push the result datatype
      wxlState.PushUserDataType(s_wxluatag_wxGridCellAttrProvider, returns);
***************
*** 2506,2510 ****
      wxGridTableBase * self = (wxGridTableBase *)wxlState.GetUserDataType(1, s_wxluatag_wxGridTableBase);
      // call GetAttr
!     returns = self->GetAttr(row, col, kind);
      // push the result datatype
      wxlState.PushUserDataType(s_wxluatag_wxGridCellAttr, returns);
--- 2506,2510 ----
      wxGridTableBase * self = (wxGridTableBase *)wxlState.GetUserDataType(1, s_wxluatag_wxGridTableBase);
      // call GetAttr
!     returns = (wxGridCellAttr *)self->GetAttr(row, col, kind);
      // push the result datatype
      wxlState.PushUserDataType(s_wxluatag_wxGridCellAttr, returns);
***************
*** 2723,2727 ****
      wxGridTableMessage * self = (wxGridTableMessage *)wxlState.GetUserDataType(1, s_wxluatag_wxGridTableMessage);
      // call GetTableObject
!     returns = self->GetTableObject();
      // push the result datatype
      wxlState.PushUserDataType(s_wxluatag_wxGridTableBase, returns);
--- 2723,2727 ----
      wxGridTableMessage * self = (wxGridTableMessage *)wxlState.GetUserDataType(1, s_wxluatag_wxGridTableMessage);
      // call GetTableObject
!     returns = (wxGridTableBase *)self->GetTableObject();
      // push the result datatype
      wxlState.PushUserDataType(s_wxluatag_wxGridTableBase, returns);
***************
*** 3764,3768 ****
      wxGrid * self = (wxGrid *)wxlState.GetUserDataType(1, s_wxluatag_wxGrid);
      // call GetTable
!     returns = self->GetTable();
      // push the result datatype
      wxlState.PushUserDataType(s_wxluatag_wxGridTableBase, returns);
--- 3764,3768 ----
      wxGrid * self = (wxGrid *)wxlState.GetUserDataType(1, s_wxluatag_wxGrid);
      // call GetTable
!     returns = (wxGridTableBase *)self->GetTable();
      // push the result datatype
      wxlState.PushUserDataType(s_wxluatag_wxGridTableBase, returns);
***************
*** 5055,5059 ****
      wxGrid * self = (wxGrid *)wxlState.GetUserDataType(1, s_wxluatag_wxGrid);
      // call GetOrCreateCellAttr
!     returns = self->GetOrCreateCellAttr(row, col);
      // push the result datatype
      wxlState.PushUserDataType(s_wxluatag_wxGridCellAttr, returns);
--- 5055,5059 ----
      wxGrid * self = (wxGrid *)wxlState.GetUserDataType(1, s_wxluatag_wxGrid);
      // call GetOrCreateCellAttr
!     returns = (wxGridCellAttr *)self->GetOrCreateCellAttr(row, col);
      // push the result datatype
      wxlState.PushUserDataType(s_wxluatag_wxGridCellAttr, returns);
***************
*** 5743,5747 ****
      wxGrid * self = (wxGrid *)wxlState.GetUserDataType(1, s_wxluatag_wxGrid);
      // call GetDefaultRenderer
!     returns = self->GetDefaultRenderer();
      // push the result datatype
      wxlState.PushUserDataType(s_wxluatag_wxGridCellRenderer, returns);
--- 5743,5747 ----
      wxGrid * self = (wxGrid *)wxlState.GetUserDataType(1, s_wxluatag_wxGrid);
      // call GetDefaultRenderer
!     returns = (wxGridCellRenderer *)self->GetDefaultRenderer();
      // push the result datatype
      wxlState.PushUserDataType(s_wxluatag_wxGridCellRenderer, returns);
***************
*** 5763,5767 ****
      wxGrid * self = (wxGrid *)wxlState.GetUserDataType(1, s_wxluatag_wxGrid);
      // call GetCellRenderer
!     returns = self->GetCellRenderer(row, col);
      // push the result datatype
      wxlState.PushUserDataType(s_wxluatag_wxGridCellRenderer, returns);
--- 5763,5767 ----
      wxGrid * self = (wxGrid *)wxlState.GetUserDataType(1, s_wxluatag_wxGrid);
      // call GetCellRenderer
!     returns = (wxGridCellRenderer *)self->GetCellRenderer(row, col);
      // push the result datatype
      wxlState.PushUserDataType(s_wxluatag_wxGridCellRenderer, returns);
***************
*** 5812,5816 ****
      wxGrid * self = (wxGrid *)wxlState.GetUserDataType(1, s_wxluatag_wxGrid);
      // call GetDefaultEditor
!     returns = self->GetDefaultEditor();
      // push the result datatype
      wxlState.PushUserDataType(s_wxluatag_wxGridCellEditor, returns);
--- 5812,5816 ----
      wxGrid * self = (wxGrid *)wxlState.GetUserDataType(1, s_wxluatag_wxGrid);
      // call GetDefaultEditor
!     returns = (wxGridCellEditor *)self->GetDefaultEditor();
      // push the result datatype
      wxlState.PushUserDataType(s_wxluatag_wxGridCellEditor, returns);
***************
*** 5832,5836 ****
      wxGrid * self = (wxGrid *)wxlState.GetUserDataType(1, s_wxluatag_wxGrid);
      // call GetCellEditor
!     returns = self->GetCellEditor(row, col);
      // push the result datatype
      wxlState.PushUserDataType(s_wxluatag_wxGridCellEditor, returns);
--- 5832,5836 ----
      wxGrid * self = (wxGrid *)wxlState.GetUserDataType(1, s_wxluatag_wxGrid);
      // call GetCellEditor
!     returns = (wxGridCellEditor *)self->GetCellEditor(row, col);
      // push the result datatype
      wxlState.PushUserDataType(s_wxluatag_wxGridCellEditor, returns);
***************
*** 6120,6124 ****
      wxGrid * self = (wxGrid *)wxlState.GetUserDataType(1, s_wxluatag_wxGrid);
      // call GetDefaultEditorForCell
!     returns = self->GetDefaultEditorForCell(row, col);
      // push the result datatype
      wxlState.PushUserDataType(s_wxluatag_wxGridCellEditor, returns);
--- 6120,6124 ----
      wxGrid * self = (wxGrid *)wxlState.GetUserDataType(1, s_wxluatag_wxGrid);
      // call GetDefaultEditorForCell
!     returns = (wxGridCellEditor *)self->GetDefaultEditorForCell(row, col);
      // push the result datatype
      wxlState.PushUserDataType(s_wxluatag_wxGridCellEditor, returns);
***************
*** 6140,6144 ****
      wxGrid * self = (wxGrid *)wxlState.GetUserDataType(1, s_wxluatag_wxGrid);
      // call GetDefaultRendererForCell
!     returns = self->GetDefaultRendererForCell(row, col);
      // push the result datatype
      wxlState.PushUserDataType(s_wxluatag_wxGridCellRenderer, returns);
--- 6140,6144 ----
      wxGrid * self = (wxGrid *)wxlState.GetUserDataType(1, s_wxluatag_wxGrid);
      // call GetDefaultRendererForCell
!     returns = (wxGridCellRenderer *)self->GetDefaultRendererForCell(row, col);
      // push the result datatype
      wxlState.PushUserDataType(s_wxluatag_wxGridCellRenderer, returns);
***************
*** 6158,6162 ****
      wxGrid * self = (wxGrid *)wxlState.GetUserDataType(1, s_wxluatag_wxGrid);
      // call GetDefaultEditorForType
!     returns = self->GetDefaultEditorForType(typeName);
      // push the result datatype
      wxlState.PushUserDataType(s_wxluatag_wxGridCellEditor, returns);
--- 6158,6162 ----
      wxGrid * self = (wxGrid *)wxlState.GetUserDataType(1, s_wxluatag_wxGrid);
      // call GetDefaultEditorForType
!     returns = (wxGridCellEditor *)self->GetDefaultEditorForType(typeName);
      // push the result datatype
      wxlState.PushUserDataType(s_wxluatag_wxGridCellEditor, returns);
***************
*** 6176,6180 ****
      wxGrid * self = (wxGrid *)wxlState.GetUserDataType(1, s_wxluatag_wxGrid);
      // call GetDefaultRendererForType
!     returns = self->GetDefaultRendererForType(typeName);
      // push the result datatype
      wxlState.PushUserDataType(s_wxluatag_wxGridCellRenderer, returns);
--- 6176,6180 ----
      wxGrid * self = (wxGrid *)wxlState.GetUserDataType(1, s_wxluatag_wxGrid);
      // call GetDefaultRendererForType
!     returns = (wxGridCellRenderer *)self->GetDefaultRendererForType(typeName);
      // push the result datatype
      wxlState.PushUserDataType(s_wxluatag_wxGridCellRenderer, returns);
***************
*** 6208,6212 ****
      wxGrid * self = (wxGrid *)wxlState.GetUserDataType(1, s_wxluatag_wxGrid);
      // call GetGridWindow
!     returns = self->GetGridWindow();
      // push the result datatype
      wxlState.PushUserDataType(s_wxluatag_wxWindow, returns);
--- 6208,6212 ----
      wxGrid * self = (wxGrid *)wxlState.GetUserDataType(1, s_wxluatag_wxGrid);
      // call GetGridWindow
!     returns = (wxWindow *)self->GetGridWindow();
      // push the result datatype
      wxlState.PushUserDataType(s_wxluatag_wxWindow, returns);
***************
*** 6223,6227 ****
      wxGrid * self = (wxGrid *)wxlState.GetUserDataType(1, s_wxluatag_wxGrid);
      // call GetGridRowLabelWindow
!     returns = self->GetGridRowLabelWindow();
      // push the result datatype
      wxlState.PushUserDataType(s_wxluatag_wxWindow, returns);
--- 6223,6227 ----
      wxGrid * self = (wxGrid *)wxlState.GetUserDataType(1, s_wxluatag_wxGrid);
      // call GetGridRowLabelWindow
!     returns = (wxWindow *)self->GetGridRowLabelWindow();
      // push the result datatype
      wxlState.PushUserDataType(s_wxluatag_wxWindow, returns);
***************
*** 6238,6242 ****
      wxGrid * self = (wxGrid *)wxlState.GetUserDataType(1, s_wxluatag_wxGrid);
      // call GetGridColLabelWindow
!     returns = self->GetGridColLabelWindow();
      // push the result datatype
      wxlState.PushUserDataType(s_wxluatag_wxWindow, returns);
--- 6238,6242 ----
      wxGrid * self = (wxGrid *)wxlState.GetUserDataType(1, s_wxluatag_wxGrid);
      // call GetGridColLabelWindow
!     returns = (wxWindow *)self->GetGridColLabelWindow();
      // push the result datatype
      wxlState.PushUserDataType(s_wxluatag_wxWindow, returns);
***************
*** 6253,6257 ****
      wxGrid * self = (wxGrid *)wxlState.GetUserDataType(1, s_wxluatag_wxGrid);
      // call GetGridCornerLabelWindow
!     returns = self->GetGridCornerLabelWindow();
      // push the result datatype
      wxlState.PushUserDataType(s_wxluatag_wxWindow, returns);
--- 6253,6257 ----
      wxGrid * self = (wxGrid *)wxlState.GetUserDataType(1, s_wxluatag_wxGrid);
      // call GetGridCornerLabelWindow
!     returns = (wxWindow *)self->GetGridCornerLabelWindow();
      // push the result datatype
      wxlState.PushUserDataType(s_wxluatag_wxWindow, returns);
***************
*** 7293,7297 ****
      wxGridEditorCreatedEvent * self = (wxGridEditorCreatedEvent *)wxlState.GetUserDataType(1, s_wxluatag_wxGridEditorCreatedEvent);
      // call GetControl
!     returns = self->GetControl();
      // push the result datatype
      wxlState.PushUserDataType(s_wxluatag_wxControl, returns);
--- 7293,7297 ----
      wxGridEditorCreatedEvent * self = (wxGridEditorCreatedEvent *)wxlState.GetUserDataType(1, s_wxluatag_wxGridEditorCreatedEvent);
      // call GetControl
!     returns = (wxControl *)self->GetControl();
      // push the result datatype
      wxlState.PushUserDataType(s_wxluatag_wxControl, returns);

Index: file.cpp
===================================================================
RCS file: /cvsroot/wxlua/wxLua/modules/wxbind/src/file.cpp,v
retrieving revision 1.34
retrieving revision 1.35
diff -C2 -d -r1.34 -r1.35
*** file.cpp	8 Mar 2007 06:26:43 -0000	1.34
--- file.cpp	9 Mar 2007 00:15:15 -0000	1.35
***************
*** 2045,2049 ****
  #if (wxCHECK_VERSION(2,8,0)) && (wxLUA_USE_wxDir)
  static wxLuaArgTag s_wxluatagArray_wxLua_wxDir_FindFirst[] = { &s_wxluaarg_String, &s_wxluaarg_String, &s_wxluaarg_Number, 0 };
! //     %wxchkver_2_8 static wxString FindFirst(const wxString& dirname, const wxString& filespec, int flags = wxDIR_DEFAULT);
  static int LUACALL wxLua_wxDir_FindFirst(lua_State *L)
  {
--- 2045,2049 ----
  #if (wxCHECK_VERSION(2,8,0)) && (wxLUA_USE_wxDir)
  static wxLuaArgTag s_wxluatagArray_wxLua_wxDir_FindFirst[] = { &s_wxluaarg_String, &s_wxluaarg_String, &s_wxluaarg_Number, 0 };
! //     %wxchkver_2_8 static wxString FindFirst(const wxString& dirname, const wxString& filespec, int flags = wxDIR_DEFAULT)
  static int LUACALL wxLua_wxDir_FindFirst(lua_State *L)
  {
***************
*** 2348,2352 ****
  
  #if (wxCHECK_VERSION(2,5,0)) && (wxUSE_STREAMS)
! //     %wxchkver25 wxFileOffset GetLength() const
  static int LUACALL wxLua_wxStreamBase_GetLength(lua_State *L)
  {
--- 2348,2352 ----
  
  #if (wxCHECK_VERSION(2,5,0)) && (wxUSE_STREAMS)
! //     %wxchkver_2_5 wxFileOffset GetLength() const
  static int LUACALL wxLua_wxStreamBase_GetLength(lua_State *L)
  {

Index: data.cpp
===================================================================
RCS file: /cvsroot/wxlua/wxLua/modules/wxbind/src/data.cpp,v
retrieving revision 1.35
retrieving revision 1.36
diff -C2 -d -r1.35 -r1.36
*** data.cpp	7 Mar 2007 23:56:42 -0000	1.35
--- data.cpp	9 Mar 2007 00:15:14 -0000	1.36
***************
*** 197,201 ****
      wxObject * self = (wxObject *)wxlState.GetUserDataType(1, s_wxluatag_wxObject);
      // call GetClassInfo
!     returns = self->GetClassInfo();
      // push the result datatype
      wxlState.PushUserDataType(s_wxluatag_wxClassInfo, returns);
--- 197,201 ----
      wxObject * self...
 
[truncated message content]

[Wxlua-commit] wxLua/modules/wxbindstc/src stc.cpp,1.26,1.27

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

Update of /cvsroot/wxlua/wxLua/modules/wxbindstc/src
In directory sc8-pr-cvs9.sourceforge.net:/tmp/cvs-serv32506/wxLua/modules/wxbindstc/src

Modified Files:
	stc.cpp 
Log Message:
update to 2.8 using C++ header files


Index: stc.cpp
===================================================================
RCS file: /cvsroot/wxlua/wxLua/modules/wxbindstc/src/stc.cpp,v
retrieving revision 1.26
retrieving revision 1.27
diff -C2 -d -r1.26 -r1.27
*** stc.cpp	26 Feb 2007 01:57:05 -0000	1.26
--- stc.cpp	9 Mar 2007 00:15:18 -0000	1.27
***************
*** 29,33 ****
  
  #if (wxCHECK_VERSION(2,7,1)) && (wxLUA_USE_wxColourPenBrush)
! //     %wxchkver271  wxColour GetCaretLineBackground();
  static int LUACALL wxLua_wxStyledTextCtrl_GetCaretLineBackground(lua_State *L)
  {
--- 29,33 ----
  
  #if (wxCHECK_VERSION(2,7,1)) && (wxLUA_USE_wxColourPenBrush)
! //     %wxchkver_2_7_1  wxColour GetCaretLineBackground();
  static int LUACALL wxLua_wxStyledTextCtrl_GetCaretLineBackground(lua_State *L)
  {
***************
*** 48,52 ****
  
  static wxLuaArgTag s_wxluatagArray_wxLua_wxStyledTextCtrl_SetCaretLineBackground[] = { &s_wxluatag_wxColour, 0 };
! //     %wxchkver271  void SetCaretLineBackground(const wxColour& back);
  static int LUACALL wxLua_wxStyledTextCtrl_SetCaretLineBackground(lua_State *L)
  {
--- 48,52 ----
  
  static wxLuaArgTag s_wxluatagArray_wxLua_wxStyledTextCtrl_SetCaretLineBackground[] = { &s_wxluatag_wxColour, 0 };
! //     %wxchkver_2_7_1  void SetCaretLineBackground(const wxColour& back);
  static int LUACALL wxLua_wxStyledTextCtrl_SetCaretLineBackground(lua_State *L)
  {
***************
*** 66,70 ****
  
  #if (wxLUA_USE_wxColourPenBrush) && (!wxCHECK_VERSION(2,7,1))
! //     !%wxchkver271 wxColour GetCaretLineBack();
  static int LUACALL wxLua_wxStyledTextCtrl_GetCaretLineBack(lua_State *L)
  {
--- 66,70 ----
  
  #if (wxLUA_USE_wxColourPenBrush) && (!wxCHECK_VERSION(2,7,1))
! //     !%wxchkver_2_7_1 wxColour GetCaretLineBack();
  static int LUACALL wxLua_wxStyledTextCtrl_GetCaretLineBack(lua_State *L)
  {
***************
*** 85,89 ****
  
  static wxLuaArgTag s_wxluatagArray_wxLua_wxStyledTextCtrl_SetCaretLineBack[] = { &s_wxluatag_wxColour, 0 };
! //     !%wxchkver271 void SetCaretLineBack(const wxColour& back);
  static int LUACALL wxLua_wxStyledTextCtrl_SetCaretLineBack(lua_State *L)
  {
--- 85,89 ----
  
  static wxLuaArgTag s_wxluatagArray_wxLua_wxStyledTextCtrl_SetCaretLineBack[] = { &s_wxluatag_wxColour, 0 };
! //     !%wxchkver_2_7_1 void SetCaretLineBack(const wxColour& back);
  static int LUACALL wxLua_wxStyledTextCtrl_SetCaretLineBack(lua_State *L)
  {
***************
*** 4537,4541 ****
      wxStyledTextCtrl * self = (wxStyledTextCtrl *)wxlState.GetUserDataType(1, s_wxluatag_wxStyledTextCtrl);
      // call GetDocPointer
!     returns = self->GetDocPointer();
      // push the result pointer
      lua_pushlightuserdata(L, (void *)returns);
--- 4537,4541 ----
      wxStyledTextCtrl * self = (wxStyledTextCtrl *)wxlState.GetUserDataType(1, s_wxluatag_wxStyledTextCtrl);
      // call GetDocPointer
!     returns = (void *)self->GetDocPointer();
      // push the result pointer
      lua_pushlightuserdata(L, (void *)returns);
***************
*** 4769,4773 ****
      wxStyledTextCtrl * self = (wxStyledTextCtrl *)wxlState.GetUserDataType(1, s_wxluatag_wxStyledTextCtrl);
      // call CreateDocument
!     returns = self->CreateDocument();
      // push the result pointer
      lua_pushlightuserdata(L, (void *)returns);
--- 4769,4773 ----
      wxStyledTextCtrl * self = (wxStyledTextCtrl *)wxlState.GetUserDataType(1, s_wxluatag_wxStyledTextCtrl);
      // call CreateDocument
!     returns = (void *)self->CreateDocument();
      // push the result pointer
      lua_pushlightuserdata(L, (void *)returns);

[Wxlua-commit] wxLua/samples dialog.wx.lua,1.9,1.10

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

Update of /cvsroot/wxlua/wxLua/samples
In directory sc8-pr-cvs9.sourceforge.net:/tmp/cvs-serv6186/samples

Modified Files:
	dialog.wx.lua 
Log Message:
Use functions to create GUI elements, show use of "case" statement for conversion


Index: dialog.wx.lua
===================================================================
RCS file: /cvsroot/wxlua/wxLua/samples/dialog.wx.lua,v
retrieving revision 1.9
retrieving revision 1.10
diff -C2 -d -r1.9 -r1.10
*** dialog.wx.lua	21 Nov 2006 23:20:37 -0000	1.9
--- dialog.wx.lua	8 Mar 2007 20:34:04 -0000	1.10
***************
*** 3,7 ****
  -- Purpose:     Dialog wxLua sample, a temperature converter
  --              Based on the C++ version by Marco Ghislanzoni
! -- Author:      J Winwood
  -- Created:     March 2002
  -- Copyright:   (c) 2001 Lomtick Software. All rights reserved.
--- 3,7 ----
  -- Purpose:     Dialog wxLua sample, a temperature converter
  --              Based on the C++ version by Marco Ghislanzoni
! -- Author:      J Winwood, John Labenski
  -- Created:     March 2002
  -- Copyright:   (c) 2001 Lomtick Software. All rights reserved.
***************
*** 10,26 ****
  
  -- IDs of the controls in the dialog
! local ID_CELSIUS_BUTTON      = 1
! local ID_CELSIUS_TEXTCTRL    = 2
! local ID_FAHRENHEIT_BUTTON   = 3
! local ID_FAHRENHEIT_TEXTCTRL = 4
! local ID_ABOUT_BUTTON        = 5
! local ID_CLOSE_BUTTON        = 6
  
  -- Create the dialog
! local dialog = wx.wxDialog(wx.wxNull, wx.wxID_ANY, "wxLua Temperature Converter",
!                            wx.wxDefaultPosition, wx.wxDefaultSize)
  
! -- Create a wxPanel to contain all the buttons
! local panel = wx.wxPanel(dialog, wx.wxID_ANY)
  
  -- Layout all the buttons using wxSizers
--- 10,33 ----
  
  -- IDs of the controls in the dialog
! ID_CELSIUS_BUTTON      = 1  -- NOTE: We use the fact that the textctrl ids
! ID_CELSIUS_TEXTCTRL    = 2  --       are +1 fom the button ids.
! ID_KELVIN_BUTTON       = 3
! ID_KELVIN_TEXTCTRL     = 4
! ID_FAHRENHEIT_BUTTON   = 5
! ID_FAHRENHEIT_TEXTCTRL = 6
! ID_RANKINE_BUTTON      = 7
! ID_RANKINE_TEXTCTRL    = 8
! ID_ABOUT_BUTTON        = 9
! ID_CLOSE_BUTTON        = 10
  
  -- Create the dialog
! dialog = wx.wxDialog(wx.wxNull, wx.wxID_ANY, "wxLua Temperature Converter",
!                      wx.wxDefaultPosition, wx.wxDefaultSize)
  
! -- Create a wxPanel to contain all the buttons. It's a good idea to always
! -- create a single child window for top level windows (frames, dialogs) since
! -- by default the top level window will want to expand the child to fill the
! -- whole client area. The wxPanel also gives us keyboard navigation with TAB key.
! panel = wx.wxPanel(dialog, wx.wxID_ANY)
  
  -- Layout all the buttons using wxSizers
***************
*** 29,48 ****
  local staticBox      = wx.wxStaticBox(panel, wx.wxID_ANY, "Enter temperature")
  local staticBoxSizer = wx.wxStaticBoxSizer(staticBox, wx.wxVERTICAL)
! local flexGridSizer  = wx.wxFlexGridSizer( 2, 3, 0, 0 )
  flexGridSizer:AddGrowableCol(1, 0)
  
! local celsiusStaticText = wx.wxStaticText( panel, wx.wxID_ANY, "Celcius")
  local celsiusTextCtrl   = wx.wxTextCtrl( panel, ID_CELSIUS_TEXTCTRL, "", wx.wxDefaultPosition, wx.wxSize(80,-1), 0 )
! local celsiusButton     = wx.wxButton( panel, ID_CELSIUS_BUTTON, "C -> F")
  flexGridSizer:AddWindow( celsiusStaticText, 0, wx.wxALIGN_CENTER_VERTICAL+wx.wxALL, 5 )
  flexGridSizer:AddWindow( celsiusTextCtrl,   0, wx.wxGROW+wx.wxALIGN_CENTER+wx.wxALL, 5 )
  flexGridSizer:AddWindow( celsiusButton,     0, wx.wxALIGN_CENTER+wx.wxALL, 5 )
! 
! local fahrenheitStaticText = wx.wxStaticText( panel, wx.wxID_ANY, "Fahrenheit")
! local fahrenheitTextCtrl   = wx.wxTextCtrl( panel, ID_FAHRENHEIT_TEXTCTRL, "", wx.wxDefaultPosition, wx.wxSize(80,-1), 0 )
! local fahrenheitButton     = wx.wxButton( panel, ID_FAHRENHEIT_BUTTON, "F -> C")
! flexGridSizer:AddWindow( fahrenheitStaticText, 0, wx.wxALIGN_CENTER_VERTICAL+wx.wxALL, 5 )
! flexGridSizer:AddWindow( fahrenheitTextCtrl,   0, wx.wxGROW+wx.wxALIGN_CENTER+wx.wxALL, 5 )
! flexGridSizer:AddWindow( fahrenheitButton,     0, wx.wxALIGN_CENTER+wx.wxALL, 5 )
  
  staticBoxSizer:AddSizer( flexGridSizer,  0, wx.wxGROW+wx.wxALIGN_CENTER+wx.wxALL, 5 )
--- 36,70 ----
  local staticBox      = wx.wxStaticBox(panel, wx.wxID_ANY, "Enter temperature")
  local staticBoxSizer = wx.wxStaticBoxSizer(staticBox, wx.wxVERTICAL)
! local flexGridSizer  = wx.wxFlexGridSizer( 3, 3, 0, 0 )
  flexGridSizer:AddGrowableCol(1, 0)
  
! -- Make a function to reduce the amount of duplicate code.
! function AddConverterControl(name_string, button_text, textCtrlID, buttonID)
!     local staticText = wx.wxStaticText( panel, wx.wxID_ANY, name_string)
!     local textCtrl   = wx.wxTextCtrl( panel, textCtrlID, "000000.00000", wx.wxDefaultPosition, wx.wxSize(-1,-1), wx.wxTE_PROCESS_ENTER )
!     local button     = wx.wxButton( panel, buttonID, button_text)
!     flexGridSizer:AddWindow( staticText, 0, wx.wxALIGN_CENTER_VERTICAL+wx.wxALL, 5 )
!     flexGridSizer:AddWindow( textCtrl,   0, wx.wxGROW+wx.wxALIGN_CENTER+wx.wxALL, 5 )
!     flexGridSizer:AddWindow( button,     0, wx.wxALIGN_CENTER+wx.wxALL, 5 )
! 
!     return textCtrl
! end
! 
! celsiusTextCtrl    = AddConverterControl("Celsius",    "From &Celsius",    ID_CELSIUS_TEXTCTRL,    ID_CELSIUS_BUTTON)
! kelvinTextCtrl     = AddConverterControl("Kelvin",     "From &Kelvin",     ID_KELVIN_TEXTCTRL,     ID_KELVIN_BUTTON)
! fahrenheitTextCtrl = AddConverterControl("Fahrenheit", "From &Fahrenheit", ID_FAHRENHEIT_TEXTCTRL, ID_FAHRENHEIT_BUTTON)
! rankineTextCtrl    = AddConverterControl("Rankine",    "From &Rankine",    ID_RANKINE_TEXTCTRL,    ID_RANKINE_BUTTON)
! 
! --[[
! NOTE: We've wrapped the creation of the controls into a function, but we could
!       have created them all separately this way.
! 
! local celsiusStaticText = wx.wxStaticText( panel, wx.wxID_ANY, "Celsius")
  local celsiusTextCtrl   = wx.wxTextCtrl( panel, ID_CELSIUS_TEXTCTRL, "", wx.wxDefaultPosition, wx.wxSize(80,-1), 0 )
! local celsiusButton     = wx.wxButton( panel, ID_CELSIUS_BUTTON, "C -> K && F")
  flexGridSizer:AddWindow( celsiusStaticText, 0, wx.wxALIGN_CENTER_VERTICAL+wx.wxALL, 5 )
  flexGridSizer:AddWindow( celsiusTextCtrl,   0, wx.wxGROW+wx.wxALIGN_CENTER+wx.wxALL, 5 )
  flexGridSizer:AddWindow( celsiusButton,     0, wx.wxALIGN_CENTER+wx.wxALL, 5 )
! ]]
  
  staticBoxSizer:AddSizer( flexGridSizer,  0, wx.wxGROW+wx.wxALIGN_CENTER+wx.wxALL, 5 )
***************
*** 50,55 ****
  
  local buttonSizer = wx.wxBoxSizer( wx.wxHORIZONTAL )
! local aboutButton = wx.wxButton( panel, ID_ABOUT_BUTTON, "About")
! local closeButton = wx.wxButton( panel, ID_CLOSE_BUTTON, "Close")
  buttonSizer:AddWindow( aboutButton, 0, wx.wxALIGN_CENTER+wx.wxALL, 5 )
  buttonSizer:AddWindow( closeButton, 0, wx.wxALIGN_CENTER+wx.wxALL, 5 )
--- 72,77 ----
  
  local buttonSizer = wx.wxBoxSizer( wx.wxHORIZONTAL )
! local aboutButton = wx.wxButton( panel, ID_ABOUT_BUTTON, "&About")
! local closeButton = wx.wxButton( panel, ID_CLOSE_BUTTON, "E&xit")
  buttonSizer:AddWindow( aboutButton, 0, wx.wxALIGN_CENTER+wx.wxALL, 5 )
  buttonSizer:AddWindow( closeButton, 0, wx.wxALIGN_CENTER+wx.wxALL, 5 )
***************
*** 59,92 ****
  mainSizer:SetSizeHints( dialog )
  
! -- Attach an event handler to the CelsiusToFahrenheit button
! dialog:Connect(ID_CELSIUS_BUTTON, wx.wxEVT_COMMAND_BUTTON_CLICKED,
      function(event)
!         local celsiusValue = tonumber(celsiusTextCtrl:GetValue())
!         if celsiusValue == nil then
!             wx.wxMessageBox("The Celsius entry is invalid, enter a number.",
                              "Error!",
                              wx.wxOK + wx.wxICON_EXCLAMATION + wx.wxCENTRE,
                              dialog)
          else
!             local fahrenheitValue = (celsiusValue * 9 / 5) + 32
!             fahrenheitTextCtrl:SetValue(fahrenheitValue)
          end
      end)
  
! -- Attach an event handler to the FahrenheitToCelsius button
! dialog:Connect(ID_FAHRENHEIT_BUTTON, wx.wxEVT_COMMAND_BUTTON_CLICKED,
      function(event)
!         local fahrenheitValue = tonumber(fahrenheitTextCtrl:GetValue())
!         if fahrenheitValue == nil then
!             wx.wxMessageBox("The Fahrenheit entry is invalid, enter a number.",
                              "Error!",
                              wx.wxOK + wx.wxICON_EXCLAMATION + wx.wxCENTRE,
                              dialog)
          else
!             local celsiusValue = (fahrenheitValue - 32) * 5 / 9
!             celsiusTextCtrl:SetValue(celsiusValue)
          end
      end)
  
  -- Attach an event handler to the Close button
  dialog:Connect(ID_CLOSE_BUTTON, wx.wxEVT_COMMAND_BUTTON_CLICKED,
--- 81,168 ----
  mainSizer:SetSizeHints( dialog )
  
! -- ---------------------------------------------------------------------------
! -- Calculate the temp conversions, input only one temp, set others to nil
! --    Shows how to handle nil inputs and return multiple ones
! function ConvertTemp( Tc, Tk, Tf, Tr )
!     if Tc or Tk then
!         Tc = Tc or (Tk - 273.15)
!         Tf = (Tc * 9/5) + 32
!     else -- Tf or Tr
!         Tf = Tf or (Tr - 459.67)
!         Tc = (Tf - 32) * 5/9
!     end
! 
!     Tk = Tc + 273.15
!     Tr = Tf + 459.67
! 
!     return Tc, Tk, Tf, Tr
! end
! 
! -- ---------------------------------------------------------------------------
! -- Connect a handler for pressing enter in the textctrls
! dialog:Connect(wx.wxID_ANY, wx.wxEVT_COMMAND_TEXT_ENTER,
      function(event)
!         -- Send "fake" button press to do calculation.
!         -- Button ids have been set to be -1 from textctrl ids.
!         dialog:ProcessEvent(wx.wxCommandEvent(wx.wxEVT_COMMAND_BUTTON_CLICKED, event:GetId()-1))
!     end)
! 
! -- ---------------------------------------------------------------------------
! -- Connect a central event handler that responds to all button clicks.
! -- NOTE: Since we Connect() the about and close buttons after this they will be
! --       called first and unless we call event:Skip() in their handlers the
! --       events will never reach this function. Therefore we don't bother to
! --       check that the ids are only from temp conversion buttons.
! 
! dialog:Connect(wx.wxID_ANY, wx.wxEVT_COMMAND_BUTTON_CLICKED,
!     function(event)
!         -- We know that the textctrl window ids are +1 from the button ids
!         local T = tonumber(dialog:FindWindow(event:GetId()+1):DynamicCast("wxTextCtrl"):GetValue())
! 
!         if T == nil then
!             wx.wxMessageBox("The input temperature is invalid, enter a number.",
                              "Error!",
                              wx.wxOK + wx.wxICON_EXCLAMATION + wx.wxCENTRE,
                              dialog)
          else
!             -- Create a "case" type statement
!             local TempCase = {
!                 [ID_CELSIUS_BUTTON]    = function() return ConvertTemp(T, nil, nil, nil) end,
!                 [ID_KELVIN_BUTTON]     = function() return ConvertTemp(nil, T) end, -- don't need trailing nils
!                 [ID_FAHRENHEIT_BUTTON] = function() return ConvertTemp(nil, nil, T) end,
!                 [ID_RANKINE_BUTTON]    = function() return ConvertTemp(nil, nil, nil, T) end
!             }
! 
!             -- call the "case" statement
!             local Tc, Tk, Tf, Tr = TempCase[event:GetId()]()
! 
!             celsiusTextCtrl:SetValue(string.format("%.3f", Tc))
!             kelvinTextCtrl:SetValue(string.format("%.3f", Tk))
!             fahrenheitTextCtrl:SetValue(string.format("%.3f", Tf))
!             rankineTextCtrl:SetValue(string.format("%.3f", Tr))
          end
      end)
  
! --[[
! -- NOTE: You can also attach single event handlers to each of the buttons and
! --       handle them separately.
! 
! dialog:Connect(ID_CELSIUS_BUTTON, wx.wxEVT_COMMAND_BUTTON_CLICKED,
      function(event)
!         local T = tonumber(celsiusTextCtrl:GetValue())
!         if T == nil then
!             wx.wxMessageBox("The Celsius temperature is invalid, enter a number.",
                              "Error!",
                              wx.wxOK + wx.wxICON_EXCLAMATION + wx.wxCENTRE,
                              dialog)
          else
!             kelvinTextCtrl:SetValue(T + 273.15)
!             fahrenheitTextCtrl:SetValue((T * 9 / 5) + 32)
!             rankineTextCtrl:SetValue((T * 9 / 5) + 32 + 459.67)
          end
      end)
+ ]]
  
+ -- ---------------------------------------------------------------------------
  -- Attach an event handler to the Close button
  dialog:Connect(ID_CLOSE_BUTTON, wx.wxEVT_COMMAND_BUTTON_CLICKED,
***************
*** 99,102 ****
--- 175,179 ----
      end)
  
+ -- ---------------------------------------------------------------------------
  -- Attach an event handler to the About button
  dialog:Connect(ID_ABOUT_BUTTON, wx.wxEVT_COMMAND_BUTTON_CLICKED,
***************
*** 109,112 ****
--- 186,194 ----
      end)
  
+ -- ---------------------------------------------------------------------------
+ -- Send a "fake" event to simulate a button press to update the textctrls
+ dialog:ProcessEvent(wx.wxCommandEvent(wx.wxEVT_COMMAND_BUTTON_CLICKED, ID_CELSIUS_BUTTON))
+ 
+ -- ---------------------------------------------------------------------------
  -- Centre the dialog on the screen
  dialog:Centre()

[Wxlua-commit] wxLua/modules/wxbind/src file.cpp, 1.33, 1.34 wx_bind.cpp, 1.81, 1.82

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

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

Modified Files:
	file.cpp wx_bind.cpp 
Log Message:
update to wxWidgets 2.8


Index: wx_bind.cpp
===================================================================
RCS file: /cvsroot/wxlua/wxLua/modules/wxbind/src/wx_bind.cpp,v
retrieving revision 1.81
retrieving revision 1.82
diff -C2 -d -r1.81 -r1.82
*** wx_bind.cpp	7 Mar 2007 23:56:43 -0000	1.81
--- wx_bind.cpp	8 Mar 2007 06:26:43 -0000	1.82
***************
*** 392,395 ****
--- 392,399 ----
  #endif // (!wxCHECK_VERSION(2,7,0) || (defined(WXWIN_COMPATIBILITY_2_6) && WXWIN_COMPATIBILITY_2_6)) && (wxLUA_USE_wxNotebook && wxUSE_NOTEBOOK)
  
+ #if (!wxCHECK_VERSION(2,8,0)) && (wxLUA_USE_wxDirDialog && wxUSE_DIRDLG)
+         { "wxDD_NEW_DIR_BUTTON", wxDD_NEW_DIR_BUTTON },
+ #endif // (!wxCHECK_VERSION(2,8,0)) && (wxLUA_USE_wxDirDialog && wxUSE_DIRDLG)
+ 
  #if (defined(__WXMSW__)) && ((defined(__WXMSW__) && !wxCHECK_VERSION(2,5,0) && wxUSE_WAVE) && (wxLUA_USE_wxWave))
          { "wxSOUND_ASYNC", wxSOUND_ASYNC },
***************
*** 430,433 ****
--- 434,442 ----
  #endif // (wxCHECK_VERSION(2,8,0)) && (wxLUA_USE_wxDC)
  
+ #if (wxCHECK_VERSION(2,8,0)) && (wxLUA_USE_wxDirDialog && wxUSE_DIRDLG)
+         { "wxDD_CHANGE_DIR", wxDD_CHANGE_DIR },
+         { "wxDD_DIR_MUST_EXIST", wxDD_DIR_MUST_EXIST },
+ #endif // (wxCHECK_VERSION(2,8,0)) && (wxLUA_USE_wxDirDialog && wxUSE_DIRDLG)
+ 
  #if (wxCHECK_VERSION(2,8,0)) && (wxLUA_USE_wxID_XXX)
          { "wxID_EDIT", wxID_EDIT },
***************
*** 810,814 ****
  #if wxLUA_USE_wxDirDialog && wxUSE_DIRDLG
          { "wxDD_DEFAULT_STYLE", wxDD_DEFAULT_STYLE },
-         { "wxDD_NEW_DIR_BUTTON", wxDD_NEW_DIR_BUTTON },
  #endif // wxLUA_USE_wxDirDialog && wxUSE_DIRDLG
  
--- 819,822 ----
***************
*** 4924,4928 ****
  
  static wxLuaArgTag s_wxluatagArray_wxLua_function_wxDirSelector[] = { &s_wxluaarg_String, &s_wxluaarg_String, &s_wxluaarg_Number, &s_wxluatag_wxPoint, &s_wxluatag_wxWindow, 0 };
! // %function wxString wxDirSelector(const wxString& message = wxDirSelectorPromptStr, const wxString& default_path = "", long style = 0, const wxPoint& pos = wxDefaultPosition, wxWindow *parent = NULL)
  static int LUACALL wxLua_function_wxDirSelector(lua_State *L)
  {
--- 4932,4936 ----
  
  static wxLuaArgTag s_wxluatagArray_wxLua_function_wxDirSelector[] = { &s_wxluaarg_String, &s_wxluaarg_String, &s_wxluaarg_Number, &s_wxluatag_wxPoint, &s_wxluatag_wxWindow, 0 };
! // %function wxString wxDirSelector(const wxString& message = wxDirSelectorPromptStr, const wxString& default_path = "", long style = wxDD_DEFAULT_STYLE, const wxPoint& pos = wxDefaultPosition, wxWindow *parent = NULL)
  static int LUACALL wxLua_function_wxDirSelector(lua_State *L)
  {
***************
*** 4935,4940 ****
      // const wxPoint pos = wxDefaultPosition
      const wxPoint * pos = (argCount >= 4 ? (const wxPoint *)wxlState.GetUserDataType(4, s_wxluatag_wxPoint) : &wxDefaultPosition);
!     // long style = 0
!     long style = (argCount >= 3 ? (long)wxlState.GetNumberType(3) : 0);
      // const wxString default_path = ""
      const wxString default_path = (argCount >= 2 ? wxlState.GetwxStringType(2) : wxString(wxEmptyString));
--- 4943,4948 ----
      // const wxPoint pos = wxDefaultPosition
      const wxPoint * pos = (argCount >= 4 ? (const wxPoint *)wxlState.GetUserDataType(4, s_wxluatag_wxPoint) : &wxDefaultPosition);
!     // long style = wxDD_DEFAULT_STYLE
!     long style = (argCount >= 3 ? (long)wxlState.GetNumberType(3) : wxDD_DEFAULT_STYLE);
      // const wxString default_path = ""
      const wxString default_path = (argCount >= 2 ? wxlState.GetwxStringType(2) : wxString(wxEmptyString));

Index: file.cpp
===================================================================
RCS file: /cvsroot/wxlua/wxLua/modules/wxbind/src/file.cpp,v
retrieving revision 1.33
retrieving revision 1.34
diff -C2 -d -r1.33 -r1.34
*** file.cpp	2 Mar 2007 05:44:24 -0000	1.33
--- file.cpp	8 Mar 2007 06:26:43 -0000	1.34
***************
*** 2043,2046 ****
--- 2043,2072 ----
  
  
+ #if (wxCHECK_VERSION(2,8,0)) && (wxLUA_USE_wxDir)
+ static wxLuaArgTag s_wxluatagArray_wxLua_wxDir_FindFirst[] = { &s_wxluaarg_String, &s_wxluaarg_String, &s_wxluaarg_Number, 0 };
+ //     %wxchkver_2_8 static wxString FindFirst(const wxString& dirname, const wxString& filespec, int flags = wxDIR_DEFAULT);
+ static int LUACALL wxLua_wxDir_FindFirst(lua_State *L)
+ {
+     wxLuaState wxlState(L);
+     wxString returns;
+     // get number of arguments
+     int argCount = lua_gettop(L);
+     // int flags = wxDIR_DEFAULT
+     int flags = (argCount >= 4 ? (int)wxlState.GetNumberType(4) : wxDIR_DEFAULT);
+     // const wxString filespec
+     const wxString filespec = wxlState.GetwxStringType(3);
+     // const wxString dirname
+     const wxString dirname = wxlState.GetwxStringType(2);
+     // call FindFirst
+     returns = wxDir::FindFirst(dirname, filespec, flags);
+     // push the result string
+     wxlState.lua_PushString(returns);
+ 
+     return 1;
+ }
+ 
+ #endif // (wxCHECK_VERSION(2,8,0)) && (wxLUA_USE_wxDir)
+ 
+ 
  #if (wxLUA_USE_wxArrayString) && (wxLUA_USE_wxDir)
  static wxLuaArgTag s_wxluatagArray_wxLua_wxDir_GetAllFiles[] = { &s_wxluaarg_String, &s_wxluatag_wxArrayString, &s_wxluaarg_String, &s_wxluaarg_Number, 0 };
***************
*** 2147,2150 ****
--- 2173,2191 ----
  }
  
+ //     wxString GetName() const
+ static int LUACALL wxLua_wxDir_GetName(lua_State *L)
+ {
+     wxLuaState wxlState(L);
+     wxString returns;
+     // get this
+     wxDir * self = (wxDir *)wxlState.GetUserDataType(1, s_wxluatag_wxDir);
+     // call GetName
+     returns = self->GetName();
+     // push the result string
+     wxlState.lua_PushString(returns);
+ 
+     return 1;
+ }
+ 
  static wxLuaArgTag s_wxluatagArray_wxLua_wxDir_GetNext[] = { &s_wxluaarg_String, 0 };
  // %override wxLua_wxDir_GetNext
***************
*** 2270,2273 ****
--- 2311,2319 ----
  WXLUAMETHOD wxDir_methods[] = {
  
+ #if (wxCHECK_VERSION(2,8,0)) && (wxLUA_USE_wxDir)
+     { LuaMethod, "FindFirst", wxLua_wxDir_FindFirst, 3, 2, s_wxluatagArray_wxLua_wxDir_FindFirst },
+ #endif  // (wxCHECK_VERSION(2,8,0)) && (wxLUA_USE_wxDir)
+ 
+ 
  #if (wxLUA_USE_wxArrayString) && (wxLUA_USE_wxDir)
      { LuaMethod, "GetAllFiles", wxLua_wxDir_GetAllFiles, 4, 2, s_wxluatagArray_wxLua_wxDir_GetAllFiles },
***************
*** 2278,2281 ****
--- 2324,2328 ----
      { LuaMethod, "Exists", wxLua_wxDir_Exists, 1, 1, s_wxluatagArray_wxLua_wxDir_Exists },
      { LuaMethod, "GetFirst", wxLua_wxDir_GetFirst, 3, 1, s_wxluatagArray_wxLua_wxDir_GetFirst },
+     { LuaMethod, "GetName", wxLua_wxDir_GetName, 0, 0, s_wxluaargArray_None },
      { LuaMethod, "GetNext", wxLua_wxDir_GetNext, 1, 1, s_wxluatagArray_wxLua_wxDir_GetNext },
      { LuaMethod, "HasFiles", wxLua_wxDir_HasFiles, 1, 0, s_wxluatagArray_wxLua_wxDir_HasFiles },

[Wxlua-commit] wxLua/bindings/wxwidgets dialogs.i, 1.23, 1.24 file.i, 1.15, 1.16

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

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

Modified Files:
	dialogs.i file.i 
Log Message:
update to wxWidgets 2.8


Index: dialogs.i
===================================================================
RCS file: /cvsroot/wxlua/wxLua/bindings/wxwidgets/dialogs.i,v
retrieving revision 1.23
retrieving revision 1.24
diff -C2 -d -r1.23 -r1.24
*** dialogs.i	2 Mar 2007 05:44:22 -0000	1.23
--- dialogs.i	8 Mar 2007 06:26:43 -0000	1.24
***************
*** 36,40 ****
  // %function wxTipProvider* wxCreateFileTipProvider(const wxString& filename, size_t currentTip)
  
! %function wxString wxDirSelector(const wxString& message = wxDirSelectorPromptStr, const wxString& default_path = "", long style = 0, const wxPoint& pos = wxDefaultPosition, wxWindow *parent = NULL)
  %function wxString wxFileSelector(const wxString& message, const wxString& default_path = "", const wxString& default_filename = "", const wxString& default_extension = "", const wxString& wildcard = "*.*", int flags = 0, wxWindow *parent = NULL, int x = -1, int y = -1)
  %function void wxEndBusyCursor()
--- 36,40 ----
  // %function wxTipProvider* wxCreateFileTipProvider(const wxString& filename, size_t currentTip)
  
! %function wxString wxDirSelector(const wxString& message = wxDirSelectorPromptStr, const wxString& default_path = "", long style = wxDD_DEFAULT_STYLE, const wxPoint& pos = wxDefaultPosition, wxWindow *parent = NULL)
  %function wxString wxFileSelector(const wxString& message, const wxString& default_path = "", const wxString& default_filename = "", const wxString& default_extension = "", const wxString& wildcard = "*.*", int flags = 0, wxWindow *parent = NULL, int x = -1, int y = -1)
  %function void wxEndBusyCursor()
***************
*** 258,262 ****
  
  %define wxDD_DEFAULT_STYLE
! %define wxDD_NEW_DIR_BUTTON
  
  %class %noclassinfo wxDirDialog, wxDialog
--- 258,264 ----
  
  %define wxDD_DEFAULT_STYLE
! !%wxchkver_2_8 %define wxDD_NEW_DIR_BUTTON
! %wxchkver_2_8 %define wxDD_CHANGE_DIR
! %wxchkver_2_8 %define wxDD_DIR_MUST_EXIST
  
  %class %noclassinfo wxDirDialog, wxDialog

Index: file.i
===================================================================
RCS file: /cvsroot/wxlua/wxLua/bindings/wxwidgets/file.i,v
retrieving revision 1.15
retrieving revision 1.16
diff -C2 -d -r1.15 -r1.16
*** file.i	2 Mar 2007 05:44:22 -0000	1.15
--- file.i	8 Mar 2007 06:26:43 -0000	1.16
***************
*** 275,278 ****
--- 275,279 ----
      // %override [bool, string filename] wxDir::GetFirst(const wxString& filespec = "", int flags = wxDIR_DEFAULT)
      bool GetFirst(wxString * filename, const wxString& filespec = "", int flags = wxDIR_DEFAULT) const
+     wxString GetName() const
      // %override [bool, string filename] wxDir::GetNext()
      bool GetNext(wxString * filename) const
***************
*** 281,284 ****
--- 282,290 ----
      bool IsOpened() const
      bool Open(const wxString& dir)
+ 
+     %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);
+ 
+     // We don't need wxDirTraverser, just use wxDir methods GetFirst, GetNext.
      //size_t Traverse(wxDirTraverser& sink, const wxString& filespec = wxEmptyString, int flags = wxDIR_DEFAULT)
  %endclass

[Wxlua-commit] wxLua/modules/wxbind/include wxbind.h,1.54,1.55

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

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

Modified Files:
	wxbind.h 
Log Message:
Add stub for wxSortedArrayString


Index: wxbind.h
===================================================================
RCS file: /cvsroot/wxlua/wxLua/modules/wxbind/include/wxbind.h,v
retrieving revision 1.54
retrieving revision 1.55
diff -C2 -d -r1.54 -r1.55
*** wxbind.h	2 Mar 2007 05:44:23 -0000	1.54
--- wxbind.h	7 Mar 2007 23:56:42 -0000	1.55
***************
*** 201,205 ****
  
  #if wxLUA_USE_wxArrayString
!     #include "wx/string.h"
  #endif // wxLUA_USE_wxArrayString
  
--- 201,205 ----
  
  #if wxLUA_USE_wxArrayString
!     #include "wx/arrstr.h"
  #endif // wxLUA_USE_wxArrayString
  
***************
*** 882,885 ****
--- 882,886 ----
  #if wxLUA_USE_wxArrayString
      extern WXDLLIMPEXP_DATA_WXBIND(int) s_wxluatag_wxArrayString;
+     extern WXDLLIMPEXP_DATA_WXBIND(int) s_wxluatag_wxSortedArrayString;
  #endif // wxLUA_USE_wxArrayString
  
***************
*** 1827,1830 ****
--- 1828,1833 ----
      extern WXDLLIMPEXP_WXBIND WXLUAMETHOD wxArrayString_methods[];
      extern WXDLLIMPEXP_DATA_WXBIND(int) wxArrayString_methodCount;
+     extern WXDLLIMPEXP_WXBIND WXLUAMETHOD wxSortedArrayString_methods[];
+     extern WXDLLIMPEXP_DATA_WXBIND(int) wxSortedArrayString_methodCount;
  #endif // wxLUA_USE_wxArrayString
  
***************
*** 2724,2727 ****
--- 2727,2731 ----
  #if wxLUA_USE_wxArrayString
      wxLUA_DECLARE_ENCAPSULATION(WXDLLIMPEXP_WXBIND, wxArrayString, wxArrayString)
+     wxLUA_DECLARE_ENCAPSULATION(WXDLLIMPEXP_WXBIND, wxSortedArrayString, wxSortedArrayString)
  #endif // wxLUA_USE_wxArrayString
  

[Wxlua-commit] wxLua/bindings/wxwidgets data.i, 1.22, 1.23 wx_datatypes.lua, 1.50, 1.51

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

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

Modified Files:
	data.i wx_datatypes.lua 
Log Message:
Add stub for wxSortedArrayString


Index: wx_datatypes.lua
===================================================================
RCS file: /cvsroot/wxlua/wxLua/bindings/wxwidgets/wx_datatypes.lua,v
retrieving revision 1.50
retrieving revision 1.51
diff -C2 -d -r1.50 -r1.51
*** wx_datatypes.lua	2 Mar 2007 05:44:22 -0000	1.50
--- wx_datatypes.lua	7 Mar 2007 23:56:41 -0000	1.51
***************
*** 2644,2647 ****
--- 2644,2654 ----
      Name = "wxSocketType",
    },
+   wxSortedArrayString = {
+     BaseClass = "wxArrayString",
+     Condition = "wxLUA_USE_wxArrayString",
+     DefType = "class",
+     IsNumber = false,
+     Name = "wxSortedArrayString",
+   },
    wxSound = {
      BaseClass = "wxObject",

Index: data.i
===================================================================
RCS file: /cvsroot/wxlua/wxLua/bindings/wxwidgets/data.i,v
retrieving revision 1.22
retrieving revision 1.23
diff -C2 -d -r1.22 -r1.23
*** data.i	23 Feb 2007 04:35:30 -0000	1.22
--- data.i	7 Mar 2007 23:56:41 -0000	1.23
***************
*** 297,301 ****
  %if wxLUA_USE_wxArrayString
  
! %include "wx/string.h"
  
  %class %delete %noclassinfo %encapsulate wxArrayString
--- 297,301 ----
  %if wxLUA_USE_wxArrayString
  
! %include "wx/arrstr.h"
  
  %class %delete %noclassinfo %encapsulate wxArrayString
***************
*** 323,326 ****
--- 323,340 ----
  %endclass
  
+ //-----------------------------------------------------------------------------
+ // wxSortedArrayString
+ 
+ // Note: We cheat by saying that it's derived from a wxArrayString to not
+ //       have to duplicate it's methods. The binder doesn't know any better.
+ 
+ %class %delete %noclassinfo %encapsulate wxSortedArrayString, wxArrayString
+     %overload wxSortedArrayString()
+     //%constructor wxSortedArrayStringCopy(const wxSortedArrayString& array)
+     %overload %constructor wxSortedArrayStringCopy(const wxSortedArrayString& src)
+     %overload %constructor wxSortedArrayStringFromTable(const wxArrayString_FromLuaTable& array)
+ 
+ %endclass
+ 
  %endif //wxLUA_USE_wxArrayString
  

[Wxlua-commit] wxLua/modules/wxbind/src data.cpp, 1.34, 1.35 wx_bind.cpp, 1.80, 1.81

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

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

Modified Files:
	data.cpp wx_bind.cpp 
Log Message:
Add stub for wxSortedArrayString


Index: data.cpp
===================================================================
RCS file: /cvsroot/wxlua/wxLua/modules/wxbind/src/data.cpp,v
retrieving revision 1.34
retrieving revision 1.35
diff -C2 -d -r1.34 -r1.35
*** data.cpp	26 Feb 2007 01:57:02 -0000	1.34
--- data.cpp	7 Mar 2007 23:56:42 -0000	1.35
***************
*** 2339,2340 ****
--- 2339,2460 ----
  #endif  // wxLUA_USE_wxArrayString
  
+ 
+ #if wxLUA_USE_wxArrayString
+ // ---------------------------------------------------------------------------
+ // Bind class wxSortedArrayString
+ // ---------------------------------------------------------------------------
+ 
+ // Lua MetaTable Tag for Class 'wxSortedArrayString'
+ int s_wxluatag_wxSortedArrayString = -1;
+ 
+ //     %overload wxSortedArrayString()
+ static int LUACALL wxLua_wxSortedArrayString_constructor1(lua_State *L)
+ {
+     wxLuaState wxlState(L);
+     wxSortedArrayString *returns;
+     // call constructor
+     returns = new wxSortedArrayString();
+     // add to tracked memory list
+     wxLua_AddTrackedObject(wxlState, (wxSortedArrayString *)returns);
+     // push the constructed class pointer
+     wxlState.PushUserDataType(s_wxluatag_wxSortedArrayString, returns);
+ 
+     return 1;
+ }
+ 
+ static wxLuaArgTag s_wxluatagArray_wxLua_wxSortedArrayStringCopy_constructor[] = { &s_wxluatag_wxSortedArrayString, 0 };
+ //     %overload %constructor wxSortedArrayStringCopy(const wxSortedArrayString& src)
+ static int LUACALL wxLua_wxSortedArrayStringCopy_constructor(lua_State *L)
+ {
+     wxLuaState wxlState(L);
+     wxSortedArrayString *returns;
+     // const wxSortedArrayString src
+     const wxSortedArrayString * src = (const wxSortedArrayString *)wxlState.GetUserDataType(1, s_wxluatag_wxSortedArrayString);
+     // call constructor
+     returns = new wxSortedArrayString(*src);
+     // add to tracked memory list
+     wxLua_AddTrackedObject(wxlState, (wxSortedArrayString *)returns);
+     // push the constructed class pointer
+     wxlState.PushUserDataType(s_wxluatag_wxSortedArrayString, returns);
+ 
+     return 1;
+ }
+ 
+ static wxLuaArgTag s_wxluatagArray_wxLua_wxSortedArrayStringFromTable_constructor[] = { &s_wxluaarg_LuaTable, 0 };
+ //     %overload %constructor wxSortedArrayStringFromTable(const wxArrayString_FromLuaTable& array)
+ static int LUACALL wxLua_wxSortedArrayStringFromTable_constructor(lua_State *L)
+ {
+     wxLuaState wxlState(L);
+     wxSortedArrayString *returns;
+     // const wxArrayString_FromLuaTable array
+     wxArrayString  array = wxArrayString(); wxlState.GetwxArrayString(1, array);
+     // call constructor
+     returns = new wxSortedArrayString(array);
+     // add to tracked memory list
+     wxLua_AddTrackedObject(wxlState, (wxSortedArrayString *)returns);
+     // push the constructed class pointer
+     wxlState.PushUserDataType(s_wxluatag_wxSortedArrayString, returns);
+ 
+     return 1;
+ }
+ 
+ static int LUACALL wxLua_wxSortedArrayString_destructor(lua_State *L)
+ {
+     wxLuaState wxlState(L);
+     wxSortedArrayString * self = (wxSortedArrayString *)wxlState.GetUserDataType(1, s_wxluatag_wxSortedArrayString);
+ 
+     // remove from tracked memory list
+     if (self != 0)
+         wxlState.RemoveTrackedObject(self);
+     return 0;
+ }
+ 
+ static int LUACALL wxLua_wxSortedArrayString_Delete(lua_State *L)
+ {
+     wxLuaState wxlState(L);
+     wxSortedArrayString * self = (wxSortedArrayString *)wxlState.GetUserDataType(1, s_wxluatag_wxSortedArrayString);
+     // remove from tracked memory list
+     if (self != 0)
+         if (wxlState.RemoveTrackedObject(self))
+         {   // if removed, reset the tag so that gc() is not called on this object.
+             lua_pushnil(L);
+             lua_setmetatable(L, -2);
+         }
+     return 0;
+ }
+ 
+ 
+ 
+ // Overloaded function bindings
+ 
+ #if (wxLUA_USE_wxArrayString)
+ // Overloaded functions for wxLua_wxSortedArrayString_constructor
+ static int LUACALL wxLua_wxSortedArrayString_constructor(lua_State *L)
+ {
+     // function overload table
+     static WXLUAMETHOD overloaded_methods[] =
+     {
+         { LuaConstructor, "wxSortedArrayString", wxLua_wxSortedArrayString_constructor1, 0, 0, s_wxluaargArray_None },
+         { LuaConstructor, "wxSortedArrayStringCopy", wxLua_wxSortedArrayStringCopy_constructor, 1, 1, s_wxluatagArray_wxLua_wxSortedArrayStringCopy_constructor },
+         { LuaConstructor, "wxSortedArrayStringFromTable", wxLua_wxSortedArrayStringFromTable_constructor, 1, 1, s_wxluatagArray_wxLua_wxSortedArrayStringFromTable_constructor },
+     };
+     static int overloaded_methodCount = sizeof(overloaded_methods)/sizeof(overloaded_methods[0]);
+     wxLuaState wxlState(L);
+     return wxlState.CallOverloadedFunction(overloaded_methods, overloaded_methodCount);
+ }
+ #endif  // (wxLUA_USE_wxArrayString)
+ 
+ 
+ 
+ // Map Lua Class Methods to C Binding Functions
+ WXLUAMETHOD wxSortedArrayString_methods[] = {
+     { LuaConstructor, "wxSortedArrayString", wxLua_wxSortedArrayString_constructor, 0, 0, s_wxluaargArray_None },
+     { LuaConstructor, "wxSortedArrayStringCopy", wxLua_wxSortedArrayStringCopy_constructor, 1, 1, s_wxluatagArray_wxLua_wxSortedArrayStringCopy_constructor },
+     { LuaConstructor, "wxSortedArrayStringFromTable", wxLua_wxSortedArrayStringFromTable_constructor, 1, 1, s_wxluatagArray_wxLua_wxSortedArrayStringFromTable_constructor },
+     { LuaDelete, "wxSortedArrayString", wxLua_wxSortedArrayString_destructor, 0, 0, s_wxluaargArray_None },
+     { LuaMethod, "Delete", wxLua_wxSortedArrayString_Delete, 0, 0, s_wxluaargArray_None },
+ };
+ 
+ int wxSortedArrayString_methodCount = sizeof(wxSortedArrayString_methods)/sizeof(wxSortedArrayString_methods[0]);
+ #endif  // wxLUA_USE_wxArrayString
+ 

Index: wx_bind.cpp
===================================================================
RCS file: /cvsroot/wxlua/wxLua/modules/wxbind/src/wx_bind.cpp,v
retrieving revision 1.80
retrieving revision 1.81
diff -C2 -d -r1.80 -r1.81
*** wx_bind.cpp	2 Mar 2007 05:44:28 -0000	1.80
--- wx_bind.cpp	7 Mar 2007 23:56:43 -0000	1.81
***************
*** 5937,5940 ****
--- 5937,5941 ----
  #if wxLUA_USE_wxArrayString
          { "wxArrayString", wxArrayString_methods, wxArrayString_methodCount, NULL, &s_wxluatag_wxArrayString, NULL, NULL }, 
+         { "wxSortedArrayString", wxSortedArrayString_methods, wxSortedArrayString_methodCount, NULL, &s_wxluatag_wxSortedArrayString, "wxArrayString", NULL }, 
  #endif // wxLUA_USE_wxArrayString
  
***************
*** 6807,6810 ****
--- 6808,6812 ----
  #if wxLUA_USE_wxArrayString
  wxLUA_IMPLEMENT_ENCAPSULATION(wxArrayString, wxArrayString)
+ wxLUA_IMPLEMENT_ENCAPSULATION(wxSortedArrayString, wxSortedArrayString)
  #endif // wxLUA_USE_wxArrayString
  

[Wxlua-commit] wxLua/bindings/wxwidgets clipdrag.i, 1.21, 1.22 config.i, 1.14, 1.15 controls.i, 1.27, 1.28 datetime.i, 1.21, 1.22 defsutil.i, 1.31, 1.32 dialogs.i, 1.22, 1.23 file.i, 1.14, 1.15 gdi.i, 1.38, 1.39 override.hpp, 1.60, 1.61 print.i, 1.12, 1.13 wave.i, 1.13, 1.14 windows.i, 1.27, 1.28 wx_datatypes.lua, 1.49, 1.50

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

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

Modified Files:
	clipdrag.i config.i controls.i datetime.i defsutil.i dialogs.i 
	file.i gdi.i override.hpp print.i wave.i windows.i 
	wx_datatypes.lua 
Log Message:
update more bindings to 2.8 using header files


Index: config.i
===================================================================
RCS file: /cvsroot/wxlua/wxLua/bindings/wxwidgets/config.i,v
retrieving revision 1.14
retrieving revision 1.15
diff -C2 -d -r1.14 -r1.15
*** config.i	23 Feb 2007 04:35:30 -0000	1.14
--- config.i	2 Mar 2007 05:44:21 -0000	1.15
***************
*** 125,127 ****
--- 125,141 ----
  %endclass
  
+ //-----------------------------------------------------------------------------
+ // wxConfigPathChanger - Skip this for wxLua, just restore the path manually
+ 
+ // a handy little class which changes current path to the path of given entry
+ // and restores it in dtor: so if you declare a local variable of this type,
+ // you work in the entry directory and the path is automatically restored
+ // when the function returns
+ 
+ //%class %noclassinfo wxConfigPathChanger
+ //    wxConfigPathChanger(const wxConfigBase *pContainer, const wxString& strEntry)
+ //    wxString Name() const
+ //    %wxchkver_2_8 void UpdateIfDeleted()
+ //%endclass
+ 
  %endif //wxLUA_USE_wxConfig & wxUSE_CONFIG

Index: wave.i
===================================================================
RCS file: /cvsroot/wxlua/wxLua/bindings/wxwidgets/wave.i,v
retrieving revision 1.13
retrieving revision 1.14
diff -C2 -d -r1.13 -r1.14
*** wave.i	23 Feb 2007 04:35:30 -0000	1.13
--- wave.i	2 Mar 2007 05:44:22 -0000	1.14
***************
*** 151,155 ****
      int GetNumberAxes() const
      int GetNumberButtons() const
!     %static int GetNumberJoysticks() const
      int GetPollingMax() const
      int GetPollingMin() const
--- 151,156 ----
      int GetNumberAxes() const
      int GetNumberButtons() const
!     %wxchkver_2_8 %static int GetNumberJoysticks() const
!     !%wxchkver_2_8 int GetNumberJoysticks() const
      int GetPollingMax() const
      int GetPollingMin() const

Index: wx_datatypes.lua
===================================================================
RCS file: /cvsroot/wxlua/wxLua/bindings/wxwidgets/wx_datatypes.lua,v
retrieving revision 1.49
retrieving revision 1.50
diff -C2 -d -r1.49 -r1.50
*** wx_datatypes.lua	23 Feb 2007 04:35:30 -0000	1.49
--- wx_datatypes.lua	2 Mar 2007 05:44:22 -0000	1.50
***************
*** 267,270 ****
--- 267,277 ----
      Name = "wxArtProvider",
    },
+   wxAutoBufferedPaintDC = {
+     BaseClass = "wxDC",
+     Condition = "(wxCHECK_VERSION(2,8,0)) && (wxLUA_USE_wxDC)",
+     DefType = "class",
+     IsNumber = false,
+     Name = "wxAutoBufferedPaintDC",
+   },
    wxBMPHandler = {
      BaseClass = "wxImageHandler",
***************
*** 667,670 ****
--- 674,683 ----
      Name = "wxDataFormatId",
    },
+   wxDataInputStream = {
+     Condition = "wxUSE_STREAMS",
+     DefType = "class",
+     IsNumber = false,
+     Name = "wxDataInputStream",
+   },
    wxDataObject = {
      Condition = "wxLUA_USE_wxDataObject && wxUSE_DATAOBJ",
***************
*** 693,696 ****
--- 706,715 ----
      Name = "wxDataObjectSimple",
    },
+   wxDataOutputStream = {
+     Condition = "wxUSE_STREAMS",
+     DefType = "class",
+     IsNumber = false,
+     Name = "wxDataOutputStream",
+   },
    wxDateEvent = {
      BaseClass = "wxCommandEvent",
***************
*** 1752,1755 ****
--- 1771,1780 ----
      Name = "wxLayoutConstraints",
    },
+   wxLayoutDirection = {
+     Condition = "(wxCHECK_VERSION(2,8,0)) && (wxLUA_USE_wxDC)",
+     DefType = "enum",
+     IsNumber = true,
+     Name = "wxLayoutDirection",
+   },
    wxLayoutOrientation = {
      Condition = "wxLUA_USE_wxSashWindow && wxUSE_SASH",

Index: print.i
===================================================================
RCS file: /cvsroot/wxlua/wxLua/bindings/wxwidgets/print.i,v
retrieving revision 1.12
retrieving revision 1.13
diff -C2 -d -r1.12 -r1.13
*** print.i	23 Feb 2007 04:35:30 -0000	1.12
--- print.i	2 Mar 2007 05:44:22 -0000	1.13
***************
*** 254,257 ****
--- 254,258 ----
      bool GetColour() const
      wxDuplexMode GetDuplex() const
+     %wxchkver_2_8 int GetMedia() const
      wxPaperSize GetPaperId() const
      wxSize GetPaperSize() const
***************
*** 259,262 ****
--- 260,264 ----
      wxPrintBin GetBin() const
      wxPrintMode GetPrintMode() const
+     %wxchkver_2_8 bool IsOrientationReversed() const
      void SetNoCopies(int v)
      void SetCollate(bool flag)
***************
*** 265,268 ****
--- 267,272 ----
      void SetColour(bool colour)
      void SetDuplex(wxDuplexMode duplex)
+     %wxchkver_2_8 void SetOrientationReversed(bool reversed)
+     %wxchkver_2_8 void SetMedia(int media)
      void SetPaperId(wxPaperSize sizeId)
      void SetPaperSize(const wxSize& sz)

Index: file.i
===================================================================
RCS file: /cvsroot/wxlua/wxLua/bindings/wxwidgets/file.i,v
retrieving revision 1.14
retrieving revision 1.15
diff -C2 -d -r1.14 -r1.15
*** file.i	23 Feb 2007 04:35:30 -0000	1.14
--- file.i	2 Mar 2007 05:44:22 -0000	1.15
***************
*** 386,388 ****
--- 386,483 ----
  %endclass
  
+ //-----------------------------------------------------------------------------
+ //  wxDataInputStream
+ 
+ %include "wx/datstrm.h"
+ 
+ %class %noclassinfo wxDataInputStream
+     //%if wxUSE_UNICODE
+     //   wxDataInputStream(wxInputStream& s, const wxMBConv& conv = wxConvAuto());
+     //%endif // wxUSE_UNICODE
+     //%if !wxUSE_UNICODE
+     wxDataInputStream(wxInputStream& s)
+     //%endif // !wxUSE_UNICODE
+ 
+     bool IsOk()
+ 
+     //#if wxHAS_INT64
+     //    wxUint64 Read64()
+     //#endif
+     //#if wxUSE_LONGLONG
+     //    wxLongLong ReadLL()
+     //#endif
+     wxUint32 Read32()
+     wxUint16 Read16()
+     wxUint8 Read8()
+     double ReadDouble()
+     wxString ReadString()
+ 
+     //#if wxHAS_INT64
+     //   void Read64(wxUint64 *buffer, size_t size)
+     //    void Read64(wxInt64 *buffer, size_t size)
+     //#endif
+     //#if defined(wxLongLong_t) && wxUSE_LONGLONG
+     //    void Read64(wxULongLong *buffer, size_t size)
+     //    void Read64(wxLongLong *buffer, size_t size)
+     //#endif
+     //#if wxUSE_LONGLONG
+     //  void ReadLL(wxULongLong *buffer, size_t size)
+     //  void ReadLL(wxLongLong *buffer, size_t size)
+     //#endif
+     //void Read32(wxUint32 *buffer, size_t size)
+     //void Read16(wxUint16 *buffer, size_t size)
+     //void Read8(wxUint8 *buffer, size_t size)
+     //void ReadDouble(double *buffer, size_t size)
+ 
+     void BigEndianOrdered(bool be_order)
+ %endclass
+ 
+ //-----------------------------------------------------------------------------
+ //  wxDataOutputStream
+ 
+ %include "wx/datstrm.h"
+ 
+ %class %noclassinfo wxDataOutputStream
+     //#if wxUSE_UNICODE
+     //  wxDataOutputStream(wxOutputStream& s, const wxMBConv& conv = wxConvAuto());
+     //#else
+     wxDataOutputStream(wxOutputStream& s);
+     //#endif
+ 
+     bool IsOk()
+ 
+     //#if wxHAS_INT64
+     //  void Write64(wxUint64 i);
+     //  void Write64(wxInt64 i);
+     //#endif
+     //#if wxUSE_LONGLONG
+     //    void WriteLL(const wxLongLong &ll);
+     //    void WriteLL(const wxULongLong &ll);
+     //#endif
+     void Write32(wxUint32 i)
+     void Write16(wxUint16 i)
+     void Write8(wxUint8 i)
+     void WriteDouble(double d)
+     void WriteString(const wxString& string)
+ 
+     //#if wxHAS_INT64
+     //    void Write64(const wxUint64 *buffer, size_t size);
+     //    void Write64(const wxInt64 *buffer, size_t size);
+     //#endif
+     //#if defined(wxLongLong_t) && wxUSE_LONGLONG
+     //    void Write64(const wxULongLong *buffer, size_t size);
+     //    void Write64(const wxLongLong *buffer, size_t size);
+     //#endif
+     //#if wxUSE_LONGLONG
+     //    void WriteLL(const wxULongLong *buffer, size_t size);
+     //    void WriteLL(const wxLongLong *buffer, size_t size);
+     //#endif
+     //void Write32(const wxUint32 *buffer, size_t size);
+     //void Write16(const wxUint16 *buffer, size_t size);
+     //void Write8(const wxUint8 *buffer, size_t size);
+     //void WriteDouble(const double *buffer, size_t size);
+ 
+     void BigEndianOrdered(bool be_order)
+ %endclass
+ 
  %endif // wxUSE_STREAMS

Index: windows.i
===================================================================
RCS file: /cvsroot/wxlua/wxLua/bindings/wxwidgets/windows.i,v
retrieving revision 1.27
retrieving revision 1.28
diff -C2 -d -r1.27 -r1.28
*** windows.i	1 Mar 2007 23:12:31 -0000	1.27
--- windows.i	2 Mar 2007 05:44:22 -0000	1.28
***************
*** 343,346 ****
--- 343,349 ----
      !%wxchkver26 void     SetLabel(const wxString& label) // see wxWindow
  
+     //static wxString GetLabelText(const wxString& label) translates arbitrary string, removes mnemonic characters ('&')
+     %wxchkver_2_8 wxString GetLabelText() const
+ 
      !%wxchkver26 %property=Label, read, write
  %endclass
***************
*** 408,415 ****
          //virtual int HitTest(const wxPoint& pt, long* flags = NULL) const
          //virtual bool HasMultiplePages() const - FIXME do we need this?
-     %endif // %wxchkver_2_8
- 
-     wxSizer* GetControlSizer() const { return m_controlSizer; }
  
  
      %property=ImageList, read, write
--- 411,417 ----
          //virtual int HitTest(const wxPoint& pt, long* flags = NULL) const
          //virtual bool HasMultiplePages() const - FIXME do we need this?
  
+         wxSizer* GetControlSizer() const
+     %endif // %wxchkver_2_8
  
      %property=ImageList, read, write
***************
*** 985,988 ****
--- 987,992 ----
  
  %define wxST_NO_AUTORESIZE
+ %wxchkver_2_8 %define wxST_DOTS_MIDDLE
+ %wxchkver_2_8 %define wxST_DOTS_END
  
  %class wxStaticText, wxControl

Index: gdi.i
===================================================================
RCS file: /cvsroot/wxlua/wxLua/bindings/wxwidgets/gdi.i,v
retrieving revision 1.38
retrieving revision 1.39
diff -C2 -d -r1.38 -r1.39
*** gdi.i	1 Mar 2007 23:12:31 -0000	1.38
--- gdi.i	2 Mar 2007 05:44:22 -0000	1.39
***************
*** 445,448 ****
--- 445,457 ----
  %include "wx/gdicmn.h"
  
+ %if %wxchkver_2_8
+     %define wxC2S_NAME          // return colour name, when possible
+     %define wxC2S_CSS_SYNTAX    // return colour in rgb(r,g,b) syntax
+     %define wxC2S_HTML_SYNTAX   // return colour in #rrggbb syntax
+ 
+     %define wxALPHA_TRANSPARENT
+     %define wxALPHA_OPAQUE
+ %endif // %wxchkver_2_8
+ 
  %class %delete wxColour, wxGDIObject
      %define %object  wxNullColour
***************
*** 455,468 ****
      %rename wxLIGHT_GREY %define %pointer wxLua_wxLIGHT_GREY
  
!     wxColour(const unsigned char red, const unsigned char green, const unsigned char blue)
      %constructor wxNamedColour(const wxString& colourName) // wxPython compatibility
      %constructor wxColourCopy(const wxColour& colour)
  
      unsigned char Blue() const
      !%mac long GetPixel() const
      unsigned char Green() const
      bool Ok() const
      unsigned char Red() const
!     void Set(const unsigned char red, const unsigned char green, const unsigned char blue)
  %endclass
  
--- 464,483 ----
      %rename wxLIGHT_GREY %define %pointer wxLua_wxLIGHT_GREY
  
!     !%wxchkver_2_8 wxColour(unsigned char red, unsigned char green, unsigned char blue)
!     %wxchkver_2_8 wxColour(unsigned char red, unsigned char green, unsigned char blue, unsigned char alpha)
      %constructor wxNamedColour(const wxString& colourName) // wxPython compatibility
      %constructor wxColourCopy(const wxColour& colour)
  
+     %wxchkver_2_8 unsigned char Alpha() const
      unsigned char Blue() const
+     %wxchkver_2_8 virtual wxString GetAsString(long flags = wxC2S_NAME | wxC2S_CSS_SYNTAX) const
      !%mac long GetPixel() const
      unsigned char Green() const
      bool Ok() const
      unsigned char Red() const
!     !%wxchkver_2_8 void Set(unsigned char red, unsigned char green, unsigned char blue)
!     %wxchkver_2_8 void Set(unsigned char red, unsigned char green, unsigned char blue, unsigned char alpha = wxALPHA_OPAQUE)
!     %wxchkver_2_8 %rename SetFromString bool Set(const wxString &str)
!     %wxchkver_2_8 %rename SetFromLong void Set(unsigned long colRGB)
  %endclass
  
***************
*** 975,978 ****
--- 990,1002 ----
  %define wxWINDING_RULE
  
+ %if %wxchkver_2_8
+ %enum wxLayoutDirection
+     wxLayout_Default
+     wxLayout_LeftToRight
+     wxLayout_RightToLeft
+ %endenum
+ %endif %wxchkver_2_8
+ 
+ 
  %class %delete wxDC, wxObject
      // %win wxDC() wxDC is abstract use wxXXXDC
***************
*** 1021,1024 ****
--- 1045,1056 ----
      void EndPage()
      void FloodFill(wxCoord x, wxCoord y, const wxColour& colour, int style=wxFLOOD_SURFACE)
+ 
+     %if %wxchkver_2_8
+         //void GradientFillConcentric(const wxRect& rect, const wxColour& initialColour, const wxColour& destColour)
+         void GradientFillConcentric(const wxRect& rect, const wxColour& initialColour, const wxColour& destColour, const wxPoint& circleCenter)
+         void GradientFillLinear(const wxRect& rect, const wxColour& initialColour, const wxColour& destColour, wxDirection nDirection = wxEAST)
+         wxBitmap GetAsBitmap(const wxRect *subrect = NULL) const
+     %endif //%wxchkver_2_8
+ 
      // alias
      const wxBrush& GetBackground()
***************
*** 1029,1032 ****
--- 1061,1065 ----
      void GetClippingBox(wxCoord *x, wxCoord *y, wxCoord *width, wxCoord *height)
      const wxFont& GetFont()
+     %wxchkver_2_8 wxLayoutDirection GetLayoutDirection() const
      int GetLogicalFunction()
      int GetMapMode()
***************
*** 1038,1042 ****
--- 1071,1082 ----
      //void GetSizeMM(wxCoord *width, wxCoord *height) const // wxSize GetSizeMM() const
      const wxColour& GetTextBackground() const
+     // %override [int x, int y, int descent, int externalLeading] int wxDC::GetTextExtent(const wxString& string, const wxFont* font = NULL )
+     // void GetTextExtent(const wxString& string, wxCoord* x, wxCoord* y, wxCoord* descent = NULL, wxCoord* externalLeading = NULL, const wxFont* font = NULL)
      void GetTextExtent(const wxString& string, wxCoord *w, wxCoord *h, wxCoord *descent = NULL, wxCoord *externalLeading = NULL, wxFont *font = NULL)
+     %wxchkver_2_8 %rename GetTextExtentSize wxSize GetTextExtent(const wxString& string) const
+     // %override [int x, int y, int heightLine] int wxDC::GetMultiLineTextExtent(const wxString& string, const wxFont* font = NULL )
+     // void GetMultiLineTextExtent(const wxString& string, wxCoord* x, wxCoord* y, wxCoord* heightLine = NULL, const wxFont* font = NULL)
+     %wxchkver_2_8 void GetMultiLineTextExtent(const wxString& string, wxCoord *width, wxCoord *height, wxCoord *heightLine = NULL, wxFont *font = NULL) const
+     %wxchkver_2_8 %rename GetMultiLineTextExtentSize wxSize GetMultiLineTextExtent(const wxString& string) const
      const wxColour& GetTextForeground()
      void GetUserScale(double *x, double *y)
***************
*** 1061,1064 ****
--- 1101,1105 ----
      void SetDeviceOrigin(wxCoord x, wxCoord y)
      void SetFont(const wxFont& font)
+     %wxchkver_2_8 void SetLayoutDirection(wxLayoutDirection dir)
      void SetLogicalFunction(int function)
      void SetMapMode(int unit)
***************
*** 1156,1159 ****
--- 1197,1215 ----
  
  //-----------------------------------------------------------------------------
+ // wxAutoBufferedPaintDC
+ 
+ %include "wx/dcbuffer.h"
+ 
+ %if %wxchkver_2_8
+ 
+ %define wxALWAYS_NATIVE_DOUBLE_BUFFER
+ 
+ %class %delete wxAutoBufferedPaintDC, wxDC // ok to derive from wxDC only
+     %overload wxAutoBufferedPaintDC(wxWindow *window)
+ %endclass
+ 
+ %endif // %wxchkver_2_8
+ 
+ //-----------------------------------------------------------------------------
  // wxMirrorDC
  
***************
*** 1333,1337 ****
      // int  GetDepth() const // in docs BUT not in C++ header
      %static int GetFromPoint(const wxPoint& pt)
!     %static int GetFromWindow(wxWindow* win)
      wxRect  GetGeometry() const
      %wxchkver_2_8 wxRect GetClientArea() const
--- 1389,1393 ----
      // int  GetDepth() const // in docs BUT not in C++ header
      %static int GetFromPoint(const wxPoint& pt)
!     %wxchkver_2_8|!%gtk %static int GetFromWindow(wxWindow* win)
      wxRect  GetGeometry() const
      %wxchkver_2_8 wxRect GetClientArea() const

Index: override.hpp
===================================================================
RCS file: /cvsroot/wxlua/wxLua/bindings/wxwidgets/override.hpp,v
retrieving revision 1.60
retrieving revision 1.61
diff -C2 -d -r1.60 -r1.61
*** override.hpp	22 Feb 2007 05:40:52 -0000	1.60
--- override.hpp	2 Mar 2007 05:44:22 -0000	1.61
***************
*** 2646,2649 ****
--- 2646,2676 ----
  %end
  
+ %override wxLua_wxDC_GetMultiLineTextExtent
+ // void GetMultiLineTextExtent(const wxString& string, wxCoord *w, wxCoord *h, wxCoord *heightLine = NULL, wxFont *font = NULL)
+ static int LUACALL wxLua_wxDC_GetMultiLineTextExtent(lua_State *L)
+ {
+     wxLuaState wxlState(L);
+     // get number of arguments
+     int argCount = lua_gettop(L);
+     // wxFont *font = NULL
+     wxFont *font = (argCount >= 3 ? (wxFont *)wxlState.GetUserDataType(3, s_wxluatag_wxFont) : NULL);
+ 
+     wxCoord heightLine;
+     wxCoord h;
+     wxCoord w;
+ 
+     wxString string = wxlState.GetwxStringType(2);
+     // get this
+     wxDC *self = (wxDC *)wxlState.GetUserDataType(1, s_wxluatag_wxDC);
+     // call GetTextExtent
+     self->GetMultiLineTextExtent(string, &w, &h, &heightLine, font);
+     lua_pushnumber(L, w);
+     lua_pushnumber(L, h);
+     lua_pushnumber(L, heightLine);
+     // return the number of parameters
+     return 4;
+ }
+ %end
+ 
  %override wxLua_wxDC_GetClippingBox
  // void GetClippingBox(wxCoord *x, wxCoord *y, wxCoord *width, wxCoord *height)

Index: datetime.i
===================================================================
RCS file: /cvsroot/wxlua/wxLua/bindings/wxwidgets/datetime.i,v
retrieving revision 1.21
retrieving revision 1.22
diff -C2 -d -r1.21 -r1.22
*** datetime.i	18 Jan 2007 17:19:01 -0000	1.21
--- datetime.i	2 Mar 2007 05:44:21 -0000	1.22
***************
*** 56,59 ****
--- 56,60 ----
      GMT11
      GMT12
+     %wxchkver_2_8 GMT13
      WET
      WEST
***************
*** 81,84 ****
--- 82,87 ----
      A_EST
      A_ESST
+     %wxchkver_2_8 NZST
+     %wxchkver_2_8 NZDT
      UTC
  %endenum

Index: clipdrag.i
===================================================================
RCS file: /cvsroot/wxlua/wxLua/bindings/wxwidgets/clipdrag.i,v
retrieving revision 1.21
retrieving revision 1.22
diff -C2 -d -r1.21 -r1.22
*** clipdrag.i	23 Feb 2007 04:35:30 -0000	1.21
--- clipdrag.i	2 Mar 2007 05:44:21 -0000	1.22
***************
*** 141,144 ****
--- 141,145 ----
  
      void Add(wxDataObjectSimple *dataObject, bool preferred = false)
+     %wxchkver_2_8 wxDataFormat GetReceivedFormat() const
  %endclass
  

Index: dialogs.i
===================================================================
RCS file: /cvsroot/wxlua/wxLua/bindings/wxwidgets/dialogs.i,v
retrieving revision 1.22
retrieving revision 1.23
diff -C2 -d -r1.22 -r1.23
*** dialogs.i	23 Feb 2007 04:35:30 -0000	1.22
--- dialogs.i	2 Mar 2007 05:44:22 -0000	1.23
***************
*** 39,43 ****
  %function wxString wxFileSelector(const wxString& message, const wxString& default_path = "", const wxString& default_filename = "", const wxString& default_extension = "", const wxString& wildcard = "*.*", int flags = 0, wxWindow *parent = NULL, int x = -1, int y = -1)
  %function void wxEndBusyCursor()
! wxUSE_COLOURDLG %function wxColour wxGetColourFromUser(wxWindow *parent, const wxColour& colInit)
  wxUSE_FONTDLG %function wxFont wxGetFontFromUser(wxWindow *parent, const wxFont& fontInit)
  // %override [int, lua int table] wxGetMultipleChoices(const wxString& message, const wxString& caption, lua string table, wxWindow *parent = NULL, int x = -1, int y = -1, bool centre = true, int width=150, int height=200)
--- 39,44 ----
  %function wxString wxFileSelector(const wxString& message, const wxString& default_path = "", const wxString& default_filename = "", const wxString& default_extension = "", const wxString& wildcard = "*.*", int flags = 0, wxWindow *parent = NULL, int x = -1, int y = -1)
  %function void wxEndBusyCursor()
! wxUSE_COLOURDLG&&!%wxchkver_2_8 %function wxColour wxGetColourFromUser(wxWindow *parent, const wxColour& colInit)
! wxUSE_COLOURDLG&&%wxchkver_2_8 %function wxColour wxGetColourFromUser(wxWindow *parent, const wxColour& colInit, const wxString& caption = "")
  wxUSE_FONTDLG %function wxFont wxGetFontFromUser(wxWindow *parent, const wxFont& fontInit)
  // %override [int, lua int table] wxGetMultipleChoices(const wxString& message, const wxString& caption, lua string table, wxWindow *parent = NULL, int x = -1, int y = -1, bool centre = true, int width=150, int height=200)

Index: controls.i
===================================================================
RCS file: /cvsroot/wxlua/wxLua/bindings/wxwidgets/controls.i,v
retrieving revision 1.27
retrieving revision 1.28
diff -C2 -d -r1.27 -r1.28
*** controls.i	1 Mar 2007 23:12:31 -0000	1.27
--- controls.i	2 Mar 2007 05:44:21 -0000	1.28
***************
*** 8,11 ****
--- 8,13 ----
  // ============================================================================
  
+ // FIXME - handle WX_DECLARE_CONTROL_CONTAINER ?
+ 
  //-----------------------------------------------------------------------------
  // wxButton

Index: defsutil.i
===================================================================
RCS file: /cvsroot/wxlua/wxLua/bindings/wxwidgets/defsutil.i,v
retrieving revision 1.31
retrieving revision 1.32
diff -C2 -d -r1.31 -r1.32
*** defsutil.i	23 Feb 2007 04:35:30 -0000	1.31
--- defsutil.i	2 Mar 2007 05:44:22 -0000	1.32
***************
*** 368,374 ****
--- 368,377 ----
  %define wxID_PRINT
  %define wxID_PRINT_SETUP
+ %wxchkver_2_8 %define wxID_PAGE_SETUP
  %define wxID_PREVIEW
  %define wxID_ABOUT
  %define wxID_HELP_CONTENTS
+ %wxchkver_2_8 %define wxID_HELP_INDEX
+ %wxchkver_2_8 %define wxID_HELP_SEARCH
  %define wxID_HELP_COMMANDS
  %define wxID_HELP_PROCEDURES
***************
*** 377,380 ****
--- 380,384 ----
  %define wxID_PREFERENCES
  
+ %wxchkver_2_8 %define wxID_EDIT
  %define wxID_CUT
  %define wxID_COPY
***************
*** 398,401 ****
--- 402,406 ----
  %define wxID_VIEW_SORTTYPE
  
+ %wxchkver_2_8 %define wxID_FILE
  %define wxID_FILE1
  %define wxID_FILE2
***************
*** 479,482 ****
--- 484,488 ----
  %define wxCENTRE_ON_SCREEN
  %define wxCOLOURED
+ %define wxDD_NEW_DIR_BUTTON
  //%define wxED_BUTTONS_BOTTOM  // for wxExtDialog? not used?
  //%define wxED_BUTTONS_RIGHT
***************
*** 508,512 ****
  %define wxSIZE_NO_ADJUSTMENTS
  %define wxSIZE_USE_EXISTING
- %define wxST_NO_AUTORESIZE
  %define wxTOP
  %define wxUNKNOWN_PLATFORM
--- 514,517 ----
***************
*** 584,589 ****
--- 589,598 ----
      wxMOD_ALT
      wxMOD_CONTROL
+     %wxchkver_2_8 wxMOD_ALTGR
      wxMOD_SHIFT
+     %wxchkver_2_8 wxMOD_META
      wxMOD_WIN
+     %wxchkver_2_8 wxMOD_CMD
+     %wxchkver_2_8 wxMOD_ALL
  %endenum
  %endif

[Wxlua-commit] wxLua/modules/wxbind/include wxbind.h,1.53,1.54

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

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

Modified Files:
	wxbind.h 
Log Message:
update more bindings to 2.8 using header files


Index: wxbind.h
===================================================================
RCS file: /cvsroot/wxlua/wxLua/modules/wxbind/include/wxbind.h,v
retrieving revision 1.53
retrieving revision 1.54
diff -C2 -d -r1.53 -r1.54
*** wxbind.h	26 Feb 2007 01:57:01 -0000	1.53
--- wxbind.h	2 Mar 2007 05:44:23 -0000	1.54
***************
*** 630,633 ****
--- 630,634 ----
  
  #if wxUSE_STREAMS
+     #include "wx/datstrm.h"
      #include "wx/stream.h"
      #include "wx/txtstrm.h"
***************
*** 682,685 ****
--- 683,690 ----
  #endif // (wxCHECK_VERSION(2,7,0)) && (wxLUA_USE_wxHTML && wxUSE_HTML)
  
+ #if (wxCHECK_VERSION(2,8,0)) && (wxLUA_USE_wxDC)
+     extern WXDLLIMPEXP_DATA_WXBIND(int) s_wxluatag_wxAutoBufferedPaintDC;
+ #endif // (wxCHECK_VERSION(2,8,0)) && (wxLUA_USE_wxDC)
+ 
  #if (wxLUA_USE_wxBitmapButton && wxUSE_BMPBUTTON) && (wxLUA_USE_wxButton && wxUSE_BUTTON)
      extern WXDLLIMPEXP_DATA_WXBIND(int) s_wxluatag_wxBitmapButton;
***************
*** 1455,1458 ****
--- 1460,1465 ----
  
  #if wxUSE_STREAMS
+     extern WXDLLIMPEXP_DATA_WXBIND(int) s_wxluatag_wxDataInputStream;
+     extern WXDLLIMPEXP_DATA_WXBIND(int) s_wxluatag_wxDataOutputStream;
      extern WXDLLIMPEXP_DATA_WXBIND(int) s_wxluatag_wxFileInputStream;
      extern WXDLLIMPEXP_DATA_WXBIND(int) s_wxluatag_wxFileOutputStream;
***************
*** 1529,1532 ****
--- 1536,1544 ----
  #endif // (wxCHECK_VERSION(2,7,0)) && (wxLUA_USE_wxHTML && wxUSE_HTML)
  
+ #if (wxCHECK_VERSION(2,8,0)) && (wxLUA_USE_wxDC)
+     extern WXDLLIMPEXP_WXBIND WXLUAMETHOD wxAutoBufferedPaintDC_methods[];
+     extern WXDLLIMPEXP_DATA_WXBIND(int) wxAutoBufferedPaintDC_methodCount;
+ #endif // (wxCHECK_VERSION(2,8,0)) && (wxLUA_USE_wxDC)
+ 
  #if (wxLUA_USE_wxBitmapButton && wxUSE_BMPBUTTON) && (wxLUA_USE_wxButton && wxUSE_BUTTON)
      extern WXDLLIMPEXP_WXBIND WXLUAMETHOD wxBitmapButton_methods[];
***************
*** 2644,2647 ****
--- 2656,2663 ----
  
  #if wxUSE_STREAMS
+     extern WXDLLIMPEXP_WXBIND WXLUAMETHOD wxDataInputStream_methods[];
+     extern WXDLLIMPEXP_DATA_WXBIND(int) wxDataInputStream_methodCount;
+     extern WXDLLIMPEXP_WXBIND WXLUAMETHOD wxDataOutputStream_methods[];
+     extern WXDLLIMPEXP_DATA_WXBIND(int) wxDataOutputStream_methodCount;
      extern WXDLLIMPEXP_WXBIND WXLUAMETHOD wxFileInputStream_methods[];
      extern WXDLLIMPEXP_DATA_WXBIND(int) wxFileInputStream_methodCount;