Menu
▾
▴
wxlua-commit — CVS commits of wxLua
You can subscribe to this list here.
| 2005 |
Jan
|
Feb
|
Mar
|
Apr
|
May
|
Jun
(191) |
Jul
(1) |
Aug
(2) |
Sep
|
Oct
|
Nov
(238) |
Dec
(68) |
|---|---|---|---|---|---|---|---|---|---|---|---|---|
| 2006 |
Jan
(104) |
Feb
(518) |
Mar
(302) |
Apr
(211) |
May
(311) |
Jun
(55) |
Jul
(6) |
Aug
(35) |
Sep
(76) |
Oct
(50) |
Nov
(37) |
Dec
(340) |
| 2007 |
Jan
(23) |
Feb
(107) |
Mar
(98) |
Apr
(60) |
May
(136) |
Jun
(371) |
Jul
(175) |
Aug
(74) |
Sep
(3) |
Oct
(2) |
Nov
(53) |
Dec
(129) |
| 2008 |
Jan
(337) |
Feb
(23) |
Mar
(18) |
Apr
(4) |
May
(3) |
Jun
|
Jul
|
Aug
(4) |
Sep
|
Oct
(33) |
Nov
|
Dec
(26) |
| 2009 |
Jan
(4) |
Feb
(1) |
Mar
(15) |
Apr
|
May
(35) |
Jun
(11) |
Jul
|
Aug
|
Sep
(19) |
Oct
(26) |
Nov
(11) |
Dec
(11) |
| 2010 |
Jan
(4) |
Feb
|
Mar
|
Apr
|
May
(1) |
Jun
|
Jul
|
Aug
(8) |
Sep
|
Oct
|
Nov
(8) |
Dec
(7) |
| 2011 |
Jan
|
Feb
|
Mar
(4) |
Apr
(8) |
May
(5) |
Jun
(8) |
Jul
(1) |
Aug
|
Sep
|
Oct
(5) |
Nov
(13) |
Dec
|
|
From: John L. <jr...@us...> - 2007-06-18 14:55:32
|
Update of /cvsroot/wxlua/wxLua/bindings In directory sc8-pr-cvs9.sourceforge.net:/tmp/cvs-serv1750/wxLua/bindings Modified Files: genwxbind.lua Log Message: Fix compilation in MSW, add includes, etc Change genwxbind.lua to preserve the order of conditions, fifo instead of filo not sure why it reversed the order before, but it doesn't seem right. Index: genwxbind.lua =================================================================== RCS file: /cvsroot/wxlua/wxLua/bindings/genwxbind.lua,v retrieving revision 1.126 retrieving revision 1.127 diff -C2 -d -r1.126 -r1.127 *** genwxbind.lua 18 Jun 2007 02:56:22 -0000 1.126 --- genwxbind.lua 18 Jun 2007 14:54:58 -0000 1.127 *************** *** 698,702 **** preprocConditionTable["%__WXWINCE__"] = "defined(__WXWINCE__)" ! preprocConditionTable["wxHAS_POWER_EVENTS"] = "wxHAS_POWER_EVENTS" -- wxUSE_ conditions --- 698,702 ---- preprocConditionTable["%__WXWINCE__"] = "defined(__WXWINCE__)" ! preprocConditionTable["wxHAS_POWER_EVENTS"] = "defined(wxHAS_POWER_EVENTS)" -- wxUSE_ conditions *************** *** 2468,2472 **** elseif lineState.DefType == "blockcondition" then -- line is a block condition, push onto condition stack ! table.insert(parseState.ConditionStack, 1, lineState.Condition) elseif lineState.DefType == "property" then --- 2468,2472 ---- elseif lineState.DefType == "blockcondition" then -- line is a block condition, push onto condition stack ! table.insert(parseState.ConditionStack, lineState.Condition) elseif lineState.DefType == "property" then |
|
From: John L. <jr...@us...> - 2007-06-18 14:55:32
|
Update of /cvsroot/wxlua/wxLua/bindings/wxwidgets In directory sc8-pr-cvs9.sourceforge.net:/tmp/cvs-serv1750/wxLua/bindings/wxwidgets Modified Files: event.i help.i picker.i windows.i wx_datatypes.lua Log Message: Fix compilation in MSW, add includes, etc Change genwxbind.lua to preserve the order of conditions, fifo instead of filo not sure why it reversed the order before, but it doesn't seem right. Index: help.i =================================================================== RCS file: /cvsroot/wxlua/wxLua/bindings/wxwidgets/help.i,v retrieving revision 1.19 retrieving revision 1.20 diff -C2 -d -r1.19 -r1.20 *** help.i 18 Jun 2007 02:56:24 -0000 1.19 --- help.i 18 Jun 2007 14:54:58 -0000 1.20 *************** *** 135,142 **** %if %msw %class %delete wxWinHelpController, wxHelpControllerBase - %include "wx/helpwin.h" wxWinHelpController() %endclass %endif //%msw --- 135,145 ---- %if %msw + + %include "wx/helpwin.h" + %class %delete wxWinHelpController, wxHelpControllerBase wxWinHelpController() %endclass + %endif //%msw *************** *** 158,163 **** %class wxBestHelpController, wxHelpControllerBase wxBestHelpController(wxWindow* parentWindow = NULL, int style = wxHF_DEFAULT_STYLE) - %endclass %endif //%msw --- 161,166 ---- %class wxBestHelpController, wxHelpControllerBase wxBestHelpController(wxWindow* parentWindow = NULL, int style = wxHF_DEFAULT_STYLE) %endclass + %endif //%msw *************** *** 166,173 **** %if !%win %class %delete wxExtHelpController, wxHelpControllerBase - %include "wx/generic/helpext.h" wxExtHelpController() %endclass %endif //!%win --- 169,179 ---- %if !%win + + %include "wx/generic/helpext.h" + %class %delete wxExtHelpController, wxHelpControllerBase wxExtHelpController() %endclass + %endif //!%win Index: windows.i =================================================================== RCS file: /cvsroot/wxlua/wxLua/bindings/wxwidgets/windows.i,v retrieving revision 1.43 retrieving revision 1.44 diff -C2 -d -r1.43 -r1.44 *** windows.i 18 Jun 2007 02:56:24 -0000 1.43 --- windows.i 18 Jun 2007 14:54:58 -0000 1.44 *************** *** 620,624 **** %define wxTC_OWNERDRAW - %include "wx/tabctrl.h" wxTabCtrl(wxWindow *parent, wxWindowID id, const wxPoint& pos = wxDefaultPosition, const wxSize& size = wxDefaultSize, long style = 0, const wxString& name = "wxTabCtrl") bool Create(wxWindow* parent, wxWindowID id, const wxPoint& pos = wxDefaultPosition, const wxSize& size = wxDefaultSize, long style = 0, const wxString& name = "wxTabCtrl") --- 620,623 ---- Index: wx_datatypes.lua =================================================================== RCS file: /cvsroot/wxlua/wxLua/bindings/wxwidgets/wx_datatypes.lua,v retrieving revision 1.70 retrieving revision 1.71 diff -C2 -d -r1.70 -r1.71 *** wx_datatypes.lua 18 Jun 2007 02:56:25 -0000 1.70 --- wx_datatypes.lua 18 Jun 2007 14:54:58 -0000 1.71 *************** *** 201,205 **** wxANIHandler = { BaseClass = "wxCURHandler", ! Condition = "(wxUSE_ICO_CUR) && (wxLUA_USE_wxImage && wxUSE_IMAGE)", DefType = "class", IsNumber = false, --- 201,205 ---- wxANIHandler = { BaseClass = "wxCURHandler", ! Condition = "(wxLUA_USE_wxImage && wxUSE_IMAGE) && (wxUSE_ICO_CUR)", DefType = "class", [...1362 lines suppressed...] IsNumber = false, --- 3806,3810 ---- wxXPMHandler = { BaseClass = "wxImageHandler", ! Condition = "wxCHECK_VERSION(2,8,0) && wxUSE_TGA", DefType = "class", IsNumber = false, *************** *** 3909,3913 **** WXWIN_COMPATIBILITY_2_6 = "(defined(WXWIN_COMPATIBILITY_2_6) && WXWIN_COMPATIBILITY_2_6)", WXWIN_COMPATIBILITY_2_8 = "(defined(WXWIN_COMPATIBILITY_2_8) && WXWIN_COMPATIBILITY_2_8)", ! wxHAS_POWER_EVENTS = "wxHAS_POWER_EVENTS", wxLUA_USE_Animation = "wxLUA_USE_Animation", wxLUA_USE_FL = "wxLUA_USE_FL", --- 3911,3915 ---- WXWIN_COMPATIBILITY_2_6 = "(defined(WXWIN_COMPATIBILITY_2_6) && WXWIN_COMPATIBILITY_2_6)", WXWIN_COMPATIBILITY_2_8 = "(defined(WXWIN_COMPATIBILITY_2_8) && WXWIN_COMPATIBILITY_2_8)", ! wxHAS_POWER_EVENTS = "defined(wxHAS_POWER_EVENTS)", wxLUA_USE_Animation = "wxLUA_USE_Animation", wxLUA_USE_FL = "wxLUA_USE_FL", Index: event.i =================================================================== RCS file: /cvsroot/wxlua/wxLua/bindings/wxwidgets/event.i,v retrieving revision 1.28 retrieving revision 1.29 diff -C2 -d -r1.28 -r1.29 *** event.i 18 Jun 2007 02:56:23 -0000 1.28 --- event.i 18 Jun 2007 14:54:58 -0000 1.29 *************** *** 816,819 **** --- 816,821 ---- // wxPowerEvent + %if %wxchkver_2_8 + %include "wx/power.h" *************** *** 851,854 **** --- 853,859 ---- %endif // wxHAS_POWER_EVENTS + %endif %wxchkver_2_8 + + // --------------------------------------------------------------------------- // wxSetCursorEvent Index: picker.i =================================================================== RCS file: /cvsroot/wxlua/wxLua/bindings/wxwidgets/picker.i,v retrieving revision 1.1 retrieving revision 1.2 diff -C2 -d -r1.1 -r1.2 *** picker.i 17 Jun 2007 18:36:06 -0000 1.1 --- picker.i 18 Jun 2007 14:54:58 -0000 1.2 *************** *** 125,128 **** --- 125,130 ---- %if (wxLUA_USE_wxDirPickerCtrl || wxLUA_USE_wxFilePickerCtrl) && (wxUSE_FILEPICKERCTRL || wxUSE_DIRPICKERCTRL) + %include "wx/filepicker.h" + %class wxFileDirPickerCtrlBase, wxPickerBase // No constructor - this is a base class *************** *** 165,169 **** %class wxDirPickerCtrl, wxFileDirPickerCtrlBase ! //wxDirPickerCtrl() {} wxDirPickerCtrl(wxWindow *parent, wxWindowID id, const wxString& path = "", const wxString& message = wxDirSelectorPromptStr, const wxPoint& pos = wxDefaultPosition, const wxSize& size = wxDefaultSize, long style = wxDIRP_DEFAULT_STYLE, const wxValidator& validator = wxDefaultValidator, const wxString& name = "wxDirPickerCtrl") //bool Create(wxWindow *parent, wxWindowID id, const wxString& path = "", const wxString& message = wxDirSelectorPromptStr, const wxPoint& pos = wxDefaultPosition, const wxSize& size = wxDefaultSize, long style = wxDIRP_DEFAULT_STYLE, const wxValidator& validator = wxDefaultValidator, const wxString& name = "wxDirPickerCtrl") --- 167,171 ---- %class wxDirPickerCtrl, wxFileDirPickerCtrlBase ! //wxDirPickerCtrl() wxDirPickerCtrl(wxWindow *parent, wxWindowID id, const wxString& path = "", const wxString& message = wxDirSelectorPromptStr, const wxPoint& pos = wxDefaultPosition, const wxSize& size = wxDefaultSize, long style = wxDIRP_DEFAULT_STYLE, const wxValidator& validator = wxDefaultValidator, const wxString& name = "wxDirPickerCtrl") //bool Create(wxWindow *parent, wxWindowID id, const wxString& path = "", const wxString& message = wxDirSelectorPromptStr, const wxPoint& pos = wxDefaultPosition, const wxSize& size = wxDefaultSize, long style = wxDIRP_DEFAULT_STYLE, const wxValidator& validator = wxDefaultValidator, const wxString& name = "wxDirPickerCtrl") *************** *** 202,205 **** --- 204,209 ---- %if wxLUA_USE_wxFontPickerCtrl && wxUSE_FONTPICKERCTRL + %include "wx/fontpicker.h" + %define wxFNTP_FONTDESC_AS_LABEL %define wxFNTP_USE_TEXTCTRL |
|
From: John L. <jr...@us...> - 2007-06-18 14:55:32
|
Update of /cvsroot/wxlua/wxLua/modules/wxbind/include In directory sc8-pr-cvs9.sourceforge.net:/tmp/cvs-serv1750/wxLua/modules/wxbind/include Modified Files: wxbind.h Log Message: Fix compilation in MSW, add includes, etc Change genwxbind.lua to preserve the order of conditions, fifo instead of filo not sure why it reversed the order before, but it doesn't seem right. Index: wxbind.h =================================================================== RCS file: /cvsroot/wxlua/wxLua/modules/wxbind/include/wxbind.h,v retrieving revision 1.76 retrieving revision 1.77 diff -C2 -d -r1.76 -r1.77 *** wxbind.h 18 Jun 2007 02:56:26 -0000 1.76 --- wxbind.h 18 Jun 2007 14:54:59 -0000 1.77 *************** *** 72,82 **** // --------------------------------------------------------------------------- ! #if (!defined(__WXMSW__)) && (wxLUA_USE_wxHelpController && wxUSE_HELP) ! #include "wx/generic/helpext.h" ! #endif // (!defined(__WXMSW__)) && (wxLUA_USE_wxHelpController && wxUSE_HELP) ! ! #if (!wxCHECK_VERSION(2,6,0)) && (wxLUA_USE_wxToolbar) ! #include "wx/tbarsmpl.h" ! #endif // (!wxCHECK_VERSION(2,6,0)) && (wxLUA_USE_wxToolbar) [...1444 lines suppressed...] - #if wxLUA_USE_wxDC - wxLUA_DECLARE_ENCAPSULATION(WXDLLIMPEXP_WXBIND, wxDCClipper, wxDCClipper) - #endif // wxLUA_USE_wxDC - #if wxLUA_USE_wxDataObject && wxUSE_DATAOBJ wxLUA_DECLARE_ENCAPSULATION(WXDLLIMPEXP_WXBIND, wxBitmapDataObject, wxBitmapDataObject) --- 2677,2680 ---- *************** *** 2668,2677 **** #endif // wxLUA_USE_wxGrid && wxUSE_GRID - #if wxLUA_USE_wxHelpController && wxUSE_HELP - wxLUA_DECLARE_ENCAPSULATION(WXDLLIMPEXP_WXBIND, wxHelpControllerHelpProvider, wxHelpControllerHelpProvider) - wxLUA_DECLARE_ENCAPSULATION(WXDLLIMPEXP_WXBIND, wxHelpProvider, wxHelpProvider) - wxLUA_DECLARE_ENCAPSULATION(WXDLLIMPEXP_WXBIND, wxSimpleHelpProvider, wxSimpleHelpProvider) - #endif // wxLUA_USE_wxHelpController && wxUSE_HELP - #if wxLUA_USE_wxIcon wxLUA_DECLARE_ENCAPSULATION(WXDLLIMPEXP_WXBIND, wxIconBundle, wxIconBundle) --- 2735,2738 ---- |
|
From: John L. <jr...@us...> - 2007-06-18 14:55:32
|
Update of /cvsroot/wxlua/wxLua/bindings/wxstc In directory sc8-pr-cvs9.sourceforge.net:/tmp/cvs-serv1750/wxLua/bindings/wxstc Modified Files: wxstc_datatypes.lua Log Message: Fix compilation in MSW, add includes, etc Change genwxbind.lua to preserve the order of conditions, fifo instead of filo not sure why it reversed the order before, but it doesn't seem right. Index: wxstc_datatypes.lua =================================================================== RCS file: /cvsroot/wxlua/wxLua/bindings/wxstc/wxstc_datatypes.lua,v retrieving revision 1.60 retrieving revision 1.61 diff -C2 -d -r1.60 -r1.61 *** wxstc_datatypes.lua 18 Jun 2007 02:56:23 -0000 1.60 --- wxstc_datatypes.lua 18 Jun 2007 14:54:58 -0000 1.61 *************** *** 201,205 **** wxANIHandler = { BaseClass = "wxCURHandler", ! Condition = "(wxUSE_ICO_CUR) && (wxLUA_USE_wxImage && wxUSE_IMAGE)", DefType = "class", IsNumber = false, --- 201,205 ---- wxANIHandler = { BaseClass = "wxCURHandler", ! Condition = "(wxLUA_USE_wxImage && wxUSE_IMAGE) && (wxUSE_ICO_CUR)", DefType = "class", [...1362 lines suppressed...] IsNumber = false, --- 3817,3821 ---- wxXPMHandler = { BaseClass = "wxImageHandler", ! Condition = "wxCHECK_VERSION(2,8,0) && wxUSE_TGA", DefType = "class", IsNumber = false, *************** *** 3920,3924 **** WXWIN_COMPATIBILITY_2_6 = "(defined(WXWIN_COMPATIBILITY_2_6) && WXWIN_COMPATIBILITY_2_6)", WXWIN_COMPATIBILITY_2_8 = "(defined(WXWIN_COMPATIBILITY_2_8) && WXWIN_COMPATIBILITY_2_8)", ! wxHAS_POWER_EVENTS = "wxHAS_POWER_EVENTS", wxLUA_USE_Animation = "wxLUA_USE_Animation", wxLUA_USE_FL = "wxLUA_USE_FL", --- 3922,3926 ---- WXWIN_COMPATIBILITY_2_6 = "(defined(WXWIN_COMPATIBILITY_2_6) && WXWIN_COMPATIBILITY_2_6)", WXWIN_COMPATIBILITY_2_8 = "(defined(WXWIN_COMPATIBILITY_2_8) && WXWIN_COMPATIBILITY_2_8)", ! wxHAS_POWER_EVENTS = "defined(wxHAS_POWER_EVENTS)", wxLUA_USE_Animation = "wxLUA_USE_Animation", wxLUA_USE_FL = "wxLUA_USE_FL", |
|
From: John L. <jr...@us...> - 2007-06-18 14:55:09
|
Update of /cvsroot/wxlua/wxLua/modules/wxluadebug/include In directory sc8-pr-cvs9.sourceforge.net:/tmp/cvs-serv1750/wxLua/modules/wxluadebug/include Modified Files: wxlstack.h Log Message: Fix compilation in MSW, add includes, etc Change genwxbind.lua to preserve the order of conditions, fifo instead of filo not sure why it reversed the order before, but it doesn't seem right. Index: wxlstack.h =================================================================== RCS file: /cvsroot/wxlua/wxLua/modules/wxluadebug/include/wxlstack.h,v retrieving revision 1.3 retrieving revision 1.4 diff -C2 -d -r1.3 -r1.4 *** wxlstack.h 16 Jun 2007 06:21:47 -0000 1.3 --- wxlstack.h 18 Jun 2007 14:55:05 -0000 1.4 *************** *** 12,15 **** --- 12,16 ---- #include "wx/dialog.h" + #include "wx/listctrl.h" #include "wx/treectrl.h" |
|
From: John L. <jr...@us...> - 2007-06-18 14:55:09
|
Update of /cvsroot/wxlua/wxLua/modules/wxbindstc/src In directory sc8-pr-cvs9.sourceforge.net:/tmp/cvs-serv1750/wxLua/modules/wxbindstc/src Modified Files: stc.cpp Log Message: Fix compilation in MSW, add includes, etc Change genwxbind.lua to preserve the order of conditions, fifo instead of filo not sure why it reversed the order before, but it doesn't seem right. Index: stc.cpp =================================================================== RCS file: /cvsroot/wxlua/wxLua/modules/wxbindstc/src/stc.cpp,v retrieving revision 1.43 retrieving revision 1.44 diff -C2 -d -r1.43 -r1.44 *** stc.cpp 18 Jun 2007 02:56:35 -0000 1.43 --- stc.cpp 18 Jun 2007 14:55:04 -0000 1.44 *************** *** 719,723 **** ! #if wxLUA_USE_wxColourPenBrush static wxLuaArgTag s_wxluatagArray_wxLua_wxStyledTextCtrl_CallTipSetBackground[] = { &s_wxluatag_wxStyledTextCtrl, &s_wxluatag_wxColour, NULL }; static int LUACALL wxLua_wxStyledTextCtrl_CallTipSetBackground(lua_State *L); --- 719,723 ---- ! #if wxCHECK_VERSION(2,8,0) static wxLuaArgTag s_wxluatagArray_wxLua_wxStyledTextCtrl_CallTipSetBackground[] = { &s_wxluatag_wxStyledTextCtrl, &s_wxluatag_wxColour, NULL }; static int LUACALL wxLua_wxStyledTextCtrl_CallTipSetBackground(lua_State *L); *************** *** 771,775 **** } ! #endif // wxLUA_USE_wxColourPenBrush static wxLuaArgTag s_wxluatagArray_wxLua_wxStyledTextCtrl_CallTipSetHighlight[] = { &s_wxluatag_wxStyledTextCtrl, &s_wxluaarg_Number, &s_wxluaarg_Number, NULL }; --- 771,775 ---- } ! #endif // wxCHECK_VERSION(2,8,0) static wxLuaArgTag s_wxluatagArray_wxLua_wxStyledTextCtrl_CallTipSetHighlight[] = { &s_wxluatag_wxStyledTextCtrl, &s_wxluaarg_Number, &s_wxluaarg_Number, NULL }; *************** *** 1569,1573 **** ! #if (wxLUA_USE_wxPointSizeRect) && (wxLUA_USE_wxDC) static wxLuaArgTag s_wxluatagArray_wxLua_wxStyledTextCtrl_FormatRange[] = { &s_wxluatag_wxStyledTextCtrl, &s_wxluaarg_Boolean, &s_wxluaarg_Number, &s_wxluaarg_Number, &s_wxluatag_wxDC, &s_wxluatag_wxDC, &s_wxluatag_wxRect, &s_wxluatag_wxRect, NULL }; static int LUACALL wxLua_wxStyledTextCtrl_FormatRange(lua_State *L); --- 1569,1573 ---- ! #if (wxLUA_USE_wxPointSizeRect) && (wxCHECK_VERSION(2,8,0)) static wxLuaArgTag s_wxluatagArray_wxLua_wxStyledTextCtrl_FormatRange[] = { &s_wxluatag_wxStyledTextCtrl, &s_wxluaarg_Boolean, &s_wxluaarg_Number, &s_wxluaarg_Number, &s_wxluatag_wxDC, &s_wxluatag_wxDC, &s_wxluatag_wxRect, &s_wxluatag_wxRect, NULL }; static int LUACALL wxLua_wxStyledTextCtrl_FormatRange(lua_State *L); *************** *** 1602,1606 **** } ! #endif // (wxLUA_USE_wxPointSizeRect) && (wxLUA_USE_wxDC) static wxLuaArgTag s_wxluatagArray_wxLua_wxStyledTextCtrl_GetAnchor[] = { &s_wxluatag_wxStyledTextCtrl, NULL }; --- 1602,1606 ---- } ! #endif // (wxLUA_USE_wxPointSizeRect) && (wxCHECK_VERSION(2,8,0)) static wxLuaArgTag s_wxluatagArray_wxLua_wxStyledTextCtrl_GetAnchor[] = { &s_wxluatag_wxStyledTextCtrl, NULL }; *************** *** 1659,1663 **** ! #if wxLUA_USE_wxColourPenBrush static wxLuaArgTag s_wxluatagArray_wxLua_wxStyledTextCtrl_GetCaretForeground[] = { &s_wxluatag_wxStyledTextCtrl, NULL }; static int LUACALL wxLua_wxStyledTextCtrl_GetCaretForeground(lua_State *L); --- 1659,1663 ---- ! #if wxCHECK_VERSION(2,8,0) static wxLuaArgTag s_wxluatagArray_wxLua_wxStyledTextCtrl_GetCaretForeground[] = { &s_wxluatag_wxStyledTextCtrl, NULL }; static int LUACALL wxLua_wxStyledTextCtrl_GetCaretForeground(lua_State *L); *************** *** 1681,1687 **** } ! #endif // wxLUA_USE_wxColourPenBrush ! #if (!wxCHECK_VERSION(2,8,0)) && (wxLUA_USE_wxColourPenBrush) static wxLuaArgTag s_wxluatagArray_wxLua_wxStyledTextCtrl_GetCaretLineBack[] = { &s_wxluatag_wxStyledTextCtrl, NULL }; static int LUACALL wxLua_wxStyledTextCtrl_GetCaretLineBack(lua_State *L); --- 1681,1687 ---- } ! #endif // wxCHECK_VERSION(2,8,0) ! #if (!wxCHECK_VERSION(2,8,0)) && (wxCHECK_VERSION(2,8,0)) static wxLuaArgTag s_wxluatagArray_wxLua_wxStyledTextCtrl_GetCaretLineBack[] = { &s_wxluatag_wxStyledTextCtrl, NULL }; static int LUACALL wxLua_wxStyledTextCtrl_GetCaretLineBack(lua_State *L); *************** *** 1705,1711 **** } ! #endif // (!wxCHECK_VERSION(2,8,0)) && (wxLUA_USE_wxColourPenBrush) ! #if (wxLUA_USE_wxColourPenBrush) && (wxCHECK_VERSION(2,8,0)) static wxLuaArgTag s_wxluatagArray_wxLua_wxStyledTextCtrl_GetCaretLineBackground[] = { &s_wxluatag_wxStyledTextCtrl, NULL }; static int LUACALL wxLua_wxStyledTextCtrl_GetCaretLineBackground(lua_State *L); --- 1705,1711 ---- } ! #endif // (!wxCHECK_VERSION(2,8,0)) && (wxCHECK_VERSION(2,8,0)) ! #if wxCHECK_VERSION(2,8,0) static wxLuaArgTag s_wxluatagArray_wxLua_wxStyledTextCtrl_GetCaretLineBackground[] = { &s_wxluatag_wxStyledTextCtrl, NULL }; static int LUACALL wxLua_wxStyledTextCtrl_GetCaretLineBackground(lua_State *L); *************** *** 1729,1733 **** } ! #endif // (wxLUA_USE_wxColourPenBrush) && (wxCHECK_VERSION(2,8,0)) static wxLuaArgTag s_wxluatagArray_wxLua_wxStyledTextCtrl_GetCaretLineVisible[] = { &s_wxluatag_wxStyledTextCtrl, NULL }; --- 1729,1733 ---- } ! #endif // wxCHECK_VERSION(2,8,0) static wxLuaArgTag s_wxluatagArray_wxLua_wxStyledTextCtrl_GetCaretLineVisible[] = { &s_wxluatag_wxStyledTextCtrl, NULL }; *************** *** 1974,1978 **** ! #if wxLUA_USE_wxColourPenBrush static wxLuaArgTag s_wxluatagArray_wxLua_wxStyledTextCtrl_GetEdgeColour[] = { &s_wxluatag_wxStyledTextCtrl, NULL }; static int LUACALL wxLua_wxStyledTextCtrl_GetEdgeColour(lua_State *L); --- 1974,1978 ---- ! #if wxCHECK_VERSION(2,8,0) static wxLuaArgTag s_wxluatagArray_wxLua_wxStyledTextCtrl_GetEdgeColour[] = { &s_wxluatag_wxStyledTextCtrl, NULL }; static int LUACALL wxLua_wxStyledTextCtrl_GetEdgeColour(lua_State *L); *************** *** 1996,2000 **** } ! #endif // wxLUA_USE_wxColourPenBrush static wxLuaArgTag s_wxluatagArray_wxLua_wxStyledTextCtrl_GetEdgeColumn[] = { &s_wxluatag_wxStyledTextCtrl, NULL }; --- 1996,2000 ---- } ! #endif // wxCHECK_VERSION(2,8,0) static wxLuaArgTag s_wxluatagArray_wxLua_wxStyledTextCtrl_GetEdgeColumn[] = { &s_wxluatag_wxStyledTextCtrl, NULL }; *************** *** 3646,3650 **** ! #if wxLUA_USE_wxColourPenBrush static wxLuaArgTag s_wxluatagArray_wxLua_wxStyledTextCtrl_IndicatorGetForeground[] = { &s_wxluatag_wxStyledTextCtrl, &s_wxluaarg_Number, NULL }; static int LUACALL wxLua_wxStyledTextCtrl_IndicatorGetForeground(lua_State *L); --- 3646,3650 ---- ! #if wxCHECK_VERSION(2,8,0) static wxLuaArgTag s_wxluatagArray_wxLua_wxStyledTextCtrl_IndicatorGetForeground[] = { &s_wxluatag_wxStyledTextCtrl, &s_wxluaarg_Number, NULL }; static int LUACALL wxLua_wxStyledTextCtrl_IndicatorGetForeground(lua_State *L); *************** *** 3670,3674 **** } ! #endif // wxLUA_USE_wxColourPenBrush static wxLuaArgTag s_wxluatagArray_wxLua_wxStyledTextCtrl_IndicatorGetStyle[] = { &s_wxluatag_wxStyledTextCtrl, &s_wxluaarg_Number, NULL }; --- 3670,3674 ---- } ! #endif // wxCHECK_VERSION(2,8,0) static wxLuaArgTag s_wxluatagArray_wxLua_wxStyledTextCtrl_IndicatorGetStyle[] = { &s_wxluatag_wxStyledTextCtrl, &s_wxluaarg_Number, NULL }; *************** *** 3693,3697 **** ! #if wxLUA_USE_wxColourPenBrush static wxLuaArgTag s_wxluatagArray_wxLua_wxStyledTextCtrl_IndicatorSetForeground[] = { &s_wxluatag_wxStyledTextCtrl, &s_wxluaarg_Number, &s_wxluatag_wxColour, NULL }; static int LUACALL wxLua_wxStyledTextCtrl_IndicatorSetForeground(lua_State *L); --- 3693,3697 ---- ! #if wxCHECK_VERSION(2,8,0) static wxLuaArgTag s_wxluatagArray_wxLua_wxStyledTextCtrl_IndicatorSetForeground[] = { &s_wxluatag_wxStyledTextCtrl, &s_wxluaarg_Number, &s_wxluatag_wxColour, NULL }; static int LUACALL wxLua_wxStyledTextCtrl_IndicatorSetForeground(lua_State *L); *************** *** 3713,3717 **** } ! #endif // wxLUA_USE_wxColourPenBrush static wxLuaArgTag s_wxluatagArray_wxLua_wxStyledTextCtrl_IndicatorSetStyle[] = { &s_wxluatag_wxStyledTextCtrl, &s_wxluaarg_Number, &s_wxluaarg_Number, NULL }; --- 3713,3717 ---- } ! #endif // wxCHECK_VERSION(2,8,0) static wxLuaArgTag s_wxluatagArray_wxLua_wxStyledTextCtrl_IndicatorSetStyle[] = { &s_wxluatag_wxStyledTextCtrl, &s_wxluaarg_Number, &s_wxluaarg_Number, NULL }; *************** *** 4258,4262 **** ! #if wxLUA_USE_wxColourPenBrush static wxLuaArgTag s_wxluatagArray_wxLua_wxStyledTextCtrl_MarkerDefine[] = { &s_wxluatag_wxStyledTextCtrl, &s_wxluaarg_Number, &s_wxluaarg_Number, &s_wxluatag_wxColour, &s_wxluatag_wxColour, NULL }; static int LUACALL wxLua_wxStyledTextCtrl_MarkerDefine(lua_State *L); --- 4258,4262 ---- ! #if wxCHECK_VERSION(2,8,0) static wxLuaArgTag s_wxluatagArray_wxLua_wxStyledTextCtrl_MarkerDefine[] = { &s_wxluatag_wxStyledTextCtrl, &s_wxluaarg_Number, &s_wxluaarg_Number, &s_wxluatag_wxColour, &s_wxluatag_wxColour, NULL }; static int LUACALL wxLua_wxStyledTextCtrl_MarkerDefine(lua_State *L); *************** *** 4284,4288 **** } ! #endif // wxLUA_USE_wxColourPenBrush #if wxLUA_USE_wxBitmap --- 4284,4288 ---- } ! #endif // wxCHECK_VERSION(2,8,0) #if wxLUA_USE_wxBitmap *************** *** 4446,4450 **** ! #if wxLUA_USE_wxColourPenBrush static wxLuaArgTag s_wxluatagArray_wxLua_wxStyledTextCtrl_MarkerSetBackground[] = { &s_wxluatag_wxStyledTextCtrl, &s_wxluaarg_Number, &s_wxluatag_wxColour, NULL }; static int LUACALL wxLua_wxStyledTextCtrl_MarkerSetBackground(lua_State *L); --- 4446,4450 ---- ! #if wxCHECK_VERSION(2,8,0) static wxLuaArgTag s_wxluatagArray_wxLua_wxStyledTextCtrl_MarkerSetBackground[] = { &s_wxluatag_wxStyledTextCtrl, &s_wxluaarg_Number, &s_wxluatag_wxColour, NULL }; static int LUACALL wxLua_wxStyledTextCtrl_MarkerSetBackground(lua_State *L); *************** *** 4485,4489 **** } ! #endif // wxLUA_USE_wxColourPenBrush static wxLuaArgTag s_wxluatagArray_wxLua_wxStyledTextCtrl_MoveCaretInsideView[] = { &s_wxluatag_wxStyledTextCtrl, NULL }; --- 4485,4489 ---- } ! #endif // wxCHECK_VERSION(2,8,0) static wxLuaArgTag s_wxluatagArray_wxLua_wxStyledTextCtrl_MoveCaretInsideView[] = { &s_wxluatag_wxStyledTextCtrl, NULL }; *************** *** 5186,5190 **** ! #if wxLUA_USE_wxColourPenBrush static wxLuaArgTag s_wxluatagArray_wxLua_wxStyledTextCtrl_SetCaretForeground[] = { &s_wxluatag_wxStyledTextCtrl, &s_wxluatag_wxColour, NULL }; static int LUACALL wxLua_wxStyledTextCtrl_SetCaretForeground(lua_State *L); --- 5186,5190 ---- ! #if wxCHECK_VERSION(2,8,0) static wxLuaArgTag s_wxluatagArray_wxLua_wxStyledTextCtrl_SetCaretForeground[] = { &s_wxluatag_wxStyledTextCtrl, &s_wxluatag_wxColour, NULL }; static int LUACALL wxLua_wxStyledTextCtrl_SetCaretForeground(lua_State *L); *************** *** 5204,5210 **** } ! #endif // wxLUA_USE_wxColourPenBrush ! #if (!wxCHECK_VERSION(2,8,0)) && (wxLUA_USE_wxColourPenBrush) static wxLuaArgTag s_wxluatagArray_wxLua_wxStyledTextCtrl_SetCaretLineBack[] = { &s_wxluatag_wxStyledTextCtrl, &s_wxluatag_wxColour, NULL }; static int LUACALL wxLua_wxStyledTextCtrl_SetCaretLineBack(lua_State *L); --- 5204,5210 ---- } ! #endif // wxCHECK_VERSION(2,8,0) ! #if (!wxCHECK_VERSION(2,8,0)) && (wxCHECK_VERSION(2,8,0)) static wxLuaArgTag s_wxluatagArray_wxLua_wxStyledTextCtrl_SetCaretLineBack[] = { &s_wxluatag_wxStyledTextCtrl, &s_wxluatag_wxColour, NULL }; static int LUACALL wxLua_wxStyledTextCtrl_SetCaretLineBack(lua_State *L); *************** *** 5224,5230 **** } ! #endif // (!wxCHECK_VERSION(2,8,0)) && (wxLUA_USE_wxColourPenBrush) ! #if (wxLUA_USE_wxColourPenBrush) && (wxCHECK_VERSION(2,8,0)) static wxLuaArgTag s_wxluatagArray_wxLua_wxStyledTextCtrl_SetCaretLineBackground[] = { &s_wxluatag_wxStyledTextCtrl, &s_wxluatag_wxColour, NULL }; static int LUACALL wxLua_wxStyledTextCtrl_SetCaretLineBackground(lua_State *L); --- 5224,5230 ---- } ! #endif // (!wxCHECK_VERSION(2,8,0)) && (wxCHECK_VERSION(2,8,0)) ! #if wxCHECK_VERSION(2,8,0) static wxLuaArgTag s_wxluatagArray_wxLua_wxStyledTextCtrl_SetCaretLineBackground[] = { &s_wxluatag_wxStyledTextCtrl, &s_wxluatag_wxColour, NULL }; static int LUACALL wxLua_wxStyledTextCtrl_SetCaretLineBackground(lua_State *L); *************** *** 5244,5248 **** } ! #endif // (wxLUA_USE_wxColourPenBrush) && (wxCHECK_VERSION(2,8,0)) static wxLuaArgTag s_wxluatagArray_wxLua_wxStyledTextCtrl_SetCaretLineVisible[] = { &s_wxluatag_wxStyledTextCtrl, &s_wxluaarg_Boolean, NULL }; --- 5244,5248 ---- } ! #endif // wxCHECK_VERSION(2,8,0) static wxLuaArgTag s_wxluatagArray_wxLua_wxStyledTextCtrl_SetCaretLineVisible[] = { &s_wxluatag_wxStyledTextCtrl, &s_wxluaarg_Boolean, NULL }; *************** *** 5415,5419 **** ! #if wxLUA_USE_wxColourPenBrush static wxLuaArgTag s_wxluatagArray_wxLua_wxStyledTextCtrl_SetEdgeColour[] = { &s_wxluatag_wxStyledTextCtrl, &s_wxluatag_wxColour, NULL }; static int LUACALL wxLua_wxStyledTextCtrl_SetEdgeColour(lua_State *L); --- 5415,5419 ---- ! #if wxCHECK_VERSION(2,8,0) static wxLuaArgTag s_wxluatagArray_wxLua_wxStyledTextCtrl_SetEdgeColour[] = { &s_wxluatag_wxStyledTextCtrl, &s_wxluatag_wxColour, NULL }; static int LUACALL wxLua_wxStyledTextCtrl_SetEdgeColour(lua_State *L); *************** *** 5433,5437 **** } ! #endif // wxLUA_USE_wxColourPenBrush static wxLuaArgTag s_wxluatagArray_wxLua_wxStyledTextCtrl_SetEdgeColumn[] = { &s_wxluatag_wxStyledTextCtrl, &s_wxluaarg_Number, NULL }; --- 5433,5437 ---- } ! #endif // wxCHECK_VERSION(2,8,0) static wxLuaArgTag s_wxluatagArray_wxLua_wxStyledTextCtrl_SetEdgeColumn[] = { &s_wxluatag_wxStyledTextCtrl, &s_wxluaarg_Number, NULL }; *************** *** 5542,5546 **** ! #if wxLUA_USE_wxColourPenBrush static wxLuaArgTag s_wxluatagArray_wxLua_wxStyledTextCtrl_SetFoldMarginColour[] = { &s_wxluatag_wxStyledTextCtrl, &s_wxluaarg_Boolean, &s_wxluatag_wxColour, NULL }; static int LUACALL wxLua_wxStyledTextCtrl_SetFoldMarginColour(lua_State *L); --- 5542,5546 ---- ! #if wxCHECK_VERSION(2,8,0) static wxLuaArgTag s_wxluatagArray_wxLua_wxStyledTextCtrl_SetFoldMarginColour[] = { &s_wxluatag_wxStyledTextCtrl, &s_wxluaarg_Boolean, &s_wxluatag_wxColour, NULL }; static int LUACALL wxLua_wxStyledTextCtrl_SetFoldMarginColour(lua_State *L); *************** *** 5581,5585 **** } ! #endif // wxLUA_USE_wxColourPenBrush #if wxLUA_USE_wxScrollBar && wxUSE_SCROLLBAR --- 5581,5585 ---- } ! #endif // wxCHECK_VERSION(2,8,0) #if wxLUA_USE_wxScrollBar && wxUSE_SCROLLBAR *************** *** 5621,5625 **** ! #if wxLUA_USE_wxColourPenBrush static wxLuaArgTag s_wxluatagArray_wxLua_wxStyledTextCtrl_SetHotspotActiveBackground[] = { &s_wxluatag_wxStyledTextCtrl, &s_wxluaarg_Boolean, &s_wxluatag_wxColour, NULL }; static int LUACALL wxLua_wxStyledTextCtrl_SetHotspotActiveBackground(lua_State *L); --- 5621,5625 ---- ! #if wxCHECK_VERSION(2,8,0) static wxLuaArgTag s_wxluatagArray_wxLua_wxStyledTextCtrl_SetHotspotActiveBackground[] = { &s_wxluatag_wxStyledTextCtrl, &s_wxluaarg_Boolean, &s_wxluatag_wxColour, NULL }; static int LUACALL wxLua_wxStyledTextCtrl_SetHotspotActiveBackground(lua_State *L); *************** *** 5660,5664 **** } ! #endif // wxLUA_USE_wxColourPenBrush static wxLuaArgTag s_wxluatagArray_wxLua_wxStyledTextCtrl_SetHotspotActiveUnderline[] = { &s_wxluatag_wxStyledTextCtrl, &s_wxluaarg_Boolean, NULL }; --- 5660,5664 ---- } ! #endif // wxCHECK_VERSION(2,8,0) static wxLuaArgTag s_wxluatagArray_wxLua_wxStyledTextCtrl_SetHotspotActiveUnderline[] = { &s_wxluatag_wxStyledTextCtrl, &s_wxluaarg_Boolean, NULL }; *************** *** 6240,6244 **** ! #if wxLUA_USE_wxColourPenBrush static wxLuaArgTag s_wxluatagArray_wxLua_wxStyledTextCtrl_SetSelBackground[] = { &s_wxluatag_wxStyledTextCtrl, &s_wxluaarg_Boolean, &s_wxluatag_wxColour, NULL }; static int LUACALL wxLua_wxStyledTextCtrl_SetSelBackground(lua_State *L); --- 6240,6244 ---- ! #if wxCHECK_VERSION(2,8,0) static wxLuaArgTag s_wxluatagArray_wxLua_wxStyledTextCtrl_SetSelBackground[] = { &s_wxluatag_wxStyledTextCtrl, &s_wxluaarg_Boolean, &s_wxluatag_wxColour, NULL }; static int LUACALL wxLua_wxStyledTextCtrl_SetSelBackground(lua_State *L); *************** *** 6279,6283 **** } ! #endif // wxLUA_USE_wxColourPenBrush static wxLuaArgTag s_wxluatagArray_wxLua_wxStyledTextCtrl_SetSelection[] = { &s_wxluatag_wxStyledTextCtrl, &s_wxluaarg_Number, &s_wxluaarg_Number, NULL }; --- 6279,6283 ---- } ! #endif // wxCHECK_VERSION(2,8,0) static wxLuaArgTag s_wxluatagArray_wxLua_wxStyledTextCtrl_SetSelection[] = { &s_wxluatag_wxStyledTextCtrl, &s_wxluaarg_Number, &s_wxluaarg_Number, NULL }; *************** *** 6689,6693 **** ! #if wxLUA_USE_wxColourPenBrush static wxLuaArgTag s_wxluatagArray_wxLua_wxStyledTextCtrl_SetWhitespaceBackground[] = { &s_wxluatag_wxStyledTextCtrl, &s_wxluaarg_Boolean, &s_wxluatag_wxColour, NULL }; static int LUACALL wxLua_wxStyledTextCtrl_SetWhitespaceBackground(lua_State *L); --- 6689,6693 ---- ! #if wxCHECK_VERSION(2,8,0) static wxLuaArgTag s_wxluatagArray_wxLua_wxStyledTextCtrl_SetWhitespaceBackground[] = { &s_wxluatag_wxStyledTextCtrl, &s_wxluaarg_Boolean, &s_wxluatag_wxColour, NULL }; static int LUACALL wxLua_wxStyledTextCtrl_SetWhitespaceBackground(lua_State *L); *************** *** 6709,6713 **** } ! #endif // wxLUA_USE_wxColourPenBrush static wxLuaArgTag s_wxluatagArray_wxLua_wxStyledTextCtrl_SetWhitespaceChars[] = { &s_wxluatag_wxStyledTextCtrl, &s_wxluaarg_String, NULL }; --- 6709,6713 ---- } ! #endif // wxCHECK_VERSION(2,8,0) static wxLuaArgTag s_wxluatagArray_wxLua_wxStyledTextCtrl_SetWhitespaceChars[] = { &s_wxluatag_wxStyledTextCtrl, &s_wxluaarg_String, NULL }; *************** *** 6729,6733 **** ! #if wxLUA_USE_wxColourPenBrush static wxLuaArgTag s_wxluatagArray_wxLua_wxStyledTextCtrl_SetWhitespaceForeground[] = { &s_wxluatag_wxStyledTextCtrl, &s_wxluaarg_Boolean, &s_wxluatag_wxColour, NULL }; static int LUACALL wxLua_wxStyledTextCtrl_SetWhitespaceForeground(lua_State *L); --- 6729,6733 ---- ! #if wxCHECK_VERSION(2,8,0) static wxLuaArgTag s_wxluatagArray_wxLua_wxStyledTextCtrl_SetWhitespaceForeground[] = { &s_wxluatag_wxStyledTextCtrl, &s_wxluaarg_Boolean, &s_wxluatag_wxColour, NULL }; static int LUACALL wxLua_wxStyledTextCtrl_SetWhitespaceForeground(lua_State *L); *************** *** 6749,6753 **** } ! #endif // wxLUA_USE_wxColourPenBrush static wxLuaArgTag s_wxluatagArray_wxLua_wxStyledTextCtrl_SetWordChars[] = { &s_wxluatag_wxStyledTextCtrl, &s_wxluaarg_String, NULL }; --- 6749,6753 ---- } ! #endif // wxCHECK_VERSION(2,8,0) static wxLuaArgTag s_wxluatagArray_wxLua_wxStyledTextCtrl_SetWordChars[] = { &s_wxluatag_wxStyledTextCtrl, &s_wxluaarg_String, NULL }; *************** *** 7067,7071 **** ! #if wxLUA_USE_wxColourPenBrush static wxLuaArgTag s_wxluatagArray_wxLua_wxStyledTextCtrl_StyleSetBackground[] = { &s_wxluatag_wxStyledTextCtrl, &s_wxluaarg_Number, &s_wxluatag_wxColour, NULL }; static int LUACALL wxLua_wxStyledTextCtrl_StyleSetBackground(lua_State *L); --- 7067,7071 ---- ! #if wxCHECK_VERSION(2,8,0) static wxLuaArgTag s_wxluatagArray_wxLua_wxStyledTextCtrl_StyleSetBackground[] = { &s_wxluatag_wxStyledTextCtrl, &s_wxluaarg_Number, &s_wxluatag_wxColour, NULL }; static int LUACALL wxLua_wxStyledTextCtrl_StyleSetBackground(lua_State *L); *************** *** 7087,7091 **** } ! #endif // wxLUA_USE_wxColourPenBrush static wxLuaArgTag s_wxluatagArray_wxLua_wxStyledTextCtrl_StyleSetBold[] = { &s_wxluatag_wxStyledTextCtrl, &s_wxluaarg_Number, &s_wxluaarg_Boolean, NULL }; --- 7087,7091 ---- } ! #endif // wxCHECK_VERSION(2,8,0) static wxLuaArgTag s_wxluatagArray_wxLua_wxStyledTextCtrl_StyleSetBold[] = { &s_wxluatag_wxStyledTextCtrl, &s_wxluaarg_Number, &s_wxluaarg_Boolean, NULL }; *************** *** 7276,7280 **** #endif // wxLUA_USE_wxFont ! #if wxLUA_USE_wxColourPenBrush static wxLuaArgTag s_wxluatagArray_wxLua_wxStyledTextCtrl_StyleSetForeground[] = { &s_wxluatag_wxStyledTextCtrl, &s_wxluaarg_Number, &s_wxluatag_wxColour, NULL }; static int LUACALL wxLua_wxStyledTextCtrl_StyleSetForeground(lua_State *L); --- 7276,7280 ---- #endif // wxLUA_USE_wxFont ! #if wxCHECK_VERSION(2,8,0) static wxLuaArgTag s_wxluatagArray_wxLua_wxStyledTextCtrl_StyleSetForeground[] = { &s_wxluatag_wxStyledTextCtrl, &s_wxluaarg_Number, &s_wxluatag_wxColour, NULL }; static int LUACALL wxLua_wxStyledTextCtrl_StyleSetForeground(lua_State *L); *************** *** 7296,7300 **** } ! #endif // wxLUA_USE_wxColourPenBrush static wxLuaArgTag s_wxluatagArray_wxLua_wxStyledTextCtrl_StyleSetHotSpot[] = { &s_wxluatag_wxStyledTextCtrl, &s_wxluaarg_Number, &s_wxluaarg_Boolean, NULL }; --- 7296,7300 ---- } ! #endif // wxCHECK_VERSION(2,8,0) static wxLuaArgTag s_wxluatagArray_wxLua_wxStyledTextCtrl_StyleSetHotSpot[] = { &s_wxluatag_wxStyledTextCtrl, &s_wxluaarg_Number, &s_wxluaarg_Boolean, NULL }; *************** *** 8033,8041 **** { "CallTipPosAtStart", WXLUAMETHOD_METHOD, s_wxluafunc_wxLua_wxStyledTextCtrl_CallTipPosAtStart, 1, NULL }, ! #if wxLUA_USE_wxColourPenBrush { "CallTipSetBackground", WXLUAMETHOD_METHOD, s_wxluafunc_wxLua_wxStyledTextCtrl_CallTipSetBackground, 1, NULL }, { "CallTipSetForeground", WXLUAMETHOD_METHOD, s_wxluafunc_wxLua_wxStyledTextCtrl_CallTipSetForeground, 1, NULL }, { "CallTipSetForegroundHighlight", WXLUAMETHOD_METHOD, s_wxluafunc_wxLua_wxStyledTextCtrl_CallTipSetForegroundHighlight, 1, NULL }, ! #endif // wxLUA_USE_wxColourPenBrush { "CallTipSetHighlight", WXLUAMETHOD_METHOD, s_wxluafunc_wxLua_wxStyledTextCtrl_CallTipSetHighlight, 1, NULL }, --- 8033,8041 ---- { "CallTipPosAtStart", WXLUAMETHOD_METHOD, s_wxluafunc_wxLua_wxStyledTextCtrl_CallTipPosAtStart, 1, NULL }, ! #if wxCHECK_VERSION(2,8,0) { "CallTipSetBackground", WXLUAMETHOD_METHOD, s_wxluafunc_wxLua_wxStyledTextCtrl_CallTipSetBackground, 1, NULL }, { "CallTipSetForeground", WXLUAMETHOD_METHOD, s_wxluafunc_wxLua_wxStyledTextCtrl_CallTipSetForeground, 1, NULL }, { "CallTipSetForegroundHighlight", WXLUAMETHOD_METHOD, s_wxluafunc_wxLua_wxStyledTextCtrl_CallTipSetForegroundHighlight, 1, NULL }, ! #endif // wxCHECK_VERSION(2,8,0) { "CallTipSetHighlight", WXLUAMETHOD_METHOD, s_wxluafunc_wxLua_wxStyledTextCtrl_CallTipSetHighlight, 1, NULL }, *************** *** 8088,8094 **** { "FormFeed", WXLUAMETHOD_METHOD, s_wxluafunc_wxLua_wxStyledTextCtrl_FormFeed, 1, NULL }, ! #if (wxLUA_USE_wxPointSizeRect) && (wxLUA_USE_wxDC) { "FormatRange", WXLUAMETHOD_METHOD, s_wxluafunc_wxLua_wxStyledTextCtrl_FormatRange, 1, NULL }, ! #endif // (wxLUA_USE_wxPointSizeRect) && (wxLUA_USE_wxDC) { "GetAnchor", WXLUAMETHOD_METHOD, s_wxluafunc_wxLua_wxStyledTextCtrl_GetAnchor, 1, NULL }, --- 8088,8094 ---- { "FormFeed", WXLUAMETHOD_METHOD, s_wxluafunc_wxLua_wxStyledTextCtrl_FormFeed, 1, NULL }, ! #if (wxLUA_USE_wxPointSizeRect) && (wxCHECK_VERSION(2,8,0)) { "FormatRange", WXLUAMETHOD_METHOD, s_wxluafunc_wxLua_wxStyledTextCtrl_FormatRange, 1, NULL }, ! #endif // (wxLUA_USE_wxPointSizeRect) && (wxCHECK_VERSION(2,8,0)) { "GetAnchor", WXLUAMETHOD_METHOD, s_wxluafunc_wxLua_wxStyledTextCtrl_GetAnchor, 1, NULL }, *************** *** 8096,8110 **** { "GetBufferedDraw", WXLUAMETHOD_METHOD, s_wxluafunc_wxLua_wxStyledTextCtrl_GetBufferedDraw, 1, NULL }, ! #if wxLUA_USE_wxColourPenBrush { "GetCaretForeground", WXLUAMETHOD_METHOD, s_wxluafunc_wxLua_wxStyledTextCtrl_GetCaretForeground, 1, NULL }, ! #endif // wxLUA_USE_wxColourPenBrush ! #if (!wxCHECK_VERSION(2,8,0)) && (wxLUA_USE_wxColourPenBrush) { "GetCaretLineBack", WXLUAMETHOD_METHOD, s_wxluafunc_wxLua_wxStyledTextCtrl_GetCaretLineBack, 1, NULL }, ! #endif // (!wxCHECK_VERSION(2,8,0)) && (wxLUA_USE_wxColourPenBrush) ! #if (wxLUA_USE_wxColourPenBrush) && (wxCHECK_VERSION(2,8,0)) { "GetCaretLineBackground", WXLUAMETHOD_METHOD, s_wxluafunc_wxLua_wxStyledTextCtrl_GetCaretLineBackground, 1, NULL }, ! #endif // (wxLUA_USE_wxColourPenBrush) && (wxCHECK_VERSION(2,8,0)) { "GetCaretLineVisible", WXLUAMETHOD_METHOD, s_wxluafunc_wxLua_wxStyledTextCtrl_GetCaretLineVisible, 1, NULL }, --- 8096,8110 ---- { "GetBufferedDraw", WXLUAMETHOD_METHOD, s_wxluafunc_wxLua_wxStyledTextCtrl_GetBufferedDraw, 1, NULL }, ! #if wxCHECK_VERSION(2,8,0) { "GetCaretForeground", WXLUAMETHOD_METHOD, s_wxluafunc_wxLua_wxStyledTextCtrl_GetCaretForeground, 1, NULL }, ! #endif // wxCHECK_VERSION(2,8,0) ! #if (!wxCHECK_VERSION(2,8,0)) && (wxCHECK_VERSION(2,8,0)) { "GetCaretLineBack", WXLUAMETHOD_METHOD, s_wxluafunc_wxLua_wxStyledTextCtrl_GetCaretLineBack, 1, NULL }, ! #endif // (!wxCHECK_VERSION(2,8,0)) && (wxCHECK_VERSION(2,8,0)) ! #if wxCHECK_VERSION(2,8,0) { "GetCaretLineBackground", WXLUAMETHOD_METHOD, s_wxluafunc_wxLua_wxStyledTextCtrl_GetCaretLineBackground, 1, NULL }, ! #endif // wxCHECK_VERSION(2,8,0) { "GetCaretLineVisible", WXLUAMETHOD_METHOD, s_wxluafunc_wxLua_wxStyledTextCtrl_GetCaretLineVisible, 1, NULL }, *************** *** 8122,8128 **** { "GetEOLMode", WXLUAMETHOD_METHOD, s_wxluafunc_wxLua_wxStyledTextCtrl_GetEOLMode, 1, NULL }, ! #if wxLUA_USE_wxColourPenBrush { "GetEdgeColour", WXLUAMETHOD_METHOD, s_wxluafunc_wxLua_wxStyledTextCtrl_GetEdgeColour, 1, NULL }, ! #endif // wxLUA_USE_wxColourPenBrush { "GetEdgeColumn", WXLUAMETHOD_METHOD, s_wxluafunc_wxLua_wxStyledTextCtrl_GetEdgeColumn, 1, NULL }, --- 8122,8128 ---- { "GetEOLMode", WXLUAMETHOD_METHOD, s_wxluafunc_wxLua_wxStyledTextCtrl_GetEOLMode, 1, NULL }, ! #if wxCHECK_VERSION(2,8,0) { "GetEdgeColour", WXLUAMETHOD_METHOD, s_wxluafunc_wxLua_wxStyledTextCtrl_GetEdgeColour, 1, NULL }, ! #endif // wxCHECK_VERSION(2,8,0) { "GetEdgeColumn", WXLUAMETHOD_METHOD, s_wxluafunc_wxLua_wxStyledTextCtrl_GetEdgeColumn, 1, NULL }, *************** *** 8217,8229 **** { "HomeWrapExtend", WXLUAMETHOD_METHOD, s_wxluafunc_wxLua_wxStyledTextCtrl_HomeWrapExtend, 1, NULL }, ! #if wxLUA_USE_wxColourPenBrush { "IndicatorGetForeground", WXLUAMETHOD_METHOD, s_wxluafunc_wxLua_wxStyledTextCtrl_IndicatorGetForeground, 1, NULL }, ! #endif // wxLUA_USE_wxColourPenBrush { "IndicatorGetStyle", WXLUAMETHOD_METHOD, s_wxluafunc_wxLua_wxStyledTextCtrl_IndicatorGetStyle, 1, NULL }, ! #if wxLUA_USE_wxColourPenBrush { "IndicatorSetForeground", WXLUAMETHOD_METHOD, s_wxluafunc_wxLua_wxStyledTextCtrl_IndicatorSetForeground, 1, NULL }, ! #endif // wxLUA_USE_wxColourPenBrush { "IndicatorSetStyle", WXLUAMETHOD_METHOD, s_wxluafunc_wxLua_wxStyledTextCtrl_IndicatorSetStyle, 1, NULL }, --- 8217,8229 ---- { "HomeWrapExtend", WXLUAMETHOD_METHOD, s_wxluafunc_wxLua_wxStyledTextCtrl_HomeWrapExtend, 1, NULL }, ! #if wxCHECK_VERSION(2,8,0) { "IndicatorGetForeground", WXLUAMETHOD_METHOD, s_wxluafunc_wxLua_wxStyledTextCtrl_IndicatorGetForeground, 1, NULL }, ! #endif // wxCHECK_VERSION(2,8,0) { "IndicatorGetStyle", WXLUAMETHOD_METHOD, s_wxluafunc_wxLua_wxStyledTextCtrl_IndicatorGetStyle, 1, NULL }, ! #if wxCHECK_VERSION(2,8,0) { "IndicatorSetForeground", WXLUAMETHOD_METHOD, s_wxluafunc_wxLua_wxStyledTextCtrl_IndicatorSetForeground, 1, NULL }, ! #endif // wxCHECK_VERSION(2,8,0) { "IndicatorSetStyle", WXLUAMETHOD_METHOD, s_wxluafunc_wxLua_wxStyledTextCtrl_IndicatorSetStyle, 1, NULL }, *************** *** 8261,8267 **** { "MarkerAddSet", WXLUAMETHOD_METHOD, s_wxluafunc_wxLua_wxStyledTextCtrl_MarkerAddSet, 1, NULL }, ! #if wxLUA_USE_wxColourPenBrush { "MarkerDefine", WXLUAMETHOD_METHOD, s_wxluafunc_wxLua_wxStyledTextCtrl_MarkerDefine, 1, NULL }, ! #endif // wxLUA_USE_wxColourPenBrush #if wxLUA_USE_wxBitmap --- 8261,8267 ---- { "MarkerAddSet", WXLUAMETHOD_METHOD, s_wxluafunc_wxLua_wxStyledTextCtrl_MarkerAddSet, 1, NULL }, ! #if wxCHECK_VERSION(2,8,0) { "MarkerDefine", WXLUAMETHOD_METHOD, s_wxluafunc_wxLua_wxStyledTextCtrl_MarkerDefine, 1, NULL }, ! #endif // wxCHECK_VERSION(2,8,0) #if wxLUA_USE_wxBitmap *************** *** 8277,8284 **** { "MarkerPrevious", WXLUAMETHOD_METHOD, s_wxluafunc_wxLua_wxStyledTextCtrl_MarkerPrevious, 1, NULL }, ! #if wxLUA_USE_wxColourPenBrush { "MarkerSetBackground", WXLUAMETHOD_METHOD, s_wxluafunc_wxLua_wxStyledTextCtrl_MarkerSetBackground, 1, NULL }, { "MarkerSetForeground", WXLUAMETHOD_METHOD, s_wxluafunc_wxLua_wxStyledTextCtrl_MarkerSetForeground, 1, NULL }, ! #endif // wxLUA_USE_wxColourPenBrush { "MoveCaretInsideView", WXLUAMETHOD_METHOD, s_wxluafunc_wxLua_wxStyledTextCtrl_MoveCaretInsideView, 1, NULL }, --- 8277,8284 ---- { "MarkerPrevious", WXLUAMETHOD_METHOD, s_wxluafunc_wxLua_wxStyledTextCtrl_MarkerPrevious, 1, NULL }, ! #if wxCHECK_VERSION(2,8,0) { "MarkerSetBackground", WXLUAMETHOD_METHOD, s_wxluafunc_wxLua_wxStyledTextCtrl_MarkerSetBackground, 1, NULL }, { "MarkerSetForeground", WXLUAMETHOD_METHOD, s_wxluafunc_wxLua_wxStyledTextCtrl_MarkerSetForeground, 1, NULL }, ! #endif // wxCHECK_VERSION(2,8,0) { "MoveCaretInsideView", WXLUAMETHOD_METHOD, s_wxluafunc_wxLua_wxStyledTextCtrl_MoveCaretInsideView, 1, NULL }, *************** *** 8334,8348 **** { "SetBufferedDraw", WXLUAMETHOD_METHOD, s_wxluafunc_wxLua_wxStyledTextCtrl_SetBufferedDraw, 1, NULL }, ! #if wxLUA_USE_wxColourPenBrush { "SetCaretForeground", WXLUAMETHOD_METHOD, s_wxluafunc_wxLua_wxStyledTextCtrl_SetCaretForeground, 1, NULL }, ! #endif // wxLUA_USE_wxColourPenBrush ! #if (!wxCHECK_VERSION(2,8,0)) && (wxLUA_USE_wxColourPenBrush) { "SetCaretLineBack", WXLUAMETHOD_METHOD, s_wxluafunc_wxLua_wxStyledTextCtrl_SetCaretLineBack, 1, NULL }, ! #endif // (!wxCHECK_VERSION(2,8,0)) && (wxLUA_USE_wxColourPenBrush) ! #if (wxLUA_USE_wxColourPenBrush) && (wxCHECK_VERSION(2,8,0)) { "SetCaretLineBackground", WXLUAMETHOD_METHOD, s_wxluafunc_wxLua_wxStyledTextCtrl_SetCaretLineBackground, 1, NULL }, ! #endif // (wxLUA_USE_wxColourPenBrush) && (wxCHECK_VERSION(2,8,0)) { "SetCaretLineVisible", WXLUAMETHOD_METHOD, s_wxluafunc_wxLua_wxStyledTextCtrl_SetCaretLineVisible, 1, NULL }, --- 8334,8348 ---- { "SetBufferedDraw", WXLUAMETHOD_METHOD, s_wxluafunc_wxLua_wxStyledTextCtrl_SetBufferedDraw, 1, NULL }, ! #if wxCHECK_VERSION(2,8,0) { "SetCaretForeground", WXLUAMETHOD_METHOD, s_wxluafunc_wxLua_wxStyledTextCtrl_SetCaretForeground, 1, NULL }, ! #endif // wxCHECK_VERSION(2,8,0) ! #if (!wxCHECK_VERSION(2,8,0)) && (wxCHECK_VERSION(2,8,0)) { "SetCaretLineBack", WXLUAMETHOD_METHOD, s_wxluafunc_wxLua_wxStyledTextCtrl_SetCaretLineBack, 1, NULL }, ! #endif // (!wxCHECK_VERSION(2,8,0)) && (wxCHECK_VERSION(2,8,0)) ! #if wxCHECK_VERSION(2,8,0) { "SetCaretLineBackground", WXLUAMETHOD_METHOD, s_wxluafunc_wxLua_wxStyledTextCtrl_SetCaretLineBackground, 1, NULL }, ! #endif // wxCHECK_VERSION(2,8,0) { "SetCaretLineVisible", WXLUAMETHOD_METHOD, s_wxluafunc_wxLua_wxStyledTextCtrl_SetCaretLineVisible, 1, NULL }, *************** *** 8357,8363 **** { "SetEOLMode", WXLUAMETHOD_METHOD, s_wxluafunc_wxLua_wxStyledTextCtrl_SetEOLMode, 1, NULL }, ! #if wxLUA_USE_wxColourPenBrush { "SetEdgeColour", WXLUAMETHOD_METHOD, s_wxluafunc_wxLua_wxStyledTextCtrl_SetEdgeColour, 1, NULL }, ! #endif // wxLUA_USE_wxColourPenBrush { "SetEdgeColumn", WXLUAMETHOD_METHOD, s_wxluafunc_wxLua_wxStyledTextCtrl_SetEdgeColumn, 1, NULL }, --- 8357,8363 ---- { "SetEOLMode", WXLUAMETHOD_METHOD, s_wxluafunc_wxLua_wxStyledTextCtrl_SetEOLMode, 1, NULL }, ! #if wxCHECK_VERSION(2,8,0) { "SetEdgeColour", WXLUAMETHOD_METHOD, s_wxluafunc_wxLua_wxStyledTextCtrl_SetEdgeColour, 1, NULL }, ! #endif // wxCHECK_VERSION(2,8,0) { "SetEdgeColumn", WXLUAMETHOD_METHOD, s_wxluafunc_wxLua_wxStyledTextCtrl_SetEdgeColumn, 1, NULL }, *************** *** 8368,8375 **** { "SetFoldLevel", WXLUAMETHOD_METHOD, s_wxluafunc_wxLua_wxStyledTextCtrl_SetFoldLevel, 1, NULL }, ! #if wxLUA_USE_wxColourPenBrush { "SetFoldMarginColour", WXLUAMETHOD_METHOD, s_wxluafunc_wxLua_wxStyledTextCtrl_SetFoldMarginColour, 1, NULL }, { "SetFoldMarginHiColour", WXLUAMETHOD_METHOD, s_wxluafunc_wxLua_wxStyledTextCtrl_SetFoldMarginHiColour, 1, NULL }, ! #endif // wxLUA_USE_wxColourPenBrush #if wxLUA_USE_wxScrollBar && wxUSE_SCROLLBAR --- 8368,8375 ---- { "SetFoldLevel", WXLUAMETHOD_METHOD, s_wxluafunc_wxLua_wxStyledTextCtrl_SetFoldLevel, 1, NULL }, ! #if wxCHECK_VERSION(2,8,0) { "SetFoldMarginColour", WXLUAMETHOD_METHOD, s_wxluafunc_wxLua_wxStyledTextCtrl_SetFoldMarginColour, 1, NULL }, { "SetFoldMarginHiColour", WXLUAMETHOD_METHOD, s_wxluafunc_wxLua_wxStyledTextCtrl_SetFoldMarginHiColour, 1, NULL }, ! #endif // wxCHECK_VERSION(2,8,0) #if wxLUA_USE_wxScrollBar && wxUSE_SCROLLBAR *************** *** 8379,8386 **** { "SetHighlightGuide", WXLUAMETHOD_METHOD, s_wxluafunc_wxLua_wxStyledTextCtrl_SetHighlightGuide, 1, NULL }, ! #if wxLUA_USE_wxColourPenBrush { "SetHotspotActiveBackground", WXLUAMETHOD_METHOD, s_wxluafunc_wxLua_wxStyledTextCtrl_SetHotspotActiveBackground, 1, NULL }, { "SetHotspotActiveForeground", WXLUAMETHOD_METHOD, s_wxluafunc_wxLua_wxStyledTextCtrl_SetHotspotActiveForeground, 1, NULL }, ! #endif // wxLUA_USE_wxColourPenBrush { "SetHotspotActiveUnderline", WXLUAMETHOD_METHOD, s_wxluafunc_wxLua_wxStyledTextCtrl_SetHotspotActiveUnderline, 1, NULL }, --- 8379,8386 ---- { "SetHighlightGuide", WXLUAMETHOD_METHOD, s_wxluafunc_wxLua_wxStyledTextCtrl_SetHighlightGuide, 1, NULL }, ! #if wxCHECK_VERSION(2,8,0) { "SetHotspotActiveBackground", WXLUAMETHOD_METHOD, s_wxluafunc_wxLua_wxStyledTextCtrl_SetHotspotActiveBackground, 1, NULL }, { "SetHotspotActiveForeground", WXLUAMETHOD_METHOD, s_wxluafunc_wxLua_wxStyledTextCtrl_SetHotspotActiveForeground, 1, NULL }, ! #endif // wxCHECK_VERSION(2,8,0) { "SetHotspotActiveUnderline", WXLUAMETHOD_METHOD, s_wxluafunc_wxLua_wxStyledTextCtrl_SetHotspotActiveUnderline, 1, NULL }, *************** *** 8418,8425 **** { "SetSearchFlags", WXLUAMETHOD_METHOD, s_wxluafunc_wxLua_wxStyledTextCtrl_SetSearchFlags, 1, NULL }, ! #if wxLUA_USE_wxColourPenBrush { "SetSelBackground", WXLUAMETHOD_METHOD, s_wxluafunc_wxLua_wxStyledTextCtrl_SetSelBackground, 1, NULL }, { "SetSelForeground", WXLUAMETHOD_METHOD, s_wxluafunc_wxLua_wxStyledTextCtrl_SetSelForeground, 1, NULL }, ! #endif // wxLUA_USE_wxColourPenBrush { "SetSelection", WXLUAMETHOD_METHOD, s_wxluafunc_wxLua_wxStyledTextCtrl_SetSelection, 1, NULL }, --- 8418,8425 ---- { "SetSearchFlags", WXLUAMETHOD_METHOD, s_wxluafunc_wxLua_wxStyledTextCtrl_SetSearchFlags, 1, NULL }, ! #if wxCHECK_VERSION(2,8,0) { "SetSelBackground", WXLUAMETHOD_METHOD, s_wxluafunc_wxLua_wxStyledTextCtrl_SetSelBackground, 1, NULL }, { "SetSelForeground", WXLUAMETHOD_METHOD, s_wxluafunc_wxLua_wxStyledTextCtrl_SetSelForeground, 1, NULL }, ! #endif // wxCHECK_VERSION(2,8,0) { "SetSelection", WXLUAMETHOD_METHOD, s_wxluafunc_wxLua_wxStyledTextCtrl_SetSelection, 1, NULL }, *************** *** 8451,8463 **** { "SetVisiblePolicy", WXLUAMETHOD_METHOD, s_wxluafunc_wxLua_wxStyledTextCtrl_SetVisiblePolicy, 1, NULL }, ! #if wxLUA_USE_wxColourPenBrush { "SetWhitespaceBackground", WXLUAMETHOD_METHOD, s_wxluafunc_wxLua_wxStyledTextCtrl_SetWhitespaceBackground, 1, NULL }, ! #endif // wxLUA_USE_wxColourPenBrush { "SetWhitespaceChars", WXLUAMETHOD_METHOD, s_wxluafunc_wxLua_wxStyledTextCtrl_SetWhitespaceChars, 1, NULL }, ! #if wxLUA_USE_wxColourPenBrush { "SetWhitespaceForeground", WXLUAMETHOD_METHOD, s_wxluafunc_wxLua_wxStyledTextCtrl_SetWhitespaceForeground, 1, NULL }, ! #endif // wxLUA_USE_wxColourPenBrush { "SetWordChars", WXLUAMETHOD_METHOD, s_wxluafunc_wxLua_wxStyledTextCtrl_SetWordChars, 1, NULL }, --- 8451,8463 ---- { "SetVisiblePolicy", WXLUAMETHOD_METHOD, s_wxluafunc_wxLua_wxStyledTextCtrl_SetVisiblePolicy, 1, NULL }, ! #if wxCHECK_VERSION(2,8,0) { "SetWhitespaceBackground", WXLUAMETHOD_METHOD, s_wxluafunc_wxLua_wxStyledTextCtrl_SetWhitespaceBackground, 1, NULL }, ! #endif // wxCHECK_VERSION(2,8,0) { "SetWhitespaceChars", WXLUAMETHOD_METHOD, s_wxluafunc_wxLua_wxStyledTextCtrl_SetWhitespaceChars, 1, NULL }, ! #if wxCHECK_VERSION(2,8,0) { "SetWhitespaceForeground", WXLUAMETHOD_METHOD, s_wxluafunc_wxLua_wxStyledTextCtrl_SetWhitespaceForeground, 1, NULL }, ! #endif // wxCHECK_VERSION(2,8,0) { "SetWordChars", WXLUAMETHOD_METHOD, s_wxluafunc_wxLua_wxStyledTextCtrl_SetWordChars, 1, NULL }, *************** *** 8481,8487 **** { "StyleResetDefault", WXLUAMETHOD_METHOD, s_wxluafunc_wxLua_wxStyledTextCtrl_StyleResetDefault, 1, NULL }, ! #if wxLUA_USE_wxColourPenBrush { "StyleSetBackground", WXLUAMETHOD_METHOD, s_wxluafunc_wxLua_wxStyledTextCtrl_StyleSetBackground, 1, NULL }, ! #endif // wxLUA_USE_wxColourPenBrush { "StyleSetBold", WXLUAMETHOD_METHOD, s_wxluafunc_wxLua_wxStyledTextCtrl_StyleSetBold, 1, NULL }, --- 8481,8487 ---- { "StyleResetDefault", WXLUAMETHOD_METHOD, s_wxluafunc_wxLua_wxStyledTextCtrl_StyleResetDefault, 1, NULL }, ! #if wxCHECK_VERSION(2,8,0) { "StyleSetBackground", WXLUAMETHOD_METHOD, s_wxluafunc_wxLua_wxStyledTextCtrl_StyleSetBackground, 1, NULL }, ! #endif // wxCHECK_VERSION(2,8,0) { "StyleSetBold", WXLUAMETHOD_METHOD, s_wxluafunc_wxLua_wxStyledTextCtrl_StyleSetBold, 1, NULL }, *************** *** 8498,8504 **** #endif // wxLUA_USE_wxFont ! #if wxLUA_USE_wxColourPenBrush { "StyleSetForeground", WXLUAMETHOD_METHOD, s_wxluafunc_wxLua_wxStyledTextCtrl_StyleSetForeground, 1, NULL }, ! #endif // wxLUA_USE_wxColourPenBrush { "StyleSetHotSpot", WXLUAMETHOD_METHOD, s_wxluafunc_wxLua_wxStyledTextCtrl_StyleSetHotSpot, 1, NULL }, --- 8498,8504 ---- #endif // wxLUA_USE_wxFont ! #if wxCHECK_VERSION(2,8,0) { "StyleSetForeground", WXLUAMETHOD_METHOD, s_wxluafunc_wxLua_wxStyledTextCtrl_StyleSetForeground, 1, NULL }, ! #endif // wxCHECK_VERSION(2,8,0) { "StyleSetHotSpot", WXLUAMETHOD_METHOD, s_wxluafunc_wxLua_wxStyledTextCtrl_StyleSetHotSpot, 1, NULL }, |
Update of /cvsroot/wxlua/wxLua/bindings/wxwidgets In directory sc8-pr-cvs9.sourceforge.net:/tmp/cvs-serv7428/wxLua/bindings/wxwidgets Modified Files: appframe.i clipdrag.i controls.i data.i datetime.i defsutil.i dialogs.i event.i file.i gdi.i help.i html.i image.i mdi.i menutool.i override.hpp print.i sizer.i wave.i windows.i wx_datatypes.lua xml.i Log Message: Add more classes from wxWidgets 2.8 Index: wave.i =================================================================== RCS file: /cvsroot/wxlua/wxLua/bindings/wxwidgets/wave.i,v retrieving revision 1.19 retrieving revision 1.20 diff -C2 -d -r1.19 -r1.20 *** wave.i 17 Jun 2007 17:17:37 -0000 1.19 --- wave.i 18 Jun 2007 02:56:24 -0000 1.20 *************** *** 40,44 **** // wxWave ! %if %msw & !%wxchkver_2_5 & wxUSE_WAVE %include "wx/wave.h" --- 40,44 ---- // wxWave ! %if %msw & !%wxchkver_2_6 & wxUSE_WAVE %include "wx/wave.h" *************** *** 50,58 **** bool Create(const wxString& fileName, bool isResource = false) bool IsOk() const ! !%wxchkver_2_5 bool Play(bool async = true, bool looped = false) const ! %wxchkver_2_5 bool Play(unsigned int flags = wxSOUND_ASYNC) const %endclass ! %endif // %msw & !%wxchkver_2_5 & wxUSE_WAVE %endif //wxLUA_USE_wxWave --- 50,58 ---- bool Create(const wxString& fileName, bool isResource = false) bool IsOk() const ! !%wxchkver_2_6 bool Play(bool async = true, bool looped = false) const ! %wxchkver_2_6 bool Play(unsigned int flags = wxSOUND_ASYNC) const %endclass ! %endif // %msw & !%wxchkver_2_6 & wxUSE_WAVE %endif //wxLUA_USE_wxWave Index: menutool.i =================================================================== RCS file: /cvsroot/wxlua/wxLua/bindings/wxwidgets/menutool.i,v retrieving revision 1.21 retrieving revision 1.22 diff -C2 -d -r1.21 -r1.22 *** menutool.i 17 Jun 2007 17:17:37 -0000 1.21 --- menutool.i 18 Jun 2007 02:56:24 -0000 1.22 *************** *** 265,269 **** // wxToolBarSimple ! %if !%wxchkver_2_5 %include "wx/tbarsmpl.h" --- 265,269 ---- // wxToolBarSimple ! %if !%wxchkver_2_6 %include "wx/tbarsmpl.h" *************** *** 277,281 **** %endclass ! %endif // !%wxchkver_2_5 // --------------------------------------------------------------------------- --- 277,281 ---- %endclass ! %endif // !%wxchkver_2_6 // --------------------------------------------------------------------------- Index: clipdrag.i =================================================================== RCS file: /cvsroot/wxlua/wxLua/bindings/wxwidgets/clipdrag.i,v retrieving revision 1.28 retrieving revision 1.29 diff -C2 -d -r1.28 -r1.29 *** clipdrag.i 17 Jun 2007 17:17:37 -0000 1.28 --- clipdrag.i 18 Jun 2007 02:56:23 -0000 1.29 *************** *** 16,21 **** %class wxClipboard, wxObject ! !%wxchkver_2_5 %define_pointer wxTheClipboard ! %wxchkver_2_5 static wxClipboard *Get() // wxClipboard() use global clipboard only --- 16,21 ---- %class wxClipboard, wxObject ! !%wxchkver_2_6 %define_pointer wxTheClipboard ! %wxchkver_2_6 static wxClipboard *Get() // wxClipboard() use global clipboard only Index: data.i =================================================================== RCS file: /cvsroot/wxlua/wxLua/bindings/wxwidgets/data.i,v retrieving revision 1.34 retrieving revision 1.35 diff -C2 -d -r1.34 -r1.35 *** data.i 17 Jun 2007 17:17:37 -0000 1.34 --- data.i 18 Jun 2007 02:56:23 -0000 1.35 *************** *** 164,178 **** wxTextValidator(long style = wxFILTER_NONE, wxLuaObject* stringObj = NULL) ! %wxchkver_2_5 wxArrayString& GetExcludes() ! %wxchkver_2_5 wxArrayString& GetIncludes() long GetStyle() const void SetStyle(long style) ! %wxchkver_2_5 void SetIncludes(const wxArrayString& includes) ! %wxchkver_2_5 void SetExcludes(const wxArrayString& excludes) ! //!%wxchkver_2_5|%wxcompat_2_4 wxStringList& GetExcludeList() const ! //!%wxchkver_2_5|%wxcompat_2_4 wxStringList& GetIncludeList() const ! //!%wxchkver_2_5|%wxcompat_2_4 void SetExcludeList(const wxStringList& stringList) ! //!%wxchkver_2_5|%wxcompat_2_4 void SetIncludeList(const wxStringList& stringList) %endclass --- 164,178 ---- wxTextValidator(long style = wxFILTER_NONE, wxLuaObject* stringObj = NULL) ! %wxchkver_2_6 wxArrayString& GetExcludes() ! %wxchkver_2_6 wxArrayString& GetIncludes() long GetStyle() const void SetStyle(long style) ! %wxchkver_2_6 void SetIncludes(const wxArrayString& includes) ! %wxchkver_2_6 void SetExcludes(const wxArrayString& excludes) ! //!%wxchkver_2_6|%wxcompat_2_4 wxStringList& GetExcludeList() const ! //!%wxchkver_2_6|%wxcompat_2_4 wxStringList& GetIncludeList() const ! //!%wxchkver_2_6|%wxcompat_2_4 void SetExcludeList(const wxStringList& stringList) ! //!%wxchkver_2_6|%wxcompat_2_4 void SetIncludeList(const wxStringList& stringList) %endclass *************** *** 406,410 **** //%include "wx/hash.h" ! //%if %wxchkver_2_5 //%class %noclassinfo wxHashTable::Node //%endclass --- 406,410 ---- //%include "wx/hash.h" ! //%if %wxchkver_2_6 //%class %noclassinfo wxHashTable::Node //%endclass *************** *** 412,417 **** //%class %noclassinfo wxHashTable, wxObject ! // !%wxchkver_2_5 wxHashTable(unsigned int key_type, int size = 1000) ! // %wxchkver_2_5 wxHashTable(wxKeyType key_type, int size = 1000) // void BeginFind() // void Clear() --- 412,417 ---- //%class %noclassinfo wxHashTable, wxObject ! // !%wxchkver_2_6 wxHashTable(unsigned int key_type, int size = 1000) ! // %wxchkver_2_6 wxHashTable(wxKeyType key_type, int size = 1000) // void BeginFind() // void Clear() *************** *** 421,426 **** // wxObject * Get(const wxString &key) // long MakeKey(const wxString& string) ! // !%wxchkver_2_5 wxNode * Next() ! // %wxchkver_2_5 wxHashTable::Node * Next() // void Put(long key, wxObject *object) // void Put(const wxString & key, wxObject *object) --- 421,426 ---- // wxObject * Get(const wxString &key) // long MakeKey(const wxString& string) ! // !%wxchkver_2_6 wxNode * Next() ! // %wxchkver_2_6 wxHashTable::Node * Next() // void Put(long key, wxObject *object) // void Put(const wxString & key, wxObject *object) Index: wx_datatypes.lua =================================================================== RCS file: /cvsroot/wxlua/wxLua/bindings/wxwidgets/wx_datatypes.lua,v retrieving revision 1.69 retrieving revision 1.70 diff -C2 -d -r1.69 -r1.70 *** wx_datatypes.lua 17 Jun 2007 18:36:06 -0000 1.69 --- wx_datatypes.lua 18 Jun 2007 02:56:25 -0000 1.70 *************** *** 238,241 **** --- 238,261 ---- Name = "wxAlignment", }, + wxAnimation = { + BaseClass = "wxGDIObject", + Condition = "wxLUA_USE_Animation && wxUSE_ANIMATIONCTRL && wxchkver_2_8", + DefType = "class", + IsNumber = false, + Name = "wxAnimation", + }, + wxAnimationCtrl = { + BaseClass = "wxControl", + Condition = "wxLUA_USE_Animation && wxUSE_ANIMATIONCTRL && wxchkver_2_8", + DefType = "class", + IsNumber = false, + Name = "wxAnimationCtrl", + }, + wxAnimationType = { + Condition = "wxLUA_USE_Animation && wxUSE_ANIMATIONCTRL && wxchkver_2_8", + DefType = "enum", + IsNumber = true, + Name = "wxAnimationType", + }, wxApp = { BaseClass = "wxEvtHandler", *************** *** 245,248 **** --- 265,273 ---- Name = "wxApp", }, + wxArchitecture = { + DefType = "enum", + IsNumber = true, + Name = "wxArchitecture", + }, wxArrayInt = { Condition = "wxLUA_USE_wxArrayInt", *************** *** 299,302 **** --- 324,332 ---- Name = "wxBackgroundStyle", }, + wxBatteryState = { + DefType = "enum", + IsNumber = true, + Name = "wxBatteryState", + }, wxBestHelpController = { BaseClass = "wxHelpControllerBase", *************** *** 320,323 **** --- 350,360 ---- Name = "wxBitmapButton", }, + wxBitmapComboBox = { + BaseClass = "wxControlWithItems", + Condition = "wxLUA_USE_wxBitmapComboBox && wxUSE_BITMAPCOMBOBOX", + DefType = "class", + IsNumber = false, + Name = "wxBitmapComboBox", + }, wxBitmapDataObject = { BaseClass = "wxDataObjectSimple", *************** *** 568,571 **** --- 605,622 ---- Name = "wxCloseEvent", }, + wxCollapsiblePane = { + BaseClass = "wxControl", + Condition = "wxchkver_2_8 && wxLUA_USE_wxCollapsiblePane && wxUSE_COLLPANE", + DefType = "class", + IsNumber = false, + Name = "wxCollapsiblePane", + }, + wxCollapsiblePaneEvent = { + BaseClass = "wxCommandEvent", + Condition = "wxchkver_2_8 && wxLUA_USE_wxCollapsiblePane && wxUSE_COLLPANE", + DefType = "class", + IsNumber = false, + Name = "wxCollapsiblePaneEvent", + }, wxColour = { BaseClass = "wxGDIObject", *************** *** 677,680 **** --- 728,737 ---- Name = "wxContextHelpButton", }, + wxContextMenuEvent = { + BaseClass = "wxCommandEvent", + DefType = "class", + IsNumber = false, + Name = "wxContextMenuEvent", + }, wxControl = { BaseClass = "wxWindow", *************** *** 916,919 **** --- 973,990 ---- Name = "wxDocChildFrame", }, + wxDocMDIChildFrame = { + BaseClass = "wxMDIChildFrame", + Condition = "wxLUA_USE_MDI && wxUSE_MDI && wxUSE_DOC_VIEW_ARCHITECTURE", + DefType = "class", + IsNumber = false, + Name = "wxDocMDIChildFrame", + }, + wxDocMDIParentFrame = { + BaseClass = "wxMDIParentFrame", + Condition = "wxLUA_USE_MDI && wxUSE_MDI && wxUSE_DOC_VIEW_ARCHITECTURE", + DefType = "class", + IsNumber = false, + Name = "wxDocMDIParentFrame", + }, wxDocManager = { BaseClass = "wxEvtHandler", *************** *** 999,1002 **** --- 1070,1078 ---- Name = "wxEffects", }, + wxEndianness = { + DefType = "enum", + IsNumber = true, + Name = "wxEndianness", + }, wxEraseEvent = { BaseClass = "wxEvent", *************** *** 1143,1146 **** --- 1219,1240 ---- Name = "wxFilePickerCtrl", }, + wxFileType = { + DefType = "class", + Encapsulate = true, + IsNumber = false, + Name = "wxFileType", + }, + ["wxFileType::MessageParameters"] = { + DefType = "class", + Encapsulate = true, + IsNumber = false, + Name = "wxFileType::MessageParameters", + }, + wxFileTypeInfo = { + DefType = "class", + Encapsulate = true, + IsNumber = false, + Name = "wxFileTypeInfo", + }, wxFindDialogEvent = { BaseClass = "wxCommandEvent", *************** *** 1736,1740 **** }, wxHtmlWindowInterface = { ! Condition = "(wxCHECK_VERSION(2,7,0)) && (wxLUA_USE_wxHTML && wxUSE_HTML)", DefType = "class", IsNumber = false, --- 1830,1834 ---- }, wxHtmlWindowInterface = { ! Condition = "(wxCHECK_VERSION(2,8,0)) && (wxLUA_USE_wxHTML && wxUSE_HTML)", DefType = "class", IsNumber = false, *************** *** 1742,1746 **** }, ["wxHtmlWindowInterface::HTMLCursor"] = { ! Condition = "(wxCHECK_VERSION(2,7,0)) && (wxLUA_USE_wxHTML && wxUSE_HTML)", DefType = "enum", IsNumber = true, --- 1836,1840 ---- }, ["wxHtmlWindowInterface::HTMLCursor"] = { ! Condition = "(wxCHECK_VERSION(2,8,0)) && (wxLUA_USE_wxHTML && wxUSE_HTML)", DefType = "enum", IsNumber = true, *************** *** 2302,2305 **** --- 2396,2405 ---- Name = "wxMetafileDC", }, + wxMimeTypesManager = { + DefType = "class", + Encapsulate = true, + IsNumber = false, + Name = "wxMimeTypesManager", + }, wxMiniFrame = { BaseClass = "wxFrame", *************** *** 2336,2340 **** }, wxMouseState = { ! Condition = "wxCHECK_VERSION(2,7,0)", DefType = "class", Encapsulate = true, --- 2436,2440 ---- }, wxMouseState = { ! Condition = "wxCHECK_VERSION(2,8,0)", DefType = "class", Encapsulate = true, *************** *** 2395,2399 **** wxNotebookSizer = { BaseClass = "wxSizer", ! Condition = "(wxUSE_NOTEBOOK && (!wxCHECK_VERSION(2,5,0))) && (wxLUA_USE_wxSizer)", DefType = "class", IsNumber = false, --- 2495,2499 ---- wxNotebookSizer = { BaseClass = "wxSizer", ! Condition = "(wxUSE_NOTEBOOK && (!wxCHECK_VERSION(2,6,0))) && (wxLUA_USE_wxSizer)", DefType = "class", IsNumber = false, *************** *** 2418,2421 **** --- 2518,2526 ---- Name = "wxObjectRefData", }, + wxOperatingSystemId = { + DefType = "enum", + IsNumber = true, + Name = "wxOperatingSystemId", + }, wxOrientation = { DefType = "enum", *************** *** 2556,2559 **** --- 2661,2670 ---- Name = "wxPickerBase", }, + wxPlatformInfo = { + DefType = "class", + Encapsulate = true, + IsNumber = false, + Name = "wxPlatformInfo", + }, wxPoint = { Condition = "wxLUA_USE_wxPointSizeRect", *************** *** 2577,2580 **** --- 2688,2696 ---- Name = "wxPoint2DInt", }, + wxPortId = { + DefType = "enum", + IsNumber = true, + Name = "wxPortId", + }, wxPostScriptDC = { BaseClass = "wxDC", *************** *** 2584,2587 **** --- 2700,2715 ---- Name = "wxPostScriptDC", }, + wxPowerEvent = { + BaseClass = "wxEvent", + Condition = "wxHAS_POWER_EVENTS", + DefType = "class", + IsNumber = false, + Name = "wxPowerEvent", + }, + wxPowerType = { + DefType = "enum", + IsNumber = true, + Name = "wxPowerType", + }, wxPreviewCanvas = { BaseClass = "wxWindow", *************** *** 2606,2610 **** }, wxPrintBin = { ! Condition = "(wxCHECK_VERSION(2,5,0)) && (wxLUA_USE_wxPrint && wxUSE_PRINTING_ARCHITECTURE)", DefType = "enum", IsNumber = true, --- 2734,2738 ---- }, wxPrintBin = { ! Condition = "(wxCHECK_VERSION(2,6,0)) && (wxLUA_USE_wxPrint && wxUSE_PRINTING_ARCHITECTURE)", DefType = "enum", IsNumber = true, *************** *** 2724,2727 **** --- 2852,2862 ---- Name = "wxProtocolError", }, + wxQuantize = { + BaseClass = "wxObject", + Condition = "wxLUA_USE_wxImage && wxUSE_IMAGE", + DefType = "class", + IsNumber = false, + Name = "wxQuantize", + }, wxQueryLayoutInfoEvent = { BaseClass = "wxEvent", *************** *** 2905,2909 **** wxSimpleHtmlListBox = { BaseClass = "wxHtmlWindowInterface", ! Condition = "(wxCHECK_VERSION(2,7,0)) && (wxLUA_USE_wxHTML && wxUSE_HTML)", DefType = "class", IsNumber = false, --- 3040,3044 ---- wxSimpleHtmlListBox = { BaseClass = "wxHtmlWindowInterface", ! Condition = "(wxCHECK_VERSION(2,8,0)) && (wxLUA_USE_wxHTML && wxUSE_HTML)", DefType = "class", IsNumber = false, *************** *** 3372,3376 **** wxToolBarSimple = { BaseClass = "wxToolBarBase", ! Condition = "(!wxCHECK_VERSION(2,5,0)) && (wxLUA_USE_wxToolbar)", DefType = "class", IsNumber = false, --- 3507,3511 ---- wxToolBarSimple = { BaseClass = "wxToolBarBase", ! Condition = "(!wxCHECK_VERSION(2,6,0)) && (wxLUA_USE_wxToolbar)", DefType = "class", IsNumber = false, *************** *** 3574,3578 **** wxWave = { BaseClass = "wxObject", ! Condition = "(defined(__WXMSW__) && !wxCHECK_VERSION(2,5,0) && wxUSE_WAVE) && (wxLUA_USE_wxWave)", DefType = "class", IsNumber = false, --- 3709,3713 ---- wxWave = { BaseClass = "wxObject", ! Condition = "(defined(__WXMSW__) && !wxCHECK_VERSION(2,6,0) && wxUSE_WAVE) && (wxLUA_USE_wxWave)", DefType = "class", IsNumber = false, *************** *** 3762,3769 **** ["%wince"] = "defined(__WXWINCE__)", ["%wxchkver_2_4"] = "wxCHECK_VERSION(2,4,0)", - ["%wxchkver_2_5"] = "wxCHECK_VERSION(2,5,0)", ["%wxchkver_2_6"] = "wxCHECK_VERSION(2,6,0)", ["%wxchkver_2_6_4"] = "wxCHECK_VERSION(2,6,4)", - ["%wxchkver_2_7"] = "wxCHECK_VERSION(2,7,0)", ["%wxchkver_2_8"] = "wxCHECK_VERSION(2,8,0)", ["%wxchkver_2_8_1"] = "wxCHECK_VERSION(2,8,1)", --- 3897,3902 ---- *************** *** 3776,3779 **** --- 3909,3914 ---- WXWIN_COMPATIBILITY_2_6 = "(defined(WXWIN_COMPATIBILITY_2_6) && WXWIN_COMPATIBILITY_2_6)", WXWIN_COMPATIBILITY_2_8 = "(defined(WXWIN_COMPATIBILITY_2_8) && WXWIN_COMPATIBILITY_2_8)", + wxHAS_POWER_EVENTS = "wxHAS_POWER_EVENTS", + wxLUA_USE_Animation = "wxLUA_USE_Animation", wxLUA_USE_FL = "wxLUA_USE_FL", wxLUA_USE_Geometry = "wxLUA_USE_Geometry", *************** *** 3787,3790 **** --- 3922,3926 ---- wxLUA_USE_wxBitmap = "wxLUA_USE_wxBitmap", wxLUA_USE_wxBitmapButton = "wxLUA_USE_wxBitmapButton", + wxLUA_USE_wxBitmapComboBox = "wxLUA_USE_wxBitmapComboBox", wxLUA_USE_wxBrushList = "wxLUA_USE_wxBrushList", wxLUA_USE_wxBusyCursor = "wxLUA_USE_wxBusyCursor", *************** *** 3798,3801 **** --- 3934,3938 ---- wxLUA_USE_wxClassInfo = "wxLUA_USE_wxClassInfo", wxLUA_USE_wxClipboard = "wxLUA_USE_wxClipboard", + wxLUA_USE_wxCollapsiblePane = "wxLUA_USE_wxCollapsiblePane", wxLUA_USE_wxColourDialog = "wxLUA_USE_wxColourDialog", wxLUA_USE_wxColourPenBrush = "wxLUA_USE_wxColourPenBrush", *************** *** 3911,3915 **** --- 4048,4054 ---- wxUSE_ACCESSIBILITY = "wxUSE_ACCESSIBILITY", wxUSE_AFM_FOR_POSTSCRIPT = "wxUSE_AFM_FOR_POSTSCRIPT", + wxUSE_ANIMATIONCTRL = "wxUSE_ANIMATIONCTRL", wxUSE_APPLE_IEEE = "wxUSE_APPLE_IEEE", + wxUSE_BITMAPCOMBOBOX = "wxUSE_BITMAPCOMBOBOX", wxUSE_BMPBUTTON = "wxUSE_BMPBUTTON", wxUSE_BOOKCTRL = "wxUSE_BOOKCTRL", *************** *** 3926,3929 **** --- 4065,4069 ---- wxUSE_CLIPBOARD = "wxUSE_CLIPBOARD", wxUSE_CMDLINE_PARSER = "wxUSE_CMDLINE_PARSER", + wxUSE_COLLPANE = "wxUSE_COLLPANE", wxUSE_COLOURDLG = "wxUSE_COLOURDLG", wxUSE_COLOURPICKERCTRL = "wxUSE_COLOURPICKERCTRL", Index: print.i =================================================================== RCS file: /cvsroot/wxlua/wxLua/bindings/wxwidgets/print.i,v retrieving revision 1.19 retrieving revision 1.20 diff -C2 -d -r1.19 -r1.20 *** print.i 17 Jun 2007 17:17:37 -0000 1.19 --- print.i 18 Jun 2007 02:56:24 -0000 1.20 *************** *** 229,233 **** %endenum ! %if %wxchkver_2_5 %enum wxPrintBin wxPRINTBIN_DEFAULT --- 229,233 ---- %endenum ! %if %wxchkver_2_6 %enum wxPrintBin wxPRINTBIN_DEFAULT *************** *** 291,312 **** // these are all WXWIN_COMPATIBILITY_2_4 and for postscript printing only ! //!%wxchkver_2_7 wxString GetPrinterCommand() ! //!%wxchkver_2_7 wxString GetPrinterOptions() ! //!%wxchkver_2_7 wxString GetPreviewCommand() ! //!%wxchkver_2_7 const wxString& GetFontMetricPath() ! //!%wxchkver_2_7 double GetPrinterScaleX() ! //!%wxchkver_2_7 double GetPrinterScaleY() ! //!%wxchkver_2_7 long GetPrinterTranslateX() ! //!%wxchkver_2_7 long GetPrinterTranslateY() ! //!%wxchkver_2_7 void SetPrinterCommand(const wxString& command) ! //!%wxchkver_2_7 void SetPrinterOptions(const wxString& options) ! //!%wxchkver_2_7 void SetPreviewCommand(const wxString& command) ! //!%wxchkver_2_7 void SetFontMetricPath(const wxString& path) ! //!%wxchkver_2_7 void SetPrinterScaleX(double x) ! //!%wxchkver_2_7 void SetPrinterScaleY(double y) ! //!%wxchkver_2_7 void SetPrinterScaling(double x, double y) ! //!%wxchkver_2_7 void SetPrinterTranslateX(long x) ! //!%wxchkver_2_7 void SetPrinterTranslateY(long y) ! //!%wxchkver_2_7 void SetPrinterTranslation(long x, long y) %endclass --- 291,312 ---- // these are all WXWIN_COMPATIBILITY_2_4 and for postscript printing only ! //!%wxchkver_2_8 wxString GetPrinterCommand() ! //!%wxchkver_2_8 wxString GetPrinterOptions() ! //!%wxchkver_2_8 wxString GetPreviewCommand() ! //!%wxchkver_2_8 const wxString& GetFontMetricPath() ! //!%wxchkver_2_8 double GetPrinterScaleX() ! //!%wxchkver_2_8 double GetPrinterScaleY() ! //!%wxchkver_2_8 long GetPrinterTranslateX() ! //!%wxchkver_2_8 long GetPrinterTranslateY() ! //!%wxchkver_2_8 void SetPrinterCommand(const wxString& command) ! //!%wxchkver_2_8 void SetPrinterOptions(const wxString& options) ! //!%wxchkver_2_8 void SetPreviewCommand(const wxString& command) ! //!%wxchkver_2_8 void SetFontMetricPath(const wxString& path) ! //!%wxchkver_2_8 void SetPrinterScaleX(double x) ! //!%wxchkver_2_8 void SetPrinterScaleY(double y) ! //!%wxchkver_2_8 void SetPrinterScaling(double x, double y) ! //!%wxchkver_2_8 void SetPrinterTranslateX(long x) ! //!%wxchkver_2_8 void SetPrinterTranslateY(long y) ! //!%wxchkver_2_8 void SetPrinterTranslation(long x, long y) %endclass Index: file.i =================================================================== RCS file: /cvsroot/wxlua/wxLua/bindings/wxwidgets/file.i,v retrieving revision 1.25 retrieving revision 1.26 diff -C2 -d -r1.25 -r1.26 *** file.i 17 Jun 2007 17:17:37 -0000 1.25 --- file.i 18 Jun 2007 02:56:24 -0000 1.26 *************** *** 49,54 **** // These two methods are for wxLua - // %override wxFILE_SEP_PATH wxFileSeparator() - returns either / or \ depending on platform - %function wxString wxFileSeparator() // %override long wxFileSize(const wxString& fileName) - gets the filesize %function long wxFileSize(const wxString& fileName) --- 49,52 ---- *************** *** 75,79 **** %function bool wxEndsWithPathSeparator(const wxString& pszFileName) - // --------------------------------------------------------------------------- // wxPathList --- 73,76 ---- *************** *** 114,119 **** %define wxPATH_MKDIR_FULL - //%define_string wxFILE_SEP_PATH // this is wxChar see override wxFileSeparator - //%define_string wxPATH_SEP // this is wxChar see override wxFileSeparator %define wxFILE %define wxDIR --- 111,114 ---- *************** *** 432,435 **** --- 427,584 ---- // --------------------------------------------------------------------------- + // wxFileTypeInfo + + %include "wx/mimetype.h" + + %class %delete %noclassinfo %encapsulate wxFileTypeInfo + // the ... parameters form a NULL terminated list of extensions + //wxFileTypeInfo(const wxChar *mimeType, const wxChar *openCmd, const wxChar *printCmd, const wxChar *desc, ...) + // the array elements correspond to the parameters of the ctor above in the same order + wxFileTypeInfo(const wxArrayString& sArray) + + // invalid item - use this to terminate the array passed to wxMimeTypesManager::AddFallbacks + wxFileTypeInfo() + + bool IsValid() const + + void SetIcon(const wxString& iconFile, int iconIndex = 0) + void SetShortDesc(const wxString& shortDesc) + + wxString GetMimeType() const + wxString GetOpenCommand() const + wxString GetPrintCommand() const + wxString GetShortDesc() const + wxString GetDescription() const + wxArrayString GetExtensions() const + size_t GetExtensionsCount() const + wxString GetIconFile() const + int GetIconIndex() const + %endclass + + // --------------------------------------------------------------------------- + // wxFileType::MessageParameters + + %class %delete %noclassinfo %encapsulate wxFileType::MessageParameters + //wxFileType::MessageParameters() + wxFileType::MessageParameters(const wxString& filename, const wxString& mimetype = "") + + // accessors (called by GetOpenCommand) + wxString GetFileName() const + wxString GetMimeType() const + + // override this function in derived class + virtual wxString GetParamValue(const wxString& name) const + %endclass + + // --------------------------------------------------------------------------- + // wxFileType + + %class %delete %noclassinfo %encapsulate wxFileType + wxFileType(const wxFileTypeInfo& ftInfo) + + // accessors: all of them return true if the corresponding information + // could be retrieved/found, false otherwise (and in this case all [out] parameters are unchanged) + + // return the MIME type for this file type + //bool GetMimeType(wxString *mimeType) const; + bool GetMimeTypes(wxArrayString& mimeTypes) const; + + bool GetExtensions(wxArrayString& extensions); + + // get the icon corresponding to this file type and of the given size + bool GetIcon(wxIconLocation *iconloc) const; + //bool GetIcon(wxIconLocation *iconloc, const wxFileType::MessageParameters& params) const; + + // get a brief file type description ("*.txt" => "text document") + // %override [bool lua string] GetDescription() const; + // C++ Func: bool GetDescription(wxString *desc) const + bool GetDescription() const + + // get the command to be used to open/print the given file. + //bool GetOpenCommand(wxString *openCmd, const wxFileType::MessageParameters& params) const; + // a simpler to use version of GetOpenCommand() -- it only takes the + // filename and returns an empty string on failure + wxString GetOpenCommand(const wxString& filename) const; + + // get the command to print the file of given type + // %override [bool lua string] GetPrintCommand(const wxFileType::MessageParameters& params) const; + // C++ Func: bool GetPrintCommand(wxString *printCmd, const wxFileType::MessageParameters& params) const; + bool GetPrintCommand(const wxFileType::MessageParameters& params) const; + + // return the number of commands defined for this file type, 0 if none + size_t GetAllCommands(wxArrayString *verbs, wxArrayString *commands, const wxFileType::MessageParameters& params) const; + + // set an arbitrary command, ask confirmation if it already exists and overwriteprompt is true + bool SetCommand(const wxString& cmd, const wxString& verb, bool overwriteprompt = true) + + bool SetDefaultIcon(const wxString& cmd = "", int index = 0) + + // remove the association for this filetype from the system MIME database: + // notice that it will only work if the association is defined in the user + // file/registry part, we will never modify the system-wide settings + bool Unassociate(); + + // expand a string in the format of GetOpenCommand (which may contain + // '%s' and '%t' format specificators for the file name and mime type + // and %{param} constructions). + static wxString ExpandCommand(const wxString& command, const wxFileType::MessageParameters& params); + %endclass + + // --------------------------------------------------------------------------- + // wxMimeTypesManager + + %class %noclassinfo %encapsulate wxMimeTypesManager + %define_pointer wxTheMimeTypesManager + + // wxMimeTypesManager(); - Use pointer wxTheMimeTypesManager + + // check if the given MIME type is the same as the other one: the + // second argument may contain wildcards ('*'), but not the first. If + // the types are equal or if the mimeType matches wildcard the function + // returns true, otherwise it returns false + static bool IsOfType(const wxString& mimeType, const wxString& wildcard); + + // NB: the following 2 functions are for Unix only and don't do anything elsewhere + + // loads data from standard files according to the mailcap styles + // specified: this is a bitwise OR of wxMailcapStyle values + // + // use the extraDir parameter if you want to look for files in another + // directory + void Initialize(int mailcapStyle = wxMAILCAP_ALL, const wxString& extraDir = ""); + // and this function clears all the data from the manager + void ClearData(); + + // Database lookup: all functions return a pointer to wxFileType object + // whose methods may be used to query it for the information you're + // interested in. If the return value is !NULL, caller is responsible for + // deleting it. + // get file type from file extension + wxFileType *GetFileTypeFromExtension(const wxString& ext); + // get file type from MIME type (in format <category>/<format>) + wxFileType *GetFileTypeFromMimeType(const wxString& mimeType); + + bool ReadMailcap(const wxString& filename, bool fallback = false); + // read in additional file in mime.types format + bool ReadMimeTypes(const wxString& filename); + + // enumerate all known MIME types returns the number of retrieved file types + size_t EnumAllFileTypes(wxArrayString& mimetypes); + + // The filetypes array should be terminated by either NULL entry or an + // invalid wxFileTypeInfo (i.e. the one created with default ctor) + //void AddFallbacks(const wxFileTypeInfo *filetypes); + void AddFallback(const wxFileTypeInfo& ft) + + // create a new association using the fields of wxFileTypeInfo (at least + // the MIME type and the extension should be set) + // if the other fields are empty, the existing values should be left alone + wxFileType *Associate(const wxFileTypeInfo& ftInfo) + + // undo Associate() + bool Unassociate(wxFileType *ft) + %endclass + + // --------------------------------------------------------------------------- // wxStreamBase *************** *** 459,463 **** // wxStreamBase() this is only a base class ! %wxchkver_2_5 wxFileOffset GetLength() const wxStreamError GetLastError() const size_t GetSize() const --- 608,612 ---- // wxStreamBase() this is only a base class ! %wxchkver_2_6 wxFileOffset GetLength() const wxStreamError GetLastError() const size_t GetSize() const Index: dialogs.i =================================================================== RCS file: /cvsroot/wxlua/wxLua/bindings/wxwidgets/dialogs.i,v retrieving revision 1.34 retrieving revision 1.35 diff -C2 -d -r1.34 -r1.35 *** dialogs.i 17 Jun 2007 17:17:37 -0000 1.34 --- dialogs.i 18 Jun 2007 02:56:23 -0000 1.35 *************** *** 64,68 **** %if wxUSE_NUMBERDLG ! %wxchkver_2_5 %include "wx/numdlg.h" // FIXME not in 2.4 %function long wxGetNumberFromUser(const wxString& message, const wxString& prompt, const wxString& caption, long value, long min = 0, long max = 100, wxWindow *parent = NULL, const wxPoint& pos = wxDefaultPosition) %endif // wxUSE_NUMBERDLG --- 64,68 ---- %if wxUSE_NUMBERDLG ! %wxchkver_2_6 %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 *************** *** 253,257 **** void GetPaths() const ! !%wxchkver_2_7 long GetStyle() const wxString GetWildcard() const void SetDirectory(const wxString& directory) --- 253,257 ---- void GetPaths() const ! !%wxchkver_2_8 long GetStyle() const wxString GetWildcard() const void SetDirectory(const wxString& directory) *************** *** 260,264 **** void SetMessage(const wxString& message) void SetPath(const wxString& path) ! !%wxchkver_2_7 void SetStyle(long style) void SetWildcard(const wxString& wildCard) // int ShowModal() - in wxDialog --- 260,264 ---- void SetMessage(const wxString& message) void SetPath(const wxString& path) ! !%wxchkver_2_8 void SetStyle(long style) void SetWildcard(const wxString& wildCard) // int ShowModal() - in wxDialog *************** *** 284,291 **** wxString GetPath() const wxString GetMessage() const ! !%wxchkver_2_7 long GetStyle() const void SetMessage(const wxString& message) void SetPath(const wxString& path) ! !%wxchkver_2_7 void SetStyle(long style) // int ShowModal() - in wxDialog %endclass --- 284,291 ---- wxString GetPath() const wxString GetMessage() const ! !%wxchkver_2_8 long GetStyle() const void SetMessage(const wxString& message) void SetPath(const wxString& path) ! !%wxchkver_2_8 void SetStyle(long style) // int ShowModal() - in wxDialog %endclass Index: xml.i =================================================================== RCS file: /cvsroot/wxlua/wxLua/bindings/wxwidgets/xml.i,v retrieving revision 1.13 retrieving revision 1.14 diff -C2 -d -r1.13 -r1.14 *** xml.i 17 Jun 2007 17:17:37 -0000 1.13 --- xml.i 18 Jun 2007 02:56:25 -0000 1.14 *************** *** 9,14 **** %if wxLUA_USE_wxXMLResource & wxUSE_XML ! !%wxchkver_2_5 %include "wx/xrc/xml.h" ! %wxchkver_2_5 %include "wx/xml/xml.h" %include "wx/xrc/xmlres.h" --- 9,14 ---- %if wxLUA_USE_wxXMLResource & wxUSE_XML ! !%wxchkver_2_6 %include "wx/xrc/xml.h" ! %wxchkver_2_6 %include "wx/xml/xml.h" %include "wx/xrc/xmlres.h" Index: windows.i =================================================================== RCS file: /cvsroot/wxlua/wxLua/bindings/wxwidgets/windows.i,v retrieving revision 1.42 retrieving revision 1.43 diff -C2 -d -r1.42 -r1.43 *** windows.i 17 Jun 2007 17:17:37 -0000 1.42 --- windows.i 18 Jun 2007 02:56:24 -0000 1.43 *************** *** 82,91 **** void Center(int direction = wxBOTH) void CenterOnParent(int direction = wxBOTH) ! !%wxchkver_2_7 void CenterOnScreen(int direction = wxBOTH) void Centre(int direction = wxBOTH) void CentreOnParent(int direction = wxBOTH) ! !%wxchkver_2_7 void CentreOnScreen(int direction = wxBOTH) ! !%wxchkver_2_5 void Clear() ! %wxchkver_2_5 void ClearBackground() // %override [int x, int y] ClientToScreen(int x, int y) const --- 82,91 ---- void Center(int direction = wxBOTH) void CenterOnParent(int direction = wxBOTH) ! !%wxchkver_2_8 void CenterOnScreen(int direction = wxBOTH) void Centre(int direction = wxBOTH) void CentreOnParent(int direction = wxBOTH) ! !%wxchkver_2_8 void CentreOnScreen(int direction = wxBOTH) ! !%wxchkver_2_6 void Clear() ! %wxchkver_2_6 void ClearBackground() // %override [int x, int y] ClientToScreen(int x, int y) const *************** *** 117,121 **** wxAcceleratorTable* GetAcceleratorTable() const //wxAccessible* GetAccessible() ! !%wxchkver_2_7 wxSize GetAdjustedBestSize() const virtual wxColour GetBackgroundColour() const virtual wxBackgroundStyle GetBackgroundStyle() const --- 117,121 ---- wxAcceleratorTable* GetAcceleratorTable() const //wxAccessible* GetAccessible() ! !%wxchkver_2_8 wxSize GetAdjustedBestSize() const virtual wxColour GetBackgroundColour() const virtual wxBackgroundStyle GetBackgroundStyle() const *************** *** 138,142 **** wxCursor GetCursor() const //virtual wxVisualAttributes GetDefaultAttributes() const ! !%wxchkver_2_7 wxWindow* GetDefaultItem() const wxDropTarget* GetDropTarget() const wxEvtHandler* GetEventHandler() const --- 138,142 ---- wxCursor GetCursor() const //virtual wxVisualAttributes GetDefaultAttributes() const ! !%wxchkver_2_8 wxWindow* GetDefaultItem() const wxDropTarget* GetDropTarget() const wxEvtHandler* GetEventHandler() const *************** *** 183,187 **** virtual void GetTextExtent(const wxString& string, const wxFont* font = NULL ) const ! !%wxchkver_2_7 virtual wxString GetTitle() wxToolTip* GetToolTip() const virtual wxRegion GetUpdateRegion() const --- 183,187 ---- virtual void GetTextExtent(const wxString& string, const wxFont* font = NULL ) const ! !%wxchkver_2_8 virtual wxString GetTitle() wxToolTip* GetToolTip() const virtual wxRegion GetUpdateRegion() const *************** *** 251,255 **** virtual void SetCursor(const wxCursor& cursor) !%wxchkver_2_6 void SetConstraints(wxLayoutConstraints* constraints) ! !%wxchkver_2_7 wxWindow* SetDefaultItem(wxWindow *win) // virtual void SetInitialBestSize(const wxSize& size) protected void SetMaxSize(const wxSize& size) --- 251,255 ---- virtual void SetCursor(const wxCursor& cursor) !%wxchkver_2_6 void SetConstraints(wxLayoutConstraints* constraints) ! !%wxchkver_2_8 wxWindow* SetDefaultItem(wxWindow *win) // virtual void SetInitialBestSize(const wxSize& size) protected void SetMaxSize(const wxSize& size) *************** *** 280,284 **** void SetSizer(wxSizer* sizer, bool deleteOld=true) void SetSizerAndFit(wxSizer* sizer, bool deleteOld=true) ! !%wxchkver_2_7 virtual void SetTitle(const wxString& title) virtual void SetThemeEnabled(bool enable) void SetToolTip(const wxString& tip) --- 280,284 ---- void SetSizer(wxSizer* sizer, bool deleteOld=true) void SetSizerAndFit(wxSizer* sizer, bool deleteOld=true) ! !%wxchkver_2_8 virtual void SetTitle(const wxString& title) virtual void SetThemeEnabled(bool enable) void SetToolTip(const wxString& tip) *************** *** 329,335 **** bool Create(wxWindow* parent, wxWindowID id, const wxPoint& pos = wxDefaultPosition, const wxSize& size = wxDefaultSize, long style = wxTAB_TRAVERSAL, const wxString& name = "wxPanel") ! //!%wxchkver_2_7 wxWindow* GetDefaultItem() const - see wxWindow // void InitDialog() see wxWindow ! //!%wxchkver_2_7 wxWindow* SetDefaultItem(wxWindow *win) - see wxWindow //virtual void SetFocus() - see wxWindow virtual void SetFocusIgnoringChildren() --- 329,335 ---- bool Create(wxWindow* parent, wxWindowID id, const wxPoint& pos = wxDefaultPosition, const wxSize& size = wxDefaultSize, long style = wxTAB_TRAVERSAL, const wxString& name = "wxPanel") ! //!%wxchkver_2_8 wxWindow* GetDefaultItem() const - see wxWindow // void InitDialog() see wxWindow ! //!%wxchkver_2_8 wxWindow* SetDefaultItem(wxWindow *win) - see wxWindow //virtual void SetFocus() - see wxWindow virtual void SetFocusIgnoringChildren() *************** *** 442,446 **** %include "wx/notebook.h" ! //%if !%wxchkver_2_7|%wxcompat_2_6 %define wxNB_TOP // use wxBK_XXX after 2.6 %define wxNB_LEFT --- 442,446 ---- %include "wx/notebook.h" ! //%if !%wxchkver_2_8|%wxcompat_2_6 %define wxNB_TOP // use wxBK_XXX after 2.6 %define wxNB_LEFT *************** *** 450,454 **** %define wxNB_MULTILINE %define wxNB_NOPAGETHEME ! //%endif // !%wxchkver_2_7|%wxcompat_2_6 %enum --- 450,454 ---- %define wxNB_MULTILINE %define wxNB_NOPAGETHEME ! //%endif // !%wxchkver_2_8|%wxcompat_2_6 %enum *************** *** 910,913 **** --- 910,952 ---- %endif //wxLUA_USE_wxSplitterWindow + + // --------------------------------------------------------------------------- + // wxCollapsiblePane + + %if wxchkver_2_8 && wxLUA_USE_wxCollapsiblePane && wxUSE_COLLPANE + + %include "wx/collpane.h" + + %define wxCP_DEFAULT_STYLE + + %class wxCollapsiblePane, wxControl + wxCollapsiblePane() + wxCollapsiblePane(wxWindow *parent, wxWindowID id, const wxString& label, const wxPoint& pos = wxDefaultPosition, const wxSize& size = wxDefaultSize, long style = wxCP_DEFAULT_STYLE, const wxValidator& validator = wxDefaultValidator, const wxString& name = "wxCollapsiblePane") + + bool Create(wxWindow *parent, wxWindowID id, const wxString& label, const wxPoint& pos = wxDefaultPosition, const wxSize& size = wxDefaultSize, long style = wxCP_DEFAULT_STYLE, const wxValidator& validator = wxDefaultValidator, const wxString& name = "wxCollapsiblePane") + + bool IsCollapsed() const + bool IsExpanded() const + void Collapse(bool collapse = true) + void Expand() + wxWindow* GetPane() const + + %endclass + + // --------------------------------------------------------------------------- + // wxCollapsiblePaneEvent + + %class %delete wxCollapsiblePaneEvent, wxCommandEvent + %define wxEVT_COMMAND_COLLPANE_CHANGED // EVT_COLLAPSIBLEPANE_CHANGED(id, fn) + + wxCollapsiblePaneEvent() + wxCollapsiblePaneEvent(wxObject *generator, int id, bool collapsed) + + bool GetCollapsed() const + void SetCollapsed(bool c) + %endclass + + %endif // wxchkver_2_8 && wxLUA_USE_wxCollapsiblePane && wxUSE_COLLPANE + // --------------------------------------------------------------------------- // wxStaticBox Index: gdi.i =================================================================== RCS file: /cvsroot/wxlua/wxLua/bindings/wxwidgets/gdi.i,v retrieving revision 1.53 retrieving revision 1.54 diff -C2 -d -r1.53 -r1.54 *** gdi.i 17 Jun 2007 17:17:37 -0000 1.53 --- gdi.i 18 Jun 2007 02:56:24 -0000 1.54 *************** *** 93,99 **** %wxchkver_2_8 wxRect CentreIn(const wxRect& r, int dir = wxBOTH) const // CenterIn ! %wxchkver_2_7 bool Contains(wxCoord dx, wxCoord dy) const ! %wxchkver_2_7 bool Contains(const wxPoint& pt) const ! %wxchkver_2_7 bool Contains(const wxRect& rect) const wxRect Deflate(wxCoord dx, wxCoord dy) const //wxRect& Deflate(wxCoord dx, wxCoord dy) int GetBottom() --- 93,99 ---- %wxchkver_2_8 wxRect CentreIn(const wxRect& r, int dir = wxBOTH) const // CenterIn ! %wxchkver_2_8 bool Contains(wxCoord dx, wxCoord dy) const ! %wxchkver_2_8 bool Contains(const wxPoint& pt) const ! %wxchkver_2_8 bool Contains(const wxRect& rect) const wxRect Deflate(wxCoord dx, wxCoord dy) const //wxRect& Deflate(wxCoord dx, wxCoord dy) int GetBottom() *************** *** 507,514 **** virtual bool EnumerateEncodings( const wxString &font = "" ) ! %wxchkver_2_7 static wxArrayString GetEncodings(const wxString& facename = "") ! %wxchkver_2_7 static wxArrayString GetFacenames(wxFontEncoding encoding = wxFONTENCODING_SYSTEM, bool fixedWidthOnly = false) ! !%wxchkver_2_7 wxArrayString* GetEncodings() ! !%wxchkver_2_7 wxArrayString* GetFacenames() // Use GetEncodings/Facenames after calling EnumerateXXX --- 507,514 ---- virtual bool EnumerateEncodings( const wxString &font = "" ) ! %wxchkver_2_8 static wxArrayString GetEncodings(const wxString& facename = "") ! %wxchkver_2_8 static wxArrayString GetFacenames(wxFontEncoding encoding = wxFONTENCODING_SYSTEM, bool fixedWidthOnly = false) ! !%wxchkver_2_8 wxArrayString* GetEncodings() ! !%wxchkver_2_8 wxArrayString* GetFacenames() // Use GetEncodings/Facenames after calling EnumerateXXX *************** *** 566,570 **** void SetDialogTitle(const wxString &title) static wxFontMapper *Set(wxFontMapper *mapper) ! !%wxchkver_2_7 void SetConfig(wxConfigBase *config = NULL) void SetConfigPath(const wxString &prefix) %endclass --- 566,570 ---- void SetDialogTitle(const wxString &title) static wxFontMapper *Set(wxFontMapper *mapper) ! !%wxchkver_2_8 void SetConfig(wxConfigBase *config = NULL) void SetConfigPath(const wxString &prefix) %endclass *************** *** 873,877 **** //wxIcon(int width, int height, int depth = -1) // constructor does not exist ! %win|%mac|%wxchkver_2_5 void CopyFromBitmap(const wxBitmap& bmp) int GetDepth() int GetHeight() --- 873,877 ---- //wxIcon(int width, int height, int depth = -1) // constructor does not exist ! %win|%mac|%wxchkver_2_6 void CopyFromBitmap(const wxBitmap& bmp) int GetDepth() int GetHeight() *************** *** 941,945 **** //%win %class %delete %noclassinfo wxGDIImageHandler //%endclass ! //%wxchkver_2_5&%win %class %noclassinfo wxGDIImageHandlerList, wxList //%endclass --- 941,945 ---- //%win %class %delete %noclassinfo wxGDIImageHandler //%endclass ! //%wxchkver_2_6&%win %class %noclassinfo wxGDIImageHandlerList, wxList //%endclass *************** *** 970,975 **** //static wxBitmapHandler* FindHandler(wxBitmapType bitmapType) int GetDepth() const ! //%wxchkver_2_5&%win static wxGDIImageHandlerList& GetHandlers() ! //!%wxchkver_2_5&%win static wxList& GetHandlers() int GetHeight() const wxPalette* GetPalette() const --- 970,975 ---- //static wxBitmapHandler* FindHandler(wxBitmapType bitmapType) int GetDepth() const ! //%wxchkver_2_6&%win static wxGDIImageHandlerList& GetHandlers() ! //!%wxchkver_2_6&%win static wxList& GetHandlers() int GetHeight() const wxPalette* GetPalette() const *************** *** 1657,1658 **** --- 1657,1715 ---- %endclass + + // --------------------------------------------------------------------------- + // wxAnimation + + %if wxLUA_USE_Animation && wxUSE_ANIMATIONCTRL && wxchkver_2_8 + + %include "wx/animate.h" + + %enum wxAnimationType + wxANIMATION_TYPE_INVALID + wxANIMATION_TYPE_GIF + wxANIMATION_TYPE_ANI + + wxANIMATION_TYPE_ANY + %endenum + + %class wxAnimation, wxGDIObject + wxAnimation() + wxAnimation(const wxAnimation& anim) + wxAnimation(const wxString& name, wxAnimationType type = wxANIMATION_TYPE_ANY) + + virtual bool IsOk() const + virtual int GetDelay(unsigned int frame) const // can be -1 + virtual unsigned int GetFrameCount() const + virtual wxImage GetFrame(unsigned int frame) const + virtual wxSize GetSize() const + + virtual bool LoadFile(const wxString& name, wxAnimationType type = wxANIMATION_TYPE_ANY) + virtual bool Load(wxInputStream& stream, wxAnimationType type = wxANIMATION_TYPE_ANY) + %endclass + + // --------------------------------------------------------------------------- + // wxAnimationCtrl + + %define wxAC_NO_AUTORESIZE + %define wxAC_DEFAULT_STYLE + + %class wxAnimationCtrl, wxControl + wxAnimationCtrl() + wxAnimationCtrl(wxWindow *parent, wxWindowID id, const wxAnimation& anim, const wxPoint& pos = wxDefaultPosition, const wxSize& size = wxDefaultSize, long style = wxAC_DEFAULT_STYLE, const wxString& name = "wxAnimationCtrl") + bool Create(wxWindow *parent, wxWindowID id, const wxAnimation& anim, const wxPoint& pos = wxDefaultPosition, const wxSize& size = wxDefaultSize, long style = wxAC_DEFAULT_STYLE, const wxString& name = "wxAnimationCtrl") + + virtual bool LoadFile(const wxString& filename, wxAnimationType type = wxANIMATION_TYPE_ANY) + + wxAnimation GetAnimation() const + // always return the original bitmap set in this control + wxBitmap GetInactiveBitmap() const + virtual bool IsPlaying() const + bool LoadFile(const wxString & file, wxAnimationType animType = wxANIMATION_TYPE_ANY) + virtual bool Play() + virtual void SetAnimation(const wxAnimation &anim) + virtual void SetInactiveBitmap(const wxBitmap &bmp) + virtual void Stop() + + %endclass + + %endif // wxLUA_USE_Animation && wxUSE_ANIMATIONCTRL && wxchkver_2_8 Index: html.i =================================================================== RCS file: /cvsroot/wxlua/wxLua/bindings/wxwidgets/html.i,v retrieving revision 1.24 retrieving revision 1.25 diff -C2 -d -r1.24 -r1.25 *** html.i 17 Jun 2007 17:17:37 -0000 1.24 --- html.i 18 Jun 2007 02:56:24 -0000 1.25 *************** *** 26,34 **** // %override bool AdjustPagebreak(int pagebreak) // int* known_pagebreaks, int number_of_pages) // C++ Func: bool AdjustPagebreak(int pagebreak, int* known_pagebreaks, int number_of_pages) ! %not_overload !%wxchkver_2_7 virtual bool AdjustPagebreak(int pagebreak) // int* known_pagebreaks, int number_of_pages) // %override bool AdjustPagebreak(int pagebreak, wxArrayInt& known_pagebreaks) // C++ Func: bool AdjustPagebreak(int pagebreak, wxArrayInt& known_pagebreaks) ! %not_overload %wxchkver_2_7 virtual bool AdjustPagebreak(int pagebreak, wxArrayInt& known_pagebreaks) //virtual void Draw(wxDC& dc, int x, int y, int view_y1, int view_y2, wxHtmlRenderingInfo& info) --- 26,34 ---- // %override bool AdjustPagebreak(int pagebreak) // int* known_pagebreaks, int number_of_pages) // C++ Func: bool AdjustPagebreak(int pagebreak, int* known_pagebreaks, int number_of_pages) ! %not_overload !%wxchkver_2_8 virtual bool AdjustPagebreak(int pagebreak) // int* known_pagebreaks, int number_of_pages) // %override bool AdjustPagebreak(int pagebreak, wxArrayInt& known_pagebreaks) // C++ Func: bool AdjustPagebreak(int pagebreak, wxArrayInt& known_pagebreaks) ! %not_overload %wxchkver_2_8 virtual bool AdjustPagebreak(int pagebreak, wxArrayInt& known_pagebreaks) //virtual void Draw(wxDC& dc, int x, int y, int view_y1, int view_y2, wxHtmlRenderingInfo& info) *************** *** 148,153 **** void SetWidthFloat(const wxHtmlTag& tag, double pixel_scale = 1.0) ! // %wxchkver_2_5 wxHtmlCell* GetFirstChild() see wxHtmlCell ! // !%wxchkver_2_5 wxHtmlCell* GetFirstCell() - nobody probably uses this %endclass --- 148,153 ---- void SetWidthFloat(const wxHtmlTag& tag, double pixel_scale = 1.0) ! // %wxchkver_2_6 wxHtmlCell* GetFirstChild() see wxHtmlCell ! // !%wxchkver_2_6 wxHtmlCell* GetFirstCell() - nobody probably uses this %endclass *************** *** 249,254 **** wxColour GetLinkColor() const //wxFontEncoding GetOutputEncoding() const ! %wxchkver_2_7 wxHtmlWindowInterface *GetWindowInterface() ! !%wxchkver_2_7 wxWindow* GetWindow() wxHtmlContainerCell* OpenContainer() void SetActualColor(const wxColour& clr) --- 249,254 ---- wxColour GetLinkColor() const //wxFontEncoding GetOutputEncoding() const ! %wxchkver_2_8 wxHtmlWindowInterface *GetWindowInterface() ! !%wxchkver_2_8 wxWindow* GetWindow() wxHtmlContainerCell* OpenContainer() void SetActualColor(const wxColour& clr) *************** *** 274,278 **** // wxHtmlWindowInterface ! %if %wxchkver_2_7 %enum wxHtmlWindowInterface::HTMLCursor --- 274,278 ---- // wxHtmlWindowInterface ! %if %wxchkver_2_8 %enum wxHtmlWindowInterface::HTMLCursor *************** *** 323,327 **** %endclass ! %endif //%wxchkver_2_7 // --------------------------------------------------------------------------- --- 323,327 ---- %endclass ! %endif //%wxchkver_2_8 // --------------------------------------------------------------------------- *************** *** 337,342 **** void SetSize(int width, int height) void SetHtmlText(const wxString& html, const wxString& basepath = "", bool isdir = true) ! !%wxchkver_2_7 int Render(int x, int y, int from = 0, int dont_render = false) //, int *known_pagebreaks = NULL, int number_of_pages = 0) ! %wxchkver_2_7 int Render(int x, int y, wxArrayInt& known_pagebreaks, int from = 0, int dont_render = false, int to = INT_MAX); int GetTotalHeight() %endclass --- 337,342 ---- void SetSize(int width, int height) void SetHtmlText(const wxString& html, const wxString& basepath = "", bool isdir = true) ! !%wxchkver_2_8 int Render(int x, int y, int from = 0, int dont_render = false) //, int *known_pagebreaks = NULL, int number_of_pages = 0) ! %wxchkver_2_8 int Render(int x, int y, wxArrayInt& known_pagebreaks, int from = 0, int dont_render = false, int to = INT_MAX); int GetTotalHeight() %endclass *************** *** 354,358 **** bool PrintFile(const wxString& htmlfile) bool PrintText(const wxString& htmltext, const wxString& basepath = "") ! %wxchkver_2_4&!%wxchkver_2_5 void PrinterSetup() void PageSetup() //void SetFonts(wxString normal_face, wxString fixed_face, const int *sizes = NULL) --- 354,358 ---- bool PrintFile(const wxString& htmlfile) bool PrintText(const wxString& htmltext, const wxString& basepath = "") ! %wxchkver_2_4&!%wxchkver_2_6 void PrinterSetup() void PageSetup() //void SetFonts(wxString normal_face, wxString fixed_face, const int *sizes = NULL) Index: datetime.i =================================================================== RCS file: /cvsroot/wxlua/wxLua/bindings/wxwidgets/datetime.i,v retrieving revision 1.31 retrieving revision 1.32 diff -C2 -d -r1.31 -r1.32 *** datetime.i 17 Jun 2007 18:36:06 -0000 1.31 --- datetime.i 18 Jun 2007 02:56:23 -0000 1.32 *************** *** 18,24 **** %wxcompat_2_6 %function long wxGetElapsedTime(bool resetTimer = true) // deprecated in 2.8 use wxStopWatch %function void wxSleep(int secs) ! %wxchkver_2_5 %function void wxMilliSleep(unsigned long milliseconds) ! %wxchkver_2_5 %function void wxMicroSleep(unsigned long microseconds) ! !%wxchkver_2_5 %function void wxUsleep(unsigned long milliseconds) // --------------------------------------------------------------------------- --- 18,24 ---- %wxcompat_2_6 %function long wxGetElapsedTime(bool resetTimer = true) // deprecated in 2.8 use wxStopWatch %function void wxSleep(int secs) ! %wxchkver_2_6 %function void wxMilliSleep(unsigned long milliseconds) ! %wxchkver_2_6 %function void wxMicroSleep(unsigned long microseconds) ! !%wxchkver_2_6 %function void wxUsleep(unsigned long milliseconds) // --------------------------------------------------------------------------- *************** *** 179,183 **** !%wxchkver_2_6 bool SetToTheWeek(wxDateTime::wxDateTime_t numWeek, wxDateTime::WeekDay weekday = wxDateTime::Mon) !%wxchkver_2_6 wxDateTime GetWeek(wxDateTime::wxDateTime_t numWeek, wxDateTime::WeekDay weekday = wxDateTime::Mon) const ! %wxchkver_2_5 static wxDateTime SetToWeekOfYear(int year, wxDateTime::wxDateTime_t numWeek, wxDateTime::WeekDay weekday = wxDateTime::Mon) wxDateTime& SetToLastMonthDay(wxDateTime::Month month = wxDateTime::Inv_Month, int year = wxDateTime::Inv_Year) wxDateTime GetLastMonthDay(wxDateTime::Month month = wxDateTime::Inv_Month, int year = wxDateTime::Inv_Year) const --- 179,183 ---- !%wxchkver_2_6 bool SetToTheWeek(wxDateTime::wxDateTime_t numWeek, wxDateTime::WeekDay weekday = wxDateTime::Mon) !%wxchkver_2_6 wxDateTime GetWeek(wxDateTime::wxDateTime_t numWeek, wxDateTime::WeekDay weekday = wxDateTime::Mon) const ! %wxchkver_2_6 static wxDateTime SetToWeekOfYear(int year, wxDateTime::wxDateTime_t numWeek, wxDateTime::WeekDay weekday = wxDateTime::Mon) wxDateTime& SetToLastMonthDay(wxDateTime::Month month = wxDateTime::Inv_Month, int year = wxDateTime::Inv_Year) wxDateTime GetLastMonthDay(wxDateTime::Month month = wxDateTime::Inv_Month, int year = wxDateTime::Inv_Year) const Index: appframe.i =================================================================== RCS file: /cvsroot/wxlua/wxLua/bindings/wxwidgets/appframe.i,v retrieving revision 1.39 retrieving revision 1.40 diff -C2 -d -r1.39 -r1.40 *** appframe.i 17 Jun 2007 17:17:36 -0000 1.39 --- appframe.i 18 Jun 2007 02:56:23 -0000 1.40 *************** *** 154,163 **** // wxChar** wxApp::argv ! //!%wxchkver_2_5|%wxcompat_2_4 virtual wxLog* CreateLogTarget() void Dispatch() void ExitMainLoop() // virtual int FilterEvent(wxEvent& event) too dangerous, use ConnectEvent wxString GetAppName() const ! //!%wxchkver_2_5&%win bool GetAuto3D() const wxString GetClassName() const bool GetExitOnFrameDelete() const --- 154,163 ---- // wxChar** wxApp::argv ! //!%wxchkver_2_6|%wxcompat_2_4 virtual wxLog* CreateLogTarget() void Dispatch() void ExitMainLoop() // virtual int FilterEvent(wxEvent& event) too dangerous, use ConnectEvent wxString GetAppName() const ! //!%wxchkver_2_6&%win bool GetAuto3D() const wxString GetClassName() const bool GetExitOnFrameDelete() const *************** *** 174,179 **** // virtual int OnRun() nothing we can do here bool Pending() ! // !%wxchkver_2_5 bool SendIdleEvents() ! %wxchkver_2_5 bool SendIdleEvents(wxWindow* win, wxIdleEvent& event) void SetAppName(const wxString& name) //!%wxchkver_2_4&(%win|%mac) void SetAuto3D(const bool auto3D) --- 174,179 ---- // virtual int OnRun() nothing we can do here bool Pending() ! // !%wxchkver_2_6 bool SendIdleEvents() ! %wxchkver_2_6 bool SendIdleEvents(wxWindow* win, wxIdleEvent& event) void SetAppName(const wxString& name) //!%wxchkver_2_4&(%win|%mac) void SetAuto3D(const bool auto3D) *************** *** 213,221 **** // No constructors, virtual base class, use wxFrame or wxDialog ! %wxchkver_2_7 wxWindow* GetDefaultItem() const wxIcon GetIcon() const //const wxIconBundle& GetIcons() const wxString GetTitle() const ! %wxchkver_2_7 wxWindow* GetTmpDefaultItem() const bool IsActive() const void Iconize(bool iconize) --- 213,221 ---- // No constructors, virtual base class, use wxFrame or wxDialog ! %wxchkver_2_8 wxWindow* GetDefaultItem() const wxIcon GetIcon() const //const wxIconBundle& GetIcons() const wxString GetTitle() const ! %wxchkver_2_8 wxWindow* GetTmpDefaultItem() const bool IsActive() const void Iconize(bool iconize) *************** *** 225,229 **** void Maximize(bool maximize) void RequestUserAttention(int flags = wxUSER_ATTENTION_INFO) ! %wxchkver_2_7 wxWindow* SetDefaultItem(wxWindow *win) void SetIcon(const wxIcon& icon) void SetIcons(const wxIconBundle& icons) --- 225,229 ---- void Maximize(bool maximize) void RequestUserAttention(int flags = wxUSER_ATTENTION_INFO) ! %wxchkver_2_8 wxWindow* SetDefaultItem(wxWindow *win) void SetIcon(const wxIcon& icon) void SetIcons(const wxIconBundle& icons) *************** *** 232,236 **** bool SetShape(const wxRegion& region) virtual void SetTitle(const wxString& title) ! %wxchkver_2_7 wxWindow* SetTmpDefaultItem(wxWindow *win) %win bool ShowFullScreen(bool show, long style = wxFULLSCREEN_ALL) %endclass --- 232,236 ---- bool SetShape(const wxRegion& region) virtual void SetTitle(const wxString& title) ! %wxchkver_2_8 wxWindow* SetTmpDefaultItem(wxWindow *win) %win bool ShowFullScreen(bool show, long style = wxFULLSCREEN_ALL) %endclass *************** *** 252,256 **** %define wxMAXIMIZE %define wxMAXIMIZE_BOX ! %wxchkver_2_5 %define wxCLOSE_BOX %define wxSTAY_ON_TOP %define wxSYSTEM_MENU --- 252,256 ---- %define wxMAXIMIZE %define wxMAXIMIZE_BOX ! %wxchkver_2_6 %define wxCLOSE_BOX %define wxSTAY_ON_TOP %define wxSYSTEM_MENU *************** *** 262,267 **** %define wxFRAME_FLOAT_ON_PARENT %define wxFRAME_EX_CONTEXTHELP ! %wxchkver_2_5 %define wxFRAME_SHAPED ! %wxchkver_2_5 %define wxFRAME_EX_METAL %define wxTHICK_FRAME --- 262,267 ---- %define wxFRAME_FLOAT_ON_PARENT %define wxFRAME_EX_CONTEXTHELP ! %wxchkver_2_6 %define wxFRAME_SHAPED ! %wxchkver_2_6 %define wxFRAME_EX_METAL %define wxTHICK_FRAME *************** *** 620,621 **** --- 620,747 ---- %endif //wxLUA_USE_wxSystemOptions + + // --------------------------------------------------------------------------- + // wxPlatformInfo + + %enum wxOperatingSystemId + wxOS_UNKNOWN // returned on error + + wxOS_MAC_OS // Apple Mac OS 8/9/X with Mac paths + wxOS_MAC_OSX_DARWIN // Apple Mac OS X with Unix paths + wxOS_MAC // wxOS_MAC_OS|wxOS_MAC_OSX_DARWIN, + + wxOS_WINDOWS_9X // Windows 9x family (95/98/ME) + wxOS_WINDOWS_NT // Windows NT family (NT/2000/XP) + wxOS_WINDOWS_MICRO // MicroWindows + wxOS_WINDOWS_CE // Windows CE (Window Mobile) + wxOS_WINDOWS // wxOS_WINDOWS_9X|wxOS_WINDOWS_NT|wxOS_WINDOWS_MICRO|wxOS_WINDOWS_CE, + + wxOS_UNIX_LINUX // Linux + wxOS_UNIX_FREEBSD // FreeBSD + wxOS_UNIX_OPENBSD // OpenBSD + wxOS_UNIX_NETBSD // NetBSD + wxOS_UNIX_SOLARIS // SunOS + wxOS_UNIX_AIX // AIX + wxOS_UNIX_HPUX // HP/UX + wxOS_UNIX // wxOS_UNIX_LINUX|wxOS_UNIX_FREEBSD|wxOS_UNIX_OPENBSD|wxOS_UNIX_NETBSD|wxOS_UNIX_SOLARIS|wxOS_UNIX_AIX|wxOS_UNIX_HPUX, + + wxOS_DOS // Microsoft DOS + wxOS_OS2 // OS/2 + %endenum + + %enum wxPortId + wxPORT_UNKNOWN // returned on error + + wxPORT_BASE // wxBase, no native toolkit used + + wxPORT_MSW // wxMSW, native toolkit is Windows API + wxPORT_MOTIF // wxMotif, using [Open]Motif or Lesstif + wxPORT_GTK ... [truncated message content] |
|
From: John L. <jr...@us...> - 2007-06-18 02:57:01
|
Update of /cvsroot/wxlua/wxLua/modules/wxbind/include In directory sc8-pr-cvs9.sourceforge.net:/tmp/cvs-serv7428/wxLua/modules/wxbind/include Modified Files: wxbind.h Log Message: Add more classes from wxWidgets 2.8 Index: wxbind.h =================================================================== RCS file: /cvsroot/wxlua/wxLua/modules/wxbind/include/wxbind.h,v retrieving revision 1.75 retrieving revision 1.76 diff -C2 -d -r1.75 -r1.76 *** wxbind.h 17 Jun 2007 18:36:12 -0000 1.75 --- wxbind.h 18 Jun 2007 02:56:26 -0000 1.76 *************** *** 76,90 **** #endif // (!defined(__WXMSW__)) && (wxLUA_USE_wxHelpController && wxUSE_HELP) ! #if (!wxCHECK_VERSION(2,5,0)) && (wxLUA_USE_wxToolbar) #include "wx/tbarsmpl.h" ! #endif // (!wxCHECK_VERSION(2,5,0)) && (wxLUA_USE_wxToolbar) ! #if (!wxCHECK_VERSION(2,5,0)) && (wxLUA_USE_wxXMLResource && wxUSE_XML) #include "wx/xrc/xml.h" ! #endif // (!wxCHECK_VERSION(2,5,0)) && (wxLUA_USE_wxXMLResource && wxUSE_XML) ! #if (defined(__WXMSW__) && !wxCHECK_VERSION(2,5,0) && wxUSE_WAVE) && (wxLUA_USE_wxWave) #include "wx/wave.h" ! #endif // (defined(__WXMSW__) && !wxCHECK_VERSION(2,5,0) && wxUSE_WAVE) && (wxLUA_USE_wxWave) #if (defined(__WXMSW__) || defined(__WXMAC__)) && (wxLUA_USE_wxPrint && wxUSE_PRINTING_ARCHITECTURE) --- 76,90 ---- #endif // (!defined(__WXMSW__)) && (wxLUA_USE_wxHelpController && wxUSE_HELP) ! #if (!wxCHECK_VERSION(2,6,0)) && (wxLUA_USE_wxToolbar) #include "wx/tbarsmpl.h" ! #endif // (!wxCHECK_VERSION(2,6,0)) && (wxLUA_USE_wxToolbar) ! #if (!wxCHECK_VERSION(2,6,0)) && (wxLUA_USE_wxXMLResource && wxUSE_XML) #include "wx/xrc/xml.h" ! #endif // (!wxCHECK_VERSION(2,6,0)) && (wxLUA_USE_wxXMLResource && wxUSE_XML) ! #if (defined(__WXMSW__) && !wxCHECK_VERSION(2,6,0) && wxUSE_WAVE) && (wxLUA_USE_wxWave) #include "wx/wave.h" ! #endif // (defined(__WXMSW__) && !wxCHECK_VERSION(2,6,0) && wxUSE_WAVE) && (wxLUA_USE_wxWave) #if (defined(__WXMSW__) || defined(__WXMAC__)) && (wxLUA_USE_wxPrint && wxUSE_PRINTING_ARCHITECTURE) *************** *** 97,115 **** #endif // (defined(__WXMSW__)) && (wxLUA_USE_wxHelpController && wxUSE_HELP) - #if (wxCHECK_VERSION(2,5,0)) && (wxLUA_USE_wxXMLResource && wxUSE_XML) - #include "wx/xml/xml.h" - #endif // (wxCHECK_VERSION(2,5,0)) && (wxLUA_USE_wxXMLResource && wxUSE_XML) - - #if (wxCHECK_VERSION(2,5,0)) && (wxUSE_NUMBERDLG) - #include "wx/numdlg.h" - #endif // (wxCHECK_VERSION(2,5,0)) && (wxUSE_NUMBERDLG) - #if (wxCHECK_VERSION(2,6,0) && wxUSE_SOUND) && (wxLUA_USE_wxWave) #include "wx/sound.h" #endif // (wxCHECK_VERSION(2,6,0) && wxUSE_SOUND) && (wxLUA_USE_wxWave) ! #if (wxCHECK_VERSION(2,7,0)) && (wxLUA_USE_wxHTML && wxUSE_HTML) ! #include "wx/htmllbox.h" ! #endif // (wxCHECK_VERSION(2,7,0)) && (wxLUA_USE_wxHTML && wxUSE_HTML) #if (wxCHECK_VERSION(2,8,0) && wxUSE_TGA) && (wxLUA_USE_wxImage && wxUSE_IMAGE) --- 97,111 ---- #endif // (defined(__WXMSW__)) && (wxLUA_USE_wxHelpController && wxUSE_HELP) #if (wxCHECK_VERSION(2,6,0) && wxUSE_SOUND) && (wxLUA_USE_wxWave) #include "wx/sound.h" #endif // (wxCHECK_VERSION(2,6,0) && wxUSE_SOUND) && (wxLUA_USE_wxWave) ! #if (wxCHECK_VERSION(2,6,0)) && (wxLUA_USE_wxXMLResource && wxUSE_XML) ! #include "wx/xml/xml.h" ! #endif // (wxCHECK_VERSION(2,6,0)) && (wxLUA_USE_wxXMLResource && wxUSE_XML) ! ! #if (wxCHECK_VERSION(2,6,0)) && (wxUSE_NUMBERDLG) ! #include "wx/numdlg.h" ! #endif // (wxCHECK_VERSION(2,6,0)) && (wxUSE_NUMBERDLG) #if (wxCHECK_VERSION(2,8,0) && wxUSE_TGA) && (wxLUA_USE_wxImage && wxUSE_IMAGE) *************** *** 121,124 **** --- 117,124 ---- #endif // (wxCHECK_VERSION(2,8,0)) && (wxLUA_USE_wxClipboard && wxUSE_CLIPBOARD) + #if (wxCHECK_VERSION(2,8,0)) && (wxLUA_USE_wxHTML && wxUSE_HTML) + #include "wx/htmllbox.h" + #endif // (wxCHECK_VERSION(2,8,0)) && (wxLUA_USE_wxHTML && wxUSE_HTML) + #if (wxLUA_USE_wxBitmapButton && wxUSE_BMPBUTTON) && (wxLUA_USE_wxButton && wxUSE_BUTTON) #include "wx/bmpbuttn.h" *************** *** 189,192 **** --- 189,194 ---- #include "wx/filefn.h" #include "wx/intl.h" + #include "wx/mimetype.h" + #include "wx/power.h" #include "wx/process.h" #include "wx/timer.h" *************** *** 210,213 **** --- 212,219 ---- #endif // wxCHECK_VERSION(2,8,0) && wxUSE_ABOUTDLG && wxLUA_USE_wxAboutDialog + #if wxLUA_USE_Animation && wxUSE_ANIMATIONCTRL && wxchkver_2_8 + #include "wx/animate.h" + #endif // wxLUA_USE_Animation && wxUSE_ANIMATIONCTRL && wxchkver_2_8 + #if wxLUA_USE_Geometry && wxUSE_GEOMETRY #include "wx/geometry.h" *************** *** 216,219 **** --- 222,226 ---- #if wxLUA_USE_MDI && wxUSE_MDI && wxUSE_DOC_VIEW_ARCHITECTURE #include "wx/cmdproc.h" + #include "wx/docmdi.h" #include "wx/docview.h" #endif // wxLUA_USE_MDI && wxUSE_MDI && wxUSE_DOC_VIEW_ARCHITECTURE *************** *** 243,246 **** --- 250,257 ---- #endif // wxLUA_USE_wxBitmap + #if wxLUA_USE_wxBitmapComboBox && wxUSE_BITMAPCOMBOBOX + #include "wx/bmpcbox.h" + #endif // wxLUA_USE_wxBitmapComboBox && wxUSE_BITMAPCOMBOBOX + #if wxLUA_USE_wxBusyCursor #include "wx/utils.h" *************** *** 444,447 **** --- 455,459 ---- #include "wx/imagtiff.h" #include "wx/imagxpm.h" + #include "wx/quantize.h" #endif // wxLUA_USE_wxImage && wxUSE_IMAGE *************** *** 683,686 **** --- 695,702 ---- #endif // wxUSE_WIZARDDLG && wxLUA_USE_wxWizard + #if wxchkver_2_8 && wxLUA_USE_wxCollapsiblePane && wxUSE_COLLPANE + #include "wx/collpane.h" + #endif // wxchkver_2_8 && wxLUA_USE_wxCollapsiblePane && wxUSE_COLLPANE + #if wxchkver_2_8 && wxLUA_USE_wxPicker #include "wx/pickerbase.h" *************** *** 698,706 **** #endif // (!defined(__WXMSW__)) && (wxLUA_USE_wxHelpController && wxUSE_HELP) ! #if (!wxCHECK_VERSION(2,5,0)) && (wxLUA_USE_wxToolbar) extern WXDLLIMPEXP_DATA_WXBIND(int) s_wxluatag_wxToolBarSimple; extern WXDLLIMPEXP_WXBIND wxLuaBindMethod wxToolBarSimple_methods[]; extern WXDLLIMPEXP_DATA_WXBIND(int) wxToolBarSimple_methodCount; ! #endif // (!wxCHECK_VERSION(2,5,0)) && (wxLUA_USE_wxToolbar) #if ((wxLUA_USE_wxDirPickerCtrl || wxLUA_USE_wxFilePickerCtrl ) && (wxUSE_FILEPICKERCTRL || wxUSE_DIRPICKERCTRL )) && (wxchkver_2_8 && wxLUA_USE_wxPicker) --- 714,722 ---- #endif // (!defined(__WXMSW__)) && (wxLUA_USE_wxHelpController && wxUSE_HELP) ! #if (!wxCHECK_VERSION(2,6,0)) && (wxLUA_USE_wxToolbar) extern WXDLLIMPEXP_DATA_WXBIND(int) s_wxluatag_wxToolBarSimple; extern WXDLLIMPEXP_WXBIND wxLuaBindMethod wxToolBarSimple_methods[]; extern WXDLLIMPEXP_DATA_WXBIND(int) wxToolBarSimple_methodCount; ! #endif // (!wxCHECK_VERSION(2,6,0)) && (wxLUA_USE_wxToolbar) #if ((wxLUA_USE_wxDirPickerCtrl || wxLUA_USE_wxFilePickerCtrl ) && (wxUSE_FILEPICKERCTRL || wxUSE_DIRPICKERCTRL )) && (wxchkver_2_8 && wxLUA_USE_wxPicker) *************** *** 713,721 **** #endif // ((wxLUA_USE_wxDirPickerCtrl || wxLUA_USE_wxFilePickerCtrl ) && (wxUSE_FILEPICKERCTRL || wxUSE_DIRPICKERCTRL )) && (wxchkver_2_8 && wxLUA_USE_wxPicker) ! #if (defined(__WXMSW__) && !wxCHECK_VERSION(2,5,0) && wxUSE_WAVE) && (wxLUA_USE_wxWave) extern WXDLLIMPEXP_DATA_WXBIND(int) s_wxluatag_wxWave; extern WXDLLIMPEXP_WXBIND wxLuaBindMethod wxWave_methods[]; extern WXDLLIMPEXP_DATA_WXBIND(int) wxWave_methodCount; ! #endif // (defined(__WXMSW__) && !wxCHECK_VERSION(2,5,0) && wxUSE_WAVE) && (wxLUA_USE_wxWave) #if (defined(__WXMSW__) || defined(__WXMAC__)) && (wxLUA_USE_wxPrint && wxUSE_PRINTING_ARCHITECTURE) --- 729,737 ---- #endif // ((wxLUA_USE_wxDirPickerCtrl || wxLUA_USE_wxFilePickerCtrl ) && (wxUSE_FILEPICKERCTRL || wxUSE_DIRPICKERCTRL )) && (wxchkver_2_8 && wxLUA_USE_wxPicker) ! #if (defined(__WXMSW__) && !wxCHECK_VERSION(2,6,0) && wxUSE_WAVE) && (wxLUA_USE_wxWave) extern WXDLLIMPEXP_DATA_WXBIND(int) s_wxluatag_wxWave; extern WXDLLIMPEXP_WXBIND wxLuaBindMethod wxWave_methods[]; extern WXDLLIMPEXP_DATA_WXBIND(int) wxWave_methodCount; ! #endif // (defined(__WXMSW__) && !wxCHECK_VERSION(2,6,0) && wxUSE_WAVE) && (wxLUA_USE_wxWave) #if (defined(__WXMSW__) || defined(__WXMAC__)) && (wxLUA_USE_wxPrint && wxUSE_PRINTING_ARCHITECTURE) *************** *** 740,754 **** #endif // (wxCHECK_VERSION(2,6,0) && wxUSE_SOUND) && (wxLUA_USE_wxWave) - #if (wxCHECK_VERSION(2,7,0)) && (wxLUA_USE_wxHTML && wxUSE_HTML) - extern WXDLLIMPEXP_DATA_WXBIND(int) s_wxluatag_wxHtmlWindowInterface; - extern WXDLLIMPEXP_WXBIND wxLuaBindMethod wxHtmlWindowInterface_methods[]; - extern WXDLLIMPEXP_DATA_WXBIND(int) wxHtmlWindowInterface_methodCount; - extern WXDLLIMPEXP_WXBIND wxLuaBindDefine wxHtmlWindowInterface_enums[]; - extern WXDLLIMPEXP_DATA_WXBIND(int) wxHtmlWindowInterface_enumCount; - extern WXDLLIMPEXP_DATA_WXBIND(int) s_wxluatag_wxSimpleHtmlListBox; - extern WXDLLIMPEXP_WXBIND wxLuaBindMethod wxSimpleHtmlListBox_methods[]; - extern WXDLLIMPEXP_DATA_WXBIND(int) wxSimpleHtmlListBox_methodCount; - #endif // (wxCHECK_VERSION(2,7,0)) && (wxLUA_USE_wxHTML && wxUSE_HTML) - #if (wxCHECK_VERSION(2,8,0) && wxUSE_TGA) && (wxLUA_USE_wxImage && wxUSE_IMAGE) extern WXDLLIMPEXP_DATA_WXBIND(int) s_wxluatag_wxTGAHandler; --- 756,759 ---- *************** *** 783,786 **** --- 788,802 ---- #endif // (wxCHECK_VERSION(2,8,0)) && (wxLUA_USE_wxDataObject && wxUSE_DATAOBJ) + #if (wxCHECK_VERSION(2,8,0)) && (wxLUA_USE_wxHTML && wxUSE_HTML) + extern WXDLLIMPEXP_DATA_WXBIND(int) s_wxluatag_wxHtmlWindowInterface; + extern WXDLLIMPEXP_WXBIND wxLuaBindMethod wxHtmlWindowInterface_methods[]; + extern WXDLLIMPEXP_DATA_WXBIND(int) wxHtmlWindowInterface_methodCount; + extern WXDLLIMPEXP_WXBIND wxLuaBindDefine wxHtmlWindowInterface_enums[]; + extern WXDLLIMPEXP_DATA_WXBIND(int) wxHtmlWindowInterface_enumCount; + extern WXDLLIMPEXP_DATA_WXBIND(int) s_wxluatag_wxSimpleHtmlListBox; + extern WXDLLIMPEXP_WXBIND wxLuaBindMethod wxSimpleHtmlListBox_methods[]; + extern WXDLLIMPEXP_DATA_WXBIND(int) wxSimpleHtmlListBox_methodCount; + #endif // (wxCHECK_VERSION(2,8,0)) && (wxLUA_USE_wxHTML && wxUSE_HTML) + #if (wxLUA_USE_wxBitmapButton && wxUSE_BMPBUTTON) && (wxLUA_USE_wxButton && wxUSE_BUTTON) extern WXDLLIMPEXP_DATA_WXBIND(int) s_wxluatag_wxBitmapButton; *************** *** 939,947 **** #endif // (wxUSE_LIBTIFF) && (wxLUA_USE_wxImage && wxUSE_IMAGE) ! #if (wxUSE_NOTEBOOK && (!wxCHECK_VERSION(2,5,0))) && (wxLUA_USE_wxSizer) extern WXDLLIMPEXP_DATA_WXBIND(int) s_wxluatag_wxNotebookSizer; extern WXDLLIMPEXP_WXBIND wxLuaBindMethod wxNotebookSizer_methods[]; extern WXDLLIMPEXP_DATA_WXBIND(int) wxNotebookSizer_methodCount; ! #endif // (wxUSE_NOTEBOOK && (!wxCHECK_VERSION(2,5,0))) && (wxLUA_USE_wxSizer) #if (wxUSE_PCX) && (wxLUA_USE_wxImage && wxUSE_IMAGE) --- 955,963 ---- #endif // (wxUSE_LIBTIFF) && (wxLUA_USE_wxImage && wxUSE_IMAGE) ! #if (wxUSE_NOTEBOOK && (!wxCHECK_VERSION(2,6,0))) && (wxLUA_USE_wxSizer) extern WXDLLIMPEXP_DATA_WXBIND(int) s_wxluatag_wxNotebookSizer; extern WXDLLIMPEXP_WXBIND wxLuaBindMethod wxNotebookSizer_methods[]; extern WXDLLIMPEXP_DATA_WXBIND(int) wxNotebookSizer_methodCount; ! #endif // (wxUSE_NOTEBOOK && (!wxCHECK_VERSION(2,6,0))) && (wxLUA_USE_wxSizer) #if (wxUSE_PCX) && (wxLUA_USE_wxImage && wxUSE_IMAGE) *************** *** 1013,1016 **** --- 1029,1035 ---- extern WXDLLIMPEXP_WXBIND wxLuaBindMethod wxCommandEvent_methods[]; extern WXDLLIMPEXP_DATA_WXBIND(int) wxCommandEvent_methodCount; + extern WXDLLIMPEXP_DATA_WXBIND(int) s_wxluatag_wxContextMenuEvent; + extern WXDLLIMPEXP_WXBIND wxLuaBindMethod wxContextMenuEvent_methods[]; + extern WXDLLIMPEXP_DATA_WXBIND(int) wxContextMenuEvent_methodCount; extern WXDLLIMPEXP_DATA_WXBIND(int) s_wxluatag_wxControl; extern WXDLLIMPEXP_WXBIND wxLuaBindMethod wxControl_methods[]; *************** *** 1031,1034 **** --- 1050,1062 ---- extern WXDLLIMPEXP_WXBIND wxLuaBindMethod wxEvtHandler_methods[]; extern WXDLLIMPEXP_DATA_WXBIND(int) wxEvtHandler_methodCount; + extern WXDLLIMPEXP_DATA_WXBIND(int) s_wxluatag_wxFileType; + extern WXDLLIMPEXP_WXBIND wxLuaBindMethod wxFileType_methods[]; + extern WXDLLIMPEXP_DATA_WXBIND(int) wxFileType_methodCount; + extern WXDLLIMPEXP_DATA_WXBIND(int) s_wxluatag_wxFileType_MessageParameters; + extern WXDLLIMPEXP_WXBIND wxLuaBindMethod wxFileType_MessageParameters_methods[]; + extern WXDLLIMPEXP_DATA_WXBIND(int) wxFileType_MessageParameters_methodCount; + extern WXDLLIMPEXP_DATA_WXBIND(int) s_wxluatag_wxFileTypeInfo; + extern WXDLLIMPEXP_WXBIND wxLuaBindMethod wxFileTypeInfo_methods[]; + extern WXDLLIMPEXP_DATA_WXBIND(int) wxFileTypeInfo_methodCount; extern WXDLLIMPEXP_DATA_WXBIND(int) s_wxluatag_wxFocusEvent; extern WXDLLIMPEXP_WXBIND wxLuaBindMethod wxFocusEvent_methods[]; *************** *** 1057,1060 **** --- 1085,1091 ---- extern WXDLLIMPEXP_WXBIND wxLuaBindMethod wxMaximizeEvent_methods[]; extern WXDLLIMPEXP_DATA_WXBIND(int) wxMaximizeEvent_methodCount; + extern WXDLLIMPEXP_DATA_WXBIND(int) s_wxluatag_wxMimeTypesManager; + extern WXDLLIMPEXP_WXBIND wxLuaBindMethod wxMimeTypesManager_methods[]; + extern WXDLLIMPEXP_DATA_WXBIND(int) wxMimeTypesManager_methodCount; extern WXDLLIMPEXP_DATA_WXBIND(int) s_wxluatag_wxMouseCaptureChangedEvent; extern WXDLLIMPEXP_WXBIND wxLuaBindMethod wxMouseCaptureChangedEvent_methods[]; *************** *** 1086,1089 **** --- 1117,1123 ---- extern WXDLLIMPEXP_WXBIND wxLuaBindMethod wxPathList_methods[]; extern WXDLLIMPEXP_DATA_WXBIND(int) wxPathList_methodCount; + extern WXDLLIMPEXP_DATA_WXBIND(int) s_wxluatag_wxPlatformInfo; + extern WXDLLIMPEXP_WXBIND wxLuaBindMethod wxPlatformInfo_methods[]; + extern WXDLLIMPEXP_DATA_WXBIND(int) wxPlatformInfo_methodCount; extern WXDLLIMPEXP_DATA_WXBIND(int) s_wxluatag_wxProcessEvent; extern WXDLLIMPEXP_WXBIND wxLuaBindMethod wxProcessEvent_methods[]; *************** *** 1150,1163 **** #endif // wxCHECK_VERSION(2,4,0) && defined(__WXMSW__) && wxLUA_USE_wxTabCtrl && wxUSE_TAB_DIALOG - #if wxCHECK_VERSION(2,7,0) - extern WXDLLIMPEXP_DATA_WXBIND(int) s_wxluatag_wxMouseState; - extern WXDLLIMPEXP_WXBIND wxLuaBindMethod wxMouseState_methods[]; - extern WXDLLIMPEXP_DATA_WXBIND(int) wxMouseState_methodCount; - #endif // wxCHECK_VERSION(2,7,0) - #if wxCHECK_VERSION(2,8,0) extern WXDLLIMPEXP_DATA_WXBIND(int) s_wxluatag_wxMouseCaptureLostEvent; extern WXDLLIMPEXP_WXBIND wxLuaBindMethod wxMouseCaptureLostEvent_methods[]; extern WXDLLIMPEXP_DATA_WXBIND(int) wxMouseCaptureLostEvent_methodCount; #endif // wxCHECK_VERSION(2,8,0) --- 1184,1194 ---- #endif // wxCHECK_VERSION(2,4,0) && defined(__WXMSW__) && wxLUA_USE_wxTabCtrl && wxUSE_TAB_DIALOG #if wxCHECK_VERSION(2,8,0) extern WXDLLIMPEXP_DATA_WXBIND(int) s_wxluatag_wxMouseCaptureLostEvent; extern WXDLLIMPEXP_WXBIND wxLuaBindMethod wxMouseCaptureLostEvent_methods[]; extern WXDLLIMPEXP_DATA_WXBIND(int) wxMouseCaptureLostEvent_methodCount; + extern WXDLLIMPEXP_DATA_WXBIND(int) s_wxluatag_wxMouseState; + extern WXDLLIMPEXP_WXBIND wxLuaBindMethod wxMouseState_methods[]; + extern WXDLLIMPEXP_DATA_WXBIND(int) wxMouseState_methodCount; #endif // wxCHECK_VERSION(2,8,0) *************** *** 1168,1171 **** --- 1199,1217 ---- #endif // wxCHECK_VERSION(2,8,0) && wxUSE_ABOUTDLG && wxLUA_USE_wxAboutDialog + #if wxHAS_POWER_EVENTS + extern WXDLLIMPEXP_DATA_WXBIND(int) s_wxluatag_wxPowerEvent; + extern WXDLLIMPEXP_WXBIND wxLuaBindMethod wxPowerEvent_methods[]; + extern WXDLLIMPEXP_DATA_WXBIND(int) wxPowerEvent_methodCount; + #endif // wxHAS_POWER_EVENTS + + #if wxLUA_USE_Animation && wxUSE_ANIMATIONCTRL && wxchkver_2_8 + extern WXDLLIMPEXP_DATA_WXBIND(int) s_wxluatag_wxAnimation; + extern WXDLLIMPEXP_WXBIND wxLuaBindMethod wxAnimation_methods[]; + extern WXDLLIMPEXP_DATA_WXBIND(int) wxAnimation_methodCount; + extern WXDLLIMPEXP_DATA_WXBIND(int) s_wxluatag_wxAnimationCtrl; + extern WXDLLIMPEXP_WXBIND wxLuaBindMethod wxAnimationCtrl_methods[]; + extern WXDLLIMPEXP_DATA_WXBIND(int) wxAnimationCtrl_methodCount; + #endif // wxLUA_USE_Animation && wxUSE_ANIMATIONCTRL && wxchkver_2_8 + #if wxLUA_USE_Geometry && wxUSE_GEOMETRY extern WXDLLIMPEXP_DATA_WXBIND(int) s_wxluatag_wxPoint2DDouble; *************** *** 1187,1190 **** --- 1233,1242 ---- extern WXDLLIMPEXP_WXBIND wxLuaBindMethod wxDocChildFrame_methods[]; extern WXDLLIMPEXP_DATA_WXBIND(int) wxDocChildFrame_methodCount; + extern WXDLLIMPEXP_DATA_WXBIND(int) s_wxluatag_wxDocMDIChildFrame; + extern WXDLLIMPEXP_WXBIND wxLuaBindMethod wxDocMDIChildFrame_methods[]; + extern WXDLLIMPEXP_DATA_WXBIND(int) wxDocMDIChildFrame_methodCount; + extern WXDLLIMPEXP_DATA_WXBIND(int) s_wxluatag_wxDocMDIParentFrame; + extern WXDLLIMPEXP_WXBIND wxLuaBindMethod wxDocMDIParentFrame_methods[]; + extern WXDLLIMPEXP_DATA_WXBIND(int) wxDocMDIParentFrame_methodCount; extern WXDLLIMPEXP_DATA_WXBIND(int) s_wxluatag_wxDocManager; extern WXDLLIMPEXP_WXBIND wxLuaBindMethod wxDocManager_methods[]; *************** *** 1255,1258 **** --- 1307,1316 ---- #endif // wxLUA_USE_wxBitmap + #if wxLUA_USE_wxBitmapComboBox && wxUSE_BITMAPCOMBOBOX + extern WXDLLIMPEXP_DATA_WXBIND(int) s_wxluatag_wxBitmapComboBox; + extern WXDLLIMPEXP_WXBIND wxLuaBindMethod wxBitmapComboBox_methods[]; + extern WXDLLIMPEXP_DATA_WXBIND(int) wxBitmapComboBox_methodCount; + #endif // wxLUA_USE_wxBitmapComboBox && wxUSE_BITMAPCOMBOBOX + #if wxLUA_USE_wxBusyCursor extern WXDLLIMPEXP_DATA_WXBIND(int) s_wxluatag_wxBusyCursor; *************** *** 1793,1796 **** --- 1851,1857 ---- extern WXDLLIMPEXP_WXBIND wxLuaBindMethod wxImageHistogramEntry_methods[]; extern WXDLLIMPEXP_DATA_WXBIND(int) wxImageHistogramEntry_methodCount; + extern WXDLLIMPEXP_DATA_WXBIND(int) s_wxluatag_wxQuantize; + extern WXDLLIMPEXP_WXBIND wxLuaBindMethod wxQuantize_methods[]; + extern WXDLLIMPEXP_DATA_WXBIND(int) wxQuantize_methodCount; extern WXDLLIMPEXP_DATA_WXBIND(int) s_wxluatag_wxXPMHandler; extern WXDLLIMPEXP_WXBIND wxLuaBindMethod wxXPMHandler_methods[]; *************** *** 2449,2452 **** --- 2510,2522 ---- #endif // wxUSE_WIZARDDLG && wxLUA_USE_wxWizard + #if wxchkver_2_8 && wxLUA_USE_wxCollapsiblePane && wxUSE_COLLPANE + extern WXDLLIMPEXP_DATA_WXBIND(int) s_wxluatag_wxCollapsiblePane; + extern WXDLLIMPEXP_WXBIND wxLuaBindMethod wxCollapsiblePane_methods[]; + extern WXDLLIMPEXP_DATA_WXBIND(int) wxCollapsiblePane_methodCount; + extern WXDLLIMPEXP_DATA_WXBIND(int) s_wxluatag_wxCollapsiblePaneEvent; + extern WXDLLIMPEXP_WXBIND wxLuaBindMethod wxCollapsiblePaneEvent_methods[]; + extern WXDLLIMPEXP_DATA_WXBIND(int) wxCollapsiblePaneEvent_methodCount; + #endif // wxchkver_2_8 && wxLUA_USE_wxCollapsiblePane && wxUSE_COLLPANE + #if wxchkver_2_8 && wxLUA_USE_wxPicker extern WXDLLIMPEXP_DATA_WXBIND(int) s_wxluatag_wxPickerBase; *************** *** 2469,2473 **** --- 2539,2548 ---- #endif // (wxCHECK_VERSION(2,8,0)) && (wxLUA_USE_wxDataObject && wxUSE_DATAOBJ) + wxLUA_DECLARE_ENCAPSULATION(WXDLLIMPEXP_WXBIND, wxFileType, wxFileType) + wxLUA_DECLARE_ENCAPSULATION(WXDLLIMPEXP_WXBIND, wxFileType::MessageParameters, wxFileType_MessageParameters) + wxLUA_DECLARE_ENCAPSULATION(WXDLLIMPEXP_WXBIND, wxFileTypeInfo, wxFileTypeInfo) + wxLUA_DECLARE_ENCAPSULATION(WXDLLIMPEXP_WXBIND, wxMimeTypesManager, wxMimeTypesManager) wxLUA_DECLARE_ENCAPSULATION(WXDLLIMPEXP_WXBIND, wxPathList, wxPathList) + wxLUA_DECLARE_ENCAPSULATION(WXDLLIMPEXP_WXBIND, wxPlatformInfo, wxPlatformInfo) wxLUA_DECLARE_ENCAPSULATION(WXDLLIMPEXP_WXBIND, wxPropagateOnce, wxPropagateOnce) wxLUA_DECLARE_ENCAPSULATION(WXDLLIMPEXP_WXBIND, wxPropagationDisabler, wxPropagationDisabler) *************** *** 2475,2481 **** wxLUA_DECLARE_ENCAPSULATION(WXDLLIMPEXP_WXBIND, wxWindowDisabler, wxWindowDisabler) ! #if wxCHECK_VERSION(2,7,0) wxLUA_DECLARE_ENCAPSULATION(WXDLLIMPEXP_WXBIND, wxMouseState, wxMouseState) ! #endif // wxCHECK_VERSION(2,7,0) #if wxCHECK_VERSION(2,8,0) && wxUSE_ABOUTDLG && wxLUA_USE_wxAboutDialog --- 2550,2556 ---- wxLUA_DECLARE_ENCAPSULATION(WXDLLIMPEXP_WXBIND, wxWindowDisabler, wxWindowDisabler) ! #if wxCHECK_VERSION(2,8,0) wxLUA_DECLARE_ENCAPSULATION(WXDLLIMPEXP_WXBIND, wxMouseState, wxMouseState) ! #endif // wxCHECK_VERSION(2,8,0) #if wxCHECK_VERSION(2,8,0) && wxUSE_ABOUTDLG && wxLUA_USE_wxAboutDialog |
|
From: John L. <jr...@us...> - 2007-06-18 02:57:00
|
Update of /cvsroot/wxlua/wxLua/modules/wxbind/setup In directory sc8-pr-cvs9.sourceforge.net:/tmp/cvs-serv7428/wxLua/modules/wxbind/setup Modified Files: wxluasetup.h Log Message: Add more classes from wxWidgets 2.8 Index: wxluasetup.h =================================================================== RCS file: /cvsroot/wxlua/wxLua/modules/wxbind/setup/wxluasetup.h,v retrieving revision 1.12 retrieving revision 1.13 diff -C2 -d -r1.12 -r1.13 *** wxluasetup.h 17 Jun 2007 18:36:13 -0000 1.12 --- wxluasetup.h 18 Jun 2007 02:56:27 -0000 1.13 *************** *** 9,12 **** --- 9,13 ---- #define wxLUA_USE_wxAboutDialog 1 #define wxLUA_USE_wxAcceleratorTable 1 + #define wxLUA_USE_wxAnimation 1 #define wxLUA_USE_wxApp 1 #define wxLUA_USE_wxArrayInt 1 *************** *** 14,17 **** --- 15,19 ---- #define wxLUA_USE_wxArtProvider 1 #define wxLUA_USE_wxBitmap 1 + #define wxLUA_USE_wxBitmapComboBox 1 #define wxLUA_USE_wxBitmapButton 1 #define wxLUA_USE_wxBrushList 1 *************** *** 26,29 **** --- 28,32 ---- #define wxLUA_USE_wxClassInfo 1 #define wxLUA_USE_wxClipboard 1 + #define wxLUA_USE_wxCollapsiblePane 1 #define wxLUA_USE_wxColourDialog 1 #define wxLUA_USE_wxColourPenBrush 1 |
|
From: John L. <jr...@us...> - 2007-06-18 02:57:00
|
Update of /cvsroot/wxlua/wxLua/docs In directory sc8-pr-cvs9.sourceforge.net:/tmp/cvs-serv7428/wxLua/docs Modified Files: wxluaref.html Log Message: Add more classes from wxWidgets 2.8 Index: wxluaref.html =================================================================== RCS file: /cvsroot/wxlua/wxLua/docs/wxluaref.html,v retrieving revision 1.26 retrieving revision 1.27 diff -C2 -d -r1.26 -r1.27 *** wxluaref.html 17 Jun 2007 18:36:07 -0000 1.26 --- wxluaref.html 18 Jun 2007 02:56:25 -0000 1.27 *************** *** 54,65 **** <td> <tr> ! <td>wxAnimation <td align="center">X - <td> <td> <tr> ! <td>wxAnimationCtrl <td align="center">X - <td> [...2113 lines suppressed...] ! <i>%wxchkver_2_8</i> <a href="#wxColour">wxColour</a> GetCaretLineBackground();<br> <br> <font color=#009900>// Set the colour of the background of the line containing the caret.</font><br> ! !<i>%wxchkver_2_8</i> void SetCaretLineBack(const <a href="#wxColour">wxColour</a>& back);<br> ! <i>%wxchkver_2_8</i> void SetCaretLineBackground(const <a href="#wxColour">wxColour</a>& back);<br> <br> <font color=#009900>// Set a style to be changeable or not (read only).</font><br> *************** *** 21372,21376 **** <font color=#006666> <i>%define_event</i> wxEVT_STC_MARGINCLICK <font color=#009900>// EVT_STC_MARGINCLICK(id, fn)</font></font><br> <font color=#006666> <i>%define_event</i> wxEVT_STC_NEEDSHOWN <font color=#009900>// EVT_STC_NEEDSHOWN(id, fn)</font></font><br> ! <font color=#006666> !<i>%wxchkver_2_5</i> <i>%define_event</i> wxEVT_STC_POSCHANGED <font color=#009900>// ??</font></font><br> <font color=#006666> <i>%define_event</i> wxEVT_STC_PAINTED <font color=#009900>// EVT_STC_PAINTED(id, fn)</font></font><br> <font color=#006666> <i>%define_event</i> wxEVT_STC_USERLISTSELECTION <font color=#009900>// EVT_STC_USERLISTSELECTION(id, fn)</font></font><br> --- 21921,21925 ---- <font color=#006666> <i>%define_event</i> wxEVT_STC_MARGINCLICK <font color=#009900>// EVT_STC_MARGINCLICK(id, fn)</font></font><br> <font color=#006666> <i>%define_event</i> wxEVT_STC_NEEDSHOWN <font color=#009900>// EVT_STC_NEEDSHOWN(id, fn)</font></font><br> ! <font color=#006666> !<i>%wxchkver_2_6</i> <i>%define_event</i> wxEVT_STC_POSCHANGED <font color=#009900>// ??</font></font><br> <font color=#006666> <i>%define_event</i> wxEVT_STC_PAINTED <font color=#009900>// EVT_STC_PAINTED(id, fn)</font></font><br> <font color=#006666> <i>%define_event</i> wxEVT_STC_USERLISTSELECTION <font color=#009900>// EVT_STC_USERLISTSELECTION(id, fn)</font></font><br> |
|
From: John L. <jr...@us...> - 2007-06-18 02:56:59
|
Update of /cvsroot/wxlua/wxLua/bindings/wxstc In directory sc8-pr-cvs9.sourceforge.net:/tmp/cvs-serv7428/wxLua/bindings/wxstc Modified Files: stc.i wxstc_datatypes.lua Log Message: Add more classes from wxWidgets 2.8 Index: stc.i =================================================================== RCS file: /cvsroot/wxlua/wxLua/bindings/wxstc/stc.i,v retrieving revision 1.12 retrieving revision 1.13 diff -C2 -d -r1.12 -r1.13 *** stc.i 11 Jun 2007 03:57:58 -0000 1.12 --- stc.i 18 Jun 2007 02:56:23 -0000 1.13 *************** *** 341,346 **** // These are deprecated, STC_LEX_HTML should be used instead. ! !%wxchkver_2_7 %define wxSTC_LEX_ASP ! !%wxchkver_2_7 %define wxSTC_LEX_PHP // When a lexer specifies its language as SCLEX_AUTOMATIC it receives a --- 341,346 ---- // These are deprecated, STC_LEX_HTML should be used instead. ! !%wxchkver_2_8 %define wxSTC_LEX_ASP ! !%wxchkver_2_8 %define wxSTC_LEX_PHP // When a lexer specifies its language as SCLEX_AUTOMATIC it receives a *************** *** 825,865 **** // Lexical states for SCLEX_SCRIPTOL ! !%wxchkver_2_5 %define wxSTC_SCRIPTOL_DEFAULT ! !%wxchkver_2_5 %define wxSTC_SCRIPTOL_COMMENT ! !%wxchkver_2_5 %define wxSTC_SCRIPTOL_COMMENTLINE ! !%wxchkver_2_5 %define wxSTC_SCRIPTOL_COMMENTDOC ! !%wxchkver_2_5 %define wxSTC_SCRIPTOL_NUMBER ! !%wxchkver_2_5 %define wxSTC_SCRIPTOL_WORD ! !%wxchkver_2_5 %define wxSTC_SCRIPTOL_STRING ! !%wxchkver_2_5 %define wxSTC_SCRIPTOL_CHARACTER ! !%wxchkver_2_5 %define wxSTC_SCRIPTOL_UUID ! !%wxchkver_2_5 %define wxSTC_SCRIPTOL_PREPROCESSOR ! !%wxchkver_2_5 %define wxSTC_SCRIPTOL_OPERATOR ! !%wxchkver_2_5 %define wxSTC_SCRIPTOL_IDENTIFIER ! !%wxchkver_2_5 %define wxSTC_SCRIPTOL_STRINGEOL ! !%wxchkver_2_5 %define wxSTC_SCRIPTOL_VERBATIM ! !%wxchkver_2_5 %define wxSTC_SCRIPTOL_REGEX ! !%wxchkver_2_5 %define wxSTC_SCRIPTOL_COMMENTLINEDOC ! !%wxchkver_2_5 %define wxSTC_SCRIPTOL_WORD2 ! !%wxchkver_2_5 %define wxSTC_SCRIPTOL_COMMENTDOCKEYWORD ! !%wxchkver_2_5 %define wxSTC_SCRIPTOL_COMMENTDOCKEYWORDERROR ! !%wxchkver_2_5 %define wxSTC_SCRIPTOL_COMMENTBASIC ! %wxchkver_2_5 %define wxSTC_SCRIPTOL_DEFAULT ! %wxchkver_2_5 %define wxSTC_SCRIPTOL_WHITE ! %wxchkver_2_5 %define wxSTC_SCRIPTOL_COMMENTLINE ! %wxchkver_2_5 %define wxSTC_SCRIPTOL_PERSISTENT ! %wxchkver_2_5 %define wxSTC_SCRIPTOL_CSTYLE ! %wxchkver_2_5 %define wxSTC_SCRIPTOL_COMMENTBLOCK ! %wxchkver_2_5 %define wxSTC_SCRIPTOL_NUMBER ! %wxchkver_2_5 %define wxSTC_SCRIPTOL_STRING ! %wxchkver_2_5 %define wxSTC_SCRIPTOL_CHARACTER ! %wxchkver_2_5 %define wxSTC_SCRIPTOL_STRINGEOL ! %wxchkver_2_5 %define wxSTC_SCRIPTOL_KEYWORD ! %wxchkver_2_5 %define wxSTC_SCRIPTOL_OPERATOR ! %wxchkver_2_5 %define wxSTC_SCRIPTOL_IDENTIFIER ! %wxchkver_2_5 %define wxSTC_SCRIPTOL_TRIPLE ! %wxchkver_2_5 %define wxSTC_SCRIPTOL_CLASSNAME ! %wxchkver_2_5 %define wxSTC_SCRIPTOL_PREPROCESSOR // Lexical states for SCLEX_ASM --- 825,865 ---- // Lexical states for SCLEX_SCRIPTOL ! !%wxchkver_2_6 %define wxSTC_SCRIPTOL_DEFAULT ! !%wxchkver_2_6 %define wxSTC_SCRIPTOL_COMMENT ! !%wxchkver_2_6 %define wxSTC_SCRIPTOL_COMMENTLINE ! !%wxchkver_2_6 %define wxSTC_SCRIPTOL_COMMENTDOC ! !%wxchkver_2_6 %define wxSTC_SCRIPTOL_NUMBER ! !%wxchkver_2_6 %define wxSTC_SCRIPTOL_WORD ! !%wxchkver_2_6 %define wxSTC_SCRIPTOL_STRING ! !%wxchkver_2_6 %define wxSTC_SCRIPTOL_CHARACTER ! !%wxchkver_2_6 %define wxSTC_SCRIPTOL_UUID ! !%wxchkver_2_6 %define wxSTC_SCRIPTOL_PREPROCESSOR ! !%wxchkver_2_6 %define wxSTC_SCRIPTOL_OPERATOR ! !%wxchkver_2_6 %define wxSTC_SCRIPTOL_IDENTIFIER ! !%wxchkver_2_6 %define wxSTC_SCRIPTOL_STRINGEOL ! !%wxchkver_2_6 %define wxSTC_SCRIPTOL_VERBATIM ! !%wxchkver_2_6 %define wxSTC_SCRIPTOL_REGEX ! !%wxchkver_2_6 %define wxSTC_SCRIPTOL_COMMENTLINEDOC ! !%wxchkver_2_6 %define wxSTC_SCRIPTOL_WORD2 ! !%wxchkver_2_6 %define wxSTC_SCRIPTOL_COMMENTDOCKEYWORD ! !%wxchkver_2_6 %define wxSTC_SCRIPTOL_COMMENTDOCKEYWORDERROR ! !%wxchkver_2_6 %define wxSTC_SCRIPTOL_COMMENTBASIC ! %wxchkver_2_6 %define wxSTC_SCRIPTOL_DEFAULT ! %wxchkver_2_6 %define wxSTC_SCRIPTOL_WHITE ! %wxchkver_2_6 %define wxSTC_SCRIPTOL_COMMENTLINE ! %wxchkver_2_6 %define wxSTC_SCRIPTOL_PERSISTENT ! %wxchkver_2_6 %define wxSTC_SCRIPTOL_CSTYLE ! %wxchkver_2_6 %define wxSTC_SCRIPTOL_COMMENTBLOCK ! %wxchkver_2_6 %define wxSTC_SCRIPTOL_NUMBER ! %wxchkver_2_6 %define wxSTC_SCRIPTOL_STRING ! %wxchkver_2_6 %define wxSTC_SCRIPTOL_CHARACTER ! %wxchkver_2_6 %define wxSTC_SCRIPTOL_STRINGEOL ! %wxchkver_2_6 %define wxSTC_SCRIPTOL_KEYWORD ! %wxchkver_2_6 %define wxSTC_SCRIPTOL_OPERATOR ! %wxchkver_2_6 %define wxSTC_SCRIPTOL_IDENTIFIER ! %wxchkver_2_6 %define wxSTC_SCRIPTOL_TRIPLE ! %wxchkver_2_6 %define wxSTC_SCRIPTOL_CLASSNAME ! %wxchkver_2_6 %define wxSTC_SCRIPTOL_PREPROCESSOR // Lexical states for SCLEX_ASM *************** *** 2020,2029 **** // Get the colour of the background of the line containing the caret. ! !%wxchkver_2_7_1 wxColour GetCaretLineBack(); ! %wxchkver_2_7_1 wxColour GetCaretLineBackground(); // Set the colour of the background of the line containing the caret. ! !%wxchkver_2_7_1 void SetCaretLineBack(const wxColour& back); ! %wxchkver_2_7_1 void SetCaretLineBackground(const wxColour& back); // Set a style to be changeable or not (read only). --- 2020,2029 ---- // Get the colour of the background of the line containing the caret. ! !%wxchkver_2_8 wxColour GetCaretLineBack(); ! %wxchkver_2_8 wxColour GetCaretLineBackground(); // Set the colour of the background of the line containing the caret. ! !%wxchkver_2_8 void SetCaretLineBack(const wxColour& back); ! %wxchkver_2_8 void SetCaretLineBackground(const wxColour& back); // Set a style to be changeable or not (read only). *************** *** 3214,3218 **** %define_event wxEVT_STC_MARGINCLICK // EVT_STC_MARGINCLICK(id, fn) %define_event wxEVT_STC_NEEDSHOWN // EVT_STC_NEEDSHOWN(id, fn) ! !%wxchkver_2_5 %define_event wxEVT_STC_POSCHANGED // ?? %define_event wxEVT_STC_PAINTED // EVT_STC_PAINTED(id, fn) %define_event wxEVT_STC_USERLISTSELECTION // EVT_STC_USERLISTSELECTION(id, fn) --- 3214,3218 ---- %define_event wxEVT_STC_MARGINCLICK // EVT_STC_MARGINCLICK(id, fn) %define_event wxEVT_STC_NEEDSHOWN // EVT_STC_NEEDSHOWN(id, fn) ! !%wxchkver_2_6 %define_event wxEVT_STC_POSCHANGED // ?? %define_event wxEVT_STC_PAINTED // EVT_STC_PAINTED(id, fn) %define_event wxEVT_STC_USERLISTSELECTION // EVT_STC_USERLISTSELECTION(id, fn) Index: wxstc_datatypes.lua =================================================================== RCS file: /cvsroot/wxlua/wxLua/bindings/wxstc/wxstc_datatypes.lua,v retrieving revision 1.59 retrieving revision 1.60 diff -C2 -d -r1.59 -r1.60 *** wxstc_datatypes.lua 17 Jun 2007 18:36:06 -0000 1.59 --- wxstc_datatypes.lua 18 Jun 2007 02:56:23 -0000 1.60 *************** *** 238,241 **** --- 238,261 ---- Name = "wxAlignment", }, + wxAnimation = { + BaseClass = "wxGDIObject", + Condition = "wxLUA_USE_Animation && wxUSE_ANIMATIONCTRL && wxchkver_2_8", + DefType = "class", + IsNumber = false, + Name = "wxAnimation", + }, + wxAnimationCtrl = { + BaseClass = "wxControl", + Condition = "wxLUA_USE_Animation && wxUSE_ANIMATIONCTRL && wxchkver_2_8", + DefType = "class", + IsNumber = false, + Name = "wxAnimationCtrl", + }, + wxAnimationType = { + Condition = "wxLUA_USE_Animation && wxUSE_ANIMATIONCTRL && wxchkver_2_8", + DefType = "enum", + IsNumber = true, + Name = "wxAnimationType", + }, wxApp = { BaseClass = "wxEvtHandler", *************** *** 245,248 **** --- 265,273 ---- Name = "wxApp", }, + wxArchitecture = { + DefType = "enum", + IsNumber = true, + Name = "wxArchitecture", + }, wxArrayInt = { Condition = "wxLUA_USE_wxArrayInt", *************** *** 299,302 **** --- 324,332 ---- Name = "wxBackgroundStyle", }, + wxBatteryState = { + DefType = "enum", + IsNumber = true, + Name = "wxBatteryState", + }, wxBestHelpController = { BaseClass = "wxHelpControllerBase", *************** *** 320,323 **** --- 350,360 ---- Name = "wxBitmapButton", }, + wxBitmapComboBox = { + BaseClass = "wxControlWithItems", + Condition = "wxLUA_USE_wxBitmapComboBox && wxUSE_BITMAPCOMBOBOX", + DefType = "class", + IsNumber = false, + Name = "wxBitmapComboBox", + }, wxBitmapDataObject = { BaseClass = "wxDataObjectSimple", *************** *** 568,571 **** --- 605,622 ---- Name = "wxCloseEvent", }, + wxCollapsiblePane = { + BaseClass = "wxControl", + Condition = "wxchkver_2_8 && wxLUA_USE_wxCollapsiblePane && wxUSE_COLLPANE", + DefType = "class", + IsNumber = false, + Name = "wxCollapsiblePane", + }, + wxCollapsiblePaneEvent = { + BaseClass = "wxCommandEvent", + Condition = "wxchkver_2_8 && wxLUA_USE_wxCollapsiblePane && wxUSE_COLLPANE", + DefType = "class", + IsNumber = false, + Name = "wxCollapsiblePaneEvent", + }, wxColour = { BaseClass = "wxGDIObject", *************** *** 677,680 **** --- 728,737 ---- Name = "wxContextHelpButton", }, + wxContextMenuEvent = { + BaseClass = "wxCommandEvent", + DefType = "class", + IsNumber = false, + Name = "wxContextMenuEvent", + }, wxControl = { BaseClass = "wxWindow", *************** *** 916,919 **** --- 973,990 ---- Name = "wxDocChildFrame", }, + wxDocMDIChildFrame = { + BaseClass = "wxMDIChildFrame", + Condition = "wxLUA_USE_MDI && wxUSE_MDI && wxUSE_DOC_VIEW_ARCHITECTURE", + DefType = "class", + IsNumber = false, + Name = "wxDocMDIChildFrame", + }, + wxDocMDIParentFrame = { + BaseClass = "wxMDIParentFrame", + Condition = "wxLUA_USE_MDI && wxUSE_MDI && wxUSE_DOC_VIEW_ARCHITECTURE", + DefType = "class", + IsNumber = false, + Name = "wxDocMDIParentFrame", + }, wxDocManager = { BaseClass = "wxEvtHandler", *************** *** 999,1002 **** --- 1070,1078 ---- Name = "wxEffects", }, + wxEndianness = { + DefType = "enum", + IsNumber = true, + Name = "wxEndianness", + }, wxEraseEvent = { BaseClass = "wxEvent", *************** *** 1143,1146 **** --- 1219,1240 ---- Name = "wxFilePickerCtrl", }, + wxFileType = { + DefType = "class", + Encapsulate = true, + IsNumber = false, + Name = "wxFileType", + }, + ["wxFileType::MessageParameters"] = { + DefType = "class", + Encapsulate = true, + IsNumber = false, + Name = "wxFileType::MessageParameters", + }, + wxFileTypeInfo = { + DefType = "class", + Encapsulate = true, + IsNumber = false, + Name = "wxFileTypeInfo", + }, wxFindDialogEvent = { BaseClass = "wxCommandEvent", *************** *** 1736,1740 **** }, wxHtmlWindowInterface = { ! Condition = "(wxCHECK_VERSION(2,7,0)) && (wxLUA_USE_wxHTML && wxUSE_HTML)", DefType = "class", IsNumber = false, --- 1830,1834 ---- }, wxHtmlWindowInterface = { ! Condition = "(wxCHECK_VERSION(2,8,0)) && (wxLUA_USE_wxHTML && wxUSE_HTML)", DefType = "class", IsNumber = false, *************** *** 1742,1746 **** }, ["wxHtmlWindowInterface::HTMLCursor"] = { ! Condition = "(wxCHECK_VERSION(2,7,0)) && (wxLUA_USE_wxHTML && wxUSE_HTML)", DefType = "enum", IsNumber = true, --- 1836,1840 ---- }, ["wxHtmlWindowInterface::HTMLCursor"] = { ! Condition = "(wxCHECK_VERSION(2,8,0)) && (wxLUA_USE_wxHTML && wxUSE_HTML)", DefType = "enum", IsNumber = true, *************** *** 2302,2305 **** --- 2396,2405 ---- Name = "wxMetafileDC", }, + wxMimeTypesManager = { + DefType = "class", + Encapsulate = true, + IsNumber = false, + Name = "wxMimeTypesManager", + }, wxMiniFrame = { BaseClass = "wxFrame", *************** *** 2336,2340 **** }, wxMouseState = { ! Condition = "wxCHECK_VERSION(2,7,0)", DefType = "class", Encapsulate = true, --- 2436,2440 ---- }, wxMouseState = { ! Condition = "wxCHECK_VERSION(2,8,0)", DefType = "class", Encapsulate = true, *************** *** 2395,2399 **** wxNotebookSizer = { BaseClass = "wxSizer", ! Condition = "(wxUSE_NOTEBOOK && (!wxCHECK_VERSION(2,5,0))) && (wxLUA_USE_wxSizer)", DefType = "class", IsNumber = false, --- 2495,2499 ---- wxNotebookSizer = { BaseClass = "wxSizer", ! Condition = "(wxUSE_NOTEBOOK && (!wxCHECK_VERSION(2,6,0))) && (wxLUA_USE_wxSizer)", DefType = "class", IsNumber = false, *************** *** 2418,2421 **** --- 2518,2526 ---- Name = "wxObjectRefData", }, + wxOperatingSystemId = { + DefType = "enum", + IsNumber = true, + Name = "wxOperatingSystemId", + }, wxOrientation = { DefType = "enum", *************** *** 2556,2559 **** --- 2661,2670 ---- Name = "wxPickerBase", }, + wxPlatformInfo = { + DefType = "class", + Encapsulate = true, + IsNumber = false, + Name = "wxPlatformInfo", + }, wxPoint = { Condition = "wxLUA_USE_wxPointSizeRect", *************** *** 2577,2580 **** --- 2688,2696 ---- Name = "wxPoint2DInt", }, + wxPortId = { + DefType = "enum", + IsNumber = true, + Name = "wxPortId", + }, wxPostScriptDC = { BaseClass = "wxDC", *************** *** 2584,2587 **** --- 2700,2715 ---- Name = "wxPostScriptDC", }, + wxPowerEvent = { + BaseClass = "wxEvent", + Condition = "wxHAS_POWER_EVENTS", + DefType = "class", + IsNumber = false, + Name = "wxPowerEvent", + }, + wxPowerType = { + DefType = "enum", + IsNumber = true, + Name = "wxPowerType", + }, wxPreviewCanvas = { BaseClass = "wxWindow", *************** *** 2606,2610 **** }, wxPrintBin = { ! Condition = "(wxCHECK_VERSION(2,5,0)) && (wxLUA_USE_wxPrint && wxUSE_PRINTING_ARCHITECTURE)", DefType = "enum", IsNumber = true, --- 2734,2738 ---- }, wxPrintBin = { ! Condition = "(wxCHECK_VERSION(2,6,0)) && (wxLUA_USE_wxPrint && wxUSE_PRINTING_ARCHITECTURE)", DefType = "enum", IsNumber = true, *************** *** 2724,2727 **** --- 2852,2862 ---- Name = "wxProtocolError", }, + wxQuantize = { + BaseClass = "wxObject", + Condition = "wxLUA_USE_wxImage && wxUSE_IMAGE", + DefType = "class", + IsNumber = false, + Name = "wxQuantize", + }, wxQueryLayoutInfoEvent = { BaseClass = "wxEvent", *************** *** 2905,2909 **** wxSimpleHtmlListBox = { BaseClass = "wxHtmlWindowInterface", ! Condition = "(wxCHECK_VERSION(2,7,0)) && (wxLUA_USE_wxHTML && wxUSE_HTML)", DefType = "class", IsNumber = false, --- 3040,3044 ---- wxSimpleHtmlListBox = { BaseClass = "wxHtmlWindowInterface", ! Condition = "(wxCHECK_VERSION(2,8,0)) && (wxLUA_USE_wxHTML && wxUSE_HTML)", DefType = "class", IsNumber = false, *************** *** 3383,3387 **** wxToolBarSimple = { BaseClass = "wxToolBarBase", ! Condition = "(!wxCHECK_VERSION(2,5,0)) && (wxLUA_USE_wxToolbar)", DefType = "class", IsNumber = false, --- 3518,3522 ---- wxToolBarSimple = { BaseClass = "wxToolBarBase", ! Condition = "(!wxCHECK_VERSION(2,6,0)) && (wxLUA_USE_wxToolbar)", DefType = "class", IsNumber = false, *************** *** 3585,3589 **** wxWave = { BaseClass = "wxObject", ! Condition = "(defined(__WXMSW__) && !wxCHECK_VERSION(2,5,0) && wxUSE_WAVE) && (wxLUA_USE_wxWave)", DefType = "class", IsNumber = false, --- 3720,3724 ---- wxWave = { BaseClass = "wxObject", ! Condition = "(defined(__WXMSW__) && !wxCHECK_VERSION(2,6,0) && wxUSE_WAVE) && (wxLUA_USE_wxWave)", DefType = "class", IsNumber = false, *************** *** 3773,3781 **** ["%wince"] = "defined(__WXWINCE__)", ["%wxchkver_2_4"] = "wxCHECK_VERSION(2,4,0)", - ["%wxchkver_2_5"] = "wxCHECK_VERSION(2,5,0)", ["%wxchkver_2_6"] = "wxCHECK_VERSION(2,6,0)", ["%wxchkver_2_6_4"] = "wxCHECK_VERSION(2,6,4)", - ["%wxchkver_2_7"] = "wxCHECK_VERSION(2,7,0)", - ["%wxchkver_2_7_1"] = "wxCHECK_VERSION(2,7,1)", ["%wxchkver_2_8"] = "wxCHECK_VERSION(2,8,0)", ["%wxchkver_2_8_1"] = "wxCHECK_VERSION(2,8,1)", --- 3908,3913 ---- *************** *** 3788,3791 **** --- 3920,3925 ---- WXWIN_COMPATIBILITY_2_6 = "(defined(WXWIN_COMPATIBILITY_2_6) && WXWIN_COMPATIBILITY_2_6)", WXWIN_COMPATIBILITY_2_8 = "(defined(WXWIN_COMPATIBILITY_2_8) && WXWIN_COMPATIBILITY_2_8)", + wxHAS_POWER_EVENTS = "wxHAS_POWER_EVENTS", + wxLUA_USE_Animation = "wxLUA_USE_Animation", wxLUA_USE_FL = "wxLUA_USE_FL", wxLUA_USE_Geometry = "wxLUA_USE_Geometry", *************** *** 3799,3802 **** --- 3933,3937 ---- wxLUA_USE_wxBitmap = "wxLUA_USE_wxBitmap", wxLUA_USE_wxBitmapButton = "wxLUA_USE_wxBitmapButton", + wxLUA_USE_wxBitmapComboBox = "wxLUA_USE_wxBitmapComboBox", wxLUA_USE_wxBrushList = "wxLUA_USE_wxBrushList", wxLUA_USE_wxBusyCursor = "wxLUA_USE_wxBusyCursor", *************** *** 3810,3813 **** --- 3945,3949 ---- wxLUA_USE_wxClassInfo = "wxLUA_USE_wxClassInfo", wxLUA_USE_wxClipboard = "wxLUA_USE_wxClipboard", + wxLUA_USE_wxCollapsiblePane = "wxLUA_USE_wxCollapsiblePane", wxLUA_USE_wxColourDialog = "wxLUA_USE_wxColourDialog", wxLUA_USE_wxColourPenBrush = "wxLUA_USE_wxColourPenBrush", *************** *** 3923,3927 **** --- 4059,4065 ---- wxUSE_ACCESSIBILITY = "wxUSE_ACCESSIBILITY", wxUSE_AFM_FOR_POSTSCRIPT = "wxUSE_AFM_FOR_POSTSCRIPT", + wxUSE_ANIMATIONCTRL = "wxUSE_ANIMATIONCTRL", wxUSE_APPLE_IEEE = "wxUSE_APPLE_IEEE", + wxUSE_BITMAPCOMBOBOX = "wxUSE_BITMAPCOMBOBOX", wxUSE_BMPBUTTON = "wxUSE_BMPBUTTON", wxUSE_BOOKCTRL = "wxUSE_BOOKCTRL", *************** *** 3938,3941 **** --- 4076,4080 ---- wxUSE_CLIPBOARD = "wxUSE_CLIPBOARD", wxUSE_CMDLINE_PARSER = "wxUSE_CMDLINE_PARSER", + wxUSE_COLLPANE = "wxUSE_COLLPANE", wxUSE_COLOURDLG = "wxUSE_COLOURDLG", wxUSE_COLOURPICKERCTRL = "wxUSE_COLOURPICKERCTRL", |
|
From: John L. <jr...@us...> - 2007-06-18 02:56:56
|
Update of /cvsroot/wxlua/wxLua/bindings In directory sc8-pr-cvs9.sourceforge.net:/tmp/cvs-serv7428/wxLua/bindings Modified Files: genidocs_rules.lua genwxbind.lua Log Message: Add more classes from wxWidgets 2.8 Index: genidocs_rules.lua =================================================================== RCS file: /cvsroot/wxlua/wxLua/bindings/genidocs_rules.lua,v retrieving revision 1.1 retrieving revision 1.2 diff -C2 -d -r1.1 -r1.2 *** genidocs_rules.lua 17 Jun 2007 17:17:36 -0000 1.1 --- genidocs_rules.lua 18 Jun 2007 02:56:22 -0000 1.2 *************** *** 98,104 **** --- 98,107 ---- ["wxArrayInt"] = "Interchangeable with a numeric indexed lua table", ["wxArrayString"] = "Interchangeable with a numeric indexed lua table", + ["wxBitmapHandler"] = "Base class for bitmap loaders, not needed", + ["wxCondition"] = "For threading in C", ["wxCmdLineParser"] = "Easier to implement in lua", ["wxCSConv"] = "Lua uses ANSI 8-bit strings", ["wxDirTraverser"] = "Use wxDir::GetFirst() and GetNext()", + ["wxEncodingConverter"] = "Lua uses ANSI 8-bit strings", ["wxHashMap"] = "Lua tables are hash tables", ["wxHashSet"] = "Lua tables are hash tables", *************** *** 111,114 **** --- 114,119 ---- ["wxMBConvUTF8"] = "Lua uses ANSI 8-bit strings", ["wxModule"] = "Useable in C++ only", + ["wxMutex"] = "For threading in C", + ["wxMutexLocker"] = "For threading in C", ["wxRealPoint"] = "Not used anywhere in wxWidgets", ["wxRecursionGuard"] = "Easier to implement in lua", *************** *** 117,120 **** --- 122,126 ---- ["wxScopedPtr"] = "Useable in C++ only (unnecessary in lua)", ["wxScopedTiedPtr"] = "Useable in C++ only (unnecessary in lua)", + ["wxSemaphore"] = "For threading in C", ["wxSortedArrayString"] = "Interchangeable with a numeric indexed lua table", ["wxString"] = "Interchangeable with a lua string", Index: genwxbind.lua =================================================================== RCS file: /cvsroot/wxlua/wxLua/bindings/genwxbind.lua,v retrieving revision 1.125 retrieving revision 1.126 diff -C2 -d -r1.125 -r1.126 *** genwxbind.lua 17 Jun 2007 18:36:05 -0000 1.125 --- genwxbind.lua 18 Jun 2007 02:56:22 -0000 1.126 *************** *** 698,701 **** --- 698,703 ---- preprocConditionTable["%__WXWINCE__"] = "defined(__WXWINCE__)" + preprocConditionTable["wxHAS_POWER_EVENTS"] = "wxHAS_POWER_EVENTS" + -- wxUSE_ conditions preprocConditionTable["wxUSE_ABOUTDLG"] = "wxUSE_ABOUTDLG" *************** *** 703,707 **** --- 705,711 ---- preprocConditionTable["wxUSE_ACCESSIBILITY"] = "wxUSE_ACCESSIBILITY" preprocConditionTable["wxUSE_AFM_FOR_POSTSCRIPT"] = "wxUSE_AFM_FOR_POSTSCRIPT" + preprocConditionTable["wxUSE_ANIMATIONCTRL"] = "wxUSE_ANIMATIONCTRL" preprocConditionTable["wxUSE_APPLE_IEEE"] = "wxUSE_APPLE_IEEE" + preprocConditionTable["wxUSE_BITMAPCOMBOBOX"] = "wxUSE_BITMAPCOMBOBOX" preprocConditionTable["wxUSE_BMPBUTTON"] = "wxUSE_BMPBUTTON" preprocConditionTable["wxUSE_BOOKCTRL"] = "wxUSE_BOOKCTRL" *************** *** 718,721 **** --- 722,726 ---- preprocConditionTable["wxUSE_CLIPBOARD"] = "wxUSE_CLIPBOARD" preprocConditionTable["wxUSE_CMDLINE_PARSER"] = "wxUSE_CMDLINE_PARSER" + preprocConditionTable["wxUSE_COLLPANE"] = "wxUSE_COLLPANE" preprocConditionTable["wxUSE_COLOURDLG"] = "wxUSE_COLOURDLG" preprocConditionTable["wxUSE_COLOURPICKERCTRL"] = "wxUSE_COLOURPICKERCTRL" *************** *** 893,896 **** --- 898,902 ---- preprocConditionTable["wxLUA_USE_wxAboutDialog"] = "wxLUA_USE_wxAboutDialog" preprocConditionTable["wxLUA_USE_wxAcceleratorTable"] = "wxLUA_USE_wxAcceleratorTable" + preprocConditionTable["wxLUA_USE_Animation"] = "wxLUA_USE_Animation" preprocConditionTable["wxLUA_USE_wxApp"] = "wxLUA_USE_wxApp" preprocConditionTable["wxLUA_USE_wxArrayInt"] = "wxLUA_USE_wxArrayInt" *************** *** 898,901 **** --- 904,908 ---- preprocConditionTable["wxLUA_USE_wxArtProvider"] = "wxLUA_USE_wxArtProvider" preprocConditionTable["wxLUA_USE_wxBitmap"] = "wxLUA_USE_wxBitmap" + preprocConditionTable["wxLUA_USE_wxBitmapComboBox"] = "wxLUA_USE_wxBitmapComboBox" preprocConditionTable["wxLUA_USE_wxBitmapButton"] = "wxLUA_USE_wxBitmapButton" preprocConditionTable["wxLUA_USE_wxBrushList"] = "wxLUA_USE_wxBrushList" *************** *** 910,913 **** --- 917,921 ---- preprocConditionTable["wxLUA_USE_wxClassInfo"] = "wxLUA_USE_wxClassInfo" preprocConditionTable["wxLUA_USE_wxClipboard"] = "wxLUA_USE_wxClipboard" + preprocConditionTable["wxLUA_USE_wxCollapsiblePane"] = "wxLUA_USE_wxCollapsiblePane" preprocConditionTable["wxLUA_USE_wxColourDialog"] = "wxLUA_USE_wxColourDialog" preprocConditionTable["wxLUA_USE_wxColourPenBrush"] = "wxLUA_USE_wxColourPenBrush" |
Update of /cvsroot/wxlua/wxLua/modules/wxbind/src In directory sc8-pr-cvs9.sourceforge.net:/tmp/cvs-serv7428/wxLua/modules/wxbind/src Modified Files: appframe.cpp clipdrag.cpp controls.cpp data.cpp datetime.cpp defsutil.cpp dialogs.cpp event.cpp file.cpp gdi.cpp html.cpp image.cpp mdi.cpp menutool.cpp print.cpp sizer.cpp wave.cpp windows.cpp wx_bind.cpp Log Message: Add more classes from wxWidgets 2.8 Index: dialogs.cpp =================================================================== RCS file: /cvsroot/wxlua/wxLua/modules/wxbind/src/dialogs.cpp,v retrieving revision 1.48 retrieving revision 1.49 diff -C2 -d -r1.48 -r1.49 *** dialogs.cpp 17 Jun 2007 18:36:17 -0000 1.48 --- dialogs.cpp 18 Jun 2007 02:56:29 -0000 1.49 *************** *** 1658,1666 **** ! #if (!wxCHECK_VERSION(2,7,0)) && (wxLUA_USE_wxFileDialog && wxUSE_FILEDLG) static wxLuaArgTag s_wxluatagArray_wxLua_wxFileDialog_GetStyle[] = { &s_wxluatag_wxFileDialog, NULL }; static int LUACALL wxLua_wxFileDialog_GetStyle(lua_State *L); static wxLuaBindCFunc s_wxluafunc_wxLua_wxFileDialog_GetStyle[1] = {{ wxLua_wxFileDialog_GetStyle, WXLUAMETHOD_METHOD, 1, 1, s_wxluatagArray_wxLua_wxFileDialog_GetStyle }}; ! // !%wxchkver_2_7 long GetStyle() const static int LUACALL wxLua_wxFileDialog_GetStyle(lua_State *L) { --- 1658,1666 ---- ! #if (!wxCHECK_VERSION(2,8,0)) && (wxLUA_USE_wxFileDialog && wxUSE_FILEDLG) static wxLuaArgTag s_wxluatagArray_wxLua_wxFileDialog_GetStyle[] = { &s_wxluatag_wxFileDialog, NULL }; static int LUACALL wxLua_wxFileDialog_GetStyle(lua_State *L); static wxLuaBindCFunc s_wxluafunc_wxLua_wxFileDialog_GetStyle[1] = {{ wxLua_wxFileDialog_GetStyle, WXLUAMETHOD_METHOD, 1, 1, s_wxluatagArray_wxLua_wxFileDialog_GetStyle }}; ! // !%wxchkver_2_8 long GetStyle() const static int LUACALL wxLua_wxFileDialog_GetStyle(lua_State *L) { *************** *** 1677,1681 **** } ! #endif // (!wxCHECK_VERSION(2,7,0)) && (wxLUA_USE_wxFileDialog && wxUSE_FILEDLG) static wxLuaArgTag s_wxluatagArray_wxLua_wxFileDialog_GetWildcard[] = { &s_wxluatag_wxFileDialog, NULL }; --- 1677,1681 ---- } ! #endif // (!wxCHECK_VERSION(2,8,0)) && (wxLUA_USE_wxFileDialog && wxUSE_FILEDLG) static wxLuaArgTag s_wxluatagArray_wxLua_wxFileDialog_GetWildcard[] = { &s_wxluatag_wxFileDialog, NULL }; *************** *** 1783,1791 **** ! #if (!wxCHECK_VERSION(2,7,0)) && (wxLUA_USE_wxFileDialog && wxUSE_FILEDLG) static wxLuaArgTag s_wxluatagArray_wxLua_wxFileDialog_SetStyle[] = { &s_wxluatag_wxFileDialog, &s_wxluaarg_Number, NULL }; static int LUACALL wxLua_wxFileDialog_SetStyle(lua_State *L); static wxLuaBindCFunc s_wxluafunc_wxLua_wxFileDialog_SetStyle[1] = {{ wxLua_wxFileDialog_SetStyle, WXLUAMETHOD_METHOD, 2, 2, s_wxluatagArray_wxLua_wxFileDialog_SetStyle }}; ! // !%wxchkver_2_7 void SetStyle(long style) static int LUACALL wxLua_wxFileDialog_SetStyle(lua_State *L) { --- 1783,1791 ---- ! #if (!wxCHECK_VERSION(2,8,0)) && (wxLUA_USE_wxFileDialog && wxUSE_FILEDLG) static wxLuaArgTag s_wxluatagArray_wxLua_wxFileDialog_SetStyle[] = { &s_wxluatag_wxFileDialog, &s_wxluaarg_Number, NULL }; static int LUACALL wxLua_wxFileDialog_SetStyle(lua_State *L); static wxLuaBindCFunc s_wxluafunc_wxLua_wxFileDialog_SetStyle[1] = {{ wxLua_wxFileDialog_SetStyle, WXLUAMETHOD_METHOD, 2, 2, s_wxluatagArray_wxLua_wxFileDialog_SetStyle }}; ! // !%wxchkver_2_8 void SetStyle(long style) static int LUACALL wxLua_wxFileDialog_SetStyle(lua_State *L) { *************** *** 1801,1805 **** } ! #endif // (!wxCHECK_VERSION(2,7,0)) && (wxLUA_USE_wxFileDialog && wxUSE_FILEDLG) static wxLuaArgTag s_wxluatagArray_wxLua_wxFileDialog_SetWildcard[] = { &s_wxluatag_wxFileDialog, &s_wxluaarg_String, NULL }; --- 1801,1805 ---- } ! #endif // (!wxCHECK_VERSION(2,8,0)) && (wxLUA_USE_wxFileDialog && wxUSE_FILEDLG) static wxLuaArgTag s_wxluatagArray_wxLua_wxFileDialog_SetWildcard[] = { &s_wxluatag_wxFileDialog, &s_wxluaarg_String, NULL }; *************** *** 1913,1919 **** { "GetPaths", WXLUAMETHOD_METHOD, s_wxluafunc_wxLua_wxFileDialog_GetPaths, 1, NULL }, ! #if (!wxCHECK_VERSION(2,7,0)) && (wxLUA_USE_wxFileDialog && wxUSE_FILEDLG) { "GetStyle", WXLUAMETHOD_METHOD, s_wxluafunc_wxLua_wxFileDialog_GetStyle, 1, NULL }, ! #endif // (!wxCHECK_VERSION(2,7,0)) && (wxLUA_USE_wxFileDialog && wxUSE_FILEDLG) { "GetWildcard", WXLUAMETHOD_METHOD, s_wxluafunc_wxLua_wxFileDialog_GetWildcard, 1, NULL }, --- 1913,1919 ---- { "GetPaths", WXLUAMETHOD_METHOD, s_wxluafunc_wxLua_wxFileDialog_GetPaths, 1, NULL }, ! #if (!wxCHECK_VERSION(2,8,0)) && (wxLUA_USE_wxFileDialog && wxUSE_FILEDLG) { "GetStyle", WXLUAMETHOD_METHOD, s_wxluafunc_wxLua_wxFileDialog_GetStyle, 1, NULL }, ! #endif // (!wxCHECK_VERSION(2,8,0)) && (wxLUA_USE_wxFileDialog && wxUSE_FILEDLG) { "GetWildcard", WXLUAMETHOD_METHOD, s_wxluafunc_wxLua_wxFileDialog_GetWildcard, 1, NULL }, *************** *** 1924,1930 **** { "SetPath", WXLUAMETHOD_METHOD, s_wxluafunc_wxLua_wxFileDialog_SetPath, 1, NULL }, ! #if (!wxCHECK_VERSION(2,7,0)) && (wxLUA_USE_wxFileDialog && wxUSE_FILEDLG) { "SetStyle", WXLUAMETHOD_METHOD, s_wxluafunc_wxLua_wxFileDialog_SetStyle, 1, NULL }, ! #endif // (!wxCHECK_VERSION(2,7,0)) && (wxLUA_USE_wxFileDialog && wxUSE_FILEDLG) { "SetWildcard", WXLUAMETHOD_METHOD, s_wxluafunc_wxLua_wxFileDialog_SetWildcard, 1, NULL }, --- 1924,1930 ---- { "SetPath", WXLUAMETHOD_METHOD, s_wxluafunc_wxLua_wxFileDialog_SetPath, 1, NULL }, ! #if (!wxCHECK_VERSION(2,8,0)) && (wxLUA_USE_wxFileDialog && wxUSE_FILEDLG) { "SetStyle", WXLUAMETHOD_METHOD, s_wxluafunc_wxLua_wxFileDialog_SetStyle, 1, NULL }, ! #endif // (!wxCHECK_VERSION(2,8,0)) && (wxLUA_USE_wxFileDialog && wxUSE_FILEDLG) { "SetWildcard", WXLUAMETHOD_METHOD, s_wxluafunc_wxLua_wxFileDialog_SetWildcard, 1, NULL }, *************** *** 1988,1996 **** ! #if (!wxCHECK_VERSION(2,7,0)) && (wxLUA_USE_wxDirDialog && wxUSE_DIRDLG) static wxLuaArgTag s_wxluatagArray_wxLua_wxDirDialog_GetStyle[] = { &s_wxluatag_wxDirDialog, NULL }; static int LUACALL wxLua_wxDirDialog_GetStyle(lua_State *L); static wxLuaBindCFunc s_wxluafunc_wxLua_wxDirDialog_GetStyle[1] = {{ wxLua_wxDirDialog_GetStyle, WXLUAMETHOD_METHOD, 1, 1, s_wxluatagArray_wxLua_wxDirDialog_GetStyle }}; ! // !%wxchkver_2_7 long GetStyle() const static int LUACALL wxLua_wxDirDialog_GetStyle(lua_State *L) { --- 1988,1996 ---- ! #if (!wxCHECK_VERSION(2,8,0)) && (wxLUA_USE_wxDirDialog && wxUSE_DIRDLG) static wxLuaArgTag s_wxluatagArray_wxLua_wxDirDialog_GetStyle[] = { &s_wxluatag_wxDirDialog, NULL }; static int LUACALL wxLua_wxDirDialog_GetStyle(lua_State *L); static wxLuaBindCFunc s_wxluafunc_wxLua_wxDirDialog_GetStyle[1] = {{ wxLua_wxDirDialog_GetStyle, WXLUAMETHOD_METHOD, 1, 1, s_wxluatagArray_wxLua_wxDirDialog_GetStyle }}; ! // !%wxchkver_2_8 long GetStyle() const static int LUACALL wxLua_wxDirDialog_GetStyle(lua_State *L) { *************** *** 2007,2011 **** } ! #endif // (!wxCHECK_VERSION(2,7,0)) && (wxLUA_USE_wxDirDialog && wxUSE_DIRDLG) static wxLuaArgTag s_wxluatagArray_wxLua_wxDirDialog_SetMessage[] = { &s_wxluatag_wxDirDialog, &s_wxluaarg_String, NULL }; --- 2007,2011 ---- } ! #endif // (!wxCHECK_VERSION(2,8,0)) && (wxLUA_USE_wxDirDialog && wxUSE_DIRDLG) static wxLuaArgTag s_wxluatagArray_wxLua_wxDirDialog_SetMessage[] = { &s_wxluatag_wxDirDialog, &s_wxluaarg_String, NULL }; *************** *** 2044,2052 **** ! #if (!wxCHECK_VERSION(2,7,0)) && (wxLUA_USE_wxDirDialog && wxUSE_DIRDLG) static wxLuaArgTag s_wxluatagArray_wxLua_wxDirDialog_SetStyle[] = { &s_wxluatag_wxDirDialog, &s_wxluaarg_Number, NULL }; static int LUACALL wxLua_wxDirDialog_SetStyle(lua_State *L); static wxLuaBindCFunc s_wxluafunc_wxLua_wxDirDialog_SetStyle[1] = {{ wxLua_wxDirDialog_SetStyle, WXLUAMETHOD_METHOD, 2, 2, s_wxluatagArray_wxLua_wxDirDialog_SetStyle }}; ! // !%wxchkver_2_7 void SetStyle(long style) static int LUACALL wxLua_wxDirDialog_SetStyle(lua_State *L) { --- 2044,2052 ---- ! #if (!wxCHECK_VERSION(2,8,0)) && (wxLUA_USE_wxDirDialog && wxUSE_DIRDLG) static wxLuaArgTag s_wxluatagArray_wxLua_wxDirDialog_SetStyle[] = { &s_wxluatag_wxDirDialog, &s_wxluaarg_Number, NULL }; static int LUACALL wxLua_wxDirDialog_SetStyle(lua_State *L); static wxLuaBindCFunc s_wxluafunc_wxLua_wxDirDialog_SetStyle[1] = {{ wxLua_wxDirDialog_SetStyle, WXLUAMETHOD_METHOD, 2, 2, s_wxluatagArray_wxLua_wxDirDialog_SetStyle }}; ! // !%wxchkver_2_8 void SetStyle(long style) static int LUACALL wxLua_wxDirDialog_SetStyle(lua_State *L) { *************** *** 2062,2066 **** } ! #endif // (!wxCHECK_VERSION(2,7,0)) && (wxLUA_USE_wxDirDialog && wxUSE_DIRDLG) #if (wxLUA_USE_wxPointSizeRect) && (wxLUA_USE_wxDirDialog && wxUSE_DIRDLG) --- 2062,2066 ---- } ! #endif // (!wxCHECK_VERSION(2,8,0)) && (wxLUA_USE_wxDirDialog && wxUSE_DIRDLG) #if (wxLUA_USE_wxPointSizeRect) && (wxLUA_USE_wxDirDialog && wxUSE_DIRDLG) *************** *** 2105,2118 **** { "GetPath", WXLUAMETHOD_METHOD, s_wxluafunc_wxLua_wxDirDialog_GetPath, 1, NULL }, ! #if (!wxCHECK_VERSION(2,7,0)) && (wxLUA_USE_wxDirDialog && wxUSE_DIRDLG) { "GetStyle", WXLUAMETHOD_METHOD, s_wxluafunc_wxLua_wxDirDialog_GetStyle, 1, NULL }, ! #endif // (!wxCHECK_VERSION(2,7,0)) && (wxLUA_USE_wxDirDialog && wxUSE_DIRDLG) { "SetMessage", WXLUAMETHOD_METHOD, s_wxluafunc_wxLua_wxDirDialog_SetMessage, 1, NULL }, { "SetPath", WXLUAMETHOD_METHOD, s_wxluafunc_wxLua_wxDirDialog_SetPath, 1, NULL }, ! #if (!wxCHECK_VERSION(2,7,0)) && (wxLUA_USE_wxDirDialog && wxUSE_DIRDLG) { "SetStyle", WXLUAMETHOD_METHOD, s_wxluafunc_wxLua_wxDirDialog_SetStyle, 1, NULL }, ! #endif // (!wxCHECK_VERSION(2,7,0)) && (wxLUA_USE_wxDirDialog && wxUSE_DIRDLG) #if (wxLUA_USE_wxPointSizeRect) && (wxLUA_USE_wxDirDialog && wxUSE_DIRDLG) --- 2105,2118 ---- { "GetPath", WXLUAMETHOD_METHOD, s_wxluafunc_wxLua_wxDirDialog_GetPath, 1, NULL }, ! #if (!wxCHECK_VERSION(2,8,0)) && (wxLUA_USE_wxDirDialog && wxUSE_DIRDLG) { "GetStyle", WXLUAMETHOD_METHOD, s_wxluafunc_wxLua_wxDirDialog_GetStyle, 1, NULL }, ! #endif // (!wxCHECK_VERSION(2,8,0)) && (wxLUA_USE_wxDirDialog && wxUSE_DIRDLG) { "SetMessage", WXLUAMETHOD_METHOD, s_wxluafunc_wxLua_wxDirDialog_SetMessage, 1, NULL }, { "SetPath", WXLUAMETHOD_METHOD, s_wxluafunc_wxLua_wxDirDialog_SetPath, 1, NULL }, ! #if (!wxCHECK_VERSION(2,8,0)) && (wxLUA_USE_wxDirDialog && wxUSE_DIRDLG) { "SetStyle", WXLUAMETHOD_METHOD, s_wxluafunc_wxLua_wxDirDialog_SetStyle, 1, NULL }, ! #endif // (!wxCHECK_VERSION(2,8,0)) && (wxLUA_USE_wxDirDialog && wxUSE_DIRDLG) #if (wxLUA_USE_wxPointSizeRect) && (wxLUA_USE_wxDirDialog && wxUSE_DIRDLG) Index: image.cpp =================================================================== RCS file: /cvsroot/wxlua/wxLua/modules/wxbind/src/image.cpp,v retrieving revision 1.46 retrieving revision 1.47 diff -C2 -d -r1.46 -r1.47 *** image.cpp 17 Jun 2007 18:36:24 -0000 1.46 --- image.cpp 18 Jun 2007 02:56:31 -0000 1.47 *************** *** 2758,2761 **** --- 2758,2812 ---- #if wxLUA_USE_wxImage && wxUSE_IMAGE // --------------------------------------------------------------------------- + // Bind class wxQuantize + // --------------------------------------------------------------------------- + + // Lua MetaTable Tag for Class 'wxQuantize' + int s_wxluatag_wxQuantize = -1; + + static wxLuaArgTag s_wxluatagArray_wxLua_wxQuantize_Quantize[] = { &s_wxluatag_wxImage, &s_wxluatag_wxImage, &s_wxluaarg_Number, &s_wxluaarg_Number, NULL }; + static int LUACALL wxLua_wxQuantize_Quantize(lua_State *L); + static wxLuaBindCFunc s_wxluafunc_wxLua_wxQuantize_Quantize[1] = {{ wxLua_wxQuantize_Quantize, WXLUAMETHOD_METHOD|WXLUAMETHOD_STATIC, 2, 4, s_wxluatagArray_wxLua_wxQuantize_Quantize }}; + // %override wxLua_wxQuantize_Quantize + // static bool Quantize(const wxImage& src, wxImage& dest, wxPalette** pPalette, int desiredNoColours = 236, unsigned char** eightBitData = 0, int flags = wxQUANTIZE_INCLUDE_WINDOWS_COLOURS|wxQUANTIZE_FILL_DESTINATION_IMAGE|wxQUANTIZE_RETURN_8BIT_DATA); + static int LUACALL wxLua_wxQuantize_Quantize(lua_State *L) + { + wxLuaState wxlState(L); + bool returns; + // get number of arguments + int argCount = lua_gettop(L); + // int flags = wxQUANTIZE_INCLUDE_WINDOWS_COLOURS | wxQUANTIZE_FILL_DESTINATION_IMAGE | wxQUANTIZE_RETURN_8BIT_DATA + int flags = (argCount >= 6 ? (int)wxlua_getnumbertype(L, 4) : wxQUANTIZE_INCLUDE_WINDOWS_COLOURS | wxQUANTIZE_FILL_DESTINATION_IMAGE | wxQUANTIZE_RETURN_8BIT_DATA); + // int desiredNoColours = 236 + int desiredNoColours = (argCount >= 4 ? (int)wxlua_getnumbertype(L, 3) : 236); + // wxImage dest + wxImage * dest = (wxImage *)wxlState.GetUserDataType(2, s_wxluatag_wxImage); + // const wxImage src + const wxImage * src = (const wxImage *)wxlState.GetUserDataType(1, s_wxluatag_wxImage); + // call Quantize + returns = (wxQuantize::Quantize(*src, *dest, NULL, desiredNoColours, NULL, flags)); + // push the result flag + lua_pushboolean(L, returns); + + return 1; + } + + + + + + // Map Lua Class Methods to C Binding Functions + wxLuaBindMethod wxQuantize_methods[] = { + { "Quantize", WXLUAMETHOD_METHOD|WXLUAMETHOD_STATIC, s_wxluafunc_wxLua_wxQuantize_Quantize, 1, NULL }, + + { 0, 0, 0, 0 }, + }; + + int wxQuantize_methodCount = sizeof(wxQuantize_methods)/sizeof(wxLuaBindMethod) - 1; + + #endif // wxLUA_USE_wxImage && wxUSE_IMAGE + + + #if wxLUA_USE_wxImage && wxUSE_IMAGE + // --------------------------------------------------------------------------- // Bind class wxImageHandler // --------------------------------------------------------------------------- Index: mdi.cpp =================================================================== RCS file: /cvsroot/wxlua/wxLua/modules/wxbind/src/mdi.cpp,v retrieving revision 1.40 retrieving revision 1.41 diff -C2 -d -r1.40 -r1.41 *** mdi.cpp 14 Jun 2007 23:59:45 -0000 1.40 --- mdi.cpp 18 Jun 2007 02:56:31 -0000 1.41 *************** *** 568,571 **** --- 568,970 ---- #if wxLUA_USE_MDI && wxUSE_MDI && wxUSE_DOC_VIEW_ARCHITECTURE // --------------------------------------------------------------------------- + // Bind class wxDocMDIParentFrame + // --------------------------------------------------------------------------- + + // Lua MetaTable Tag for Class 'wxDocMDIParentFrame' + int s_wxluatag_wxDocMDIParentFrame = -1; + + #if ((wxLUA_USE_wxFrame) && (wxLUA_USE_MDI && wxUSE_MDI && wxUSE_DOC_VIEW_ARCHITECTURE)) && (wxLUA_USE_wxPointSizeRect) + static wxLuaArgTag s_wxluatagArray_wxLua_wxDocMDIParentFrame_Create[] = { &s_wxluatag_wxDocMDIParentFrame, &s_wxluatag_wxDocManager, &s_wxluatag_wxFrame, &s_wxluaarg_Number, &s_wxluaarg_String, &s_wxluatag_wxPoint, &s_wxluatag_wxSize, &s_wxluaarg_Number, &s_wxluaarg_String, NULL }; + static int LUACALL wxLua_wxDocMDIParentFrame_Create(lua_State *L); + static wxLuaBindCFunc s_wxluafunc_wxLua_wxDocMDIParentFrame_Create[1] = {{ wxLua_wxDocMDIParentFrame_Create, WXLUAMETHOD_METHOD, 5, 9, s_wxluatagArray_wxLua_wxDocMDIParentFrame_Create }}; + // bool Create(wxDocManager *manager, wxFrame *parent, wxWindowID id, const wxString& title, const wxPoint& pos = wxDefaultPosition, const wxSize& size = wxDefaultSize, long style = wxDEFAULT_FRAME_STYLE, const wxString& name = "wxDocMDIParentFrame") + static int LUACALL wxLua_wxDocMDIParentFrame_Create(lua_State *L) + { + wxLuaState wxlState(L); + bool returns; + // get number of arguments + int argCount = lua_gettop(L); + // const wxString name = "wxDocMDIParentFrame" + const wxString name = (argCount >= 9 ? wxlState.GetwxStringType(9) : wxString(wxT("wxDocMDIParentFrame"))); + // long style = wxDEFAULT_FRAME_STYLE + long style = (argCount >= 8 ? (long)wxlua_getnumbertype(L, 8) : wxDEFAULT_FRAME_STYLE); + // const wxSize size = wxDefaultSize + const wxSize * size = (argCount >= 7 ? (const wxSize *)wxlState.GetUserDataType(7, s_wxluatag_wxSize) : &wxDefaultSize); + // const wxPoint pos = wxDefaultPosition + const wxPoint * pos = (argCount >= 6 ? (const wxPoint *)wxlState.GetUserDataType(6, s_wxluatag_wxPoint) : &wxDefaultPosition); + // const wxString title + const wxString title = wxlState.GetwxStringType(5); + // wxWindowID id + wxWindowID id = (wxWindowID)wxlua_getnumbertype(L, 4); + // wxFrame parent + wxFrame * parent = (wxFrame *)wxlState.GetUserDataType(3, s_wxluatag_wxFrame); + // wxDocManager manager + wxDocManager * manager = (wxDocManager *)wxlState.GetUserDataType(2, s_wxluatag_wxDocManager); + // get this + wxDocMDIParentFrame * self = (wxDocMDIParentFrame *)wxlState.GetUserDataType(1, s_wxluatag_wxDocMDIParentFrame); + // call Create + returns = (self->Create(manager, parent, id, title, *pos, *size, style, name)); + // push the result flag + lua_pushboolean(L, returns); + + return 1; + } + + #endif // ((wxLUA_USE_wxFrame) && (wxLUA_USE_MDI && wxUSE_MDI && wxUSE_DOC_VIEW_ARCHITECTURE)) && (wxLUA_USE_wxPointSizeRect) + + static wxLuaArgTag s_wxluatagArray_wxLua_wxDocMDIParentFrame_GetDocumentManager[] = { &s_wxluatag_wxDocMDIParentFrame, NULL }; + static int LUACALL wxLua_wxDocMDIParentFrame_GetDocumentManager(lua_State *L); + static wxLuaBindCFunc s_wxluafunc_wxLua_wxDocMDIParentFrame_GetDocumentManager[1] = {{ wxLua_wxDocMDIParentFrame_GetDocumentManager, WXLUAMETHOD_METHOD, 1, 1, s_wxluatagArray_wxLua_wxDocMDIParentFrame_GetDocumentManager }}; + // wxDocManager *GetDocumentManager() const + static int LUACALL wxLua_wxDocMDIParentFrame_GetDocumentManager(lua_State *L) + { + wxLuaState wxlState(L); + wxDocManager *returns; + // get this + wxDocMDIParentFrame * self = (wxDocMDIParentFrame *)wxlState.GetUserDataType(1, s_wxluatag_wxDocMDIParentFrame); + // call GetDocumentManager + returns = (wxDocManager *)self->GetDocumentManager(); + // push the result datatype + wxlState.PushUserDataType(s_wxluatag_wxDocManager, returns); + + return 1; + } + + + #if ((wxLUA_USE_wxFrame) && (wxLUA_USE_MDI && wxUSE_MDI && wxUSE_DOC_VIEW_ARCHITECTURE)) && (wxLUA_USE_wxPointSizeRect) + static wxLuaArgTag s_wxluatagArray_wxLua_wxDocMDIParentFrame_constructor1[] = { &s_wxluatag_wxDocManager, &s_wxluatag_wxFrame, &s_wxluaarg_Number, &s_wxluaarg_String, &s_wxluatag_wxPoint, &s_wxluatag_wxSize, &s_wxluaarg_Number, &s_wxluaarg_String, NULL }; + static int LUACALL wxLua_wxDocMDIParentFrame_constructor1(lua_State *L); + // static wxLuaBindCFunc s_wxluafunc_wxLua_wxDocMDIParentFrame_constructor1[1] = {{ wxLua_wxDocMDIParentFrame_constructor1, WXLUAMETHOD_CONSTRUCTOR, 4, 8, s_wxluatagArray_wxLua_wxDocMDIParentFrame_constructor1 }}; + // wxDocMDIParentFrame(wxDocManager *manager, wxFrame *parent, wxWindowID id, const wxString& title, const wxPoint& pos = wxDefaultPosition, const wxSize& size = wxDefaultSize, long style = wxDEFAULT_FRAME_STYLE, const wxString& name = "wxDocMDIParentFrame") + static int LUACALL wxLua_wxDocMDIParentFrame_constructor1(lua_State *L) + { + wxluabind_removetableforcall(L); + wxLuaState wxlState(L); + wxDocMDIParentFrame *returns; + // get number of arguments + int argCount = lua_gettop(L); + // const wxString name = "wxDocMDIParentFrame" + const wxString name = (argCount >= 8 ? wxlState.GetwxStringType(8) : wxString(wxT("wxDocMDIParentFrame"))); + // long style = wxDEFAULT_FRAME_STYLE + long style = (argCount >= 7 ? (long)wxlua_getnumbertype(L, 7) : wxDEFAULT_FRAME_STYLE); + // const wxSize size = wxDefaultSize + const wxSize * size = (argCount >= 6 ? (const wxSize *)wxlState.GetUserDataType(6, s_wxluatag_wxSize) : &wxDefaultSize); + // const wxPoint pos = wxDefaultPosition + const wxPoint * pos = (argCount >= 5 ? (const wxPoint *)wxlState.GetUserDataType(5, s_wxluatag_wxPoint) : &wxDefaultPosition); + // const wxString title + const wxString title = wxlState.GetwxStringType(4); + // wxWindowID id + wxWindowID id = (wxWindowID)wxlua_getnumbertype(L, 3); + // wxFrame parent + wxFrame * parent = (wxFrame *)wxlState.GetUserDataType(2, s_wxluatag_wxFrame); + // wxDocManager manager + wxDocManager * manager = (wxDocManager *)wxlState.GetUserDataType(1, s_wxluatag_wxDocManager); + // call constructor + returns = new wxDocMDIParentFrame(manager, parent, id, title, *pos, *size, style, name); + // add to tracked window list, it will check validity + wxlState.AddTrackedWindow(returns); + // push the constructed class pointer + wxlState.PushUserDataType(s_wxluatag_wxDocMDIParentFrame, returns); + + return 1; + } + + #endif // ((wxLUA_USE_wxFrame) && (wxLUA_USE_MDI && wxUSE_MDI && wxUSE_DOC_VIEW_ARCHITECTURE)) && (wxLUA_USE_wxPointSizeRect) + + static int LUACALL wxLua_wxDocMDIParentFrame_constructor(lua_State *L); + // static wxLuaBindCFunc s_wxluafunc_wxLua_wxDocMDIParentFrame_constructor[1] = {{ wxLua_wxDocMDIParentFrame_constructor, WXLUAMETHOD_CONSTRUCTOR, 0, 0, s_wxluaargArray_None }}; + // wxDocMDIParentFrame() + static int LUACALL wxLua_wxDocMDIParentFrame_constructor(lua_State *L) + { + wxluabind_removetableforcall(L); + wxLuaState wxlState(L); + wxDocMDIParentFrame *returns; + // call constructor + returns = new wxDocMDIParentFrame(); + // add to tracked window list, it will check validity + wxlState.AddTrackedWindow(returns); + // push the constructed class pointer + wxlState.PushUserDataType(s_wxluatag_wxDocMDIParentFrame, returns); + + return 1; + } + + + + + #if (((wxLUA_USE_wxFrame) && (wxLUA_USE_MDI && wxUSE_MDI && wxUSE_DOC_VIEW_ARCHITECTURE)) && (wxLUA_USE_wxPointSizeRect))||(wxLUA_USE_MDI && wxUSE_MDI && wxUSE_DOC_VIEW_ARCHITECTURE) + static int LUACALL wxLua_wxDocMDIParentFrame_constructor_overload(lua_State *L); + // function overload table + static wxLuaBindCFunc s_wxluafunc_wxLua_wxDocMDIParentFrame_constructor_overload[] = + { + { wxLua_wxDocMDIParentFrame_constructor_overload, WXLUAMETHOD_METHOD|WXLUAMETHOD_OVERLOAD, 0, 8, s_wxluaargArray_None }, + + #if ((wxLUA_USE_wxFrame) && (wxLUA_USE_MDI && wxUSE_MDI && wxUSE_DOC_VIEW_ARCHITECTURE)) && (wxLUA_USE_wxPointSizeRect) + { wxLua_wxDocMDIParentFrame_constructor1, WXLUAMETHOD_CONSTRUCTOR, 4, 8, s_wxluatagArray_wxLua_wxDocMDIParentFrame_constructor1 }, + #endif // ((wxLUA_USE_wxFrame) && (wxLUA_USE_MDI && wxUSE_MDI && wxUSE_DOC_VIEW_ARCHITECTURE)) && (wxLUA_USE_wxPointSizeRect) + { wxLua_wxDocMDIParentFrame_constructor, WXLUAMETHOD_CONSTRUCTOR, 0, 0, s_wxluaargArray_None }, + }; + static int s_wxluafunc_wxLua_wxDocMDIParentFrame_constructor_overload_count = sizeof(s_wxluafunc_wxLua_wxDocMDIParentFrame_constructor_overload)/sizeof(wxLuaBindCFunc); + // Overloaded function for wxDocMDIParentFrame::wxDocMDIParentFrame + static int LUACALL wxLua_wxDocMDIParentFrame_constructor_overload(lua_State *L) + { + wxLuaState wxlState(L); + static wxLuaBindMethod overload_method = + { "wxDocMDIParentFrame", WXLUAMETHOD_CONSTRUCTOR, s_wxluafunc_wxLua_wxDocMDIParentFrame_constructor_overload, s_wxluafunc_wxLua_wxDocMDIParentFrame_constructor_overload_count, 0 }; + return wxlState.CallOverloadedFunction(&overload_method); + } + #endif // (((wxLUA_USE_wxFrame) && (wxLUA_USE_MDI && wxUSE_MDI && wxUSE_DOC_VIEW_ARCHITECTURE)) && (wxLUA_USE_wxPointSizeRect))||(wxLUA_USE_MDI && wxUSE_MDI && wxUSE_DOC_VIEW_ARCHITECTURE) + + // Map Lua Class Methods to C Binding Functions + wxLuaBindMethod wxDocMDIParentFrame_methods[] = { + #if ((wxLUA_USE_wxFrame) && (wxLUA_USE_MDI && wxUSE_MDI && wxUSE_DOC_VIEW_ARCHITECTURE)) && (wxLUA_USE_wxPointSizeRect) + { "Create", WXLUAMETHOD_METHOD, s_wxluafunc_wxLua_wxDocMDIParentFrame_Create, 1, NULL }, + #endif // ((wxLUA_USE_wxFrame) && (wxLUA_USE_MDI && wxUSE_MDI && wxUSE_DOC_VIEW_ARCHITECTURE)) && (wxLUA_USE_wxPointSizeRect) + + { "GetDocumentManager", WXLUAMETHOD_METHOD, s_wxluafunc_wxLua_wxDocMDIParentFrame_GetDocumentManager, 1, NULL }, + + #if (((wxLUA_USE_wxFrame) && (wxLUA_USE_MDI && wxUSE_MDI && wxUSE_DOC_VIEW_ARCHITECTURE)) && (wxLUA_USE_wxPointSizeRect))||(wxLUA_USE_MDI && wxUSE_MDI && wxUSE_DOC_VIEW_ARCHITECTURE) + { "wxDocMDIParentFrame", WXLUAMETHOD_CONSTRUCTOR, s_wxluafunc_wxLua_wxDocMDIParentFrame_constructor_overload, s_wxluafunc_wxLua_wxDocMDIParentFrame_constructor_overload_count, 0 }, + #endif // (((wxLUA_USE_wxFrame) && (wxLUA_USE_MDI && wxUSE_MDI && wxUSE_DOC_VIEW_ARCHITECTURE)) && (wxLUA_USE_wxPointSizeRect))||(wxLUA_USE_MDI && wxUSE_MDI && wxUSE_DOC_VIEW_ARCHITECTURE) + + { 0, 0, 0, 0 }, + }; + + int wxDocMDIParentFrame_methodCount = sizeof(wxDocMDIParentFrame_methods)/sizeof(wxLuaBindMethod) - 1; + + #endif // wxLUA_USE_MDI && wxUSE_MDI && wxUSE_DOC_VIEW_ARCHITECTURE + + + #if wxLUA_USE_MDI && wxUSE_MDI && wxUSE_DOC_VIEW_ARCHITECTURE + // --------------------------------------------------------------------------- + // Bind class wxDocMDIChildFrame + // --------------------------------------------------------------------------- + + // Lua MetaTable Tag for Class 'wxDocMDIChildFrame' + int s_wxluatag_wxDocMDIChildFrame = -1; + + #if (wxLUA_USE_MDI && wxUSE_MDI && wxUSE_DOC_VIEW_ARCHITECTURE) && (wxLUA_USE_wxPointSizeRect) + static wxLuaArgTag s_wxluatagArray_wxLua_wxDocMDIChildFrame_Create[] = { &s_wxluatag_wxDocMDIChildFrame, &s_wxluatag_wxDocument, &s_wxluatag_wxView, &s_wxluatag_wxMDIParentFrame, &s_wxluaarg_Number, &s_wxluaarg_String, &s_wxluatag_wxPoint, &s_wxluatag_wxSize, &s_wxluaarg_Number, &s_wxluaarg_String, NULL }; + static int LUACALL wxLua_wxDocMDIChildFrame_Create(lua_State *L); + static wxLuaBindCFunc s_wxluafunc_wxLua_wxDocMDIChildFrame_Create[1] = {{ wxLua_wxDocMDIChildFrame_Create, WXLUAMETHOD_METHOD, 6, 10, s_wxluatagArray_wxLua_wxDocMDIChildFrame_Create }}; + // bool Create(wxDocument *doc, wxView *view, wxMDIParentFrame *frame, wxWindowID id, const wxString& title, const wxPoint& pos = wxDefaultPosition, const wxSize& size = wxDefaultSize, long type = wxDEFAULT_FRAME_STYLE, const wxString& name = "wxDocMDIChildFrame") + static int LUACALL wxLua_wxDocMDIChildFrame_Create(lua_State *L) + { + wxLuaState wxlState(L); + bool returns; + // get number of arguments + int argCount = lua_gettop(L); + // const wxString name = "wxDocMDIChildFrame" + const wxString name = (argCount >= 10 ? wxlState.GetwxStringType(10) : wxString(wxT("wxDocMDIChildFrame"))); + // long type = wxDEFAULT_FRAME_STYLE + long type = (argCount >= 9 ? (long)wxlua_getnumbertype(L, 9) : wxDEFAULT_FRAME_STYLE); + // const wxSize size = wxDefaultSize + const wxSize * size = (argCount >= 8 ? (const wxSize *)wxlState.GetUserDataType(8, s_wxluatag_wxSize) : &wxDefaultSize); + // const wxPoint pos = wxDefaultPosition + const wxPoint * pos = (argCount >= 7 ? (const wxPoint *)wxlState.GetUserDataType(7, s_wxluatag_wxPoint) : &wxDefaultPosition); + // const wxString title + const wxString title = wxlState.GetwxStringType(6); + // wxWindowID id + wxWindowID id = (wxWindowID)wxlua_getnumbertype(L, 5); + // wxMDIParentFrame frame + wxMDIParentFrame * frame = (wxMDIParentFrame *)wxlState.GetUserDataType(4, s_wxluatag_wxMDIParentFrame); + // wxView view + wxView * view = (wxView *)wxlState.GetUserDataType(3, s_wxluatag_wxView); + // wxDocument doc + wxDocument * doc = (wxDocument *)wxlState.GetUserDataType(2, s_wxluatag_wxDocument); + // get this + wxDocMDIChildFrame * self = (wxDocMDIChildFrame *)wxlState.GetUserDataType(1, s_wxluatag_wxDocMDIChildFrame); + // call Create + returns = (self->Create(doc, view, frame, id, title, *pos, *size, type, name)); + // push the result flag + lua_pushboolean(L, returns); + + return 1; + } + + #endif // (wxLUA_USE_MDI && wxUSE_MDI && wxUSE_DOC_VIEW_ARCHITECTURE) && (wxLUA_USE_wxPointSizeRect) + + static wxLuaArgTag s_wxluatagArray_wxLua_wxDocMDIChildFrame_GetDocument[] = { &s_wxluatag_wxDocMDIChildFrame, NULL }; + static int LUACALL wxLua_wxDocMDIChildFrame_GetDocument(lua_State *L); + static wxLuaBindCFunc s_wxluafunc_wxLua_wxDocMDIChildFrame_GetDocument[1] = {{ wxLua_wxDocMDIChildFrame_GetDocument, WXLUAMETHOD_METHOD, 1, 1, s_wxluatagArray_wxLua_wxDocMDIChildFrame_GetDocument }}; + // wxDocument *GetDocument() const + static int LUACALL wxLua_wxDocMDIChildFrame_GetDocument(lua_State *L) + { + wxLuaState wxlState(L); + wxDocument *returns; + // get this + wxDocMDIChildFrame * self = (wxDocMDIChildFrame *)wxlState.GetUserDataType(1, s_wxluatag_wxDocMDIChildFrame); + // call GetDocument + returns = (wxDocument *)self->GetDocument(); + // push the result datatype + wxlState.PushUserDataType(s_wxluatag_wxDocument, returns); + + return 1; + } + + static wxLuaArgTag s_wxluatagArray_wxLua_wxDocMDIChildFrame_GetView[] = { &s_wxluatag_wxDocMDIChildFrame, NULL }; + static int LUACALL wxLua_wxDocMDIChildFrame_GetView(lua_State *L); + static wxLuaBindCFunc s_wxluafunc_wxLua_wxDocMDIChildFrame_GetView[1] = {{ wxLua_wxDocMDIChildFrame_GetView, WXLUAMETHOD_METHOD, 1, 1, s_wxluatagArray_wxLua_wxDocMDIChildFrame_GetView }}; + // wxView *GetView() const + static int LUACALL wxLua_wxDocMDIChildFrame_GetView(lua_State *L) + { + wxLuaState wxlState(L); + wxView *returns; + // get this + wxDocMDIChildFrame * self = (wxDocMDIChildFrame *)wxlState.GetUserDataType(1, s_wxluatag_wxDocMDIChildFrame); + // call GetView + returns = (wxView *)self->GetView(); + // push the result datatype + wxlState.PushUserDataType(s_wxluatag_wxView, returns); + + return 1; + } + + static wxLuaArgTag s_wxluatagArray_wxLua_wxDocMDIChildFrame_SetDocument[] = { &s_wxluatag_wxDocMDIChildFrame, &s_wxluatag_wxDocument, NULL }; + static int LUACALL wxLua_wxDocMDIChildFrame_SetDocument(lua_State *L); + static wxLuaBindCFunc s_wxluafunc_wxLua_wxDocMDIChildFrame_SetDocument[1] = {{ wxLua_wxDocMDIChildFrame_SetDocument, WXLUAMETHOD_METHOD, 2, 2, s_wxluatagArray_wxLua_wxDocMDIChildFrame_SetDocument }}; + // void SetDocument(wxDocument *doc) + static int LUACALL wxLua_wxDocMDIChildFrame_SetDocument(lua_State *L) + { + wxLuaState wxlState(L); + // wxDocument doc + wxDocument * doc = (wxDocument *)wxlState.GetUserDataType(2, s_wxluatag_wxDocument); + // get this + wxDocMDIChildFrame * self = (wxDocMDIChildFrame *)wxlState.GetUserDataType(1, s_wxluatag_wxDocMDIChildFrame); + // call SetDocument + self->SetDocument(doc); + + return 0; + } + + static wxLuaArgTag s_wxluatagArray_wxLua_wxDocMDIChildFrame_SetView[] = { &s_wxluatag_wxDocMDIChildFrame, &s_wxluatag_wxView, NULL }; + static int LUACALL wxLua_wxDocMDIChildFrame_SetView(lua_State *L); + static wxLuaBindCFunc s_wxluafunc_wxLua_wxDocMDIChildFrame_SetView[1] = {{ wxLua_wxDocMDIChildFrame_SetView, WXLUAMETHOD_METHOD, 2, 2, s_wxluatagArray_wxLua_wxDocMDIChildFrame_SetView }}; + // void SetView(wxView *view) + static int LUACALL wxLua_wxDocMDIChildFrame_SetView(lua_State *L) + { + wxLuaState wxlState(L); + // wxView view + wxView * view = (wxView *)wxlState.GetUserDataType(2, s_wxluatag_wxView); + // get this + wxDocMDIChildFrame * self = (wxDocMDIChildFrame *)wxlState.GetUserDataType(1, s_wxluatag_wxDocMDIChildFrame); + // call SetView + self->SetView(view); + + return 0; + } + + + #if (wxLUA_USE_MDI && wxUSE_MDI && wxUSE_DOC_VIEW_ARCHITECTURE) && (wxLUA_USE_wxPointSizeRect) + static wxLuaArgTag s_wxluatagArray_wxLua_wxDocMDIChildFrame_constructor1[] = { &s_wxluatag_wxDocument, &s_wxluatag_wxView, &s_wxluatag_wxMDIParentFrame, &s_wxluaarg_Number, &s_wxluaarg_String, &s_wxluatag_wxPoint, &s_wxluatag_wxSize, &s_wxluaarg_Number, &s_wxluaarg_String, NULL }; + static int LUACALL wxLua_wxDocMDIChildFrame_constructor1(lua_State *L); + // static wxLuaBindCFunc s_wxluafunc_wxLua_wxDocMDIChildFrame_constructor1[1] = {{ wxLua_wxDocMDIChildFrame_constructor1, WXLUAMETHOD_CONSTRUCTOR, 5, 9, s_wxluatagArray_wxLua_wxDocMDIChildFrame_constructor1 }}; + // wxDocMDIChildFrame(wxDocument *doc, wxView *view, wxMDIParentFrame *frame, wxWindowID id, const wxString& title, const wxPoint& pos = wxDefaultPosition, const wxSize& size = wxDefaultSize,long type = wxDEFAULT_FRAME_STYLE, const wxString& name = "wxDocMDIChildFrame") + static int LUACALL wxLua_wxDocMDIChildFrame_constructor1(lua_State *L) + { + wxluabind_removetableforcall(L); + wxLuaState wxlState(L); + wxDocMDIChildFrame *returns; + // get number of arguments + int argCount = lua_gettop(L); + // const wxString name = "wxDocMDIChildFrame" + const wxString name = (argCount >= 9 ? wxlState.GetwxStringType(9) : wxString(wxT("wxDocMDIChildFrame"))); + // long type = wxDEFAULT_FRAME_STYLE + long type = (argCount >= 8 ? (long)wxlua_getnumbertype(L, 8) : wxDEFAULT_FRAME_STYLE); + // const wxSize size = wxDefaultSize + const wxSize * size = (argCount >= 7 ? (const wxSize *)wxlState.GetUserDataType(7, s_wxluatag_wxSize) : &wxDefaultSize); + // const wxPoint pos = wxDefaultPosition + const wxPoint * pos = (argCount >= 6 ? (const wxPoint *)wxlState.GetUserDataType(6, s_wxluatag_wxPoint) : &wxDefaultPosition); + // const wxString title + const wxString title = wxlState.GetwxStringType(5); + // wxWindowID id + wxWindowID id = (wxWindowID)wxlua_getnumbertype(L, 4); + // wxMDIParentFrame frame + wxMDIParentFrame * frame = (wxMDIParentFrame *)wxlState.GetUserDataType(3, s_wxluatag_wxMDIParentFrame); + // wxView view + wxView * view = (wxView *)wxlState.GetUserDataType(2, s_wxluatag_wxView); + // wxDocument doc + wxDocument * doc = (wxDocument *)wxlState.GetUserDataType(1, s_wxluatag_wxDocument); + // call constructor + returns = new wxDocMDIChildFrame(doc, view, frame, id, title, *pos, *size, type, name); + // add to tracked window list, it will check validity + wxlState.AddTrackedWindow(returns); + // push the constructed class pointer + wxlState.PushUserDataType(s_wxluatag_wxDocMDIChildFrame, returns); + + return 1; + } + + #endif // (wxLUA_USE_MDI && wxUSE_MDI && wxUSE_DOC_VIEW_ARCHITECTURE) && (wxLUA_USE_wxPointSizeRect) + + static int LUACALL wxLua_wxDocMDIChildFrame_constructor(lua_State *L); + // static wxLuaBindCFunc s_wxluafunc_wxLua_wxDocMDIChildFrame_constructor[1] = {{ wxLua_wxDocMDIChildFrame_constructor, WXLUAMETHOD_CONSTRUCTOR, 0, 0, s_wxluaargArray_None }}; + // wxDocMDIChildFrame() + static int LUACALL wxLua_wxDocMDIChildFrame_constructor(lua_State *L) + { + wxluabind_removetableforcall(L); + wxLuaState wxlState(L); + wxDocMDIChildFrame *returns; + // call constructor + returns = new wxDocMDIChildFrame(); + // add to tracked window list, it will check validity + wxlState.AddTrackedWindow(returns); + // push the constructed class pointer + wxlState.PushUserDataType(s_wxluatag_wxDocMDIChildFrame, returns); + + return 1; + } + + + + + #if ((wxLUA_USE_MDI && wxUSE_MDI && wxUSE_DOC_VIEW_ARCHITECTURE) && (wxLUA_USE_wxPointSizeRect))||(wxLUA_USE_MDI && wxUSE_MDI && wxUSE_DOC_VIEW_ARCHITECTURE) + static int LUACALL wxLua_wxDocMDIChildFrame_constructor_overload(lua_State *L); + // function overload table + static wxLuaBindCFunc s_wxluafunc_wxLua_wxDocMDIChildFrame_constructor_overload[] = + { + { wxLua_wxDocMDIChildFrame_constructor_overload, WXLUAMETHOD_METHOD|WXLUAMETHOD_OVERLOAD, 0, 9, s_wxluaargArray_None }, + + #if (wxLUA_USE_MDI && wxUSE_MDI && wxUSE_DOC_VIEW_ARCHITECTURE) && (wxLUA_USE_wxPointSizeRect) + { wxLua_wxDocMDIChildFrame_constructor1, WXLUAMETHOD_CONSTRUCTOR, 5, 9, s_wxluatagArray_wxLua_wxDocMDIChildFrame_constructor1 }, + #endif // (wxLUA_USE_MDI && wxUSE_MDI && wxUSE_DOC_VIEW_ARCHITECTURE) && (wxLUA_USE_wxPointSizeRect) + { wxLua_wxDocMDIChildFrame_constructor, WXLUAMETHOD_CONSTRUCTOR, 0, 0, s_wxluaargArray_None }, + }; + static int s_wxluafunc_wxLua_wxDocMDIChildFrame_constructor_overload_count = sizeof(s_wxluafunc_wxLua_wxDocMDIChildFrame_constructor_overload)/sizeof(wxLuaBindCFunc); + // Overloaded function for wxDocMDIChildFrame::wxDocMDIChildFrame + static int LUACALL wxLua_wxDocMDIChildFrame_constructor_overload(lua_State *L) + { + wxLuaState wxlState(L); + static wxLuaBindMethod overload_method = + { "wxDocMDIChildFrame", WXLUAMETHOD_CONSTRUCTOR, s_wxluafunc_wxLua_wxDocMDIChildFrame_constructor_overload, s_wxluafunc_wxLua_wxDocMDIChildFrame_constructor_overload_count, 0 }; + return wxlState.CallOverloadedFunction(&overload_method); + } + #endif // ((wxLUA_USE_MDI && wxUSE_MDI && wxUSE_DOC_VIEW_ARCHITECTURE) && (wxLUA_USE_wxPointSizeRect))||(wxLUA_USE_MDI && wxUSE_MDI && wxUSE_DOC_VIEW_ARCHITECTURE) + + // Map Lua Class Methods to C Binding Functions + wxLuaBindMethod wxDocMDIChildFrame_methods[] = { + #if (wxLUA_USE_MDI && wxUSE_MDI && wxUSE_DOC_VIEW_ARCHITECTURE) && (wxLUA_USE_wxPointSizeRect) + { "Create", WXLUAMETHOD_METHOD, s_wxluafunc_wxLua_wxDocMDIChildFrame_Create, 1, NULL }, + #endif // (wxLUA_USE_MDI && wxUSE_MDI && wxUSE_DOC_VIEW_ARCHITECTURE) && (wxLUA_USE_wxPointSizeRect) + + { "GetDocument", WXLUAMETHOD_METHOD, s_wxluafunc_wxLua_wxDocMDIChildFrame_GetDocument, 1, NULL }, + { "GetView", WXLUAMETHOD_METHOD, s_wxluafunc_wxLua_wxDocMDIChildFrame_GetView, 1, NULL }, + { "SetDocument", WXLUAMETHOD_METHOD, s_wxluafunc_wxLua_wxDocMDIChildFrame_SetDocument, 1, NULL }, + { "SetView", WXLUAMETHOD_METHOD, s_wxluafunc_wxLua_wxDocMDIChildFrame_SetView, 1, NULL }, + + #if ((wxLUA_USE_MDI && wxUSE_MDI && wxUSE_DOC_VIEW_ARCHITECTURE) && (wxLUA_USE_wxPointSizeRect))||(wxLUA_USE_MDI && wxUSE_MDI && wxUSE_DOC_VIEW_ARCHITECTURE) + { "wxDocMDIChildFrame", WXLUAMETHOD_CONSTRUCTOR, s_wxluafunc_wxLua_wxDocMDIChildFrame_constructor_overload, s_wxluafunc_wxLua_wxDocMDIChildFrame_constructor_overload_count, 0 }, + #endif // ((wxLUA_USE_MDI && wxUSE_MDI && wxUSE_DOC_VIEW_ARCHITECTURE) && (wxLUA_USE_wxPointSizeRect))||(wxLUA_USE_MDI && wxUSE_MDI && wxUSE_DOC_VIEW_ARCHITECTURE) + + { 0, 0, 0, 0 }, + }; + + int wxDocMDIChildFrame_methodCount = sizeof(wxDocMDIChildFrame_methods)/sizeof(wxLuaBindMethod) - 1; + + #endif // wxLUA_USE_MDI && wxUSE_MDI && wxUSE_DOC_VIEW_ARCHITECTURE + + + #if wxLUA_USE_MDI && wxUSE_MDI && wxUSE_DOC_VIEW_ARCHITECTURE + // --------------------------------------------------------------------------- // Bind class wxDocChildFrame // --------------------------------------------------------------------------- *************** *** 716,724 **** int s_wxluatag_wxDocManager = -1; ! #if (wxLUA_USE_MDI && wxUSE_MDI && wxUSE_DOC_VIEW_ARCHITECTURE) && ((!wxCHECK_VERSION(2,5,0)) && (wxLUA_USE_MDI && wxUSE_MDI && wxUSE_DOC_VIEW_ARCHITECTURE)) static wxLuaArgTag s_wxluatagArray_wxLua_wxDocManager_ActivateView1[] = { &s_wxluatag_wxDocManager, &s_wxluatag_wxView, &s_wxluaarg_Boolean, &s_wxluaarg_Boolean, NULL }; static int LUACALL wxLua_wxDocManager_ActivateView1(lua_State *L); // static wxLuaBindCFunc s_wxluafunc_wxLua_wxDocManager_ActivateView1[1] = {{ wxLua_wxDocManager_ActivateView1, WXLUAMETHOD_METHOD, 4, 4, s_wxluatagArray_wxLua_wxDocManager_ActivateView1 }}; ! // !%wxchkver_2_5 void ActivateView(wxView* view, bool activate, bool deleting) static int LUACALL wxLua_wxDocManager_ActivateView1(lua_State *L) { --- 1115,1123 ---- int s_wxluatag_wxDocManager = -1; ! #if (wxLUA_USE_MDI && wxUSE_MDI && wxUSE_DOC_VIEW_ARCHITECTURE) && ((!wxCHECK_VERSION(2,6,0)) && (wxLUA_USE_MDI && wxUSE_MDI && wxUSE_DOC_VIEW_ARCHITECTURE)) static wxLuaArgTag s_wxluatagArray_wxLua_wxDocManager_ActivateView1[] = { &s_wxluatag_wxDocManager, &s_wxluatag_wxView, &s_wxluaarg_Boolean, &s_wxluaarg_Boolean, NULL }; static int LUACALL wxLua_wxDocManager_ActivateView1(lua_State *L); // static wxLuaBindCFunc s_wxluafunc_wxLua_wxDocManager_ActivateView1[1] = {{ wxLua_wxDocManager_ActivateView1, WXLUAMETHOD_METHOD, 4, 4, s_wxluatagArray_wxLua_wxDocManager_ActivateView1 }}; ! // !%wxchkver_2_6 void ActivateView(wxView* view, bool activate, bool deleting) static int LUACALL wxLua_wxDocManager_ActivateView1(lua_State *L) { *************** *** 738,748 **** } ! #endif // (wxLUA_USE_MDI && wxUSE_MDI && wxUSE_DOC_VIEW_ARCHITECTURE) && ((!wxCHECK_VERSION(2,5,0)) && (wxLUA_USE_MDI && wxUSE_MDI && wxUSE_DOC_VIEW_ARCHITECTURE)) ! #if ((wxCHECK_VERSION(2,5,0)) && (wxLUA_USE_MDI && wxUSE_MDI && wxUSE_DOC_VIEW_ARCHITECTURE)) && (wxLUA_USE_MDI && wxUSE_MDI && wxUSE_DOC_VIEW_ARCHITECTURE) static wxLuaArgTag s_wxluatagArray_wxLua_wxDocManager_ActivateView[] = { &s_wxluatag_wxDocManager, &s_wxluatag_wxView, &s_wxluaarg_Boolean, NULL }; static int LUACALL wxLua_wxDocManager_ActivateView(lua_State *L); // static wxLuaBindCFunc s_wxluafunc_wxLua_wxDocManager_ActivateView[1] = {{ wxLua_wxDocManager_ActivateView, WXLUAMETHOD_METHOD, 3, 3, s_wxluatagArray_wxLua_wxDocManager_ActivateView }}; ! // %wxchkver_2_5 void ActivateView(wxView* view, bool activate) static int LUACALL wxLua_wxDocManager_ActivateView(lua_State *L) { --- 1137,1147 ---- } ! #endif // (wxLUA_USE_MDI && wxUSE_MDI && wxUSE_DOC_VIEW_ARCHITECTURE) && ((!wxCHECK_VERSION(2,6,0)) && (wxLUA_USE_MDI && wxUSE_MDI && wxUSE_DOC_VIEW_ARCHITECTURE)) ! #if ((wxCHECK_VERSION(2,6,0)) && (wxLUA_USE_MDI && wxUSE_MDI && wxUSE_DOC_VIEW_ARCHITECTURE)) && (wxLUA_USE_MDI && wxUSE_MDI && wxUSE_DOC_VIEW_ARCHITECTURE) static wxLuaArgTag s_wxluatagArray_wxLua_wxDocManager_ActivateView[] = { &s_wxluatag_wxDocManager, &s_wxluatag_wxView, &s_wxluaarg_Boolean, NULL }; static int LUACALL wxLua_wxDocManager_ActivateView(lua_State *L); // static wxLuaBindCFunc s_wxluafunc_wxLua_wxDocManager_ActivateView[1] = {{ wxLua_wxDocManager_ActivateView, WXLUAMETHOD_METHOD, 3, 3, s_wxluatagArray_wxLua_wxDocManager_ActivateView }}; ! // %wxchkver_2_6 void ActivateView(wxView* view, bool activate) static int LUACALL wxLua_wxDocManager_ActivateView(lua_State *L) { *************** *** 760,764 **** } ! #endif // ((wxCHECK_VERSION(2,5,0)) && (wxLUA_USE_MDI && wxUSE_MDI && wxUSE_DOC_VIEW_ARCHITECTURE)) && (wxLUA_USE_MDI && wxUSE_MDI && wxUSE_DOC_VIEW_ARCHITECTURE) static wxLuaArgTag s_wxluatagArray_wxLua_wxDocManager_AddDocument[] = { &s_wxluatag_wxDocManager, &s_wxluatag_wxDocument, NULL }; --- 1159,1163 ---- } ! #endif // ((wxCHECK_VERSION(2,6,0)) && (wxLUA_USE_MDI && wxUSE_MDI && wxUSE_DOC_VIEW_ARCHITECTURE)) && (wxLUA_USE_MDI && wxUSE_MDI && wxUSE_DOC_VIEW_ARCHITECTURE) static wxLuaArgTag s_wxluatagArray_wxLua_wxDocManager_AddDocument[] = { &s_wxluatag_wxDocManager, &s_wxluatag_wxDocument, NULL }; *************** *** 1479,1483 **** ! #if ((wxLUA_USE_MDI && wxUSE_MDI && wxUSE_DOC_VIEW_ARCHITECTURE) && ((!wxCHECK_VERSION(2,5,0)) && (wxLUA_USE_MDI && wxUSE_MDI && wxUSE_DOC_VIEW_ARCHITECTURE)))||(((wxCHECK_VERSION(2,5,0)) && (wxLUA_USE_MDI && wxUSE_MDI && wxUSE_DOC_VIEW_ARCHITECTURE)) && (wxLUA_USE_MDI && wxUSE_MDI && wxUSE_DOC_VIEW_ARCHITECTURE)) static int LUACALL wxLua_wxDocManager_ActivateView_overload(lua_State *L); // function overload table --- 1878,1882 ---- ! #if ((wxLUA_USE_MDI && wxUSE_MDI && wxUSE_DOC_VIEW_ARCHITECTURE) && ((!wxCHECK_VERSION(2,6,0)) && (wxLUA_USE_MDI && wxUSE_MDI && wxUSE_DOC_VIEW_ARCHITECTURE)))||(((wxCHECK_VERSION(2,6,0)) && (wxLUA_USE_MDI && wxUSE_MDI && wxUSE_DOC_VIEW_ARCHITECTURE)) && (wxLUA_USE_MDI && wxUSE_MDI && wxUSE_DOC_VIEW_ARCHITECTURE)) static int LUACALL wxLua_wxDocManager_ActivateView_overload(lua_State *L); // function overload table *************** *** 1486,1496 **** { wxLua_wxDocManager_ActivateView_overload, WXLUAMETHOD_METHOD|WXLUAMETHOD_OVERLOAD, 3, 4, s_wxluaargArray_None }, ! #if (wxLUA_USE_MDI && wxUSE_MDI && wxUSE_DOC_VIEW_ARCHITECTURE) && ((!wxCHECK_VERSION(2,5,0)) && (wxLUA_USE_MDI && wxUSE_MDI && wxUSE_DOC_VIEW_ARCHITECTURE)) { wxLua_wxDocManager_ActivateView1, WXLUAMETHOD_METHOD, 4, 4, s_wxluatagArray_wxLua_wxDocManager_ActivateView1 }, ! #endif // (wxLUA_USE_MDI && wxUSE_MDI && wxUSE_DOC_VIEW_ARCHITECTURE) && ((!wxCHECK_VERSION(2,5,0)) && (wxLUA_USE_MDI && wxUSE_MDI && wxUSE_DOC_VIEW_ARCHITECTURE)) ! #if ((wxCHECK_VERSION(2,5,0)) && (wxLUA_USE_MDI && wxUSE_MDI && wxUSE_DOC_VIEW_ARCHITECTURE)) && (wxLUA_USE_MDI && wxUSE_MDI && wxUSE_DOC_VIEW_ARCHITECTURE) { wxLua_wxDocManager_ActivateView, WXLUAMETHOD_METHOD, 3, 3, s_wxluatagArray_wxLua_wxDocManager_ActivateView }, ! #endif // ((wxCHECK_VERSION(2,5,0)) && (wxLUA_USE_MDI && wxUSE_MDI && wxUSE_DOC_VIEW_ARCHITECTURE)) && (wxLUA_USE_MDI && wxUSE_MDI && wxUSE_DOC_VIEW_ARCHITECTURE) }; static int s_wxluafunc_wxLua_wxDocManager_ActivateView_overload_count = sizeof(s_wxluafunc_wxLua_wxDocManager_ActivateView_overload)/sizeof(wxLuaBindCFunc); --- 1885,1895 ---- { wxLua_wxDocManager_ActivateView_overload, WXLUAMETHOD_METHOD|WXLUAMETHOD_OVERLOAD, 3, 4, s_wxluaargArray_None }, ! #if (wxLUA_USE_MDI && wxUSE_MDI && wxUSE_DOC_VIEW_ARCHITECTURE) && ((!wxCHECK_VERSION(2,6,0)) && (wxLUA_USE_MDI && wxUSE_MDI && wxUSE_DOC_VIEW_ARCHITECTURE)) { wxLua_wxDocManager_ActivateView1, WXLUAMETHOD_METHOD, 4, 4, s_wxluatagArray_wxLua_wxDocManager_ActivateView1 }, ! #endif // (wxLUA_USE_MDI && wxUSE_MDI && wxUSE_DOC_VIEW_ARCHITECTURE) && ((!wxCHECK_VERSION(2,6,0)) && (wxLUA_USE_MDI && wxUSE_MDI && wxUSE_DOC_VIEW_ARCHITECTURE)) ! #if ((wxCHECK_VERSION(2,6,0)) && (wxLUA_USE_MDI && wxUSE_MDI && wxUSE_DOC_VIEW_ARCHITECTURE)) && (wxLUA_USE_MDI && wxUSE_MDI && wxUSE_DOC_VIEW_ARCHITECTURE) { wxLua_wxDocManager_ActivateView, WXLUAMETHOD_METHOD, 3, 3, s_wxluatagArray_wxLua_wxDocManager_ActivateView }, ! #endif // ((wxCHECK_VERSION(2,6,0)) && (wxLUA_USE_MDI && wxUSE_MDI && wxUSE_DOC_VIEW_ARCHITECTURE)) && (wxLUA_USE_MDI && wxUSE_MDI && wxUSE_DOC_VIEW_ARCHITECTURE) }; static int s_wxluafunc_wxLua_wxDocManager_ActivateView_overload_count = sizeof(s_wxluafunc_wxLua_wxDocManager_ActivateView_overload)/sizeof(wxLuaBindCFunc); *************** *** 1503,1507 **** return wxlState.CallOverloadedFunction(&overload_method); } ! #endif // ((wxLUA_USE_MDI && wxUSE_MDI && wxUSE_DOC_VIEW_ARCHITECTURE) && ((!wxCHECK_VERSION(2,5,0)) && (wxLUA_USE_MDI && wxUSE_MDI && wxUSE_DOC_VIEW_ARCHITECTURE)))||(((wxCHECK_VERSION(2,5,0)) && (wxLUA_USE_MDI && wxUSE_MDI && wxUSE_DOC_VIEW_ARCHITECTURE)) && (wxLUA_USE_MDI && wxUSE_MDI && wxUSE_DOC_VIEW_ARCHITECTURE)) #if ((wxLUA_USE_MDI && wxUSE_MDI && wxUSE_DOC_VIEW_ARCHITECTURE) && (wxLUA_USE_wxMenu && wxUSE_MENUS))||(wxLUA_USE_MDI && wxUSE_MDI && wxUSE_DOC_VIEW_ARCHITECTURE) --- 1902,1906 ---- return wxlState.CallOverloadedFunction(&overload_method); } ! #endif // ((wxLUA_USE_MDI && wxUSE_MDI && wxUSE_DOC_VIEW_ARCHITECTURE) && ((!wxCHECK_VERSION(2,6,0)) && (wxLUA_USE_MDI && wxUSE_MDI && wxUSE_DOC_VIEW_ARCHITECTURE)))||(((wxCHECK_VERSION(2,6,0)) && (wxLUA_USE_MDI && wxUSE_MDI && wxUSE_DOC_VIEW_ARCHITECTURE)) && (wxLUA_USE_MDI && wxUSE_MDI && wxUSE_DOC_VIEW_ARCHITECTURE)) #if ((wxLUA_USE_MDI && wxUSE_MDI && wxUSE_DOC_VIEW_ARCHITECTURE) && (wxLUA_USE_wxMenu && wxUSE_MENUS))||(wxLUA_USE_MDI && wxUSE_MDI && wxUSE_DOC_VIEW_ARCHITECTURE) *************** *** 1530,1536 **** // Map Lua Class Methods to C Binding Functions wxLuaBindMethod wxDocManager_methods[] = { ! #if ((wxLUA_USE_MDI && wxUSE_MDI && wxUSE_DOC_VIEW_ARCHITECTURE) && ((!wxCHECK_VERSION(2,5,0)) && (wxLUA_USE_MDI && wxUSE_MDI && wxUSE_DOC_VIEW_ARCHITECTURE)))||(((wxCHECK_VERSION(2,5,0)) && (wxLUA_USE_MDI && wxUSE_MDI && wxUSE_DOC_VIEW_ARCHITECTURE)) && (wxLUA_USE_MDI && wxUSE_MDI && wxUSE_DOC_VIEW_ARCHITECTURE)) { "ActivateView", WXLUAMETHOD_METHOD, s_wxluafunc_wxLua_wxDocManager_ActivateView_overload, s_wxluafunc_wxLua_wxDocManager_ActivateView_overload_count, 0 }, ! #endif // ((wxLUA_USE_MDI && wxUSE_MDI && wxUSE_DOC_VIEW_ARCHITECTURE) && ((!wxCHECK_VERSION(2,5,0)) && (wxLUA_USE_MDI && wxUSE_MDI && wxUSE_DOC_VIEW_ARCHITECTURE)))||(((wxCHECK_VERSION(2,5,0)) && (wxLUA_USE_MDI && wxUSE_MDI && wxUSE_DOC_VIEW_ARCHITECTURE)) && (wxLUA_USE_MDI && wxUSE_MDI && wxUSE_DOC_VIEW_ARCHITECTURE)) { "AddDocument", WXLUAMETHOD_METHOD, s_wxluafunc_wxLua_wxDocManager_AddDocument, 1, NULL }, --- 1929,1935 ---- // Map Lua Class Methods to C Binding Functions wxLuaBindMethod wxDocManager_methods[] = { ! #if ((wxLUA_USE_MDI && wxUSE_MDI && wxUSE_DOC_VIEW_ARCHITECTURE) && ((!wxCHECK_VERSION(2,6,0)) && (wxLUA_USE_MDI && wxUSE_MDI && wxUSE_DOC_VIEW_ARCHITECTURE)))||(((wxCHECK_VERSION(2,6,0)) && (wxLUA_USE_MDI && wxUSE_MDI && wxUSE_DOC_VIEW_ARCHITECTURE)) && (wxLUA_USE_MDI && wxUSE_MDI && wxUSE_DOC_VIEW_ARCHITECTURE)) { "ActivateView", WXLUAMETHOD_METHOD, s_wxluafunc_wxLua_wxDocManager_ActivateView_overload, s_wxluafunc_wxLua_wxDocManager_ActivateView_overload_count, 0 }, ! #endif // ((wxLUA_USE_MDI && wxUSE_MDI && wxUSE_DOC_VIEW_ARCHITECTURE) && ((!wxCHECK_VERSION(2,6,0)) && (wxLUA_USE_MDI && wxUSE_MDI && wxUSE_DOC_VIEW_ARCHITECTURE)))||(((wxCHECK_VERSION(2,6,0)) && (wxLUA_USE_MDI && wxUSE_MDI && wxUSE_DOC_VIEW_ARCHITECTURE)) && (wxLUA_USE_MDI && wxUSE_MDI && wxUSE_DOC_VIEW_ARCHITECTURE)) { "AddDocument", WXLUAMETHOD_METHOD, s_wxluafunc_wxLua_wxDocManager_AddDocument, 1, NULL }, Index: file.cpp =================================================================== RCS file: /cvsroot/wxlua/wxLua/modules/wxbind/src/file.cpp,v retrieving revision 1.53 retrieving revision 1.54 diff -C2 -d -r1.53 -r1.54 *** file.cpp 17 Jun 2007 18:36:19 -0000 1.53 --- file.cpp 18 Jun 2007 02:56:29 -0000 1.54 *************** *** 3558,3561 **** --- 3558,4614 ---- #endif // wxLUA_USE_wxDir + // --------------------------------------------------------------------------- + // Bind class wxFileTypeInfo + // --------------------------------------------------------------------------- + + // Lua MetaTable Tag for Class 'wxFileTypeInfo' + int s_wxluatag_wxFileTypeInfo = -1; + [...1079 lines suppressed...] ! #endif // (wxCHECK_VERSION(2,6,0)) && (wxUSE_STREAMS) static wxLuaArgTag s_wxluatagArray_wxLua_wxStreamBase_GetSize[] = { &s_wxluatag_wxStreamBase, NULL }; *************** *** 3683,3689 **** { "GetLastError", WXLUAMETHOD_METHOD, s_wxluafunc_wxLua_wxStreamBase_GetLastError, 1, NULL }, ! #if (wxCHECK_VERSION(2,5,0)) && (wxUSE_STREAMS) { "GetLength", WXLUAMETHOD_METHOD, s_wxluafunc_wxLua_wxStreamBase_GetLength, 1, NULL }, ! #endif // (wxCHECK_VERSION(2,5,0)) && (wxUSE_STREAMS) { "GetSize", WXLUAMETHOD_METHOD, s_wxluafunc_wxLua_wxStreamBase_GetSize, 1, NULL }, --- 4736,4742 ---- { "GetLastError", WXLUAMETHOD_METHOD, s_wxluafunc_wxLua_wxStreamBase_GetLastError, 1, NULL }, ! #if (wxCHECK_VERSION(2,6,0)) && (wxUSE_STREAMS) { "GetLength", WXLUAMETHOD_METHOD, s_wxluafunc_wxLua_wxStreamBase_GetLength, 1, NULL }, ! #endif // (wxCHECK_VERSION(2,6,0)) && (wxUSE_STREAMS) { "GetSize", WXLUAMETHOD_METHOD, s_wxluafunc_wxLua_wxStreamBase_GetSize, 1, NULL }, Index: data.cpp =================================================================== RCS file: /cvsroot/wxlua/wxLua/modules/wxbind/src/data.cpp,v retrieving revision 1.53 retrieving revision 1.54 diff -C2 -d -r1.53 -r1.54 *** data.cpp 17 Jun 2007 18:36:15 -0000 1.53 --- data.cpp 18 Jun 2007 02:56:28 -0000 1.54 *************** *** 1017,1025 **** int s_wxluatag_wxTextValidator = -1; ! #if (wxLUA_USE_wxArrayString) && ((wxCHECK_VERSION(2,5,0)) && ((wxLUA_USE_wxTextValidator) && (wxLUA_USE_wxValidator && wxUSE_VALIDATORS))) static wxLuaArgTag s_wxluatagArray_wxLua_wxTextValidator_GetExcludes[] = { &s_wxluatag_wxTextValidator, NULL }; static int LUACALL wxLua_wxTextValidator_GetExcludes(lua_State *L); static wxLuaBindCFunc s_wxluafunc_wxLua_wxTextValidator_GetExcludes[1] = {{ wxLua_wxTextValidator_GetExcludes, WXLUAMETHOD_METHOD, 1, 1, s_wxluatagArray_wxLua_wxTextValidator_GetExcludes }}; ! // %wxchkver_2_5 wxArrayString& GetExcludes() static int LUACALL wxLua_wxTextValidator_GetExcludes(lua_State *L) { --- 1017,1025 ---- int s_wxluatag_wxTextValidator = -1; ! #if (wxLUA_USE_wxArrayString) && ((wxCHECK_VERSION(2,6,0)) && ((wxLUA_USE_wxTextValidator) && (wxLUA_USE_wxValidator && wxUSE_VALIDATORS))) static wxLuaArgTag s_wxluatagArray_wxLua_wxTextValidator_GetExcludes[] = { &s_wxluatag_wxTextValidator, NULL }; static int LUACALL wxLua_wxTextValidator_GetExcludes(lua_State *L); static wxLuaBindCFunc s_wxluafunc_wxLua_wxTextValidator_GetExcludes[1] = {{ wxLua_wxTextValidator_GetExcludes, WXLUAMETHOD_METHOD, 1, 1, s_wxluatagArray_wxLua_wxTextValidator_GetExcludes }}; ! // %wxchkver_2_6 wxArrayString& GetExcludes() static int LUACALL wxLua_wxTextValidator_GetExcludes(lua_State *L) { *************** *** 1039,1043 **** static int LUACALL wxLua_wxTextValidator_GetIncludes(lua_State *L); static wxLuaBindCFunc s_wxluafunc_wxLua_wxTextValidator_GetIncludes[1] = {{ wxLua_wxTextValidator_GetIncludes, WXLUAMETHOD_METHOD, 1, 1, s_wxluatagArray_wxLua_wxTextValidator_GetIncludes }}; ! // %wxchkver_2_5 wxArrayString& GetIncludes() static int LUACALL wxLua_wxTextValidator_GetIncludes(lua_State *L) { --- 1039,1043 ---- static int LUACALL wxLua_wxTextValidator_GetIncludes(lua_State *L); static wxLuaBindCFunc s_wxluafunc_wxLua_wxTextValidator_GetIncludes[1] = {{ wxLua_wxTextValidator_GetIncludes, WXLUAMETHOD_METHOD, 1, 1, s_wxluatagArray_wxLua_wxTextValidator_GetIncludes }}; ! // %wxchkver_2_6 wxArrayString& GetIncludes() static int LUACALL wxLua_wxTextValidator_GetIncludes(lua_State *L) { *************** *** 1054,1058 **** } ! #endif // (wxLUA_USE_wxArrayString) && ((wxCHECK_VERSION(2,5,0)) && ((wxLUA_USE_wxTextValidator) && (wxLUA_USE_wxValidator && wxUSE_VALIDATORS))) static wxLuaArgTag s_wxluatagArray_wxLua_wxTextValidator_GetStyle[] = { &s_wxluatag_wxTextValidator, NULL }; --- 1054,1058 ---- } ! #endif // (wxLUA_USE_wxArrayString) && ((wxCHECK_VERSION(2,6,0)) && ((wxLUA_USE_wxTextValidator) && (wxLUA_USE_wxValidator && wxUSE_VALIDATORS))) static wxLuaArgTag s_wxluatagArray_wxLua_wxTextValidator_GetStyle[] = { &s_wxluatag_wxTextValidator, NULL }; *************** *** 1075,1083 **** ! #if (wxLUA_USE_wxArrayString) && ((wxCHECK_VERSION(2,5,0)) && ((wxLUA_USE_wxTextValidator) && (wxLUA_USE_wxValidator && wxUSE_VALIDATORS))) static wxLuaArgTag s_wxluatagArray_wxLua_wxTextValidator_SetExcludes[] = { &s_wxluatag_wxTextValidator, &s_wxluatag_wxArrayString, NULL }; static int LUACALL wxLua_wxTextValidator_SetExcludes(lua_State *L); static wxLuaBindCFunc s_wxluafunc_wxLua_wxTextValidator_SetExcludes[1] = {{ wxLua_wxTextValidator_SetExcludes, WXLUAMETHOD_METHOD, 2, 2, s_wxluatagArray_wxLua_wxTextValidator_SetExcludes }}; ! // %wxchkver_2_5 void SetExcludes(const wxArrayString& excludes) static int LUACALL wxLua_wxTextValidator_SetExcludes(lua_State *L) { --- 1075,1083 ---- ! #if (wxLUA_USE_wxArrayString) && ((wxCHECK_VERSION(2,6,0)) && ((wxLUA_USE_wxTextValidator) && (wxLUA_USE_wxValidator && wxUSE_VALIDATORS))) static wxLuaArgTag s_wxluatagArray_wxLua_wxTextValidator_SetExcludes[] = { &s_wxluatag_wxTextValidator, &s_wxluatag_wxArrayString, NULL }; static int LUACALL wxLua_wxTextValidator_SetExcludes(lua_State *L); static wxLuaBindCFunc s_wxluafunc_wxLua_wxTextValidator_SetExcludes[1] = {{ wxLua_wxTextValidator_SetExcludes, WXLUAMETHOD_METHOD, 2, 2, s_wxluatagArray_wxLua_wxTextValidator_SetExcludes }}; ! // %wxchkver_2_6 void SetExcludes(const wxArrayString& excludes) static int LUACALL wxLua_wxTextValidator_SetExcludes(lua_State *L) { *************** *** 1096,1100 **** static int LUACALL wxLua_wxTextValidator_SetIncludes(lua_State *L); static wxLuaBindCFunc s_wxluafunc_wxLua_wxTextValidator_SetIncludes[1] = {{ wxLua_wxTextValidator_SetIncludes, WXLUAMETHOD_METHOD, 2, 2, s_wxluatagArray_wxLua_wxTextValidator_SetIncludes }}; ! // %wxchkver_2_5 void SetIncludes(const wxArrayString& includes) static int LUACALL wxLua_wxTextValidator_SetIncludes(lua_State *L) { --- 1096,1100 ---- static int LUACALL wxLua_wxTextValidator_SetIncludes(lua_State *L); static wxLuaBindCFunc s_wxluafunc_wxLua_wxTextValidator_SetIncludes[1] = {{ wxLua_wxTextValidator_SetIncludes, WXLUAMETHOD_METHOD, 2, 2, s_wxluatagArray_wxLua_wxTextValidator_SetIncludes }}; ! // %wxchkver_2_6 void SetIncludes(const wxArrayString& includes) static int LUACALL wxLua_wxTextValidator_SetIncludes(lua_State *L) { *************** *** 1110,1114 **** } ! #endif // (wxLUA_USE_wxArrayString) && ((wxCHECK_VERSION(2,5,0)) && ((wxLUA_USE_wxTextValidator) && (wxLUA_USE_wxValidator && wxUSE_VALIDATORS))) static wxLuaArgTag s_wxluatagArray_wxLua_wxTextValidator_SetStyle[] = { &s_wxluatag_wxTextValidator, &s_wxluaarg_Number, NULL }; --- 1110,1114 ---- } ! #endif // (wxLUA_USE_wxArrayString) && ((wxCHECK_VERSION(2,6,0)) && ((wxLUA_USE_wxTextValidator) && (wxLUA_USE_wxValidator && wxUSE_VALIDATORS))) static wxLuaArgTag s_wxluatagArray_wxLua_wxTextValidator_SetStyle[] = { &s_wxluatag_wxTextValidator, &s_wxluaarg_Number, NULL }; *************** *** 1181,1195 **** // Map Lua Class Methods to C Binding Functions wxLuaBindMethod wxTextValidator_methods[] = { ! #if (wxLUA_USE_wxArrayString) && ((wxCHECK_VERSION(2,5,0)) && ((wxLUA_USE_wxTextValidator) && (wxLUA_USE_wxValidator && wxUSE_VALIDATORS))) { "GetExcludes", WXLUAMETHOD_METHOD, s_wxluafunc_wxLua_wxTextValidator_GetExcludes, 1, NULL }, { "GetIncludes", WXLUAMETHOD_METHOD, s_wxluafunc_wxLua_wxTextValidator_GetIncludes, 1, NULL }, ! #endif // (wxLUA_USE_wxArrayString) && ((wxCHECK_VERSION(2,5,0)) && ((wxLUA_USE_wxTextValidator) && (wxLUA_USE_wxValidator && wxUSE_VALIDATORS))) { "GetStyle", WXLUAMETHOD_METHOD, s_wxluafunc_wxLua_wxTextValidator_GetStyle, 1, NULL }, ! #if (wxLUA_USE_wxArrayString) && ((wxCHECK_VERSION(2,5,0)) && ((wxLUA_USE_wxTextValidator) && (wxLUA_USE_wxValidator && wxUSE_VALIDATORS))) { "SetExcludes", WXLUAMETHOD_METHOD, s_wxluafunc_wxLua_wxTextValidator_SetExcludes, 1, NULL }, { "SetIncludes", WXLUAMETHOD_METHOD, s_wxluafunc_wxLua_wxTextValidator_SetIncludes, 1, NULL }, ! #endif // (wxLUA_USE_wxArrayString) && ((wxCHECK_VERSION(2,5,0)) && ((wxLUA_USE_wxTextValidator) && (wxLUA_USE_wxValidator && wxUSE_VALIDATORS))) { "SetStyle", WXLUAMETHOD_METHOD, s_wxluafunc_wxLua_wxTextValidator_SetStyle, 1, NULL }, --- 1181,1195 ---- // Map Lua Class Methods to C Binding Functions wxLuaBindMethod wxTextValidator_methods[] = { ! #if (wxLUA_USE_wxArrayString) && ((wxCHECK_VERSION(2,6,0)) && ((wxLUA_USE_wxTextValidator) && (wxLUA_USE_wxValidator && wxUSE_VALIDATORS))) { "GetExcludes", WXLUAMETHOD_METHOD, s_wxluafunc_wxLua_wxTextValidator_GetExcludes, 1, NULL }, { "GetIncludes", WXLUAMETHOD_METHOD, s_wxluafunc_wxLua_wxTextValidator_GetIncludes, 1, NULL }, ! #endif // (wxLUA_USE_wxArrayString) && ((wxCHECK_VERSION(2,6,0)) && ((wxLUA_USE_wxTextValidator) && (wxLUA_USE_wxValidator && wxUSE_VALIDATORS))) { "GetStyle", WXLUAMETHOD_METHOD, s_wxluafunc_wxLua_wxTextValidator_GetStyle, 1, NULL }, ! #if (wxLUA_USE_wxArrayString) && ((wxCHECK_VERSION(2,6,0)) && ((wxLUA_USE_wxTextValidator) && (wxLUA_USE_wxValidator && wxUSE_VALIDATORS))) { "SetExcludes", WXLUAMETHOD_METHOD, s_wxluafunc_wxLua_wxTextValidator_SetExcludes, 1, NULL }, { "SetIncludes", WXLUAMETHOD_METHOD, s_wxluafunc_wxLua_wxTextValidator_SetIncludes, 1, NULL }, ! #endif // (wxLUA_USE_wxArrayString) && ((wxCHECK_VERSION(2,6,0)) && ((wxLUA_USE_wxTextValidator) && (wxLUA_USE_wxValidator && wxUSE_VALIDATORS))) { "SetStyle", WXLUAMETHOD_METHOD, s_wxluafunc_wxLua_wxTextValidator_SetStyle, 1, NULL }, Index: controls.cpp =================================================================== RCS file: /cvsroot/wxlua/wxLua/modules/wxbind/src/controls.cpp,v retrieving revision 1.67 retrieving revision 1.68 diff -C2 -d -r1.67 -r1.68 *** controls.cpp 17 Jun 2007 18:36:15 -0000 1.67 --- controls.cpp 18 Jun 2007 02:56:27 -0000 1.68 *************** *** 2331,2334 **** --- 2331,2784 ---- + #if wxLUA_USE_wxBitmapComboBox && wxUSE_BITMAPCOMBOBOX + // --------------------------------------------------------------------------- + // Bind class wxBitmapComboBox + // --------------------------------------------------------------------------- + + // Lua MetaTable Tag for Class 'wxBitmapComboBox' + int s_wxluatag_wxBitmapComboBox = -1; + + #if (wxLUA_USE_wxBitmapComboBox && wxUSE_BITMAPCOMBOBOX) && (wxLUA_USE_wxBitm... [truncated message content] |
|
From: John L. <jr...@us...> - 2007-06-18 02:56:39
|
Update of /cvsroot/wxlua/wxLua/modules/wxbindstc/src In directory sc8-pr-cvs9.sourceforge.net:/tmp/cvs-serv7428/wxLua/modules/wxbindstc/src Modified Files: stc.cpp wxstc_bind.cpp Log Message: Add more classes from wxWidgets 2.8 Index: wxstc_bind.cpp =================================================================== RCS file: /cvsroot/wxlua/wxLua/modules/wxbindstc/src/wxstc_bind.cpp,v retrieving revision 1.26 retrieving revision 1.27 diff -C2 -d -r1.26 -r1.27 *** wxstc_bind.cpp 14 Jun 2007 01:23:19 -0000 1.26 --- wxstc_bind.cpp 18 Jun 2007 02:56:35 -0000 1.27 *************** *** 46,52 **** { "wxEVT_STC_PAINTED", &wxEVT_STC_PAINTED, &s_wxluatag_wxStyledTextEvent }, ! #if !wxCHECK_VERSION(2,5,0) { "wxEVT_STC_POSCHANGED", &wxEVT_STC_POSCHANGED, &s_wxluatag_wxStyledTextEvent }, ! #endif // !wxCHECK_VERSION(2,5,0) { "wxEVT_STC_ROMODIFYATTEMPT", &wxEVT_STC_ROMODIFYATTEMPT, &s_wxluatag_wxStyledTextEvent }, --- 46,52 ---- { "wxEVT_STC_PAINTED", &wxEVT_STC_PAINTED, &s_wxluatag_wxStyledTextEvent }, ! #if !wxCHECK_VERSION(2,6,0) { "wxEVT_STC_POSCHANGED", &wxEVT_STC_POSCHANGED, &s_wxluatag_wxStyledTextEvent }, ! #endif // !wxCHECK_VERSION(2,6,0) { "wxEVT_STC_ROMODIFYATTEMPT", &wxEVT_STC_ROMODIFYATTEMPT, &s_wxluatag_wxStyledTextEvent }, *************** *** 742,748 **** { "wxSTC_LEX_ASN1", wxSTC_LEX_ASN1 }, ! #if !wxCHECK_VERSION(2,7,0) { "wxSTC_LEX_ASP", wxSTC_LEX_ASP }, ! #endif // !wxCHECK_VERSION(2,7,0) { "wxSTC_LEX_AU3", wxSTC_LEX_AU3 }, --- 742,748 ---- { "wxSTC_LEX_ASN1", wxSTC_LEX_ASN1 }, ! #if !wxCHECK_VERSION(2,8,0) { "wxSTC_LEX_ASP", wxSTC_LEX_ASP }, ! #endif // !wxCHECK_VERSION(2,8,0) { "wxSTC_LEX_AU3", wxSTC_LEX_AU3 }, *************** *** 795,801 **** { "wxSTC_LEX_PERL", wxSTC_LEX_PERL }, ! #if !wxCHECK_VERSION(2,7,0) { "wxSTC_LEX_PHP", wxSTC_LEX_PHP }, ! #endif // !wxCHECK_VERSION(2,7,0) { "wxSTC_LEX_PHPSCRIPT", wxSTC_LEX_PHPSCRIPT }, --- 795,801 ---- { "wxSTC_LEX_PERL", wxSTC_LEX_PERL }, ! #if !wxCHECK_VERSION(2,8,0) { "wxSTC_LEX_PHP", wxSTC_LEX_PHP }, ! #endif // !wxCHECK_VERSION(2,8,0) { "wxSTC_LEX_PHPSCRIPT", wxSTC_LEX_PHPSCRIPT }, *************** *** 1177,1272 **** { "wxSTC_SCMOD_SHIFT", wxSTC_SCMOD_SHIFT }, ! #if wxCHECK_VERSION(2,5,0) { "wxSTC_SCRIPTOL_CHARACTER", wxSTC_SCRIPTOL_CHARACTER }, ! #elif !wxCHECK_VERSION(2,5,0) { "wxSTC_SCRIPTOL_CHARACTER", wxSTC_SCRIPTOL_CHARACTER }, ! #endif // !wxCHECK_VERSION(2,5,0) ! #if wxCHECK_VERSION(2,5,0) { "wxSTC_SCRIPTOL_CLASSNAME", wxSTC_SCRIPTOL_CLASSNAME }, ! #endif // wxCHECK_VERSION(2,5,0) ! #if !wxCHECK_VERSION(2,5,0) { "wxSTC_SCRIPTOL_COMMENT", wxSTC_SCRIPTOL_COMMENT }, { "wxSTC_SCRIPTOL_COMMENTBASIC", wxSTC_SCRIPTOL_COMMENTBASIC }, ! #endif // !wxCHECK_VERSION(2,5,0) ! #if wxCHECK_VERSION(2,5,0) { "wxSTC_SCRIPTOL_COMMENTBLOCK", wxSTC_SCRIPTOL_COMMENTBLOCK }, ! #endif // wxCHECK_VERSION(2,5,0) ! #if !wxCHECK_VERSION(2,5,0) { "wxSTC_SCRIPTOL_COMMENTDOC", wxSTC_SCRIPTOL_COMMENTDOC }, { "wxSTC_SCRIPTOL_COMMENTDOCKEYWORD", wxSTC_SCRIPTOL_COMMENTDOCKEYWORD }, { "wxSTC_SCRIPTOL_COMMENTDOCKEYWORDERROR", wxSTC_SCRIPTOL_COMMENTDOCKEYWORDERROR }, ! #endif // !wxCHECK_VERSION(2,5,0) ! #if wxCHECK_VERSION(2,5,0) { "wxSTC_SCRIPTOL_COMMENTLINE", wxSTC_SCRIPTOL_COMMENTLINE }, ! #elif !wxCHECK_VERSION(2,5,0) { "wxSTC_SCRIPTOL_COMMENTLINE", wxSTC_SCRIPTOL_COMMENTLINE }, ! #endif // !wxCHECK_VERSION(2,5,0) ! #if !wxCHECK_VERSION(2,5,0) { "wxSTC_SCRIPTOL_COMMENTLINEDOC", wxSTC_SCRIPTOL_COMMENTLINEDOC }, ! #endif // !wxCHECK_VERSION(2,5,0) ! #if wxCHECK_VERSION(2,5,0) { "wxSTC_SCRIPTOL_CSTYLE", wxSTC_SCRIPTOL_CSTYLE }, { "wxSTC_SCRIPTOL_DEFAULT", wxSTC_SCRIPTOL_DEFAULT }, ! #elif !wxCHECK_VERSION(2,5,0) { "wxSTC_SCRIPTOL_DEFAULT", wxSTC_SCRIPTOL_DEFAULT }, ! #endif // !wxCHECK_VERSION(2,5,0) ! #if wxCHECK_VERSION(2,5,0) { "wxSTC_SCRIPTOL_IDENTIFIER", wxSTC_SCRIPTOL_IDENTIFIER }, ! #elif !wxCHECK_VERSION(2,5,0) { "wxSTC_SCRIPTOL_IDENTIFIER", wxSTC_SCRIPTOL_IDENTIFIER }, ! #endif // !wxCHECK_VERSION(2,5,0) ! #if wxCHECK_VERSION(2,5,0) { "wxSTC_SCRIPTOL_KEYWORD", wxSTC_SCRIPTOL_KEYWORD }, { "wxSTC_SCRIPTOL_NUMBER", wxSTC_SCRIPTOL_NUMBER }, ! #elif !wxCHECK_VERSION(2,5,0) { "wxSTC_SCRIPTOL_NUMBER", wxSTC_SCRIPTOL_NUMBER }, ! #endif // !wxCHECK_VERSION(2,5,0) ! #if wxCHECK_VERSION(2,5,0) { "wxSTC_SCRIPTOL_OPERATOR", wxSTC_SCRIPTOL_OPERATOR }, ! #elif !wxCHECK_VERSION(2,5,0) { "wxSTC_SCRIPTOL_OPERATOR", wxSTC_SCRIPTOL_OPERATOR }, ! #endif // !wxCHECK_VERSION(2,5,0) ! #if wxCHECK_VERSION(2,5,0) { "wxSTC_SCRIPTOL_PERSISTENT", wxSTC_SCRIPTOL_PERSISTENT }, { "wxSTC_SCRIPTOL_PREPROCESSOR", wxSTC_SCRIPTOL_PREPROCESSOR }, ! #elif !wxCHECK_VERSION(2,5,0) { "wxSTC_SCRIPTOL_PREPROCESSOR", wxSTC_SCRIPTOL_PREPROCESSOR }, ! #endif // !wxCHECK_VERSION(2,5,0) ! #if !wxCHECK_VERSION(2,5,0) { "wxSTC_SCRIPTOL_REGEX", wxSTC_SCRIPTOL_REGEX }, ! #endif // !wxCHECK_VERSION(2,5,0) ! #if wxCHECK_VERSION(2,5,0) { "wxSTC_SCRIPTOL_STRING", wxSTC_SCRIPTOL_STRING }, ! #elif !wxCHECK_VERSION(2,5,0) { "wxSTC_SCRIPTOL_STRING", wxSTC_SCRIPTOL_STRING }, ! #endif // !wxCHECK_VERSION(2,5,0) ! #if wxCHECK_VERSION(2,5,0) { "wxSTC_SCRIPTOL_STRINGEOL", wxSTC_SCRIPTOL_STRINGEOL }, ! #elif !wxCHECK_VERSION(2,5,0) { "wxSTC_SCRIPTOL_STRINGEOL", wxSTC_SCRIPTOL_STRINGEOL }, ! #endif // !wxCHECK_VERSION(2,5,0) ! #if wxCHECK_VERSION(2,5,0) { "wxSTC_SCRIPTOL_TRIPLE", wxSTC_SCRIPTOL_TRIPLE }, ! #endif // wxCHECK_VERSION(2,5,0) ! #if !wxCHECK_VERSION(2,5,0) { "wxSTC_SCRIPTOL_UUID", wxSTC_SCRIPTOL_UUID }, { "wxSTC_SCRIPTOL_VERBATIM", wxSTC_SCRIPTOL_VERBATIM }, ! #endif // !wxCHECK_VERSION(2,5,0) ! #if wxCHECK_VERSION(2,5,0) { "wxSTC_SCRIPTOL_WHITE", wxSTC_SCRIPTOL_WHITE }, ! #endif // wxCHECK_VERSION(2,5,0) ! #if !wxCHECK_VERSION(2,5,0) { "wxSTC_SCRIPTOL_WORD", wxSTC_SCRIPTOL_WORD }, { "wxSTC_SCRIPTOL_WORD2", wxSTC_SCRIPTOL_WORD2 }, ! #endif // !wxCHECK_VERSION(2,5,0) { "wxSTC_SEL_LINES", wxSTC_SEL_LINES }, --- 1177,1272 ---- { "wxSTC_SCMOD_SHIFT", wxSTC_SCMOD_SHIFT }, ! #if wxCHECK_VERSION(2,6,0) { "wxSTC_SCRIPTOL_CHARACTER", wxSTC_SCRIPTOL_CHARACTER }, ! #elif !wxCHECK_VERSION(2,6,0) { "wxSTC_SCRIPTOL_CHARACTER", wxSTC_SCRIPTOL_CHARACTER }, ! #endif // !wxCHECK_VERSION(2,6,0) ! #if wxCHECK_VERSION(2,6,0) { "wxSTC_SCRIPTOL_CLASSNAME", wxSTC_SCRIPTOL_CLASSNAME }, ! #endif // wxCHECK_VERSION(2,6,0) ! #if !wxCHECK_VERSION(2,6,0) { "wxSTC_SCRIPTOL_COMMENT", wxSTC_SCRIPTOL_COMMENT }, { "wxSTC_SCRIPTOL_COMMENTBASIC", wxSTC_SCRIPTOL_COMMENTBASIC }, ! #endif // !wxCHECK_VERSION(2,6,0) ! #if wxCHECK_VERSION(2,6,0) { "wxSTC_SCRIPTOL_COMMENTBLOCK", wxSTC_SCRIPTOL_COMMENTBLOCK }, ! #endif // wxCHECK_VERSION(2,6,0) ! #if !wxCHECK_VERSION(2,6,0) { "wxSTC_SCRIPTOL_COMMENTDOC", wxSTC_SCRIPTOL_COMMENTDOC }, { "wxSTC_SCRIPTOL_COMMENTDOCKEYWORD", wxSTC_SCRIPTOL_COMMENTDOCKEYWORD }, { "wxSTC_SCRIPTOL_COMMENTDOCKEYWORDERROR", wxSTC_SCRIPTOL_COMMENTDOCKEYWORDERROR }, ! #endif // !wxCHECK_VERSION(2,6,0) ! #if wxCHECK_VERSION(2,6,0) { "wxSTC_SCRIPTOL_COMMENTLINE", wxSTC_SCRIPTOL_COMMENTLINE }, ! #elif !wxCHECK_VERSION(2,6,0) { "wxSTC_SCRIPTOL_COMMENTLINE", wxSTC_SCRIPTOL_COMMENTLINE }, ! #endif // !wxCHECK_VERSION(2,6,0) ! #if !wxCHECK_VERSION(2,6,0) { "wxSTC_SCRIPTOL_COMMENTLINEDOC", wxSTC_SCRIPTOL_COMMENTLINEDOC }, ! #endif // !wxCHECK_VERSION(2,6,0) ! #if wxCHECK_VERSION(2,6,0) { "wxSTC_SCRIPTOL_CSTYLE", wxSTC_SCRIPTOL_CSTYLE }, { "wxSTC_SCRIPTOL_DEFAULT", wxSTC_SCRIPTOL_DEFAULT }, ! #elif !wxCHECK_VERSION(2,6,0) { "wxSTC_SCRIPTOL_DEFAULT", wxSTC_SCRIPTOL_DEFAULT }, ! #endif // !wxCHECK_VERSION(2,6,0) ! #if wxCHECK_VERSION(2,6,0) { "wxSTC_SCRIPTOL_IDENTIFIER", wxSTC_SCRIPTOL_IDENTIFIER }, ! #elif !wxCHECK_VERSION(2,6,0) { "wxSTC_SCRIPTOL_IDENTIFIER", wxSTC_SCRIPTOL_IDENTIFIER }, ! #endif // !wxCHECK_VERSION(2,6,0) ! #if wxCHECK_VERSION(2,6,0) { "wxSTC_SCRIPTOL_KEYWORD", wxSTC_SCRIPTOL_KEYWORD }, { "wxSTC_SCRIPTOL_NUMBER", wxSTC_SCRIPTOL_NUMBER }, ! #elif !wxCHECK_VERSION(2,6,0) { "wxSTC_SCRIPTOL_NUMBER", wxSTC_SCRIPTOL_NUMBER }, ! #endif // !wxCHECK_VERSION(2,6,0) ! #if wxCHECK_VERSION(2,6,0) { "wxSTC_SCRIPTOL_OPERATOR", wxSTC_SCRIPTOL_OPERATOR }, ! #elif !wxCHECK_VERSION(2,6,0) { "wxSTC_SCRIPTOL_OPERATOR", wxSTC_SCRIPTOL_OPERATOR }, ! #endif // !wxCHECK_VERSION(2,6,0) ! #if wxCHECK_VERSION(2,6,0) { "wxSTC_SCRIPTOL_PERSISTENT", wxSTC_SCRIPTOL_PERSISTENT }, { "wxSTC_SCRIPTOL_PREPROCESSOR", wxSTC_SCRIPTOL_PREPROCESSOR }, ! #elif !wxCHECK_VERSION(2,6,0) { "wxSTC_SCRIPTOL_PREPROCESSOR", wxSTC_SCRIPTOL_PREPROCESSOR }, ! #endif // !wxCHECK_VERSION(2,6,0) ! #if !wxCHECK_VERSION(2,6,0) { "wxSTC_SCRIPTOL_REGEX", wxSTC_SCRIPTOL_REGEX }, ! #endif // !wxCHECK_VERSION(2,6,0) ! #if wxCHECK_VERSION(2,6,0) { "wxSTC_SCRIPTOL_STRING", wxSTC_SCRIPTOL_STRING }, ! #elif !wxCHECK_VERSION(2,6,0) { "wxSTC_SCRIPTOL_STRING", wxSTC_SCRIPTOL_STRING }, ! #endif // !wxCHECK_VERSION(2,6,0) ! #if wxCHECK_VERSION(2,6,0) { "wxSTC_SCRIPTOL_STRINGEOL", wxSTC_SCRIPTOL_STRINGEOL }, ! #elif !wxCHECK_VERSION(2,6,0) { "wxSTC_SCRIPTOL_STRINGEOL", wxSTC_SCRIPTOL_STRINGEOL }, ! #endif // !wxCHECK_VERSION(2,6,0) ! #if wxCHECK_VERSION(2,6,0) { "wxSTC_SCRIPTOL_TRIPLE", wxSTC_SCRIPTOL_TRIPLE }, ! #endif // wxCHECK_VERSION(2,6,0) ! #if !wxCHECK_VERSION(2,6,0) { "wxSTC_SCRIPTOL_UUID", wxSTC_SCRIPTOL_UUID }, { "wxSTC_SCRIPTOL_VERBATIM", wxSTC_SCRIPTOL_VERBATIM }, ! #endif // !wxCHECK_VERSION(2,6,0) ! #if wxCHECK_VERSION(2,6,0) { "wxSTC_SCRIPTOL_WHITE", wxSTC_SCRIPTOL_WHITE }, ! #endif // wxCHECK_VERSION(2,6,0) ! #if !wxCHECK_VERSION(2,6,0) { "wxSTC_SCRIPTOL_WORD", wxSTC_SCRIPTOL_WORD }, { "wxSTC_SCRIPTOL_WORD2", wxSTC_SCRIPTOL_WORD2 }, ! #endif // !wxCHECK_VERSION(2,6,0) { "wxSTC_SEL_LINES", wxSTC_SEL_LINES }, Index: stc.cpp =================================================================== RCS file: /cvsroot/wxlua/wxLua/modules/wxbindstc/src/stc.cpp,v retrieving revision 1.42 retrieving revision 1.43 diff -C2 -d -r1.42 -r1.43 *** stc.cpp 17 Jun 2007 18:36:28 -0000 1.42 --- stc.cpp 18 Jun 2007 02:56:35 -0000 1.43 *************** *** 1683,1691 **** #endif // wxLUA_USE_wxColourPenBrush ! #if (wxLUA_USE_wxColourPenBrush) && (!wxCHECK_VERSION(2,7,1)) static wxLuaArgTag s_wxluatagArray_wxLua_wxStyledTextCtrl_GetCaretLineBack[] = { &s_wxluatag_wxStyledTextCtrl, NULL }; static int LUACALL wxLua_wxStyledTextCtrl_GetCaretLineBack(lua_State *L); static wxLuaBindCFunc s_wxluafunc_wxLua_wxStyledTextCtrl_GetCaretLineBack[1] = {{ wxLua_wxStyledTextCtrl_GetCaretLineBack, WXLUAMETHOD_METHOD, 1, 1, s_wxluatagArray_wxLua_wxStyledTextCtrl_GetCaretLineBack }}; ! // !%wxchkver_2_7_1 wxColour GetCaretLineBack(); static int LUACALL wxLua_wxStyledTextCtrl_GetCaretLineBack(lua_State *L) { --- 1683,1691 ---- #endif // wxLUA_USE_wxColourPenBrush ! #if (!wxCHECK_VERSION(2,8,0)) && (wxLUA_USE_wxColourPenBrush) static wxLuaArgTag s_wxluatagArray_wxLua_wxStyledTextCtrl_GetCaretLineBack[] = { &s_wxluatag_wxStyledTextCtrl, NULL }; static int LUACALL wxLua_wxStyledTextCtrl_GetCaretLineBack(lua_State *L); static wxLuaBindCFunc s_wxluafunc_wxLua_wxStyledTextCtrl_GetCaretLineBack[1] = {{ wxLua_wxStyledTextCtrl_GetCaretLineBack, WXLUAMETHOD_METHOD, 1, 1, s_wxluatagArray_wxLua_wxStyledTextCtrl_GetCaretLineBack }}; ! // !%wxchkver_2_8 wxColour GetCaretLineBack(); static int LUACALL wxLua_wxStyledTextCtrl_GetCaretLineBack(lua_State *L) { *************** *** 1705,1715 **** } ! #endif // (wxLUA_USE_wxColourPenBrush) && (!wxCHECK_VERSION(2,7,1)) ! #if (wxCHECK_VERSION(2,7,1)) && (wxLUA_USE_wxColourPenBrush) static wxLuaArgTag s_wxluatagArray_wxLua_wxStyledTextCtrl_GetCaretLineBackground[] = { &s_wxluatag_wxStyledTextCtrl, NULL }; static int LUACALL wxLua_wxStyledTextCtrl_GetCaretLineBackground(lua_State *L); static wxLuaBindCFunc s_wxluafunc_wxLua_wxStyledTextCtrl_GetCaretLineBackground[1] = {{ wxLua_wxStyledTextCtrl_GetCaretLineBackground, WXLUAMETHOD_METHOD, 1, 1, s_wxluatagArray_wxLua_wxStyledTextCtrl_GetCaretLineBackground }}; ! // %wxchkver_2_7_1 wxColour GetCaretLineBackground(); static int LUACALL wxLua_wxStyledTextCtrl_GetCaretLineBackground(lua_State *L) { --- 1705,1715 ---- } ! #endif // (!wxCHECK_VERSION(2,8,0)) && (wxLUA_USE_wxColourPenBrush) ! #if (wxLUA_USE_wxColourPenBrush) && (wxCHECK_VERSION(2,8,0)) static wxLuaArgTag s_wxluatagArray_wxLua_wxStyledTextCtrl_GetCaretLineBackground[] = { &s_wxluatag_wxStyledTextCtrl, NULL }; static int LUACALL wxLua_wxStyledTextCtrl_GetCaretLineBackground(lua_State *L); static wxLuaBindCFunc s_wxluafunc_wxLua_wxStyledTextCtrl_GetCaretLineBackground[1] = {{ wxLua_wxStyledTextCtrl_GetCaretLineBackground, WXLUAMETHOD_METHOD, 1, 1, s_wxluatagArray_wxLua_wxStyledTextCtrl_GetCaretLineBackground }}; ! // %wxchkver_2_8 wxColour GetCaretLineBackground(); static int LUACALL wxLua_wxStyledTextCtrl_GetCaretLineBackground(lua_State *L) { *************** *** 1729,1733 **** } ! #endif // (wxCHECK_VERSION(2,7,1)) && (wxLUA_USE_wxColourPenBrush) static wxLuaArgTag s_wxluatagArray_wxLua_wxStyledTextCtrl_GetCaretLineVisible[] = { &s_wxluatag_wxStyledTextCtrl, NULL }; --- 1729,1733 ---- } ! #endif // (wxLUA_USE_wxColourPenBrush) && (wxCHECK_VERSION(2,8,0)) static wxLuaArgTag s_wxluatagArray_wxLua_wxStyledTextCtrl_GetCaretLineVisible[] = { &s_wxluatag_wxStyledTextCtrl, NULL }; *************** *** 5206,5214 **** #endif // wxLUA_USE_wxColourPenBrush ! #if (wxLUA_USE_wxColourPenBrush) && (!wxCHECK_VERSION(2,7,1)) static wxLuaArgTag s_wxluatagArray_wxLua_wxStyledTextCtrl_SetCaretLineBack[] = { &s_wxluatag_wxStyledTextCtrl, &s_wxluatag_wxColour, NULL }; static int LUACALL wxLua_wxStyledTextCtrl_SetCaretLineBack(lua_State *L); static wxLuaBindCFunc s_wxluafunc_wxLua_wxStyledTextCtrl_SetCaretLineBack[1] = {{ wxLua_wxStyledTextCtrl_SetCaretLineBack, WXLUAMETHOD_METHOD, 2, 2, s_wxluatagArray_wxLua_wxStyledTextCtrl_SetCaretLineBack }}; ! // !%wxchkver_2_7_1 void SetCaretLineBack(const wxColour& back); static int LUACALL wxLua_wxStyledTextCtrl_SetCaretLineBack(lua_State *L) { --- 5206,5214 ---- #endif // wxLUA_USE_wxColourPenBrush ! #if (!wxCHECK_VERSION(2,8,0)) && (wxLUA_USE_wxColourPenBrush) static wxLuaArgTag s_wxluatagArray_wxLua_wxStyledTextCtrl_SetCaretLineBack[] = { &s_wxluatag_wxStyledTextCtrl, &s_wxluatag_wxColour, NULL }; static int LUACALL wxLua_wxStyledTextCtrl_SetCaretLineBack(lua_State *L); static wxLuaBindCFunc s_wxluafunc_wxLua_wxStyledTextCtrl_SetCaretLineBack[1] = {{ wxLua_wxStyledTextCtrl_SetCaretLineBack, WXLUAMETHOD_METHOD, 2, 2, s_wxluatagArray_wxLua_wxStyledTextCtrl_SetCaretLineBack }}; ! // !%wxchkver_2_8 void SetCaretLineBack(const wxColour& back); static int LUACALL wxLua_wxStyledTextCtrl_SetCaretLineBack(lua_State *L) { *************** *** 5224,5234 **** } ! #endif // (wxLUA_USE_wxColourPenBrush) && (!wxCHECK_VERSION(2,7,1)) ! #if (wxCHECK_VERSION(2,7,1)) && (wxLUA_USE_wxColourPenBrush) static wxLuaArgTag s_wxluatagArray_wxLua_wxStyledTextCtrl_SetCaretLineBackground[] = { &s_wxluatag_wxStyledTextCtrl, &s_wxluatag_wxColour, NULL }; static int LUACALL wxLua_wxStyledTextCtrl_SetCaretLineBackground(lua_State *L); static wxLuaBindCFunc s_wxluafunc_wxLua_wxStyledTextCtrl_SetCaretLineBackground[1] = {{ wxLua_wxStyledTextCtrl_SetCaretLineBackground, WXLUAMETHOD_METHOD, 2, 2, s_wxluatagArray_wxLua_wxStyledTextCtrl_SetCaretLineBackground }}; ! // %wxchkver_2_7_1 void SetCaretLineBackground(const wxColour& back); static int LUACALL wxLua_wxStyledTextCtrl_SetCaretLineBackground(lua_State *L) { --- 5224,5234 ---- } ! #endif // (!wxCHECK_VERSION(2,8,0)) && (wxLUA_USE_wxColourPenBrush) ! #if (wxLUA_USE_wxColourPenBrush) && (wxCHECK_VERSION(2,8,0)) static wxLuaArgTag s_wxluatagArray_wxLua_wxStyledTextCtrl_SetCaretLineBackground[] = { &s_wxluatag_wxStyledTextCtrl, &s_wxluatag_wxColour, NULL }; static int LUACALL wxLua_wxStyledTextCtrl_SetCaretLineBackground(lua_State *L); static wxLuaBindCFunc s_wxluafunc_wxLua_wxStyledTextCtrl_SetCaretLineBackground[1] = {{ wxLua_wxStyledTextCtrl_SetCaretLineBackground, WXLUAMETHOD_METHOD, 2, 2, s_wxluatagArray_wxLua_wxStyledTextCtrl_SetCaretLineBackground }}; ! // %wxchkver_2_8 void SetCaretLineBackground(const wxColour& back); static int LUACALL wxLua_wxStyledTextCtrl_SetCaretLineBackground(lua_State *L) { *************** *** 5244,5248 **** } ! #endif // (wxCHECK_VERSION(2,7,1)) && (wxLUA_USE_wxColourPenBrush) static wxLuaArgTag s_wxluatagArray_wxLua_wxStyledTextCtrl_SetCaretLineVisible[] = { &s_wxluatag_wxStyledTextCtrl, &s_wxluaarg_Boolean, NULL }; --- 5244,5248 ---- } ! #endif // (wxLUA_USE_wxColourPenBrush) && (wxCHECK_VERSION(2,8,0)) static wxLuaArgTag s_wxluatagArray_wxLua_wxStyledTextCtrl_SetCaretLineVisible[] = { &s_wxluatag_wxStyledTextCtrl, &s_wxluaarg_Boolean, NULL }; *************** *** 8100,8110 **** #endif // wxLUA_USE_wxColourPenBrush ! #if (wxLUA_USE_wxColourPenBrush) && (!wxCHECK_VERSION(2,7,1)) { "GetCaretLineBack", WXLUAMETHOD_METHOD, s_wxluafunc_wxLua_wxStyledTextCtrl_GetCaretLineBack, 1, NULL }, ! #endif // (wxLUA_USE_wxColourPenBrush) && (!wxCHECK_VERSION(2,7,1)) ! #if (wxCHECK_VERSION(2,7,1)) && (wxLUA_USE_wxColourPenBrush) { "GetCaretLineBackground", WXLUAMETHOD_METHOD, s_wxluafunc_wxLua_wxStyledTextCtrl_GetCaretLineBackground, 1, NULL }, ! #endif // (wxCHECK_VERSION(2,7,1)) && (wxLUA_USE_wxColourPenBrush) { "GetCaretLineVisible", WXLUAMETHOD_METHOD, s_wxluafunc_wxLua_wxStyledTextCtrl_GetCaretLineVisible, 1, NULL }, --- 8100,8110 ---- #endif // wxLUA_USE_wxColourPenBrush ! #if (!wxCHECK_VERSION(2,8,0)) && (wxLUA_USE_wxColourPenBrush) { "GetCaretLineBack", WXLUAMETHOD_METHOD, s_wxluafunc_wxLua_wxStyledTextCtrl_GetCaretLineBack, 1, NULL }, ! #endif // (!wxCHECK_VERSION(2,8,0)) && (wxLUA_USE_wxColourPenBrush) ! #if (wxLUA_USE_wxColourPenBrush) && (wxCHECK_VERSION(2,8,0)) { "GetCaretLineBackground", WXLUAMETHOD_METHOD, s_wxluafunc_wxLua_wxStyledTextCtrl_GetCaretLineBackground, 1, NULL }, ! #endif // (wxLUA_USE_wxColourPenBrush) && (wxCHECK_VERSION(2,8,0)) { "GetCaretLineVisible", WXLUAMETHOD_METHOD, s_wxluafunc_wxLua_wxStyledTextCtrl_GetCaretLineVisible, 1, NULL }, *************** *** 8338,8348 **** #endif // wxLUA_USE_wxColourPenBrush ! #if (wxLUA_USE_wxColourPenBrush) && (!wxCHECK_VERSION(2,7,1)) { "SetCaretLineBack", WXLUAMETHOD_METHOD, s_wxluafunc_wxLua_wxStyledTextCtrl_SetCaretLineBack, 1, NULL }, ! #endif // (wxLUA_USE_wxColourPenBrush) && (!wxCHECK_VERSION(2,7,1)) ! #if (wxCHECK_VERSION(2,7,1)) && (wxLUA_USE_wxColourPenBrush) { "SetCaretLineBackground", WXLUAMETHOD_METHOD, s_wxluafunc_wxLua_wxStyledTextCtrl_SetCaretLineBackground, 1, NULL }, ! #endif // (wxCHECK_VERSION(2,7,1)) && (wxLUA_USE_wxColourPenBrush) { "SetCaretLineVisible", WXLUAMETHOD_METHOD, s_wxluafunc_wxLua_wxStyledTextCtrl_SetCaretLineVisible, 1, NULL }, --- 8338,8348 ---- #endif // wxLUA_USE_wxColourPenBrush ! #if (!wxCHECK_VERSION(2,8,0)) && (wxLUA_USE_wxColourPenBrush) { "SetCaretLineBack", WXLUAMETHOD_METHOD, s_wxluafunc_wxLua_wxStyledTextCtrl_SetCaretLineBack, 1, NULL }, ! #endif // (!wxCHECK_VERSION(2,8,0)) && (wxLUA_USE_wxColourPenBrush) ! #if (wxLUA_USE_wxColourPenBrush) && (wxCHECK_VERSION(2,8,0)) { "SetCaretLineBackground", WXLUAMETHOD_METHOD, s_wxluafunc_wxLua_wxStyledTextCtrl_SetCaretLineBackground, 1, NULL }, ! #endif // (wxLUA_USE_wxColourPenBrush) && (wxCHECK_VERSION(2,8,0)) { "SetCaretLineVisible", WXLUAMETHOD_METHOD, s_wxluafunc_wxLua_wxStyledTextCtrl_SetCaretLineVisible, 1, NULL }, |
|
From: John L. <jr...@us...> - 2007-06-17 18:36:47
|
Update of /cvsroot/wxlua/wxLua/modules/build/msw In directory sc8-pr-cvs9.sourceforge.net:/tmp/cvs-serv12639/wxLua/modules/build/msw Modified Files: makefile.bcc makefile.gcc makefile.vc makefile.wat Log Message: Add picker.i for all of the wxPicker controls Change WXLUA_DECLARE_ENCAPSULATION to prepend wxLua_ to it for clarity. Index: makefile.vc =================================================================== RCS file: /cvsroot/wxlua/wxLua/modules/build/msw/makefile.vc,v retrieving revision 1.67 retrieving revision 1.68 diff -C2 -d -r1.67 -r1.68 *** makefile.vc 14 Jun 2007 12:23:04 -0000 1.67 --- makefile.vc 17 Jun 2007 18:36:10 -0000 1.68 *************** *** 233,237 **** vcmsw$(WXLIBPOSTFIX)$(_BUILDDIR_SHARED_SUFFIX)\wxbind_lib_wxlprint.obj \ vcmsw$(WXLIBPOSTFIX)$(_BUILDDIR_SHARED_SUFFIX)\wxbind_lib_wxlua.obj \ ! vcmsw$(WXLIBPOSTFIX)$(_BUILDDIR_SHARED_SUFFIX)\wxbind_lib_xml.obj WXBIND_DLL_CXXFLAGS = /M$(__RUNTIME_LIBS_70)$(VAR_69) /DWIN32 \ /I..\..\..\modules\wxbind\setup $(____WX_SHARED) $(__WXUNICODE_DEFINE_p) \ --- 233,238 ---- vcmsw$(WXLIBPOSTFIX)$(_BUILDDIR_SHARED_SUFFIX)\wxbind_lib_wxlprint.obj \ vcmsw$(WXLIBPOSTFIX)$(_BUILDDIR_SHARED_SUFFIX)\wxbind_lib_wxlua.obj \ ! vcmsw$(WXLIBPOSTFIX)$(_BUILDDIR_SHARED_SUFFIX)\wxbind_lib_xml.obj \ ! vcmsw$(WXLIBPOSTFIX)$(_BUILDDIR_SHARED_SUFFIX)\wxbind_lib_picker.obj WXBIND_DLL_CXXFLAGS = /M$(__RUNTIME_LIBS_70)$(VAR_69) /DWIN32 \ /I..\..\..\modules\wxbind\setup $(____WX_SHARED) $(__WXUNICODE_DEFINE_p) \ *************** *** 275,279 **** vcmsw$(WXLIBPOSTFIX)$(_BUILDDIR_SHARED_SUFFIX)\wxbind_dll_wxlprint.obj \ vcmsw$(WXLIBPOSTFIX)$(_BUILDDIR_SHARED_SUFFIX)\wxbind_dll_wxlua.obj \ ! vcmsw$(WXLIBPOSTFIX)$(_BUILDDIR_SHARED_SUFFIX)\wxbind_dll_xml.obj WXBINDSTC_LIB_CXXFLAGS = /M$(__RUNTIME_LIBS_83)$(VAR_69) /DWIN32 \ /I..\..\..\modules\wxbind\setup $(____WX_SHARED) $(__WXUNICODE_DEFINE_p) \ --- 276,281 ---- vcmsw$(WXLIBPOSTFIX)$(_BUILDDIR_SHARED_SUFFIX)\wxbind_dll_wxlprint.obj \ vcmsw$(WXLIBPOSTFIX)$(_BUILDDIR_SHARED_SUFFIX)\wxbind_dll_wxlua.obj \ ! vcmsw$(WXLIBPOSTFIX)$(_BUILDDIR_SHARED_SUFFIX)\wxbind_dll_xml.obj \ ! vcmsw$(WXLIBPOSTFIX)$(_BUILDDIR_SHARED_SUFFIX)\wxbind_dll_picker.obj WXBINDSTC_LIB_CXXFLAGS = /M$(__RUNTIME_LIBS_83)$(VAR_69) /DWIN32 \ /I..\..\..\modules\wxbind\setup $(____WX_SHARED) $(__WXUNICODE_DEFINE_p) \ *************** *** 1192,1195 **** --- 1194,1200 ---- $(CXX) /c /nologo /TP /Fo$@ $(WXBIND_LIB_CXXFLAGS) $** + vcmsw$(WXLIBPOSTFIX)$(_BUILDDIR_SHARED_SUFFIX)\wxbind_lib_picker.obj: ..\..\wxbind\src\picker.cpp + $(CXX) /c /nologo /TP /Fo$@ $(WXBIND_LIB_CXXFLAGS) $** + vcmsw$(WXLIBPOSTFIX)$(_BUILDDIR_SHARED_SUFFIX)\wxbind_dll_appframe.obj: ..\..\wxbind\src\appframe.cpp $(CXX) /c /nologo /TP /Fo$@ $(WXBIND_DLL_CXXFLAGS) $** *************** *** 1285,1288 **** --- 1290,1296 ---- $(CXX) /c /nologo /TP /Fo$@ $(WXBIND_DLL_CXXFLAGS) $** + vcmsw$(WXLIBPOSTFIX)$(_BUILDDIR_SHARED_SUFFIX)\wxbind_dll_picker.obj: ..\..\wxbind\src\picker.cpp + $(CXX) /c /nologo /TP /Fo$@ $(WXBIND_DLL_CXXFLAGS) $** + vcmsw$(WXLIBPOSTFIX)$(_BUILDDIR_SHARED_SUFFIX)\wxbindstc_lib_dummy.obj: ..\..\wxbindstc\src\dummy.cpp $(CXX) /c /nologo /TP /Fo$@ $(WXBINDSTC_LIB_CXXFLAGS) /Ycwx/wxprec.h $** Index: makefile.bcc =================================================================== RCS file: /cvsroot/wxlua/wxLua/modules/build/msw/makefile.bcc,v retrieving revision 1.68 retrieving revision 1.69 diff -C2 -d -r1.68 -r1.69 *** makefile.bcc 14 Jun 2007 12:23:04 -0000 1.68 --- makefile.bcc 17 Jun 2007 18:36:09 -0000 1.69 *************** *** 270,274 **** bccmsw$(WXLIBPOSTFIX)$(_BUILDDIR_SHARED_SUFFIX)\wxbind_lib_wxlprint.obj \ bccmsw$(WXLIBPOSTFIX)$(_BUILDDIR_SHARED_SUFFIX)\wxbind_lib_wxlua.obj \ ! bccmsw$(WXLIBPOSTFIX)$(_BUILDDIR_SHARED_SUFFIX)\wxbind_lib_xml.obj WXBIND_DLL_CXXFLAGS = $(__RUNTIME_LIBS) -I$(BCCDIR)\include \ -I..\..\..\modules\wxbind\setup $(____WX_SHARED) $(__WXUNICODE_DEFINE_p) \ --- 270,275 ---- bccmsw$(WXLIBPOSTFIX)$(_BUILDDIR_SHARED_SUFFIX)\wxbind_lib_wxlprint.obj \ bccmsw$(WXLIBPOSTFIX)$(_BUILDDIR_SHARED_SUFFIX)\wxbind_lib_wxlua.obj \ ! bccmsw$(WXLIBPOSTFIX)$(_BUILDDIR_SHARED_SUFFIX)\wxbind_lib_xml.obj \ ! bccmsw$(WXLIBPOSTFIX)$(_BUILDDIR_SHARED_SUFFIX)\wxbind_lib_picker.obj WXBIND_DLL_CXXFLAGS = $(__RUNTIME_LIBS) -I$(BCCDIR)\include \ -I..\..\..\modules\wxbind\setup $(____WX_SHARED) $(__WXUNICODE_DEFINE_p) \ *************** *** 310,314 **** bccmsw$(WXLIBPOSTFIX)$(_BUILDDIR_SHARED_SUFFIX)\wxbind_dll_wxlprint.obj \ bccmsw$(WXLIBPOSTFIX)$(_BUILDDIR_SHARED_SUFFIX)\wxbind_dll_wxlua.obj \ ! bccmsw$(WXLIBPOSTFIX)$(_BUILDDIR_SHARED_SUFFIX)\wxbind_dll_xml.obj WXBINDSTC_LIB_CXXFLAGS = $(__RUNTIME_LIBS) -I$(BCCDIR)\include \ -I..\..\..\modules\wxbind\setup $(____WX_SHARED) $(__WXUNICODE_DEFINE_p) \ --- 311,316 ---- bccmsw$(WXLIBPOSTFIX)$(_BUILDDIR_SHARED_SUFFIX)\wxbind_dll_wxlprint.obj \ bccmsw$(WXLIBPOSTFIX)$(_BUILDDIR_SHARED_SUFFIX)\wxbind_dll_wxlua.obj \ ! bccmsw$(WXLIBPOSTFIX)$(_BUILDDIR_SHARED_SUFFIX)\wxbind_dll_xml.obj \ ! bccmsw$(WXLIBPOSTFIX)$(_BUILDDIR_SHARED_SUFFIX)\wxbind_dll_picker.obj WXBINDSTC_LIB_CXXFLAGS = $(__RUNTIME_LIBS) -I$(BCCDIR)\include \ -I..\..\..\modules\wxbind\setup $(____WX_SHARED) $(__WXUNICODE_DEFINE_p) \ *************** *** 1172,1175 **** --- 1174,1180 ---- $(CXX) -q -c -P -o$@ $(WXBIND_LIB_CXXFLAGS) $** + bccmsw$(WXLIBPOSTFIX)$(_BUILDDIR_SHARED_SUFFIX)\wxbind_lib_picker.obj: ..\..\wxbind\src\picker.cpp + $(CXX) -q -c -P -o$@ $(WXBIND_LIB_CXXFLAGS) $** + bccmsw$(WXLIBPOSTFIX)$(_BUILDDIR_SHARED_SUFFIX)\wxbind_dll_appframe.obj: ..\..\wxbind\src\appframe.cpp $(CXX) -q -c -P -o$@ $(WXBIND_DLL_CXXFLAGS) $** *************** *** 1265,1268 **** --- 1270,1276 ---- $(CXX) -q -c -P -o$@ $(WXBIND_DLL_CXXFLAGS) $** + bccmsw$(WXLIBPOSTFIX)$(_BUILDDIR_SHARED_SUFFIX)\wxbind_dll_picker.obj: ..\..\wxbind\src\picker.cpp + $(CXX) -q -c -P -o$@ $(WXBIND_DLL_CXXFLAGS) $** + bccmsw$(WXLIBPOSTFIX)$(_BUILDDIR_SHARED_SUFFIX)\wxbindstc_lib_dummy.obj: ..\..\wxbindstc\src\dummy.cpp $(CXX) -q -c -P -o$@ $(WXBINDSTC_LIB_CXXFLAGS) -H $** Index: makefile.wat =================================================================== RCS file: /cvsroot/wxlua/wxLua/modules/build/msw/makefile.wat,v retrieving revision 1.67 retrieving revision 1.68 diff -C2 -d -r1.67 -r1.68 *** makefile.wat 14 Jun 2007 12:23:04 -0000 1.67 --- makefile.wat 17 Jun 2007 18:36:11 -0000 1.68 *************** *** 680,684 **** watmsw$(WXLIBPOSTFIX)$(_BUILDDIR_SHARED_SUFFIX)\wxbind_lib_wxlprint.obj & watmsw$(WXLIBPOSTFIX)$(_BUILDDIR_SHARED_SUFFIX)\wxbind_lib_wxlua.obj & ! watmsw$(WXLIBPOSTFIX)$(_BUILDDIR_SHARED_SUFFIX)\wxbind_lib_xml.obj WXBIND_DLL_CXXFLAGS = -bd -i=..\..\..\modules\wxbind\setup $(____WX_SHARED) & $(__WXUNICODE_DEFINE_p) $(__WXDEBUG_DEFINE_p) -d__WXMSW__ & --- 680,685 ---- watmsw$(WXLIBPOSTFIX)$(_BUILDDIR_SHARED_SUFFIX)\wxbind_lib_wxlprint.obj & watmsw$(WXLIBPOSTFIX)$(_BUILDDIR_SHARED_SUFFIX)\wxbind_lib_wxlua.obj & ! watmsw$(WXLIBPOSTFIX)$(_BUILDDIR_SHARED_SUFFIX)\wxbind_lib_xml.obj & ! watmsw$(WXLIBPOSTFIX)$(_BUILDDIR_SHARED_SUFFIX)\wxbind_lib_picker.obj WXBIND_DLL_CXXFLAGS = -bd -i=..\..\..\modules\wxbind\setup $(____WX_SHARED) & $(__WXUNICODE_DEFINE_p) $(__WXDEBUG_DEFINE_p) -d__WXMSW__ & *************** *** 718,722 **** watmsw$(WXLIBPOSTFIX)$(_BUILDDIR_SHARED_SUFFIX)\wxbind_dll_wxlprint.obj & watmsw$(WXLIBPOSTFIX)$(_BUILDDIR_SHARED_SUFFIX)\wxbind_dll_wxlua.obj & ! watmsw$(WXLIBPOSTFIX)$(_BUILDDIR_SHARED_SUFFIX)\wxbind_dll_xml.obj WXBINDSTC_LIB_CXXFLAGS = -i=..\..\..\modules\wxbind\setup $(____WX_SHARED) & $(__WXUNICODE_DEFINE_p) $(__WXDEBUG_DEFINE_p) -d__WXMSW__ & --- 719,724 ---- watmsw$(WXLIBPOSTFIX)$(_BUILDDIR_SHARED_SUFFIX)\wxbind_dll_wxlprint.obj & watmsw$(WXLIBPOSTFIX)$(_BUILDDIR_SHARED_SUFFIX)\wxbind_dll_wxlua.obj & ! watmsw$(WXLIBPOSTFIX)$(_BUILDDIR_SHARED_SUFFIX)\wxbind_dll_xml.obj & ! watmsw$(WXLIBPOSTFIX)$(_BUILDDIR_SHARED_SUFFIX)\wxbind_dll_picker.obj WXBINDSTC_LIB_CXXFLAGS = -i=..\..\..\modules\wxbind\setup $(____WX_SHARED) & $(__WXUNICODE_DEFINE_p) $(__WXDEBUG_DEFINE_p) -d__WXMSW__ & *************** *** 1346,1349 **** --- 1348,1354 ---- $(CXX) -bt=nt -zq -fo=$^@ $(WXBIND_LIB_CXXFLAGS) $< + watmsw$(WXLIBPOSTFIX)$(_BUILDDIR_SHARED_SUFFIX)\wxbind_lib_picker.obj : .AUTODEPEND ..\..\wxbind\src\picker.cpp + $(CXX) -bt=nt -zq -fo=$^@ $(WXBIND_LIB_CXXFLAGS) $< + watmsw$(WXLIBPOSTFIX)$(_BUILDDIR_SHARED_SUFFIX)\wxbind_dll_appframe.obj : .AUTODEPEND ..\..\wxbind\src\appframe.cpp $(CXX) -bt=nt -zq -fo=$^@ $(WXBIND_DLL_CXXFLAGS) $< *************** *** 1439,1442 **** --- 1444,1450 ---- $(CXX) -bt=nt -zq -fo=$^@ $(WXBIND_DLL_CXXFLAGS) $< + watmsw$(WXLIBPOSTFIX)$(_BUILDDIR_SHARED_SUFFIX)\wxbind_dll_picker.obj : .AUTODEPEND ..\..\wxbind\src\picker.cpp + $(CXX) -bt=nt -zq -fo=$^@ $(WXBIND_DLL_CXXFLAGS) $< + watmsw$(WXLIBPOSTFIX)$(_BUILDDIR_SHARED_SUFFIX)\wxbindstc_lib_dummy.obj : .AUTODEPEND ..\..\wxbindstc\src\dummy.cpp $(CXX) -bt=nt -zq -fo=$^@ $(WXBINDSTC_LIB_CXXFLAGS) $< Index: makefile.gcc =================================================================== RCS file: /cvsroot/wxlua/wxLua/modules/build/msw/makefile.gcc,v retrieving revision 1.67 retrieving revision 1.68 diff -C2 -d -r1.67 -r1.68 *** makefile.gcc 14 Jun 2007 12:23:04 -0000 1.67 --- makefile.gcc 17 Jun 2007 18:36:10 -0000 1.68 *************** *** 205,209 **** gccmsw$(WXLIBPOSTFIX)$(_BUILDDIR_SHARED_SUFFIX)\wxbind_lib_wxlprint.o \ gccmsw$(WXLIBPOSTFIX)$(_BUILDDIR_SHARED_SUFFIX)\wxbind_lib_wxlua.o \ ! gccmsw$(WXLIBPOSTFIX)$(_BUILDDIR_SHARED_SUFFIX)\wxbind_lib_xml.o WXBIND_DLL_CXXFLAGS = -I..\..\..\modules\wxbind\setup -DHAVE_W32API_H \ $(____WX_SHARED) $(__WXUNICODE_DEFINE_p) $(__WXDEBUG_DEFINE_p) -D__WXMSW__ \ --- 205,210 ---- gccmsw$(WXLIBPOSTFIX)$(_BUILDDIR_SHARED_SUFFIX)\wxbind_lib_wxlprint.o \ gccmsw$(WXLIBPOSTFIX)$(_BUILDDIR_SHARED_SUFFIX)\wxbind_lib_wxlua.o \ ! gccmsw$(WXLIBPOSTFIX)$(_BUILDDIR_SHARED_SUFFIX)\wxbind_lib_xml.o \ ! gccmsw$(WXLIBPOSTFIX)$(_BUILDDIR_SHARED_SUFFIX)\wxbind_lib_picker.o WXBIND_DLL_CXXFLAGS = -I..\..\..\modules\wxbind\setup -DHAVE_W32API_H \ $(____WX_SHARED) $(__WXUNICODE_DEFINE_p) $(__WXDEBUG_DEFINE_p) -D__WXMSW__ \ *************** *** 243,247 **** gccmsw$(WXLIBPOSTFIX)$(_BUILDDIR_SHARED_SUFFIX)\wxbind_dll_wxlprint.o \ gccmsw$(WXLIBPOSTFIX)$(_BUILDDIR_SHARED_SUFFIX)\wxbind_dll_wxlua.o \ ! gccmsw$(WXLIBPOSTFIX)$(_BUILDDIR_SHARED_SUFFIX)\wxbind_dll_xml.o WXBINDSTC_LIB_CXXFLAGS = -I..\..\..\modules\wxbind\setup -DHAVE_W32API_H \ $(____WX_SHARED) $(__WXUNICODE_DEFINE_p) $(__WXDEBUG_DEFINE_p) -D__WXMSW__ \ --- 244,249 ---- gccmsw$(WXLIBPOSTFIX)$(_BUILDDIR_SHARED_SUFFIX)\wxbind_dll_wxlprint.o \ gccmsw$(WXLIBPOSTFIX)$(_BUILDDIR_SHARED_SUFFIX)\wxbind_dll_wxlua.o \ ! gccmsw$(WXLIBPOSTFIX)$(_BUILDDIR_SHARED_SUFFIX)\wxbind_dll_xml.o \ ! gccmsw$(WXLIBPOSTFIX)$(_BUILDDIR_SHARED_SUFFIX)\wxbind_dll_picker.o WXBINDSTC_LIB_CXXFLAGS = -I..\..\..\modules\wxbind\setup -DHAVE_W32API_H \ $(____WX_SHARED) $(__WXUNICODE_DEFINE_p) $(__WXDEBUG_DEFINE_p) -D__WXMSW__ \ *************** *** 1196,1199 **** --- 1198,1204 ---- $(CXX) -c -o $@ $(WXBIND_LIB_CXXFLAGS) $(CPPDEPS) $< + gccmsw$(WXLIBPOSTFIX)$(_BUILDDIR_SHARED_SUFFIX)\wxbind_lib_picker.o: ../../wxbind/src/picker.cpp + $(CXX) -c -o $@ $(WXBIND_LIB_CXXFLAGS) $(CPPDEPS) $< + gccmsw$(WXLIBPOSTFIX)$(_BUILDDIR_SHARED_SUFFIX)\wxbind_dll_appframe.o: ../../wxbind/src/appframe.cpp $(CXX) -c -o $@ $(WXBIND_DLL_CXXFLAGS) $(CPPDEPS) $< *************** *** 1289,1292 **** --- 1294,1300 ---- $(CXX) -c -o $@ $(WXBIND_DLL_CXXFLAGS) $(CPPDEPS) $< + gccmsw$(WXLIBPOSTFIX)$(_BUILDDIR_SHARED_SUFFIX)\wxbind_dll_picker.o: ../../wxbind/src/picker.cpp + $(CXX) -c -o $@ $(WXBIND_DLL_CXXFLAGS) $(CPPDEPS) $< + gccmsw$(WXLIBPOSTFIX)$(_BUILDDIR_SHARED_SUFFIX)\wxbindstc_lib_dummy.o: ../../wxbindstc/src/dummy.cpp $(CXX) -c -o $@ $(WXBINDSTC_LIB_CXXFLAGS) $(CPPDEPS) $< |
|
From: John L. <jr...@us...> - 2007-06-17 18:36:47
|
Update of /cvsroot/wxlua/wxLua/modules/wxbind/include In directory sc8-pr-cvs9.sourceforge.net:/tmp/cvs-serv12639/wxLua/modules/wxbind/include Modified Files: wxbind.h Log Message: Add picker.i for all of the wxPicker controls Change WXLUA_DECLARE_ENCAPSULATION to prepend wxLua_ to it for clarity. Index: wxbind.h =================================================================== RCS file: /cvsroot/wxlua/wxLua/modules/wxbind/include/wxbind.h,v retrieving revision 1.74 retrieving revision 1.75 diff -C2 -d -r1.74 -r1.75 *** wxbind.h 16 Jun 2007 06:21:43 -0000 1.74 --- wxbind.h 17 Jun 2007 18:36:12 -0000 1.75 *************** *** 137,140 **** --- 137,148 ---- #endif // (wxLUA_USE_wxChoice || wxLUA_USE_wxComboBox || wxLUA_USE_wxListBox ) && wxUSE_CONTROLS + #if (wxLUA_USE_wxColourPickerCtrl && wxUSE_COLOURPICKERCTRL) && (wxchkver_2_8 && wxLUA_USE_wxPicker) + #include "wx/clrpicker.h" + #endif // (wxLUA_USE_wxColourPickerCtrl && wxUSE_COLOURPICKERCTRL) && (wxchkver_2_8 && wxLUA_USE_wxPicker) + + #if (wxLUA_USE_wxDatePickerCtrl && wxUSE_DATEPICKCTRL) && (wxchkver_2_8 && wxLUA_USE_wxPicker) + #include "wx/datectrl.h" + #endif // (wxLUA_USE_wxDatePickerCtrl && wxUSE_DATEPICKCTRL) && (wxchkver_2_8 && wxLUA_USE_wxPicker) + #if (wxLUA_USE_wxGenericValidator) && (wxLUA_USE_wxValidator && wxUSE_VALIDATORS) #include "wx/valgen.h" *************** *** 325,332 **** #endif // wxLUA_USE_wxDataObject && wxUSE_DATAOBJ - #if wxLUA_USE_wxDatePickerCtrl && wxUSE_DATEPICKCTRL - #include "wx/datectrl.h" - #endif // wxLUA_USE_wxDatePickerCtrl && wxUSE_DATEPICKCTRL - #if wxLUA_USE_wxDateSpan && wxUSE_DATETIME #include "wx/datetime.h" --- 333,336 ---- *************** *** 679,682 **** --- 683,690 ---- #endif // wxUSE_WIZARDDLG && wxLUA_USE_wxWizard + #if wxchkver_2_8 && wxLUA_USE_wxPicker + #include "wx/pickerbase.h" + #endif // wxchkver_2_8 && wxLUA_USE_wxPicker + // --------------------------------------------------------------------------- *************** *** 696,699 **** --- 704,716 ---- #endif // (!wxCHECK_VERSION(2,5,0)) && (wxLUA_USE_wxToolbar) + #if ((wxLUA_USE_wxDirPickerCtrl || wxLUA_USE_wxFilePickerCtrl ) && (wxUSE_FILEPICKERCTRL || wxUSE_DIRPICKERCTRL )) && (wxchkver_2_8 && wxLUA_USE_wxPicker) + extern WXDLLIMPEXP_DATA_WXBIND(int) s_wxluatag_wxFileDirPickerCtrlBase; + extern WXDLLIMPEXP_WXBIND wxLuaBindMethod wxFileDirPickerCtrlBase_methods[]; + extern WXDLLIMPEXP_DATA_WXBIND(int) wxFileDirPickerCtrlBase_methodCount; + extern WXDLLIMPEXP_DATA_WXBIND(int) s_wxluatag_wxFileDirPickerEvent; + extern WXDLLIMPEXP_WXBIND wxLuaBindMethod wxFileDirPickerEvent_methods[]; + extern WXDLLIMPEXP_DATA_WXBIND(int) wxFileDirPickerEvent_methodCount; + #endif // ((wxLUA_USE_wxDirPickerCtrl || wxLUA_USE_wxFilePickerCtrl ) && (wxUSE_FILEPICKERCTRL || wxUSE_DIRPICKERCTRL )) && (wxchkver_2_8 && wxLUA_USE_wxPicker) + #if (defined(__WXMSW__) && !wxCHECK_VERSION(2,5,0) && wxUSE_WAVE) && (wxLUA_USE_wxWave) extern WXDLLIMPEXP_DATA_WXBIND(int) s_wxluatag_wxWave; *************** *** 796,799 **** --- 813,849 ---- #endif // (wxLUA_USE_wxChoice || wxLUA_USE_wxComboBox || wxLUA_USE_wxListBox ) && wxUSE_CONTROLS + #if (wxLUA_USE_wxColourPickerCtrl && wxUSE_COLOURPICKERCTRL) && (wxchkver_2_8 && wxLUA_USE_wxPicker) + extern WXDLLIMPEXP_DATA_WXBIND(int) s_wxluatag_wxColourPickerCtrl; + extern WXDLLIMPEXP_WXBIND wxLuaBindMethod wxColourPickerCtrl_methods[]; + extern WXDLLIMPEXP_DATA_WXBIND(int) wxColourPickerCtrl_methodCount; + extern WXDLLIMPEXP_DATA_WXBIND(int) s_wxluatag_wxColourPickerEvent; + extern WXDLLIMPEXP_WXBIND wxLuaBindMethod wxColourPickerEvent_methods[]; + extern WXDLLIMPEXP_DATA_WXBIND(int) wxColourPickerEvent_methodCount; + #endif // (wxLUA_USE_wxColourPickerCtrl && wxUSE_COLOURPICKERCTRL) && (wxchkver_2_8 && wxLUA_USE_wxPicker) + + #if (wxLUA_USE_wxDatePickerCtrl && wxUSE_DATEPICKCTRL) && (wxchkver_2_8 && wxLUA_USE_wxPicker) + extern WXDLLIMPEXP_DATA_WXBIND(int) s_wxluatag_wxDatePickerCtrl; + extern WXDLLIMPEXP_WXBIND wxLuaBindMethod wxDatePickerCtrl_methods[]; + extern WXDLLIMPEXP_DATA_WXBIND(int) wxDatePickerCtrl_methodCount; + #endif // (wxLUA_USE_wxDatePickerCtrl && wxUSE_DATEPICKCTRL) && (wxchkver_2_8 && wxLUA_USE_wxPicker) + + #if (wxLUA_USE_wxDirPickerCtrl && (wxUSE_FILEPICKERCTRL || wxUSE_DIRPICKERCTRL )) && (wxchkver_2_8 && wxLUA_USE_wxPicker) + extern WXDLLIMPEXP_DATA_WXBIND(int) s_wxluatag_wxDirPickerCtrl; + extern WXDLLIMPEXP_WXBIND wxLuaBindMethod wxDirPickerCtrl_methods[]; + extern WXDLLIMPEXP_DATA_WXBIND(int) wxDirPickerCtrl_methodCount; + extern WXDLLIMPEXP_DATA_WXBIND(int) s_wxluatag_wxFilePickerCtrl; + extern WXDLLIMPEXP_WXBIND wxLuaBindMethod wxFilePickerCtrl_methods[]; + extern WXDLLIMPEXP_DATA_WXBIND(int) wxFilePickerCtrl_methodCount; + #endif // (wxLUA_USE_wxDirPickerCtrl && (wxUSE_FILEPICKERCTRL || wxUSE_DIRPICKERCTRL )) && (wxchkver_2_8 && wxLUA_USE_wxPicker) + + #if (wxLUA_USE_wxFontPickerCtrl && wxUSE_FONTPICKERCTRL) && (wxchkver_2_8 && wxLUA_USE_wxPicker) + extern WXDLLIMPEXP_DATA_WXBIND(int) s_wxluatag_wxFontPickerCtrl; + extern WXDLLIMPEXP_WXBIND wxLuaBindMethod wxFontPickerCtrl_methods[]; + extern WXDLLIMPEXP_DATA_WXBIND(int) wxFontPickerCtrl_methodCount; + extern WXDLLIMPEXP_DATA_WXBIND(int) s_wxluatag_wxFontPickerEvent; + extern WXDLLIMPEXP_WXBIND wxLuaBindMethod wxFontPickerEvent_methods[]; + extern WXDLLIMPEXP_DATA_WXBIND(int) wxFontPickerEvent_methodCount; + #endif // (wxLUA_USE_wxFontPickerCtrl && wxUSE_FONTPICKERCTRL) && (wxchkver_2_8 && wxLUA_USE_wxPicker) + #if (wxLUA_USE_wxGenericValidator) && (wxLUA_USE_wxValidator && wxUSE_VALIDATORS) extern WXDLLIMPEXP_DATA_WXBIND(int) s_wxluatag_wxGenericValidator; *************** *** 1407,1416 **** #endif // wxLUA_USE_wxDataObject && wxUSE_DATAOBJ - #if wxLUA_USE_wxDatePickerCtrl && wxUSE_DATEPICKCTRL - extern WXDLLIMPEXP_DATA_WXBIND(int) s_wxluatag_wxDatePickerCtrl; - extern WXDLLIMPEXP_WXBIND wxLuaBindMethod wxDatePickerCtrl_methods[]; - extern WXDLLIMPEXP_DATA_WXBIND(int) wxDatePickerCtrl_methodCount; - #endif // wxLUA_USE_wxDatePickerCtrl && wxUSE_DATEPICKCTRL - #if wxLUA_USE_wxDateSpan && wxUSE_DATETIME extern WXDLLIMPEXP_DATA_WXBIND(int) s_wxluatag_wxDateSpan; --- 1457,1460 ---- *************** *** 2405,2408 **** --- 2449,2458 ---- #endif // wxUSE_WIZARDDLG && wxLUA_USE_wxWizard + #if wxchkver_2_8 && wxLUA_USE_wxPicker + extern WXDLLIMPEXP_DATA_WXBIND(int) s_wxluatag_wxPickerBase; + extern WXDLLIMPEXP_WXBIND wxLuaBindMethod wxPickerBase_methods[]; + extern WXDLLIMPEXP_DATA_WXBIND(int) wxPickerBase_methodCount; + #endif // wxchkver_2_8 && wxLUA_USE_wxPicker + |
|
From: John L. <jr...@us...> - 2007-06-17 18:36:47
|
Update of /cvsroot/wxlua/wxLua/modules/wxbind/setup In directory sc8-pr-cvs9.sourceforge.net:/tmp/cvs-serv12639/wxLua/modules/wxbind/setup Modified Files: wxluasetup.h Log Message: Add picker.i for all of the wxPicker controls Change WXLUA_DECLARE_ENCAPSULATION to prepend wxLua_ to it for clarity. Index: wxluasetup.h =================================================================== RCS file: /cvsroot/wxlua/wxLua/modules/wxbind/setup/wxluasetup.h,v retrieving revision 1.11 retrieving revision 1.12 diff -C2 -d -r1.11 -r1.12 *** wxluasetup.h 7 Dec 2006 06:32:43 -0000 1.11 --- wxluasetup.h 17 Jun 2007 18:36:13 -0000 1.12 *************** *** 28,31 **** --- 28,32 ---- #define wxLUA_USE_wxColourDialog 1 #define wxLUA_USE_wxColourPenBrush 1 + #define wxLUA_USE_wxColourPickerCtrl 1 #define wxLUA_USE_wxComboBox 1 #define wxLUA_USE_wxCommandProcessor 1 *************** *** 43,46 **** --- 44,48 ---- #define wxLUA_USE_wxDir 1 #define wxLUA_USE_wxDirDialog 1 + #define wxLUA_USE_wxDirPickerCtrl 1 #define wxLUA_USE_wxDisplay 1 #define wxLUA_USE_wxDragDrop 1 *************** *** 49,52 **** --- 51,55 ---- #define wxLUA_USE_wxFileHistory 1 #define wxLUA_USE_wxFileName 1 + #define wxLUA_USE_wxFilePickerCtrl 1 #define wxLUA_USE_wxFindReplaceDialog 1 #define wxLUA_USE_wxFont 1 *************** *** 55,58 **** --- 58,62 ---- #define wxLUA_USE_wxFontList 1 #define wxLUA_USE_wxFontMapper 1 + #define wxLUA_USE_wxFontPickerCtrl 1 #define wxLUA_USE_wxFrame 1 #define wxLUA_USE_wxGauge 1 *************** *** 85,88 **** --- 89,93 ---- #define wxLUA_USE_wxNotebook 1 #define wxLUA_USE_wxObject 1 + #define wxLUA_USE_wxPicker 1 #define wxLUA_USE_wxPalette 1 #define wxLUA_USE_wxPenList 1 |
|
From: John L. <jr...@us...> - 2007-06-17 18:36:45
|
Update of /cvsroot/wxlua/wxLua/modules In directory sc8-pr-cvs9.sourceforge.net:/tmp/cvs-serv12639/wxLua/modules Modified Files: Makefile.in Log Message: Add picker.i for all of the wxPicker controls Change WXLUA_DECLARE_ENCAPSULATION to prepend wxLua_ to it for clarity. Index: Makefile.in =================================================================== RCS file: /cvsroot/wxlua/wxLua/modules/Makefile.in,v retrieving revision 1.57 retrieving revision 1.58 diff -C2 -d -r1.57 -r1.58 *** Makefile.in 14 Jun 2007 12:23:04 -0000 1.57 --- Makefile.in 17 Jun 2007 18:36:08 -0000 1.58 *************** *** 179,183 **** wxbind_lib_wxlprint.o \ wxbind_lib_wxlua.o \ ! wxbind_lib_xml.o WXBIND_LIB_ODEP = $(___pch_wxprec_wxbind_lib_wx_wxprec_h_gch___depname) WXBIND_DLL_CXXFLAGS = $(__wxbind_dll_PCH_INC) \ --- 179,184 ---- wxbind_lib_wxlprint.o \ wxbind_lib_wxlua.o \ ! wxbind_lib_xml.o \ ! wxbind_lib_picker.o WXBIND_LIB_ODEP = $(___pch_wxprec_wxbind_lib_wx_wxprec_h_gch___depname) WXBIND_DLL_CXXFLAGS = $(__wxbind_dll_PCH_INC) \ *************** *** 216,220 **** wxbind_dll_wxlprint.o \ wxbind_dll_wxlua.o \ ! wxbind_dll_xml.o WXBIND_DLL_ODEP = $(___pch_wxprec_wxbind_dll_wx_wxprec_h_gch___depname) WXBINDSTC_LIB_CXXFLAGS = $(__wxbindstc_lib_PCH_INC) \ --- 217,222 ---- wxbind_dll_wxlprint.o \ wxbind_dll_wxlua.o \ ! wxbind_dll_xml.o \ ! wxbind_dll_picker.o WXBIND_DLL_ODEP = $(___pch_wxprec_wxbind_dll_wx_wxprec_h_gch___depname) WXBINDSTC_LIB_CXXFLAGS = $(__wxbindstc_lib_PCH_INC) \ *************** *** 1148,1152 **** @COND_INSTALL_CUSTOM_WXBIND_1@wxbindsrc: @COND_INSTALL_CUSTOM_WXBIND_1@ @mkdir -p $(DESTDIR)$(prefix)/src/wxbind ! @COND_INSTALL_CUSTOM_WXBIND_1@ @for f in wxbind/src/appframe.cpp wxbind/src/clipdrag.cpp wxbind/src/config.cpp wxbind/src/controls.cpp wxbind/src/data.cpp wxbind/src/datetime.cpp wxbind/src/defsutil.cpp wxbind/src/dialogs.cpp wxbind/src/dummy.cpp wxbind/src/event.cpp wxbind/src/file.cpp wxbind/src/gdi.cpp wxbind/src/geometry.cpp wxbind/src/grid.cpp wxbind/src/help.cpp wxbind/src/html.cpp wxbind/src/image.cpp wxbind/src/mdi.cpp wxbind/src/menutool.cpp wxbind/src/print.cpp wxbind/src/regex.cpp wxbind/src/sizer.cpp wxbind/src/socket.cpp wxbind/src/thread.cpp wxbind/src/wave.cpp wxbind/src/windows.cpp wxbind/src/wx_bind.cpp wxbind/src/wxlhtmlwin.cpp wxbind/src/wxlprint.cpp wxbind/src/wxlua.cpp wxbind/src/xml.cpp; do \ @COND_INSTALL_CUSTOM_WXBIND_1@ if test ! -f $(DESTDIR)$(prefix)/src/wxbind/$$f -a ! -d $(DESTDIR)$(prefix)/src/wxbind/$$f ; \ @COND_INSTALL_CUSTOM_WXBIND_1@ then x=yep ; \ --- 1150,1154 ---- @COND_INSTALL_CUSTOM_WXBIND_1@wxbindsrc: @COND_INSTALL_CUSTOM_WXBIND_1@ @mkdir -p $(DESTDIR)$(prefix)/src/wxbind ! @COND_INSTALL_CUSTOM_WXBIND_1@ @for f in wxbind/src/appframe.cpp wxbind/src/clipdrag.cpp wxbind/src/config.cpp wxbind/src/controls.cpp wxbind/src/data.cpp wxbind/src/datetime.cpp wxbind/src/defsutil.cpp wxbind/src/dialogs.cpp wxbind/src/dummy.cpp wxbind/src/event.cpp wxbind/src/file.cpp wxbind/src/gdi.cpp wxbind/src/geometry.cpp wxbind/src/grid.cpp wxbind/src/help.cpp wxbind/src/html.cpp wxbind/src/image.cpp wxbind/src/mdi.cpp wxbind/src/menutool.cpp wxbind/src/print.cpp wxbind/src/regex.cpp wxbind/src/sizer.cpp wxbind/src/socket.cpp wxbind/src/thread.cpp wxbind/src/wave.cpp wxbind/src/windows.cpp wxbind/src/wx_bind.cpp wxbind/src/wxlhtmlwin.cpp wxbind/src/wxlprint.cpp wxbind/src/wxlua.cpp wxbind/src/xml.cpp wxbind/src/picker.cpp; do \ @COND_INSTALL_CUSTOM_WXBIND_1@ if test ! -f $(DESTDIR)$(prefix)/src/wxbind/$$f -a ! -d $(DESTDIR)$(prefix)/src/wxbind/$$f ; \ @COND_INSTALL_CUSTOM_WXBIND_1@ then x=yep ; \ *************** *** 1485,1488 **** --- 1487,1493 ---- $(CXXC) -c -o $@ $(WXBIND_LIB_CXXFLAGS) $(srcdir)/wxbind/src/xml.cpp + wxbind_lib_picker.o: $(srcdir)/wxbind/src/picker.cpp $(WXBIND_LIB_ODEP) + $(CXXC) -c -o $@ $(WXBIND_LIB_CXXFLAGS) $(srcdir)/wxbind/src/picker.cpp + wxbind_dll_appframe.o: $(srcdir)/wxbind/src/appframe.cpp $(WXBIND_DLL_ODEP) $(CXXC) -c -o $@ $(WXBIND_DLL_CXXFLAGS) $(srcdir)/wxbind/src/appframe.cpp *************** *** 1578,1581 **** --- 1583,1589 ---- $(CXXC) -c -o $@ $(WXBIND_DLL_CXXFLAGS) $(srcdir)/wxbind/src/xml.cpp + wxbind_dll_picker.o: $(srcdir)/wxbind/src/picker.cpp $(WXBIND_DLL_ODEP) + $(CXXC) -c -o $@ $(WXBIND_DLL_CXXFLAGS) $(srcdir)/wxbind/src/picker.cpp + wxbindstc_lib_dummy.o: $(srcdir)/wxbindstc/src/dummy.cpp $(WXBINDSTC_LIB_ODEP) $(CXXC) -c -o $@ $(WXBINDSTC_LIB_CXXFLAGS) $(srcdir)/wxbindstc/src/dummy.cpp |
|
From: John L. <jr...@us...> - 2007-06-17 18:36:45
|
Update of /cvsroot/wxlua/wxLua/modules/build/msvc6 In directory sc8-pr-cvs9.sourceforge.net:/tmp/cvs-serv12639/wxLua/modules/build/msvc6 Modified Files: modules_mod_wxbind.dsp Log Message: Add picker.i for all of the wxPicker controls Change WXLUA_DECLARE_ENCAPSULATION to prepend wxLua_ to it for clarity. Index: modules_mod_wxbind.dsp =================================================================== RCS file: /cvsroot/wxlua/wxLua/modules/build/msvc6/modules_mod_wxbind.dsp,v retrieving revision 1.3 retrieving revision 1.4 diff -C2 -d -r1.3 -r1.4 *** modules_mod_wxbind.dsp 24 Apr 2007 14:39:55 -0000 1.3 --- modules_mod_wxbind.dsp 17 Jun 2007 18:36:08 -0000 1.4 *************** *** 531,534 **** --- 531,538 ---- # Begin Source File + SOURCE=..\..\wxbind\src\picker.cpp + # End Source File + # Begin Source File + SOURCE=..\..\wxbind\src\print.cpp # End Source File |
|
From: John L. <jr...@us...> - 2007-06-17 18:36:45
|
Update of /cvsroot/wxlua/wxLua/modules/build/msvc8 In directory sc8-pr-cvs9.sourceforge.net:/tmp/cvs-serv12639/wxLua/modules/build/msvc8 Modified Files: modules_mod_wxbind.vcproj Log Message: Add picker.i for all of the wxPicker controls Change WXLUA_DECLARE_ENCAPSULATION to prepend wxLua_ to it for clarity. Index: modules_mod_wxbind.vcproj =================================================================== RCS file: /cvsroot/wxlua/wxLua/modules/build/msvc8/modules_mod_wxbind.vcproj,v retrieving revision 1.3 retrieving revision 1.4 diff -C2 -d -r1.3 -r1.4 *** modules_mod_wxbind.vcproj 24 Apr 2007 14:39:59 -0000 1.3 --- modules_mod_wxbind.vcproj 17 Jun 2007 18:36:09 -0000 1.4 *************** *** 361,364 **** --- 361,365 ---- <File RelativePath="..\..\wxbind\src\mdi.cpp"/> <File RelativePath="..\..\wxbind\src\menutool.cpp"/> + <File RelativePath="..\..\wxbind\src\picker.cpp"/> <File RelativePath="..\..\wxbind\src\print.cpp"/> <File RelativePath="..\..\wxbind\src\regex.cpp"/> |
|
From: John L. <jr...@us...> - 2007-06-17 18:36:45
|
Update of /cvsroot/wxlua/wxLua/docs In directory sc8-pr-cvs9.sourceforge.net:/tmp/cvs-serv12639/wxLua/docs Modified Files: wxluaref.html Log Message: Add picker.i for all of the wxPicker controls Change WXLUA_DECLARE_ENCAPSULATION to prepend wxLua_ to it for clarity. Index: wxluaref.html =================================================================== RCS file: /cvsroot/wxlua/wxLua/docs/wxluaref.html,v retrieving revision 1.25 retrieving revision 1.26 diff -C2 -d -r1.25 -r1.26 *** wxluaref.html 17 Jun 2007 17:17:38 -0000 1.25 --- wxluaref.html 17 Jun 2007 18:36:07 -0000 1.26 *************** *** 409,420 **** <td> <tr> ! <td>wxColourPickerCtrl <td align="center">X - <td> <td> <tr> ! <td>wxColourPickerEvent <td align="center">X - <td> <td> <tr> --- 409,420 ---- <td> <tr> ! <td><a href="#wxColourPickerCtrl">wxColourPickerCtrl</a> ! <td align="center">X <td align="center">X <td> <tr> ! <td><a href="#wxColourPickerEvent">wxColourPickerEvent</a> ! <td align="center">X <td align="center">X <td> <tr> *************** *** 814,820 **** <td> <tr> ! <td>wxDirPickerCtrl <td align="center">X - <td> <td> <tr> --- 814,820 ---- <td> <tr> ! <td><a href="#wxDirPickerCtrl">wxDirPickerCtrl</a> ! <td align="center">X <td align="center">X <td> <tr> *************** *** 984,990 **** <td> <tr> ! <td>wxFileDirPickerEvent <td align="center">X <td> <td> <tr> --- 984,995 ---- <td> <tr> ! <td><a href="#wxFileDirPickerCtrlBase">wxFileDirPickerCtrlBase</a> ! <td> <td align="center">X <td> + <tr> + <td><a href="#wxFileDirPickerEvent">wxFileDirPickerEvent</a> + <td align="center">X + <td align="center">X <td> <tr> *************** *** 1014,1020 **** <td> <tr> ! <td>wxFilePickerCtrl <td align="center">X - <td> <td> <tr> --- 1019,1025 ---- <td> <tr> ! <td><a href="#wxFilePickerCtrl">wxFilePickerCtrl</a> ! <td align="center">X <td align="center">X <td> <tr> *************** *** 1109,1120 **** <td> <tr> ! <td>wxFontPickerCtrl <td align="center">X - <td> <td> <tr> ! <td>wxFontPickerEvent <td align="center">X - <td> <td> <tr> --- 1114,1125 ---- <td> <tr> ! <td><a href="#wxFontPickerCtrl">wxFontPickerCtrl</a> ! <td align="center">X <td align="center">X <td> <tr> ! <td><a href="#wxFontPickerEvent">wxFontPickerEvent</a> ! <td align="center">X <td align="center">X <td> <tr> *************** *** 2134,2140 **** <td> <tr> ! <td>wxPickerBase <td align="center">X - <td> <td> <tr> --- 2139,2145 ---- <td> <tr> ! <td><a href="#wxPickerBase">wxPickerBase</a> ! <td align="center">X <td align="center">X <td> <tr> *************** *** 6944,6981 **** <br> <font color=#009900>// ---------------------------------------------------------------------------</font><br> - <font color=#009900>// <a href="#wxDatePickerCtrl">wxDatePickerCtrl</a></font><br> - <br> - <i>%if</i> wxLUA_USE_wxDatePickerCtrl & wxUSE_DATEPICKCTRL<br> - <br> - <i>%include</i> "wx/datectrl.h"<br> - <br> - <b><font size=+1 color=#0066CC><i>%enum</i></font></b> - <blockquote><font color=#0066CC> - wxDP_SPIN<br> - wxDP_DROPDOWN<br> - wxDP_DEFAULT<br> - wxDP_ALLOWNONE<br> - wxDP_SHOWCENTURY<br> - </font> - </blockquote><font color=#0066CC><i>%endenum</i></font><br> - <br> - <b><font size=+1 color=#DD0000><i>%class</i> <a name="wxDatePickerCtrl">wxDatePickerCtrl</a>, <a href="#wxControl">wxControl</a></font></b> - <blockquote> - <a href="#wxDatePickerCtrl">wxDatePickerCtrl</a>(<a href="#wxWindow">wxWindow</a> *parent, wxWindowID id, const <a href="#wxDateTime">wxDateTime</a>& dt = wxDefaultDateTime, const <a href="#wxPoint">wxPoint</a>& pos = wxDefaultPosition, const <a href="#wxSize">wxSize</a>& size = wxDefaultSize, long style = wxDP_DEFAULT | wxDP_SHOWCENTURY, const <a href="#wxValidator">wxValidator</a>& validator = wxDefaultValidator, const <a href="#wxString">wxString</a>& name = "wxDatePickerCtrl")<br> - bool Create(<a href="#wxWindow">wxWindow</a> *parent, wxWindowID id, const <a href="#wxDateTime">wxDateTime</a>& dt = wxDefaultDateTime, const <a href="#wxPoint">wxPoint</a>& pos = wxDefaultPosition, const <a href="#wxSize">wxSize</a>& size = wxDefaultSize, long style = wxDP_DEFAULT | wxDP_SHOWCENTURY, const <a href="#wxValidator">wxValidator</a>& validator = wxDefaultValidator, const <a href="#wxString">wxString</a>& name = "wxDatePickerCtrl")<br> - <br> - <font color=#BB0055> <font color=#009900>// <i>%override</i> [bool, <a href="#wxDateTime">wxDateTime</a> dt1, <a href="#wxDateTime">wxDateTime</a> dt2] wxDatePickerCtrl::GetRange() const</font></font><br> - <font color=#009900>// C++ Func: bool GetRange(<a href="#wxDateTime">wxDateTime</a> *dt1, <a href="#wxDateTime">wxDateTime</a> *dt2) const</font><br> - bool GetRange() const<br> - <br> - <a href="#wxDateTime">wxDateTime</a> GetValue() const<br> - void SetRange(const <a href="#wxDateTime">wxDateTime</a>& dt1, const <a href="#wxDateTime">wxDateTime</a>& dt2)<br> - void SetValue(const <a href="#wxDateTime">wxDateTime</a>& dt)<br> - </blockquote><font color=#DD0000><font color=#DD0000><i>%endclass</i></font></font><br> - <br> - <i>%endif</i> <font color=#009900>//wxLUA_USE_wxDatePickerCtrl & wxUSE_DATEPICKCTRL</font><br> - <br> - <br> - <font color=#009900>// ---------------------------------------------------------------------------</font><br> <font color=#009900>// <a href="#wxLocale">wxLocale</a></font><br> <br> --- 6949,6952 ---- |
|
From: John L. <jr...@us...> - 2007-06-17 18:36:41
|
Update of /cvsroot/wxlua/wxLua/bindings/wxwidgets In directory sc8-pr-cvs9.sourceforge.net:/tmp/cvs-serv12639/wxLua/bindings/wxwidgets Modified Files: datetime.i override.hpp wx_datatypes.lua wx_rules.lua Added Files: picker.i Log Message: Add picker.i for all of the wxPicker controls Change WXLUA_DECLARE_ENCAPSULATION to prepend wxLua_ to it for clarity. Index: datetime.i =================================================================== RCS file: /cvsroot/wxlua/wxLua/bindings/wxwidgets/datetime.i,v retrieving revision 1.30 retrieving revision 1.31 diff -C2 -d -r1.30 -r1.31 *** datetime.i 17 Jun 2007 17:17:37 -0000 1.30 --- datetime.i 17 Jun 2007 18:36:06 -0000 1.31 *************** *** 496,530 **** // --------------------------------------------------------------------------- - // wxDatePickerCtrl - - %if wxLUA_USE_wxDatePickerCtrl & wxUSE_DATEPICKCTRL - - %include "wx/datectrl.h" - - %enum - wxDP_SPIN - wxDP_DROPDOWN - wxDP_DEFAULT - wxDP_ALLOWNONE - wxDP_SHOWCENTURY - %endenum - - %class wxDatePickerCtrl, wxControl - wxDatePickerCtrl(wxWindow *parent, wxWindowID id, const wxDateTime& dt = wxDefaultDateTime, const wxPoint& pos = wxDefaultPosition, const wxSize& size = wxDefaultSize, long style = wxDP_DEFAULT | wxDP_SHOWCENTURY, const wxValidator& validator = wxDefaultValidator, const wxString& name = "wxDatePickerCtrl") - bool Create(wxWindow *parent, wxWindowID id, const wxDateTime& dt = wxDefaultDateTime, const wxPoint& pos = wxDefaultPosition, const wxSize& size = wxDefaultSize, long style = wxDP_DEFAULT | wxDP_SHOWCENTURY, const wxValidator& validator = wxDefaultValidator, const wxString& name = "wxDatePickerCtrl") - - // %override [bool, wxDateTime dt1, wxDateTime dt2] wxDatePickerCtrl::GetRange() const - // C++ Func: bool GetRange(wxDateTime *dt1, wxDateTime *dt2) const - bool GetRange() const - - wxDateTime GetValue() const - void SetRange(const wxDateTime& dt1, const wxDateTime& dt2) - void SetValue(const wxDateTime& dt) - %endclass - - %endif //wxLUA_USE_wxDatePickerCtrl & wxUSE_DATEPICKCTRL - - - // --------------------------------------------------------------------------- // wxLocale --- 496,499 ---- Index: wx_datatypes.lua =================================================================== RCS file: /cvsroot/wxlua/wxLua/bindings/wxwidgets/wx_datatypes.lua,v retrieving revision 1.68 retrieving revision 1.69 diff -C2 -d -r1.68 -r1.69 *** wx_datatypes.lua 14 Jun 2007 23:59:41 -0000 1.68 --- wx_datatypes.lua 17 Jun 2007 18:36:06 -0000 1.69 *************** *** 596,599 **** --- 596,613 ---- Name = "wxColourDialog", }, + wxColourPickerCtrl = { + BaseClass = "wxPickerBase", + Condition = "(wxLUA_USE_wxColourPickerCtrl && wxUSE_COLOURPICKERCTRL) && (wxchkver_2_8 && wxLUA_USE_wxPicker)", + DefType = "class", + IsNumber = false, + Name = "wxColourPickerCtrl", + }, + wxColourPickerEvent = { + BaseClass = "wxCommandEvent", + Condition = "(wxLUA_USE_wxColourPickerCtrl && wxUSE_COLOURPICKERCTRL) && (wxchkver_2_8 && wxLUA_USE_wxPicker)", + DefType = "class", + IsNumber = false, + Name = "wxColourPickerEvent", + }, wxComboBox = { BaseClass = "wxControlWithItems", *************** *** 778,782 **** wxDatePickerCtrl = { BaseClass = "wxControl", ! Condition = "wxLUA_USE_wxDatePickerCtrl && wxUSE_DATEPICKCTRL", DefType = "class", IsNumber = false, --- 792,796 ---- wxDatePickerCtrl = { BaseClass = "wxControl", ! Condition = "(wxLUA_USE_wxDatePickerCtrl && wxUSE_DATEPICKCTRL) && (wxchkver_2_8 && wxLUA_USE_wxPicker)", DefType = "class", IsNumber = false, *************** *** 870,873 **** --- 884,894 ---- Name = "wxDirDialog", }, + wxDirPickerCtrl = { + BaseClass = "wxFileDirPickerCtrlBase", + Condition = "(wxLUA_USE_wxDirPickerCtrl && (wxUSE_FILEPICKERCTRL || wxUSE_DIRPICKERCTRL )) && (wxchkver_2_8 && wxLUA_USE_wxPicker)", + DefType = "class", + IsNumber = false, + Name = "wxDirPickerCtrl", + }, wxDirection = { DefType = "enum", *************** *** 1062,1065 **** --- 1083,1100 ---- Name = "wxFileDialog", }, + wxFileDirPickerCtrlBase = { + BaseClass = "wxPickerBase", + Condition = "((wxLUA_USE_wxDirPickerCtrl || wxLUA_USE_wxFilePickerCtrl ) && (wxUSE_FILEPICKERCTRL || wxUSE_DIRPICKERCTRL )) && (wxchkver_2_8 && wxLUA_USE_wxPicker)", + DefType = "class", + IsNumber = false, + Name = "wxFileDirPickerCtrlBase", + }, + wxFileDirPickerEvent = { + BaseClass = "wxCommandEvent", + Condition = "((wxLUA_USE_wxDirPickerCtrl || wxLUA_USE_wxFilePickerCtrl ) && (wxUSE_FILEPICKERCTRL || wxUSE_DIRPICKERCTRL )) && (wxchkver_2_8 && wxLUA_USE_wxPicker)", + DefType = "class", + IsNumber = false, + Name = "wxFileDirPickerEvent", + }, wxFileHistory = { BaseClass = "wxObject", *************** *** 1101,1104 **** --- 1136,1146 ---- Name = "wxFileOutputStream", }, + wxFilePickerCtrl = { + BaseClass = "wxFileDirPickerCtrlBase", + Condition = "(wxLUA_USE_wxDirPickerCtrl && (wxUSE_FILEPICKERCTRL || wxUSE_DIRPICKERCTRL )) && (wxchkver_2_8 && wxLUA_USE_wxPicker)", + DefType = "class", + IsNumber = false, + Name = "wxFilePickerCtrl", + }, wxFindDialogEvent = { BaseClass = "wxCommandEvent", *************** *** 1214,1217 **** --- 1256,1273 ---- Name = "wxFontMapper", }, + wxFontPickerCtrl = { + BaseClass = "wxPickerBase", + Condition = "(wxLUA_USE_wxFontPickerCtrl && wxUSE_FONTPICKERCTRL) && (wxchkver_2_8 && wxLUA_USE_wxPicker)", + DefType = "class", + IsNumber = false, + Name = "wxFontPickerCtrl", + }, + wxFontPickerEvent = { + BaseClass = "wxCommandEvent", + Condition = "(wxLUA_USE_wxFontPickerCtrl && wxUSE_FONTPICKERCTRL) && (wxchkver_2_8 && wxLUA_USE_wxPicker)", + DefType = "class", + IsNumber = false, + Name = "wxFontPickerEvent", + }, wxFontStyle = { Condition = "wxLUA_USE_wxFont", *************** *** 2493,2496 **** --- 2549,2559 ---- Name = "wxPenList", }, + wxPickerBase = { + BaseClass = "wxControl", + Condition = "wxchkver_2_8 && wxLUA_USE_wxPicker", + DefType = "class", + IsNumber = false, + Name = "wxPickerBase", + }, wxPoint = { Condition = "wxLUA_USE_wxPointSizeRect", *************** *** 3737,3740 **** --- 3800,3804 ---- wxLUA_USE_wxColourDialog = "wxLUA_USE_wxColourDialog", wxLUA_USE_wxColourPenBrush = "wxLUA_USE_wxColourPenBrush", + wxLUA_USE_wxColourPickerCtrl = "wxLUA_USE_wxColourPickerCtrl", wxLUA_USE_wxComboBox = "wxLUA_USE_wxComboBox", wxLUA_USE_wxCommandProcessor = "wxLUA_USE_wxCommandProcessor", *************** *** 3752,3755 **** --- 3816,3820 ---- wxLUA_USE_wxDir = "wxLUA_USE_wxDir", wxLUA_USE_wxDirDialog = "wxLUA_USE_wxDirDialog", + wxLUA_USE_wxDirPickerCtrl = "wxLUA_USE_wxDirPickerCtrl", wxLUA_USE_wxDisplay = "wxLUA_USE_wxDisplay", wxLUA_USE_wxDragDrop = "wxLUA_USE_wxDragDrop", *************** *** 3758,3761 **** --- 3823,3827 ---- wxLUA_USE_wxFileHistory = "wxLUA_USE_wxFileHistory", wxLUA_USE_wxFileName = "wxLUA_USE_wxFileName", + wxLUA_USE_wxFilePickerCtrl = "wxLUA_USE_wxFilePickerCtrl", wxLUA_USE_wxFindReplaceDialog = "wxLUA_USE_wxFindReplaceDialog", wxLUA_USE_wxFont = "wxLUA_USE_wxFont", *************** *** 3764,3767 **** --- 3830,3834 ---- wxLUA_USE_wxFontList = "wxLUA_USE_wxFontList", wxLUA_USE_wxFontMapper = "wxLUA_USE_wxFontMapper", + wxLUA_USE_wxFontPickerCtrl = "wxLUA_USE_wxFontPickerCtrl", wxLUA_USE_wxFrame = "wxLUA_USE_wxFrame", wxLUA_USE_wxGLCanvas = "wxLUA_USE_wxGLCanvas", *************** *** 3796,3799 **** --- 3863,3867 ---- wxLUA_USE_wxPalette = "wxLUA_USE_wxPalette", wxLUA_USE_wxPenList = "wxLUA_USE_wxPenList", + wxLUA_USE_wxPicker = "wxLUA_USE_wxPicker", wxLUA_USE_wxPointSizeRect = "wxLUA_USE_wxPointSizeRect", wxLUA_USE_wxPrint = "wxLUA_USE_wxPrint", *************** *** 3859,3862 **** --- 3927,3931 ---- wxUSE_CMDLINE_PARSER = "wxUSE_CMDLINE_PARSER", wxUSE_COLOURDLG = "wxUSE_COLOURDLG", + wxUSE_COLOURPICKERCTRL = "wxUSE_COLOURPICKERCTRL", wxUSE_COMBOBOX = "wxUSE_COMBOBOX", wxUSE_CONFIG = "wxUSE_CONFIG", *************** *** 3870,3873 **** --- 3939,3943 ---- wxUSE_DIALUP_MANAGER = "wxUSE_DIALUP_MANAGER", wxUSE_DIRDLG = "wxUSE_DIRDLG", + wxUSE_DIRPICKERCTRL = "wxUSE_DIRPICKERCTRL", wxUSE_DISPLAY = "wxUSE_DISPLAY", wxUSE_DOC_VIEW_ARCHITECTURE = "wxUSE_DOC_VIEW_ARCHITECTURE", *************** *** 3883,3890 **** --- 3953,3962 ---- wxUSE_FILE = "wxUSE_FILE", wxUSE_FILEDLG = "wxUSE_FILEDLG", + wxUSE_FILEPICKERCTRL = "wxUSE_FILEPICKERCTRL", wxUSE_FILESYSTEM = "wxUSE_FILESYSTEM", wxUSE_FINDREPLDLG = "wxUSE_FINDREPLDLG", wxUSE_FONTDLG = "wxUSE_FONTDLG", wxUSE_FONTMAP = "wxUSE_FONTMAP", + wxUSE_FONTPICKERCTRL = "wxUSE_FONTPICKERCTRL", wxUSE_FREETYPE = "wxUSE_FREETYPE", wxUSE_FSVOLUME = "wxUSE_FSVOLUME", Index: wx_rules.lua =================================================================== RCS file: /cvsroot/wxlua/wxLua/bindings/wxwidgets/wx_rules.lua,v retrieving revision 1.29 retrieving revision 1.30 diff -C2 -d -r1.29 -r1.30 *** wx_rules.lua 14 Jun 2007 23:59:41 -0000 1.29 --- wx_rules.lua 17 Jun 2007 18:36:06 -0000 1.30 *************** *** 180,183 **** --- 180,184 ---- "mdi.i", "menutool.i", + "picker.i", "print.i", "regex.i", Index: override.hpp =================================================================== RCS file: /cvsroot/wxlua/wxLua/bindings/wxwidgets/override.hpp,v retrieving revision 1.76 retrieving revision 1.77 diff -C2 -d -r1.76 -r1.77 *** override.hpp 14 Jun 2007 23:59:41 -0000 1.76 --- override.hpp 17 Jun 2007 18:36:06 -0000 1.77 *************** *** 752,756 **** returns = new wxTreeItemId(self->GetFirstChild(*item, cookie)); // add the new object to the tracked memory list ! wxlState.AddTrackedObject((long)returns, new wxObject_wxTreeItemId(returns)); // push the result datatype wxlState.PushUserDataType(s_wxluatag_wxTreeItemId, returns); --- 752,756 ---- returns = new wxTreeItemId(self->GetFirstChild(*item, cookie)); // add the new object to the tracked memory list ! wxlState.AddTrackedObject((long)returns, new wxLua_wxObject_wxTreeItemId(returns)); // push the result datatype wxlState.PushUserDataType(s_wxluatag_wxTreeItemId, returns); *************** *** 787,791 **** returns = new wxTreeItemId(self->GetNextChild(*item, cookie)); // add the new object to the tracked memory list ! wxlState.AddTrackedObject((long)returns, new wxObject_wxTreeItemId(returns)); // push the result datatype wxlState.PushUserDataType(s_wxluatag_wxTreeItemId, returns); --- 787,791 ---- returns = new wxTreeItemId(self->GetNextChild(*item, cookie)); // add the new object to the tracked memory list ! wxlState.AddTrackedObject((long)returns, new wxLua_wxObject_wxTreeItemId(returns)); // push the result datatype wxlState.PushUserDataType(s_wxluatag_wxTreeItemId, returns); *************** *** 818,822 **** { wxTreeItemId* treeId = new wxTreeItemId(selection[idx]); ! wxlState.AddTrackedObject((long)treeId, new wxObject_wxTreeItemId(treeId)); wxlState.PushUserDataType(s_wxluatag_wxTreeItemId, treeId); lua_rawseti(L, -2, idx + 1); --- 818,822 ---- { wxTreeItemId* treeId = new wxTreeItemId(selection[idx]); ! wxlState.AddTrackedObject((long)treeId, new wxLua_wxObject_wxTreeItemId(treeId)); wxlState.PushUserDataType(s_wxluatag_wxTreeItemId, treeId); lua_rawseti(L, -2, idx + 1); *************** *** 843,847 **** returns = new wxTreeItemId(self->HitTest(*point, flags)); // add the new object to the tracked memory list ! wxlState.AddTrackedObject((long)returns, new wxObject_wxTreeItemId(returns)); // push the result datatype --- 843,847 ---- returns = new wxTreeItemId(self->HitTest(*point, flags)); // add the new object to the tracked memory list ! wxlState.AddTrackedObject((long)returns, new wxLua_wxObject_wxTreeItemId(returns)); // push the result datatype *************** *** 871,875 **** returns = new wxString(str); // add to tracked memory list ! wxlState.AddTrackedObject((long)returns, new wxObject_wxString(returns)); // push the constructed class pointer wxlState.PushUserDataType(s_wxluatag_wxString, returns); --- 871,875 ---- returns = new wxString(str); // add to tracked memory list ! wxlState.AddTrackedObject((long)returns, new wxLua_wxObject_wxString(returns)); // push the constructed class pointer wxlState.PushUserDataType(s_wxluatag_wxString, returns); *************** *** 1302,1306 **** returns = new wxBusyCursor(cursor); // add to tracked memory list ! wxlState.AddTrackedObject((long)returns, new wxObject_wxBusyCursor((wxBusyCursor *)returns)); // push the constructed class pointer wxlState.PushUserDataType(s_wxluatag_wxBusyCursor, returns); --- 1302,1306 ---- returns = new wxBusyCursor(cursor); // add to tracked memory list ! wxlState.AddTrackedObject((long)returns, new wxLua_wxObject_wxBusyCursor((wxBusyCursor *)returns)); // push the constructed class pointer wxlState.PushUserDataType(s_wxluatag_wxBusyCursor, returns); *************** *** 1819,1825 **** returns = self->GetTimes(dtAccess, dtMod, dtCreate); // add to tracked memory list ! wxlState.AddTrackedObject((long)dtAccess, new wxObject_wxDateTime(dtAccess)); ! wxlState.AddTrackedObject((long)dtMod, new wxObject_wxDateTime(dtMod)); ! wxlState.AddTrackedObject((long)dtCreate, new wxObject_wxDateTime(dtCreate)); // push the constructed class pointers wxlState.PushUserDataType(s_wxluatag_wxDateTime, dtAccess); --- 1819,1825 ---- returns = self->GetTimes(dtAccess, dtMod, dtCreate); // add to tracked memory list ! wxlState.AddTrackedObject((long)dtAccess, new wxLua_wxObject_wxDateTime(dtAccess)); ! wxlState.AddTrackedObject((long)dtMod, new wxLua_wxObject_wxDateTime(dtMod)); ! wxlState.AddTrackedObject((long)dtCreate, new wxLua_wxObject_wxDateTime(dtCreate)); // push the constructed class pointers wxlState.PushUserDataType(s_wxluatag_wxDateTime, dtAccess); --- NEW FILE: picker.i --- // =========================================================================== // Purpose: wxPickerXXX controls // Author: John Labenski // Created: 14/11/2001 // Copyright: (c) 2007 John Labenski // Licence: wxWidgets licence // wxWidgets: Updated to 2.6.3 // =========================================================================== %if wxchkver_2_8 && wxLUA_USE_wxPicker // --------------------------------------------------------------------------- // wxPickerBase %include "wx/pickerbase.h" %define wxPB_USE_TEXTCTRL %class wxPickerBase, wxControl // No construcor - this is a base class // margin between the text control and the picker void SetInternalMargin(int newmargin) int GetInternalMargin() const // proportion of the text control void SetTextCtrlProportion(int prop) int GetTextCtrlProportion() const // proportion of the picker control void SetPickerCtrlProportion(int prop) int GetPickerCtrlProportion() const bool IsTextCtrlGrowable() const void SetTextCtrlGrowable(bool grow = true) bool IsPickerCtrlGrowable() const void SetPickerCtrlGrowable(bool grow = true) bool HasTextCtrl() const wxTextCtrl *GetTextCtrl() wxControl *GetPickerCtrl() // methods that derived class must/may override virtual void UpdatePickerFromTextCtrl() virtual void UpdateTextCtrlFromPicker() %endclass // --------------------------------------------------------------------------- // wxColourPickerCtrl %if wxLUA_USE_wxColourPickerCtrl & wxUSE_COLOURPICKERCTRL %include "wx/clrpicker.h" %define wxCLRP_SHOW_LABEL %define wxCLRP_USE_TEXTCTRL %define wxCLRP_DEFAULT_STYLE %class wxColourPickerCtrl, wxPickerBase wxColourPickerCtrl() // Note default color is *wxBLACK wxColourPickerCtrl(wxWindow *parent, wxWindowID id, const wxColour& col, const wxPoint& pos = wxDefaultPosition, const wxSize& size = wxDefaultSize, long style = wxCLRP_DEFAULT_STYLE, const wxValidator& validator = wxDefaultValidator, const wxString& name = "wxColourPickerCtrl") //bool Create(wxWindow *parent, wxWindowID id, const wxColour& col = *wxBLACK, const wxPoint& pos = wxDefaultPosition, const wxSize& size = wxDefaultSize, long style = wxCLRP_DEFAULT_STYLE, const wxValidator& validator = wxDefaultValidator, const wxString& name = "wxColourPickerCtrl") // get the colour chosen wxColour GetColour() const // set currently displayed color void SetColour(const wxColour& col) // set colour using RGB(r,g,b) syntax or considering given text as a colour name; // returns true if the given text was successfully recognized. bool SetColour(const wxString& text) %endclass // --------------------------------------------------------------------------- // wxColourPickerEvent %class %delete wxColourPickerEvent, wxCommandEvent %define_event wxEVT_COMMAND_COLOURPICKER_CHANGED // EVT_COLOURPICKER_CHANGED(id, func) wxColourPickerEvent() wxColourPickerEvent(wxObject *generator, int id, const wxColour &col) wxColour GetColour() const void SetColour(const wxColour &c) %endclass %endif //wxLUA_USE_wxColourPickerCtrl & wxUSE_COLOURPICKERCTRL // --------------------------------------------------------------------------- // wxDatePickerCtrl %if wxLUA_USE_wxDatePickerCtrl & wxUSE_DATEPICKCTRL %include "wx/datectrl.h" %enum wxDP_SPIN wxDP_DROPDOWN wxDP_DEFAULT wxDP_ALLOWNONE wxDP_SHOWCENTURY %endenum %class wxDatePickerCtrl, wxControl //wxDatePickerCtrl() wxDatePickerCtrl(wxWindow *parent, wxWindowID id, const wxDateTime& dt = wxDefaultDateTime, const wxPoint& pos = wxDefaultPosition, const wxSize& size = wxDefaultSize, long style = wxDP_DEFAULT | wxDP_SHOWCENTURY, const wxValidator& validator = wxDefaultValidator, const wxString& name = "wxDatePickerCtrl") //bool Create(wxWindow *parent, wxWindowID id, const wxDateTime& dt = wxDefaultDateTime, const wxPoint& pos = wxDefaultPosition, const wxSize& size = wxDefaultSize, long style = wxDP_DEFAULT | wxDP_SHOWCENTURY, const wxValidator& validator = wxDefaultValidator, const wxString& name = "wxDatePickerCtrl") // %override [bool, wxDateTime dt1, wxDateTime dt2] wxDatePickerCtrl::GetRange() const // C++ Func: bool GetRange(wxDateTime *dt1, wxDateTime *dt2) const bool GetRange() const wxDateTime GetValue() const void SetRange(const wxDateTime& dt1, const wxDateTime& dt2) void SetValue(const wxDateTime& dt) %endclass %endif //wxLUA_USE_wxDatePickerCtrl & wxUSE_DATEPICKCTRL // --------------------------------------------------------------------------- // wxFileDirPickerCtrlBase %if (wxLUA_USE_wxDirPickerCtrl || wxLUA_USE_wxFilePickerCtrl) && (wxUSE_FILEPICKERCTRL || wxUSE_DIRPICKERCTRL) %class wxFileDirPickerCtrlBase, wxPickerBase // No constructor - this is a base class wxString GetPath() const void SetPath(const wxString &str) // return true if the given path is valid for this control bool CheckPath(const wxString& path) const // return the text control value in canonical form wxString GetTextCtrlValue() const %endclass // --------------------------------------------------------------------------- // wxFileDirPickerEvent %class %delete wxFileDirPickerEvent, wxCommandEvent %define_event wxEVT_COMMAND_FILEPICKER_CHANGED // EVT_FILEPICKER_CHANGED(id, fn) %define_event wxEVT_COMMAND_DIRPICKER_CHANGED // EVT_DIRPICKER_CHANGED(id, fn) //wxFileDirPickerEvent() wxFileDirPickerEvent(wxEventType type, wxObject *generator, int id, const wxString &path) wxString GetPath() const void SetPath(const wxString &p) %endclass %endif // (wxLUA_USE_wxDirPickerCtrl || wxLUA_USE_wxFilePickerCtrl) && (wxUSE_FILEPICKERCTRL || wxUSE_DIRPICKERCTRL) // --------------------------------------------------------------------------- // wxDirPickerCtrl %if wxLUA_USE_wxDirPickerCtrl && (wxUSE_FILEPICKERCTRL || wxUSE_DIRPICKERCTRL) %define wxDIRP_DIR_MUST_EXIST %define wxDIRP_CHANGE_DIR %define wxDIRP_DEFAULT_STYLE %define wxDIRP_USE_TEXTCTRL %class wxDirPickerCtrl, wxFileDirPickerCtrlBase //wxDirPickerCtrl() {} wxDirPickerCtrl(wxWindow *parent, wxWindowID id, const wxString& path = "", const wxString& message = wxDirSelectorPromptStr, const wxPoint& pos = wxDefaultPosition, const wxSize& size = wxDefaultSize, long style = wxDIRP_DEFAULT_STYLE, const wxValidator& validator = wxDefaultValidator, const wxString& name = "wxDirPickerCtrl") //bool Create(wxWindow *parent, wxWindowID id, const wxString& path = "", const wxString& message = wxDirSelectorPromptStr, const wxPoint& pos = wxDefaultPosition, const wxSize& size = wxDefaultSize, long style = wxDIRP_DEFAULT_STYLE, const wxValidator& validator = wxDefaultValidator, const wxString& name = "wxDirPickerCtrl") %endclass %endif wxLUA_USE_wxDirPickerCtrl && (wxUSE_FILEPICKERCTRL || wxUSE_DIRPICKERCTRL) // --------------------------------------------------------------------------- // wxFilePickerCtrl %if wxLUA_USE_wxDirPickerCtrl && (wxUSE_FILEPICKERCTRL || wxUSE_DIRPICKERCTRL) %define wxFLP_OPEN %define wxFLP_SAVE %define wxFLP_OVERWRITE_PROMPT %define wxFLP_FILE_MUST_EXIST %define wxFLP_CHANGE_DIR %define wxFLP_DEFAULT_STYLE %define wxFLP_USE_TEXTCTRL %class wxFilePickerCtrl, wxFileDirPickerCtrlBase //wxFilePickerCtrl() wxFilePickerCtrl(wxWindow *parent, wxWindowID id, const wxString& path = "", const wxString& message = wxFileSelectorPromptStr, const wxString& wildcard = wxFileSelectorDefaultWildcardStr, const wxPoint& pos = wxDefaultPosition, const wxSize& size = wxDefaultSize, long style = wxFLP_DEFAULT_STYLE, const wxValidator& validator = wxDefaultValidator, const wxString& name = "wxFilePickerCtrl") //bool Create(wxWindow *parent, wxWindowID id, const wxString& path = "", const wxString& message = wxFileSelectorPromptStr, const wxString& wildcard = wxFileSelectorDefaultWildcardStr, const wxPoint& pos = wxDefaultPosition, const wxSize& size = wxDefaultSize, long style = wxFLP_DEFAULT_STYLE, const wxValidator& validator = wxDefaultValidator, const wxString& name = "wxFilePickerCtrl") %endclass %endif // wxLUA_USE_wxDirPickerCtrl && (wxUSE_FILEPICKERCTRL || wxUSE_DIRPICKERCTRL) // --------------------------------------------------------------------------- // wxFontPickerCtrl %if wxLUA_USE_wxFontPickerCtrl && wxUSE_FONTPICKERCTRL %define wxFNTP_FONTDESC_AS_LABEL %define wxFNTP_USE_TEXTCTRL %define wxFNTP_DEFAULT_STYLE %define wxFNTP_MAXPOINT_SIZE %class wxFontPickerCtrl, wxPickerBase //wxFontPickerCtrl() wxFontPickerCtrl(wxWindow *parent, wxWindowID id, const wxFont& initial = wxNullFont, const wxPoint& pos = wxDefaultPosition, const wxSize& size = wxDefaultSize, long style = wxFNTP_DEFAULT_STYLE, const wxValidator& validator = wxDefaultValidator, const wxString& name = "wxFontPickerCtrl") //bool Create(wxWindow *parent, wxWindowID id, const wxFont& initial = wxNullFont, const wxPoint& pos = wxDefaultPosition, const wxSize& size = wxDefaultSize, long style = wxFNTP_DEFAULT_STYLE, const wxValidator& validator = wxDefaultValidator, const wxString& name = "wxFontPickerCtrl") wxFont GetSelectedFont() const virtual void SetSelectedFont(const wxFont &f) void SetMaxPointSize(unsigned int max) unsigned int GetMaxPointSize() const %endclass // --------------------------------------------------------------------------- // wxFontPickerEvent %class %delete wxFontPickerEvent, wxCommandEvent %define_event wxEVT_COMMAND_FONTPICKER_CHANGED // EVT_FONTPICKER_CHANGED(id, fn) //wxFontPickerEvent() wxFontPickerEvent(wxObject *generator, int id, const wxFont &f) wxFont GetFont() const void SetFont(const wxFont &c) %endclass %endif // wxLUA_USE_wxFontPickerCtrl && wxUSE_FONTPICKERCTRL %endif // wxchkver_2_8 && wxLUA_USE_wxPicker |
|
From: John L. <jr...@us...> - 2007-06-17 18:36:39
|
Update of /cvsroot/wxlua/wxLua/bindings/wxstc In directory sc8-pr-cvs9.sourceforge.net:/tmp/cvs-serv12639/wxLua/bindings/wxstc Modified Files: wxstc_datatypes.lua Log Message: Add picker.i for all of the wxPicker controls Change WXLUA_DECLARE_ENCAPSULATION to prepend wxLua_ to it for clarity. Index: wxstc_datatypes.lua =================================================================== RCS file: /cvsroot/wxlua/wxLua/bindings/wxstc/wxstc_datatypes.lua,v retrieving revision 1.58 retrieving revision 1.59 diff -C2 -d -r1.58 -r1.59 *** wxstc_datatypes.lua 14 Jun 2007 23:59:41 -0000 1.58 --- wxstc_datatypes.lua 17 Jun 2007 18:36:06 -0000 1.59 *************** *** 596,599 **** --- 596,613 ---- Name = "wxColourDialog", }, + wxColourPickerCtrl = { + BaseClass = "wxPickerBase", + Condition = "(wxLUA_USE_wxColourPickerCtrl && wxUSE_COLOURPICKERCTRL) && (wxchkver_2_8 && wxLUA_USE_wxPicker)", + DefType = "class", + IsNumber = false, + Name = "wxColourPickerCtrl", + }, + wxColourPickerEvent = { + BaseClass = "wxCommandEvent", + Condition = "(wxLUA_USE_wxColourPickerCtrl && wxUSE_COLOURPICKERCTRL) && (wxchkver_2_8 && wxLUA_USE_wxPicker)", + DefType = "class", + IsNumber = false, + Name = "wxColourPickerEvent", + }, wxComboBox = { BaseClass = "wxControlWithItems", *************** *** 778,782 **** wxDatePickerCtrl = { BaseClass = "wxControl", ! Condition = "wxLUA_USE_wxDatePickerCtrl && wxUSE_DATEPICKCTRL", DefType = "class", IsNumber = false, --- 792,796 ---- wxDatePickerCtrl = { BaseClass = "wxControl", ! Condition = "(wxLUA_USE_wxDatePickerCtrl && wxUSE_DATEPICKCTRL) && (wxchkver_2_8 && wxLUA_USE_wxPicker)", DefType = "class", IsNumber = false, *************** *** 870,873 **** --- 884,894 ---- Name = "wxDirDialog", }, + wxDirPickerCtrl = { + BaseClass = "wxFileDirPickerCtrlBase", + Condition = "(wxLUA_USE_wxDirPickerCtrl && (wxUSE_FILEPICKERCTRL || wxUSE_DIRPICKERCTRL )) && (wxchkver_2_8 && wxLUA_USE_wxPicker)", + DefType = "class", + IsNumber = false, + Name = "wxDirPickerCtrl", + }, wxDirection = { DefType = "enum", *************** *** 1062,1065 **** --- 1083,1100 ---- Name = "wxFileDialog", }, + wxFileDirPickerCtrlBase = { + BaseClass = "wxPickerBase", + Condition = "((wxLUA_USE_wxDirPickerCtrl || wxLUA_USE_wxFilePickerCtrl ) && (wxUSE_FILEPICKERCTRL || wxUSE_DIRPICKERCTRL )) && (wxchkver_2_8 && wxLUA_USE_wxPicker)", + DefType = "class", + IsNumber = false, + Name = "wxFileDirPickerCtrlBase", + }, + wxFileDirPickerEvent = { + BaseClass = "wxCommandEvent", + Condition = "((wxLUA_USE_wxDirPickerCtrl || wxLUA_USE_wxFilePickerCtrl ) && (wxUSE_FILEPICKERCTRL || wxUSE_DIRPICKERCTRL )) && (wxchkver_2_8 && wxLUA_USE_wxPicker)", + DefType = "class", + IsNumber = false, + Name = "wxFileDirPickerEvent", + }, wxFileHistory = { BaseClass = "wxObject", *************** *** 1101,1104 **** --- 1136,1146 ---- Name = "wxFileOutputStream", }, + wxFilePickerCtrl = { + BaseClass = "wxFileDirPickerCtrlBase", + Condition = "(wxLUA_USE_wxDirPickerCtrl && (wxUSE_FILEPICKERCTRL || wxUSE_DIRPICKERCTRL )) && (wxchkver_2_8 && wxLUA_USE_wxPicker)", + DefType = "class", + IsNumber = false, + Name = "wxFilePickerCtrl", + }, wxFindDialogEvent = { BaseClass = "wxCommandEvent", *************** *** 1214,1217 **** --- 1256,1273 ---- Name = "wxFontMapper", }, + wxFontPickerCtrl = { + BaseClass = "wxPickerBase", + Condition = "(wxLUA_USE_wxFontPickerCtrl && wxUSE_FONTPICKERCTRL) && (wxchkver_2_8 && wxLUA_USE_wxPicker)", + DefType = "class", + IsNumber = false, + Name = "wxFontPickerCtrl", + }, + wxFontPickerEvent = { + BaseClass = "wxCommandEvent", + Condition = "(wxLUA_USE_wxFontPickerCtrl && wxUSE_FONTPICKERCTRL) && (wxchkver_2_8 && wxLUA_USE_wxPicker)", + DefType = "class", + IsNumber = false, + Name = "wxFontPickerEvent", + }, wxFontStyle = { Condition = "wxLUA_USE_wxFont", *************** *** 2493,2496 **** --- 2549,2559 ---- Name = "wxPenList", }, + wxPickerBase = { + BaseClass = "wxControl", + Condition = "wxchkver_2_8 && wxLUA_USE_wxPicker", + DefType = "class", + IsNumber = false, + Name = "wxPickerBase", + }, wxPoint = { Condition = "wxLUA_USE_wxPointSizeRect", *************** *** 3749,3752 **** --- 3812,3816 ---- wxLUA_USE_wxColourDialog = "wxLUA_USE_wxColourDialog", wxLUA_USE_wxColourPenBrush = "wxLUA_USE_wxColourPenBrush", + wxLUA_USE_wxColourPickerCtrl = "wxLUA_USE_wxColourPickerCtrl", wxLUA_USE_wxComboBox = "wxLUA_USE_wxComboBox", wxLUA_USE_wxCommandProcessor = "wxLUA_USE_wxCommandProcessor", *************** *** 3764,3767 **** --- 3828,3832 ---- wxLUA_USE_wxDir = "wxLUA_USE_wxDir", wxLUA_USE_wxDirDialog = "wxLUA_USE_wxDirDialog", + wxLUA_USE_wxDirPickerCtrl = "wxLUA_USE_wxDirPickerCtrl", wxLUA_USE_wxDisplay = "wxLUA_USE_wxDisplay", wxLUA_USE_wxDragDrop = "wxLUA_USE_wxDragDrop", *************** *** 3770,3773 **** --- 3835,3839 ---- wxLUA_USE_wxFileHistory = "wxLUA_USE_wxFileHistory", wxLUA_USE_wxFileName = "wxLUA_USE_wxFileName", + wxLUA_USE_wxFilePickerCtrl = "wxLUA_USE_wxFilePickerCtrl", wxLUA_USE_wxFindReplaceDialog = "wxLUA_USE_wxFindReplaceDialog", wxLUA_USE_wxFont = "wxLUA_USE_wxFont", *************** *** 3776,3779 **** --- 3842,3846 ---- wxLUA_USE_wxFontList = "wxLUA_USE_wxFontList", wxLUA_USE_wxFontMapper = "wxLUA_USE_wxFontMapper", + wxLUA_USE_wxFontPickerCtrl = "wxLUA_USE_wxFontPickerCtrl", wxLUA_USE_wxFrame = "wxLUA_USE_wxFrame", wxLUA_USE_wxGLCanvas = "wxLUA_USE_wxGLCanvas", *************** *** 3808,3811 **** --- 3875,3879 ---- wxLUA_USE_wxPalette = "wxLUA_USE_wxPalette", wxLUA_USE_wxPenList = "wxLUA_USE_wxPenList", + wxLUA_USE_wxPicker = "wxLUA_USE_wxPicker", wxLUA_USE_wxPointSizeRect = "wxLUA_USE_wxPointSizeRect", wxLUA_USE_wxPrint = "wxLUA_USE_wxPrint", *************** *** 3871,3874 **** --- 3939,3943 ---- wxUSE_CMDLINE_PARSER = "wxUSE_CMDLINE_PARSER", wxUSE_COLOURDLG = "wxUSE_COLOURDLG", + wxUSE_COLOURPICKERCTRL = "wxUSE_COLOURPICKERCTRL", wxUSE_COMBOBOX = "wxUSE_COMBOBOX", wxUSE_CONFIG = "wxUSE_CONFIG", *************** *** 3882,3885 **** --- 3951,3955 ---- wxUSE_DIALUP_MANAGER = "wxUSE_DIALUP_MANAGER", wxUSE_DIRDLG = "wxUSE_DIRDLG", + wxUSE_DIRPICKERCTRL = "wxUSE_DIRPICKERCTRL", wxUSE_DISPLAY = "wxUSE_DISPLAY", wxUSE_DOC_VIEW_ARCHITECTURE = "wxUSE_DOC_VIEW_ARCHITECTURE", *************** *** 3895,3902 **** --- 3965,3974 ---- wxUSE_FILE = "wxUSE_FILE", wxUSE_FILEDLG = "wxUSE_FILEDLG", + wxUSE_FILEPICKERCTRL = "wxUSE_FILEPICKERCTRL", wxUSE_FILESYSTEM = "wxUSE_FILESYSTEM", wxUSE_FINDREPLDLG = "wxUSE_FINDREPLDLG", wxUSE_FONTDLG = "wxUSE_FONTDLG", wxUSE_FONTMAP = "wxUSE_FONTMAP", + wxUSE_FONTPICKERCTRL = "wxUSE_FONTPICKERCTRL", wxUSE_FREETYPE = "wxUSE_FREETYPE", wxUSE_FSVOLUME = "wxUSE_FSVOLUME", |
|
From: John L. <jr...@us...> - 2007-06-17 18:36:39
|
Update of /cvsroot/wxlua/wxLua/bindings In directory sc8-pr-cvs9.sourceforge.net:/tmp/cvs-serv12639/wxLua/bindings Modified Files: genwxbind.lua Log Message: Add picker.i for all of the wxPicker controls Change WXLUA_DECLARE_ENCAPSULATION to prepend wxLua_ to it for clarity. Index: genwxbind.lua =================================================================== RCS file: /cvsroot/wxlua/wxLua/bindings/genwxbind.lua,v retrieving revision 1.124 retrieving revision 1.125 diff -C2 -d -r1.124 -r1.125 *** genwxbind.lua 16 Jun 2007 06:21:42 -0000 1.124 --- genwxbind.lua 17 Jun 2007 18:36:05 -0000 1.125 *************** *** 719,722 **** --- 719,723 ---- preprocConditionTable["wxUSE_CMDLINE_PARSER"] = "wxUSE_CMDLINE_PARSER" preprocConditionTable["wxUSE_COLOURDLG"] = "wxUSE_COLOURDLG" + preprocConditionTable["wxUSE_COLOURPICKERCTRL"] = "wxUSE_COLOURPICKERCTRL" preprocConditionTable["wxUSE_COMBOBOX"] = "wxUSE_COMBOBOX" preprocConditionTable["wxUSE_CONFIG"] = "wxUSE_CONFIG" *************** *** 730,733 **** --- 731,735 ---- preprocConditionTable["wxUSE_DIALUP_MANAGER"] = "wxUSE_DIALUP_MANAGER" preprocConditionTable["wxUSE_DIRDLG"] = "wxUSE_DIRDLG" + preprocConditionTable["wxUSE_DIRPICKERCTRL"] = "wxUSE_DIRPICKERCTRL" preprocConditionTable["wxUSE_DISPLAY"] = "wxUSE_DISPLAY" preprocConditionTable["wxUSE_DOC_VIEW_ARCHITECTURE"] = "wxUSE_DOC_VIEW_ARCHITECTURE" *************** *** 743,750 **** --- 745,754 ---- preprocConditionTable["wxUSE_FILE"] = "wxUSE_FILE" preprocConditionTable["wxUSE_FILEDLG"] = "wxUSE_FILEDLG" + preprocConditionTable["wxUSE_FILEPICKERCTRL"] = "wxUSE_FILEPICKERCTRL" preprocConditionTable["wxUSE_FILESYSTEM"] = "wxUSE_FILESYSTEM" preprocConditionTable["wxUSE_FINDREPLDLG"] = "wxUSE_FINDREPLDLG" preprocConditionTable["wxUSE_FONTDLG"] = "wxUSE_FONTDLG" preprocConditionTable["wxUSE_FONTMAP"] = "wxUSE_FONTMAP" + preprocConditionTable["wxUSE_FONTPICKERCTRL"] = "wxUSE_FONTPICKERCTRL" preprocConditionTable["wxUSE_FREETYPE"] = "wxUSE_FREETYPE" preprocConditionTable["wxUSE_FSVOLUME"] = "wxUSE_FSVOLUME" *************** *** 908,911 **** --- 912,916 ---- preprocConditionTable["wxLUA_USE_wxColourDialog"] = "wxLUA_USE_wxColourDialog" preprocConditionTable["wxLUA_USE_wxColourPenBrush"] = "wxLUA_USE_wxColourPenBrush" + preprocConditionTable["wxLUA_USE_wxColourPickerCtrl"] = "wxLUA_USE_wxColourPickerCtrl" preprocConditionTable["wxLUA_USE_wxComboBox"] = "wxLUA_USE_wxComboBox" preprocConditionTable["wxLUA_USE_wxCommandProcessor"] = "wxLUA_USE_wxCommandProcessor" *************** *** 923,926 **** --- 928,932 ---- preprocConditionTable["wxLUA_USE_wxDir"] = "wxLUA_USE_wxDir" preprocConditionTable["wxLUA_USE_wxDirDialog"] = "wxLUA_USE_wxDirDialog" + preprocConditionTable["wxLUA_USE_wxDirPickerCtrl"] = "wxLUA_USE_wxDirPickerCtrl" preprocConditionTable["wxLUA_USE_wxDisplay"] = "wxLUA_USE_wxDisplay" preprocConditionTable["wxLUA_USE_wxDragDrop"] = "wxLUA_USE_wxDragDrop" *************** *** 929,932 **** --- 935,939 ---- preprocConditionTable["wxLUA_USE_wxFileHistory"] = "wxLUA_USE_wxFileHistory" preprocConditionTable["wxLUA_USE_wxFileName"] = "wxLUA_USE_wxFileName" + preprocConditionTable["wxLUA_USE_wxFilePickerCtrl"] = "wxLUA_USE_wxFilePickerCtrl" preprocConditionTable["wxLUA_USE_wxFindReplaceDialog"] = "wxLUA_USE_wxFindReplaceDialog" preprocConditionTable["wxLUA_USE_wxFont"] = "wxLUA_USE_wxFont" *************** *** 935,938 **** --- 942,946 ---- preprocConditionTable["wxLUA_USE_wxFontList"] = "wxLUA_USE_wxFontList" preprocConditionTable["wxLUA_USE_wxFontMapper"] = "wxLUA_USE_wxFontMapper" + preprocConditionTable["wxLUA_USE_wxFontPickerCtrl"] = "wxLUA_USE_wxFontPickerCtrl" preprocConditionTable["wxLUA_USE_wxFrame"] = "wxLUA_USE_wxFrame" preprocConditionTable["wxLUA_USE_wxGauge"] = "wxLUA_USE_wxGauge" *************** *** 967,970 **** --- 975,979 ---- preprocConditionTable["wxLUA_USE_wxPalette"] = "wxLUA_USE_wxPalette" preprocConditionTable["wxLUA_USE_wxPenList"] = "wxLUA_USE_wxPenList" + preprocConditionTable["wxLUA_USE_wxPicker"] = "wxLUA_USE_wxPicker" preprocConditionTable["wxLUA_USE_wxPointSizeRect"] = "wxLUA_USE_wxPointSizeRect" preprocConditionTable["wxLUA_USE_wxPrint"] = "wxLUA_USE_wxPrint" *************** *** 3477,3481 **** if parseObject.Encapsulate then ! table.insert(codeList, " wxlState.AddTrackedObject((long)returns, new wxObject_"..MakeVar(parseObject.Name).."(("..returnCast..")returns));\n") else table.insert(codeList, " wxlState.AddTrackedObject(returns);\n") --- 3486,3490 ---- if parseObject.Encapsulate then ! table.insert(codeList, " wxlState.AddTrackedObject((long)returns, new wxLua_wxObject_"..MakeVar(parseObject.Name).."(("..returnCast..")returns));\n") else table.insert(codeList, " wxlState.AddTrackedObject(returns);\n") *************** *** 3557,3561 **** if dataTypeTable[memberType].Encapsulate then ! table.insert(codeList, " wxlState.AddTrackedObject((long)returns, new wxObject_"..MakeVar(memberType).."(("..returnCast..")returns));\n") else table.insert(codeList, " wxlState.AddTrackedObject(("..returnCast..")returns);\n") --- 3566,3570 ---- if dataTypeTable[memberType].Encapsulate then ! table.insert(codeList, " wxlState.AddTrackedObject((long)returns, new wxLua_wxObject_"..MakeVar(memberType).."(("..returnCast..")returns));\n") else table.insert(codeList, " wxlState.AddTrackedObject(("..returnCast..")returns);\n") |
|
From: John L. <jr...@us...> - 2007-06-17 18:36:38
|
Update of /cvsroot/wxlua/wxLua In directory sc8-pr-cvs9.sourceforge.net:/tmp/cvs-serv12639/wxLua Modified Files: Makefile.in Log Message: Add picker.i for all of the wxPicker controls Change WXLUA_DECLARE_ENCAPSULATION to prepend wxLua_ to it for clarity. Index: Makefile.in =================================================================== RCS file: /cvsroot/wxlua/wxLua/Makefile.in,v retrieving revision 1.26 retrieving revision 1.27 diff -C2 -d -r1.26 -r1.27 *** Makefile.in 14 Jun 2007 12:23:03 -0000 1.26 --- Makefile.in 17 Jun 2007 18:36:04 -0000 1.27 *************** *** 79,83 **** samples: @mkdir -p $(DESTDIR)$(datadir)/wxlua/samples ! @for f in samples/validator.wx.lua samples/calculator.wx.lua samples/choices.wx.lua samples/coroutine.wx.lua samples/debug.wx.lua samples/dialog.wx.lua samples/editor.wx.lua samples/fldemo.wx.lua samples/grid.wx.lua samples/htmlwin.wx.lua samples/luamodule.wx.lua samples/mdi.wx.lua samples/minimal.wx.lua samples/printing.wx.lua samples/scribble.wx.lua samples/sizer.wx.lua samples/tree.wx.lua samples/unittest.wx.lua samples/veryminimal.wx.lua samples/wxluasudoku.wx.lua samples/bindings.wx.lua samples/calculator.xrc; do \ if test ! -f $(DESTDIR)$(datadir)/wxlua/samples/$$f -a ! -d $(DESTDIR)$(datadir)/wxlua/samples/$$f ; \ then x=yep ; \ --- 79,83 ---- samples: @mkdir -p $(DESTDIR)$(datadir)/wxlua/samples ! @for f in samples/validator.wx.lua samples/calculator.wx.lua samples/choices.wx.lua samples/coroutine.wx.lua samples/dialog.wx.lua samples/editor.wx.lua samples/fldemo.wx.lua samples/grid.wx.lua samples/htmlwin.wx.lua samples/luamodule.wx.lua samples/mdi.wx.lua samples/minimal.wx.lua samples/printing.wx.lua samples/scribble.wx.lua samples/sizer.wx.lua samples/tree.wx.lua samples/unittest.wx.lua samples/veryminimal.wx.lua samples/wxluasudoku.wx.lua samples/bindings.wx.lua samples/calculator.xrc; do \ if test ! -f $(DESTDIR)$(datadir)/wxlua/samples/$$f -a ! -d $(DESTDIR)$(datadir)/wxlua/samples/$$f ; \ then x=yep ; \ |
