Menu
▾
▴
[Wxlua-commit] wxLua/bindings/wxwidgets appframe.i, 1.23, 1.24 clipdrag.i, 1.19, 1.20 config.i, 1.12, 1.13 controls.i, 1.23, 1.24 data.i, 1.18, 1.19 datetime.i, 1.19, 1.20 defsutil.i, 1.29, 1.30 dialogs.i, 1.20, 1.21 event.i, 1.16, 1.17 file.i, 1.12, 1.13 fl.i, 1.7, 1.8 gdi.i, 1.31, 1.32 geometry.i, 1.6, 1.7 grid.i, 1.9, 1.10 help.i, 1.8, 1.9 html.i, 1.11, 1.12 image.i, 1.14, 1.15 mdi.i, 1.8, 1.9 menutool.i, 1.10, 1.11 print.i, 1.10, 1.11 regex.i, 1.4, 1.5 sizer.i, 1.8, 1.9 socket.i, 1.8, 1.9 wave.i, 1.9, 1.10 windows.i, 1.23, 1.24 wx_datatypes.lua, 1.40, 1.41 wxlua.i, 1.18, 1.19 xml.i, 1.4, 1.5
Update of /cvsroot/wxlua/wxLua/bindings/wxwidgets In directory sc8-pr-cvs9.sourceforge.net:/tmp/cvs-serv30967/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 fl.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 wave.i windows.i wx_datatypes.lua wxlua.i xml.i Log Message: update bindings, better docs, add wxAboutBox for 2.8 fix /* */ in genwxbind.lua Remove wxPlatformXXX just use __WXMSW__ or whatever Index: wave.i =================================================================== RCS file: /cvsroot/wxlua/wxLua/bindings/wxwidgets/wave.i,v retrieving revision 1.9 retrieving revision 1.10 diff -C2 -d -r1.9 -r1.10 *** wave.i 25 May 2006 22:50:05 -0000 1.9 --- wave.i 7 Dec 2006 06:32:42 -0000 1.10 *************** *** 61,65 **** %endif // %msw&!%wxchkver25 ! %endif wxLUA_USE_wxWave //----------------------------------------------------------------------------- --- 61,65 ---- %endif // %msw&!%wxchkver25 ! %endif //wxLUA_USE_wxWave //----------------------------------------------------------------------------- *************** *** 216,219 **** %endclass ! %endif wxLUA_USE_wxJoystick|wxUSE_JOYSTICK --- 216,219 ---- %endclass ! %endif //wxLUA_USE_wxJoystick|wxUSE_JOYSTICK Index: menutool.i =================================================================== RCS file: /cvsroot/wxlua/wxLua/bindings/wxwidgets/menutool.i,v retrieving revision 1.10 retrieving revision 1.11 diff -C2 -d -r1.10 -r1.11 *** menutool.i 17 May 2006 05:02:04 -0000 1.10 --- menutool.i 7 Dec 2006 06:32:42 -0000 1.11 *************** *** 170,175 **** %class %delete wxMenuEvent, wxEvent %define %event wxEVT_MENU_HIGHLIGHT ! %wxchkver23 %define %event wxEVT_MENU_OPEN ! %wxchkver23 %define %event wxEVT_MENU_CLOSE %define %event wxEVT_MENU_HIGHLIGHT --- 170,175 ---- %class %delete wxMenuEvent, wxEvent %define %event wxEVT_MENU_HIGHLIGHT ! %define %event wxEVT_MENU_OPEN ! %define %event wxEVT_MENU_CLOSE %define %event wxEVT_MENU_HIGHLIGHT *************** *** 180,184 **** %endclass ! %endif wxLUA_USE_wxMenu //----------------------------------------------------------------------------- --- 180,184 ---- %endclass ! %endif //wxLUA_USE_wxMenu //----------------------------------------------------------------------------- *************** *** 194,201 **** %define wxTB_VERTICAL %define wxTB_3DBUTTONS ! %wxchkver23 %define wxTB_TEXT ! %wxchkver23 %define wxTB_NOICONS ! %wxchkver23 %define wxTB_NODIVIDER ! %wxchkver23 %define wxTB_NOALIGN %define wxTB_HORZ_LAYOUT %define wxTB_HORZ_TEXT --- 194,201 ---- %define wxTB_VERTICAL %define wxTB_3DBUTTONS ! %define wxTB_TEXT ! %define wxTB_NOICONS ! %define wxTB_NODIVIDER ! %define wxTB_NOALIGN %define wxTB_HORZ_LAYOUT %define wxTB_HORZ_TEXT *************** *** 276,287 **** // wxToolBarSimple ! %wxchkver22&!%wxchkver25 %include "wx/tbarsmpl.h" ! %wxchkver22&!%wxchkver25 %class wxToolBarSimple, wxToolBarBase ! %wxchkver22&!%wxchkver25 wxToolBarSimple(wxWindow *parent, wxWindowID id, const wxPoint& pos = wxDefaultPosition, const wxSize& size = wxDefaultSize, long style = wxNO_BORDER | wxTB_HORIZONTAL, const wxString &name = wxToolBarNameStr) ! %wxchkver22&!%wxchkver25 %constructor wxPreToolBarSimple() ! %wxchkver22&!%wxchkver25 bool Create(wxWindow *parent,wxWindowID id, const wxPoint& pos = wxDefaultPosition, const wxSize& size = wxDefaultSize, long style = wxNO_BORDER | wxTB_HORIZONTAL, const wxString &name = wxToolBarNameStr) ! %wxchkver22&!%wxchkver25 wxToolBarToolBase *FindToolForPosition(wxCoord x, wxCoord y) ! %wxchkver22&!%wxchkver25 %endclass //----------------------------------------------------------------------------- --- 276,291 ---- // wxToolBarSimple ! %if !%wxchkver25 ! %include "wx/tbarsmpl.h" ! ! %class wxToolBarSimple, wxToolBarBase ! wxToolBarSimple(wxWindow *parent, wxWindowID id, const wxPoint& pos = wxDefaultPosition, const wxSize& size = wxDefaultSize, long style = wxNO_BORDER | wxTB_HORIZONTAL, const wxString &name = wxToolBarNameStr) ! %constructor wxPreToolBarSimple() ! bool Create(wxWindow *parent,wxWindowID id, const wxPoint& pos = wxDefaultPosition, const wxSize& size = wxDefaultSize, long style = wxNO_BORDER | wxTB_HORIZONTAL, const wxString &name = wxToolBarNameStr) ! wxToolBarToolBase *FindToolForPosition(wxCoord x, wxCoord y) ! %endclass ! ! %endif // !%wxchkver25 //----------------------------------------------------------------------------- *************** *** 347,350 **** %endclass ! %endif wxLUA_USE_wxToolbar --- 351,354 ---- %endclass ! %endif //wxLUA_USE_wxToolbar Index: clipdrag.i =================================================================== RCS file: /cvsroot/wxlua/wxLua/bindings/wxwidgets/clipdrag.i,v retrieving revision 1.19 retrieving revision 1.20 diff -C2 -d -r1.19 -r1.20 *** clipdrag.i 26 May 2006 03:19:51 -0000 1.19 --- clipdrag.i 7 Dec 2006 06:32:42 -0000 1.20 *************** *** 35,39 **** %endclass ! %endif wxLUA_USE_wxClipboard //----------------------------------------------------------------------------- --- 35,39 ---- %endclass ! %endif //wxLUA_USE_wxClipboard //----------------------------------------------------------------------------- *************** *** 63,68 **** wxDF_LOCALE wxDF_PRIVATE ! %wxchkver23 wxDF_HTML ! %wxchkver23 wxDF_MAX %endenum --- 63,68 ---- wxDF_LOCALE wxDF_PRIVATE ! wxDF_HTML ! wxDF_MAX %endenum *************** *** 183,187 **** //%endclass ! %endif wxLUA_USE_wxDataObject //----------------------------------------------------------------------------- --- 183,187 ---- //%endclass ! %endif //wxLUA_USE_wxDataObject //----------------------------------------------------------------------------- *************** *** 192,196 **** %include "wx/dnd.h" - %if %wxchkver23 %enum wxDrag_CopyOnly --- 192,195 ---- *************** *** 198,202 **** wxDrag_DefaultMove %endenum - %endif %enum wxDragResult --- 197,200 ---- *************** *** 272,276 **** %endclass ! %endif wxLUA_USE_wxDragDrop //----------------------------------------------------------------------------- --- 270,274 ---- %endclass ! %endif //wxLUA_USE_wxDragDrop //----------------------------------------------------------------------------- *************** *** 303,305 **** %endif ! %endif wxLUA_USE_wxMetafile --- 301,303 ---- %endif ! %endif //wxLUA_USE_wxMetafile Index: data.i =================================================================== RCS file: /cvsroot/wxlua/wxLua/bindings/wxwidgets/data.i,v retrieving revision 1.18 retrieving revision 1.19 diff -C2 -d -r1.18 -r1.19 *** data.i 26 May 2006 20:22:09 -0000 1.18 --- data.i 7 Dec 2006 06:32:42 -0000 1.19 *************** *** 69,73 **** %endclass ! %endif wxLUA_USE_wxObject //----------------------------------------------------------------------------- --- 69,73 ---- %endclass ! %endif //wxLUA_USE_wxObject //----------------------------------------------------------------------------- *************** *** 96,100 **** %endclass ! %endif wxLUA_USE_wxClassInfo //----------------------------------------------------------------------------- --- 96,100 ---- %endclass ! %endif //wxLUA_USE_wxClassInfo //----------------------------------------------------------------------------- *************** *** 118,122 **** %endclass ! %endif wxLUA_USE_wxValidator //----------------------------------------------------------------------------- --- 118,122 ---- %endclass ! %endif //wxLUA_USE_wxValidator //----------------------------------------------------------------------------- *************** *** 160,164 **** %endclass ! %endif wxLUA_USE_wxTextValidator //----------------------------------------------------------------------------- --- 160,164 ---- %endclass ! %endif //wxLUA_USE_wxTextValidator //----------------------------------------------------------------------------- *************** *** 180,184 **** %endclass ! %endif wxLUA_USE_wxGenericValidator //----------------------------------------------------------------------------- --- 180,184 ---- %endclass ! %endif //wxLUA_USE_wxGenericValidator //----------------------------------------------------------------------------- *************** *** 241,245 **** %endclass ! %endif wxLUA_USE_wxList //----------------------------------------------------------------------------- --- 241,245 ---- %endclass ! %endif //wxLUA_USE_wxList //----------------------------------------------------------------------------- *************** *** 291,295 **** %endclass ! %endif wxLUA_USE_wxArrayInt //----------------------------------------------------------------------------- --- 291,295 ---- %endclass ! %endif //wxLUA_USE_wxArrayInt //----------------------------------------------------------------------------- *************** *** 324,328 **** %endclass ! %endif wxLUA_USE_wxArrayString //----------------------------------------------------------------------------- --- 324,328 ---- %endclass ! %endif //wxLUA_USE_wxArrayString //----------------------------------------------------------------------------- *************** *** 354,358 **** //%class %noclassinfo wxHashTable, wxObject ! // %wxchkver22&!%wxchkver25 wxHashTable(unsigned int key_type, int size = 1000) // %wxchkver25 wxHashTable(wxKeyType key_type, int size = 1000) // void BeginFind() --- 354,358 ---- //%class %noclassinfo wxHashTable, wxObject ! // !%wxchkver25 wxHashTable(unsigned int key_type, int size = 1000) // %wxchkver25 wxHashTable(wxKeyType key_type, int size = 1000) // void BeginFind() *************** *** 363,367 **** // %rename GetStringKey wxObject * Get(const wxString &key) // long MakeKey(const wxString& string) ! // %wxchkver22&!%wxchkver25 wxNode * Next() // %wxchkver25 wxHashTable::Node * Next() // %rename PutNumKey void Put(long key, wxObject *object) --- 363,367 ---- // %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) Index: wx_datatypes.lua =================================================================== RCS file: /cvsroot/wxlua/wxLua/bindings/wxwidgets/wx_datatypes.lua,v retrieving revision 1.40 retrieving revision 1.41 diff -C2 -d -r1.40 -r1.41 *** wx_datatypes.lua 22 Nov 2006 06:08:32 -0000 1.40 --- wx_datatypes.lua 7 Dec 2006 06:32:42 -0000 1.41 *************** *** 169,172 **** --- 169,178 ---- Name = "wxANIHandler", }, + wxAboutDialogInfo = { + Condition = "wxCHECK_VERSION(2,8,0) && wxUSE_ABOUTDLG && wxLUA_USE_wxAboutDialog", + DefType = "class", + Intrinsic = false, + Name = "wxAboutDialogInfo", + }, wxAcceleratorEntry = { Condition = "wxLUA_USE_wxAcceleratorTable", *************** *** 307,311 **** }, wxBorder = { - Condition = "wxCHECK_VERSION(2,3,0)", DefType = "enum", Intrinsic = true, --- 313,316 ---- *************** *** 444,448 **** wxCheckListBox = { BaseClass = "wxListBox", ! Condition = "(wxLUA_USE_wxCheckListBox) && (wxLUA_USE_wxListBox)", DefType = "class", Intrinsic = false, --- 449,453 ---- wxCheckListBox = { BaseClass = "wxListBox", ! Condition = "(wxUSE_CHECKLISTBOX && wxLUA_USE_wxCheckListBox) && (wxUSE_LISTBOX && wxLUA_USE_wxListBox)", DefType = "class", Intrinsic = false, *************** *** 516,520 **** wxColourData = { BaseClass = "wxObject", ! Condition = "wxLUA_USE_wxColourDialog", DefType = "class", Intrinsic = false, --- 521,525 ---- wxColourData = { BaseClass = "wxObject", ! Condition = "wxUSE_COLOURDLG && wxLUA_USE_wxColourDialog", DefType = "class", Intrinsic = false, *************** *** 529,533 **** wxColourDialog = { BaseClass = "wxDialog", ! Condition = "wxLUA_USE_wxColourDialog", DefType = "class", Intrinsic = false, --- 534,538 ---- wxColourDialog = { BaseClass = "wxDialog", ! Condition = "wxUSE_COLOURDLG && wxLUA_USE_wxColourDialog", DefType = "class", Intrinsic = false, *************** *** 536,540 **** wxComboBox = { BaseClass = "wxControlWithItems", ! Condition = "wxLUA_USE_wxComboBox", DefType = "class", Intrinsic = false, --- 541,545 ---- wxComboBox = { BaseClass = "wxControlWithItems", ! Condition = "wxUSE_COMBOBOX && wxLUA_USE_wxComboBox", DefType = "class", Intrinsic = false, *************** *** 973,977 **** wxFindDialogEvent = { BaseClass = "wxCommandEvent", ! Condition = "wxLUA_USE_wxFindReplaceDialog", DefType = "class", Intrinsic = false, --- 978,982 ---- wxFindDialogEvent = { BaseClass = "wxCommandEvent", ! Condition = "wxUSE_FINDREPLDLG && wxLUA_USE_wxFindReplaceDialog", DefType = "class", Intrinsic = false, *************** *** 979,983 **** }, wxFindReplaceData = { ! Condition = "wxLUA_USE_wxFindReplaceDialog", DefType = "class", Intrinsic = false, --- 984,988 ---- }, wxFindReplaceData = { ! Condition = "wxUSE_FINDREPLDLG && wxLUA_USE_wxFindReplaceDialog", DefType = "class", Intrinsic = false, *************** *** 986,990 **** wxFindReplaceDialog = { BaseClass = "wxDialog", ! Condition = "wxLUA_USE_wxFindReplaceDialog", DefType = "class", Intrinsic = false, --- 991,995 ---- wxFindReplaceDialog = { BaseClass = "wxDialog", ! Condition = "wxUSE_FINDREPLDLG && wxLUA_USE_wxFindReplaceDialog", DefType = "class", Intrinsic = false, *************** *** 992,996 **** }, wxFindReplaceDialogStyles = { ! Condition = "wxLUA_USE_wxFindReplaceDialog", DefType = "enum", Intrinsic = true, --- 997,1001 ---- }, wxFindReplaceDialogStyles = { ! Condition = "wxUSE_FINDREPLDLG && wxLUA_USE_wxFindReplaceDialog", DefType = "enum", Intrinsic = true, *************** *** 998,1002 **** }, wxFindReplaceFlags = { ! Condition = "wxLUA_USE_wxFindReplaceDialog", DefType = "enum", Intrinsic = true, --- 1003,1007 ---- }, wxFindReplaceFlags = { ! Condition = "wxUSE_FINDREPLDLG && wxLUA_USE_wxFindReplaceDialog", DefType = "enum", Intrinsic = true, *************** *** 1040,1044 **** }, wxFontData = { ! Condition = "wxLUA_USE_wxFontDialog", DefType = "class", Intrinsic = false, --- 1045,1049 ---- }, wxFontData = { ! Condition = "wxUSE_FONTDLG && wxLUA_USE_wxFontDialog", DefType = "class", Intrinsic = false, *************** *** 1047,1051 **** wxFontDialog = { BaseClass = "wxDialog", ! Condition = "wxLUA_USE_wxFontDialog", DefType = "class", Intrinsic = false, --- 1052,1056 ---- wxFontDialog = { BaseClass = "wxDialog", ! Condition = "wxUSE_FONTDLG && wxLUA_USE_wxFontDialog", DefType = "class", Intrinsic = false, *************** *** 1162,1166 **** wxGauge = { BaseClass = "wxControl", ! Condition = "wxLUA_USE_wxGauge", DefType = "class", Intrinsic = false, --- 1167,1171 ---- wxGauge = { BaseClass = "wxControl", ! Condition = "wxUSE_GAUGE && wxLUA_USE_wxGauge", DefType = "class", Intrinsic = false, *************** *** 1348,1352 **** wxGridEditorCreatedEvent = { BaseClass = "wxCommandEvent", ! Condition = "(wxCHECK_VERSION(2,3,0)) && (wxLUA_USE_wxGrid)", DefType = "class", Intrinsic = false, --- 1353,1357 ---- wxGridEditorCreatedEvent = { BaseClass = "wxCommandEvent", ! Condition = "wxLUA_USE_wxGrid", DefType = "class", Intrinsic = false, *************** *** 1423,1427 **** wxHelpEvent = { BaseClass = "wxCommandEvent", - Condition = "wxCHECK_VERSION(2,3,0)", DefType = "class", Intrinsic = false, --- 1428,1431 ---- *************** *** 1737,1741 **** wxListBox = { BaseClass = "wxControlWithItems", ! Condition = "wxLUA_USE_wxListBox", DefType = "class", Intrinsic = false, --- 1741,1745 ---- wxListBox = { BaseClass = "wxControlWithItems", ! Condition = "wxUSE_LISTBOX && wxLUA_USE_wxListBox", DefType = "class", Intrinsic = false, *************** *** 1743,1747 **** }, wxListColumnFormat = { ! Condition = "wxLUA_USE_wxListCtrl", DefType = "enum", Intrinsic = true, --- 1747,1751 ---- }, wxListColumnFormat = { ! Condition = "wxUSE_LISTCTRL && wxLUA_USE_wxListCtrl", DefType = "enum", Intrinsic = true, *************** *** 1750,1754 **** wxListCtrl = { BaseClass = "wxControl", ! Condition = "wxLUA_USE_wxListCtrl", DefType = "class", Intrinsic = false, --- 1754,1758 ---- wxListCtrl = { BaseClass = "wxControl", ! Condition = "wxUSE_LISTCTRL && wxLUA_USE_wxListCtrl", DefType = "class", Intrinsic = false, *************** *** 1757,1761 **** wxListEvent = { BaseClass = "wxNotifyEvent", ! Condition = "wxLUA_USE_wxListCtrl", DefType = "class", Intrinsic = false, --- 1761,1765 ---- wxListEvent = { BaseClass = "wxNotifyEvent", ! Condition = "wxUSE_LISTCTRL && wxLUA_USE_wxListCtrl", DefType = "class", Intrinsic = false, *************** *** 1764,1768 **** wxListItem = { BaseClass = "wxObject", ! Condition = "wxLUA_USE_wxListCtrl", DefType = "class", Intrinsic = false, --- 1768,1772 ---- wxListItem = { BaseClass = "wxObject", ! Condition = "wxUSE_LISTCTRL && wxLUA_USE_wxListCtrl", DefType = "class", Intrinsic = false, *************** *** 1770,1774 **** }, wxListItemAttr = { ! Condition = "wxLUA_USE_wxListCtrl", DefType = "class", Intrinsic = false, --- 1774,1778 ---- }, wxListItemAttr = { ! Condition = "wxUSE_LISTCTRL && wxLUA_USE_wxListCtrl", DefType = "class", Intrinsic = false, *************** *** 1777,1781 **** wxListView = { BaseClass = "wxListCtrl", ! Condition = "wxLUA_USE_wxListCtrl", DefType = "class", Intrinsic = false, --- 1781,1785 ---- wxListView = { BaseClass = "wxListCtrl", ! Condition = "wxUSE_LISTCTRL && wxLUA_USE_wxListCtrl", DefType = "class", Intrinsic = false, *************** *** 1796,1805 **** Name = "wxListbookEvent", }, - wxLog = { - Condition = "(wxCHECK_VERSION(2,2,0) && !wxCHECK_VERSION(2,5,0) || (defined(WXWIN_COMPATIBILITY_2_4) && WXWIN_COMPATIBILITY_2_4)) && (wxUSE_LOG) && (wxLUA_USE_wxApp)", - DefType = "class", - Intrinsic = false, - Name = "wxLog", - }, wxLuaHtmlWinTagEvent = { BaseClass = "wxEvent", --- 1800,1803 ---- *************** *** 2015,2019 **** wxMultiChoiceDialog = { BaseClass = "wxDialog", ! Condition = "wxLUA_USE_wxMultiChoiceDialog", DefType = "class", Intrinsic = false, --- 2013,2017 ---- wxMultiChoiceDialog = { BaseClass = "wxDialog", ! Condition = "wxUSE_CHOICEDLG && wxLUA_USE_wxMultiChoiceDialog", DefType = "class", Intrinsic = false, *************** *** 2152,2156 **** wxPasswordEntryDialog = { BaseClass = "wxTextEntryDialog", ! Condition = "wxLUA_USE_wxTextEntryDialog", DefType = "class", Intrinsic = false, --- 2150,2154 ---- wxPasswordEntryDialog = { BaseClass = "wxTextEntryDialog", ! Condition = "wxUSE_TEXTDLG && wxLUA_USE_wxTextEntryDialog", DefType = "class", Intrinsic = false, *************** *** 2317,2321 **** wxProgressDialog = { BaseClass = "wxDialog", ! Condition = "wxLUA_USE_wxProgressDialog", DefType = "class", Intrinsic = false, --- 2315,2319 ---- wxProgressDialog = { BaseClass = "wxDialog", ! Condition = "wxUSE_PROGRESSDLG && wxLUA_USE_wxProgressDialog", DefType = "class", Intrinsic = false, *************** *** 2344,2348 **** wxRadioBox = { BaseClass = "wxControl", ! Condition = "wxLUA_USE_wxRadioBox", DefType = "class", Intrinsic = false, --- 2342,2346 ---- wxRadioBox = { BaseClass = "wxControl", ! Condition = "wxUSE_RADIOBOX && wxLUA_USE_wxRadioBox", DefType = "class", Intrinsic = false, *************** *** 2351,2355 **** wxRadioButton = { BaseClass = "wxControl", ! Condition = "wxLUA_USE_wxRadioButton", DefType = "class", Intrinsic = false, --- 2349,2353 ---- wxRadioButton = { BaseClass = "wxControl", ! Condition = "wxUSE_RADIOBTN && wxLUA_USE_wxRadioButton", DefType = "class", Intrinsic = false, *************** *** 2492,2496 **** wxSingleChoiceDialog = { BaseClass = "wxDialog", ! Condition = "wxLUA_USE_wxSingleChoiceDialog", DefType = "class", Intrinsic = false, --- 2490,2494 ---- wxSingleChoiceDialog = { BaseClass = "wxDialog", ! Condition = "wxUSE_CHOICEDLG && wxLUA_USE_wxSingleChoiceDialog", DefType = "class", Intrinsic = false, *************** *** 2739,2743 **** }, wxSystemFeature = { ! Condition = "(wxCHECK_VERSION(2,3,0)) && (wxLUA_USE_wxSystemSettings)", DefType = "enum", Intrinsic = true, --- 2737,2741 ---- }, wxSystemFeature = { ! Condition = "wxLUA_USE_wxSystemSettings", DefType = "enum", Intrinsic = true, *************** *** 2764,2768 **** }, wxSystemScreenType = { ! Condition = "(wxCHECK_VERSION(2,3,0)) && (wxLUA_USE_wxSystemSettings)", DefType = "enum", Intrinsic = true, --- 2762,2766 ---- }, wxSystemScreenType = { ! Condition = "wxLUA_USE_wxSystemSettings", DefType = "enum", Intrinsic = true, *************** *** 2849,2853 **** wxTextEntryDialog = { BaseClass = "wxDialog", ! Condition = "wxLUA_USE_wxTextEntryDialog", DefType = "class", Intrinsic = false, --- 2847,2851 ---- wxTextEntryDialog = { BaseClass = "wxDialog", ! Condition = "wxUSE_TEXTDLG && wxLUA_USE_wxTextEntryDialog", DefType = "class", Intrinsic = false, *************** *** 2904,2908 **** wxToolBarSimple = { BaseClass = "wxToolBarBase", ! Condition = "(wxCHECK_VERSION(2,2,0) && !wxCHECK_VERSION(2,5,0)) && (wxLUA_USE_wxToolbar)", DefType = "class", Intrinsic = false, --- 2902,2906 ---- wxToolBarSimple = { BaseClass = "wxToolBarBase", ! Condition = "(!wxCHECK_VERSION(2,5,0)) && (wxLUA_USE_wxToolbar)", DefType = "class", Intrinsic = false, *************** *** 3148,3152 **** wxWizard = { BaseClass = "wxDialog", ! Condition = "wxLUA_USE_wxWizard", DefType = "class", Intrinsic = false, --- 3146,3150 ---- wxWizard = { BaseClass = "wxDialog", ! Condition = "wxUSE_WIZARDDLG && wxLUA_USE_wxWizard", DefType = "class", Intrinsic = false, *************** *** 3155,3159 **** wxWizardEvent = { BaseClass = "wxNotifyEvent", ! Condition = "wxLUA_USE_wxWizard", DefType = "class", Intrinsic = false, --- 3153,3157 ---- wxWizardEvent = { BaseClass = "wxNotifyEvent", ! Condition = "wxUSE_WIZARDDLG && wxLUA_USE_wxWizard", DefType = "class", Intrinsic = false, *************** *** 3162,3166 **** wxWizardPage = { BaseClass = "wxPanel", ! Condition = "wxLUA_USE_wxWizard", DefType = "class", Intrinsic = false, --- 3160,3164 ---- wxWizardPage = { BaseClass = "wxPanel", ! Condition = "wxUSE_WIZARDDLG && wxLUA_USE_wxWizard", DefType = "class", Intrinsic = false, *************** *** 3169,3173 **** wxWizardPageSimple = { BaseClass = "wxWizardPage", ! Condition = "wxLUA_USE_wxWizard", DefType = "class", Intrinsic = false, --- 3167,3171 ---- wxWizardPageSimple = { BaseClass = "wxWizardPage", ! Condition = "wxUSE_WIZARDDLG && wxLUA_USE_wxWizard", DefType = "class", Intrinsic = false, *************** *** 3291,3296 **** ["%wxchkver272"] = "wxCHECK_VERSION(2,7,2)", ["%wxchkver28"] = "wxCHECK_VERSION(2,8,0)", ! ["%wxchkver_2_2"] = "wxCHECK_VERSION(2,2,0)", ! ["%wxchkver_2_5"] = "wxCHECK_VERSION(2,5,0)", ["%wxcompat20"] = "(defined(WXWIN_COMPATIBILITY_2) && WXWIN_COMPATIBILITY_2)", ["%wxcompat22"] = "(defined(WXWIN_COMPATIBILITY_2_2) && WXWIN_COMPATIBILITY_2_2)", --- 3289,3293 ---- ["%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)", *************** *** 3307,3310 **** --- 3304,3308 ---- wxLUA_USE_Geometry = "wxLUA_USE_Geometry", wxLUA_USE_MDI = "wxLUA_USE_MDI", + wxLUA_USE_wxAboutDialog = "wxLUA_USE_wxAboutDialog", wxLUA_USE_wxAcceleratorTable = "wxLUA_USE_wxAcceleratorTable", wxLUA_USE_wxApp = "wxLUA_USE_wxApp", *************** *** 3429,3432 **** --- 3427,3431 ---- wxLUA_USE_wxWizard = "wxLUA_USE_wxWizard", wxLUA_USE_wxXMLResource = "wxLUA_USE_wxXMLResource", + wxUSE_ABOUTDLG = "wxUSE_ABOUTDLG", wxUSE_ACCEL = "wxUSE_ACCEL", wxUSE_ACCESSIBILITY = "wxUSE_ACCESSIBILITY", Index: print.i =================================================================== RCS file: /cvsroot/wxlua/wxLua/bindings/wxwidgets/print.i,v retrieving revision 1.10 retrieving revision 1.11 diff -C2 -d -r1.10 -r1.11 *** print.i 17 May 2006 05:02:04 -0000 1.10 --- print.i 7 Dec 2006 06:32:42 -0000 1.11 *************** *** 64,72 **** bool Print(wxWindow *parent, wxLuaPrintout *printout, bool prompt=true) wxDC* PrintDialog(wxWindow *parent) ! %wxchkver23 void ReportError(wxWindow *parent, wxLuaPrintout *printout, const wxString& message) bool Setup(wxWindow *parent) %endclass ! %endif wxLUA_USE_wxLuaPrintout //----------------------------------------------------------------------------- --- 64,72 ---- bool Print(wxWindow *parent, wxLuaPrintout *printout, bool prompt=true) wxDC* PrintDialog(wxWindow *parent) ! void ReportError(wxWindow *parent, wxLuaPrintout *printout, const wxString& message) bool Setup(wxWindow *parent) %endclass ! %endif //wxLUA_USE_wxLuaPrintout //----------------------------------------------------------------------------- *************** *** 543,547 **** %endclass ! %endif wxLUA_USE_wxLuaPrintout //----------------------------------------------------------------------------- --- 543,547 ---- %endclass ! %endif //wxLUA_USE_wxLuaPrintout //----------------------------------------------------------------------------- *************** *** 573,576 **** %endif // %msw|%mac ! %endif wxLUA_USE_wxPrint --- 573,576 ---- %endif // %msw|%mac ! %endif //wxLUA_USE_wxPrint Index: file.i =================================================================== RCS file: /cvsroot/wxlua/wxLua/bindings/wxwidgets/file.i,v retrieving revision 1.12 retrieving revision 1.13 diff -C2 -d -r1.12 -r1.13 *** file.i 18 May 2006 05:47:39 -0000 1.12 --- file.i 7 Dec 2006 06:32:42 -0000 1.13 *************** *** 181,185 **** %endclass ! %endif wxLUA_USE_wxFileName //----------------------------------------------------------------------------- --- 181,185 ---- %endclass ! %endif //wxLUA_USE_wxFileName //----------------------------------------------------------------------------- *************** *** 251,255 **** %endclass ! %endif wxLUA_USE_wxFile //----------------------------------------------------------------------------- --- 251,255 ---- %endclass ! %endif //wxLUA_USE_wxFile //----------------------------------------------------------------------------- *************** *** 272,276 **** static bool Exists(const wxString& dir) // %override [unsigned int, lua string table] wxDir::GetAllFiles(const wxString& dirname, const wxString& filespec = "", int flags = wxDIR_DEFAULT) ! %wxchkver23 static unsigned int GetAllFiles(const wxString& dirname, wxArrayString *files, const wxString& filespec = "", int flags = wxDIR_DEFAULT) // %override [bool, string filename] wxDir::GetFirst(const wxString& filespec = "", int flags = wxDIR_DEFAULT) bool GetFirst(wxString * filename, const wxString& filespec = "", int flags = wxDIR_DEFAULT) const --- 272,276 ---- static bool Exists(const wxString& dir) // %override [unsigned int, lua string table] wxDir::GetAllFiles(const wxString& dirname, const wxString& filespec = "", int flags = wxDIR_DEFAULT) ! static unsigned int GetAllFiles(const wxString& dirname, wxArrayString *files, const wxString& filespec = "", int flags = wxDIR_DEFAULT) // %override [bool, string filename] wxDir::GetFirst(const wxString& filespec = "", int flags = wxDIR_DEFAULT) bool GetFirst(wxString * filename, const wxString& filespec = "", int flags = wxDIR_DEFAULT) const *************** *** 284,288 **** %endclass ! %endif wxLUA_USE_wxDir //----------------------------------------------------------------------------- --- 284,288 ---- %endclass ! %endif //wxLUA_USE_wxDir //----------------------------------------------------------------------------- Index: regex.i =================================================================== RCS file: /cvsroot/wxlua/wxLua/bindings/wxwidgets/regex.i,v retrieving revision 1.4 retrieving revision 1.5 diff -C2 -d -r1.4 -r1.5 *** regex.i 17 May 2006 05:02:04 -0000 1.4 --- regex.i 7 Dec 2006 06:32:42 -0000 1.5 *************** *** 49,52 **** %endclass ! %endif wxLUA_USE_wxRegEx --- 49,52 ---- %endclass ! %endif //wxLUA_USE_wxRegEx Index: dialogs.i =================================================================== RCS file: /cvsroot/wxlua/wxLua/bindings/wxwidgets/dialogs.i,v retrieving revision 1.20 retrieving revision 1.21 diff -C2 -d -r1.20 -r1.21 *** dialogs.i 6 Nov 2006 06:11:43 -0000 1.20 --- dialogs.i 7 Dec 2006 06:32:42 -0000 1.21 *************** *** 26,30 **** wxFILE_MUST_EXIST wxMULTIPLE ! %wxchkver23 wxCHANGE_DIR %endenum --- 26,30 ---- wxFILE_MUST_EXIST wxMULTIPLE ! wxCHANGE_DIR %endenum *************** *** 39,55 **** %function wxString wxFileSelector(const wxString& message, const wxString& default_path = "", const wxString& default_filename = "", const wxString& default_extension = "", const wxString& wildcard = "*.*", int flags = 0, wxWindow *parent = NULL, int x = -1, int y = -1) %function void wxEndBusyCursor() ! %function wxColour wxGetColourFromUser(wxWindow *parent, const wxColour& colInit) ! %function wxFont wxGetFontFromUser(wxWindow *parent, const wxFont& fontInit) // %override [int, lua int table] wxGetMultipleChoices(const wxString& message, const wxString& caption, lua string table, wxWindow *parent = NULL, int x = -1, int y = -1, bool centre = true, int width=150, int height=200) ! %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 ! %function wxString wxGetPasswordFromUser(const wxString& message, const wxString& caption = "Input text", const wxString& default_value = "", wxWindow *parent = NULL) ! %function wxString wxGetTextFromUser(const wxString& message, const wxString& caption = "Input text", const wxString& default_value = "", wxWindow *parent = NULL, int x = -1, int y = -1, bool centre = true) // int wxGetMultipleChoice(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) ! %function wxString wxGetSingleChoice(const wxString& message, const wxString& caption, const wxArrayString_FromLuaTable& choices, wxWindow *parent = NULL, int x = wxDefaultCoord, int y = wxDefaultCoord, bool centre = true, int width = wxCHOICE_WIDTH, int height = wxCHOICE_HEIGHT) ! %function int wxGetSingleChoiceIndex(const wxString& message, const wxString& caption, const wxArrayString_FromLuaTable& choices, wxWindow *parent = NULL, int x = wxDefaultCoord, int y = wxDefaultCoord, bool centre = true, int width = wxCHOICE_WIDTH, int height = wxCHOICE_HEIGHT) %function bool wxIsBusy() %function int wxMessageBox(const wxString& message, const wxString& caption = "Message", int style = wxOK | wxCENTRE, wxWindow *parent = NULL, int x = -1, int y = -1) --- 39,55 ---- %function wxString wxFileSelector(const wxString& message, const wxString& default_path = "", const wxString& default_filename = "", const wxString& default_extension = "", const wxString& wildcard = "*.*", int flags = 0, wxWindow *parent = NULL, int x = -1, int y = -1) %function void wxEndBusyCursor() ! wxUSE_COLOURDLG %function wxColour wxGetColourFromUser(wxWindow *parent, const wxColour& colInit) ! wxUSE_FONTDLG %function wxFont wxGetFontFromUser(wxWindow *parent, const wxFont& fontInit) // %override [int, lua int table] wxGetMultipleChoices(const wxString& message, const wxString& caption, lua string table, wxWindow *parent = NULL, int x = -1, int y = -1, bool centre = true, int width=150, int height=200) ! 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 ! wxUSE_TEXTDLG %function wxString wxGetPasswordFromUser(const wxString& message, const wxString& caption = "Input text", const wxString& default_value = "", wxWindow *parent = NULL) ! wxUSE_TEXTDLG %function wxString wxGetTextFromUser(const wxString& message, const wxString& caption = "Input text", const wxString& default_value = "", wxWindow *parent = NULL, int x = -1, int y = -1, bool centre = true) // int wxGetMultipleChoice(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) ! wxUSE_CHOICEDLG %function wxString wxGetSingleChoice(const wxString& message, const wxString& caption, const wxArrayString_FromLuaTable& choices, wxWindow *parent = NULL, int x = wxDefaultCoord, int y = wxDefaultCoord, bool centre = true, int width = wxCHOICE_WIDTH, int height = wxCHOICE_HEIGHT) ! wxUSE_CHOICEDLG %function int wxGetSingleChoiceIndex(const wxString& message, const wxString& caption, const wxArrayString_FromLuaTable& choices, wxWindow *parent = NULL, int x = wxDefaultCoord, int y = wxDefaultCoord, bool centre = true, int width = wxCHOICE_WIDTH, int height = wxCHOICE_HEIGHT) %function bool wxIsBusy() %function int wxMessageBox(const wxString& message, const wxString& caption = "Message", int style = wxOK | wxCENTRE, wxWindow *parent = NULL, int x = -1, int y = -1) *************** *** 66,71 **** %define wxDIALOG_MODELESS %define wxDEFAULT_DIALOG_STYLE ! %wxchkver23 %define wxDIALOG_NO_PARENT ! %wxchkver23 %define wxDIALOG_EX_CONTEXTHELP // %define wxDIALOG_EX_METAL mac only %define wxCHOICEDLG_STYLE --- 66,71 ---- %define wxDIALOG_MODELESS %define wxDEFAULT_DIALOG_STYLE ! %define wxDIALOG_NO_PARENT ! %define wxDIALOG_EX_CONTEXTHELP // %define wxDIALOG_EX_METAL mac only %define wxCHOICEDLG_STYLE *************** *** 87,91 **** //bool IsIconized() const - in wxToplevelWindow bool IsModal() const ! //%wxchkver23 void SetIcon(const wxIcon& icon) - in wxToplevelWindow // void SetModal(const bool flag) - deprecated void SetReturnCode(int retCode) --- 87,91 ---- //bool IsIconized() const - in wxToplevelWindow bool IsModal() const ! // void SetIcon(const wxIcon& icon) - in wxToplevelWindow // void SetModal(const bool flag) - deprecated void SetReturnCode(int retCode) *************** *** 100,106 **** //----------------------------------------------------------------------------- // wxColourDialog ! %if wxLUA_USE_wxColourDialog %include "wx/colordlg.h" --- 100,176 ---- //----------------------------------------------------------------------------- + // wxAboutDialog + + %if %wxchkver_2_8 & wxUSE_ABOUTDLG & wxLUA_USE_wxAboutDialog + + %include "wx/aboutdlg.h" + + %class %noclassinfo %encapsulate %delete wxAboutDialogInfo + wxAboutDialogInfo() + + void SetName(const wxString& name) + wxString GetName() const + + void SetVersion(const wxString& version) + bool HasVersion() const + wxString GetVersion() const + + void SetDescription(const wxString& desc) + bool HasDescription() const + wxString GetDescription() const + + void SetCopyright(const wxString& copyright) + bool HasCopyright() const + wxString GetCopyright() const + + void SetLicence(const wxString& licence) + void SetLicense(const wxString& licence) + bool HasLicence() const + wxString GetLicence() const + + void SetIcon(const wxIcon& icon) + bool HasIcon() const + wxIcon GetIcon() const + + void SetWebSite(const wxString& url, const wxString& desc = wxEmptyString) + bool HasWebSite() const + + wxString GetWebSiteURL() const + wxString GetWebSiteDescription() const + + void SetDevelopers(const wxArrayString_FromLuaTable& developers) + void AddDeveloper(const wxString& developer) + bool HasDevelopers() const + const wxArrayString& GetDevelopers() const + + void SetDocWriters(const wxArrayString_FromLuaTable& docwriters) + void AddDocWriter(const wxString& docwriter) + bool HasDocWriters() const + wxArrayString GetDocWriters() const + + void SetArtists(const wxArrayString_FromLuaTable& artists) + void AddArtist(const wxString& artist) + bool HasArtists() const + wxArrayString GetArtists() const + + void SetTranslators(const wxArrayString_FromLuaTable& translators) + void AddTranslator(const wxString& translator) + bool HasTranslators() const + wxArrayString GetTranslators() const + + // implementation only + // ------------------- + //bool IsSimple() const + //wxString GetDescriptionAndCredits() const + %endclass + + %function void wxAboutBox(const wxAboutDialogInfo& info) + + %endif //%wxchkver_2_8 & wxUSE_ABOUTDLG & wxLUA_USE_wxAboutDialog + + //----------------------------------------------------------------------------- // wxColourDialog ! %if wxUSE_COLOURDLG & wxLUA_USE_wxColourDialog %include "wx/colordlg.h" *************** *** 177,181 **** %endclass ! %endif wxLUA_USE_wxFileDialog //----------------------------------------------------------------------------- --- 247,251 ---- %endclass ! %endif //wxLUA_USE_wxFileDialog //----------------------------------------------------------------------------- *************** *** 203,207 **** %endclass ! %endif wxLUA_USE_wxDirDialog //----------------------------------------------------------------------------- --- 273,277 ---- %endclass ! %endif //wxLUA_USE_wxDirDialog //----------------------------------------------------------------------------- *************** *** 219,228 **** %endclass ! %endif wxLUA_USE_wxMessageDialog //----------------------------------------------------------------------------- // wxMultiChoiceDialog - use wxGetMultipleChoices ! %if wxLUA_USE_wxMultiChoiceDialog %class wxMultiChoiceDialog, wxDialog --- 289,298 ---- %endclass ! %endif //wxLUA_USE_wxMessageDialog //----------------------------------------------------------------------------- // wxMultiChoiceDialog - use wxGetMultipleChoices ! %if wxUSE_CHOICEDLG & wxLUA_USE_wxMultiChoiceDialog %class wxMultiChoiceDialog, wxDialog *************** *** 234,243 **** %endclass ! %endif wxLUA_USE_wxMultiChoiceDialog //----------------------------------------------------------------------------- // wxSingleChoiceDialog - use wxGetSingleChoice or wxGetSingleChoiceIndex ! %if wxLUA_USE_wxSingleChoiceDialog %class wxSingleChoiceDialog, wxDialog --- 304,313 ---- %endclass ! %endif //wxUSE_CHOICEDLG & wxLUA_USE_wxMultiChoiceDialog //----------------------------------------------------------------------------- // wxSingleChoiceDialog - use wxGetSingleChoice or wxGetSingleChoiceIndex ! %if wxUSE_CHOICEDLG & wxLUA_USE_wxSingleChoiceDialog %class wxSingleChoiceDialog, wxDialog *************** *** 254,263 **** %endclass ! %endif wxLUA_USE_wxSingleChoiceDialog //----------------------------------------------------------------------------- // wxTextEntryDialog - see also wxGetTextFromUser ! %if wxLUA_USE_wxTextEntryDialog %define wxTextEntryDialogStyle --- 324,333 ---- %endclass ! %endif //wxUSE_CHOICEDLG & wxLUA_USE_wxSingleChoiceDialog //----------------------------------------------------------------------------- // wxTextEntryDialog - see also wxGetTextFromUser ! %if wxUSE_TEXTDLG & wxLUA_USE_wxTextEntryDialog %define wxTextEntryDialogStyle *************** *** 281,290 **** %endclass ! %endif wxLUA_USE_wxTextEntryDialog //----------------------------------------------------------------------------- // wxFontDialog ! %if wxLUA_USE_wxFontDialog %include "wx/fontdlg.h" --- 351,360 ---- %endclass ! %endif //wxUSE_TEXTDLG & wxLUA_USE_wxTextEntryDialog //----------------------------------------------------------------------------- // wxFontDialog ! %if wxUSE_FONTDLG & wxLUA_USE_wxFontDialog %include "wx/fontdlg.h" *************** *** 328,337 **** %endclass ! %endif wxLUA_USE_wxFontDialog //----------------------------------------------------------------------------- // wxFindReplaceDialog ! %if wxLUA_USE_wxFindReplaceDialog %include "wx/fdrepdlg.h" --- 398,407 ---- %endclass ! %endif //wxUSE_FONTDLG & wxLUA_USE_wxFontDialog //----------------------------------------------------------------------------- // wxFindReplaceDialog ! %if wxUSE_FINDREPLDLG & wxLUA_USE_wxFindReplaceDialog %include "wx/fdrepdlg.h" *************** *** 404,413 **** %endclass ! %endif wxLUA_USE_wxFindReplaceDialog //----------------------------------------------------------------------------- // wxProgressDialog ! %if wxLUA_USE_wxProgressDialog %include "wx/generic/progdlgg.h" --- 474,483 ---- %endclass ! %endif //wxUSE_FINDREPLDLG & wxLUA_USE_wxFindReplaceDialog //----------------------------------------------------------------------------- // wxProgressDialog ! %if wxUSE_PROGRESSDLG & wxLUA_USE_wxProgressDialog %include "wx/generic/progdlgg.h" *************** *** 430,434 **** %endclass ! %endif wxLUA_USE_wxProgressDialog //----------------------------------------------------------------------------- --- 500,504 ---- %endclass ! %endif //wxUSE_PROGRESSDLG & wxLUA_USE_wxProgressDialog //----------------------------------------------------------------------------- *************** *** 471,480 **** %endclass ! %endif wxLUA_USE_wxSplashScreen //----------------------------------------------------------------------------- // wxWizard ! %if wxLUA_USE_wxWizard %include "wx/wizard.h" --- 541,550 ---- %endclass ! %endif //wxLUA_USE_wxSplashScreen //----------------------------------------------------------------------------- // wxWizard ! %if wxUSE_WIZARDDLG & wxLUA_USE_wxWizard %include "wx/wizard.h" *************** *** 540,542 **** %endclass ! %endif wxLUA_USE_wxWizard --- 610,612 ---- %endclass ! %endif //wxUSE_WIZARDDLG & wxLUA_USE_wxWizard Index: geometry.i =================================================================== RCS file: /cvsroot/wxlua/wxLua/bindings/wxwidgets/geometry.i,v retrieving revision 1.6 retrieving revision 1.7 diff -C2 -d -r1.6 -r1.7 *** geometry.i 17 May 2006 05:02:04 -0000 1.6 --- geometry.i 7 Dec 2006 06:32:42 -0000 1.7 *************** *** 271,273 **** //%endclass ! %endif wxLUA_USE_Geometry --- 271,273 ---- //%endclass ! %endif //wxLUA_USE_Geometry Index: xml.i =================================================================== RCS file: /cvsroot/wxlua/wxLua/bindings/wxwidgets/xml.i,v retrieving revision 1.4 retrieving revision 1.5 diff -C2 -d -r1.4 -r1.5 *** xml.i 17 May 2006 05:02:05 -0000 1.4 --- xml.i 7 Dec 2006 06:32:42 -0000 1.5 *************** *** 9,13 **** %if wxLUA_USE_wxXMLResource ! %wxchkver22&!%wxchkver25 %include "wx/xrc/xml.h" %wxchkver25 %include "wx/xml/xml.h" %include "wx/xrc/xmlres.h" --- 9,13 ---- %if wxLUA_USE_wxXMLResource ! !%wxchkver25 %include "wx/xrc/xml.h" %wxchkver25 %include "wx/xml/xml.h" %include "wx/xrc/xmlres.h" *************** *** 172,174 **** %endclass ! %endif wxLUA_USE_wxXMLResource --- 172,174 ---- %endclass ! %endif //wxLUA_USE_wxXMLResource Index: windows.i =================================================================== RCS file: /cvsroot/wxlua/wxLua/bindings/wxwidgets/windows.i,v retrieving revision 1.23 retrieving revision 1.24 diff -C2 -d -r1.23 -r1.24 *** windows.i 22 Nov 2006 21:13:56 -0000 1.23 --- windows.i 7 Dec 2006 06:32:42 -0000 1.24 *************** *** 309,313 **** %endclass ! %endif wxLUA_USE_wxWindowList //----------------------------------------------------------------------------- --- 309,313 ---- %endclass ! %endif //wxLUA_USE_wxWindowList //----------------------------------------------------------------------------- *************** *** 395,399 **** %endclass ! %endif wxLUA_USE_wxNotebook //----------------------------------------------------------------------------- --- 395,399 ---- %endclass ! %endif //wxLUA_USE_wxNotebook //----------------------------------------------------------------------------- *************** *** 405,411 **** %define wxNB_FIXEDWIDTH ! %wxchkver23 %define wxNB_MULTILINE ! %wxchkver23&(!%wxchkver27|%wxcompat26) %define wxNB_TOP !%wxchkver27|%wxcompat26 %define wxNB_LEFT !%wxchkver27|%wxcompat26 %define wxNB_RIGHT --- 405,411 ---- %define wxNB_FIXEDWIDTH ! %define wxNB_MULTILINE ! !%wxchkver27|%wxcompat26 %define wxNB_TOP // use wxBK_XXX after 2.6 !%wxchkver27|%wxcompat26 %define wxNB_LEFT !%wxchkver27|%wxcompat26 %define wxNB_RIGHT *************** *** 479,483 **** %endclass ! %endif wxLUA_USE_wxNotebook //----------------------------------------------------------------------------- --- 479,483 ---- %endclass ! %endif //wxLUA_USE_wxNotebook //----------------------------------------------------------------------------- *************** *** 522,526 **** %endclass ! %endif wxLUA_USE_wxNotebook & wxLUA_USE_wxListCtrl //----------------------------------------------------------------------------- --- 522,526 ---- %endclass ! %endif //wxLUA_USE_wxNotebook & wxLUA_USE_wxListCtrl //----------------------------------------------------------------------------- *************** *** 565,569 **** %endclass ! %endif wxLUA_USE_wxNotebook & wxLUA_USE_wxChoice //----------------------------------------------------------------------------- --- 565,569 ---- %endclass ! %endif //wxLUA_USE_wxNotebook & wxLUA_USE_wxChoice //----------------------------------------------------------------------------- *************** *** 578,585 **** %define wxTC_RIGHTJUSTIFY %define wxTC_FIXEDWIDTH ! %wxchkver23 %define wxTC_TOP ! %wxchkver23 %define wxTC_LEFT ! %wxchkver23 %define wxTC_RIGHT ! %wxchkver23 %define wxTC_BOTTOM %define wxTC_MULTILINE %define wxTC_OWNERDRAW --- 578,585 ---- %define wxTC_RIGHTJUSTIFY %define wxTC_FIXEDWIDTH ! %define wxTC_TOP ! %define wxTC_LEFT ! %define wxTC_RIGHT ! %define wxTC_BOTTOM %define wxTC_MULTILINE %define wxTC_OWNERDRAW *************** *** 627,631 **** %endif ! %endif wxLUA_USE_wxTabCtrl //----------------------------------------------------------------------------- --- 627,631 ---- %endif ! %endif //wxLUA_USE_wxTabCtrl //----------------------------------------------------------------------------- *************** *** 722,728 **** bool LayoutFrame(wxFrame* frame, wxWindow* mainWindow = NULL) const - %if wxLUA_USE_MDI bool LayoutMDIFrame(wxMDIParentFrame* frame, wxRect* rect = NULL) - %endif wxLUA_USE_MDI bool LayoutWindow(wxWindow* frame, wxWindow* mainWindow = NULL) %endclass --- 722,726 ---- *************** *** 796,800 **** %endclass ! %endif wxLUA_USE_wxSashWindow //----------------------------------------------------------------------------- --- 794,798 ---- %endclass ! %endif //wxLUA_USE_wxSashWindow //----------------------------------------------------------------------------- *************** *** 831,835 **** %endclass ! %endif wxLUA_USE_wxScrolledWindow //----------------------------------------------------------------------------- --- 829,833 ---- %endclass ! %endif //wxLUA_USE_wxScrolledWindow //----------------------------------------------------------------------------- *************** *** 850,854 **** %define wxSP_3D %wxchkver24 %define wxSP_NO_XP_THEME ! %wxchkver23 %define wxSP_SASH_AQUA %class wxSplitterWindow, wxWindow --- 848,852 ---- %define wxSP_3D %wxchkver24 %define wxSP_NO_XP_THEME ! %define wxSP_SASH_AQUA %class wxSplitterWindow, wxWindow *************** *** 906,910 **** %endclass ! %endif wxLUA_USE_wxSplitterWindow //----------------------------------------------------------------------------- --- 904,908 ---- %endclass ! %endif //wxLUA_USE_wxSplitterWindow //----------------------------------------------------------------------------- *************** *** 922,926 **** %endclass ! %endif wxLUA_USE_wxStaticBox //----------------------------------------------------------------------------- --- 920,924 ---- %endclass ! %endif //wxLUA_USE_wxStaticBox //----------------------------------------------------------------------------- *************** *** 942,946 **** %endclass ! %endif wxLUA_USE_wxStaticBitmap //----------------------------------------------------------------------------- --- 940,944 ---- %endclass ! %endif //wxLUA_USE_wxStaticBitmap //----------------------------------------------------------------------------- *************** *** 965,969 **** %endclass ! %endif wxLUA_USE_wxStaticText //----------------------------------------------------------------------------- --- 963,967 ---- %endclass ! %endif //wxLUA_USE_wxStaticText //----------------------------------------------------------------------------- *************** *** 988,990 **** %endclass ! %endif wxLUA_USE_wxStaticLine --- 986,988 ---- %endclass ! %endif //wxLUA_USE_wxStaticLine Index: gdi.i =================================================================== RCS file: /cvsroot/wxlua/wxLua/bindings/wxwidgets/gdi.i,v retrieving revision 1.31 retrieving revision 1.32 diff -C2 -d -r1.31 -r1.32 *** gdi.i 30 Nov 2006 05:56:31 -0000 1.31 --- gdi.i 7 Dec 2006 06:32:42 -0000 1.32 *************** *** 122,126 **** %endclass ! %endif wxLUA_USE_wxPointSizeRect //----------------------------------------------------------------------------- --- 122,126 ---- %endclass ! %endif //wxLUA_USE_wxPointSizeRect //----------------------------------------------------------------------------- *************** *** 206,210 **** %endclass ! %endif wxLUA_USE_wxRegion //----------------------------------------------------------------------------- --- 206,210 ---- %endclass ! %endif //wxLUA_USE_wxRegion //----------------------------------------------------------------------------- *************** *** 243,247 **** wxFONTFAMILY_TELETYPE wxFONTFAMILY_MAX ! %wxchkver23 wxFONTFAMILY_UNKNOWN %endenum --- 243,247 ---- wxFONTFAMILY_TELETYPE wxFONTFAMILY_MAX ! wxFONTFAMILY_UNKNOWN %endenum *************** *** 301,308 **** wxFONTENCODING_CP866 wxFONTENCODING_CP874 ! %wxchkver23 wxFONTENCODING_CP932 ! %wxchkver23 wxFONTENCODING_CP936 ! %wxchkver23 wxFONTENCODING_CP949 ! %wxchkver23 wxFONTENCODING_CP950 wxFONTENCODING_CP1250 wxFONTENCODING_CP1251 --- 301,308 ---- wxFONTENCODING_CP866 wxFONTENCODING_CP874 ! wxFONTENCODING_CP932 ! wxFONTENCODING_CP936 ! wxFONTENCODING_CP949 ! wxFONTENCODING_CP950 wxFONTENCODING_CP1250 wxFONTENCODING_CP1251 *************** *** 314,319 **** wxFONTENCODING_CP1257 wxFONTENCODING_CP12_MAX ! %wxchkver23 wxFONTENCODING_UTF7 ! %wxchkver23 wxFONTENCODING_UTF8 wxFONTENCODING_UNICODE wxFONTENCODING_MAX --- 314,319 ---- wxFONTENCODING_CP1257 wxFONTENCODING_CP12_MAX ! wxFONTENCODING_UTF7 ! wxFONTENCODING_UTF8 wxFONTENCODING_UNICODE wxFONTENCODING_MAX *************** *** 365,369 **** %endclass ! %endif wxLUA_USE_wxFont //----------------------------------------------------------------------------- --- 365,369 ---- %endclass ! %endif //wxLUA_USE_wxFont //----------------------------------------------------------------------------- *************** *** 389,393 **** %endclass ! %endif wxLUA_USE_wxFontEnumerator //----------------------------------------------------------------------------- --- 389,393 ---- %endclass ! %endif //wxLUA_USE_wxFontEnumerator //----------------------------------------------------------------------------- *************** *** 405,409 **** %endclass ! %endif wxLUA_USE_wxFontList //----------------------------------------------------------------------------- --- 405,409 ---- %endclass ! %endif //wxLUA_USE_wxFontList //----------------------------------------------------------------------------- *************** *** 435,439 **** %endclass ! %endif wxLUA_USE_wxFontMapper //----------------------------------------------------------------------------- --- 435,439 ---- %endclass ! %endif //wxLUA_USE_wxFontMapper //----------------------------------------------------------------------------- *************** *** 570,574 **** %endclass ! %endif wxLUA_USE_wxPenList //----------------------------------------------------------------------------- --- 570,574 ---- %endclass ! %endif //wxLUA_USE_wxPenList //----------------------------------------------------------------------------- *************** *** 625,630 **** %endclass ! %endif wxLUA_USE_wxBrushList ! %endif wxLUA_USE_wxColourPenBrush //----------------------------------------------------------------------------- --- 625,630 ---- %endclass ! %endif //wxLUA_USE_wxBrushList ! %endif //wxLUA_USE_wxColourPenBrush //----------------------------------------------------------------------------- *************** *** 649,653 **** %endclass ! %endif wxLUA_USE_wxPalette //----------------------------------------------------------------------------- --- 649,653 ---- %endclass ! %endif //wxLUA_USE_wxPalette //----------------------------------------------------------------------------- *************** *** 682,686 **** %endclass ! %endif wxLUA_USE_wxIcon //----------------------------------------------------------------------------- --- 682,686 ---- %endclass ! %endif //wxLUA_USE_wxIcon //----------------------------------------------------------------------------- *************** *** 707,711 **** %constructor wxBitmapFromFile(const wxString& name, wxBitmapType type = wxBITMAP_TYPE_ANY) %constructor wxBitmapFromXPMData(const char **data) ! %wxchkver23 %constructor wxBitmapFromImage(const wxImage &image, int depth = -1) //%win static void AddHandler(wxBitmapHandler* handler) --- 707,711 ---- %constructor wxBitmapFromFile(const wxString& name, wxBitmapType type = wxBITMAP_TYPE_ANY) %constructor wxBitmapFromXPMData(const char **data) ! %constructor wxBitmapFromImage(const wxImage &image, int depth = -1) //%win static void AddHandler(wxBitmapHandler* handler) *************** *** 719,723 **** int GetDepth() const //%wxchkver25&%win static wxGDIImageHandlerList& GetHandlers() ! //%wxchkver22&!%wxchkver25&%win static wxList& GetHandlers() int GetHeight() const wxPalette* GetPalette() const --- 719,723 ---- int GetDepth() const //%wxchkver25&%win static wxGDIImageHandlerList& GetHandlers() ! //!%wxchkver25&%win static wxList& GetHandlers() int GetHeight() const wxPalette* GetPalette() const *************** *** 745,749 **** %endclass ! %endif wxLUA_USE_wxBitmap //----------------------------------------------------------------------------- --- 745,749 ---- %endclass ! %endif //wxLUA_USE_wxBitmap //----------------------------------------------------------------------------- *************** *** 759,763 **** wxCURSOR_NONE wxCURSOR_ARROW ! %wxchkver23 wxCURSOR_RIGHT_ARROW wxCURSOR_BULLSEYE wxCURSOR_CHAR --- 759,763 ---- wxCURSOR_NONE wxCURSOR_ARROW ! wxCURSOR_RIGHT_ARROW wxCURSOR_BULLSEYE wxCURSOR_CHAR *************** *** 819,823 **** %endclass ! %endif wxLUA_USE_wxCursor //----------------------------------------------------------------------------- --- 819,823 ---- %endclass ! %endif //wxLUA_USE_wxCursor //----------------------------------------------------------------------------- *************** *** 837,841 **** %endclass ! %endif wxLUA_USE_wxMask //----------------------------------------------------------------------------- --- 837,841 ---- %endclass ! %endif //wxLUA_USE_wxMask //----------------------------------------------------------------------------- *************** *** 876,880 **** %endclass ! %endif wxLUA_USE_wxImageList //----------------------------------------------------------------------------- --- 876,880 ---- %endclass ! %endif //wxLUA_USE_wxImageList //----------------------------------------------------------------------------- *************** *** 1153,1157 **** %endclass ! %endif wxLUA_USE_wxDC //----------------------------------------------------------------------------- --- 1153,1157 ---- %endclass ! %endif //wxLUA_USE_wxDC //----------------------------------------------------------------------------- *************** *** 1196,1200 **** %endclass ! %endif wxLUA_USE_wxCaret --- 1196,1200 ---- %endclass ! %endif //wxLUA_USE_wxCaret *************** *** 1246,1250 **** %endclass ! %endif wxLUA_USE_wxGLCanvas & wxUSE_GLCANVAS //----------------------------------------------------------------------------- --- 1246,1250 ---- %endclass ! %endif //wxLUA_USE_wxGLCanvas & wxUSE_GLCANVAS //----------------------------------------------------------------------------- *************** *** 1310,1312 **** %endclass ! %endif wxLUA_USE_wxDisplay & wxUSE_DISPLAY --- 1310,1312 ---- %endclass ! %endif //wxLUA_USE_wxDisplay & wxUSE_DISPLAY Index: html.i =================================================================== RCS file: /cvsroot/wxlu... [truncated message content] |
