[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]