Thread: [Wxlua-commit] wxLua/bindings/wxwidgets appframe.i, 1.25, 1.26 clipdrag.i, 1.20, 1.21 config.i, 1.1

SourceForge Headquarters 225 Broadway Suite 1600 San Diego, CA 92101 +1 (858) 422-6466

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

Modified Files:
	appframe.i clipdrag.i config.i controls.i data.i defsutil.i 
	dialogs.i event.i file.i gdi.i geometry.i grid.i help.i html.i 
	image.i mdi.i menutool.i print.i regex.i sizer.i socket.i 
	thread.i wave.i windows.i wx_datatypes.lua xml.i 
Log Message:
added all wxWidget's wxUSE_XXX conditions to the bindings

Index: wave.i
===================================================================
RCS file: /cvsroot/wxlua/wxLua/bindings/wxwidgets/wave.i,v
retrieving revision 1.12
retrieving revision 1.13
diff -C2 -d -r1.12 -r1.13
*** wave.i	22 Feb 2007 20:33:08 -0000	1.12
--- wave.i	23 Feb 2007 04:35:30 -0000	1.13
***************
*** 13,18 ****
  //  wxSound

! %if %wxchkver26
! %if wxUSE_SOUND
  %include "wx/sound.h"

--- 13,18 ----
  //  wxSound

! %if %wxchkver26 & wxUSE_SOUND
! 
  %include "wx/sound.h"

***************
*** 35,46 ****
  %endclass

! %endif // wxUSE_SOUND
! %endif // %wxchkver26

  //-----------------------------------------------------------------------------
  //  wxWave

! %if %msw&!%wxchkver25
! %if wxUSE_WAVE
  %include "wx/wave.h"

--- 35,45 ----
  %endclass

! %endif // %wxchkver26 & wxUSE_SOUND

  //-----------------------------------------------------------------------------
  //  wxWave

! %if %msw & !%wxchkver25 & wxUSE_WAVE
! 
  %include "wx/wave.h"

***************
*** 58,63 ****
  %endclass

! %endif // wxUSE_WAVE
! %endif // %msw&!%wxchkver25

  %endif //wxLUA_USE_wxWave
--- 57,61 ----
  %endclass

! %endif // %msw & !%wxchkver25 & wxUSE_WAVE

  %endif //wxLUA_USE_wxWave

Index: menutool.i
===================================================================
RCS file: /cvsroot/wxlua/wxLua/bindings/wxwidgets/menutool.i,v
retrieving revision 1.11
retrieving revision 1.12
diff -C2 -d -r1.11 -r1.12
*** menutool.i	7 Dec 2006 06:32:42 -0000	1.11
--- menutool.i	23 Feb 2007 04:35:30 -0000	1.12
***************
*** 11,15 ****
  // wxMenu

! %if wxLUA_USE_wxMenu

  %include "wx/menu.h"
--- 11,15 ----
  // wxMenu

! %if wxLUA_USE_wxMenu & wxUSE_MENUS

  %include "wx/menu.h"
***************
*** 180,184 ****
  %endclass

! %endif //wxLUA_USE_wxMenu

  //-----------------------------------------------------------------------------
--- 180,184 ----
  %endclass

! %endif //wxLUA_USE_wxMenu & wxUSE_MENUS

  //-----------------------------------------------------------------------------

Index: clipdrag.i
===================================================================
RCS file: /cvsroot/wxlua/wxLua/bindings/wxwidgets/clipdrag.i,v
retrieving revision 1.20
retrieving revision 1.21
diff -C2 -d -r1.20 -r1.21
*** clipdrag.i	7 Dec 2006 06:32:42 -0000	1.20
--- clipdrag.i	23 Feb 2007 04:35:30 -0000	1.21
***************
*** 8,17 ****
  // ============================================================================

- // TODO - Missing wxClipboardLocker
- 
  //-----------------------------------------------------------------------------
  // wxClipboard

! %if wxLUA_USE_wxClipboard

  %include "wx/clipbrd.h"
--- 8,15 ----
  // ============================================================================

  //-----------------------------------------------------------------------------
  // wxClipboard

! %if wxLUA_USE_wxClipboard & wxUSE_CLIPBOARD

  %include "wx/clipbrd.h"
***************
*** 35,44 ****
  %endclass

! %endif //wxLUA_USE_wxClipboard

  //-----------------------------------------------------------------------------
  // wxDataFormat

! %if wxLUA_USE_wxDataObject

  %include "wx/dataobj.h"
--- 33,49 ----
  %endclass

! //-----------------------------------------------------------------------------
! // wxClipboardLocker
! 
! // Since the lua garbage collector runs whenever necessary this class doesn't
! // serve its purpose of closing the clipboard when it goes out of scope as it
! // does in C++.
! 
! %endif //wxLUA_USE_wxClipboard & wxUSE_CLIPBOARD

  //-----------------------------------------------------------------------------
  // wxDataFormat

! %if wxLUA_USE_wxDataObject & wxUSE_DATAOBJ

  %include "wx/dataobj.h"
***************
*** 183,192 ****
  //%endclass

! %endif //wxLUA_USE_wxDataObject

  //-----------------------------------------------------------------------------
  // wxDropTarget

! %if wxLUA_USE_wxDragDrop

  %include "wx/dnd.h"
--- 188,197 ----
  //%endclass

! %endif //wxLUA_USE_wxDataObject & wxUSE_DATAOBJ

  //-----------------------------------------------------------------------------
  // wxDropTarget

! %if wxLUA_USE_wxDragDrop & wxUSE_DRAG_AND_DROP

  %include "wx/dnd.h"
***************
*** 270,281 ****
  %endclass

! %endif //wxLUA_USE_wxDragDrop

  //-----------------------------------------------------------------------------
  // wxMetafile

! %if wxLUA_USE_wxMetafile
! 
! %if %msw|%mac|%os2

  %include "wx/metafile.h"
--- 275,284 ----
  %endclass

! %endif //wxLUA_USE_wxDragDrop & wxUSE_DRAG_AND_DROP

  //-----------------------------------------------------------------------------
  // wxMetafile

! %if wxLUA_USE_wxMetafile & wxUSE_METAFILE & (%msw|%mac|%os2)

  %include "wx/metafile.h"
***************
*** 301,303 ****
  %endif

! %endif //wxLUA_USE_wxMetafile
--- 304,306 ----
  %endif

! %endif //wxLUA_USE_wxMetafile & wxUSE_METAFILE & (%msw|%mac|%os2)

Index: data.i
===================================================================
RCS file: /cvsroot/wxlua/wxLua/bindings/wxwidgets/data.i,v
retrieving revision 1.21
retrieving revision 1.22
diff -C2 -d -r1.21 -r1.22
*** data.i	22 Feb 2007 00:01:34 -0000	1.21
--- data.i	23 Feb 2007 04:35:30 -0000	1.22
***************
*** 101,105 ****
  // wxValidator

! %if wxLUA_USE_wxValidator

  %include "wx/validate.h"
--- 101,105 ----
  // wxValidator

! %if wxLUA_USE_wxValidator & wxUSE_VALIDATORS

  %include "wx/validate.h"
***************
*** 118,123 ****
  %endclass

- %endif //wxLUA_USE_wxValidator
- 
  //-----------------------------------------------------------------------------
  // wxTextValidator
--- 118,121 ----
***************
*** 181,184 ****
--- 179,183 ----

  %endif //wxLUA_USE_wxGenericValidator
+ %endif //wxLUA_USE_wxValidator & wxUSE_VALIDATORS

  //-----------------------------------------------------------------------------
***************
*** 376,379 ****
--- 375,380 ----
  // wxLongLong - FIXME it's a typedef so %encapsulate fails on class wxLongLong

+ //%if wxUSE_LONGLONG
+ 
  //%class %encapsulate %delete %noclassinfo wxLongLong
  //    wxLongLong(long hi = 0, unsigned long lo = 0)
***************
*** 393,394 ****
--- 394,397 ----
      //%operator wxLongLong operator-(const wxLongLong& ll) const
  //%endclass
+ 
+ //%endif wxUSE_LONGLONG

Index: wx_datatypes.lua
===================================================================
RCS file: /cvsroot/wxlua/wxLua/bindings/wxwidgets/wx_datatypes.lua,v
retrieving revision 1.48
retrieving revision 1.49
diff -C2 -d -r1.48 -r1.49
*** wx_datatypes.lua	22 Feb 2007 20:33:08 -0000	1.48
--- wx_datatypes.lua	23 Feb 2007 04:35:30 -0000	1.49
***************
*** 184,188 ****
    wxANIHandler = {
      BaseClass = "wxCURHandler",
!     Condition = "(wxUSE_ICO_CUR) && (wxLUA_USE_wxImage)",
      DefType = "class",
      IsNumber = false,
--- 184,188 ----
    wxANIHandler = {
      BaseClass = "wxCURHandler",
!     Condition = "(wxUSE_ICO_CUR) && (wxLUA_USE_wxImage && wxUSE_IMAGE)",
      DefType = "class",
[...3119 lines suppressed...]
      BaseClass = "wxObject",
!     Condition = "wxLUA_USE_wxXMLResource && wxUSE_XML",
      DefType = "class",
      IsNumber = false,
***************
*** 3455,3458 ****
--- 3462,3466 ----
    wxUSE_APPLE_IEEE = "wxUSE_APPLE_IEEE",
    wxUSE_BMPBUTTON = "wxUSE_BMPBUTTON",
+   wxUSE_BOOKCTRL = "wxUSE_BOOKCTRL",
    wxUSE_BUILTIN_IODBC = "wxUSE_BUILTIN_IODBC",
    wxUSE_BUSYINFO = "wxUSE_BUSYINFO",
***************
*** 3463,3466 ****
--- 3471,3475 ----
    wxUSE_CHECKLISTBOX = "wxUSE_CHECKLISTBOX",
    wxUSE_CHOICE = "wxUSE_CHOICE",
+   wxUSE_CHOICEBOOK = "wxUSE_CHOICEBOOK",
    wxUSE_CHOICEDLG = "wxUSE_CHOICEDLG",
    wxUSE_CLIPBOARD = "wxUSE_CLIPBOARD",

Index: print.i
===================================================================
RCS file: /cvsroot/wxlua/wxLua/bindings/wxwidgets/print.i,v
retrieving revision 1.11
retrieving revision 1.12
diff -C2 -d -r1.11 -r1.12
*** print.i	7 Dec 2006 06:32:42 -0000	1.11
--- print.i	23 Feb 2007 04:35:30 -0000	1.12
***************
*** 8,12 ****
  // ============================================================================

! %if wxLUA_USE_wxPrint

  %typedef wxPreviewWindow wxScrolledWindow
--- 8,12 ----
  // ============================================================================

! %if wxLUA_USE_wxPrint & wxUSE_PRINTING_ARCHITECTURE

  %typedef wxPreviewWindow wxScrolledWindow
***************
*** 548,552 ****
  // wxPostScriptDC

! %if wxUSE_PRINTING_ARCHITECTURE&wxUSE_POSTSCRIPT

  %include "wx/dcps.h"
--- 548,552 ----
  // wxPostScriptDC

! %if wxUSE_POSTSCRIPT

  %include "wx/dcps.h"
***************
*** 559,563 ****
  %endclass

! %endif // wxUSE_PRINTING_ARCHITECTURE&wxUSE_POSTSCRIPT

  //-----------------------------------------------------------------------------
--- 559,563 ----
  %endclass

! %endif //wxUSE_POSTSCRIPT

  //-----------------------------------------------------------------------------
***************
*** 573,576 ****
  %endif // %msw|%mac

! %endif //wxLUA_USE_wxPrint

--- 573,576 ----
  %endif // %msw|%mac

! %endif //wxLUA_USE_wxPrint & wxUSE_PRINTING_ARCHITECTURE

Index: file.i
===================================================================
RCS file: /cvsroot/wxlua/wxLua/bindings/wxwidgets/file.i,v
retrieving revision 1.13
retrieving revision 1.14
diff -C2 -d -r1.13 -r1.14
*** file.i	7 Dec 2006 06:32:42 -0000	1.13
--- file.i	23 Feb 2007 04:35:30 -0000	1.14
***************
*** 186,194 ****
  // wxFile

! %if wxLUA_USE_wxFile

  %include "wx/file.h"

! %enum wxFile::OpenMode            // FIXME!
      read
      write
--- 186,194 ----
  // wxFile

! %if wxLUA_USE_wxFile & wxUSE_FILE

  %include "wx/file.h"

! %enum wxFile::OpenMode
      read
      write
***************
*** 251,255 ****
  %endclass

! %endif //wxLUA_USE_wxFile

  //-----------------------------------------------------------------------------
--- 251,255 ----
  %endclass

! %endif //wxLUA_USE_wxFile & wxUSE_FILE

  //-----------------------------------------------------------------------------

Index: regex.i
===================================================================
RCS file: /cvsroot/wxlua/wxLua/bindings/wxwidgets/regex.i,v
retrieving revision 1.5
retrieving revision 1.6
diff -C2 -d -r1.5 -r1.6
*** regex.i	7 Dec 2006 06:32:42 -0000	1.5
--- regex.i	23 Feb 2007 04:35:30 -0000	1.6
***************
*** 11,15 ****
  //  wxRegEx - Regular expression support

! %if wxLUA_USE_wxRegEx

  %include "wx/regex.h"
--- 11,15 ----
  //  wxRegEx - Regular expression support

! %if wxLUA_USE_wxRegEx & wxUSE_REGEX

  %include "wx/regex.h"
***************
*** 49,52 ****
  %endclass

! %endif //wxLUA_USE_wxRegEx

--- 49,52 ----
  %endclass

! %endif //wxLUA_USE_wxRegEx & wxUSE_REGEX

Index: dialogs.i
===================================================================
RCS file: /cvsroot/wxlua/wxLua/bindings/wxwidgets/dialogs.i,v
retrieving revision 1.21
retrieving revision 1.22
diff -C2 -d -r1.21 -r1.22
*** dialogs.i	7 Dec 2006 06:32:42 -0000	1.21
--- dialogs.i	23 Feb 2007 04:35:30 -0000	1.22
***************
*** 172,176 ****
  // wxColourDialog

! %if wxUSE_COLOURDLG & wxLUA_USE_wxColourDialog

  %include "wx/colordlg.h"
--- 172,176 ----
  // wxColourDialog

! %if wxLUA_USE_wxColourDialog & wxUSE_COLOURDLG

  %include "wx/colordlg.h"
***************
*** 206,215 ****
  %endclass

! %endif // wxLUA_USE_wxColourDialog

  //-----------------------------------------------------------------------------
  // wxFileDialog

! %if wxLUA_USE_wxFileDialog

  %include "wx/filedlg.h"
--- 206,215 ----
  %endclass

! %endif // wxLUA_USE_wxColourDialog & wxUSE_COLOURDLG

  //-----------------------------------------------------------------------------
  // wxFileDialog

! %if wxLUA_USE_wxFileDialog & wxUSE_FILEDLG

  %include "wx/filedlg.h"
***************
*** 247,256 ****
  %endclass

! %endif //wxLUA_USE_wxFileDialog

  //-----------------------------------------------------------------------------
  // wxDirDialog

! %if wxLUA_USE_wxDirDialog

  %define wxDD_DEFAULT_STYLE
--- 247,258 ----
  %endclass

! %endif //wxLUA_USE_wxFileDialog & wxUSE_FILEDLG

  //-----------------------------------------------------------------------------
  // wxDirDialog

! %if wxLUA_USE_wxDirDialog & wxUSE_DIRDLG
! 
! %include "wx/dirdlg.h"

  %define wxDD_DEFAULT_STYLE
***************
*** 273,282 ****
  %endclass

! %endif //wxLUA_USE_wxDirDialog

  //-----------------------------------------------------------------------------
  // wxMessageDialog

! %if wxLUA_USE_wxMessageDialog

  //%win %class wxMessageDialog, wxDialog FIXME need this for < 2.6 does 2.4 have it?
--- 275,284 ----
  %endclass

! %endif //wxLUA_USE_wxDirDialog & wxUSE_DIRDLG

  //-----------------------------------------------------------------------------
  // wxMessageDialog

! %if wxLUA_USE_wxMessageDialog & wxUSE_MSGDLG

  //%win %class wxMessageDialog, wxDialog FIXME need this for < 2.6 does 2.4 have it?
***************
*** 289,293 ****
  %endclass

! %endif //wxLUA_USE_wxMessageDialog

  //-----------------------------------------------------------------------------
--- 291,295 ----
  %endclass

! %endif //wxLUA_USE_wxMessageDialog & wxUSE_MSGDLG

  //-----------------------------------------------------------------------------

Index: geometry.i
===================================================================
RCS file: /cvsroot/wxlua/wxLua/bindings/wxwidgets/geometry.i,v
retrieving revision 1.7
retrieving revision 1.8
diff -C2 -d -r1.7 -r1.8
*** geometry.i	7 Dec 2006 06:32:42 -0000	1.7
--- geometry.i	23 Feb 2007 04:35:30 -0000	1.8
***************
*** 8,12 ****
  // ============================================================================

! %if wxLUA_USE_Geometry

  %typedef wxInt32 int
--- 8,12 ----
  // ============================================================================

! %if wxLUA_USE_Geometry & wxUSE_GEOMETRY

  %typedef wxInt32 int
***************
*** 271,273 ****
  //%endclass

! %endif //wxLUA_USE_Geometry
--- 271,273 ----
  //%endclass

! %endif //wxLUA_USE_Geometry & wxUSE_GEOMETRY

Index: xml.i
===================================================================
RCS file: /cvsroot/wxlua/wxLua/bindings/wxwidgets/xml.i,v
retrieving revision 1.5
retrieving revision 1.6
diff -C2 -d -r1.5 -r1.6
*** xml.i	7 Dec 2006 06:32:42 -0000	1.5
--- xml.i	23 Feb 2007 04:35:30 -0000	1.6
***************
*** 7,11 ****
  // ============================================================================

! %if wxLUA_USE_wxXMLResource

  !%wxchkver25 %include "wx/xrc/xml.h"
--- 7,11 ----
  // ============================================================================

! %if wxLUA_USE_wxXMLResource & wxUSE_XML

  !%wxchkver25 %include "wx/xrc/xml.h"
***************
*** 172,174 ****
  %endclass

! %endif //wxLUA_USE_wxXMLResource
--- 172,174 ----
  %endclass

! %endif //wxLUA_USE_wxXMLResource & wxUSE_XML

Index: windows.i
===================================================================
RCS file: /cvsroot/wxlua/wxLua/bindings/wxwidgets/windows.i,v
retrieving revision 1.25
retrieving revision 1.26
diff -C2 -d -r1.25 -r1.26
*** windows.i	9 Feb 2007 05:17:08 -0000	1.25
--- windows.i	23 Feb 2007 04:35:30 -0000	1.26
***************
*** 350,354 ****
  // wxBookCtrlBase

! %if wxLUA_USE_wxNotebook

  %include "wx/bookctrl.h"
--- 350,354 ----
  // wxBookCtrlBase

! %if wxLUA_USE_wxNotebook & wxUSE_BOOKCTRL

  %include "wx/bookctrl.h"
***************
*** 398,407 ****
  %endclass

! %endif //wxLUA_USE_wxNotebook

  //-----------------------------------------------------------------------------
  // wxNotebook

! %if wxLUA_USE_wxNotebook

  %include "wx/notebook.h"
--- 398,407 ----
  %endclass

! %endif //wxLUA_USE_wxNotebook & wxUSE_BOOKCTRL

  //-----------------------------------------------------------------------------
  // wxNotebook

! %if wxLUA_USE_wxNotebook & wxUSE_NOTEBOOK

  %include "wx/notebook.h"
***************
*** 483,492 ****
  %endclass

! %endif //wxLUA_USE_wxNotebook

  //-----------------------------------------------------------------------------
  // wxListbook

! %if wxLUA_USE_wxNotebook & wxLUA_USE_wxListCtrl

  %include "wx/listbook.h"
--- 483,492 ----
  %endclass

! %endif //wxLUA_USE_wxNotebook & wxUSE_NOTEBOOK

  //-----------------------------------------------------------------------------
  // wxListbook

! %if wxLUA_USE_wxNotebook & wxLUA_USE_wxListCtrl & wxUSE_LISTBOOK

  %include "wx/listbook.h"
***************
*** 527,536 ****
  %endclass

! %endif //wxLUA_USE_wxNotebook & wxLUA_USE_wxListCtrl

  //-----------------------------------------------------------------------------
  // wxChoicebook

! %if wxLUA_USE_wxNotebook & wxLUA_USE_wxChoice

  %include "wx/choicebk.h"
--- 527,536 ----
  %endclass

! %endif //wxLUA_USE_wxNotebook & wxLUA_USE_wxListCtrl & wxUSE_LISTBOOK

  //-----------------------------------------------------------------------------
  // wxChoicebook

! %if wxLUA_USE_wxNotebook & wxLUA_USE_wxChoice & wxUSE_CHOICEBOOK

  %include "wx/choicebk.h"
***************
*** 571,582 ****
  %endclass

! %endif //wxLUA_USE_wxNotebook & wxLUA_USE_wxChoice

  //-----------------------------------------------------------------------------
  // wxTabCtrl

! %if wxLUA_USE_wxTabCtrl

- %if %wxchkver24 & %msw
  %include "wx/tabctrl.h"

--- 571,581 ----
  %endclass

! %endif //wxLUA_USE_wxNotebook & wxLUA_USE_wxChoice & wxUSE_CHOICEBOOK

  //-----------------------------------------------------------------------------
  // wxTabCtrl

! %if %wxchkver24 & %msw & wxLUA_USE_wxTabCtrl & wxUSE_TAB_DIALOG // note: wxUSE_TAB_DIALOG is correct

  %include "wx/tabctrl.h"

***************
*** 631,642 ****
  %endclass

! %endif
! 
! %endif //wxLUA_USE_wxTabCtrl

  //-----------------------------------------------------------------------------
  // wxSashWindow

! %if wxLUA_USE_wxSashWindow

  %include "wx/sashwin.h"
--- 630,639 ----
  %endclass

! %endif //%wxchkver24 & %msw & wxLUA_USE_wxTabCtrl & wxUSE_TAB_DIALOG

  //-----------------------------------------------------------------------------
  // wxSashWindow

! %if wxLUA_USE_wxSashWindow & wxUSE_SASH

  %include "wx/sashwin.h"
***************
*** 800,804 ****
  %endclass

! %endif //wxLUA_USE_wxSashWindow

  //-----------------------------------------------------------------------------
--- 797,801 ----
  %endclass

! %endif //wxLUA_USE_wxSashWindow & wxUSE_SASH

  //-----------------------------------------------------------------------------
***************
*** 915,919 ****
  // wxStaticBox

! %if wxLUA_USE_wxStaticBox

  %include "wx/statbox.h"
--- 912,916 ----
  // wxStaticBox

! %if wxLUA_USE_wxStaticBox & wxUSE_STATBOX

  %include "wx/statbox.h"
***************
*** 926,935 ****
  %endclass

! %endif //wxLUA_USE_wxStaticBox

  //-----------------------------------------------------------------------------
  // wxStaticBitmap

! %if wxLUA_USE_wxStaticBitmap

  %include "wx/statbmp.h"
--- 923,932 ----
  %endclass

! %endif //wxLUA_USE_wxStaticBox & wxUSE_STATBOX

  //-----------------------------------------------------------------------------
  // wxStaticBitmap

! %if wxLUA_USE_wxStaticBitmap & wxUSE_STATBMP

  %include "wx/statbmp.h"
***************
*** 946,955 ****
  %endclass

! %endif //wxLUA_USE_wxStaticBitmap

  //-----------------------------------------------------------------------------
  // wxStaticText

! %if wxLUA_USE_wxStaticText

  %include "wx/stattext.h"
--- 943,952 ----
  %endclass

! %endif //wxLUA_USE_wxStaticBitmap & wxUSE_STATBMP

  //-----------------------------------------------------------------------------
  // wxStaticText

! %if wxLUA_USE_wxStaticText & wxUSE_STATTEXT

  %include "wx/stattext.h"
***************
*** 969,978 ****
  %endclass

! %endif //wxLUA_USE_wxStaticText

  //-----------------------------------------------------------------------------
  // wxStaticLine

! %if wxLUA_USE_wxStaticLine

  %include "wx/statline.h"
--- 966,975 ----
  %endclass

! %endif //wxLUA_USE_wxStaticText & wxUSE_STATTEXT

  //-----------------------------------------------------------------------------
  // wxStaticLine

! %if wxLUA_USE_wxStaticLine & wxUSE_STATLINE

  %include "wx/statline.h"
***************
*** 992,994 ****
  %endclass

! %endif //wxLUA_USE_wxStaticLine
--- 989,991 ----
  %endclass

! %endif //wxLUA_USE_wxStaticLine & wxUSE_STATLINE

Index: thread.i
===================================================================
RCS file: /cvsroot/wxlua/wxLua/bindings/wxwidgets/thread.i,v
retrieving revision 1.4
retrieving revision 1.5
diff -C2 -d -r1.4 -r1.5
*** thread.i	17 May 2006 05:02:04 -0000	1.4
--- thread.i	23 Feb 2007 04:35:30 -0000	1.5
***************
*** 11,17 ****
  // wxCriticalSection

! %if wxLUA_USE_wxCriticalSection

  %include "wx/thread.h"
  %class %encapsulate %noclassinfo wxCriticalSection
      wxCriticalSection()
--- 11,18 ----
  // wxCriticalSection

! %if wxLUA_USE_wxCriticalSection & wxUSE_THREADS

  %include "wx/thread.h"
+ 
  %class %encapsulate %noclassinfo wxCriticalSection
      wxCriticalSection()
***************
*** 28,35 ****

  %include "wx/thread.h"
  %class %encapsulate %noclassinfo wxCriticalSectionLocker
      wxCriticalSectionLocker(wxCriticalSection& cs);
  %endclass

! %endif // wxLUA_USE_wxCriticalSectionLocker

--- 29,37 ----

  %include "wx/thread.h"
+ 
  %class %encapsulate %noclassinfo wxCriticalSectionLocker
      wxCriticalSectionLocker(wxCriticalSection& cs);
  %endclass

! %endif // wxLUA_USE_wxCriticalSectionLocker & wxUSE_THREADS

Index: gdi.i
===================================================================
RCS file: /cvsroot/wxlua/wxLua/bindings/wxwidgets/gdi.i,v
retrieving revision 1.36
retrieving revision 1.37
diff -C2 -d -r1.36 -r1.37
*** gdi.i	4 Jan 2007 23:28:04 -0000	1.36
--- gdi.i	23 Feb 2007 04:35:30 -0000	1.37
***************
*** 631,635 ****
  // wxPalette

! %if wxLUA_USE_wxPalette

  %include "wx/palette.h"
--- 631,635 ----
  // wxPalette

! %if wxLUA_USE_wxPalette & wxUSE_PALETTE

  %include "wx/palette.h"
***************
*** 649,653 ****
  %endclass

! %endif //wxLUA_USE_wxPalette

  //-----------------------------------------------------------------------------
--- 649,653 ----
  %endclass

! %endif //wxLUA_USE_wxPalette & wxUSE_PALETTE

  //-----------------------------------------------------------------------------
***************
*** 843,846 ****
--- 843,848 ----
  %if wxLUA_USE_wxMask

+ %include "wx/bitmap.h"
+ 
  %class wxMask, wxObject
      wxMask(const wxBitmap& bitmap)
***************
*** 1009,1014 ****
--- 1011,1018 ----
      void DrawRotatedText(const wxString& text, wxCoord x, wxCoord y, double angle)
      void DrawRoundedRectangle(wxCoord x, wxCoord y, wxCoord width, wxCoord height, double radius = 20)
+     //%if wxUSE_SPLINES
      //void DrawSpline(int n, wxPoint points[])
      //void DrawSpline(wxList *points)
+     //%endif wxUSE_SPLINES
      void DrawText(const wxString& text, wxCoord x, wxCoord y)
      void EndDoc()
***************
*** 1175,1179 ****
  // wxCaret

! %if wxLUA_USE_wxCaret

  %include "wx/caret.h"
--- 1179,1183 ----
  // wxCaret

! %if wxLUA_USE_wxCaret & wxUSE_CARET

  %include "wx/caret.h"
***************
*** 1213,1217 ****
  %endclass

! %endif //wxLUA_USE_wxCaret

--- 1217,1221 ----
  %endclass

! %endif //wxLUA_USE_wxCaret & wxUSE_CARET

***************
*** 1317,1321 ****
  %endclass

- 
  //-----------------------------------------------------------------------------
  // wxDisplay
--- 1321,1324 ----

Index: html.i
===================================================================
RCS file: /cvsroot/wxlua/wxLua/bindings/wxwidgets/html.i,v
retrieving revision 1.12
retrieving revision 1.13
diff -C2 -d -r1.12 -r1.13
*** html.i	7 Dec 2006 06:32:42 -0000	1.12
--- html.i	23 Feb 2007 04:35:30 -0000	1.13
***************
*** 8,12 ****
  // ============================================================================

! %if wxLUA_USE_wxHTML

  //-----------------------------------------------------------------------------
--- 8,12 ----
  // ============================================================================

! %if wxLUA_USE_wxHTML & wxUSE_HTML

  //-----------------------------------------------------------------------------
***************
*** 382,384 ****
  %endclass

! %endif //wxLUA_USE_wxHTML
--- 382,384 ----
  %endclass

! %endif //wxLUA_USE_wxHTML & wxUSE_HTML

Index: appframe.i
===================================================================
RCS file: /cvsroot/wxlua/wxLua/bindings/wxwidgets/appframe.i,v
retrieving revision 1.25
retrieving revision 1.26
diff -C2 -d -r1.25 -r1.26
*** appframe.i	19 Dec 2006 06:18:02 -0000	1.25
--- appframe.i	23 Feb 2007 04:35:30 -0000	1.26
***************
*** 215,219 ****
  // wxStatusBar

! %if wxLUA_USE_wxStatusBar

  %include "wx/statusbr.h"
--- 215,219 ----
  // wxStatusBar

! %if wxLUA_USE_wxStatusBar & wxUSE_STATUSBAR

  %include "wx/statusbr.h"
***************
*** 248,257 ****
  %endclass

! %endif //wxLUA_USE_wxStatusBar

  //-----------------------------------------------------------------------------
  // wxTooltip

! %if wxLUA_USE_wxTooltip

  %include "wx/tooltip.h"
--- 248,257 ----
  %endclass

! %endif //wxLUA_USE_wxStatusBar & wxUSE_STATUSBAR

  //-----------------------------------------------------------------------------
  // wxTooltip

! %if wxLUA_USE_wxTooltip & wxUSE_TOOLTIPS

  %include "wx/tooltip.h"
***************
*** 270,279 ****
  %endclass

! %endif //wxLUA_USE_wxTooltip

  //-----------------------------------------------------------------------------
  // wxAcceleratorTable

! %if wxLUA_USE_wxAcceleratorTable

  %include "wx/accel.h"
--- 270,279 ----
  %endclass

! %endif //wxLUA_USE_wxTooltip & wxUSE_TOOLTIPS

  //-----------------------------------------------------------------------------
  // wxAcceleratorTable

! %if wxLUA_USE_wxAcceleratorTable & wxUSE_ACCEL

  %include "wx/accel.h"
***************
*** 304,307 ****
--- 304,308 ----
      wxACCEL_CTRL
      wxACCEL_SHIFT
+     wxACCEL_CMD // Command key on OS X else ctrl
  %endenum

***************
*** 325,334 ****
  %endclass

! %endif //wxLUA_USE_wxAcceleratorTable

  //-----------------------------------------------------------------------------
  // wxTaskBarIcon

! %if wxLUA_USE_wxTaskBarIcon

  %include "wx/taskbar.h"
--- 326,335 ----
  %endclass

! %endif //wxLUA_USE_wxAcceleratorTable & wxUSE_ACCEL

  //-----------------------------------------------------------------------------
  // wxTaskBarIcon

! %if wxLUA_USE_wxTaskBarIcon & defined(wxHAS_TASK_BAR_ICON)

  %include "wx/taskbar.h"
***************
*** 345,350 ****
  %endclass

  %class %noclassinfo wxTaskBarIconEvent, wxEvent
!     // no constructor since you only respond to this event

      %define %event wxEVT_TASKBAR_MOVE
--- 346,354 ----
  %endclass

+ //-----------------------------------------------------------------------------
+ // wxTaskBarIconEvent
+ 
  %class %noclassinfo wxTaskBarIconEvent, wxEvent
!     wxTaskBarIconEvent(wxEventType evtType, wxTaskBarIcon *tbIcon)

      %define %event wxEVT_TASKBAR_MOVE
***************
*** 357,361 ****
  %endclass

! %endif //wxLUA_USE_wxTaskBarIcon

  //-----------------------------------------------------------------------------
--- 361,365 ----
  %endclass

! %endif //wxLUA_USE_wxTaskBarIcon & defined(wxHAS_TASK_BAR_ICON)

  //-----------------------------------------------------------------------------
***************
*** 477,480 ****
--- 481,488 ----
      %staticonly wxFont   GetFont(wxSystemFont index)
      %staticonly int      GetMetric(wxSystemMetric index, wxWindow* win = NULL)
+     %staticonly bool     HasFeature(wxSystemFeature index)
+ 
+     %staticonly wxSystemScreenType GetScreenType()
+     %staticonly void     SetScreenType( wxSystemScreenType screen )
  %endclass

***************
*** 495,500 ****
      %staticonly bool HasOption(const wxString& name) const
      %staticonly bool IsFalse(const wxString& name) const
!     %staticonly void SetOption(const wxString& name, const wxString& value)
!     %rename SetOptionInt %staticonly void SetOption(const wxString& name, int value)
  %endclass

--- 503,511 ----
      %staticonly bool HasOption(const wxString& name) const
      %staticonly bool IsFalse(const wxString& name) const
! 
!     %if wxUSE_SYSTEM_OPTIONS
!         %staticonly void SetOption(const wxString& name, const wxString& value)
!         %rename SetOptionInt %staticonly void SetOption(const wxString& name, int value)
!     %endif //wxUSE_SYSTEM_OPTIONS
  %endclass

Index: defsutil.i
===================================================================
RCS file: /cvsroot/wxlua/wxLua/bindings/wxwidgets/defsutil.i,v
retrieving revision 1.30
retrieving revision 1.31
diff -C2 -d -r1.30 -r1.31
*** defsutil.i	7 Dec 2006 06:32:42 -0000	1.30
--- defsutil.i	23 Feb 2007 04:35:30 -0000	1.31
***************
*** 606,610 ****
  // wxBusyInfo

! %if wxLUA_USE_wxBusyInfo&wxUSE_BUSYINFO

  %include "wx/busyinfo.h"
--- 606,610 ----
  // wxBusyInfo

! %if wxLUA_USE_wxBusyInfo & wxUSE_BUSYINFO

  %include "wx/busyinfo.h"
***************
*** 615,617 ****
  %endclass

! %endif //wxLUA_USE_wxBusyInfo&wxUSE_BUSYINFO
--- 615,617 ----
  %endclass

! %endif //wxLUA_USE_wxBusyInfo & wxUSE_BUSYINFO

Index: event.i
===================================================================
RCS file: /cvsroot/wxlua/wxLua/bindings/wxwidgets/event.i,v
retrieving revision 1.17
retrieving revision 1.18
diff -C2 -d -r1.17 -r1.18
*** event.i	7 Dec 2006 06:32:42 -0000	1.17
--- event.i	23 Feb 2007 04:35:30 -0000	1.18
***************
*** 635,638 ****
--- 635,640 ----
  // wxWindowCreateEvent

+ %include "wx/event.h"
+ 
  %class wxWindowCreateEvent, wxCommandEvent
      %define %event wxEVT_CREATE
***************
*** 646,649 ****
--- 648,653 ----
  // wxWindowDestroyEvent

+ %include "wx/event.h"
+ 
  %class wxWindowDestroyEvent, wxCommandEvent
      %define %event wxEVT_DESTROY
***************
*** 725,728 ****
--- 729,734 ----
  // wxHelpEvent

+ %include "wx/event.h"
+ 
  %class %delete wxHelpEvent, wxCommandEvent
      %define %event wxEVT_HELP

Index: config.i
===================================================================
RCS file: /cvsroot/wxlua/wxLua/bindings/wxwidgets/config.i,v
retrieving revision 1.13
retrieving revision 1.14
diff -C2 -d -r1.13 -r1.14
*** config.i	7 Dec 2006 06:32:42 -0000	1.13
--- config.i	23 Feb 2007 04:35:30 -0000	1.14
***************
*** 13,17 ****
  // wxConfigBase

! %if wxLUA_USE_wxConfig

  %include "wx/confbase.h"
--- 13,17 ----
  // wxConfigBase

! %if wxLUA_USE_wxConfig & wxUSE_CONFIG

  %include "wx/confbase.h"
***************
*** 125,127 ****
  %endclass

! %endif //wxLUA_USE_wxConfig
--- 125,127 ----
  %endclass

! %endif //wxLUA_USE_wxConfig & wxUSE_CONFIG

Index: mdi.i
===================================================================
RCS file: /cvsroot/wxlua/wxLua/bindings/wxwidgets/mdi.i,v
retrieving revision 1.9
retrieving revision 1.10
diff -C2 -d -r1.9 -r1.10
*** mdi.i	7 Dec 2006 06:32:42 -0000	1.9
--- mdi.i	23 Feb 2007 04:35:30 -0000	1.10
***************
*** 8,12 ****
  // ============================================================================

! %if wxLUA_USE_MDI

  %include "wx/cmdproc.h"
--- 8,12 ----
  // ============================================================================

! %if wxLUA_USE_MDI & wxUSE_MDI & wxUSE_DOC_VIEW_ARCHITECTURE

  %include "wx/cmdproc.h"
***************
*** 283,287 ****
  %endclass

! %endif //wxLUA_USE_MDI

  //-----------------------------------------------------------------------------
--- 283,287 ----
  %endclass

! %endif //wxLUA_USE_MDI & wxUSE_MDI & wxUSE_DOC_VIEW_ARCHITECTURE

  //-----------------------------------------------------------------------------
***************
*** 337,341 ****
  // wxFileHistory

! %if wxLUA_USE_wxFileHistory

  %include "wx/docview.h"
--- 337,341 ----
  // wxFileHistory

! %if wxLUA_USE_wxFileHistory & wxUSE_DOC_VIEW_ARCHITECTURE

  %include "wx/docview.h"
***************
*** 357,360 ****
  %endclass

! %endif //wxLUA_USE_wxFileHistory

--- 357,360 ----
  %endclass

! %endif //wxLUA_USE_wxFileHistory & wxUSE_DOC_VIEW_ARCHITECTURE

Index: image.i
===================================================================
RCS file: /cvsroot/wxlua/wxLua/bindings/wxwidgets/image.i,v
retrieving revision 1.15
retrieving revision 1.16
diff -C2 -d -r1.15 -r1.16
*** image.i	7 Dec 2006 06:32:42 -0000	1.15
--- image.i	23 Feb 2007 04:35:30 -0000	1.16
***************
*** 8,24 ****
  // ============================================================================

- %wxchkver26 %define %string wxIMAGE_OPTION_CUR_HOTSPOT_X
- %wxchkver26 %define %string wxIMAGE_OPTION_CUR_HOTSPOT_Y
- 
- %define %string wxIMAGE_OPTION_PNG_FORMAT
- %define %string wxIMAGE_OPTION_PNG_BITDEPTH
- 
- %define %string wxIMAGE_OPTION_QUALITY        _T("quality")
- %define %string wxIMAGE_OPTION_FILENAME       _T("FileName")
- %define %string wxIMAGE_OPTION_RESOLUTION     _T("Resolution")
- %define %string wxIMAGE_OPTION_RESOLUTIONX    _T("ResolutionX")
- %define %string wxIMAGE_OPTION_RESOLUTIONY    _T("ResolutionY")
- %define %string wxIMAGE_OPTION_RESOLUTIONUNIT _T("ResolutionUnit")
- 
  %enum
      wxIMAGE_RESOLUTION_INCHES
--- 8,11 ----
***************
*** 68,75 ****
  // wxImage

! %if wxLUA_USE_wxImage

  %include "wx/image.h"

  %class %delete wxImage, wxObject
      %define %object wxNullImage
--- 55,76 ----
  // wxImage

! %if wxLUA_USE_wxImage & wxUSE_IMAGE

  %include "wx/image.h"

+ %wxchkver26 %define %string wxIMAGE_OPTION_CUR_HOTSPOT_X
+ %wxchkver26 %define %string wxIMAGE_OPTION_CUR_HOTSPOT_Y
+ 
+ %define %string wxIMAGE_OPTION_PNG_FORMAT
+ %define %string wxIMAGE_OPTION_PNG_BITDEPTH
+ 
+ %define %string wxIMAGE_OPTION_QUALITY        _T("quality")
+ %define %string wxIMAGE_OPTION_FILENAME       _T("FileName")
+ %define %string wxIMAGE_OPTION_RESOLUTION     _T("Resolution")
+ %define %string wxIMAGE_OPTION_RESOLUTIONX    _T("ResolutionX")
+ %define %string wxIMAGE_OPTION_RESOLUTIONY    _T("ResolutionY")
+ %define %string wxIMAGE_OPTION_RESOLUTIONUNIT _T("ResolutionUnit")
+ 
+ 
  %class %delete wxImage, wxObject
      %define %object wxNullImage
***************
*** 225,229 ****
  %endclass

! %endif

  //-----------------------------------------------------------------------------
--- 226,230 ----
  %endclass

! %endif // wxUSE_ICO_CUR

  //-----------------------------------------------------------------------------
***************
*** 232,236 ****
  %include "wx/imagiff.h"

! %if wxUSE_IMAGE && wxUSE_IFF

  %class wxIFFHandler, wxImageHandler
--- 233,237 ----
  %include "wx/imagiff.h"

! %if wxUSE_IFF

  %class wxIFFHandler, wxImageHandler
***************
*** 238,242 ****
  %endclass

! %endif

  //-----------------------------------------------------------------------------
--- 239,243 ----
  %endclass

! %endif //wxUSE_IFF

  //-----------------------------------------------------------------------------
***************
*** 251,255 ****
  %endclass

! %endif

  //-----------------------------------------------------------------------------
--- 252,256 ----
  %endclass

! %endif //wxUSE_GIF

  //-----------------------------------------------------------------------------
***************
*** 264,268 ****
  %endclass

! %endif

  //-----------------------------------------------------------------------------
--- 265,269 ----
  %endclass

! %endif //wxUSE_LIBJPEG

  //-----------------------------------------------------------------------------
***************
*** 277,281 ****
  %endclass

! %endif

  //-----------------------------------------------------------------------------
--- 278,282 ----
  %endclass

! %endif //wxUSE_PCX

  //-----------------------------------------------------------------------------
***************
*** 296,300 ****
  %endclass

! %endif

  //-----------------------------------------------------------------------------
--- 297,301 ----
  %endclass

! %endif //wxUSE_LIBPNG

  //-----------------------------------------------------------------------------
***************
*** 309,313 ****
  %endclass

! %endif

  //-----------------------------------------------------------------------------
--- 310,314 ----
  %endclass

! %endif //wxUSE_PNM

  //-----------------------------------------------------------------------------
***************
*** 327,331 ****
  %endclass

! %endif

  //-----------------------------------------------------------------------------
--- 328,332 ----
  %endclass

! %endif //wxUSE_LIBTIFF

  //-----------------------------------------------------------------------------
***************
*** 339,343 ****

! %endif //wxLUA_USE_wxImage

  //-----------------------------------------------------------------------------
--- 340,344 ----

! %endif //wxLUA_USE_wxImage & wxUSE_IMAGE

  //-----------------------------------------------------------------------------

Index: help.i
===================================================================
RCS file: /cvsroot/wxlua/wxLua/bindings/wxwidgets/help.i,v
retrieving revision 1.9
retrieving revision 1.10
diff -C2 -d -r1.9 -r1.10
*** help.i	7 Dec 2006 06:32:42 -0000	1.9
--- help.i	23 Feb 2007 04:35:30 -0000	1.10
***************
*** 8,17 ****
  // ============================================================================

- %if wxUSE_HELP
- 
  //-----------------------------------------------------------------------------
  // wxHelpController and derived help controller classes

! %if wxLUA_USE_wxHelpController

  %include "wx/help.h"
--- 8,15 ----
  // ============================================================================

  //-----------------------------------------------------------------------------
  // wxHelpController and derived help controller classes

! %if wxLUA_USE_wxHelpController & wxUSE_HELP

  %include "wx/help.h"
***************
*** 52,56 ****
      wxWinHelpController()
  %endclass
! %endif

  //-----------------------------------------------------------------------------
--- 50,54 ----
      wxWinHelpController()
  %endclass
! %endif //%msw

  //-----------------------------------------------------------------------------
***************
*** 68,72 ****
  %class %noclassinfo wxBestHelpController, wxHelpController
  %endclass
! %endif

  //-----------------------------------------------------------------------------
--- 66,70 ----
  %class %noclassinfo wxBestHelpController, wxHelpController
  %endclass
! %endif //%msw

  //-----------------------------------------------------------------------------
***************
*** 78,88 ****
      wxExtHelpController()
  %endclass
! %endif

  //-----------------------------------------------------------------------------
  // wxHtmlHelpData

! %if wxUSE_WXHTML_HELP
! %if wxLUA_USE_wxHtmlHelpController

  //%if !%wxchkver25|%wxcompat24
--- 76,85 ----
      wxExtHelpController()
  %endclass
! %endif //!%win

  //-----------------------------------------------------------------------------
  // wxHtmlHelpData

! %if wxLUA_USE_wxHtmlHelpController & wxUSE_WXHTML_HELP

  //%if !%wxchkver25|%wxcompat24
***************
*** 183,188 ****
  %endclass

! %endif //wxUSE_WXHTML_HELP
! %endif //wxLUA_USE_wxHtmlHelpController
! %endif //wxLUA_USE_wxHelpController
! %endif //wxUSE_HELP
--- 180,183 ----
  %endclass

! %endif //wxLUA_USE_wxHtmlHelpController & wxUSE_WXHTML_HELP
! %endif //wxLUA_USE_wxHelpController & wxUSE_HELP

Index: socket.i
===================================================================
RCS file: /cvsroot/wxlua/wxLua/bindings/wxwidgets/socket.i,v
retrieving revision 1.9
retrieving revision 1.10
diff -C2 -d -r1.9 -r1.10
*** socket.i	7 Dec 2006 06:32:42 -0000	1.9
--- socket.i	23 Feb 2007 04:35:30 -0000	1.10
***************
*** 8,12 ****
  // ============================================================================

! %if wxLUA_USE_wxSocket

  //-----------------------------------------------------------------------------
--- 8,12 ----
  // ============================================================================

! %if wxLUA_USE_wxSocket & wxUSE_SOCKETS

  //-----------------------------------------------------------------------------
***************
*** 192,195 ****
--- 192,197 ----
  //  wxProtocol

+ %if wxUSE_PROTOCOL
+ 
  %include "wx/protocol/protocol.h"

***************
*** 219,226 ****
--- 221,233 ----
  %endclass

+ %endif //wxUSE_PROTOCOL
+ 
  //-----------------------------------------------------------------------------
  //  wxHTTP

+ %if wxUSE_PROTOCOL_HTTP
+ 
  %include "wx/protocol/http.h"
+ 
  %class %delete %noclassinfo wxHTTP, wxProtocol
      wxHTTP()
***************
*** 232,238 ****
--- 239,249 ----
  %endclass

+ %endif //wxUSE_PROTOCOL_HTTP
+ 
  //-----------------------------------------------------------------------------
  //  wxFTP

+ %if wxUSE_PROTOCOL_FTP
+ 
  %include "wx/protocol/ftp.h"

***************
*** 270,273 ****
--- 281,286 ----
  %endclass

+ %endif //wxUSE_PROTOCOL_FTP
+ 
  //-----------------------------------------------------------------------------
  //  wxURI
***************
*** 333,336 ****
--- 346,351 ----
  //  wxURL

+ %if wxUSE_URL
+ 
  %include "wx/url.h"

***************
*** 364,367 ****
--- 379,384 ----
  %endclass

+ %endif //wxUSE_URL
+ 
  //-----------------------------------------------------------------------------
  ////  wxConnectionBase
***************
*** 417,419 ****
  //

! %endif //wxLUA_USE_wxSocket
--- 434,436 ----
  //

! %endif //wxLUA_USE_wxSocket & wxUSE_SOCKETS

Index: grid.i
===================================================================
RCS file: /cvsroot/wxlua/wxLua/bindings/wxwidgets/grid.i,v
retrieving revision 1.10
retrieving revision 1.11
diff -C2 -d -r1.10 -r1.11
*** grid.i	7 Dec 2006 06:32:42 -0000	1.10
--- grid.i	23 Feb 2007 04:35:30 -0000	1.11
***************
*** 8,12 ****
  // ============================================================================

! %if wxLUA_USE_wxGrid

  %include "wx/grid.h"
--- 8,12 ----
  // ============================================================================

! %if wxLUA_USE_wxGrid & wxUSE_GRID

  %include "wx/grid.h"
***************
*** 765,767 ****
  %endclass

! %endif //wxLUA_USE_wxGrid
--- 765,767 ----
  %endclass

! %endif //wxLUA_USE_wxGrid & wxUSE_GRID

Index: controls.i
===================================================================
RCS file: /cvsroot/wxlua/wxLua/bindings/wxwidgets/controls.i,v
retrieving revision 1.25
retrieving revision 1.26
diff -C2 -d -r1.25 -r1.26
*** controls.i	19 Jan 2007 04:17:38 -0000	1.25
--- controls.i	23 Feb 2007 04:35:30 -0000	1.26
***************
*** 11,15 ****
  // wxButton

! %if wxLUA_USE_wxButton

  %include "wx/button.h"
--- 11,15 ----
  // wxButton

! %if wxLUA_USE_wxButton & wxUSE_BUTTON

  %include "wx/button.h"
***************
*** 39,43 ****
  // wxBitmapButton

! %if wxLUA_USE_wxBitmapButton

  %include "wx/bmpbuttn.h"
--- 39,43 ----
  // wxBitmapButton

! %if wxLUA_USE_wxBitmapButton & wxUSE_BMPBUTTON

  %include "wx/bmpbuttn.h"
***************
*** 63,73 ****
  %endclass

! %endif //wxLUA_USE_wxBitmapButton
! %endif //wxLUA_USE_wxButton

  //-----------------------------------------------------------------------------
  // wxToggleButton

! %if wxLUA_USE_wxToggleButton

  %include "wx/tglbtn.h"
--- 63,73 ----
  %endclass

! %endif //wxLUA_USE_wxBitmapButton & wxUSE_BMPBUTTON
! %endif //wxLUA_USE_wxButton & wxUSE_BUTTON

  //-----------------------------------------------------------------------------
  // wxToggleButton

! %if wxLUA_USE_wxToggleButton & wxUSE_TOGGLEBTN

  %include "wx/tglbtn.h"
***************
*** 85,94 ****
  %endclass

! %endif //wxLUA_USE_wxToggleButton

  //-----------------------------------------------------------------------------
  // wxCheckBox

! %if wxLUA_USE_wxCheckBox

  %include "wx/checkbox.h"
--- 85,94 ----
  %endclass

! %endif //wxLUA_USE_wxToggleButton & wxUSE_TOGGLEBTN

  //-----------------------------------------------------------------------------
  // wxCheckBox

! %if wxLUA_USE_wxCheckBox & wxUSE_CHECKBOX

  %include "wx/checkbox.h"
***************
*** 120,129 ****
  %endclass

! %endif //wxLUA_USE_wxCheckBox

  //-----------------------------------------------------------------------------
  // wxControlWithItems

! %if wxLUA_USE_wxChoice|wxLUA_USE_wxComboBox|wxLUA_USE_wxListBox

  %include "wx/ctrlsub.h"
--- 120,129 ----
  %endclass

! %endif //wxLUA_USE_wxCheckBox & wxUSE_CHECKBOX

  //-----------------------------------------------------------------------------
  // wxControlWithItems

! %if (wxLUA_USE_wxChoice|wxLUA_USE_wxComboBox|wxLUA_USE_wxListBox) & wxUSE_CONTROLS

  %include "wx/ctrlsub.h"
***************
*** 165,174 ****
  %endclass

! %endif //wxLUA_USE_wxChoice|wxLUA_USE_wxComboBox|wxLUA_USE_wxListBox

  //-----------------------------------------------------------------------------
  // wxChoice

! %if wxLUA_USE_wxChoice

  %include "wx/choice.h"
--- 165,174 ----
  %endclass

! %endif //(wxLUA_USE_wxChoice|wxLUA_USE_wxComboBox|wxLUA_USE_wxListBox) & wxUSE_CONTROLS

  //-----------------------------------------------------------------------------
  // wxChoice

! %if wxLUA_USE_wxChoice & wxUSE_CHOICE

  %include "wx/choice.h"
***************
*** 184,193 ****
  %endclass

! %endif //wxLUA_USE_wxChoice

  //-----------------------------------------------------------------------------
  // wxComboBox

! %if wxUSE_COMBOBOX & wxLUA_USE_wxComboBox

  %include "wx/combobox.h"
--- 184,193 ----
  %endclass

! %endif //wxLUA_USE_wxChoice & wxUSE_CHOICE

  //-----------------------------------------------------------------------------
  // wxComboBox

! %if wxLUA_USE_wxComboBox & wxUSE_COMBOBOX

  %include "wx/combobox.h"
***************
*** 227,236 ****
  %endclass

! %endif //wxUSE_COMBOBOX & wxLUA_USE_wxComboBox

  //-----------------------------------------------------------------------------
  // wxGauge

! %if wxUSE_GAUGE & wxLUA_USE_wxGauge

  %include "wx/gauge.h"
--- 227,236 ----
  %endclass

! %endif //wxLUA_USE_wxComboBox & wxUSE_COMBOBOX

  //-----------------------------------------------------------------------------
  // wxGauge

! %if wxLUA_USE_wxGauge & wxUSE_GAUGE

  %include "wx/gauge.h"
***************
*** 262,271 ****
  %endclass

! %endif //wxUSE_GAUGE & wxLUA_USE_wxGauge

  //-----------------------------------------------------------------------------
  // wxListBox

! %if wxUSE_LISTBOX & wxLUA_USE_wxListBox

  %include "wx/listbox.h"
--- 262,271 ----
  %endclass

! %endif //wxLUA_USE_wxGauge & wxUSE_GAUGE

  //-----------------------------------------------------------------------------
  // wxListBox

! %if wxLUA_USE_wxListBox & wxUSE_LISTBOX

  %include "wx/listbox.h"
***************
*** 302,306 ****
  // wxCheckListBox

! %if wxUSE_CHECKLISTBOX & wxLUA_USE_wxCheckListBox

  %include "wx/checklst.h"
--- 302,306 ----
  // wxCheckListBox

! %if wxLUA_USE_wxCheckListBox & wxUSE_CHECKLISTBOX

  %include "wx/checklst.h"
***************
*** 315,325 ****
  %endclass

! %endif //wxUSE_CHECKLISTBOX & wxLUA_USE_wxCheckListBox
! %endif //wxUSE_LISTBOX & wxLUA_USE_wxListBox

  //-----------------------------------------------------------------------------
  // wxListCtrl

! %if wxUSE_LISTCTRL & wxLUA_USE_wxListCtrl

  %include "wx/listctrl.h"
--- 315,325 ----
  %endclass

! %endif //wxLUA_USE_wxCheckListBox & wxUSE_CHECKLISTBOX
! %endif //wxLUA_USE_wxListBox & wxUSE_LISTBOX

  //-----------------------------------------------------------------------------
  // wxListCtrl

! %if wxLUA_USE_wxListCtrl & wxUSE_LISTCTRL

  %include "wx/listctrl.h"
***************
*** 618,627 ****
  %endclass

! %endif //wxUSE_LISTCTRL & wxLUA_USE_wxListCtrl

  //-----------------------------------------------------------------------------
  // wxRadioBox

! %if wxUSE_RADIOBOX & wxLUA_USE_wxRadioBox

  %include "wx/radiobox.h"
--- 618,627 ----
  %endclass

! %endif //wxLUA_USE_wxListCtrl & wxUSE_LISTCTRL

  //-----------------------------------------------------------------------------
  // wxRadioBox

! %if wxLUA_USE_wxRadioBox & wxUSE_RADIOBOX

  %include "wx/radiobox.h"
***************
*** 662,671 ****
  %endclass

! %endif //wxUSE_RADIOBOX & wxLUA_USE_wxRadioBox

  //-----------------------------------------------------------------------------
  // wxRadioButton

! %if wxUSE_RADIOBTN & wxLUA_USE_wxRadioButton

  %include "wx/radiobut.h"
--- 662,671 ----
  %endclass

! %endif //wxLUA_USE_wxRadioBox & wxUSE_RADIOBOX

  //-----------------------------------------------------------------------------
  // wxRadioButton

! %if wxLUA_USE_wxRadioButton & wxUSE_RADIOBTN

  %include "wx/radiobut.h"
***************
*** 686,695 ****
  %endclass

! %endif //wxUSE_RADIOBTN & wxLUA_USE_wxRadioButton

  //-----------------------------------------------------------------------------
  // wxScrollBar

! %if wxLUA_USE_wxScrollBar

  %include "wx/scrolbar.h"
--- 686,695 ----
  %endclass

! %endif //wxLUA_USE_wxRadioButton & wxUSE_RADIOBTN

  //-----------------------------------------------------------------------------
  // wxScrollBar

! %if wxLUA_USE_wxScrollBar & wxUSE_SCROLLBAR

  %include "wx/scrolbar.h"
***************
*** 715,724 ****
  %endclass

! %endif //wxLUA_USE_wxScrollBar

  //-----------------------------------------------------------------------------
  // wxSlider

! %if wxLUA_USE_wxSlider

  %include "wx/slider.h"
--- 715,724 ----
  %endclass

! %endif //wxLUA_USE_wxScrollBar & wxUSE_SCROLLBAR

  //-----------------------------------------------------------------------------
  // wxSlider

! %if wxLUA_USE_wxSlider & wxUSE_SLIDER

  %include "wx/slider.h"
***************
*** 771,780 ****
  %endclass

! %endif //wxLUA_USE_wxSlider

  //-----------------------------------------------------------------------------
  // wxSpinButton

! %if wxLUA_USE_wxSpinButton

  %include "wx/spinbutt.h"
--- 771,780 ----
  %endclass

! %endif //wxLUA_USE_wxSlider & wxUSE_SLIDER

  //-----------------------------------------------------------------------------
  // wxSpinButton

! %if wxLUA_USE_wxSpinButton & wxUSE_SPINBTN

  %include "wx/spinbutt.h"
***************
*** 820,829 ****
  %endclass

! %endif //wxLUA_USE_wxSpinButton

  //-----------------------------------------------------------------------------
  // wxSpinCtrl

! %if wxLUA_USE_wxSpinCtrl

  %include "wx/spinctrl.h"
--- 820,829 ----
  %endclass

! %endif //wxLUA_USE_wxSpinButton & wxUSE_SPINBTN

  //-----------------------------------------------------------------------------
  // wxSpinCtrl

! %if wxLUA_USE_wxSpinCtrl & wxUSE_SPINCTRL

  %include "wx/spinctrl.h"
***************
*** 850,859 ****
  %endclass

! %endif //wxLUA_USE_wxSpinCtrl

  //-----------------------------------------------------------------------------
  // wxTextCtrl

! %if wxLUA_USE_wxTextCtrl

  %include "wx/textctrl.h"
--- 850,859 ----
  %endclass

! %endif //wxLUA_USE_wxSpinCtrl & wxUSE_SPINCTRL

  //-----------------------------------------------------------------------------
  // wxTextCtrl

! %if wxLUA_USE_wxTextCtrl & wxUSE_TEXTCTRL

  %include "wx/textctrl.h"
***************
*** 1012,1021 ****
  %endclass

! %endif //wxLUA_USE_wxTextCtrl

  //-----------------------------------------------------------------------------
  // wxTreeCtrl

! %if wxLUA_USE_wxTreeCtrl

  %include "wx/treectrl.h"
--- 1012,1021 ----
  %endclass

! %endif //wxLUA_USE_wxTextCtrl & wxUSE_TEXTCTRL

  //-----------------------------------------------------------------------------
  // wxTreeCtrl

! %if wxLUA_USE_wxTreeCtrl & wxUSE_TREECTRL

  %include "wx/treectrl.h"
***************
*** 1287,1296 ****
  %endclass

! %endif //wxLUA_USE_wxTreeCtrl

  //-----------------------------------------------------------------------------
  // wxGenericDirCtrl

! %if wxLUA_USE_wxGenericDirCtrl&wxUSE_DIRDLG

  %include "wx/dirctrl.h"
--- 1287,1296 ----
  %endclass

! %endif //wxLUA_USE_wxTreeCtrl & wxUSE_TREECTRL

  //-----------------------------------------------------------------------------
  // wxGenericDirCtrl

! %if wxLUA_USE_wxGenericDirCtrl & wxUSE_DIRDLG

  %include "wx/dirctrl.h"
***************
*** 1331,1333 ****
  %endclass

! %endif //wxLUA_USE_wxGenericDirCtrl&wxUSE_DIRDLG
--- 1331,1333 ----
  %endclass

! %endif //wxLUA_USE_wxGenericDirCtrl & wxUSE_DIRDLG

Index: sizer.i
===================================================================
RCS file: /cvsroot/wxlua/wxLua/bindings/wxwidgets/sizer.i,v
retrieving revision 1.9
retrieving revision 1.10
diff -C2 -d -r1.9 -r1.10
*** sizer.i	7 Dec 2006 06:32:42 -0000	1.9
--- sizer.i	23 Feb 2007 04:35:30 -0000	1.10
***************
*** 264,268 ****
  // wxNotebookSizer - deprecated

! %if wxUSE_NOTEBOOK&(!%wxchkver25)

  %class wxNotebookSizer, wxSizer
--- 264,268 ----
  // wxNotebookSizer - deprecated

! %if wxUSE_NOTEBOOK & (!%wxchkver25)

  %class wxNotebookSizer, wxSizer
***************
*** 272,280 ****
  %endclass

! %endif //wxUSE_NOTEBOOK

  //-----------------------------------------------------------------------------
  // wxStaticBoxSizer

  %class wxStaticBoxSizer, wxBoxSizer
      wxStaticBoxSizer(wxStaticBox* box, int orient)
--- 272,285 ----
  %endclass

! %endif //wxUSE_NOTEBOOK & (!%wxchkver25)
! 
! //-----------------------------------------------------------------------------
! // wxBookCtrlSizer - also depricated since 2.6

  //-----------------------------------------------------------------------------
  // wxStaticBoxSizer

+ %if wxUSE_STATBOX
+ 
  %class wxStaticBoxSizer, wxBoxSizer
      wxStaticBoxSizer(wxStaticBox* box, int orient)
***************
*** 286,289 ****
--- 291,320 ----
  %endclass

+ %endif //wxUSE_STATBOX
+ 
+ //-----------------------------------------------------------------------------
+ // wxStdDialogButtonSizer
+ 
+ %if wxUSE_BUTTON
+ 
+ %class wxStdDialogButtonSizer, wxBoxSizer
+     wxStdDialogButtonSizer()
+ 
+     void AddButton(wxButton *button)
+     void SetAffirmativeButton( wxButton *button );
+     void SetNegativeButton( wxButton *button );
+     void SetCancelButton( wxButton *button );
+ 
+     void Realize();
+ 
+     wxButton *GetAffirmativeButton() const
+     wxButton *GetApplyButton() const
+     wxButton *GetNegativeButton() const
+     wxButton *GetCancelButton() const
+     wxButton *GetHelpButton() const
+ %endclass
+ 
+ %endif //wxUSE_BUTTON
+ 
  %endif //wxLUA_USE_wxSizer

Thread: [Wxlua-commit] wxLua/bindings/wxwidgets appframe.i, 1.25, 1.26 clipdrag.i, 1.20, 1.21 config.i, 1.1

wxlua-commit