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-19 13:58:19
|
Update of /cvsroot/wxlua/wxLua/bindings In directory sc8-pr-cvs9.sourceforge.net:/tmp/cvs-serv31712/wxLua/bindings Modified Files: genwxbind.lua Log Message: AMD64 fixes Index: genwxbind.lua =================================================================== RCS file: /cvsroot/wxlua/wxLua/bindings/genwxbind.lua,v retrieving revision 1.129 retrieving revision 1.130 diff -C2 -d -r1.129 -r1.130 *** genwxbind.lua 18 Jun 2007 21:40:27 -0000 1.129 --- genwxbind.lua 19 Jun 2007 13:58:15 -0000 1.130 *************** *** 872,875 **** --- 872,876 ---- preprocConditionTable["wxUSE_TOOLBOOK"] = "wxUSE_TOOLBOOK" preprocConditionTable["wxUSE_TOOLTIPS"] = "wxUSE_TOOLTIPS" + preprocConditionTable["wxUSE_TREEBOOK"] = "wxUSE_TREEBOOK" preprocConditionTable["wxUSE_TREECTRL"] = "wxUSE_TREECTRL" preprocConditionTable["wxUSE_TREELAYOUT"] = "wxUSE_TREELAYOUT" |
|
From: John L. <jr...@us...> - 2007-06-19 13:58:19
|
Update of /cvsroot/wxlua/wxLua/bindings/wxwidgets In directory sc8-pr-cvs9.sourceforge.net:/tmp/cvs-serv31712/wxLua/bindings/wxwidgets Modified Files: defsutil.i wx_datatypes.lua Log Message: AMD64 fixes Index: defsutil.i =================================================================== RCS file: /cvsroot/wxlua/wxLua/bindings/wxwidgets/defsutil.i,v retrieving revision 1.45 retrieving revision 1.46 diff -C2 -d -r1.45 -r1.46 *** defsutil.i 18 Jun 2007 02:56:23 -0000 1.45 --- defsutil.i 19 Jun 2007 13:58:15 -0000 1.46 *************** *** 236,240 **** %function wxWindow* wxFindWindowAtPoint(const wxPoint& pt) %function wxWindow* wxFindWindowAtPointer(wxPoint& pt) ! %win %function wxWindow* wxGetActiveWindow() // wxBatteryState wxGetBatteryState() // X only %function wxString wxGetDisplayName() --- 236,240 ---- %function wxWindow* wxFindWindowAtPoint(const wxPoint& pt) %function wxWindow* wxFindWindowAtPointer(wxPoint& pt) ! %wxchkver_2_8_4 %function wxWindow* wxGetActiveWindow() // wxBatteryState wxGetBatteryState() // X only %function wxString wxGetDisplayName() Index: wx_datatypes.lua =================================================================== RCS file: /cvsroot/wxlua/wxLua/bindings/wxwidgets/wx_datatypes.lua,v retrieving revision 1.73 retrieving revision 1.74 diff -C2 -d -r1.73 -r1.74 *** wx_datatypes.lua 18 Jun 2007 21:40:33 -0000 1.73 --- wx_datatypes.lua 19 Jun 2007 13:58:15 -0000 1.74 *************** *** 3990,3993 **** --- 3990,3994 ---- ["%wxchkver_2_8"] = "wxCHECK_VERSION(2,8,0)", ["%wxchkver_2_8_1"] = "wxCHECK_VERSION(2,8,1)", + ["%wxchkver_2_8_4"] = "wxCHECK_VERSION(2,8,4)", ["%wxcompat_2_4"] = "(defined(WXWIN_COMPATIBILITY_2_4) && WXWIN_COMPATIBILITY_2_4)", ["%wxcompat_2_6"] = "(defined(WXWIN_COMPATIBILITY_2_6) && WXWIN_COMPATIBILITY_2_6)", *************** *** 4308,4311 **** --- 4309,4313 ---- wxUSE_TOOLBOOK = "wxUSE_TOOLBOOK", wxUSE_TOOLTIPS = "wxUSE_TOOLTIPS", + wxUSE_TREEBOOK = "wxUSE_TREEBOOK", wxUSE_TREECTRL = "wxUSE_TREECTRL", wxUSE_TREELAYOUT = "wxUSE_TREELAYOUT", |
|
From: John L. <jr...@us...> - 2007-06-18 23:52:26
|
Update of /cvsroot/wxlua/wxLua/samples In directory sc8-pr-cvs9.sourceforge.net:/tmp/cvs-serv19894/wxLua/samples Added Files: settings.wx.lua Log Message: Add a sample to show the results from all static informational functions --- NEW FILE: settings.wx.lua --- ----------------------------------------------------------------------------- -- Name: settings.wx.lua -- Purpose: Settings wxLua sample - show results of all informational functions -- Author: John Labenski -- Modified by: -- Created: 16/11/2001 -- RCS-ID: -- Copyright: (c) 2007 John Labenski -- Licence: wxWidgets licence ----------------------------------------------------------------------------- frame = nil listCtrl = nil ID_LISTCTRL = 1000 -- --------------------------------------------------------------------------- -- Add a list item with multiple col data -- --------------------------------------------------------------------------- function AddListItem(colTable) local lc_item = listCtrl:GetItemCount() lc_item = listCtrl:InsertItem(lc_item, colTable[1]) for col = 2, #colTable do listCtrl:SetItem(lc_item, col - 1, tostring(colTable[col])) end return lc_item end -- --------------------------------------------------------------------------- -- Fill the listctrl -- --------------------------------------------------------------------------- function FillListCtrl(listCtrl) listCtrl:InsertColumn(0, "Function Call", wx.wxLIST_FORMAT_LEFT, -1) listCtrl:InsertColumn(1, "Result", wx.wxLIST_FORMAT_LEFT, -1) listCtrl:SetColumnWidth(0, 300) listCtrl:SetColumnWidth(1, 300) AddListItem({"wx.wxButton.GetDefaultSize()", tostring(wx.wxButton.GetDefaultSize():GetWidth())..", "..tostring(wx.wxButton.GetDefaultSize():GetHeight())}) AddListItem({"", ""}) AddListItem({"wx.wxCaret.GetBlinkTime()", wx.wxCaret.GetBlinkTime()}) AddListItem({"", ""}) AddListItem({"wx.wxDateSpan.Day():GetTotalDays()", wx.wxDateSpan.Day():GetTotalDays()}) AddListItem({"wx.wxDateSpan.Month():GetTotalDays()", wx.wxDateSpan.Month():GetTotalDays()}) AddListItem({"wx.wxDateSpan.Week():GetTotalDays()", wx.wxDateSpan.Week():GetTotalDays()}) AddListItem({"wx.wxDateSpan.Year():GetTotalDays()", wx.wxDateSpan.Year():GetTotalDays()}) AddListItem({"", ""}) AddListItem({"wx.wxDisplay.GetCount()", wx.wxDisplay.GetCount()}) AddListItem({"", ""}) AddListItem({"wx.wxFileName.GetCwd()", wx.wxFileName.GetCwd()}) AddListItem({"wx.wxFileName.GetForbiddenChars()", wx.wxFileName.GetForbiddenChars()}) AddListItem({"wx.wxFileName.GetFormat()", wx.wxFileName.GetFormat()}) AddListItem({"wx.wxFileName.GetHomeDir()", wx.wxFileName.GetHomeDir()}) AddListItem({"wx.wxFileName.GetPathSeparator()", wx.wxFileName.GetPathSeparator()}) AddListItem({"wx.wxFileName.GetPathSeparators()", wx.wxFileName.GetPathSeparators()}) AddListItem({"wx.wxFileName.GetPathTerminators()", wx.wxFileName.GetPathTerminators()}) AddListItem({"wx.wxFileName.GetVolumeSeparator()", wx.wxFileName.GetVolumeSeparator()}) AddListItem({"wx.wxFileName.IsCaseSensitive()", wx.wxFileName.IsCaseSensitive()}) AddListItem({"wx.wxFileName.GetVolumeSeparator()", wx.wxFileName.GetVolumeSeparator()}) AddListItem({"wx.wxFileName.GetVolumeSeparator()", wx.wxFileName.GetVolumeSeparator()}) AddListItem({"", ""}) AddListItem({"wx.wxFont.GetDefaultEncoding()", wx.wxFont.GetDefaultEncoding()}) AddListItem({"", ""}) AddListItem({"wx.wxFontMapper.GetDefaultConfigPath()", wx.wxFontMapper.GetDefaultConfigPath()}) AddListItem({"wx.wxFontMapper.GetSupportedEncodingsCount()", wx.wxFontMapper.GetSupportedEncodingsCount()}) AddListItem({"wx.wxFontMapper.GetDefaultConfigPath()", wx.wxFontMapper.GetDefaultConfigPath()}) AddListItem({"", ""}) AddListItem({"wx.wxIdleEvent.GetMode()", wx.wxIdleEvent.GetMode()}) AddListItem({"", ""}) AddListItem({"wx.wxJoystick.GetNumberJoysticks()", wx.wxJoystick.GetNumberJoysticks()}) AddListItem({"", ""}) AddListItem({"wx.wxLocale.GetSystemLanguage()", wx.wxLocale.GetSystemLanguage()}) AddListItem({"wx.wxLocale.GetSystemEncoding()", wx.wxLocale.GetSystemEncoding()}) AddListItem({"wx.wxLocale.GetSystemEncodingName()", wx.wxLocale.GetSystemEncodingName()}) AddListItem({"wx.wxLocale.GetLanguageName(GetSystemLanguage())", wx.wxLocale.GetLanguageName(wx.wxLocale.GetSystemLanguage())}) AddListItem({"", ""}) AddListItem({"wx.wxLog.IsEnabled()", wx.wxLog.IsEnabled()}) AddListItem({"wx.wxLog.GetRepetitionCounting()", wx.wxLog.GetRepetitionCounting()}) AddListItem({"wx.wxLog.GetVerbose()", wx.wxLog.GetVerbose()}) AddListItem({"wx.wxLog.GetTraceMask()", wx.wxLog.GetTraceMask()}) AddListItem({"wx.wxLog.GetLogLevel()", wx.wxLog.GetLogLevel()}) AddListItem({"wx.wxLog.GetTimestamp()", wx.wxLog.GetTimestamp()}) AddListItem({"", ""}) local plat = wx.wxPlatformInfo.Get() AddListItem({"wx.wxPlatformInfo:GetOSMajorVersion()", plat:GetOSMajorVersion()}) AddListItem({"wx.wxPlatformInfo:GetOSMinorVersion()", plat:GetOSMinorVersion()}) AddListItem({"wx.wxPlatformInfo:GetToolkitMajorVersion()", plat:GetToolkitMajorVersion()}) AddListItem({"wx.wxPlatformInfo:GetToolkitMinorVersion()", plat:GetToolkitMinorVersion()}) AddListItem({"wx.wxPlatformInfo:IsUsingUniversalWidgets()", plat:IsUsingUniversalWidgets()}) AddListItem({"wx.wxPlatformInfo:GetOperatingSystemId()", plat:GetOperatingSystemId()}) AddListItem({"wx.wxPlatformInfo:GetPortId()", plat:GetPortId()}) AddListItem({"wx.wxPlatformInfo:GetArchitecture()", plat:GetArchitecture()}) AddListItem({"wx.wxPlatformInfo:GetEndianness()", plat:GetEndianness()}) AddListItem({"wx.wxPlatformInfo:GetOperatingSystemFamilyName()", plat:GetOperatingSystemFamilyName()}) AddListItem({"wx.wxPlatformInfo:GetOperatingSystemIdName()", plat:GetOperatingSystemIdName()}) AddListItem({"wx.wxPlatformInfo:GetPortIdName()", plat:GetPortIdName()}) AddListItem({"wx.wxPlatformInfo:GetPortIdShortName()", plat:GetPortIdShortName()}) AddListItem({"wx.wxPlatformInfo:GetArchName()", plat:GetArchName()}) AddListItem({"wx.wxPlatformInfo:GetEndiannessName()", plat:GetEndiannessName()}) AddListItem({"", ""}) AddListItem({"wx.wxPrinter.GetLastError()", wx.wxPrinter.GetLastError()}) AddListItem({"", ""}) if wx.wxPostScriptDC then AddListItem({"wx.wxPostScriptDC.GetResolution()", wx.wxPostScriptDC.GetResolution()}) else AddListItem({"wx.wxPostScriptDC.GetResolution()", "wxPostScriptDC not available"}) end --AddListItem({"", ""}) --AddListItem({"wx.wxSound.IsPlaying()", wx.wxSound.IsPlaying()}) -- not in MSW AddListItem({"", ""}) local stdpaths = wx.wxStandardPaths.Get() AddListItem({"wx.wxStandardPaths:GetExecutablePath()", stdpaths:GetExecutablePath()}) AddListItem({"wx.wxStandardPaths:GetConfigDir()", stdpaths:GetConfigDir()}) AddListItem({"wx.wxStandardPaths:GetUserConfigDir()", stdpaths:GetUserConfigDir()}) AddListItem({"wx.wxStandardPaths:GetDataDir()", stdpaths:GetDataDir()}) AddListItem({"wx.wxStandardPaths:GetLocalDataDir()", stdpaths:GetLocalDataDir()}) AddListItem({"wx.wxStandardPaths:GetUserDataDir()", stdpaths:GetUserDataDir()}) AddListItem({"wx.wxStandardPaths:GetUserLocalDataDir()", stdpaths:GetUserLocalDataDir()}) AddListItem({"wx.wxStandardPaths:GetPluginsDir()", stdpaths:GetPluginsDir()}) AddListItem({"wx.wxStandardPaths:GetResourcesDir()", stdpaths:GetResourcesDir()}) --AddListItem({"wx.wxStandardPaths:GetLocalizedResourcesDir()", stdpaths:GetLocalizedResourcesDir()}) AddListItem({"wx.wxStandardPaths:GetDocumentsDir()", stdpaths:GetDocumentsDir()}) AddListItem({"wx.wxStandardPaths:GetTempDir()", stdpaths:GetTempDir()}) AddListItem({"", ""}) AddListItem({"wx.wxStaticLine.GetDefaultSize()", wx.wxStaticLine.GetDefaultSize()}) AddListItem({"", ""}) AddListItem({"wx.wxSystemSettings.GetScreenType()", wx.wxSystemSettings.GetScreenType()}) AddListItem({"", ""}) AddListItem({"wx.wxTimeSpan.Week():Format()", wx.wxTimeSpan.Week():Format()}) AddListItem({"wx.wxTimeSpan.Day():Format()", wx.wxTimeSpan.Day():Format()}) AddListItem({"wx.wxTimeSpan.Hour():Format()", wx.wxTimeSpan.Hour():Format()}) AddListItem({"wx.wxTimeSpan.Minute():Format()", wx.wxTimeSpan.Minute():Format()}) AddListItem({"wx.wxTimeSpan.Second():Format()", wx.wxTimeSpan.Second():Format()}) AddListItem({"", ""}) AddListItem({"wx.wxUpdateUIEvent.GetMode()", wx.wxUpdateUIEvent.GetMode()}) AddListItem({"", ""}) AddListItem({"wx.wxValidator.IsSilent()", wx.wxValidator.IsSilent()}) AddListItem({"", ""}) AddListItem({"wx.wxWindow.FindFocus()", wx.wxWindow.FindFocus()}) AddListItem({"wx.wxWindow.GetCapture()", wx.wxWindow.GetCapture()}) -- ----------------------------------------------------------------------- AddListItem({"", ""}) AddListItem({"Functions below", "==========================="}) AddListItem({"", ""}) AddListItem({"wx.wxClientDisplayRect()", table.concat({wx.wxClientDisplayRect()}, ", ")}) AddListItem({"wx.wxGetClientDisplayRect()", table.concat({wx.wxGetClientDisplayRect():GetX(), wx.wxGetClientDisplayRect():GetY(), wx.wxGetClientDisplayRect():GetWidth(), wx.wxGetClientDisplayRect():GetHeight()}, ", ")}) AddListItem({"wx.wxDisplaySize()", table.concat({wx.wxDisplaySize()}, ", ")}) AddListItem({"wx.wxGetDisplaySize()", table.concat({wx.wxGetDisplaySize():GetWidth(), wx.wxGetDisplaySize():GetHeight()}, ", ")}) AddListItem({"wx.wxDisplaySizeMM()", table.concat({wx.wxDisplaySizeMM()}, ", ")}) AddListItem({"wx.wxGetDisplaySizeMM()", table.concat({wx.wxGetDisplaySizeMM():GetWidth(), wx.wxGetDisplaySizeMM():GetHeight()}, ", ")}) AddListItem({"wx.wxColourDisplay()", wx.wxColourDisplay()}) AddListItem({"wx.wxDisplayDepth()", wx.wxDisplayDepth()}) AddListItem({"", ""}) AddListItem({"wx.wxGetActiveWindow()", wx.wxGetActiveWindow()}) AddListItem({"", ""}) AddListItem({"wx.wxGetCwd()", wx.wxGetCwd()}) AddListItem({"wx.wxGetFreeMemory():ToLong()", wx.wxGetFreeMemory():ToLong()}) AddListItem({"wx.wxGetHostName()", wx.wxGetHostName()}) AddListItem({"wx.wxGetFullHostName()", wx.wxGetFullHostName()}) AddListItem({"wx.wxGetHomeDir()", wx.wxGetHomeDir()}) AddListItem({"wx.wxGetUserHome()", wx.wxGetUserHome()}) AddListItem({"wx.wxGetUserId()", wx.wxGetUserId()}) AddListItem({"wx.wxGetUserName()", wx.wxGetUserName()}) AddListItem({"wx.wxGetEmailAddress()", wx.wxGetEmailAddress()}) AddListItem({"", ""}) AddListItem({"wx.wxNow()", wx.wxNow()}) AddListItem({"wx.wxGetLocalTime()", wx.wxGetLocalTime()}) AddListItem({"wx.wxGetLocalTimeMillis():ToDouble()", wx.wxGetLocalTimeMillis():ToDouble()}) AddListItem({"wx.wxGetUTCTime()", wx.wxGetUTCTime()}) AddListItem({"", ""}) AddListItem({"wx.wxGetOsDescription()", wx.wxGetOsDescription()}) AddListItem({"wx.wxGetOSDirectory()", wx.wxGetOSDirectory()}) AddListItem({"wx.wxGetOsVersion()", wx.wxGetOsVersion()}) AddListItem({"wx.wxGetProcessId()", wx.wxGetProcessId()}) AddListItem({"", ""}) AddListItem({"wx.wxGetPowerType()", wx.wxGetPowerType()}) AddListItem({"wx.wxGetBatteryState()", wx.wxGetBatteryState()}) AddListItem({"", ""}) AddListItem({"wx.wxGetMousePosition()", table.concat({wx.wxGetMousePosition():GetX(),wx.wxGetMousePosition():GetY()}, ", ")}) AddListItem({"wx.wxGetMouseState()", wx.wxGetMouseState()}) AddListItem({"", ""}) AddListItem({"wx.wxNewId()", wx.wxNewId()}) AddListItem({"", ""}) AddListItem({"wx.wxSysErrorCode()", wx.wxSysErrorCode()}) AddListItem({"wx.wxSysErrorMsg()", wx.wxSysErrorMsg()}) end -- --------------------------------------------------------------------------- -- Main entry into the program -- --------------------------------------------------------------------------- function main() -- create the wxFrame window frame = wx.wxFrame( wx.NULL, -- no parent for toplevel windows wx.wxID_ANY, -- don't need a wxWindow ID "wxLua Settings Demo", -- caption on the frame wx.wxDefaultPosition, -- let system place the frame wx.wxSize(450, 450), -- set the size of the frame wx.wxDEFAULT_FRAME_STYLE ) -- use default frame styles listCtrl = wx.wxListView(frame, ID_LISTCTRL, wx.wxDefaultPosition, wx.wxDefaultSize, wx.wxLC_REPORT + wx.wxLC_SINGLE_SEL + wx.wxLC_HRULES + wx.wxLC_VRULES) FillListCtrl(listCtrl) local fileMenu = wx.wxMenu() fileMenu:Append(wx.wxID_EXIT, "E&xit", "Quit the program") local helpMenu = wx.wxMenu() helpMenu:Append(wx.wxID_ABOUT, "&About", "About the wxLua Minimal Application") local menuBar = wx.wxMenuBar() menuBar:Append(fileMenu, "&File") menuBar:Append(helpMenu, "&Help") frame:SetMenuBar(menuBar) frame:CreateStatusBar(1) frame:SetStatusText("Welcome to wxLua.") -- connect the selection event of the exit menu item to an -- event handler that closes the window frame:Connect(wx.wxID_EXIT, wx.wxEVT_COMMAND_MENU_SELECTED, function (event) frame:Close(true) end ) -- connect the selection event of the about menu item frame:Connect(wx.wxID_ABOUT, wx.wxEVT_COMMAND_MENU_SELECTED, function (event) wx.wxMessageBox('This is the "About" dialog of the Settings wxLua sample.\n'.. wx.wxLUA_VERSION_STRING.." built with "..wx.wxVERSION_STRING, "About wxLua", wx.wxOK + wx.wxICON_INFORMATION, frame) end ) -- show the frame window frame:Show(true) end main() |
|
From: John L. <jr...@us...> - 2007-06-18 21:41:11
|
Update of /cvsroot/wxlua/wxLua/modules/wxbind/include In directory sc8-pr-cvs9.sourceforge.net:/tmp/cvs-serv32406/wxLua/modules/wxbind/include Modified Files: wxbind.h Log Message: Fix last commit of trying to preserve the order of the binding conditions, this way works. Index: wxbind.h =================================================================== RCS file: /cvsroot/wxlua/wxLua/modules/wxbind/include/wxbind.h,v retrieving revision 1.78 retrieving revision 1.79 diff -C2 -d -r1.78 -r1.79 *** wxbind.h 18 Jun 2007 19:51:29 -0000 1.78 --- wxbind.h 18 Jun 2007 21:40:35 -0000 1.79 *************** *** 72,96 **** // --------------------------------------------------------------------------- - #if (!defined(__WXMSW__)) && (wxLUA_USE_wxHtmlHelpController && wxUSE_WXHTML_HELP) - #include "wx/html/helpctrl.h" - #include "wx/html/helpdata.h" - #endif // (!defined(__WXMSW__)) && (wxLUA_USE_wxHtmlHelpController && wxUSE_WXHTML_HELP) - #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) [...1344 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) *************** *** 2810,2813 **** --- 2746,2755 ---- #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) |
|
From: John L. <jr...@us...> - 2007-06-18 21:41:10
|
Update of /cvsroot/wxlua/wxLua/docs In directory sc8-pr-cvs9.sourceforge.net:/tmp/cvs-serv32406/wxLua/docs Modified Files: wxluaref.html Log Message: Fix last commit of trying to preserve the order of the binding conditions, this way works. Index: wxluaref.html =================================================================== RCS file: /cvsroot/wxlua/wxLua/docs/wxluaref.html,v retrieving revision 1.28 retrieving revision 1.29 diff -C2 -d -r1.28 -r1.29 *** wxluaref.html 18 Jun 2007 19:51:27 -0000 1.28 --- wxluaref.html 18 Jun 2007 21:40:33 -0000 1.29 *************** *** 5500,5505 **** void SetSelection(int n)<br> void SetStringSelection(const <a href="#wxString">wxString</a>& string)<br> ! bool Show(bool show = true)<br> ! bool Show(int item, bool show = true)<br> </blockquote><font color=#DD0000><font color=#DD0000><i>%endclass</i></font></font><br> <br> --- 5500,5505 ---- void SetSelection(int n)<br> void SetStringSelection(const <a href="#wxString">wxString</a>& string)<br> ! <font color=#009900>//bool Show(bool show = true) // see <a href="#wxWindow">wxWindow</a></font><br> ! bool Show(int item, bool show) <font color=#009900>// must specify both for overload</font><br> </blockquote><font color=#DD0000><font color=#DD0000><i>%endclass</i></font></font><br> <br> *************** *** 11923,11927 **** </blockquote><font color=#0066CC><i>%endenum</i></font><br> <br> ! <b><font size=+1 color=#DD0000><i>%class</i> <i>%delete</i> <a name="wxCursor">wxCursor</a>, <a href="#wxBitmap">wxBitmap</a> <font color=#009900>// just <a href="#wxObject">wxObject</a> in GTK</font></font></b> <blockquote> <font color=#006666> <i>%define_object</i> wxNullCursor</font><br> --- 11923,11927 ---- </blockquote><font color=#0066CC><i>%endenum</i></font><br> <br> ! <b><font size=+1 color=#DD0000><i>%class</i> <i>%delete</i> <a name="wxCursor">wxCursor</a>, <a href="#wxObject">wxObject</a> <font color=#009900>// <a href="#wxObject">wxObject</a> in gtk, wxGDIImage in msw, <a href="#wxBitmap">wxBitmap</a> in osx</font></font></b> <blockquote> <font color=#006666> <i>%define_object</i> wxNullCursor</font><br> *************** *** 11931,11939 **** <br> <a href="#wxCursor">wxCursor</a>()<br> - <i>%win</i>|<i>%mac</i> <a href="#wxCursor">wxCursor</a>(const <a href="#wxString">wxString</a>& cursorName, long type, int hotSpotX = 0, int hotSpotY = 0)<br> <a href="#wxCursor">wxCursor</a>(int id)<br> <a href="#wxCursor">wxCursor</a>(const <a href="#wxImage">wxImage</a>& image)<br> <br> - <font color=#009900>//bool Ok() - see <a href="#wxBitmap">wxBitmap</a></font><br> <font color=#009900>//<i>%win</i> WXHANDLE GetHandle()</font><br> <font color=#009900>//<i>%win</i> void SetHandle(WXHANDLE handle)</font><br> --- 11931,11940 ---- <br> <a href="#wxCursor">wxCursor</a>()<br> <a href="#wxCursor">wxCursor</a>(int id)<br> <a href="#wxCursor">wxCursor</a>(const <a href="#wxImage">wxImage</a>& image)<br> + <i>%win</i>|<i>%mac</i> <a href="#wxCursor">wxCursor</a>(const <a href="#wxString">wxString</a>& cursorName, long type, int hotSpotX = 0, int hotSpotY = 0)<br> + <br> + bool Ok()<br> <br> <font color=#009900>//<i>%win</i> WXHANDLE GetHandle()</font><br> <font color=#009900>//<i>%win</i> void SetHandle(WXHANDLE handle)</font><br> *************** *** 11941,11948 **** <i>%win</i> int GetHeight()<br> <i>%win</i> int GetDepth()<br> ! <i>%win</i> void SetWidth(int width)<br> ! <i>%win</i> void SetHeight(int height)<br> ! <i>%win</i> void SetDepth(int depth)<br> ! <i>%win</i> void SetSize(const <a href="#wxSize">wxSize</a>& size)<br> </blockquote><font color=#DD0000><font color=#DD0000><i>%endclass</i></font></font><br> <br> --- 11942,11949 ---- <i>%win</i> int GetHeight()<br> <i>%win</i> int GetDepth()<br> ! <font color=#009900>//<i>%win</i> void SetWidth(int width)</font><br> ! <font color=#009900>//<i>%win</i> void SetHeight(int height)</font><br> ! <font color=#009900>//<i>%win</i> void SetDepth(int depth)</font><br> ! <font color=#009900>//<i>%win</i> void SetSize(const <a href="#wxSize">wxSize</a>& size)</font><br> </blockquote><font color=#DD0000><font color=#DD0000><i>%endclass</i></font></font><br> <br> *************** *** 18215,18219 **** virtual bool AddPage(<a href="#wxWindow">wxWindow</a> *page, const <a href="#wxString">wxString</a>& text, bool bSelect = false, int imageId = wxNOT_FOUND);<br> virtual bool AddSubPage(<a href="#wxWindow">wxWindow</a> *page, const <a href="#wxString">wxString</a>& text, bool bSelect = false, int imageId = wxNOT_FOUND);<br> - virtual bool DeletePage(size_t pos);<br> virtual bool IsNodeExpanded(size_t pos) const;<br> <br> --- 18216,18219 ---- |
|
From: John L. <jr...@us...> - 2007-06-18 21:41:09
|
Update of /cvsroot/wxlua/wxLua/bindings/wxwidgets In directory sc8-pr-cvs9.sourceforge.net:/tmp/cvs-serv32406/wxLua/bindings/wxwidgets Modified Files: controls.i gdi.i windows.i wx_datatypes.lua Log Message: Fix last commit of trying to preserve the order of the binding conditions, this way works. Index: windows.i =================================================================== RCS file: /cvsroot/wxlua/wxLua/bindings/wxwidgets/windows.i,v retrieving revision 1.45 retrieving revision 1.46 diff -C2 -d -r1.45 -r1.46 *** windows.i 18 Jun 2007 19:51:26 -0000 1.45 --- windows.i 18 Jun 2007 21:40:32 -0000 1.46 *************** *** 619,623 **** virtual bool AddPage(wxWindow *page, const wxString& text, bool bSelect = false, int imageId = wxNOT_FOUND); virtual bool AddSubPage(wxWindow *page, const wxString& text, bool bSelect = false, int imageId = wxNOT_FOUND); - virtual bool DeletePage(size_t pos); virtual bool IsNodeExpanded(size_t pos) const; --- 619,622 ---- Index: wx_datatypes.lua =================================================================== RCS file: /cvsroot/wxlua/wxLua/bindings/wxwidgets/wx_datatypes.lua,v retrieving revision 1.72 retrieving revision 1.73 diff -C2 -d -r1.72 -r1.73 *** wx_datatypes.lua 18 Jun 2007 19:51:26 -0000 1.72 --- wx_datatypes.lua 18 Jun 2007 21:40:33 -0000 1.73 *************** *** 307,311 **** wxAutoBufferedPaintDC = { BaseClass = "wxDC", ! Condition = "(wxCHECK_VERSION(2,8,0)) && (wxCHECK_VERSION(2,8,0))", DefType = "class", IsNumber = false, --- 307,311 ---- wxAutoBufferedPaintDC = { BaseClass = "wxDC", ! Condition = "(wxLUA_USE_wxDC) && (wxCHECK_VERSION(2,8,0))", DefType = "class", [...1140 lines suppressed...] IsNumber = false, --- 3824,3828 ---- wxWindowDC = { BaseClass = "wxDC", ! Condition = "wxLUA_USE_wxDC", DefType = "class", IsNumber = false, *************** *** 3893,3897 **** wxXPMHandler = { BaseClass = "wxImageHandler", ! Condition = "wxCHECK_VERSION(2,8,0) && wxUSE_TGA", DefType = "class", IsNumber = false, --- 3893,3897 ---- wxXPMHandler = { BaseClass = "wxImageHandler", ! Condition = "wxLUA_USE_wxImage && wxUSE_IMAGE", DefType = "class", IsNumber = false, Index: gdi.i =================================================================== RCS file: /cvsroot/wxlua/wxLua/bindings/wxwidgets/gdi.i,v retrieving revision 1.54 retrieving revision 1.55 diff -C2 -d -r1.54 -r1.55 *** gdi.i 18 Jun 2007 02:56:24 -0000 1.54 --- gdi.i 18 Jun 2007 21:40:31 -0000 1.55 *************** *** 1045,1049 **** %endenum ! %class %delete wxCursor, wxBitmap // just wxObject in GTK %define_object wxNullCursor %rename wxSTANDARD_CURSOR %define_pointer wxLua_wxSTANDARD_CURSOR // hack for wxWidgets >2.7 --- 1045,1049 ---- %endenum ! %class %delete wxCursor, wxObject // wxObject in gtk, wxGDIImage in msw, wxBitmap in osx %define_object wxNullCursor %rename wxSTANDARD_CURSOR %define_pointer wxLua_wxSTANDARD_CURSOR // hack for wxWidgets >2.7 *************** *** 1052,1060 **** wxCursor() - %win|%mac wxCursor(const wxString& cursorName, long type, int hotSpotX = 0, int hotSpotY = 0) wxCursor(int id) wxCursor(const wxImage& image) - //bool Ok() - see wxBitmap //%win WXHANDLE GetHandle() //%win void SetHandle(WXHANDLE handle) --- 1052,1061 ---- wxCursor() wxCursor(int id) wxCursor(const wxImage& image) + %win|%mac wxCursor(const wxString& cursorName, long type, int hotSpotX = 0, int hotSpotY = 0) + + bool Ok() //%win WXHANDLE GetHandle() //%win void SetHandle(WXHANDLE handle) *************** *** 1062,1069 **** %win int GetHeight() %win int GetDepth() ! %win void SetWidth(int width) ! %win void SetHeight(int height) ! %win void SetDepth(int depth) ! %win void SetSize(const wxSize& size) %endclass --- 1063,1070 ---- %win int GetHeight() %win int GetDepth() ! //%win void SetWidth(int width) ! //%win void SetHeight(int height) ! //%win void SetDepth(int depth) ! //%win void SetSize(const wxSize& size) %endclass Index: controls.i =================================================================== RCS file: /cvsroot/wxlua/wxLua/bindings/wxwidgets/controls.i,v retrieving revision 1.42 retrieving revision 1.43 diff -C2 -d -r1.42 -r1.43 *** controls.i 18 Jun 2007 19:51:26 -0000 1.42 --- controls.i 18 Jun 2007 21:40:29 -0000 1.43 *************** *** 657,662 **** void SetSelection(int n) void SetStringSelection(const wxString& string) ! bool Show(bool show = true) ! bool Show(int item, bool show = true) %endclass --- 657,662 ---- void SetSelection(int n) void SetStringSelection(const wxString& string) ! //bool Show(bool show = true) // see wxWindow ! bool Show(int item, bool show) // must specify both for overload %endclass |
Update of /cvsroot/wxlua/wxLua/modules/wxbind/src In directory sc8-pr-cvs9.sourceforge.net:/tmp/cvs-serv32406/wxLua/modules/wxbind/src Modified Files: appframe.cpp clipdrag.cpp controls.cpp data.cpp datetime.cpp defsutil.cpp dialogs.cpp event.cpp gdi.cpp grid.cpp help.cpp html.cpp image.cpp menutool.cpp picker.cpp print.cpp sizer.cpp socket.cpp wave.cpp windows.cpp wx_bind.cpp wxlua.cpp Log Message: Fix last commit of trying to preserve the order of the binding conditions, this way works. Index: defsutil.cpp =================================================================== RCS file: /cvsroot/wxlua/wxLua/modules/wxbind/src/defsutil.cpp,v retrieving revision 1.44 retrieving revision 1.45 diff -C2 -d -r1.44 -r1.45 *** defsutil.cpp 18 Jun 2007 14:54:59 -0000 1.44 --- defsutil.cpp 18 Jun 2007 21:40:42 -0000 1.45 *************** *** 823,827 **** ! #if (wxLUA_USE_wxBusyCursor) && (defined (__X__ )) static wxLuaArgTag s_wxluatagArray_wxLua_wxBusyCursor_constructor[] = { &s_wxluatag_wxCursor, NULL }; static int LUACALL wxLua_wxBusyCursor_constructor(lua_State *L); --- 823,827 ---- ! #if (wxLUA_USE_wxBusyCursor) && (wxLUA_USE_wxCursor) static wxLuaArgTag s_wxluatagArray_wxLua_wxBusyCursor_constructor[] = { &s_wxluatag_wxCursor, NULL }; static int LUACALL wxLua_wxBusyCursor_constructor(lua_State *L); *************** *** 851,855 **** ! #endif // (wxLUA_USE_wxBusyCursor) && (defined (__X__ )) --- 851,855 ---- ! #endif // (wxLUA_USE_wxBusyCursor) && (wxLUA_USE_wxCursor) *************** *** 859,865 **** { "delete", WXLUAMETHOD_METHOD|WXLUAMETHOD_DELETE, s_wxluafunc_wxLua_wxBusyCursor_delete, 1, NULL }, ! #if (wxLUA_USE_wxBusyCursor) && (defined (__X__ )) { "wxBusyCursor", WXLUAMETHOD_CONSTRUCTOR, s_wxluafunc_wxLua_wxBusyCursor_constructor, 1, NULL }, ! #endif // (wxLUA_USE_wxBusyCursor) && (defined (__X__ )) { 0, 0, 0, 0 }, --- 859,865 ---- { "delete", WXLUAMETHOD_METHOD|WXLUAMETHOD_DELETE, s_wxluafunc_wxLua_wxBusyCursor_delete, 1, NULL }, ! #if (wxLUA_USE_wxBusyCursor) && (wxLUA_USE_wxCursor) { "wxBusyCursor", WXLUAMETHOD_CONSTRUCTOR, s_wxluafunc_wxLua_wxBusyCursor_constructor, 1, NULL }, ! #endif // (wxLUA_USE_wxBusyCursor) && (wxLUA_USE_wxCursor) { 0, 0, 0, 0 }, Index: wxlua.cpp =================================================================== RCS file: /cvsroot/wxlua/wxLua/modules/wxbind/src/wxlua.cpp,v retrieving revision 1.45 retrieving revision 1.46 diff -C2 -d -r1.45 -r1.46 *** wxlua.cpp 18 Jun 2007 19:51:38 -0000 1.45 --- wxlua.cpp 18 Jun 2007 21:40:52 -0000 1.46 *************** *** 231,235 **** int s_wxluatag_wxLuaHtmlWinTagEvent = -1; ! #if (wxLUA_USE_wxLuaHtmlWindow) && (wxCHECK_VERSION(2,8,0)) static wxLuaArgTag s_wxluatagArray_wxLua_wxLuaHtmlWinTagEvent_GetHtmlParser[] = { &s_wxluatag_wxLuaHtmlWinTagEvent, NULL }; static int LUACALL wxLua_wxLuaHtmlWinTagEvent_GetHtmlParser(lua_State *L); --- 231,235 ---- int s_wxluatag_wxLuaHtmlWinTagEvent = -1; ! #if (wxLUA_USE_wxLuaHtmlWindow) && (wxLUA_USE_wxHTML && wxUSE_HTML) static wxLuaArgTag s_wxluatagArray_wxLua_wxLuaHtmlWinTagEvent_GetHtmlParser[] = { &s_wxluatag_wxLuaHtmlWinTagEvent, NULL }; static int LUACALL wxLua_wxLuaHtmlWinTagEvent_GetHtmlParser(lua_State *L); *************** *** 268,272 **** } ! #endif // (wxLUA_USE_wxLuaHtmlWindow) && (wxCHECK_VERSION(2,8,0)) static wxLuaArgTag s_wxluatagArray_wxLua_wxLuaHtmlWinTagEvent_GetParseInnerCalled[] = { &s_wxluatag_wxLuaHtmlWinTagEvent, NULL }; --- 268,272 ---- } ! #endif // (wxLUA_USE_wxLuaHtmlWindow) && (wxLUA_USE_wxHTML && wxUSE_HTML) static wxLuaArgTag s_wxluatagArray_wxLua_wxLuaHtmlWinTagEvent_GetParseInnerCalled[] = { &s_wxluatag_wxLuaHtmlWinTagEvent, NULL }; *************** *** 328,335 **** // Map Lua Class Methods to C Binding Functions wxLuaBindMethod wxLuaHtmlWinTagEvent_methods[] = { ! #if (wxLUA_USE_wxLuaHtmlWindow) && (wxCHECK_VERSION(2,8,0)) { "GetHtmlParser", WXLUAMETHOD_METHOD, s_wxluafunc_wxLua_wxLuaHtmlWinTagEvent_GetHtmlParser, 1, NULL }, { "GetHtmlTag", WXLUAMETHOD_METHOD, s_wxluafunc_wxLua_wxLuaHtmlWinTagEvent_GetHtmlTag, 1, NULL }, ! #endif // (wxLUA_USE_wxLuaHtmlWindow) && (wxCHECK_VERSION(2,8,0)) { "GetParseInnerCalled", WXLUAMETHOD_METHOD, s_wxluafunc_wxLua_wxLuaHtmlWinTagEvent_GetParseInnerCalled, 1, NULL }, --- 328,335 ---- // Map Lua Class Methods to C Binding Functions wxLuaBindMethod wxLuaHtmlWinTagEvent_methods[] = { ! #if (wxLUA_USE_wxLuaHtmlWindow) && (wxLUA_USE_wxHTML && wxUSE_HTML) { "GetHtmlParser", WXLUAMETHOD_METHOD, s_wxluafunc_wxLua_wxLuaHtmlWinTagEvent_GetHtmlParser, 1, NULL }, { "GetHtmlTag", WXLUAMETHOD_METHOD, s_wxluafunc_wxLua_wxLuaHtmlWinTagEvent_GetHtmlTag, 1, NULL }, ! #endif // (wxLUA_USE_wxLuaHtmlWindow) && (wxLUA_USE_wxHTML && wxUSE_HTML) { "GetParseInnerCalled", WXLUAMETHOD_METHOD, s_wxluafunc_wxLua_wxLuaHtmlWinTagEvent_GetParseInnerCalled, 1, NULL }, Index: image.cpp =================================================================== RCS file: /cvsroot/wxlua/wxLua/modules/wxbind/src/image.cpp,v retrieving revision 1.48 retrieving revision 1.49 diff -C2 -d -r1.48 -r1.49 *** image.cpp 18 Jun 2007 14:55:02 -0000 1.48 --- image.cpp 18 Jun 2007 21:40:46 -0000 1.49 *************** *** 3247,3251 **** ! #if (wxUSE_ICO_CUR) && (wxUSE_IFF) // --------------------------------------------------------------------------- // Bind class wxIFFHandler --- 3247,3251 ---- ! #if (wxLUA_USE_wxImage && wxUSE_IMAGE) && (wxUSE_IFF) // --------------------------------------------------------------------------- // Bind class wxIFFHandler *************** *** 3285,3292 **** int wxIFFHandler_methodCount = sizeof(wxIFFHandler_methods)/sizeof(wxLuaBindMethod) - 1; ! #endif // (wxUSE_ICO_CUR) && (wxUSE_IFF) ! #if (wxUSE_IFF) && (wxUSE_GIF) // --------------------------------------------------------------------------- // Bind class wxGIFHandler --- 3285,3292 ---- int wxIFFHandler_methodCount = sizeof(wxIFFHandler_methods)/sizeof(wxLuaBindMethod) - 1; ! #endif // (wxLUA_USE_wxImage && wxUSE_IMAGE) && (wxUSE_IFF) ! #if (wxLUA_USE_wxImage && wxUSE_IMAGE) && (wxUSE_GIF) // --------------------------------------------------------------------------- // Bind class wxGIFHandler *************** *** 3326,3333 **** int wxGIFHandler_methodCount = sizeof(wxGIFHandler_methods)/sizeof(wxLuaBindMethod) - 1; ! #endif // (wxUSE_IFF) && (wxUSE_GIF) ! #if (wxUSE_GIF) && (wxUSE_LIBJPEG) // --------------------------------------------------------------------------- // Bind class wxJPEGHandler --- 3326,3333 ---- int wxGIFHandler_methodCount = sizeof(wxGIFHandler_methods)/sizeof(wxLuaBindMethod) - 1; ! #endif // (wxLUA_USE_wxImage && wxUSE_IMAGE) && (wxUSE_GIF) ! #if (wxLUA_USE_wxImage && wxUSE_IMAGE) && (wxUSE_LIBJPEG) // --------------------------------------------------------------------------- // Bind class wxJPEGHandler *************** *** 3367,3374 **** int wxJPEGHandler_methodCount = sizeof(wxJPEGHandler_methods)/sizeof(wxLuaBindMethod) - 1; ! #endif // (wxUSE_GIF) && (wxUSE_LIBJPEG) ! #if (wxUSE_LIBJPEG) && (wxUSE_PCX) // --------------------------------------------------------------------------- // Bind class wxPCXHandler --- 3367,3374 ---- int wxJPEGHandler_methodCount = sizeof(wxJPEGHandler_methods)/sizeof(wxLuaBindMethod) - 1; ! #endif // (wxLUA_USE_wxImage && wxUSE_IMAGE) && (wxUSE_LIBJPEG) ! #if (wxLUA_USE_wxImage && wxUSE_IMAGE) && (wxUSE_PCX) // --------------------------------------------------------------------------- // Bind class wxPCXHandler *************** *** 3408,3415 **** int wxPCXHandler_methodCount = sizeof(wxPCXHandler_methods)/sizeof(wxLuaBindMethod) - 1; ! #endif // (wxUSE_LIBJPEG) && (wxUSE_PCX) ! #if (wxUSE_PCX) && (wxUSE_LIBPNG) // --------------------------------------------------------------------------- // Bind class wxPNGHandler --- 3408,3415 ---- int wxPCXHandler_methodCount = sizeof(wxPCXHandler_methods)/sizeof(wxLuaBindMethod) - 1; ! #endif // (wxLUA_USE_wxImage && wxUSE_IMAGE) && (wxUSE_PCX) ! #if (wxLUA_USE_wxImage && wxUSE_IMAGE) && (wxUSE_LIBPNG) // --------------------------------------------------------------------------- // Bind class wxPNGHandler *************** *** 3449,3456 **** int wxPNGHandler_methodCount = sizeof(wxPNGHandler_methods)/sizeof(wxLuaBindMethod) - 1; ! #endif // (wxUSE_PCX) && (wxUSE_LIBPNG) ! #if (wxUSE_LIBPNG) && (wxUSE_PNM) // --------------------------------------------------------------------------- // Bind class wxPNMHandler --- 3449,3456 ---- int wxPNGHandler_methodCount = sizeof(wxPNGHandler_methods)/sizeof(wxLuaBindMethod) - 1; ! #endif // (wxLUA_USE_wxImage && wxUSE_IMAGE) && (wxUSE_LIBPNG) ! #if (wxLUA_USE_wxImage && wxUSE_IMAGE) && (wxUSE_PNM) // --------------------------------------------------------------------------- // Bind class wxPNMHandler *************** *** 3490,3497 **** int wxPNMHandler_methodCount = sizeof(wxPNMHandler_methods)/sizeof(wxLuaBindMethod) - 1; ! #endif // (wxUSE_LIBPNG) && (wxUSE_PNM) ! #if (wxUSE_PNM) && (wxUSE_LIBTIFF) // --------------------------------------------------------------------------- // Bind class wxTIFFHandler --- 3490,3497 ---- int wxPNMHandler_methodCount = sizeof(wxPNMHandler_methods)/sizeof(wxLuaBindMethod) - 1; ! #endif // (wxLUA_USE_wxImage && wxUSE_IMAGE) && (wxUSE_PNM) ! #if (wxLUA_USE_wxImage && wxUSE_IMAGE) && (wxUSE_LIBTIFF) // --------------------------------------------------------------------------- // Bind class wxTIFFHandler *************** *** 3531,3538 **** int wxTIFFHandler_methodCount = sizeof(wxTIFFHandler_methods)/sizeof(wxLuaBindMethod) - 1; ! #endif // (wxUSE_PNM) && (wxUSE_LIBTIFF) ! #if (wxUSE_LIBTIFF) && (wxCHECK_VERSION(2,8,0) && wxUSE_TGA) // --------------------------------------------------------------------------- // Bind class wxTGAHandler --- 3531,3538 ---- int wxTIFFHandler_methodCount = sizeof(wxTIFFHandler_methods)/sizeof(wxLuaBindMethod) - 1; ! #endif // (wxLUA_USE_wxImage && wxUSE_IMAGE) && (wxUSE_LIBTIFF) ! #if (wxLUA_USE_wxImage && wxUSE_IMAGE) && (wxCHECK_VERSION(2,8,0) && wxUSE_TGA) // --------------------------------------------------------------------------- // Bind class wxTGAHandler *************** *** 3572,3579 **** int wxTGAHandler_methodCount = sizeof(wxTGAHandler_methods)/sizeof(wxLuaBindMethod) - 1; ! #endif // (wxUSE_LIBTIFF) && (wxCHECK_VERSION(2,8,0) && wxUSE_TGA) ! #if wxCHECK_VERSION(2,8,0) && wxUSE_TGA // --------------------------------------------------------------------------- // Bind class wxXPMHandler --- 3572,3579 ---- int wxTGAHandler_methodCount = sizeof(wxTGAHandler_methods)/sizeof(wxLuaBindMethod) - 1; ! #endif // (wxLUA_USE_wxImage && wxUSE_IMAGE) && (wxCHECK_VERSION(2,8,0) && wxUSE_TGA) ! #if wxLUA_USE_wxImage && wxUSE_IMAGE // --------------------------------------------------------------------------- // Bind class wxXPMHandler *************** *** 3613,3617 **** int wxXPMHandler_methodCount = sizeof(wxXPMHandler_methods)/sizeof(wxLuaBindMethod) - 1; ! #endif // wxCHECK_VERSION(2,8,0) && wxUSE_TGA --- 3613,3617 ---- int wxXPMHandler_methodCount = sizeof(wxXPMHandler_methods)/sizeof(wxLuaBindMethod) - 1; ! #endif // wxLUA_USE_wxImage && wxUSE_IMAGE *************** *** 3645,3649 **** #endif // (wxLUA_USE_wxArtProvider) && ((wxLUA_USE_wxArtProvider) && (wxCHECK_VERSION(2,8,0))) ! #if ((wxLUA_USE_wxBitmap) && (wxLUA_USE_wxPointSizeRect)) && (wxCHECK_VERSION(2,8,0)) static wxLuaArgTag s_wxluatagArray_wxLua_wxArtProvider_GetBitmap[] = { &s_wxluaarg_String, &s_wxluaarg_String, &s_wxluatag_wxSize, NULL }; static int LUACALL wxLua_wxArtProvider_GetBitmap(lua_State *L); --- 3645,3649 ---- #endif // (wxLUA_USE_wxArtProvider) && ((wxLUA_USE_wxArtProvider) && (wxCHECK_VERSION(2,8,0))) ! #if ((wxLUA_USE_wxBitmap) && (wxLUA_USE_wxPointSizeRect)) && (wxLUA_USE_wxArtProvider) static wxLuaArgTag s_wxluatagArray_wxLua_wxArtProvider_GetBitmap[] = { &s_wxluaarg_String, &s_wxluaarg_String, &s_wxluatag_wxSize, NULL }; static int LUACALL wxLua_wxArtProvider_GetBitmap(lua_State *L); *************** *** 3673,3679 **** } ! #endif // ((wxLUA_USE_wxBitmap) && (wxLUA_USE_wxPointSizeRect)) && (wxCHECK_VERSION(2,8,0)) ! #if ((wxLUA_USE_wxIcon) && (wxLUA_USE_wxPointSizeRect)) && (wxCHECK_VERSION(2,8,0)) static wxLuaArgTag s_wxluatagArray_wxLua_wxArtProvider_GetIcon[] = { &s_wxluaarg_String, &s_wxluaarg_String, &s_wxluatag_wxSize, NULL }; static int LUACALL wxLua_wxArtProvider_GetIcon(lua_State *L); --- 3673,3679 ---- } ! #endif // ((wxLUA_USE_wxBitmap) && (wxLUA_USE_wxPointSizeRect)) && (wxLUA_USE_wxArtProvider) ! #if ((wxLUA_USE_wxIcon) && (wxLUA_USE_wxPointSizeRect)) && (wxLUA_USE_wxArtProvider) static wxLuaArgTag s_wxluatagArray_wxLua_wxArtProvider_GetIcon[] = { &s_wxluaarg_String, &s_wxluaarg_String, &s_wxluatag_wxSize, NULL }; static int LUACALL wxLua_wxArtProvider_GetIcon(lua_State *L); *************** *** 3703,3709 **** } ! #endif // ((wxLUA_USE_wxIcon) && (wxLUA_USE_wxPointSizeRect)) && (wxCHECK_VERSION(2,8,0)) ! #if (wxLUA_USE_wxPointSizeRect) && (wxCHECK_VERSION(2,8,0)) static wxLuaArgTag s_wxluatagArray_wxLua_wxArtProvider_GetSizeHint[] = { &s_wxluaarg_String, &s_wxluaarg_Boolean, NULL }; static int LUACALL wxLua_wxArtProvider_GetSizeHint(lua_State *L); --- 3703,3709 ---- } ! #endif // ((wxLUA_USE_wxIcon) && (wxLUA_USE_wxPointSizeRect)) && (wxLUA_USE_wxArtProvider) ! #if (wxLUA_USE_wxPointSizeRect) && (wxLUA_USE_wxArtProvider) static wxLuaArgTag s_wxluatagArray_wxLua_wxArtProvider_GetSizeHint[] = { &s_wxluaarg_String, &s_wxluaarg_Boolean, NULL }; static int LUACALL wxLua_wxArtProvider_GetSizeHint(lua_State *L); *************** *** 3731,3735 **** } ! #endif // (wxLUA_USE_wxPointSizeRect) && (wxCHECK_VERSION(2,8,0)) #if (wxLUA_USE_wxArtProvider) && ((wxLUA_USE_wxArtProvider) && (wxCHECK_VERSION(2,8,0))) --- 3731,3735 ---- } ! #endif // (wxLUA_USE_wxPointSizeRect) && (wxLUA_USE_wxArtProvider) #if (wxLUA_USE_wxArtProvider) && ((wxLUA_USE_wxArtProvider) && (wxCHECK_VERSION(2,8,0))) *************** *** 3812,3826 **** #endif // (wxLUA_USE_wxArtProvider) && ((wxLUA_USE_wxArtProvider) && (wxCHECK_VERSION(2,8,0))) ! #if ((wxLUA_USE_wxBitmap) && (wxLUA_USE_wxPointSizeRect)) && (wxCHECK_VERSION(2,8,0)) { "GetBitmap", WXLUAMETHOD_METHOD|WXLUAMETHOD_STATIC, s_wxluafunc_wxLua_wxArtProvider_GetBitmap, 1, NULL }, ! #endif // ((wxLUA_USE_wxBitmap) && (wxLUA_USE_wxPointSizeRect)) && (wxCHECK_VERSION(2,8,0)) ! #if ((wxLUA_USE_wxIcon) && (wxLUA_USE_wxPointSizeRect)) && (wxCHECK_VERSION(2,8,0)) { "GetIcon", WXLUAMETHOD_METHOD|WXLUAMETHOD_STATIC, s_wxluafunc_wxLua_wxArtProvider_GetIcon, 1, NULL }, ! #endif // ((wxLUA_USE_wxIcon) && (wxLUA_USE_wxPointSizeRect)) && (wxCHECK_VERSION(2,8,0)) ! #if (wxLUA_USE_wxPointSizeRect) && (wxCHECK_VERSION(2,8,0)) { "GetSizeHint", WXLUAMETHOD_METHOD|WXLUAMETHOD_STATIC, s_wxluafunc_wxLua_wxArtProvider_GetSizeHint, 1, NULL }, ! #endif // (wxLUA_USE_wxPointSizeRect) && (wxCHECK_VERSION(2,8,0)) #if (wxLUA_USE_wxArtProvider) && ((wxLUA_USE_wxArtProvider) && (wxCHECK_VERSION(2,8,0))) --- 3812,3826 ---- #endif // (wxLUA_USE_wxArtProvider) && ((wxLUA_USE_wxArtProvider) && (wxCHECK_VERSION(2,8,0))) ! #if ((wxLUA_USE_wxBitmap) && (wxLUA_USE_wxPointSizeRect)) && (wxLUA_USE_wxArtProvider) { "GetBitmap", WXLUAMETHOD_METHOD|WXLUAMETHOD_STATIC, s_wxluafunc_wxLua_wxArtProvider_GetBitmap, 1, NULL }, ! #endif // ((wxLUA_USE_wxBitmap) && (wxLUA_USE_wxPointSizeRect)) && (wxLUA_USE_wxArtProvider) ! #if ((wxLUA_USE_wxIcon) && (wxLUA_USE_wxPointSizeRect)) && (wxLUA_USE_wxArtProvider) { "GetIcon", WXLUAMETHOD_METHOD|WXLUAMETHOD_STATIC, s_wxluafunc_wxLua_wxArtProvider_GetIcon, 1, NULL }, ! #endif // ((wxLUA_USE_wxIcon) && (wxLUA_USE_wxPointSizeRect)) && (wxLUA_USE_wxArtProvider) ! #if (wxLUA_USE_wxPointSizeRect) && (wxLUA_USE_wxArtProvider) { "GetSizeHint", WXLUAMETHOD_METHOD|WXLUAMETHOD_STATIC, s_wxluafunc_wxLua_wxArtProvider_GetSizeHint, 1, NULL }, ! #endif // (wxLUA_USE_wxPointSizeRect) && (wxLUA_USE_wxArtProvider) #if (wxLUA_USE_wxArtProvider) && ((wxLUA_USE_wxArtProvider) && (wxCHECK_VERSION(2,8,0))) Index: picker.cpp =================================================================== RCS file: /cvsroot/wxlua/wxLua/modules/wxbind/src/picker.cpp,v retrieving revision 1.2 retrieving revision 1.3 diff -C2 -d -r1.2 -r1.3 *** picker.cpp 18 Jun 2007 14:55:02 -0000 1.2 --- picker.cpp 18 Jun 2007 21:40:46 -0000 1.3 *************** *** 343,347 **** int s_wxluatag_wxColourPickerCtrl = -1; ! #if (wxCHECK_VERSION(2,8,0)) && ((wxchkver_2_8 && wxLUA_USE_wxPicker) && (wxLUA_USE_wxColourPickerCtrl && wxUSE_COLOURPICKERCTRL)) static wxLuaArgTag s_wxluatagArray_wxLua_wxColourPickerCtrl_GetColour[] = { &s_wxluatag_wxColourPickerCtrl, NULL }; static int LUACALL wxLua_wxColourPickerCtrl_GetColour(lua_State *L); --- 343,347 ---- int s_wxluatag_wxColourPickerCtrl = -1; ! #if (wxLUA_USE_wxColourPenBrush) && ((wxchkver_2_8 && wxLUA_USE_wxPicker) && (wxLUA_USE_wxColourPickerCtrl && wxUSE_COLOURPICKERCTRL)) static wxLuaArgTag s_wxluatagArray_wxLua_wxColourPickerCtrl_GetColour[] = { &s_wxluatag_wxColourPickerCtrl, NULL }; static int LUACALL wxLua_wxColourPickerCtrl_GetColour(lua_State *L); *************** *** 365,369 **** } ! #endif // (wxCHECK_VERSION(2,8,0)) && ((wxchkver_2_8 && wxLUA_USE_wxPicker) && (wxLUA_USE_wxColourPickerCtrl && wxUSE_COLOURPICKERCTRL)) static wxLuaArgTag s_wxluatagArray_wxLua_wxColourPickerCtrl_SetColour1[] = { &s_wxluatag_wxColourPickerCtrl, &s_wxluaarg_String, NULL }; --- 365,369 ---- } ! #endif // (wxLUA_USE_wxColourPenBrush) && ((wxchkver_2_8 && wxLUA_USE_wxPicker) && (wxLUA_USE_wxColourPickerCtrl && wxUSE_COLOURPICKERCTRL)) static wxLuaArgTag s_wxluatagArray_wxLua_wxColourPickerCtrl_SetColour1[] = { &s_wxluatag_wxColourPickerCtrl, &s_wxluaarg_String, NULL }; *************** *** 388,392 **** ! #if (wxCHECK_VERSION(2,8,0)) && ((wxchkver_2_8 && wxLUA_USE_wxPicker) && (wxLUA_USE_wxColourPickerCtrl && wxUSE_COLOURPICKERCTRL)) static wxLuaArgTag s_wxluatagArray_wxLua_wxColourPickerCtrl_SetColour[] = { &s_wxluatag_wxColourPickerCtrl, &s_wxluatag_wxColour, NULL }; static int LUACALL wxLua_wxColourPickerCtrl_SetColour(lua_State *L); --- 388,392 ---- ! #if (wxLUA_USE_wxColourPenBrush) && ((wxchkver_2_8 && wxLUA_USE_wxPicker) && (wxLUA_USE_wxColourPickerCtrl && wxUSE_COLOURPICKERCTRL)) static wxLuaArgTag s_wxluatagArray_wxLua_wxColourPickerCtrl_SetColour[] = { &s_wxluatag_wxColourPickerCtrl, &s_wxluatag_wxColour, NULL }; static int LUACALL wxLua_wxColourPickerCtrl_SetColour(lua_State *L); *************** *** 406,412 **** } ! #endif // (wxCHECK_VERSION(2,8,0)) && ((wxchkver_2_8 && wxLUA_USE_wxPicker) && (wxLUA_USE_wxColourPickerCtrl && wxUSE_COLOURPICKERCTRL)) ! #if (((wxLUA_USE_wxValidator && wxUSE_VALIDATORS) && ((wxchkver_2_8 && wxLUA_USE_wxPicker) && (wxLUA_USE_wxColourPickerCtrl && wxUSE_COLOURPICKERCTRL))) && (wxLUA_USE_wxPointSizeRect)) && (wxCHECK_VERSION(2,8,0)) static wxLuaArgTag s_wxluatagArray_wxLua_wxColourPickerCtrl_constructor1[] = { &s_wxluatag_wxWindow, &s_wxluaarg_Number, &s_wxluatag_wxColour, &s_wxluatag_wxPoint, &s_wxluatag_wxSize, &s_wxluaarg_Number, &s_wxluatag_wxValidator, &s_wxluaarg_String, NULL }; static int LUACALL wxLua_wxColourPickerCtrl_constructor1(lua_State *L); --- 406,412 ---- } ! #endif // (wxLUA_USE_wxColourPenBrush) && ((wxchkver_2_8 && wxLUA_USE_wxPicker) && (wxLUA_USE_wxColourPickerCtrl && wxUSE_COLOURPICKERCTRL)) ! #if (((wxLUA_USE_wxColourPenBrush) && ((wxchkver_2_8 && wxLUA_USE_wxPicker) && (wxLUA_USE_wxColourPickerCtrl && wxUSE_COLOURPICKERCTRL))) && (wxLUA_USE_wxValidator && wxUSE_VALIDATORS)) && (wxLUA_USE_wxPointSizeRect) static wxLuaArgTag s_wxluatagArray_wxLua_wxColourPickerCtrl_constructor1[] = { &s_wxluatag_wxWindow, &s_wxluaarg_Number, &s_wxluatag_wxColour, &s_wxluatag_wxPoint, &s_wxluatag_wxSize, &s_wxluaarg_Number, &s_wxluatag_wxValidator, &s_wxluaarg_String, NULL }; static int LUACALL wxLua_wxColourPickerCtrl_constructor1(lua_State *L); *************** *** 446,450 **** } ! #endif // (((wxLUA_USE_wxValidator && wxUSE_VALIDATORS) && ((wxchkver_2_8 && wxLUA_USE_wxPicker) && (wxLUA_USE_wxColourPickerCtrl && wxUSE_COLOURPICKERCTRL))) && (wxLUA_USE_wxPointSizeRect)) && (wxCHECK_VERSION(2,8,0)) static int LUACALL wxLua_wxColourPickerCtrl_constructor(lua_State *L); --- 446,450 ---- } ! #endif // (((wxLUA_USE_wxColourPenBrush) && ((wxchkver_2_8 && wxLUA_USE_wxPicker) && (wxLUA_USE_wxColourPickerCtrl && wxUSE_COLOURPICKERCTRL))) && (wxLUA_USE_wxValidator && wxUSE_VALIDATORS)) && (wxLUA_USE_wxPointSizeRect) static int LUACALL wxLua_wxColourPickerCtrl_constructor(lua_State *L); *************** *** 469,473 **** ! #if ((wxchkver_2_8 && wxLUA_USE_wxPicker) && (wxLUA_USE_wxColourPickerCtrl && wxUSE_COLOURPICKERCTRL))||((wxCHECK_VERSION(2,8,0)) && ((wxchkver_2_8 && wxLUA_USE_wxPicker) && (wxLUA_USE_wxColourPickerCtrl && wxUSE_COLOURPICKERCTRL))) static int LUACALL wxLua_wxColourPickerCtrl_SetColour_overload(lua_State *L); // function overload table --- 469,473 ---- ! #if ((wxchkver_2_8 && wxLUA_USE_wxPicker) && (wxLUA_USE_wxColourPickerCtrl && wxUSE_COLOURPICKERCTRL))||((wxLUA_USE_wxColourPenBrush) && ((wxchkver_2_8 && wxLUA_USE_wxPicker) && (wxLUA_USE_wxColourPickerCtrl && wxUSE_COLOURPICKERCTRL))) static int LUACALL wxLua_wxColourPickerCtrl_SetColour_overload(lua_State *L); // function overload table *************** *** 477,483 **** { wxLua_wxColourPickerCtrl_SetColour1, WXLUAMETHOD_METHOD, 2, 2, s_wxluatagArray_wxLua_wxColourPickerCtrl_SetColour1 }, ! #if (wxCHECK_VERSION(2,8,0)) && ((wxchkver_2_8 && wxLUA_USE_wxPicker) && (wxLUA_USE_wxColourPickerCtrl && wxUSE_COLOURPICKERCTRL)) { wxLua_wxColourPickerCtrl_SetColour, WXLUAMETHOD_METHOD, 2, 2, s_wxluatagArray_wxLua_wxColourPickerCtrl_SetColour }, ! #endif // (wxCHECK_VERSION(2,8,0)) && ((wxchkver_2_8 && wxLUA_USE_wxPicker) && (wxLUA_USE_wxColourPickerCtrl && wxUSE_COLOURPICKERCTRL)) }; static int s_wxluafunc_wxLua_wxColourPickerCtrl_SetColour_overload_count = sizeof(s_wxluafunc_wxLua_wxColourPickerCtrl_SetColour_overload)/sizeof(wxLuaBindCFunc); --- 477,483 ---- { wxLua_wxColourPickerCtrl_SetColour1, WXLUAMETHOD_METHOD, 2, 2, s_wxluatagArray_wxLua_wxColourPickerCtrl_SetColour1 }, ! #if (wxLUA_USE_wxColourPenBrush) && ((wxchkver_2_8 && wxLUA_USE_wxPicker) && (wxLUA_USE_wxColourPickerCtrl && wxUSE_COLOURPICKERCTRL)) { wxLua_wxColourPickerCtrl_SetColour, WXLUAMETHOD_METHOD, 2, 2, s_wxluatagArray_wxLua_wxColourPickerCtrl_SetColour }, ! #endif // (wxLUA_USE_wxColourPenBrush) && ((wxchkver_2_8 && wxLUA_USE_wxPicker) && (wxLUA_USE_wxColourPickerCtrl && wxUSE_COLOURPICKERCTRL)) }; static int s_wxluafunc_wxLua_wxColourPickerCtrl_SetColour_overload_count = sizeof(s_wxluafunc_wxLua_wxColourPickerCtrl_SetColour_overload)/sizeof(wxLuaBindCFunc); *************** *** 490,496 **** return wxlState.CallOverloadedFunction(&overload_method); } ! #endif // ((wxchkver_2_8 && wxLUA_USE_wxPicker) && (wxLUA_USE_wxColourPickerCtrl && wxUSE_COLOURPICKERCTRL))||((wxCHECK_VERSION(2,8,0)) && ((wxchkver_2_8 && wxLUA_USE_wxPicker) && (wxLUA_USE_wxColourPickerCtrl && wxUSE_COLOURPICKERCTRL))) ! #if ((((wxLUA_USE_wxValidator && wxUSE_VALIDATORS) && ((wxchkver_2_8 && wxLUA_USE_wxPicker) && (wxLUA_USE_wxColourPickerCtrl && wxUSE_COLOURPICKERCTRL))) && (wxLUA_USE_wxPointSizeRect)) && (wxCHECK_VERSION(2,8,0)))||((wxchkver_2_8 && wxLUA_USE_wxPicker) && (wxLUA_USE_wxColourPickerCtrl && wxUSE_COLOURPICKERCTRL)) static int LUACALL wxLua_wxColourPickerCtrl_constructor_overload(lua_State *L); // function overload table --- 490,496 ---- return wxlState.CallOverloadedFunction(&overload_method); } ! #endif // ((wxchkver_2_8 && wxLUA_USE_wxPicker) && (wxLUA_USE_wxColourPickerCtrl && wxUSE_COLOURPICKERCTRL))||((wxLUA_USE_wxColourPenBrush) && ((wxchkver_2_8 && wxLUA_USE_wxPicker) && (wxLUA_USE_wxColourPickerCtrl && wxUSE_COLOURPICKERCTRL))) ! #if ((((wxLUA_USE_wxColourPenBrush) && ((wxchkver_2_8 && wxLUA_USE_wxPicker) && (wxLUA_USE_wxColourPickerCtrl && wxUSE_COLOURPICKERCTRL))) && (wxLUA_USE_wxValidator && wxUSE_VALIDATORS)) && (wxLUA_USE_wxPointSizeRect))||((wxchkver_2_8 && wxLUA_USE_wxPicker) && (wxLUA_USE_wxColourPickerCtrl && wxUSE_COLOURPICKERCTRL)) static int LUACALL wxLua_wxColourPickerCtrl_constructor_overload(lua_State *L); // function overload table *************** *** 499,505 **** { wxLua_wxColourPickerCtrl_constructor_overload, WXLUAMETHOD_METHOD|WXLUAMETHOD_OVERLOAD, 0, 8, s_wxluaargArray_None }, ! #if (((wxLUA_USE_wxValidator && wxUSE_VALIDATORS) && ((wxchkver_2_8 && wxLUA_USE_wxPicker) && (wxLUA_USE_wxColourPickerCtrl && wxUSE_COLOURPICKERCTRL))) && (wxLUA_USE_wxPointSizeRect)) && (wxCHECK_VERSION(2,8,0)) { wxLua_wxColourPickerCtrl_constructor1, WXLUAMETHOD_CONSTRUCTOR, 3, 8, s_wxluatagArray_wxLua_wxColourPickerCtrl_constructor1 }, ! #endif // (((wxLUA_USE_wxValidator && wxUSE_VALIDATORS) && ((wxchkver_2_8 && wxLUA_USE_wxPicker) && (wxLUA_USE_wxColourPickerCtrl && wxUSE_COLOURPICKERCTRL))) && (wxLUA_USE_wxPointSizeRect)) && (wxCHECK_VERSION(2,8,0)) { wxLua_wxColourPickerCtrl_constructor, WXLUAMETHOD_CONSTRUCTOR, 0, 0, s_wxluaargArray_None }, }; --- 499,505 ---- { wxLua_wxColourPickerCtrl_constructor_overload, WXLUAMETHOD_METHOD|WXLUAMETHOD_OVERLOAD, 0, 8, s_wxluaargArray_None }, ! #if (((wxLUA_USE_wxColourPenBrush) && ((wxchkver_2_8 && wxLUA_USE_wxPicker) && (wxLUA_USE_wxColourPickerCtrl && wxUSE_COLOURPICKERCTRL))) && (wxLUA_USE_wxValidator && wxUSE_VALIDATORS)) && (wxLUA_USE_wxPointSizeRect) { wxLua_wxColourPickerCtrl_constructor1, WXLUAMETHOD_CONSTRUCTOR, 3, 8, s_wxluatagArray_wxLua_wxColourPickerCtrl_constructor1 }, ! #endif // (((wxLUA_USE_wxColourPenBrush) && ((wxchkver_2_8 && wxLUA_USE_wxPicker) && (wxLUA_USE_wxColourPickerCtrl && wxUSE_COLOURPICKERCTRL))) && (wxLUA_USE_wxValidator && wxUSE_VALIDATORS)) && (wxLUA_USE_wxPointSizeRect) { wxLua_wxColourPickerCtrl_constructor, WXLUAMETHOD_CONSTRUCTOR, 0, 0, s_wxluaargArray_None }, }; *************** *** 513,531 **** return wxlState.CallOverloadedFunction(&overload_method); } ! #endif // ((((wxLUA_USE_wxValidator && wxUSE_VALIDATORS) && ((wxchkver_2_8 && wxLUA_USE_wxPicker) && (wxLUA_USE_wxColourPickerCtrl && wxUSE_COLOURPICKERCTRL))) && (wxLUA_USE_wxPointSizeRect)) && (wxCHECK_VERSION(2,8,0)))||((wxchkver_2_8 && wxLUA_USE_wxPicker) && (wxLUA_USE_wxColourPickerCtrl && wxUSE_COLOURPICKERCTRL)) // Map Lua Class Methods to C Binding Functions wxLuaBindMethod wxColourPickerCtrl_methods[] = { ! #if (wxCHECK_VERSION(2,8,0)) && ((wxchkver_2_8 && wxLUA_USE_wxPicker) && (wxLUA_USE_wxColourPickerCtrl && wxUSE_COLOURPICKERCTRL)) { "GetColour", WXLUAMETHOD_METHOD, s_wxluafunc_wxLua_wxColourPickerCtrl_GetColour, 1, NULL }, ! #endif // (wxCHECK_VERSION(2,8,0)) && ((wxchkver_2_8 && wxLUA_USE_wxPicker) && (wxLUA_USE_wxColourPickerCtrl && wxUSE_COLOURPICKERCTRL)) ! #if ((wxchkver_2_8 && wxLUA_USE_wxPicker) && (wxLUA_USE_wxColourPickerCtrl && wxUSE_COLOURPICKERCTRL))||((wxCHECK_VERSION(2,8,0)) && ((wxchkver_2_8 && wxLUA_USE_wxPicker) && (wxLUA_USE_wxColourPickerCtrl && wxUSE_COLOURPICKERCTRL))) { "SetColour", WXLUAMETHOD_METHOD, s_wxluafunc_wxLua_wxColourPickerCtrl_SetColour_overload, s_wxluafunc_wxLua_wxColourPickerCtrl_SetColour_overload_count, 0 }, ! #endif // ((wxchkver_2_8 && wxLUA_USE_wxPicker) && (wxLUA_USE_wxColourPickerCtrl && wxUSE_COLOURPICKERCTRL))||((wxCHECK_VERSION(2,8,0)) && ((wxchkver_2_8 && wxLUA_USE_wxPicker) && (wxLUA_USE_wxColourPickerCtrl && wxUSE_COLOURPICKERCTRL))) ! #if ((((wxLUA_USE_wxValidator && wxUSE_VALIDATORS) && ((wxchkver_2_8 && wxLUA_USE_wxPicker) && (wxLUA_USE_wxColourPickerCtrl && wxUSE_COLOURPICKERCTRL))) && (wxLUA_USE_wxPointSizeRect)) && (wxCHECK_VERSION(2,8,0)))||((wxchkver_2_8 && wxLUA_USE_wxPicker) && (wxLUA_USE_wxColourPickerCtrl && wxUSE_COLOURPICKERCTRL)) { "wxColourPickerCtrl", WXLUAMETHOD_CONSTRUCTOR, s_wxluafunc_wxLua_wxColourPickerCtrl_constructor_overload, s_wxluafunc_wxLua_wxColourPickerCtrl_constructor_overload_count, 0 }, ! #endif // ((((wxLUA_USE_wxValidator && wxUSE_VALIDATORS) && ((wxchkver_2_8 && wxLUA_USE_wxPicker) && (wxLUA_USE_wxColourPickerCtrl && wxUSE_COLOURPICKERCTRL))) && (wxLUA_USE_wxPointSizeRect)) && (wxCHECK_VERSION(2,8,0)))||((wxchkver_2_8 && wxLUA_USE_wxPicker) && (wxLUA_USE_wxColourPickerCtrl && wxUSE_COLOURPICKERCTRL)) { 0, 0, 0, 0 }, --- 513,531 ---- return wxlState.CallOverloadedFunction(&overload_method); } ! #endif // ((((wxLUA_USE_wxColourPenBrush) && ((wxchkver_2_8 && wxLUA_USE_wxPicker) && (wxLUA_USE_wxColourPickerCtrl && wxUSE_COLOURPICKERCTRL))) && (wxLUA_USE_wxValidator && wxUSE_VALIDATORS)) && (wxLUA_USE_wxPointSizeRect))||((wxchkver_2_8 && wxLUA_USE_wxPicker) && (wxLUA_USE_wxColourPickerCtrl && wxUSE_COLOURPICKERCTRL)) // Map Lua Class Methods to C Binding Functions wxLuaBindMethod wxColourPickerCtrl_methods[] = { ! #if (wxLUA_USE_wxColourPenBrush) && ((wxchkver_2_8 && wxLUA_USE_wxPicker) && (wxLUA_USE_wxColourPickerCtrl && wxUSE_COLOURPICKERCTRL)) { "GetColour", WXLUAMETHOD_METHOD, s_wxluafunc_wxLua_wxColourPickerCtrl_GetColour, 1, NULL }, ! #endif // (wxLUA_USE_wxColourPenBrush) && ((wxchkver_2_8 && wxLUA_USE_wxPicker) && (wxLUA_USE_wxColourPickerCtrl && wxUSE_COLOURPICKERCTRL)) ! #if ((wxchkver_2_8 && wxLUA_USE_wxPicker) && (wxLUA_USE_wxColourPickerCtrl && wxUSE_COLOURPICKERCTRL))||((wxLUA_USE_wxColourPenBrush) && ((wxchkver_2_8 && wxLUA_USE_wxPicker) && (wxLUA_USE_wxColourPickerCtrl && wxUSE_COLOURPICKERCTRL))) { "SetColour", WXLUAMETHOD_METHOD, s_wxluafunc_wxLua_wxColourPickerCtrl_SetColour_overload, s_wxluafunc_wxLua_wxColourPickerCtrl_SetColour_overload_count, 0 }, ! #endif // ((wxchkver_2_8 && wxLUA_USE_wxPicker) && (wxLUA_USE_wxColourPickerCtrl && wxUSE_COLOURPICKERCTRL))||((wxLUA_USE_wxColourPenBrush) && ((wxchkver_2_8 && wxLUA_USE_wxPicker) && (wxLUA_USE_wxColourPickerCtrl && wxUSE_COLOURPICKERCTRL))) ! #if ((((wxLUA_USE_wxColourPenBrush) && ((wxchkver_2_8 && wxLUA_USE_wxPicker) && (wxLUA_USE_wxColourPickerCtrl && wxUSE_COLOURPICKERCTRL))) && (wxLUA_USE_wxValidator && wxUSE_VALIDATORS)) && (wxLUA_USE_wxPointSizeRect))||((wxchkver_2_8 && wxLUA_USE_wxPicker) && (wxLUA_USE_wxColourPickerCtrl && wxUSE_COLOURPICKERCTRL)) { "wxColourPickerCtrl", WXLUAMETHOD_CONSTRUCTOR, s_wxluafunc_wxLua_wxColourPickerCtrl_constructor_overload, s_wxluafunc_wxLua_wxColourPickerCtrl_constructor_overload_count, 0 }, ! #endif // ((((wxLUA_USE_wxColourPenBrush) && ((wxchkver_2_8 && wxLUA_USE_wxPicker) && (wxLUA_USE_wxColourPickerCtrl && wxUSE_COLOURPICKERCTRL))) && (wxLUA_USE_wxValidator && wxUSE_VALIDATORS)) && (wxLUA_USE_wxPointSizeRect))||((wxchkver_2_8 && wxLUA_USE_wxPicker) && (wxLUA_USE_wxColourPickerCtrl && wxUSE_COLOURPICKERCTRL)) { 0, 0, 0, 0 }, *************** *** 545,549 **** int s_wxluatag_wxColourPickerEvent = -1; ! #if (wxCHECK_VERSION(2,8,0)) && ((wxchkver_2_8 && wxLUA_USE_wxPicker) && (wxLUA_USE_wxColourPickerCtrl && wxUSE_COLOURPICKERCTRL)) static wxLuaArgTag s_wxluatagArray_wxLua_wxColourPickerEvent_GetColour[] = { &s_wxluatag_wxColourPickerEvent, NULL }; static int LUACALL wxLua_wxColourPickerEvent_GetColour(lua_State *L); --- 545,549 ---- int s_wxluatag_wxColourPickerEvent = -1; ! #if (wxLUA_USE_wxColourPenBrush) && ((wxchkver_2_8 && wxLUA_USE_wxPicker) && (wxLUA_USE_wxColourPickerCtrl && wxUSE_COLOURPICKERCTRL)) static wxLuaArgTag s_wxluatagArray_wxLua_wxColourPickerEvent_GetColour[] = { &s_wxluatag_wxColourPickerEvent, NULL }; static int LUACALL wxLua_wxColourPickerEvent_GetColour(lua_State *L); *************** *** 584,588 **** } ! #endif // (wxCHECK_VERSION(2,8,0)) && ((wxchkver_2_8 && wxLUA_USE_wxPicker) && (wxLUA_USE_wxColourPickerCtrl && wxUSE_COLOURPICKERCTRL)) static wxLuaArgTag s_wxluatagArray_wxLua_wxColourPickerEvent_delete[] = { &s_wxluatag_wxColourPickerEvent, NULL }; --- 584,588 ---- } ! #endif // (wxLUA_USE_wxColourPenBrush) && ((wxchkver_2_8 && wxLUA_USE_wxPicker) && (wxLUA_USE_wxColourPickerCtrl && wxUSE_COLOURPICKERCTRL)) static wxLuaArgTag s_wxluatagArray_wxLua_wxColourPickerEvent_delete[] = { &s_wxluatag_wxColourPickerEvent, NULL }; *************** *** 603,607 **** ! #if (((wxchkver_2_8 && wxLUA_USE_wxPicker) && (wxLUA_USE_wxColourPickerCtrl && wxUSE_COLOURPICKERCTRL)) && (wxLUA_USE_wxObject)) && (wxCHECK_VERSION(2,8,0)) static wxLuaArgTag s_wxluatagArray_wxLua_wxColourPickerEvent_constructor1[] = { &s_wxluatag_wxObject, &s_wxluaarg_Number, &s_wxluatag_wxColour, NULL }; static int LUACALL wxLua_wxColourPickerEvent_constructor1(lua_State *L); --- 603,607 ---- ! #if ((wxLUA_USE_wxColourPenBrush) && ((wxchkver_2_8 && wxLUA_USE_wxPicker) && (wxLUA_USE_wxColourPickerCtrl && wxUSE_COLOURPICKERCTRL))) && (wxLUA_USE_wxObject) static wxLuaArgTag s_wxluatagArray_wxLua_wxColourPickerEvent_constructor1[] = { &s_wxluatag_wxObject, &s_wxluaarg_Number, &s_wxluatag_wxColour, NULL }; static int LUACALL wxLua_wxColourPickerEvent_constructor1(lua_State *L); *************** *** 629,633 **** } ! #endif // (((wxchkver_2_8 && wxLUA_USE_wxPicker) && (wxLUA_USE_wxColourPickerCtrl && wxUSE_COLOURPICKERCTRL)) && (wxLUA_USE_wxObject)) && (wxCHECK_VERSION(2,8,0)) static int LUACALL wxLua_wxColourPickerEvent_constructor(lua_State *L); --- 629,633 ---- } ! #endif // ((wxLUA_USE_wxColourPenBrush) && ((wxchkver_2_8 && wxLUA_USE_wxPicker) && (wxLUA_USE_wxColourPickerCtrl && wxUSE_COLOURPICKERCTRL))) && (wxLUA_USE_wxObject) static int LUACALL wxLua_wxColourPickerEvent_constructor(lua_State *L); *************** *** 652,656 **** ! #if ((((wxchkver_2_8 && wxLUA_USE_wxPicker) && (wxLUA_USE_wxColourPickerCtrl && wxUSE_COLOURPICKERCTRL)) && (wxLUA_USE_wxObject)) && (wxCHECK_VERSION(2,8,0)))||((wxchkver_2_8 && wxLUA_USE_wxPicker) && (wxLUA_USE_wxColourPickerCtrl && wxUSE_COLOURPICKERCTRL)) static int LUACALL wxLua_wxColourPickerEvent_constructor_overload(lua_State *L); // function overload table --- 652,656 ---- ! #if (((wxLUA_USE_wxColourPenBrush) && ((wxchkver_2_8 && wxLUA_USE_wxPicker) && (wxLUA_USE_wxColourPickerCtrl && wxUSE_COLOURPICKERCTRL))) && (wxLUA_USE_wxObject))||((wxchkver_2_8 && wxLUA_USE_wxPicker) && (wxLUA_USE_wxColourPickerCtrl && wxUSE_COLOURPICKERCTRL)) static int LUACALL wxLua_wxColourPickerEvent_constructor_overload(lua_State *L); // function overload table *************** *** 659,665 **** { wxLua_wxColourPickerEvent_constructor_overload, WXLUAMETHOD_METHOD|WXLUAMETHOD_OVERLOAD, 0, 3, s_wxluaargArray_None }, ! #if (((wxchkver_2_8 && wxLUA_USE_wxPicker) && (wxLUA_USE_wxColourPickerCtrl && wxUSE_COLOURPICKERCTRL)) && (wxLUA_USE_wxObject)) && (wxCHECK_VERSION(2,8,0)) { wxLua_wxColourPickerEvent_constructor1, WXLUAMETHOD_CONSTRUCTOR, 3, 3, s_wxluatagArray_wxLua_wxColourPickerEvent_constructor1 }, ! #endif // (((wxchkver_2_8 && wxLUA_USE_wxPicker) && (wxLUA_USE_wxColourPickerCtrl && wxUSE_COLOURPICKERCTRL)) && (wxLUA_USE_wxObject)) && (wxCHECK_VERSION(2,8,0)) { wxLua_wxColourPickerEvent_constructor, WXLUAMETHOD_CONSTRUCTOR, 0, 0, s_wxluaargArray_None }, }; --- 659,665 ---- { wxLua_wxColourPickerEvent_constructor_overload, WXLUAMETHOD_METHOD|WXLUAMETHOD_OVERLOAD, 0, 3, s_wxluaargArray_None }, ! #if ((wxLUA_USE_wxColourPenBrush) && ((wxchkver_2_8 && wxLUA_USE_wxPicker) && (wxLUA_USE_wxColourPickerCtrl && wxUSE_COLOURPICKERCTRL))) && (wxLUA_USE_wxObject) { wxLua_wxColourPickerEvent_constructor1, WXLUAMETHOD_CONSTRUCTOR, 3, 3, s_wxluatagArray_wxLua_wxColourPickerEvent_constructor1 }, ! #endif // ((wxLUA_USE_wxColourPenBrush) && ((wxchkver_2_8 && wxLUA_USE_wxPicker) && (wxLUA_USE_wxColourPickerCtrl && wxUSE_COLOURPICKERCTRL))) && (wxLUA_USE_wxObject) { wxLua_wxColourPickerEvent_constructor, WXLUAMETHOD_CONSTRUCTOR, 0, 0, s_wxluaargArray_None }, }; *************** *** 673,690 **** return wxlState.CallOverloadedFunction(&overload_method); } ! #endif // ((((wxchkver_2_8 && wxLUA_USE_wxPicker) && (wxLUA_USE_wxColourPickerCtrl && wxUSE_COLOURPICKERCTRL)) && (wxLUA_USE_wxObject)) && (wxCHECK_VERSION(2,8,0)))||((wxchkver_2_8 && wxLUA_USE_wxPicker) && (wxLUA_USE_wxColourPickerCtrl && wxUSE_COLOURPICKERCTRL)) // Map Lua Class Methods to C Binding Functions wxLuaBindMethod wxColourPickerEvent_methods[] = { ! #if (wxCHECK_VERSION(2,8,0)) && ((wxchkver_2_8 && wxLUA_USE_wxPicker) && (wxLUA_USE_wxColourPickerCtrl && wxUSE_COLOURPICKERCTRL)) { "GetColour", WXLUAMETHOD_METHOD, s_wxluafunc_wxLua_wxColourPickerEvent_GetColour, 1, NULL }, { "SetColour", WXLUAMETHOD_METHOD, s_wxluafunc_wxLua_wxColourPickerEvent_SetColour, 1, NULL }, ! #endif // (wxCHECK_VERSION(2,8,0)) && ((wxchkver_2_8 && wxLUA_USE_wxPicker) && (wxLUA_USE_wxColourPickerCtrl && wxUSE_COLOURPICKERCTRL)) { "delete", WXLUAMETHOD_METHOD|WXLUAMETHOD_DELETE, s_wxluafunc_wxLua_wxColourPickerEvent_delete, 1, NULL }, ! #if ((((wxchkver_2_8 && wxLUA_USE_wxPicker) && (wxLUA_USE_wxColourPickerCtrl && wxUSE_COLOURPICKERCTRL)) && (wxLUA_USE_wxObject)) && (wxCHECK_VERSION(2,8,0)))||((wxchkver_2_8 && wxLUA_USE_wxPicker) && (wxLUA_USE_wxColourPickerCtrl && wxUSE_COLOURPICKERCTRL)) { "wxColourPickerEvent", WXLUAMETHOD_CONSTRUCTOR, s_wxluafunc_wxLua_wxColourPickerEvent_constructor_overload, s_wxluafunc_wxLua_wxColourPickerEvent_constructor_overload_count, 0 }, ! #endif // ((((wxchkver_2_8 && wxLUA_USE_wxPicker) && (wxLUA_USE_wxColourPickerCtrl && wxUSE_COLOURPICKERCTRL)) && (wxLUA_USE_wxObject)) && (wxCHECK_VERSION(2,8,0)))||((wxchkver_2_8 && wxLUA_USE_wxPicker) && (wxLUA_USE_wxColourPickerCtrl && wxUSE_COLOURPICKERCTRL)) { 0, 0, 0, 0 }, --- 673,690 ---- return wxlState.CallOverloadedFunction(&overload_method); } ! #endif // (((wxLUA_USE_wxColourPenBrush) && ((wxchkver_2_8 && wxLUA_USE_wxPicker) && (wxLUA_USE_wxColourPickerCtrl && wxUSE_COLOURPICKERCTRL))) && (wxLUA_USE_wxObject))||((wxchkver_2_8 && wxLUA_USE_wxPicker) && (wxLUA_USE_wxColourPickerCtrl && wxUSE_COLOURPICKERCTRL)) // Map Lua Class Methods to C Binding Functions wxLuaBindMethod wxColourPickerEvent_methods[] = { ! #if (wxLUA_USE_wxColourPenBrush) && ((wxchkver_2_8 && wxLUA_USE_wxPicker) && (wxLUA_USE_wxColourPickerCtrl && wxUSE_COLOURPICKERCTRL)) { "GetColour", WXLUAMETHOD_METHOD, s_wxluafunc_wxLua_wxColourPickerEvent_GetColour, 1, NULL }, { "SetColour", WXLUAMETHOD_METHOD, s_wxluafunc_wxLua_wxColourPickerEvent_SetColour, 1, NULL }, ! #endif // (wxLUA_USE_wxColourPenBrush) && ((wxchkver_2_8 && wxLUA_USE_wxPicker) && (wxLUA_USE_wxColourPickerCtrl && wxUSE_COLOURPICKERCTRL)) { "delete", WXLUAMETHOD_METHOD|WXLUAMETHOD_DELETE, s_wxluafunc_wxLua_wxColourPickerEvent_delete, 1, NULL }, ! #if (((wxLUA_USE_wxColourPenBrush) && ((wxchkver_2_8 && wxLUA_USE_wxPicker) && (wxLUA_USE_wxColourPickerCtrl && wxUSE_COLOURPICKERCTRL))) && (wxLUA_USE_wxObject))||((wxchkver_2_8 && wxLUA_USE_wxPicker) && (wxLUA_USE_wxColourPickerCtrl && wxUSE_COLOURPICKERCTRL)) { "wxColourPickerEvent", WXLUAMETHOD_CONSTRUCTOR, s_wxluafunc_wxLua_wxColourPickerEvent_constructor_overload, s_wxluafunc_wxLua_wxColourPickerEvent_constructor_overload_count, 0 }, ! #endif // (((wxLUA_USE_wxColourPenBrush) && ((wxchkver_2_8 && wxLUA_USE_wxPicker) && (wxLUA_USE_wxColourPickerCtrl && wxUSE_COLOURPICKERCTRL))) && (wxLUA_USE_wxObject))||((wxchkver_2_8 && wxLUA_USE_wxPicker) && (wxLUA_USE_wxColourPickerCtrl && wxUSE_COLOURPICKERCTRL)) { 0, 0, 0, 0 }, *************** *** 696,700 **** ! #if (wxLUA_USE_wxColourPickerCtrl && wxUSE_COLOURPICKERCTRL) && (wxLUA_USE_wxDatePickerCtrl && wxUSE_DATEPICKCTRL) // --------------------------------------------------------------------------- // Bind class wxDatePickerCtrl --- 696,700 ---- ! #if (wxchkver_2_8 && wxLUA_USE_wxPicker) && (wxLUA_USE_wxDatePickerCtrl && wxUSE_DATEPICKCTRL) // --------------------------------------------------------------------------- // Bind class wxDatePickerCtrl *************** *** 730,734 **** ! #if ((wxLUA_USE_wxColourPickerCtrl && wxUSE_COLOURPICKERCTRL) && (wxLUA_USE_wxDatePickerCtrl && wxUSE_DATEPICKCTRL)) && (wxLUA_USE_wxDateTime && wxUSE_DATETIME) static wxLuaArgTag s_wxluatagArray_wxLua_wxDatePickerCtrl_GetValue[] = { &s_wxluatag_wxDatePickerCtrl, NULL }; static int LUACALL wxLua_wxDatePickerCtrl_GetValue(lua_State *L); --- 730,734 ---- ! #if ((wxchkver_2_8 && wxLUA_USE_wxPicker) && (wxLUA_USE_wxDatePickerCtrl && wxUSE_DATEPICKCTRL)) && (wxLUA_USE_wxDateTime && wxUSE_DATETIME) static wxLuaArgTag s_wxluatagArray_wxLua_wxDatePickerCtrl_GetValue[] = { &s_wxluatag_wxDatePickerCtrl, NULL }; static int LUACALL wxLua_wxDatePickerCtrl_GetValue(lua_State *L); *************** *** 788,794 **** } ! #endif // ((wxLUA_USE_wxColourPickerCtrl && wxUSE_COLOURPICKERCTRL) && (wxLUA_USE_wxDatePickerCtrl && wxUSE_DATEPICKCTRL)) && (wxLUA_USE_wxDateTime && wxUSE_DATETIME) ! #if (((wxLUA_USE_wxValidator && wxUSE_VALIDATORS) && ((wxLUA_USE_wxColourPickerCtrl && wxUSE_COLOURPICKERCTRL) && (wxLUA_USE_wxDatePickerCtrl && wxUSE_DATEPICKCTRL))) && (wxLUA_USE_wxDateTime && wxUSE_DATETIME)) && (wxLUA_USE_wxPointSizeRect) static wxLuaArgTag s_wxluatagArray_wxLua_wxDatePickerCtrl_constructor[] = { &s_wxluatag_wxWindow, &s_wxluaarg_Number, &s_wxluatag_wxDateTime, &s_wxluatag_wxPoint, &s_wxluatag_wxSize, &s_wxluaarg_Number, &s_wxluatag_wxValidator, &s_wxluaarg_String, NULL }; static int LUACALL wxLua_wxDatePickerCtrl_constructor(lua_State *L); --- 788,794 ---- } ! #endif // ((wxchkver_2_8 && wxLUA_USE_wxPicker) && (wxLUA_USE_wxDatePickerCtrl && wxUSE_DATEPICKCTRL)) && (wxLUA_USE_wxDateTime && wxUSE_DATETIME) ! #if (((wxLUA_USE_wxValidator && wxUSE_VALIDATORS) && ((wxchkver_2_8 && wxLUA_USE_wxPicker) && (wxLUA_USE_wxDatePickerCtrl && wxUSE_DATEPICKCTRL))) && (wxLUA_USE_wxDateTime && wxUSE_DATETIME)) && (wxLUA_USE_wxPointSizeRect) static wxLuaArgTag s_wxluatagArray_wxLua_wxDatePickerCtrl_constructor[] = { &s_wxluatag_wxWindow, &s_wxluaarg_Number, &s_wxluatag_wxDateTime, &s_wxluatag_wxPoint, &s_wxluatag_wxSize, &s_wxluaarg_Number, &s_wxluatag_wxValidator, &s_wxluaarg_String, NULL }; static int LUACALL wxLua_wxDatePickerCtrl_constructor(lua_State *L); *************** *** 828,832 **** } ! #endif // (((wxLUA_USE_wxValidator && wxUSE_VALIDATORS) && ((wxLUA_USE_wxColourPickerCtrl && wxUSE_COLOURPICKERCTRL) && (wxLUA_USE_wxDatePickerCtrl && wxUSE_DATEPICKCTRL))) && (wxLUA_USE_wxDateTime && wxUSE_DATETIME)) && (wxLUA_USE_wxPointSizeRect) --- 828,832 ---- } ! #endif // (((wxLUA_USE_wxValidator && wxUSE_VALIDATORS) && ((wxchkver_2_8 && wxLUA_USE_wxPicker) && (wxLUA_USE_wxDatePickerCtrl && wxUSE_DATEPICKCTRL))) && (wxLUA_USE_wxDateTime && wxUSE_DATETIME)) && (wxLUA_USE_wxPointSizeRect) *************** *** 836,848 **** { "GetRange", WXLUAMETHOD_METHOD, s_wxluafunc_wxLua_wxDatePickerCtrl_GetRange, 1, NULL }, ! #if ((wxLUA_USE_wxColourPickerCtrl && wxUSE_COLOURPICKERCTRL) && (wxLUA_USE_wxDatePickerCtrl && wxUSE_DATEPICKCTRL)) && (wxLUA_USE_wxDateTime && wxUSE_DATETIME) { "GetValue", WXLUAMETHOD_METHOD, s_wxluafunc_wxLua_wxDatePickerCtrl_GetValue, 1, NULL }, { "SetRange", WXLUAMETHOD_METHOD, s_wxluafunc_wxLua_wxDatePickerCtrl_SetRange, 1, NULL }, { "SetValue", WXLUAMETHOD_METHOD, s_wxluafunc_wxLua_wxDatePickerCtrl_SetValue, 1, NULL }, ! #endif // ((wxLUA_USE_wxColourPickerCtrl && wxUSE_COLOURPICKERCTRL) && (wxLUA_USE_wxDatePickerCtrl && wxUSE_DATEPICKCTRL)) && (wxLUA_USE_wxDateTime && wxUSE_DATETIME) ! #if (((wxLUA_USE_wxValidator && wxUSE_VALIDATORS) && ((wxLUA_USE_wxColourPickerCtrl && wxUSE_COLOURPICKERCTRL) && (wxLUA_USE_wxDatePickerCtrl && wxUSE_DATEPICKCTRL))) && (wxLUA_USE_wxDateTime && wxUSE_DATETIME)) && (wxLUA_USE_wxPointSizeRect) { "wxDatePickerCtrl", WXLUAMETHOD_CONSTRUCTOR, s_wxluafunc_wxLua_wxDatePickerCtrl_constructor, 1, NULL }, ! #endif // (((wxLUA_USE_wxValidator && wxUSE_VALIDATORS) && ((wxLUA_USE_wxColourPickerCtrl && wxUSE_COLOURPICKERCTRL) && (wxLUA_USE_wxDatePickerCtrl && wxUSE_DATEPICKCTRL))) && (wxLUA_USE_wxDateTime && wxUSE_DATETIME)) && (wxLUA_USE_wxPointSizeRect) { 0, 0, 0, 0 }, --- 836,848 ---- { "GetRange", WXLUAMETHOD_METHOD, s_wxluafunc_wxLua_wxDatePickerCtrl_GetRange, 1, NULL }, ! #if ((wxchkver_2_8 && wxLUA_USE_wxPicker) && (wxLUA_USE_wxDatePickerCtrl && wxUSE_DATEPICKCTRL)) && (wxLUA_USE_wxDateTime && wxUSE_DATETIME) { "GetValue", WXLUAMETHOD_METHOD, s_wxluafunc_wxLua_wxDatePickerCtrl_GetValue, 1, NULL }, { "SetRange", WXLUAMETHOD_METHOD, s_wxluafunc_wxLua_wxDatePickerCtrl_SetRange, 1, NULL }, { "SetValue", WXLUAMETHOD_METHOD, s_wxluafunc_wxLua_wxDatePickerCtrl_SetValue, 1, NULL }, ! #endif // ((wxchkver_2_8 && wxLUA_USE_wxPicker) && (wxLUA_USE_wxDatePickerCtrl && wxUSE_DATEPICKCTRL)) && (wxLUA_USE_wxDateTime && wxUSE_DATETIME) ! #if (((wxLUA_USE_wxValidator && wxUSE_VALIDATORS) && ((wxchkver_2_8 && wxLUA_USE_wxPicker) && (wxLUA_USE_wxDatePickerCtrl && wxUSE_DATEPICKCTRL))) && (wxLUA_USE_wxDateTime && wxUSE_DATETIME)) && (wxLUA_USE_wxPointSizeRect) { "wxDatePickerCtrl", WXLUAMETHOD_CONSTRUCTOR, s_wxluafunc_wxLua_wxDatePickerCtrl_constructor, 1, NULL }, ! #endif // (((wxLUA_USE_wxValidator && wxUSE_VALIDATORS) && ((wxchkver_2_8 && wxLUA_USE_wxPicker) && (wxLUA_USE_wxDatePickerCtrl && wxUSE_DATEPICKCTRL))) && (wxLUA_USE_wxDateTime && wxUSE_DATETIME)) && (wxLUA_USE_wxPointSizeRect) { 0, 0, 0, 0 }, *************** *** 851,858 **** int wxDatePickerCtrl_methodCount = sizeof(wxDatePickerCtrl_methods)/sizeof(wxLuaBindMethod) - 1; ! #endif // (wxLUA_USE_wxColourPickerCtrl && wxUSE_COLOURPICKERCTRL) && (wxLUA_USE_wxDatePickerCtrl && wxUSE_DATEPICKCTRL) ! #if (wxLUA_USE_wxDatePickerCtrl && wxUSE_DATEPICKCTRL) && ((wxLUA_USE_wxDirPickerCtrl || wxLUA_USE_wxFilePickerCtrl ) && (wxUSE_FILEPICKERCTRL || wxUSE_DIRPICKERCTRL )) // --------------------------------------------------------------------------- // Bind class wxFileDirPickerCtrlBase --- 851,858 ---- int wxDatePickerCtrl_methodCount = sizeof(wxDatePickerCtrl_methods)/sizeof(wxLuaBindMethod) - 1; ! #endif // (wxchkver_2_8 && wxLUA_USE_wxPicker) && (wxLUA_USE_wxDatePickerCtrl && wxUSE_DATEPICKCTRL) ! #if (wxchkver_2_8 && wxLUA_USE_wxPicker) && ((wxLUA_USE_wxDirPickerCtrl || wxLUA_USE_wxFilePickerCtrl ) && (wxUSE_FILEPICKERCTRL || wxUSE_DIRPICKERCTRL )) // --------------------------------------------------------------------------- // Bind class wxFileDirPickerCtrlBase *************** *** 950,957 **** int wxFileDirPickerCtrlBase_methodCount = sizeof(wxFileDirPickerCtrlBase_methods)/sizeof(wxLuaBindMethod) - 1; ! #endif // (wxLUA_USE_wxDatePickerCtrl && wxUSE_DATEPICKCTRL) && ((wxLUA_USE_wxDirPickerCtrl || wxLUA_USE_wxFilePickerCtrl ) && (wxUSE_FILEPICKERCTRL || wxUSE_DIRPICKERCTRL )) ! #if (wxLUA_USE_wxDatePickerCtrl && wxUSE_DATEPICKCTRL) && ((wxLUA_USE_wxDirPickerCtrl || wxLUA_USE_wxFilePickerCtrl ) && (wxUSE_FILEPICKERCTRL || wxUSE_DIRPICKERCTRL )) // --------------------------------------------------------------------------- // Bind class wxFileDirPickerEvent --- 950,957 ---- int wxFileDirPickerCtrlBase_methodCount = sizeof(wxFileDirPickerCtrlBase_methods)/sizeof(wxLuaBindMethod) - 1; ! #endif // (wxchkver_2_8 && wxLUA_USE_wxPicker) && ((wxLUA_USE_wxDirPickerCtrl || wxLUA_USE_wxFilePickerCtrl ) && (wxUSE_FILEPICKERCTRL || wxUSE_DIRPICKERCTRL )) ! #if (wxchkver_2_8 && wxLUA_USE_wxPicker) && ((wxLUA_USE_wxDirPickerCtrl || wxLUA_USE_wxFilePickerCtrl ) && (wxUSE_FILEPICKERCTRL || wxUSE_DIRPICKERCTRL )) // --------------------------------------------------------------------------- // Bind class wxFileDirPickerEvent *************** *** 1013,1017 **** ! #if (wxLUA_USE_wxObject) && ((wxLUA_USE_wxDatePickerCtrl && wxUSE_DATEPICKCTRL) && ((wxLUA_USE_wxDirPickerCtrl || wxLUA_USE_wxFilePickerCtrl ) && (wxUSE_FILEPICKERCTRL || wxUSE_DIRPICKERCTRL ))) static wxLuaArgTag s_wxluatagArray_wxLua_wxFileDirPickerEvent_constructor[] = { &s_wxluaarg_Number, &s_wxluatag_wxObject, &s_wxluaarg_Number, &s_wxluaarg_String, NULL }; static int LUACALL wxLua_wxFileDirPickerEvent_constructor(lua_State *L); --- 1013,1017 ---- ! #if ((wxchkver_2_8 && wxLUA_USE_wxPicker) && ((wxLUA_USE_wxDirPickerCtrl || wxLUA_USE_wxFilePickerCtrl ) && (wxUSE_FILEPICKERCTRL || wxUSE_DIRPICKERCTRL ))) && (wxLUA_USE_wxObject) static wxLuaArgTag s_wxluatagArray_wxLua_wxFileDirPickerEvent_constructor[] = { &s_wxluaarg_Number, &s_wxluatag_wxObject, &s_wxluaarg_Number, &s_wxluaarg_String, NULL }; static int LUACALL wxLua_wxFileDirPickerEvent_constructor(lua_State *L); *************** *** 1041,1045 **** } ! #endif // (wxLUA_USE_wxObject) && ((wxLUA_USE_wxDatePickerCtrl && wxUSE_DATEPICKCTRL) && ((wxLUA_USE_wxDirPickerCtrl || wxLUA_USE_wxFilePickerCtrl ) && (wxUSE_FILEPICKERCTRL || wxUSE_DIRPICKERCTRL ))) --- 1041,1045 ---- } ! #endif // ((wxchkver_2_8 && wxLUA_USE_wxPicker) && ((wxLUA_USE_wxDirPickerCtrl || wxLUA_USE_wxFilePickerCtrl ) && (wxUSE_FILEPICKERCTRL || wxUSE_DIRPICKERCTRL ))) && (wxLUA_USE_wxObject) *************** *** 1051,1057 **** { "delete", WXLUAMETHOD_METHOD|WXLUAMETHOD_DELETE, s_wxluafunc_wxLua_wxFileDirPickerEvent_delete, 1, NULL }, ! #if (wxLUA_USE_wxObject) && ((wxLUA_USE_wxDatePickerCtrl && wxUSE_DATEPICKCTRL) && ((wxLUA_USE_wxDirPickerCtrl || wxLUA_USE_wxFilePickerCtrl ) && (wxUSE_FILEPICKERCTRL || wxUSE_DIRPICKERCTRL ))) { "wxFileDirPickerEvent", WXLUAMETHOD_CONSTRUCTOR, s_wxluafunc_wxLua_wxFileDirPickerEvent_constructor, 1, NULL }, ! #endif // (wxLUA_USE_wxObject) && ((wxLUA_USE_wxDatePickerCtrl && wxUSE_DATEPICKCTRL) && ((wxLUA_USE_wxDirPickerCtrl || wxLUA_USE_wxFilePickerCtrl ) && (wxUSE_FILEPICKERCTRL || wxUSE_DIRPICKERCTRL ))) { 0, 0, 0, 0 }, --- 1051,1057 ---- { "delete", WXLUAMETHOD_METHOD|WXLUAMETHOD_DELETE, s_wxluafunc_wxLua_wxFileDirPickerEvent_delete, 1, NULL }, ! #if ((wxchkver_2_8 && wxLUA_USE_wxPicker) && ((wxLUA_USE_wxDirPickerCtrl || wxLUA_USE_wxFilePickerCtrl ) && (wxUSE_FILEPICKERCTRL || wxUSE_DIRPICKERCTRL ))) && (wxLUA_USE_wxObject) { "wxFileDirPickerEvent", WXLUAMETHOD_CONSTRUCTOR, s_wxluafunc_wxLua_wxFileDirPickerEvent_constructor, 1, NULL }, ! #endif // ((wxchkver_2_8 && wxLUA_USE_wxPicker) && ((wxLUA_USE_wxDirPickerCtrl || wxLUA_USE_wxFilePickerCtrl ) && (wxUSE_FILEPICKERCTRL || wxUSE_DIRPICKERCTRL ))) && (wxLUA_USE_wxObject) { 0, 0, 0, 0 }, *************** *** 1060,1067 **** int wxFileDirPickerEvent_methodCount = sizeof(wxFileDirPickerEvent_methods)/sizeof(wxLuaBindMethod) - 1; ! #endif // (wxLUA_USE_wxDatePickerCtrl && wxUSE_DATEPICKCTRL) && ((wxLUA_USE_wxDirPickerCtrl || wxLUA_USE_wxFilePickerCtrl ) && (wxUSE_FILEPICKERCTRL || wxUSE_DIRPICKERCTRL )) ! #if ((wxLUA_USE_wxDirPickerCtrl || wxLUA_USE_wxFilePickerCtrl ) && (wxUSE_FILEPICKERCTRL || wxUSE_DIRPICKERCTRL )) && (wxLUA_USE_wxDirPickerCtrl && (wxUSE_FILEPICKERCTRL || wxUSE_DIRPICKERCTRL )) // --------------------------------------------------------------------------- // Bind class wxDirPickerCtrl --- 1060,1067 ---- int wxFileDirPickerEvent_methodCount = sizeof(wxFileDirPickerEvent_methods)/sizeof(wxLuaBindMethod) - 1; ! #endif // (wxchkver_2_8 && wxLUA_USE_wxPicker) && ((wxLUA_USE_wxDirPickerCtrl || wxLUA_USE_wxFilePickerCtrl ) && (wxUSE_FILEPICKERCTRL || wxUSE_DIRPICKERCTRL )) ! #if (wxchkver_2_8 && wxLUA_USE_wxPicker) && (wxLUA_USE_wxDirPickerCtrl && (wxUSE_FILEPICKERCTRL || wxUSE_DIRPICKERCTRL )) // --------------------------------------------------------------------------- // Bind class wxDirPickerCtrl *************** *** 1071,1075 **** int s_wxluatag_wxDirPickerCtrl = -1; ! #if ((wxLUA_USE_wxValidator && wxUSE_VALIDATORS) && (((wxLUA_USE_wxDirPickerCtrl || wxLUA_USE_wxFilePickerCtrl ) && (wxUSE_FILEPICKERCTRL || wxUSE_DIRPICKERCTRL )) && (wxLUA_USE_wxDirPickerCtrl && (wxUSE_FILEPICKERCTRL || wxUSE_DIRPICKERCTRL )))) && (wxLUA_USE_wxPointSizeRect) static wxLuaArgTag s_wxluatagArray_wxLua_wxDirPickerCtrl_constructor[] = { &s_wxluatag_wxWindow, &s_wxluaarg_Number, &s_wxluaarg_String, &s_wxluaarg_String, &s_wxluatag_wxPoint, &s_wxluatag_wxSize, &s_wxluaarg_Number, &s_wxluatag_wxValidator, &s_wxluaarg_String, NULL }; static int LUACALL wxLua_wxDirPickerCtrl_constructor(lua_State *L); --- 1071,1075 ---- int s_wxluatag_wxDirPickerCtrl = -1; ! #if (((wxchkver_2_8 && wxLUA_USE_wxPicker) && (wxLUA_USE_wxDirPickerCtrl && (wxUSE_FILEPICKERCTRL || wxUSE_DIRPICKERCTRL ))) && (wxLUA_USE_wxValidator && wxUSE_VALIDATORS)) && (wxLUA_USE_wxPointSizeRect) static wxLuaArgTag s_wxluatagArray_wxLua_wxDirPickerCtrl_constructor[] = { &s_wxluatag_wxWindow, &s_wxluaarg_Number, &s_wxluaarg_String, &s_wxluaarg_String, &s_wxluatag_wxPoint, &s_wxluatag_wxSize, &s_wxluaarg_Number, &s_wxluatag_wxValidator, &s_wxluaarg_String, NULL }; static int LUACALL wxLua_wxDirPickerCtrl_constructor(lua_State *L); *************** *** 1111,1115 **** } ! #endif // ((wxLUA_USE_wxValidator && wxUSE_VALIDATORS) && (((wxLUA_USE_wxDirPickerCtrl || wxLUA_USE_wxFilePickerCtrl ) && (wxUSE_FILEPICKERCTRL || wxUSE_DIRPICKERCTRL )) && (wxLUA_USE_wxDirPickerCtrl && (wxUSE_FILEPICKERCTRL || wxUSE_DIRPICKERCTRL )))) && (wxLUA_USE_wxPointSizeRect) --- 1111,1115 ---- } ! #endif // (((wxchkver_2_8 && wxLUA_USE_wxPicker) && (wxLUA_USE_wxDirPickerCtrl && (wxUSE_FILEPICKERCTRL || wxUSE_DIRPICKERCTRL ))) && (wxLUA_USE_wxValidator && wxUSE_VALIDATORS)) && (wxLUA_USE_wxPointSizeRect) *************** *** 1117,1123 **** // Map Lua Class Methods to C Binding Functions wxLuaBindMethod wxDirPickerCtrl_methods[] = { ! #if ((wxLUA_USE_wxValidator && wxUSE_VALIDATORS) && (((wxLUA_USE_wxDirPickerCtrl || wxLUA_USE_wxFilePickerCtrl ) && (wxUSE_FILEPICKERCTRL || wxUSE_DIRPICKERCTRL )) && (wxLUA_USE_wxDirPickerCtrl && (wxUSE_FILEPICKERCTRL || wxUSE_DIRPICKERCTRL )))) && (wxLUA_USE_wxPointSizeRect) { "wxDirPickerCtrl", WXLUAMETHOD_CONSTRUCTOR, s_wxluafunc_wxLua_wxDirPickerCtrl_constructor, 1, NULL }, ! #endif // ((wxLUA_USE_wxValidator && wxUSE_VALIDATORS) && (((wxLUA_USE_wxDirPickerCtrl || wxLUA_USE_wxFilePickerCtrl ) && (wxUSE_FILEPICKERCTRL || wxUSE_DIRPICKERCTRL )) && (wxLUA_USE_wxDirPickerCtrl && (wxUSE_FILEPICKERCTRL || wxUSE_DIRPICKERCTRL )))) && (wxLUA_USE_wxPointSizeRect) { 0, 0, 0, 0 }, --- 1117,1123 ---- // Map Lua Class Methods to C Binding Functions wxLuaBindMethod wxDirPickerCtrl_methods[] = { ! #if (((wxchkver_2_8 && wxLUA_USE_wxPicker) && (wxLUA_USE_wxDirPickerCtrl && (wxUSE_FILEPICKERCTRL || wxUSE_DIRPICKERCTRL ))) && (wxLUA_USE_wxValidator && wxUSE_VALIDATORS)) && (wxLUA_USE_wxPointSizeRect) { "wxDirPickerCtrl", WXLUAMETHOD_CONSTRUCTOR, s_wxluafunc_wxLua_wxDirPickerCtrl_constructor, 1, NULL }, ! #endif // (((wxchkver_2_8 && wxLUA_USE_wxPicker) && (wxLUA_USE_wxDirPickerCtrl && (wxUSE_FILEPICKERCTRL || wxUSE_DIRPICKERCTRL ))) && (wxLUA_USE_wxValidator && wxUSE_VALIDATORS)) && (wxLUA_USE_wxPointSizeRect) { 0, 0, 0, 0 }, *************** *** 1126,1133 **** int wxDirPickerCtrl_methodCount = sizeof(wxDirPickerCtrl_methods)/sizeof(wxLuaBindMethod) - 1; ! #endif // ((wxLUA_USE_wxDirPickerCtrl || wxLUA_USE_wxFilePickerCtrl ) && (wxUSE_FILEPICKERCTRL || wxUSE_DIRPICKERCTRL )) && (wxLUA_USE_wxDirPickerCtrl && (wxUSE_FILEPICKERCTRL || wxUSE_DIRPICKERCTRL )) ! #if (wxLUA_USE_wxDirPickerCtrl && (wxUSE_FILEPICKERCTRL || wxUSE_DIRPICKERCTRL )) && (wxLUA_USE_wxDirPickerCtrl && (wxUSE_FILEPICKERCTRL || wxUSE_DIRPICKERCTRL )) // --------------------------------------------------------------------------- // Bind class wxFilePickerCtrl --- 1126,1133 ---- int wxDirPickerCtrl_methodCount = sizeof(wxDirPickerCtrl_methods)/sizeof(wxLuaBindMethod) - 1; ! #endif // (wxchkver_2_8 && wxLUA_USE_wxPicker) && (wxLUA_USE_wxDirPickerCtrl && (wxUSE_FILEPICKERCTRL || wxUSE_DIRPICKERCTRL )) ! #if (wxchkver_2_8 && wxLUA_USE_wxPicker) && (wxLUA_USE_wxDirPickerCtrl && (wxUSE_FILEPICKERCTRL || wxUSE_DIRPICKERCTRL )) // --------------------------------------------------------------------------- // Bind class wxFilePickerCtrl *************** *** 1137,1141 **** int s_wxluatag_wxFilePickerCtrl = -1; ! #if (((wxLUA_USE_wxDirPickerCtrl && (wxUSE_FILEPICKERCTRL || wxUSE_DIRPICKERCTRL )) && (wxLUA_USE_wxDirPickerCtrl && (wxUSE_FILEPICKERCTRL || wxUSE_DIRPICKERCTRL ))) && (wxLUA_USE_wxValidator && wxUSE_VALIDATORS)) && (wxLUA_USE_wxPointSizeRect) static wxLuaArgTag s_wxluatagArray_wxLua_wxFilePickerCtrl_constructor[] = { &s_wxluatag_wxWindow, &s_wxluaarg_Number, &s_wxluaarg_String, &s_wxluaarg_String, &s_wxluaarg_String, &s_wxluatag_wxPoint, &s_wxluatag_wxSize, &s_wxluaarg_Number, &s_wxluatag_wxValidator, &s_wxluaarg_String, NULL }; static int LUACALL wxLua_wxFilePickerCtrl_constructor(lua_State *L); --- 1137,1141 ---- int s_wxluatag_wxFilePickerCtrl = -1; ! #if (((wxchkver_2_8 && wxLUA_USE_wxPicker) && (wxLUA_USE_wxDirPickerCtrl && (wxUSE_FILEPICKERCTRL || wxUSE_DIRPICKERCTRL ))) && (wxLUA_USE_wxValidator && wxUSE_VALIDATORS)) && (wxLUA_USE_wxPointSizeRect) static wxLuaArgTag s_wxluatagArray_wxLua_wxFilePickerCtrl_constructor[] = { &s_wxluatag_wxWindow, &s_wxluaarg_Number, &s_wxluaarg_String, &s_wxluaarg_String, &s_wxluaarg_String, &s_wxluatag_wxPoint, &s_wxluatag_wxSize, &s_wxluaarg_Number, &s_wxluatag_wxValidator, &s_wxluaarg_String, NULL }; static int LUACALL wxLua_wxFilePickerCtrl_constructor(lua_State *L); *************** *** 1179,1183 **** } ! #endif // (((wxLUA_USE_wxDirPickerCtrl && (wxUSE_FILEPICKERCTRL || wxUSE_DIRPICKERCTRL )) && (wxLUA_USE_wxDirPickerCtrl && (wxUSE_FILEPICKERCTRL || wxUSE_DIRPICKERCTRL ))) && (wxLUA_USE_wxValidator && wxUSE_VALIDATORS)) && (wxLUA_USE_wxPointSizeRect) --- 1179,1183 ---- } ! #endif // (((wxchkver_2_8 && wxLUA_USE_wxPicker) && (wxLUA_USE_wxDirPickerCtrl && (wxUSE_FILEPICKERCTRL || wxUSE_DIRPICKERCTRL ))) && (wxLUA_USE_wxValidator && wxUSE_VALIDATORS)) && (wxLUA_USE_wxPointSizeRect) *************** *** 1185,1191 **** // Map Lua Class Methods to C Binding Functions wxLuaBindMethod wxFilePickerCtrl_methods[] = { ! #if (((wxLUA_USE_wxDirPickerCtrl && (wxUSE_FILEPICKERCTRL || wxUSE_DIRPICKERCTRL )) && (wxLUA_USE_wxDirPickerCtrl && (wxUSE_FILEPICKERCTRL || wxUSE_DIRPICKERCTRL ))) && (wxLUA_USE_wxValidator && wxUSE_VALIDATORS)) && (wxLUA_USE_wxPointSizeRect) { "wxFilePickerCtrl", WXLUAMETHOD_CONSTRUCTOR, s_wxluafunc_wxLua_wxFilePickerCtrl_constructor, 1, NULL }, ! #endif // (((wxLUA_USE_wxDirPickerCtrl && (wxUSE_FILEPICKERCTRL || wxUSE_DIRPICKERCTRL )) && (wxLUA_USE_wxDirPickerCtrl && (wxUSE_FILEPICKERCTRL || wxUSE_DIRPICKERCTRL ))) && (wxLUA_USE_wxValidator && wxUSE_VALIDATORS)) && (wxLUA_USE_wxPointSizeRect) { 0, 0, 0, 0 }, --- 1185,1191 ---- // Map Lua Class Methods to C Binding Functions wxLuaBindMethod wxFilePickerCtrl_methods[] = { ! #if (((wxchkver_2_8 && wxLUA_USE_wxPicker) && (wxLUA_USE_wxDirPickerCtrl && (wxUSE_FILEPICKERCTRL || wxUSE_DIRPICKERCTRL ))) && (wxLUA_USE_wxValidator && wxUSE_VALIDATORS)) && (wxLUA_USE_wxPointSizeRect) { "wxFilePickerCtrl", WXLUAMETHOD_CONSTRUCTOR, s_wxluafunc_wxLua_wxFilePickerCtrl_constructor, 1, NULL }, ! #endif // (((wxchkver_2_8 && wxLUA_USE_wxPicker) && (wxLUA_USE_wxDirPickerCtrl && (wxUSE_FILEPICKERCTRL || wxUSE_DIRPICKERCTRL ))) && (wxLUA_USE_wxValidator && wxUSE_VALIDATORS)) && (wxLUA_USE_wxPointSizeRect) { 0, 0, 0, 0 }, *************** *** 1194,1201 **** int wxFilePickerCtrl_methodCount = sizeof(wxFilePickerCtrl_methods)/sizeof(wxLuaBindMethod) - 1; ! #endif // (wxLUA_USE_wxDirPickerCtrl && (wxUSE_FILEPICKERCTRL || wxUSE_DIRPICKERCTRL )) && (wxLUA_USE_wxDirPickerCtrl && (wxUSE_FILEPICKERCTRL || wxUSE_DIRPICKERCTRL )) ! #if (wxLUA_USE_wxDirPickerCtrl && (wxUSE_FILEPICKERCTRL || wxUSE_DIRPICKERCTRL )) && (wxLUA_USE_wxFontPickerCtrl && wxUSE_FONTPICKERCTRL) // --------------------------------------------------------------------------- // Bind class wxFontPickerCtrl --- 1194,1201 ---- int wxFilePickerCtrl_methodCount = sizeof(wxFilePickerCtrl_methods)/sizeof(wxLuaBindMethod) - 1; ! #endif // (wxchkver_2_8 && wxLUA_U... [truncated message content] |
|
From: John L. <jr...@us...> - 2007-06-18 21:41:04
|
Update of /cvsroot/wxlua/wxLua/bindings/wxstc In directory sc8-pr-cvs9.sourceforge.net:/tmp/cvs-serv32406/wxLua/bindings/wxstc Modified Files: wxstc_datatypes.lua Log Message: Fix last commit of trying to preserve the order of the binding conditions, this way works. Index: wxstc_datatypes.lua =================================================================== RCS file: /cvsroot/wxlua/wxLua/bindings/wxstc/wxstc_datatypes.lua,v retrieving revision 1.62 retrieving revision 1.63 diff -C2 -d -r1.62 -r1.63 *** wxstc_datatypes.lua 18 Jun 2007 19:51:25 -0000 1.62 --- wxstc_datatypes.lua 18 Jun 2007 21:40:28 -0000 1.63 *************** *** 307,311 **** wxAutoBufferedPaintDC = { BaseClass = "wxDC", ! Condition = "(wxCHECK_VERSION(2,8,0)) && (wxCHECK_VERSION(2,8,0))", DefType = "class", IsNumber = false, --- 307,311 ---- wxAutoBufferedPaintDC = { BaseClass = "wxDC", ! Condition = "(wxLUA_USE_wxDC) && (wxCHECK_VERSION(2,8,0))", DefType = "class", [...1140 lines suppressed...] IsNumber = false, --- 3835,3839 ---- wxWindowDC = { BaseClass = "wxDC", ! Condition = "wxLUA_USE_wxDC", DefType = "class", IsNumber = false, *************** *** 3904,3908 **** wxXPMHandler = { BaseClass = "wxImageHandler", ! Condition = "wxCHECK_VERSION(2,8,0) && wxUSE_TGA", DefType = "class", IsNumber = false, --- 3904,3908 ---- wxXPMHandler = { BaseClass = "wxImageHandler", ! Condition = "wxLUA_USE_wxImage && wxUSE_IMAGE", DefType = "class", IsNumber = false, |
|
From: John L. <jr...@us...> - 2007-06-18 21:41:02
|
Update of /cvsroot/wxlua/wxLua/bindings In directory sc8-pr-cvs9.sourceforge.net:/tmp/cvs-serv32406/wxLua/bindings Modified Files: genwxbind.lua Log Message: Fix last commit of trying to preserve the order of the binding conditions, this way works. Index: genwxbind.lua =================================================================== RCS file: /cvsroot/wxlua/wxLua/bindings/genwxbind.lua,v retrieving revision 1.128 retrieving revision 1.129 diff -C2 -d -r1.128 -r1.129 *** genwxbind.lua 18 Jun 2007 19:51:23 -0000 1.128 --- genwxbind.lua 18 Jun 2007 21:40:27 -0000 1.129 *************** *** 532,536 **** end ! print("Updating file : '"..filename.."'") local outfile = io.open(filename, "w+") --- 532,536 ---- end ! print("Updating file : '"..filename.."'") local outfile = io.open(filename, "w+") *************** *** 1738,1742 **** elseif tag == "%endif" then ! table.remove(parseState.ConditionStack, 1) -- pop last %if break -- we can stop processing line --- 1738,1742 ---- elseif tag == "%endif" then ! table.remove(parseState.ConditionStack, #parseState.ConditionStack) -- pop last %if break -- we can stop processing line |
|
From: John L. <jr...@us...> - 2007-06-18 21:41:00
|
Update of /cvsroot/wxlua/wxLua/apps/wxluacan/src In directory sc8-pr-cvs9.sourceforge.net:/tmp/cvs-serv32406/wxLua/apps/wxluacan/src Modified Files: wxluacan.cpp Log Message: Fix last commit of trying to preserve the order of the binding conditions, this way works. Index: wxluacan.cpp =================================================================== RCS file: /cvsroot/wxlua/wxLua/apps/wxluacan/src/wxluacan.cpp,v retrieving revision 1.32 retrieving revision 1.33 diff -C2 -d -r1.32 -r1.33 *** wxluacan.cpp 18 Jun 2007 14:54:58 -0000 1.32 --- wxluacan.cpp 18 Jun 2007 21:40:26 -0000 1.33 *************** *** 81,85 **** ! #if wxLUA_USE_wxPenList static wxLuaArgTag s_wxluatagArray_wxLua_wxlCanObj_SetBrush[] = { &s_wxluatag_wxlCanObj, &s_wxluatag_wxBrush, NULL }; static int LUACALL wxLua_wxlCanObj_SetBrush(lua_State *L); --- 81,85 ---- ! #if wxLUA_USE_wxColourPenBrush static wxLuaArgTag s_wxluatagArray_wxLua_wxlCanObj_SetBrush[] = { &s_wxluatag_wxlCanObj, &s_wxluatag_wxBrush, NULL }; static int LUACALL wxLua_wxlCanObj_SetBrush(lua_State *L); *************** *** 99,105 **** } - #endif // wxLUA_USE_wxPenList - - #if wxCHECK_VERSION(2,8,0) static wxLuaArgTag s_wxluatagArray_wxLua_wxlCanObj_SetPen[] = { &s_wxluatag_wxlCanObj, &s_wxluatag_wxPen, NULL }; static int LUACALL wxLua_wxlCanObj_SetPen(lua_State *L); --- 99,102 ---- *************** *** 119,123 **** } ! #endif // wxCHECK_VERSION(2,8,0) static wxLuaArgTag s_wxluatagArray_wxLua_wxlCanObj_SetPending[] = { &s_wxluatag_wxlCanObj, &s_wxluaarg_Boolean, NULL }; --- 116,120 ---- } ! #endif // wxLUA_USE_wxColourPenBrush static wxLuaArgTag s_wxluatagArray_wxLua_wxlCanObj_SetPending[] = { &s_wxluatag_wxlCanObj, &s_wxluaarg_Boolean, NULL }; *************** *** 190,200 **** { "GetY", WXLUAMETHOD_METHOD, s_wxluafunc_wxLua_wxlCanObj_GetY, 1, NULL }, ! #if wxLUA_USE_wxPenList { "SetBrush", WXLUAMETHOD_METHOD, s_wxluafunc_wxLua_wxlCanObj_SetBrush, 1, NULL }, - #endif // wxLUA_USE_wxPenList - - #if wxCHECK_VERSION(2,8,0) { "SetPen", WXLUAMETHOD_METHOD, s_wxluafunc_wxLua_wxlCanObj_SetPen, 1, NULL }, ! #endif // wxCHECK_VERSION(2,8,0) { "SetPending", WXLUAMETHOD_METHOD, s_wxluafunc_wxLua_wxlCanObj_SetPending, 1, NULL }, --- 187,194 ---- { "GetY", WXLUAMETHOD_METHOD, s_wxluafunc_wxLua_wxlCanObj_GetY, 1, NULL }, ! #if wxLUA_USE_wxColourPenBrush { "SetBrush", WXLUAMETHOD_METHOD, s_wxluafunc_wxLua_wxlCanObj_SetBrush, 1, NULL }, { "SetPen", WXLUAMETHOD_METHOD, s_wxluafunc_wxLua_wxlCanObj_SetPen, 1, NULL }, ! #endif // wxLUA_USE_wxColourPenBrush { "SetPending", WXLUAMETHOD_METHOD, s_wxluafunc_wxLua_wxlCanObj_SetPending, 1, NULL }, |
|
From: John L. <jr...@us...> - 2007-06-18 21:40:58
|
Update of /cvsroot/wxlua/wxLua/samples In directory sc8-pr-cvs9.sourceforge.net:/tmp/cvs-serv32406/wxLua/samples Modified Files: bindings.wx.lua Log Message: Fix last commit of trying to preserve the order of the binding conditions, this way works. Index: bindings.wx.lua =================================================================== RCS file: /cvsroot/wxlua/wxLua/samples/bindings.wx.lua,v retrieving revision 1.10 retrieving revision 1.11 diff -C2 -d -r1.10 -r1.11 *** bindings.wx.lua 16 Jun 2007 06:21:47 -0000 1.10 --- bindings.wx.lua 18 Jun 2007 21:40:53 -0000 1.11 *************** *** 964,967 **** --- 964,968 ---- local classinfoNotes = { ["wxAutoBufferedPaintDC"] = "(Platform dep. baseclass, wxDC is ok)", + ["wxCursor"] = "(Platform dep. baseclass, wxObject is ok)", ["wxHelpController"] = "(Platform dep. typedef by wxWidgets)", ["wxLuaDebuggerServer"] = "(Platform dep. typedef by wxLua)", *************** *** 1157,1161 **** local t = { {"..", ["icon"] = list_images.folder}, ! ["col_labels"] = {"Class Name", "Function Name", "Args"}, ["object_type"] = "Overloaded Baseclass Functions" } --- 1158,1162 ---- local t = { {"..", ["icon"] = list_images.folder}, ! ["col_labels"] = {"Function Name", "Class Name", "Args"}, ["object_type"] = "Overloaded Baseclass Functions" } |
|
From: John L. <jr...@us...> - 2007-06-18 21:40:56
|
Update of /cvsroot/wxlua/wxLua/modules/wxbindstc/src In directory sc8-pr-cvs9.sourceforge.net:/tmp/cvs-serv32406/wxLua/modules/wxbindstc/src Modified Files: stc.cpp Log Message: Fix last commit of trying to preserve the order of the binding conditions, this way works. Index: stc.cpp =================================================================== RCS file: /cvsroot/wxlua/wxLua/modules/wxbindstc/src/stc.cpp,v retrieving revision 1.44 retrieving revision 1.45 diff -C2 -d -r1.44 -r1.45 *** stc.cpp 18 Jun 2007 14:55:04 -0000 1.44 --- stc.cpp 18 Jun 2007 21:40:52 -0000 1.45 *************** *** 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); --- 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); *************** *** 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 }; --- 771,775 ---- } ! #endif // wxLUA_USE_wxColourPenBrush static wxLuaArgTag s_wxluatagArray_wxLua_wxStyledTextCtrl_CallTipSetHighlight[] = { &s_wxluatag_wxStyledTextCtrl, &s_wxluaarg_Number, &s_wxluaarg_Number, NULL }; *************** *** 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); --- 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); *************** *** 1602,1606 **** } ! #endif // (wxLUA_USE_wxPointSizeRect) && (wxCHECK_VERSION(2,8,0)) static wxLuaArgTag s_wxluatagArray_wxLua_wxStyledTextCtrl_GetAnchor[] = { &s_wxluatag_wxStyledTextCtrl, NULL }; --- 1602,1606 ---- } ! #endif // (wxLUA_USE_wxPointSizeRect) && (wxLUA_USE_wxDC) static wxLuaArgTag s_wxluatagArray_wxLua_wxStyledTextCtrl_GetAnchor[] = { &s_wxluatag_wxStyledTextCtrl, NULL }; *************** *** 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); --- 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); *************** *** 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); --- 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); *************** *** 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); --- 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); *************** *** 1729,1733 **** } ! #endif // wxCHECK_VERSION(2,8,0) 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 }; *************** *** 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); --- 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); *************** *** 1996,2000 **** } ! #endif // wxCHECK_VERSION(2,8,0) static wxLuaArgTag s_wxluatagArray_wxLua_wxStyledTextCtrl_GetEdgeColumn[] = { &s_wxluatag_wxStyledTextCtrl, NULL }; --- 1996,2000 ---- } ! #endif // wxLUA_USE_wxColourPenBrush static wxLuaArgTag s_wxluatagArray_wxLua_wxStyledTextCtrl_GetEdgeColumn[] = { &s_wxluatag_wxStyledTextCtrl, NULL }; *************** *** 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); --- 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); *************** *** 3670,3674 **** } ! #endif // wxCHECK_VERSION(2,8,0) static wxLuaArgTag s_wxluatagArray_wxLua_wxStyledTextCtrl_IndicatorGetStyle[] = { &s_wxluatag_wxStyledTextCtrl, &s_wxluaarg_Number, NULL }; --- 3670,3674 ---- } ! #endif // wxLUA_USE_wxColourPenBrush static wxLuaArgTag s_wxluatagArray_wxLua_wxStyledTextCtrl_IndicatorGetStyle[] = { &s_wxluatag_wxStyledTextCtrl, &s_wxluaarg_Number, NULL }; *************** *** 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); --- 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); *************** *** 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 }; --- 3713,3717 ---- } ! #endif // wxLUA_USE_wxColourPenBrush static wxLuaArgTag s_wxluatagArray_wxLua_wxStyledTextCtrl_IndicatorSetStyle[] = { &s_wxluatag_wxStyledTextCtrl, &s_wxluaarg_Number, &s_wxluaarg_Number, NULL }; *************** *** 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); --- 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); *************** *** 4284,4288 **** } ! #endif // wxCHECK_VERSION(2,8,0) #if wxLUA_USE_wxBitmap --- 4284,4288 ---- } ! #endif // wxLUA_USE_wxColourPenBrush #if wxLUA_USE_wxBitmap *************** *** 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); --- 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); *************** *** 4485,4489 **** } ! #endif // wxCHECK_VERSION(2,8,0) static wxLuaArgTag s_wxluatagArray_wxLua_wxStyledTextCtrl_MoveCaretInsideView[] = { &s_wxluatag_wxStyledTextCtrl, NULL }; --- 4485,4489 ---- } ! #endif // wxLUA_USE_wxColourPenBrush static wxLuaArgTag s_wxluatagArray_wxLua_wxStyledTextCtrl_MoveCaretInsideView[] = { &s_wxluatag_wxStyledTextCtrl, NULL }; *************** *** 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); --- 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); *************** *** 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); --- 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); *************** *** 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); --- 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); *************** *** 5244,5248 **** } ! #endif // wxCHECK_VERSION(2,8,0) 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 }; *************** *** 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); --- 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); *************** *** 5433,5437 **** } ! #endif // wxCHECK_VERSION(2,8,0) static wxLuaArgTag s_wxluatagArray_wxLua_wxStyledTextCtrl_SetEdgeColumn[] = { &s_wxluatag_wxStyledTextCtrl, &s_wxluaarg_Number, NULL }; --- 5433,5437 ---- } ! #endif // wxLUA_USE_wxColourPenBrush static wxLuaArgTag s_wxluatagArray_wxLua_wxStyledTextCtrl_SetEdgeColumn[] = { &s_wxluatag_wxStyledTextCtrl, &s_wxluaarg_Number, NULL }; *************** *** 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); --- 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); *************** *** 5581,5585 **** } ! #endif // wxCHECK_VERSION(2,8,0) #if wxLUA_USE_wxScrollBar && wxUSE_SCROLLBAR --- 5581,5585 ---- } ! #endif // wxLUA_USE_wxColourPenBrush #if wxLUA_USE_wxScrollBar && wxUSE_SCROLLBAR *************** *** 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); --- 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); *************** *** 5660,5664 **** } ! #endif // wxCHECK_VERSION(2,8,0) static wxLuaArgTag s_wxluatagArray_wxLua_wxStyledTextCtrl_SetHotspotActiveUnderline[] = { &s_wxluatag_wxStyledTextCtrl, &s_wxluaarg_Boolean, NULL }; --- 5660,5664 ---- } ! #endif // wxLUA_USE_wxColourPenBrush static wxLuaArgTag s_wxluatagArray_wxLua_wxStyledTextCtrl_SetHotspotActiveUnderline[] = { &s_wxluatag_wxStyledTextCtrl, &s_wxluaarg_Boolean, NULL }; *************** *** 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); --- 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); *************** *** 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 }; --- 6279,6283 ---- } ! #endif // wxLUA_USE_wxColourPenBrush static wxLuaArgTag s_wxluatagArray_wxLua_wxStyledTextCtrl_SetSelection[] = { &s_wxluatag_wxStyledTextCtrl, &s_wxluaarg_Number, &s_wxluaarg_Number, NULL }; *************** *** 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); --- 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); *************** *** 6709,6713 **** } ! #endif // wxCHECK_VERSION(2,8,0) static wxLuaArgTag s_wxluatagArray_wxLua_wxStyledTextCtrl_SetWhitespaceChars[] = { &s_wxluatag_wxStyledTextCtrl, &s_wxluaarg_String, NULL }; --- 6709,6713 ---- } ! #endif // wxLUA_USE_wxColourPenBrush static wxLuaArgTag s_wxluatagArray_wxLua_wxStyledTextCtrl_SetWhitespaceChars[] = { &s_wxluatag_wxStyledTextCtrl, &s_wxluaarg_String, NULL }; *************** *** 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); --- 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); *************** *** 6749,6753 **** } ! #endif // wxCHECK_VERSION(2,8,0) static wxLuaArgTag s_wxluatagArray_wxLua_wxStyledTextCtrl_SetWordChars[] = { &s_wxluatag_wxStyledTextCtrl, &s_wxluaarg_String, NULL }; --- 6749,6753 ---- } ! #endif // wxLUA_USE_wxColourPenBrush static wxLuaArgTag s_wxluatagArray_wxLua_wxStyledTextCtrl_SetWordChars[] = { &s_wxluatag_wxStyledTextCtrl, &s_wxluaarg_String, NULL }; *************** *** 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); --- 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); *************** *** 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 }; --- 7087,7091 ---- } ! #endif // wxLUA_USE_wxColourPenBrush static wxLuaArgTag s_wxluatagArray_wxLua_wxStyledTextCtrl_StyleSetBold[] = { &s_wxluatag_wxStyledTextCtrl, &s_wxluaarg_Number, &s_wxluaarg_Boolean, NULL }; *************** *** 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); --- 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); *************** *** 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 }; --- 7296,7300 ---- } ! #endif // wxLUA_USE_wxColourPenBrush 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 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 }, --- 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 }, *************** *** 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 }, --- 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 }, *************** *** 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 }, --- 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 }, *************** *** 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 }, --- 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 }, *************** *** 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 }, --- 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 }, *************** *** 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 --- 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 *************** *** 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 }, --- 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 }, *************** *** 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 }, --- 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 }, *************** *** 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 }, --- 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 }, *************** *** 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 --- 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 *************** *** 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 }, --- 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 }, *************** *** 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 }, --- 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 }, *************** *** 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 }, --- 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 }, *************** *** 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 }, --- 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 }, *************** *** 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 }, --- 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 }, |
|
From: John L. <jr...@us...> - 2007-06-18 21:40:56
|
Update of /cvsroot/wxlua/wxLua/modules/wxlua/src In directory sc8-pr-cvs9.sourceforge.net:/tmp/cvs-serv32406/wxLua/modules/wxlua/src Modified Files: wxlbind.cpp Log Message: Fix last commit of trying to preserve the order of the binding conditions, this way works. Index: wxlbind.cpp =================================================================== RCS file: /cvsroot/wxlua/wxLua/modules/wxlua/src/wxlbind.cpp,v retrieving revision 1.78 retrieving revision 1.79 diff -C2 -d -r1.78 -r1.79 *** wxlbind.cpp 18 Jun 2007 19:51:38 -0000 1.78 --- wxlbind.cpp 18 Jun 2007 21:40:52 -0000 1.79 *************** *** 252,257 **** wxLuaBindClass *wxlClass = (wxLuaBindClass *)lua_touserdata(L, lua_upvalueindex(1)); - long key = -1; - if ((wxlClass != NULL) && wxlua_iswxuserdata(L, 1) && (wxlua_ttag(L, 1) == *wxlClass->class_tag)) { --- 252,255 ---- |
|
From: John L. <jr...@us...> - 2007-06-18 19:52:04
|
Update of /cvsroot/wxlua/wxLua/docs In directory sc8-pr-cvs9.sourceforge.net:/tmp/cvs-serv21463/wxLua/docs Modified Files: wxluaref.html Log Message: Add more classes from 2.8, wxStandardPaths, wxToolbook, wxTreebook... Index: wxluaref.html =================================================================== RCS file: /cvsroot/wxlua/wxLua/docs/wxluaref.html,v retrieving revision 1.27 retrieving revision 1.28 diff -C2 -d -r1.27 -r1.28 *** wxluaref.html 18 Jun 2007 02:56:25 -0000 1.27 --- wxluaref.html 18 Jun 2007 19:51:27 -0000 1.28 *************** *** 1429,1440 **** <td> <tr> ! <td>wxHtmlCellEvent <td align="center">X - <td> <td> <tr> ! <td>wxHtmlColourCell <td align="center">X - <td> <td> <tr> --- 1429,1440 ---- <td> <tr> ! <td><a href="#wxHtmlCellEvent">wxHtmlCellEvent</a> ! <td align="center">X <td align="center">X <td> <tr> ! <td><a href="#wxHtmlColourCell">wxHtmlColourCell</a> ! <td align="center">X <td align="center">X <td> <tr> *************** *** 1459,1462 **** --- 1459,1467 ---- <td> <tr> + <td><a href="#wxHtmlFontCell">wxHtmlFontCell</a> + <td> + <td align="center">X + <td> + <tr> <td><a href="#wxHtmlHelpController">wxHtmlHelpController</a> <td align="center">X *************** *** 1554,1565 **** <td> <tr> ! <td>wxHyperlinkCtrl <td align="center">X - <td> <td> <tr> ! <td>wxHyperlinkEvent <td align="center">X - <td> <td> <tr> --- 1559,1570 ---- <td> <tr> ! <td><a href="#wxHyperlinkCtrl">wxHyperlinkCtrl</a> ! <td align="center">X <td align="center">X <td> <tr> ! <td><a href="#wxHyperlinkEvent">wxHyperlinkEvent</a> ! <td align="center">X <td align="center">X <td> <tr> *************** *** 2689,2695 **** <td> <tr> ! <td>wxStandardPaths <td align="center">X - <td> <td> <tr> --- 2694,2700 ---- <td> <tr> ! <td><a href="#wxStandardPaths">wxStandardPaths</a> ! <td align="center">X <td align="center">X <td> <tr> *************** *** 2784,2790 **** <td> <tr> ! <td>wxStringTokenizer <td align="center">X - <td> <td> <tr> --- 2789,2795 ---- <td> <tr> ! <td><a href="#wxStringTokenizer">wxStringTokenizer</a> ! <td align="center">X <td align="center">X <td> <tr> *************** *** 3014,3020 **** <td> <tr> ! <td>wxToolbook <td align="center">X <td> <td> <tr> --- 3019,3030 ---- <td> <tr> ! <td><a href="#wxToolbook">wxToolbook</a> ! <td align="center">X <td align="center">X <td> + <tr> + <td><a href="#wxToolbookEvent">wxToolbookEvent</a> + <td> + <td align="center">X <td> <tr> *************** *** 3049,3060 **** <td> <tr> ! <td>wxTreebook <td align="center">X - <td> <td> <tr> ! <td>wxTreebookEvent <td align="center">X - <td> <td> <tr> --- 3059,3070 ---- <td> <tr> ! <td><a href="#wxTreebook">wxTreebook</a> ! <td align="center">X <td align="center">X <td> <tr> ! <td><a href="#wxTreebookEvent">wxTreebookEvent</a> ! <td align="center">X <td align="center">X <td> <tr> *************** *** 3343,3350 **** --- 3353,3362 ---- <a href="#wxSocketNotify">wxSocketNotify</a><br> <a href="#wxSocketType">wxSocketType</a><br> + <a href="#wxStandardPaths::ResourceCat">wxStandardPaths::ResourceCat</a><br> <a href="#wxStockCursor">wxStockCursor</a><br> <a href="#wxStockGDI::Item">wxStockGDI::Item</a><br> <a href="#wxStreamError">wxStreamError</a><br> <a href="#wxStretch">wxStretch</a><br> + <a href="#wxStringTokenizerMode">wxStringTokenizerMode</a><br> <a href="#wxSystemColour">wxSystemColour</a><br> <a href="#wxSystemFeature">wxSystemFeature</a><br> *************** *** 4074,4077 **** --- 4086,4136 ---- <i>%endif</i> <font color=#009900>//wxLUA_USE_wxSystemOptions</font><br> <br> + <br> + <font color=#009900>// ---------------------------------------------------------------------------</font><br> + <font color=#009900>// <a href="#wxStandardPaths">wxStandardPaths</a></font><br> + <br> + <i>%if</i> <i>%wxchkver_2_8</i> && wxLUA_USE_wxStandardPaths<br> + <br> + <i>%include</i> "wx/stdpaths.h"<br> + <br> + <b><font size=+1 color=#0066CC><i>%enum</i> <a name="wxStandardPaths::ResourceCat">wxStandardPaths::ResourceCat</a></font></b> + <blockquote><font color=#0066CC> + ResourceCat_None <font color=#009900>// no special category</font><br> + ResourceCat_Messages <font color=#009900>// message catalog resources</font><br> + ResourceCat_Max <font color=#009900>// end of enum marker</font><br> + </font> + </blockquote><font color=#0066CC><i>%endenum</i></font><br> + <br> + <br> + <b><font size=+1 color=#DD0000><i>%class</i> <i>%delete</i> <i>%noclassinfo</i> <i>%encapsulate</i> <a name="wxStandardPaths">wxStandardPaths</a> <font color=#009900>// we ignore wxStandardPathsBase</font></font></b> + <blockquote> + <font color=#009900>// No constructor - use Get() function</font><br> + <br> + <font color=#009900>// return the global standard paths object</font><br> + <font color=#BB0055> <font color=#009900>// <i>%override</i> static <a href="#wxStandardPaths">wxStandardPaths</a>& Get();</font></font><br> + <font color=#009900>// C++ Func: static wxStandardPathsBase& Get();</font><br> + <font color=#009900>// We pretend that there is no wxStandardPathsBase and just use the <a href="#wxStandardPaths">wxStandardPaths</a> name</font><br> + static <a href="#wxStandardPaths">wxStandardPaths</a>& Get();<br> + <br> + <font color=#009900>// These are only for the generic version, probably not ever needed</font><br> + <font color=#009900>//void SetInstallPrefix(const <a href="#wxString">wxString</a>& prefix)</font><br> + <font color=#009900>//<a href="#wxString">wxString</a> GetInstallPrefix() const</font><br> + <br> + virtual <a href="#wxString">wxString</a> GetExecutablePath() const<br> + virtual <a href="#wxString">wxString</a> GetConfigDir() const<br> + virtual <a href="#wxString">wxString</a> GetUserConfigDir() const<br> + virtual <a href="#wxString">wxString</a> GetDataDir() const<br> + virtual <a href="#wxString">wxString</a> GetLocalDataDir() const<br> + virtual <a href="#wxString">wxString</a> GetUserDataDir() const<br> + virtual <a href="#wxString">wxString</a> GetUserLocalDataDir() const<br> + virtual <a href="#wxString">wxString</a> GetPluginsDir() const<br> + virtual <a href="#wxString">wxString</a> GetResourcesDir() const<br> + virtual <a href="#wxString">wxString</a> GetLocalizedResourcesDir(const <a href="#wxString">wxString</a>& lang, wxStandardPaths::ResourceCat category = wxStandardPaths::ResourceCat_None) const<br> + virtual <a href="#wxString">wxString</a> GetDocumentsDir() const<br> + virtual <a href="#wxString">wxString</a> GetTempDir() const;<br> + </blockquote><font color=#DD0000><font color=#DD0000><i>%endclass</i></font></font><br> + <br> + <i>%endif</i> <font color=#009900>// <i>%wxchkver_2_8</i> && wxLUA_USE_wxStandardPaths</font><br> + <br> <font color=#009900>// ---------------------------------------------------------------------------</font><br> <font color=#009900>// <a href="#wxPlatformInfo">wxPlatformInfo</a></font><br> *************** *** 6110,6113 **** --- 6169,6223 ---- <br> <i>%endif</i> <font color=#009900>//wxLUA_USE_wxGenericDirCtrl & wxUSE_DIRDLG</font><br> + <br> + <font color=#009900>// ---------------------------------------------------------------------------</font><br> + <font color=#009900>// <a href="#wxHyperlinkCtrl">wxHyperlinkCtrl</a></font><br> + <br> + <i>%if</i> <i>%wxchkver_2_8</i> && wxUSE_HYPERLINKCTRL && wxLUA_USE_wxHyperlinkCtrl<br> + <br> + <i>%include</i> "wx/hyperlink.h"<br> + <br> + <font color=#006666><i>%define</i> wxHL_CONTEXTMENU</font><br> + <font color=#006666><i>%define</i> wxHL_ALIGN_LEFT</font><br> + <font color=#006666><i>%define</i> wxHL_ALIGN_RIGHT</font><br> + <font color=#006666><i>%define</i> wxHL_ALIGN_CENTRE</font><br> + <font color=#006666><i>%define</i> wxHL_DEFAULT_STYLE <font color=#009900>// (wxHL_CONTEXTMENU|wxNO_BORDER|wxHL_ALIGN_CENTRE)</font></font><br> + <br> + <b><font size=+1 color=#DD0000><i>%class</i> <a name="wxHyperlinkCtrl">wxHyperlinkCtrl</a>, <a href="#wxControl">wxControl</a></font></b> + <blockquote> + <a href="#wxHyperlinkCtrl">wxHyperlinkCtrl</a>()<br> + <a href="#wxHyperlinkCtrl">wxHyperlinkCtrl</a>(<a href="#wxWindow">wxWindow</a> *parent, wxWindowID id, const <a href="#wxString">wxString</a>& label, const <a href="#wxString">wxString</a>& url, const <a href="#wxPoint">wxPoint</a>& pos = wxDefaultPosition, const <a href="#wxSize">wxSize</a>& size = wxDefaultSize, long style = wxHL_DEFAULT_STYLE, const <a href="#wxString">wxString</a>& name = "wxHyperlinkCtrl")<br> + bool Create(<a href="#wxWindow">wxWindow</a> *parent, wxWindowID id, const <a href="#wxString">wxString</a>& label, const <a href="#wxString">wxString</a>& url, const <a href="#wxPoint">wxPoint</a>& pos = wxDefaultPosition, const <a href="#wxSize">wxSize</a>& size = wxDefaultSize, long style = wxHL_DEFAULT_STYLE, const <a href="#wxString">wxString</a>& name = "wxHyperlinkCtrl");<br> + <br> + <a href="#wxColour">wxColour</a> GetHoverColour() const<br> + void SetHoverColour(const <a href="#wxColour">wxColour</a> &colour)<br> + <br> + <a href="#wxColour">wxColour</a> GetNormalColour() const<br> + void SetNormalColour(const <a href="#wxColour">wxColour</a> &colour);<br> + <br> + <a href="#wxColour">wxColour</a> GetVisitedColour() const<br> + void SetVisitedColour(const <a href="#wxColour">wxColour</a> &colour);<br> + <br> + <a href="#wxString">wxString</a> GetURL() const<br> + void SetURL (const <a href="#wxString">wxString</a> &url)<br> + <br> + void SetVisited(bool visited = true)<br> + bool GetVisited() const<br> + </blockquote><font color=#DD0000><font color=#DD0000><i>%endclass</i></font></font><br> + <br> + <font color=#009900>// ---------------------------------------------------------------------------</font><br> + <font color=#009900>// <a href="#wxHyperlinkEvent">wxHyperlinkEvent</a></font><br> + <br> + <b><font size=+1 color=#DD0000><i>%class</i> <i>%delete</i> <a name="wxHyperlinkEvent">wxHyperlinkEvent</a>, <a href="#wxCommandEvent">wxCommandEvent</a></font></b> + <blockquote> + <font color=#006666> <i>%define_event</i> wxEVT_COMMAND_HYPERLINK <font color=#009900>// EVT_HYPERLINK(id, fn)</font></font><br> + <br> + <font color=#009900>//<a href="#wxHyperlinkEvent">wxHyperlinkEvent</a>()</font><br> + <a href="#wxHyperlinkEvent">wxHyperlinkEvent</a>(<a href="#wxObject">wxObject</a> *generator, wxWindowID id, const <a href="#wxString">wxString</a>& url)<br> + <br> + <a href="#wxString">wxString</a> GetURL() const<br> + void SetURL(const <a href="#wxString">wxString</a> &url)<br> + </blockquote><font color=#DD0000><font color=#DD0000><i>%endclass</i></font></font><br> + <br> + <i>%endif</i> <font color=#009900>// <i>%wxchkver_2_8</i> && wxUSE_HYPERLINKCTRL && wxLUA_USE_wxHyperlinkCtrl</font><br> <br><HR> *************** *** 6139,6142 **** --- 6249,6288 ---- <br> <font color=#009900>// ---------------------------------------------------------------------------</font><br> + <font color=#009900>// <a href="#wxStringTokenizer">wxStringTokenizer</a></font><br> + <br> + <i>%include</i> "wx/tokenzr.h"<br> + <br> + <b><font size=+1 color=#0066CC><i>%enum</i> <a name="wxStringTokenizerMode">wxStringTokenizerMode</a></font></b> + <blockquote><font color=#0066CC> + wxTOKEN_INVALID <font color=#009900>// set by def ctor until SetString() is called</font><br> + wxTOKEN_DEFAULT <font color=#009900>// strtok() for whitespace delims, RET_EMPTY else</font><br> + wxTOKEN_RET_EMPTY <font color=#009900>// return empty token in the middle of the string</font><br> + wxTOKEN_RET_EMPTY_ALL <font color=#009900>// return trailing empty tokens too</font><br> + wxTOKEN_RET_DELIMS <font color=#009900>// return the delim with token (implies RET_EMPTY)</font><br> + wxTOKEN_STRTOK <font color=#009900>// behave exactly like strtok(3)</font><br> + </font> + </blockquote><font color=#0066CC><i>%endenum</i></font><br> + <br> + <b><font size=+1 color=#DD0000><i>%class</i> <i>%delete</i> <i>%noclassinfo</i> <a name="wxStringTokenizer">wxStringTokenizer</a>, <a href="#wxObject">wxObject</a></font></b> + <blockquote> + <a href="#wxStringTokenizer">wxStringTokenizer</a>()<br> + <a href="#wxStringTokenizer">wxStringTokenizer</a>(const <a href="#wxString">wxString</a>& str, const <a href="#wxString">wxString</a>& delims = wxDEFAULT_DELIMITERS, <a href="#wxStringTokenizerMode">wxStringTokenizerMode</a> mode = wxTOKEN_DEFAULT);<br> + <br> + void SetString(const <a href="#wxString">wxString</a>& str, const <a href="#wxString">wxString</a>& delims = wxDEFAULT_DELIMITERS, <a href="#wxStringTokenizerMode">wxStringTokenizerMode</a> mode = wxTOKEN_DEFAULT);<br> + <br> + void Reinit(const <a href="#wxString">wxString</a>& str);<br> + size_t CountTokens() const;<br> + bool HasMoreTokens() const;<br> + <a href="#wxString">wxString</a> GetNextToken();<br> + <font color=#009900>//wxChar GetLastDelimiter() const</font><br> + <br> + <a href="#wxString">wxString</a> GetString() const<br> + size_t GetPosition() const<br> + <br> + <a href="#wxStringTokenizerMode">wxStringTokenizerMode</a> GetMode() const<br> + bool AllowEmpty() const<br> + </blockquote><font color=#DD0000><font color=#DD0000><i>%endclass</i></font></font><br> + <br> + <font color=#009900>// ---------------------------------------------------------------------------</font><br> <font color=#009900>// <a href="#wxClientData">wxClientData</a></font><br> <br> *************** *** 9728,9731 **** --- 9874,9879 ---- <font color=#009900>// <a href="#wxPowerEvent">wxPowerEvent</a></font><br> <br> + <i>%if</i> <i>%wxchkver_2_8</i><br> + <br> <i>%include</i> "wx/power.h"<br> <br> *************** *** 9768,9771 **** --- 9916,9922 ---- <i>%endif</i> <font color=#009900>// wxHAS_POWER_EVENTS</font><br> <br> + <i>%endif</i> <i>%wxchkver_2_8</i><br> + <br> + <br> <font color=#009900>// ---------------------------------------------------------------------------</font><br> <font color=#009900>// <a href="#wxSetCursorEvent">wxSetCursorEvent</a></font><br> *************** *** 13665,13673 **** <br> <i>%if</i> <i>%msw</i><br> <b><font size=+1 color=#DD0000><i>%class</i> <i>%delete</i> <a name="wxWinHelpController">wxWinHelpController</a>, <a href="#wxHelpControllerBase">wxHelpControllerBase</a></font></b> <blockquote> - <i>%include</i> "wx/helpwin.h"<br> <a href="#wxWinHelpController">wxWinHelpController</a>()<br> </blockquote><font color=#DD0000><font color=#DD0000><i>%endclass</i></font></font><br> <i>%endif</i> <font color=#009900>//<i>%msw</i></font><br> <br> --- 13816,13827 ---- <br> <i>%if</i> <i>%msw</i><br> + <br> + <i>%include</i> "wx/helpwin.h"<br> + <br> <b><font size=+1 color=#DD0000><i>%class</i> <i>%delete</i> <a name="wxWinHelpController">wxWinHelpController</a>, <a href="#wxHelpControllerBase">wxHelpControllerBase</a></font></b> <blockquote> <a href="#wxWinHelpController">wxWinHelpController</a>()<br> </blockquote><font color=#DD0000><font color=#DD0000><i>%endclass</i></font></font><br> + <br> <i>%endif</i> <font color=#009900>//<i>%msw</i></font><br> <br> *************** *** 13690,13695 **** <blockquote> <a href="#wxBestHelpController">wxBestHelpController</a>(<a href="#wxWindow">wxWindow</a>* parentWindow = NULL, int style = wxHF_DEFAULT_STYLE)<br> - <br> </blockquote><font color=#DD0000><font color=#DD0000><i>%endclass</i></font></font><br> <i>%endif</i> <font color=#009900>//<i>%msw</i></font><br> <br> --- 13844,13849 ---- <blockquote> <a href="#wxBestHelpController">wxBestHelpController</a>(<a href="#wxWindow">wxWindow</a>* parentWindow = NULL, int style = wxHF_DEFAULT_STYLE)<br> </blockquote><font color=#DD0000><font color=#DD0000><i>%endclass</i></font></font><br> + <br> <i>%endif</i> <font color=#009900>//<i>%msw</i></font><br> <br> *************** *** 13698,13706 **** <br> <i>%if</i> !<i>%win</i><br> <b><font size=+1 color=#DD0000><i>%class</i> <i>%delete</i> <a name="wxExtHelpController">wxExtHelpController</a>, <a href="#wxHelpControllerBase">wxHelpControllerBase</a></font></b> <blockquote> - <i>%include</i> "wx/generic/helpext.h"<br> <a href="#wxExtHelpController">wxExtHelpController</a>()<br> </blockquote><font color=#DD0000><font color=#DD0000><i>%endclass</i></font></font><br> <i>%endif</i> <font color=#009900>//!<i>%win</i></font><br> <br> --- 13852,13863 ---- <br> <i>%if</i> !<i>%win</i><br> + <br> + <i>%include</i> "wx/generic/helpext.h"<br> + <br> <b><font size=+1 color=#DD0000><i>%class</i> <i>%delete</i> <a name="wxExtHelpController">wxExtHelpController</a>, <a href="#wxHelpControllerBase">wxHelpControllerBase</a></font></b> <blockquote> <a href="#wxExtHelpController">wxExtHelpController</a>()<br> </blockquote><font color=#DD0000><font color=#DD0000><i>%endclass</i></font></font><br> + <br> <i>%endif</i> <font color=#009900>//!<i>%win</i></font><br> <br> *************** *** 13874,13926 **** <font color=#009900>// <a href="#wxHtmlWidgetCell">wxHtmlWidgetCell</a></font><br> <br> - <b><font size=+1 color=#DD0000><i>%class</i> <a name="wxHtmlWidgetCell">wxHtmlWidgetCell</a>, <a href="#wxHtmlCell">wxHtmlCell</a></font></b> - <blockquote> - <a href="#wxHtmlWidgetCell">wxHtmlWidgetCell</a>(<a href="#wxWindow">wxWindow</a>* wnd, int w = 0)<br> - </blockquote><font color=#DD0000><font color=#DD0000><i>%endclass</i></font></font><br> - <br> - <font color=#009900>// ---------------------------------------------------------------------------</font><br> - <font color=#009900>// <a href="#wxHtmlLinkInfo">wxHtmlLinkInfo</a></font><br> - <br> <i>%include</i> "wx/html/htmlcell.h"<br> <br> ! <b><font size=+1 color=#DD0000><i>%class</i> <i>%noclassinfo</i> <a name="wxHtmlLinkInfo">wxHtmlLinkInfo</a></font></b> <blockquote> ! <a href="#wxHtmlLinkInfo">wxHtmlLinkInfo</a>(const <a href="#wxString">wxString</a>& href, const <a href="#wxString">wxString</a>& target = "")<br> ! <br> ! const <a href="#wxMouseEvent">wxMouseEvent</a> * GetEvent()<br> ! const <a href="#wxHtmlCell">wxHtmlCell</a> * GetHtmlCell()<br> ! <a href="#wxString">wxString</a> GetHref()<br> ! <a href="#wxString">wxString</a> GetTarget()<br> </blockquote><font color=#DD0000><font color=#DD0000><i>%endclass</i></font></font><br> <br> - <font color=#009900>// ---------------------------------------------------------------------------</font><br> - <font color=#009900>// <a href="#wxHtmlTag">wxHtmlTag</a></font><br> - <br> - <i>%include</i> "wx/html/htmltag.h"<br> - <br> - <b><font size=+1 color=#DD0000><i>%class</i> <a name="wxHtmlTag">wxHtmlTag</a>, <a href="#wxObject">wxObject</a></font></b> - <blockquote> - <font color=#009900>//<a href="#wxHtmlTag">wxHtmlTag</a>(const <a href="#wxString">wxString</a>& source, int pos, int end_pos, wxHtmlTagsCache* cache)</font><br> - <br> - const <a href="#wxString">wxString</a> GetAllParams() const<br> - int GetBeginPos() const<br> - int GetEndPos1() const<br> - int GetEndPos2() const<br> - <a href="#wxString">wxString</a> GetName() const<br> - <a href="#wxString">wxString</a> GetParam(const <a href="#wxString">wxString</a>& par, bool with_commas = false) const<br> - <br> - <font color=#BB0055> <font color=#009900>// <i>%override</i> [bool, <a href="#wxColour">wxColour</a>] wxHtmlTag::GetParamAsColour(const <a href="#wxString">wxString</a>& par) const</font></font><br> - <font color=#009900>// C++ Func: bool GetParamAsColour(const <a href="#wxString">wxString</a>& par, <a href="#wxColour">wxColour</a> *clr) const</font><br> - bool GetParamAsColour(const <a href="#wxString">wxString</a>& par) const<br> - <br> - <font color=#BB0055> <font color=#009900>// <i>%override</i> [bool, int value] wxHtmlTag::GetParamAsInt(const <a href="#wxString">wxString</a>& par) const</font></font><br> - <font color=#009900>// C++ Func: bool GetParamAsInt(const <a href="#wxString">wxString</a>& par, int *value) const</font><br> - bool GetParamAsInt(const <a href="#wxString">wxString</a>& par) const<br> - <br> - bool HasEnding() const<br> - bool HasParam(const <a href="#wxString">wxString</a>& par) const<br> - <font color=#009900>//bool IsEnding() const</font><br> - <font color=#009900>//<a href="#wxString">wxString</a> ScanParam(const <a href="#wxString">wxString</a>& par, const <a href="#wxString">wxString</a> &format, void *value) const</font><br> - </blockquote><font color=#DD0000><font color=#DD0000><i>%endclass</i></font></font><br> <br> <font color=#009900>// ---------------------------------------------------------------------------</font><br> --- 14031,14041 ---- <font color=#009900>// <a href="#wxHtmlWidgetCell">wxHtmlWidgetCell</a></font><br> <br> <i>%include</i> "wx/html/htmlcell.h"<br> <br> ! <b><font size=+1 color=#DD0000><i>%class</i> <a name="wxHtmlWidgetCell">wxHtmlWidgetCell</a>, <a href="#wxHtmlCell">wxHtmlCell</a></font></b> <blockquote> ! <a href="#wxHtmlWidgetCell">wxHtmlWidgetCell</a>(<a href="#wxWindow">wxWindow</a>* wnd, int w = 0)<br> </blockquote><font color=#DD0000><font color=#DD0000><i>%endclass</i></font></font><br> <br> <br> <font color=#009900>// ---------------------------------------------------------------------------</font><br> *************** *** 13970,13973 **** --- 14085,14190 ---- <br> <font color=#009900>// ---------------------------------------------------------------------------</font><br> + <font color=#009900>// <a href="#wxHtmlColourCell">wxHtmlColourCell</a></font><br> + <br> + <i>%if</i> <i>%wxchkver_2_8</i><br> + <br> + <i>%include</i> "wx/html/htmlcell.h"<br> + <br> + <b><font size=+1 color=#DD0000><i>%class</i> <a name="wxHtmlColourCell">wxHtmlColourCell</a>, <a href="#wxHtmlCell">wxHtmlCell</a></font></b> + <blockquote> + <a href="#wxHtmlColourCell">wxHtmlColourCell</a>(const <a href="#wxColour">wxColour</a>& clr, int flags = wxHTML_CLR_FOREGROUND)<br> + <br> + <font color=#009900>//virtual void Draw(<a href="#wxDC">wxDC</a>& dc, int x, int y, int view_y1, int view_y2, wxHtmlRenderingInfo& info);</font><br> + <font color=#009900>//virtual void DrawInvisible(<a href="#wxDC">wxDC</a>& dc, int x, int y, wxHtmlRenderingInfo& info);</font><br> + </blockquote><font color=#DD0000><font color=#DD0000><i>%endclass</i></font></font><br> + <br> + <i>%endif</i> <font color=#009900>// <i>%wxchkver_2_8</i></font><br> + <br> + <font color=#009900>// ---------------------------------------------------------------------------</font><br> + <font color=#009900>// <a href="#wxHtmlFontCell">wxHtmlFontCell</a></font><br> + <br> + <i>%if</i> <i>%wxchkver_2_8</i><br> + <br> + <i>%include</i> "wx/html/htmlcell.h"<br> + <br> + <b><font size=+1 color=#DD0000><i>%class</i> <a name="wxHtmlFontCell">wxHtmlFontCell</a>, <a href="#wxHtmlCell">wxHtmlCell</a></font></b> + <blockquote> + <a href="#wxHtmlFontCell">wxHtmlFontCell</a>(<a href="#wxFont">wxFont</a> *font)<br> + <br> + <font color=#009900>//virtual void Draw(<a href="#wxDC">wxDC</a>& dc, int x, int y, int view_y1, int view_y2, wxHtmlRenderingInfo& info);</font><br> + <font color=#009900>//virtual void DrawInvisible(<a href="#wxDC">wxDC</a>& dc, int x, int y, wxHtmlRenderingInfo& info);</font><br> + </blockquote><font color=#DD0000><font color=#DD0000><i>%endclass</i></font></font><br> + <br> + <i>%endif</i> <font color=#009900>// <i>%wxchkver_2_8</i></font><br> + <br> + <font color=#009900>// ---------------------------------------------------------------------------</font><br> + <font color=#009900>// <a href="#wxHtmlCellEvent">wxHtmlCellEvent</a></font><br> + <br> + <i>%if</i> <i>%wxchkver_2_8</i><br> + <br> + <i>%include</i> "wx/html/htmlwin.h"<br> + <br> + <b><font size=+1 color=#DD0000><i>%class</i> <i>%delete</i> <a name="wxHtmlCellEvent">wxHtmlCellEvent</a>, <a href="#wxCommandEvent">wxCommandEvent</a></font></b> + <blockquote> + <a href="#wxHtmlCellEvent">wxHtmlCellEvent</a>()<br> + <a href="#wxHtmlCellEvent">wxHtmlCellEvent</a>(wxEventType commandType, int id, <a href="#wxHtmlCell">wxHtmlCell</a> *cell, const <a href="#wxPoint">wxPoint</a> &pt, const <a href="#wxMouseEvent">wxMouseEvent</a> &ev)<br> + <br> + <a href="#wxHtmlCell">wxHtmlCell</a>* GetCell() const<br> + <a href="#wxPoint">wxPoint</a> GetPoint() const<br> + <a href="#wxMouseEvent">wxMouseEvent</a> GetMouseEvent() const<br> + <br> + void SetLinkClicked(bool linkclicked)<br> + bool GetLinkClicked() const<br> + </blockquote><font color=#DD0000><font color=#DD0000><i>%endclass</i></font></font><br> + <br> + <i>%endif</i> <font color=#009900>// <i>%wxchkver_2_8</i></font><br> + <br> + <br> + <font color=#009900>// ---------------------------------------------------------------------------</font><br> + <font color=#009900>// <a href="#wxHtmlLinkInfo">wxHtmlLinkInfo</a></font><br> + <br> + <i>%include</i> "wx/html/htmlcell.h"<br> + <br> + <b><font size=+1 color=#DD0000><i>%class</i> <i>%noclassinfo</i> <a name="wxHtmlLinkInfo">wxHtmlLinkInfo</a></font></b> + <blockquote> + <a href="#wxHtmlLinkInfo">wxHtmlLinkInfo</a>(const <a href="#wxString">wxString</a>& href, const <a href="#wxString">wxString</a>& target = "")<br> + <br> + const <a href="#wxMouseEvent">wxMouseEvent</a> * GetEvent()<br> + const <a href="#wxHtmlCell">wxHtmlCell</a> * GetHtmlCell()<br> + <a href="#wxString">wxString</a> GetHref()<br> + <a href="#wxString">wxString</a> GetTarget()<br> + </blockquote><font color=#DD0000><font color=#DD0000><i>%endclass</i></font></font><br> + <br> + <font color=#009900>// ---------------------------------------------------------------------------</font><br> + <font color=#009900>// <a href="#wxHtmlTag">wxHtmlTag</a></font><br> + <br> + <i>%include</i> "wx/html/htmltag.h"<br> + <br> + <b><font size=+1 color=#DD0000><i>%class</i> <a name="wxHtmlTag">wxHtmlTag</a>, <a href="#wxObject">wxObject</a></font></b> + <blockquote> + <font color=#009900>//<a href="#wxHtmlTag">wxHtmlTag</a>(const <a href="#wxString">wxString</a>& source, int pos, int end_pos, wxHtmlTagsCache* cache)</font><br> + <br> + const <a href="#wxString">wxString</a> GetAllParams() const<br> + int GetBeginPos() const<br> + int GetEndPos1() const<br> + int GetEndPos2() const<br> + <a href="#wxString">wxString</a> GetName() const<br> + <a href="#wxString">wxString</a> GetParam(const <a href="#wxString">wxString</a>& par, bool with_commas = false) const<br> + <br> + <font color=#BB0055> <font color=#009900>// <i>%override</i> [bool, <a href="#wxColour">wxColour</a>] wxHtmlTag::GetParamAsColour(const <a href="#wxString">wxString</a>& par) const</font></font><br> + <font color=#009900>// C++ Func: bool GetParamAsColour(const <a href="#wxString">wxString</a>& par, <a href="#wxColour">wxColour</a> *clr) const</font><br> + bool GetParamAsColour(const <a href="#wxString">wxString</a>& par) const<br> + <br> + <font color=#BB0055> <font color=#009900>// <i>%override</i> [bool, int value] wxHtmlTag::GetParamAsInt(const <a href="#wxString">wxString</a>& par) const</font></font><br> + <font color=#009900>// C++ Func: bool GetParamAsInt(const <a href="#wxString">wxString</a>& par, int *value) const</font><br> + bool GetParamAsInt(const <a href="#wxString">wxString</a>& par) const<br> + <br> + bool HasEnding() const<br> + bool HasParam(const <a href="#wxString">wxString</a>& par) const<br> + <font color=#009900>//bool IsEnding() const</font><br> + <font color=#009900>//<a href="#wxString">wxString</a> ScanParam(const <a href="#wxString">wxString</a>& par, const <a href="#wxString">wxString</a> &format, void *value) const</font><br> + </blockquote><font color=#DD0000><font color=#DD0000><i>%endclass</i></font></font><br> + <br> + <font color=#009900>// ---------------------------------------------------------------------------</font><br> <font color=#009900>// <a href="#wxHtmlWindow">wxHtmlWindow</a></font><br> <br> *************** *** 17982,17985 **** --- 18199,18279 ---- <br> <font color=#009900>// ---------------------------------------------------------------------------</font><br> + <font color=#009900>// <a href="#wxTreebook">wxTreebook</a></font><br> + <br> + <i>%if</i> <i>%wxchkver_2_8</i> && wxUSE_TREEBOOK && wxLUA_USE_wxTreebook<br> + <br> + <i>%include</i> "wx/treebook.h"<br> + <br> + <b><font size=+1 color=#DD0000><i>%class</i> <a name="wxTreebook">wxTreebook</a>, <a href="#wxBookCtrlBase">wxBookCtrlBase</a></font></b> + <blockquote> + <a href="#wxTreebook">wxTreebook</a>()<br> + <a href="#wxTreebook">wxTreebook</a>(<a href="#wxWindow">wxWindow</a> *parent, wxWindowID id, const <a href="#wxPoint">wxPoint</a>& pos = wxDefaultPosition, const <a href="#wxSize">wxSize</a>& size = wxDefaultSize, long style = wxBK_DEFAULT, const <a href="#wxString">wxString</a>& name = "wxTreebook")<br> + bool Create(<a href="#wxWindow">wxWindow</a> *parent, wxWindowID id, const <a href="#wxPoint">wxPoint</a>& pos = wxDefaultPosition, const <a href="#wxSize">wxSize</a>& size = wxDefaultSize, long style = wxBK_DEFAULT,const <a href="#wxString">wxString</a>& name = "wxTreebook")<br> + <br> + virtual bool InsertPage(size_t pos, <a href="#wxWindow">wxWindow</a> *page, const <a href="#wxString">wxString</a>& text, bool bSelect = false, int imageId = wxNOT_FOUND);<br> + virtual bool InsertSubPage(size_t pos, <a href="#wxWindow">wxWindow</a> *page, const <a href="#wxString">wxString</a>& text, bool bSelect = false, int imageId = wxNOT_FOUND);<br> + virtual bool AddPage(<a href="#wxWindow">wxWindow</a> *page, const <a href="#wxString">wxString</a>& text, bool bSelect = false, int imageId = wxNOT_FOUND);<br> + virtual bool AddSubPage(<a href="#wxWindow">wxWindow</a> *page, const <a href="#wxString">wxString</a>& text, bool bSelect = false, int imageId = wxNOT_FOUND);<br> + virtual bool DeletePage(size_t pos);<br> + virtual bool IsNodeExpanded(size_t pos) const;<br> + <br> + virtual bool ExpandNode(size_t pos, bool expand = true);<br> + bool CollapseNode(size_t pos)<br> + int GetPageParent(size_t pos) const;<br> + <a href="#wxTreeCtrl">wxTreeCtrl</a>* GetTreeCtrl() const<br> + </blockquote><font color=#DD0000><font color=#DD0000><i>%endclass</i></font></font><br> + <br> + <font color=#009900>// ---------------------------------------------------------------------------</font><br> + <font color=#009900>// <a href="#wxTreebookEvent">wxTreebookEvent</a></font><br> + <br> + <b><font size=+1 color=#DD0000><i>%class</i> <i>%delete</i> <a name="wxTreebookEvent">wxTreebookEvent</a>, <a href="#wxBookCtrlBaseEvent">wxBookCtrlBaseEvent</a></font></b> + <blockquote> + <font color=#006666> <i>%define_event</i> wxEVT_COMMAND_TREEBOOK_PAGE_CHANGED <font color=#009900>// EVT_TREEBOOK_PAGE_CHANGED(winid, fn)</font></font><br> + <font color=#006666> <i>%define_event</i> wxEVT_COMMAND_TREEBOOK_PAGE_CHANGING <font color=#009900>// EVT_TREEBOOK_PAGE_CHANGING(winid, fn)</font></font><br> + <font color=#006666> <i>%define_event</i> wxEVT_COMMAND_TREEBOOK_NODE_COLLAPSED <font color=#009900>// EVT_TREEBOOK_NODE_COLLAPSED(winid, fn)</font></font><br> + <font color=#006666> <i>%define_event</i> wxEVT_COMMAND_TREEBOOK_NODE_EXPANDED <font color=#009900>// EVT_TREEBOOK_NODE_EXPANDED(winid, fn)</font></font><br> + <br> + <a href="#wxTreebookEvent">wxTreebookEvent</a>(const <a href="#wxTreebookEvent">wxTreebookEvent</a>& event)<br> + <a href="#wxTreebookEvent">wxTreebookEvent</a>(wxEventType commandType = wxEVT_NULL, int id = 0, int nSel = wxNOT_FOUND, int nOldSel = wxNOT_FOUND)<br> + <br> + </blockquote><font color=#DD0000><font color=#DD0000><i>%endclass</i></font></font><br> + <br> + <i>%endif</i> <font color=#009900>// <i>%wxchkver_2_8</i> && wxUSE_TREEBOOK && wxLUA_USE_wxTreebook</font><br> + <br> + <font color=#009900>// ---------------------------------------------------------------------------</font><br> + <font color=#009900>// <a href="#wxToolbook">wxToolbook</a></font><br> + <br> + <i>%if</i> <i>%wxchkver_2_8</i> && wxUSE_TOOLBOOK && wxLUA_USE_wxToolbook<br> + <br> + <i>%include</i> "wx/toolbook.h"<br> + <br> + <b><font size=+1 color=#DD0000><i>%class</i> <a name="wxToolbook">wxToolbook</a>, <a href="#wxBookCtrlBase">wxBookCtrlBase</a></font></b> + <blockquote> + <a href="#wxToolbook">wxToolbook</a>()<br> + <a href="#wxToolbook">wxToolbook</a>(<a href="#wxWindow">wxWindow</a> *parent, wxWindowID id, const <a href="#wxPoint">wxPoint</a>& pos = wxDefaultPosition, const <a href="#wxSize">wxSize</a>& size = wxDefaultSize, long style = 0, const <a href="#wxString">wxString</a>& name = "wxToolbook")<br> + bool Create(<a href="#wxWindow">wxWindow</a> *parent, wxWindowID id, const <a href="#wxPoint">wxPoint</a>& pos = wxDefaultPosition, const <a href="#wxSize">wxSize</a>& size = wxDefaultSize, long style = 0, const <a href="#wxString">wxString</a>& name = "wxToolbook")<br> + <br> + <a href="#wxToolBarBase">wxToolBarBase</a>* GetToolBar() const<br> + <font color=#009900>// must be called in OnIdle or by application to realize the toolbar and select the initial page.</font><br> + void Realize();<br> + <br> + </blockquote><font color=#DD0000><font color=#DD0000><i>%endclass</i></font></font><br> + <br> + <font color=#009900>// ---------------------------------------------------------------------------</font><br> + <font color=#009900>// <a href="#wxToolbookEvent">wxToolbookEvent</a></font><br> + <br> + <b><font size=+1 color=#DD0000><i>%class</i> <i>%delete</i> <a name="wxToolbookEvent">wxToolbookEvent</a>, <a href="#wxBookCtrlBaseEvent">wxBookCtrlBaseEvent</a></font></b> + <blockquote> + <font color=#006666> <i>%define_event</i> wxEVT_COMMAND_TOOLBOOK_PAGE_CHANGED <font color=#009900>// EVT_TOOLBOOK_PAGE_CHANGED(winid, fn)</font></font><br> + <font color=#006666> <i>%define_event</i> wxEVT_COMMAND_TOOLBOOK_PAGE_CHANGING <font color=#009900>// EVT_TOOLBOOK_PAGE_CHANGING(winid, fn)</font></font><br> + <br> + <a href="#wxToolbookEvent">wxToolbookEvent</a>(const <a href="#wxToolbookEvent">wxToolbookEvent</a>& event)<br> + <a href="#wxToolbookEvent">wxToolbookEvent</a>(wxEventType commandType = wxEVT_NULL, int id = 0, int nSel = wxNOT_FOUND, int nOldSel = wxNOT_FOUND)<br> + <br> + </blockquote><font color=#DD0000><font color=#DD0000><i>%endclass</i></font></font><br> + <br> + <i>%endif</i> <font color=#009900>// <i>%wxchkver_2_8</i> && wxUSE_TOOLBOOK && wxLUA_USE_wxToolbook</font><br> + <br> + <font color=#009900>// ---------------------------------------------------------------------------</font><br> <font color=#009900>// <a href="#wxTabCtrl">wxTabCtrl</a></font><br> <br> *************** *** 17999,18003 **** <font color=#006666> <i>%define</i> wxTC_OWNERDRAW</font><br> <br> - <i>%include</i> "wx/tabctrl.h"<br> <a href="#wxTabCtrl">wxTabCtrl</a>(<a href="#wxWindow">wxWindow</a> *parent, wxWindowID id, const <a href="#wxPoint">wxPoint</a>& pos = wxDefaultPosition, const <a href="#wxSize">wxSize</a>& size = wxDefaultSize, long style = 0, const <a href="#wxString">wxString</a>& name = "wxTabCtrl")<br> bool Create(<a href="#wxWindow">wxWindow</a>* parent, wxWindowID id, const <a href="#wxPoint">wxPoint</a>& pos = wxDefaultPosition, const <a href="#wxSize">wxSize</a>& size = wxDefaultSize, long style = 0, const <a href="#wxString">wxString</a>& name = "wxTabCtrl")<br> --- 18293,18296 ---- |
|
From: John L. <jr...@us...> - 2007-06-18 19:52:03
|
Update of /cvsroot/wxlua/wxLua/modules/wxbind/setup In directory sc8-pr-cvs9.sourceforge.net:/tmp/cvs-serv21463/wxLua/modules/wxbind/setup Modified Files: wxluasetup.h Log Message: Add more classes from 2.8, wxStandardPaths, wxToolbook, wxTreebook... Index: wxluasetup.h =================================================================== RCS file: /cvsroot/wxlua/wxLua/modules/wxbind/setup/wxluasetup.h,v retrieving revision 1.13 retrieving revision 1.14 diff -C2 -d -r1.13 -r1.14 *** wxluasetup.h 18 Jun 2007 02:56:27 -0000 1.13 --- wxluasetup.h 18 Jun 2007 19:51:30 -0000 1.14 *************** *** 72,75 **** --- 72,76 ---- #define wxLUA_USE_wxHTML 1 #define wxLUA_USE_wxHtmlHelpController 1 + #define wxLUA_USE_wxHyperlinkCtrl 1 #define wxLUA_USE_wxIcon 1 #define wxLUA_USE_wxID_XXX 1 *************** *** 114,117 **** --- 115,119 ---- #define wxLUA_USE_wxSplashScreen 1 #define wxLUA_USE_wxSplitterWindow 1 + #define wxLUA_USE_wxStandardPaths 1 #define wxLUA_USE_wxStaticBitmap 1 #define wxLUA_USE_wxStaticBox 1 *************** *** 131,135 **** --- 133,139 ---- #define wxLUA_USE_wxToggleButton 1 #define wxLUA_USE_wxToolbar 1 + #define wxLUA_USE_wxToolbook 1 #define wxLUA_USE_wxTooltip 1 + #define wxLUA_USE_wxTreebook 1 #define wxLUA_USE_wxTreeCtrl 1 #define wxLUA_USE_wxValidator 1 |
|
From: John L. <jr...@us...> - 2007-06-18 19:52:03
|
Update of /cvsroot/wxlua/wxLua/modules/wxbind/include In directory sc8-pr-cvs9.sourceforge.net:/tmp/cvs-serv21463/wxLua/modules/wxbind/include Modified Files: wxbind.h Log Message: Add more classes from 2.8, wxStandardPaths, wxToolbook, wxTreebook... Index: wxbind.h =================================================================== RCS file: /cvsroot/wxlua/wxLua/modules/wxbind/include/wxbind.h,v retrieving revision 1.77 retrieving revision 1.78 diff -C2 -d -r1.77 -r1.78 *** wxbind.h 18 Jun 2007 14:54:59 -0000 1.77 --- wxbind.h 18 Jun 2007 19:51:29 -0000 1.78 *************** *** 101,104 **** --- 101,110 ---- #endif // (wxCHECK_VERSION(2,6,0)) && (wxUSE_NUMBERDLG) + #if (wxCHECK_VERSION(2,8,0)) && (wxCHECK_VERSION(2,8,0)) + #include "wx/html/htmlcell.h" + #include "wx/html/htmlwin.h" + #include "wx/htmllbox.h" + #endif // (wxCHECK_VERSION(2,8,0)) && (wxCHECK_VERSION(2,8,0)) + #if (wxLUA_USE_wxButton && wxUSE_BUTTON) && (wxLUA_USE_wxBitmapButton && wxUSE_BMPBUTTON) #include "wx/bmpbuttn.h" *************** *** 130,134 **** #if (wxLUA_USE_wxHTML && wxUSE_HTML) && (wxCHECK_VERSION(2,8,0)) ! #include "wx/htmllbox.h" #endif // (wxLUA_USE_wxHTML && wxUSE_HTML) && (wxCHECK_VERSION(2,8,0)) --- 136,140 ---- #if (wxLUA_USE_wxHTML && wxUSE_HTML) && (wxCHECK_VERSION(2,8,0)) ! #include "wx/html/htmlcell.h" #endif // (wxLUA_USE_wxHTML && wxUSE_HTML) && (wxCHECK_VERSION(2,8,0)) *************** *** 203,206 **** --- 209,213 ---- #include "wx/process.h" #include "wx/timer.h" + #include "wx/tokenzr.h" #include "wx/utils.h" #include "wxlua/include/wxlua_bind.h" *************** *** 226,242 **** --- 233,268 ---- #include "wx/dcscreen.h" #include "wx/event.h" + #include "wx/html/htmlcell.h" + #include "wx/html/htmltag.h" #include "wx/html/htmprint.h" #include "wx/pen.h" #include "wx/power.h" + #include "wx/wxhtml.h" #endif // wxCHECK_VERSION(2,8,0) + #if wxCHECK_VERSION(2,8,0) && wxLUA_USE_wxStandardPaths + #include "wx/stdpaths.h" + #endif // wxCHECK_VERSION(2,8,0) && wxLUA_USE_wxStandardPaths + #if wxCHECK_VERSION(2,8,0) && wxUSE_ABOUTDLG && wxLUA_USE_wxAboutDialog #include "wx/aboutdlg.h" #endif // wxCHECK_VERSION(2,8,0) && wxUSE_ABOUTDLG && wxLUA_USE_wxAboutDialog + #if wxCHECK_VERSION(2,8,0) && wxUSE_HYPERLINKCTRL && wxLUA_USE_wxHyperlinkCtrl + #include "wx/hyperlink.h" + #endif // wxCHECK_VERSION(2,8,0) && wxUSE_HYPERLINKCTRL && wxLUA_USE_wxHyperlinkCtrl + #if wxCHECK_VERSION(2,8,0) && wxUSE_TGA #include "wx/imagxpm.h" #endif // wxCHECK_VERSION(2,8,0) && wxUSE_TGA + #if wxCHECK_VERSION(2,8,0) && wxUSE_TOOLBOOK && wxLUA_USE_wxToolbook + #include "wx/toolbook.h" + #endif // wxCHECK_VERSION(2,8,0) && wxUSE_TOOLBOOK && wxLUA_USE_wxToolbook + + #if wxCHECK_VERSION(2,8,0) && wxUSE_TREEBOOK && wxLUA_USE_wxTreebook + #include "wx/treebook.h" + #endif // wxCHECK_VERSION(2,8,0) && wxUSE_TREEBOOK && wxLUA_USE_wxTreebook + #if wxLUA_USE_Animation && wxUSE_ANIMATIONCTRL && wxchkver_2_8 #include "wx/animate.h" *************** *** 453,458 **** #if wxLUA_USE_wxHTML && wxUSE_HTML #include "wx/html/htmlcell.h" - #include "wx/html/htmltag.h" - #include "wx/wxhtml.h" #endif // wxLUA_USE_wxHTML && wxUSE_HTML --- 479,482 ---- *************** *** 818,821 **** --- 842,859 ---- extern WXDLLIMPEXP_WXBIND wxLuaBindMethod wxAutoBufferedPaintDC_methods[]; extern WXDLLIMPEXP_DATA_WXBIND(int) wxAutoBufferedPaintDC_methodCount; + extern WXDLLIMPEXP_DATA_WXBIND(int) s_wxluatag_wxHtmlCellEvent; + extern WXDLLIMPEXP_WXBIND wxLuaBindMethod wxHtmlCellEvent_methods[]; + extern WXDLLIMPEXP_DATA_WXBIND(int) wxHtmlCellEvent_methodCount; + extern WXDLLIMPEXP_DATA_WXBIND(int) s_wxluatag_wxHtmlFontCell; + extern WXDLLIMPEXP_WXBIND wxLuaBindMethod wxHtmlFontCell_methods[]; + extern WXDLLIMPEXP_DATA_WXBIND(int) wxHtmlFontCell_methodCount; + 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)) && (wxCHECK_VERSION(2,8,0)) *************** *** 895,906 **** #if (wxLUA_USE_wxHTML && wxUSE_HTML) && (wxCHECK_VERSION(2,8,0)) ! 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 // (wxLUA_USE_wxHTML && wxUSE_HTML) && (wxCHECK_VERSION(2,8,0)) --- 933,939 ---- #if (wxLUA_USE_wxHTML && wxUSE_HTML) && (wxCHECK_VERSION(2,8,0)) ! extern WXDLLIMPEXP_DATA_WXBIND(int) s_wxluatag_wxHtmlColourCell; ! extern WXDLLIMPEXP_WXBIND wxLuaBindMethod wxHtmlColourCell_methods[]; ! extern WXDLLIMPEXP_DATA_WXBIND(int) wxHtmlColourCell_methodCount; #endif // (wxLUA_USE_wxHTML && wxUSE_HTML) && (wxCHECK_VERSION(2,8,0)) *************** *** 1226,1229 **** --- 1259,1265 ---- extern WXDLLIMPEXP_WXBIND wxLuaBindMethod wxStringClientData_methods[]; extern WXDLLIMPEXP_DATA_WXBIND(int) wxStringClientData_methodCount; + extern WXDLLIMPEXP_DATA_WXBIND(int) s_wxluatag_wxStringTokenizer; + extern WXDLLIMPEXP_WXBIND wxLuaBindMethod wxStringTokenizer_methods[]; + extern WXDLLIMPEXP_DATA_WXBIND(int) wxStringTokenizer_methodCount; extern WXDLLIMPEXP_DATA_WXBIND(int) s_wxluatag_wxSysColourChangedEvent; extern WXDLLIMPEXP_WXBIND wxLuaBindMethod wxSysColourChangedEvent_methods[]; *************** *** 1321,1327 **** --- 1357,1378 ---- extern WXDLLIMPEXP_WXBIND wxLuaBindMethod wxHtmlEasyPrinting_methods[]; extern WXDLLIMPEXP_DATA_WXBIND(int) wxHtmlEasyPrinting_methodCount; + extern WXDLLIMPEXP_DATA_WXBIND(int) s_wxluatag_wxHtmlLinkInfo; + extern WXDLLIMPEXP_WXBIND wxLuaBindMethod wxHtmlLinkInfo_methods[]; + extern WXDLLIMPEXP_DATA_WXBIND(int) wxHtmlLinkInfo_methodCount; + extern WXDLLIMPEXP_DATA_WXBIND(int) s_wxluatag_wxHtmlParser; + extern WXDLLIMPEXP_WXBIND wxLuaBindMethod wxHtmlParser_methods[]; + extern WXDLLIMPEXP_DATA_WXBIND(int) wxHtmlParser_methodCount; extern WXDLLIMPEXP_DATA_WXBIND(int) s_wxluatag_wxHtmlPrintout; extern WXDLLIMPEXP_WXBIND wxLuaBindMethod wxHtmlPrintout_methods[]; extern WXDLLIMPEXP_DATA_WXBIND(int) wxHtmlPrintout_methodCount; + extern WXDLLIMPEXP_DATA_WXBIND(int) s_wxluatag_wxHtmlTag; + extern WXDLLIMPEXP_WXBIND wxLuaBindMethod wxHtmlTag_methods[]; + extern WXDLLIMPEXP_DATA_WXBIND(int) wxHtmlTag_methodCount; + extern WXDLLIMPEXP_DATA_WXBIND(int) s_wxluatag_wxHtmlWinParser; + extern WXDLLIMPEXP_WXBIND wxLuaBindMethod wxHtmlWinParser_methods[]; + extern WXDLLIMPEXP_DATA_WXBIND(int) wxHtmlWinParser_methodCount; + extern WXDLLIMPEXP_DATA_WXBIND(int) s_wxluatag_wxHtmlWindow; + extern WXDLLIMPEXP_WXBIND wxLuaBindMethod wxHtmlWindow_methods[]; + extern WXDLLIMPEXP_DATA_WXBIND(int) wxHtmlWindow_methodCount; extern WXDLLIMPEXP_DATA_WXBIND(int) s_wxluatag_wxMemoryDC; extern WXDLLIMPEXP_WXBIND wxLuaBindMethod wxMemoryDC_methods[]; *************** *** 1350,1353 **** --- 1401,1412 ---- #endif // wxCHECK_VERSION(2,8,0) + #if wxCHECK_VERSION(2,8,0) && wxLUA_USE_wxStandardPaths + extern WXDLLIMPEXP_DATA_WXBIND(int) s_wxluatag_wxStandardPaths; + extern WXDLLIMPEXP_WXBIND wxLuaBindMethod wxStandardPaths_methods[]; + extern WXDLLIMPEXP_DATA_WXBIND(int) wxStandardPaths_methodCount; + extern WXDLLIMPEXP_WXBIND wxLuaBindDefine wxStandardPaths_enums[]; + extern WXDLLIMPEXP_DATA_WXBIND(int) wxStandardPaths_enumCount; + #endif // wxCHECK_VERSION(2,8,0) && wxLUA_USE_wxStandardPaths + #if wxCHECK_VERSION(2,8,0) && wxUSE_ABOUTDLG && wxLUA_USE_wxAboutDialog extern WXDLLIMPEXP_DATA_WXBIND(int) s_wxluatag_wxAboutDialogInfo; *************** *** 1356,1359 **** --- 1415,1427 ---- #endif // wxCHECK_VERSION(2,8,0) && wxUSE_ABOUTDLG && wxLUA_USE_wxAboutDialog + #if wxCHECK_VERSION(2,8,0) && wxUSE_HYPERLINKCTRL && wxLUA_USE_wxHyperlinkCtrl + extern WXDLLIMPEXP_DATA_WXBIND(int) s_wxluatag_wxHyperlinkCtrl; + extern WXDLLIMPEXP_WXBIND wxLuaBindMethod wxHyperlinkCtrl_methods[]; + extern WXDLLIMPEXP_DATA_WXBIND(int) wxHyperlinkCtrl_methodCount; + extern WXDLLIMPEXP_DATA_WXBIND(int) s_wxluatag_wxHyperlinkEvent; + extern WXDLLIMPEXP_WXBIND wxLuaBindMethod wxHyperlinkEvent_methods[]; + extern WXDLLIMPEXP_DATA_WXBIND(int) wxHyperlinkEvent_methodCount; + #endif // wxCHECK_VERSION(2,8,0) && wxUSE_HYPERLINKCTRL && wxLUA_USE_wxHyperlinkCtrl + #if wxCHECK_VERSION(2,8,0) && wxUSE_TGA extern WXDLLIMPEXP_DATA_WXBIND(int) s_wxluatag_wxXPMHandler; *************** *** 1362,1365 **** --- 1430,1451 ---- #endif // wxCHECK_VERSION(2,8,0) && wxUSE_TGA + #if wxCHECK_VERSION(2,8,0) && wxUSE_TOOLBOOK && wxLUA_USE_wxToolbook + extern WXDLLIMPEXP_DATA_WXBIND(int) s_wxluatag_wxToolbook; + extern WXDLLIMPEXP_WXBIND wxLuaBindMethod wxToolbook_methods[]; + extern WXDLLIMPEXP_DATA_WXBIND(int) wxToolbook_methodCount; + extern WXDLLIMPEXP_DATA_WXBIND(int) s_wxluatag_wxToolbookEvent; + extern WXDLLIMPEXP_WXBIND wxLuaBindMethod wxToolbookEvent_methods[]; + extern WXDLLIMPEXP_DATA_WXBIND(int) wxToolbookEvent_methodCount; + #endif // wxCHECK_VERSION(2,8,0) && wxUSE_TOOLBOOK && wxLUA_USE_wxToolbook + + #if wxCHECK_VERSION(2,8,0) && wxUSE_TREEBOOK && wxLUA_USE_wxTreebook + extern WXDLLIMPEXP_DATA_WXBIND(int) s_wxluatag_wxTreebook; + extern WXDLLIMPEXP_WXBIND wxLuaBindMethod wxTreebook_methods[]; + extern WXDLLIMPEXP_DATA_WXBIND(int) wxTreebook_methodCount; + extern WXDLLIMPEXP_DATA_WXBIND(int) s_wxluatag_wxTreebookEvent; + extern WXDLLIMPEXP_WXBIND wxLuaBindMethod wxTreebookEvent_methods[]; + extern WXDLLIMPEXP_DATA_WXBIND(int) wxTreebookEvent_methodCount; + #endif // wxCHECK_VERSION(2,8,0) && wxUSE_TREEBOOK && wxLUA_USE_wxTreebook + #if wxLUA_USE_Animation && wxUSE_ANIMATIONCTRL && wxchkver_2_8 extern WXDLLIMPEXP_DATA_WXBIND(int) s_wxluatag_wxAnimation; *************** *** 1885,1906 **** extern WXDLLIMPEXP_WXBIND wxLuaBindMethod wxHtmlContainerCell_methods[]; extern WXDLLIMPEXP_DATA_WXBIND(int) wxHtmlContainerCell_methodCount; - extern WXDLLIMPEXP_DATA_WXBIND(int) s_wxluatag_wxHtmlLinkInfo; - extern WXDLLIMPEXP_WXBIND wxLuaBindMethod wxHtmlLinkInfo_methods[]; - extern WXDLLIMPEXP_DATA_WXBIND(int) wxHtmlLinkInfo_methodCount; - extern WXDLLIMPEXP_DATA_WXBIND(int) s_wxluatag_wxHtmlParser; - extern WXDLLIMPEXP_WXBIND wxLuaBindMethod wxHtmlParser_methods[]; - extern WXDLLIMPEXP_DATA_WXBIND(int) wxHtmlParser_methodCount; - extern WXDLLIMPEXP_DATA_WXBIND(int) s_wxluatag_wxHtmlTag; - extern WXDLLIMPEXP_WXBIND wxLuaBindMethod wxHtmlTag_methods[]; - extern WXDLLIMPEXP_DATA_WXBIND(int) wxHtmlTag_methodCount; extern WXDLLIMPEXP_DATA_WXBIND(int) s_wxluatag_wxHtmlWidgetCell; extern WXDLLIMPEXP_WXBIND wxLuaBindMethod wxHtmlWidgetCell_methods[]; extern WXDLLIMPEXP_DATA_WXBIND(int) wxHtmlWidgetCell_methodCount; - extern WXDLLIMPEXP_DATA_WXBIND(int) s_wxluatag_wxHtmlWinParser; - extern WXDLLIMPEXP_WXBIND wxLuaBindMethod wxHtmlWinParser_methods[]; - extern WXDLLIMPEXP_DATA_WXBIND(int) wxHtmlWinParser_methodCount; - extern WXDLLIMPEXP_DATA_WXBIND(int) s_wxluatag_wxHtmlWindow; - extern WXDLLIMPEXP_WXBIND wxLuaBindMethod wxHtmlWindow_methods[]; - extern WXDLLIMPEXP_DATA_WXBIND(int) wxHtmlWindow_methodCount; #endif // wxLUA_USE_wxHTML && wxUSE_HTML --- 1971,1977 ---- *************** *** 2623,2626 **** --- 2694,2701 ---- #endif // wxCHECK_VERSION(2,8,0) + #if wxCHECK_VERSION(2,8,0) && wxLUA_USE_wxStandardPaths + wxLUA_DECLARE_ENCAPSULATION(WXDLLIMPEXP_WXBIND, wxStandardPaths, wxStandardPaths) + #endif // wxCHECK_VERSION(2,8,0) && wxLUA_USE_wxStandardPaths + #if wxCHECK_VERSION(2,8,0) && wxUSE_ABOUTDLG && wxLUA_USE_wxAboutDialog wxLUA_DECLARE_ENCAPSULATION(WXDLLIMPEXP_WXBIND, wxAboutDialogInfo, wxAboutDialogInfo) |
|
From: John L. <jr...@us...> - 2007-06-18 19:52:02
|
Update of /cvsroot/wxlua/wxLua/bindings/wxwidgets In directory sc8-pr-cvs9.sourceforge.net:/tmp/cvs-serv21463/wxLua/bindings/wxwidgets Modified Files: appframe.i controls.i data.i html.i override.hpp windows.i wx_datatypes.lua Log Message: Add more classes from 2.8, wxStandardPaths, wxToolbook, wxTreebook... Index: wx_datatypes.lua =================================================================== RCS file: /cvsroot/wxlua/wxLua/bindings/wxwidgets/wx_datatypes.lua,v retrieving revision 1.71 retrieving revision 1.72 diff -C2 -d -r1.71 -r1.72 *** wx_datatypes.lua 18 Jun 2007 14:54:58 -0000 1.71 --- wx_datatypes.lua 18 Jun 2007 19:51:26 -0000 1.72 *************** *** 1747,1750 **** --- 1747,1764 ---- Name = "wxHtmlCell", }, + wxHtmlCellEvent = { + BaseClass = "wxCommandEvent", + Condition = "(wxCHECK_VERSION(2,8,0)) && (wxCHECK_VERSION(2,8,0))", + DefType = "class", + IsNumber = false, + Name = "wxHtmlCellEvent", + }, + wxHtmlColourCell = { + BaseClass = "wxHtmlCell", + Condition = "(wxLUA_USE_wxHTML && wxUSE_HTML) && (wxCHECK_VERSION(2,8,0))", + DefType = "class", + IsNumber = false, + Name = "wxHtmlColourCell", + }, wxHtmlContainerCell = { BaseClass = "wxHtmlCell", *************** *** 1768,1771 **** --- 1782,1792 ---- Name = "wxHtmlEasyPrinting", }, + wxHtmlFontCell = { + BaseClass = "wxHtmlCell", + Condition = "(wxCHECK_VERSION(2,8,0)) && (wxCHECK_VERSION(2,8,0))", + DefType = "class", + IsNumber = false, + Name = "wxHtmlFontCell", + }, wxHtmlHelpController = { BaseClass = "wxHelpControllerBase", *************** *** 1783,1787 **** }, wxHtmlLinkInfo = { ! Condition = "wxLUA_USE_wxHTML && wxUSE_HTML", DefType = "class", IsNumber = false, --- 1804,1808 ---- }, wxHtmlLinkInfo = { ! Condition = "wxCHECK_VERSION(2,8,0)", DefType = "class", IsNumber = false, *************** *** 1790,1794 **** wxHtmlParser = { BaseClass = "wxObject", ! Condition = "wxLUA_USE_wxHTML && wxUSE_HTML", DefType = "class", IsNumber = false, --- 1811,1815 ---- wxHtmlParser = { BaseClass = "wxObject", ! Condition = "wxCHECK_VERSION(2,8,0)", DefType = "class", IsNumber = false, *************** *** 1804,1808 **** wxHtmlTag = { BaseClass = "wxObject", ! Condition = "wxLUA_USE_wxHTML && wxUSE_HTML", DefType = "class", IsNumber = false, --- 1825,1829 ---- wxHtmlTag = { BaseClass = "wxObject", ! Condition = "wxCHECK_VERSION(2,8,0)", DefType = "class", IsNumber = false, *************** *** 1818,1822 **** wxHtmlWinParser = { BaseClass = "wxHtmlParser", ! Condition = "wxLUA_USE_wxHTML && wxUSE_HTML", DefType = "class", IsNumber = false, --- 1839,1843 ---- wxHtmlWinParser = { BaseClass = "wxHtmlParser", ! Condition = "wxCHECK_VERSION(2,8,0)", DefType = "class", IsNumber = false, *************** *** 1825,1829 **** wxHtmlWindow = { BaseClass = "wxScrolledWindow", ! Condition = "wxLUA_USE_wxHTML && wxUSE_HTML", DefType = "class", IsNumber = false, --- 1846,1850 ---- wxHtmlWindow = { BaseClass = "wxScrolledWindow", ! Condition = "wxCHECK_VERSION(2,8,0)", DefType = "class", IsNumber = false, *************** *** 1831,1835 **** }, wxHtmlWindowInterface = { ! Condition = "(wxLUA_USE_wxHTML && wxUSE_HTML) && (wxCHECK_VERSION(2,8,0))", DefType = "class", IsNumber = false, --- 1852,1856 ---- }, wxHtmlWindowInterface = { ! Condition = "(wxCHECK_VERSION(2,8,0)) && (wxCHECK_VERSION(2,8,0))", DefType = "class", IsNumber = false, *************** *** 1837,1845 **** }, ["wxHtmlWindowInterface::HTMLCursor"] = { ! Condition = "(wxLUA_USE_wxHTML && wxUSE_HTML) && (wxCHECK_VERSION(2,8,0))", DefType = "enum", IsNumber = true, Name = "wxHtmlWindowInterface::HTMLCursor", }, wxICOHandler = { BaseClass = "wxBMPHandler", --- 1858,1880 ---- }, ["wxHtmlWindowInterface::HTMLCursor"] = { ! Condition = "(wxCHECK_VERSION(2,8,0)) && (wxCHECK_VERSION(2,8,0))", DefType = "enum", IsNumber = true, Name = "wxHtmlWindowInterface::HTMLCursor", }, + wxHyperlinkCtrl = { + BaseClass = "wxControl", + Condition = "wxCHECK_VERSION(2,8,0) && wxUSE_HYPERLINKCTRL && wxLUA_USE_wxHyperlinkCtrl", + DefType = "class", + IsNumber = false, + Name = "wxHyperlinkCtrl", + }, + wxHyperlinkEvent = { + BaseClass = "wxCommandEvent", + Condition = "wxCHECK_VERSION(2,8,0) && wxUSE_HYPERLINKCTRL && wxLUA_USE_wxHyperlinkCtrl", + DefType = "class", + IsNumber = false, + Name = "wxHyperlinkEvent", + }, wxICOHandler = { BaseClass = "wxBMPHandler", *************** *** 3042,3046 **** wxSimpleHtmlListBox = { BaseClass = "wxHtmlWindowInterface", ! Condition = "(wxLUA_USE_wxHTML && wxUSE_HTML) && (wxCHECK_VERSION(2,8,0))", DefType = "class", IsNumber = false, --- 3077,3081 ---- wxSimpleHtmlListBox = { BaseClass = "wxHtmlWindowInterface", ! Condition = "(wxCHECK_VERSION(2,8,0)) && (wxCHECK_VERSION(2,8,0))", DefType = "class", IsNumber = false, *************** *** 3217,3220 **** --- 3252,3268 ---- Name = "wxSplitterWindow", }, + wxStandardPaths = { + Condition = "wxCHECK_VERSION(2,8,0) && wxLUA_USE_wxStandardPaths", + DefType = "class", + Encapsulate = true, + IsNumber = false, + Name = "wxStandardPaths", + }, + ["wxStandardPaths::ResourceCat"] = { + Condition = "wxCHECK_VERSION(2,8,0) && wxLUA_USE_wxStandardPaths", + DefType = "enum", + IsNumber = true, + Name = "wxStandardPaths::ResourceCat", + }, wxStaticBitmap = { BaseClass = "wxControl", *************** *** 3314,3317 **** --- 3362,3376 ---- Name = "wxStringClientData", }, + wxStringTokenizer = { + BaseClass = "wxObject", + DefType = "class", + IsNumber = false, + Name = "wxStringTokenizer", + }, + wxStringTokenizerMode = { + DefType = "enum", + IsNumber = true, + Name = "wxStringTokenizerMode", + }, wxSysColourChangedEvent = { BaseClass = "wxEvent", *************** *** 3541,3544 **** --- 3600,3617 ---- Name = "wxToolTip", }, + wxToolbook = { + BaseClass = "wxBookCtrlBase", + Condition = "wxCHECK_VERSION(2,8,0) && wxUSE_TOOLBOOK && wxLUA_USE_wxToolbook", + DefType = "class", + IsNumber = false, + Name = "wxToolbook", + }, + wxToolbookEvent = { + BaseClass = "wxBookCtrlBaseEvent", + Condition = "wxCHECK_VERSION(2,8,0) && wxUSE_TOOLBOOK && wxLUA_USE_wxToolbook", + DefType = "class", + IsNumber = false, + Name = "wxToolbookEvent", + }, wxTopLevelWindow = { BaseClass = "wxWindow", *************** *** 3594,3597 **** --- 3667,3684 ---- Name = "wxTreeItemIdValue", }, + wxTreebook = { + BaseClass = "wxBookCtrlBase", + Condition = "wxCHECK_VERSION(2,8,0) && wxUSE_TREEBOOK && wxLUA_USE_wxTreebook", + DefType = "class", + IsNumber = false, + Name = "wxTreebook", + }, + wxTreebookEvent = { + BaseClass = "wxBookCtrlBaseEvent", + Condition = "wxCHECK_VERSION(2,8,0) && wxUSE_TREEBOOK && wxLUA_USE_wxTreebook", + DefType = "class", + IsNumber = false, + Name = "wxTreebookEvent", + }, wxULongLong = { Condition = "wxUSE_LONGLONG", *************** *** 3980,3983 **** --- 4067,4071 ---- wxLUA_USE_wxHelpController = "wxLUA_USE_wxHelpController", wxLUA_USE_wxHtmlHelpController = "wxLUA_USE_wxHtmlHelpController", + wxLUA_USE_wxHyperlinkCtrl = "wxLUA_USE_wxHyperlinkCtrl", wxLUA_USE_wxID_XXX = "wxLUA_USE_wxID_XXX", wxLUA_USE_wxIcon = "wxLUA_USE_wxIcon", *************** *** 4022,4025 **** --- 4110,4114 ---- wxLUA_USE_wxSplashScreen = "wxLUA_USE_wxSplashScreen", wxLUA_USE_wxSplitterWindow = "wxLUA_USE_wxSplitterWindow", + wxLUA_USE_wxStandardPaths = "wxLUA_USE_wxStandardPaths", wxLUA_USE_wxStaticBitmap = "wxLUA_USE_wxStaticBitmap", wxLUA_USE_wxStaticBox = "wxLUA_USE_wxStaticBox", *************** *** 4039,4044 **** --- 4128,4135 ---- wxLUA_USE_wxToggleButton = "wxLUA_USE_wxToggleButton", wxLUA_USE_wxToolbar = "wxLUA_USE_wxToolbar", + wxLUA_USE_wxToolbook = "wxLUA_USE_wxToolbook", wxLUA_USE_wxTooltip = "wxLUA_USE_wxTooltip", wxLUA_USE_wxTreeCtrl = "wxLUA_USE_wxTreeCtrl", + wxLUA_USE_wxTreebook = "wxLUA_USE_wxTreebook", wxLUA_USE_wxValidator = "wxLUA_USE_wxValidator", wxLUA_USE_wxWave = "wxLUA_USE_wxWave", *************** *** 4115,4118 **** --- 4206,4210 ---- wxUSE_HOTKEY = "wxUSE_HOTKEY", wxUSE_HTML = "wxUSE_HTML", + wxUSE_HYPERLINKCTRL = "wxUSE_HYPERLINKCTRL", wxUSE_ICO_CUR = "wxUSE_ICO_CUR", wxUSE_IFF = "wxUSE_IFF", *************** *** 4214,4217 **** --- 4306,4310 ---- wxUSE_TOOLBAR = "wxUSE_TOOLBAR", wxUSE_TOOLBAR_NATIVE = "wxUSE_TOOLBAR_NATIVE", + wxUSE_TOOLBOOK = "wxUSE_TOOLBOOK", wxUSE_TOOLTIPS = "wxUSE_TOOLTIPS", wxUSE_TREECTRL = "wxUSE_TREECTRL", Index: windows.i =================================================================== RCS file: /cvsroot/wxlua/wxLua/bindings/wxwidgets/windows.i,v retrieving revision 1.44 retrieving revision 1.45 diff -C2 -d -r1.44 -r1.45 *** windows.i 18 Jun 2007 14:54:58 -0000 1.44 --- windows.i 18 Jun 2007 19:51:26 -0000 1.45 *************** *** 604,607 **** --- 604,680 ---- // --------------------------------------------------------------------------- + // wxTreebook + + %if %wxchkver_2_8 && wxUSE_TREEBOOK && wxLUA_USE_wxTreebook + + %include "wx/treebook.h" + + %class wxTreebook, wxBookCtrlBase + wxTreebook() + wxTreebook(wxWindow *parent, wxWindowID id, const wxPoint& pos = wxDefaultPosition, const wxSize& size = wxDefaultSize, long style = wxBK_DEFAULT, const wxString& name = "wxTreebook") + bool Create(wxWindow *parent, wxWindowID id, const wxPoint& pos = wxDefaultPosition, const wxSize& size = wxDefaultSize, long style = wxBK_DEFAULT,const wxString& name = "wxTreebook") + + virtual bool InsertPage(size_t pos, wxWindow *page, const wxString& text, bool bSelect = false, int imageId = wxNOT_FOUND); + virtual bool InsertSubPage(size_t pos, wxWindow *page, const wxString& text, bool bSelect = false, int imageId = wxNOT_FOUND); + virtual bool AddPage(wxWindow *page, const wxString& text, bool bSelect = false, int imageId = wxNOT_FOUND); + virtual bool AddSubPage(wxWindow *page, const wxString& text, bool bSelect = false, int imageId = wxNOT_FOUND); + virtual bool DeletePage(size_t pos); + virtual bool IsNodeExpanded(size_t pos) const; + + virtual bool ExpandNode(size_t pos, bool expand = true); + bool CollapseNode(size_t pos) + int GetPageParent(size_t pos) const; + wxTreeCtrl* GetTreeCtrl() const + %endclass + + // --------------------------------------------------------------------------- + // wxTreebookEvent + + %class %delete wxTreebookEvent, wxBookCtrlBaseEvent + %define_event wxEVT_COMMAND_TREEBOOK_PAGE_CHANGED // EVT_TREEBOOK_PAGE_CHANGED(winid, fn) + %define_event wxEVT_COMMAND_TREEBOOK_PAGE_CHANGING // EVT_TREEBOOK_PAGE_CHANGING(winid, fn) + %define_event wxEVT_COMMAND_TREEBOOK_NODE_COLLAPSED // EVT_TREEBOOK_NODE_COLLAPSED(winid, fn) + %define_event wxEVT_COMMAND_TREEBOOK_NODE_EXPANDED // EVT_TREEBOOK_NODE_EXPANDED(winid, fn) + + wxTreebookEvent(const wxTreebookEvent& event) + wxTreebookEvent(wxEventType commandType = wxEVT_NULL, int id = 0, int nSel = wxNOT_FOUND, int nOldSel = wxNOT_FOUND) + + %endclass + + %endif // %wxchkver_2_8 && wxUSE_TREEBOOK && wxLUA_USE_wxTreebook + + // --------------------------------------------------------------------------- + // wxToolbook + + %if %wxchkver_2_8 && wxUSE_TOOLBOOK && wxLUA_USE_wxToolbook + + %include "wx/toolbook.h" + + %class wxToolbook, wxBookCtrlBase + wxToolbook() + wxToolbook(wxWindow *parent, wxWindowID id, const wxPoint& pos = wxDefaultPosition, const wxSize& size = wxDefaultSize, long style = 0, const wxString& name = "wxToolbook") + bool Create(wxWindow *parent, wxWindowID id, const wxPoint& pos = wxDefaultPosition, const wxSize& size = wxDefaultSize, long style = 0, const wxString& name = "wxToolbook") + + wxToolBarBase* GetToolBar() const + // must be called in OnIdle or by application to realize the toolbar and select the initial page. + void Realize(); + + %endclass + + // --------------------------------------------------------------------------- + // wxToolbookEvent + + %class %delete wxToolbookEvent, wxBookCtrlBaseEvent + %define_event wxEVT_COMMAND_TOOLBOOK_PAGE_CHANGED // EVT_TOOLBOOK_PAGE_CHANGED(winid, fn) + %define_event wxEVT_COMMAND_TOOLBOOK_PAGE_CHANGING // EVT_TOOLBOOK_PAGE_CHANGING(winid, fn) + + wxToolbookEvent(const wxToolbookEvent& event) + wxToolbookEvent(wxEventType commandType = wxEVT_NULL, int id = 0, int nSel = wxNOT_FOUND, int nOldSel = wxNOT_FOUND) + + %endclass + + %endif // %wxchkver_2_8 && wxUSE_TOOLBOOK && wxLUA_USE_wxToolbook + + // --------------------------------------------------------------------------- // wxTabCtrl Index: html.i =================================================================== RCS file: /cvsroot/wxlua/wxLua/bindings/wxwidgets/html.i,v retrieving revision 1.25 retrieving revision 1.26 diff -C2 -d -r1.25 -r1.26 *** html.i 18 Jun 2007 02:56:24 -0000 1.25 --- html.i 18 Jun 2007 19:51:26 -0000 1.26 *************** *** 61,110 **** // wxHtmlWidgetCell %class wxHtmlWidgetCell, wxHtmlCell wxHtmlWidgetCell(wxWindow* wnd, int w = 0) %endclass - // --------------------------------------------------------------------------- - // wxHtmlLinkInfo - - %include "wx/html/htmlcell.h" - - %class %noclassinfo wxHtmlLinkInfo - wxHtmlLinkInfo(const wxString& href, const wxString& target = "") - - const wxMouseEvent * GetEvent() - const wxHtmlCell * GetHtmlCell() - wxString GetHref() - wxString GetTarget() - %endclass - - // --------------------------------------------------------------------------- - // wxHtmlTag - - %include "wx/html/htmltag.h" - - %class wxHtmlTag, wxObject - //wxHtmlTag(const wxString& source, int pos, int end_pos, wxHtmlTagsCache* cache) - - const wxString GetAllParams() const - int GetBeginPos() const - int GetEndPos1() const - int GetEndPos2() const - wxString GetName() const - wxString GetParam(const wxString& par, bool with_commas = false) const - - // %override [bool, wxColour] wxHtmlTag::GetParamAsColour(const wxString& par) const - // C++ Func: bool GetParamAsColour(const wxString& par, wxColour *clr) const - bool GetParamAsColour(const wxString& par) const - - // %override [bool, int value] wxHtmlTag::GetParamAsInt(const wxString& par) const - // C++ Func: bool GetParamAsInt(const wxString& par, int *value) const - bool GetParamAsInt(const wxString& par) const - - bool HasEnding() const - bool HasParam(const wxString& par) const - //bool IsEnding() const - //wxString ScanParam(const wxString& par, const wxString &format, void *value) const - %endclass // --------------------------------------------------------------------------- --- 61,70 ---- // wxHtmlWidgetCell + %include "wx/html/htmlcell.h" + %class wxHtmlWidgetCell, wxHtmlCell wxHtmlWidgetCell(wxWindow* wnd, int w = 0) %endclass // --------------------------------------------------------------------------- *************** *** 153,156 **** --- 113,213 ---- // --------------------------------------------------------------------------- + // wxHtmlColourCell + + %if %wxchkver_2_8 + + %include "wx/html/htmlcell.h" + + %class wxHtmlColourCell, wxHtmlCell + wxHtmlColourCell(const wxColour& clr, int flags = wxHTML_CLR_FOREGROUND) + + //virtual void Draw(wxDC& dc, int x, int y, int view_y1, int view_y2, wxHtmlRenderingInfo& info); + //virtual void DrawInvisible(wxDC& dc, int x, int y, wxHtmlRenderingInfo& info); + %endclass + + %endif // %wxchkver_2_8 + + // --------------------------------------------------------------------------- + // wxHtmlFontCell + + %if %wxchkver_2_8 + + %include "wx/html/htmlcell.h" + + %class wxHtmlFontCell, wxHtmlCell + wxHtmlFontCell(wxFont *font) + + //virtual void Draw(wxDC& dc, int x, int y, int view_y1, int view_y2, wxHtmlRenderingInfo& info); + //virtual void DrawInvisible(wxDC& dc, int x, int y, wxHtmlRenderingInfo& info); + %endclass + + %endif // %wxchkver_2_8 + + // --------------------------------------------------------------------------- + // wxHtmlCellEvent + + %if %wxchkver_2_8 + + %include "wx/html/htmlwin.h" + + %class %delete wxHtmlCellEvent, wxCommandEvent + wxHtmlCellEvent() + wxHtmlCellEvent(wxEventType commandType, int id, wxHtmlCell *cell, const wxPoint &pt, const wxMouseEvent &ev) + + wxHtmlCell* GetCell() const + wxPoint GetPoint() const + wxMouseEvent GetMouseEvent() const + + void SetLinkClicked(bool linkclicked) + bool GetLinkClicked() const + %endclass + + %endif // %wxchkver_2_8 + + + // --------------------------------------------------------------------------- + // wxHtmlLinkInfo + + %include "wx/html/htmlcell.h" + + %class %noclassinfo wxHtmlLinkInfo + wxHtmlLinkInfo(const wxString& href, const wxString& target = "") + + const wxMouseEvent * GetEvent() + const wxHtmlCell * GetHtmlCell() + wxString GetHref() + wxString GetTarget() + %endclass + + // --------------------------------------------------------------------------- + // wxHtmlTag + + %include "wx/html/htmltag.h" + + %class wxHtmlTag, wxObject + //wxHtmlTag(const wxString& source, int pos, int end_pos, wxHtmlTagsCache* cache) + + const wxString GetAllParams() const + int GetBeginPos() const + int GetEndPos1() const + int GetEndPos2() const + wxString GetName() const + wxString GetParam(const wxString& par, bool with_commas = false) const + + // %override [bool, wxColour] wxHtmlTag::GetParamAsColour(const wxString& par) const + // C++ Func: bool GetParamAsColour(const wxString& par, wxColour *clr) const + bool GetParamAsColour(const wxString& par) const + + // %override [bool, int value] wxHtmlTag::GetParamAsInt(const wxString& par) const + // C++ Func: bool GetParamAsInt(const wxString& par, int *value) const + bool GetParamAsInt(const wxString& par) const + + bool HasEnding() const + bool HasParam(const wxString& par) const + //bool IsEnding() const + //wxString ScanParam(const wxString& par, const wxString &format, void *value) const + %endclass + + // --------------------------------------------------------------------------- // wxHtmlWindow Index: override.hpp =================================================================== RCS file: /cvsroot/wxlua/wxLua/bindings/wxwidgets/override.hpp,v retrieving revision 1.78 retrieving revision 1.79 diff -C2 -d -r1.78 -r1.79 *** override.hpp 18 Jun 2007 02:56:24 -0000 1.78 --- override.hpp 18 Jun 2007 19:51:26 -0000 1.79 *************** *** 142,145 **** --- 142,160 ---- %end + %override wxLua_wxStandardPaths_Get + // static wxStandardPaths& Get(); + static int LUACALL wxLua_wxStandardPaths_Get(lua_State *L) + { + wxLuaState wxlState(L); + wxStandardPathsBase *returns; + // call Get + returns = &wxStandardPaths::Get(); + // push the result datatype + wxlState.PushUserDataType(s_wxluatag_wxStandardPaths, returns); + + return 1; + } + %end + // ---------------------------------------------------------------------------- // Overrides for clipdrag.i Index: controls.i =================================================================== RCS file: /cvsroot/wxlua/wxLua/bindings/wxwidgets/controls.i,v retrieving revision 1.41 retrieving revision 1.42 diff -C2 -d -r1.41 -r1.42 *** controls.i 18 Jun 2007 02:56:23 -0000 1.41 --- controls.i 18 Jun 2007 19:51:26 -0000 1.42 *************** *** 1301,1302 **** --- 1301,1351 ---- %endif //wxLUA_USE_wxGenericDirCtrl & wxUSE_DIRDLG + + // --------------------------------------------------------------------------- + // wxHyperlinkCtrl + + %if %wxchkver_2_8 && wxUSE_HYPERLINKCTRL && wxLUA_USE_wxHyperlinkCtrl + + %include "wx/hyperlink.h" + + %define wxHL_CONTEXTMENU + %define wxHL_ALIGN_LEFT + %define wxHL_ALIGN_RIGHT + %define wxHL_ALIGN_CENTRE + %define wxHL_DEFAULT_STYLE // (wxHL_CONTEXTMENU|wxNO_BORDER|wxHL_ALIGN_CENTRE) + + %class wxHyperlinkCtrl, wxControl + wxHyperlinkCtrl() + wxHyperlinkCtrl(wxWindow *parent, wxWindowID id, const wxString& label, const wxString& url, const wxPoint& pos = wxDefaultPosition, const wxSize& size = wxDefaultSize, long style = wxHL_DEFAULT_STYLE, const wxString& name = "wxHyperlinkCtrl") + bool Create(wxWindow *parent, wxWindowID id, const wxString& label, const wxString& url, const wxPoint& pos = wxDefaultPosition, const wxSize& size = wxDefaultSize, long style = wxHL_DEFAULT_STYLE, const wxString& name = "wxHyperlinkCtrl"); + + wxColour GetHoverColour() const + void SetHoverColour(const wxColour &colour) + + wxColour GetNormalColour() const + void SetNormalColour(const wxColour &colour); + + wxColour GetVisitedColour() const + void SetVisitedColour(const wxColour &colour); + + wxString GetURL() const + void SetURL (const wxString &url) + + void SetVisited(bool visited = true) + bool GetVisited() const + %endclass + + // --------------------------------------------------------------------------- + // wxHyperlinkEvent + + %class %delete wxHyperlinkEvent, wxCommandEvent + %define_event wxEVT_COMMAND_HYPERLINK // EVT_HYPERLINK(id, fn) + + //wxHyperlinkEvent() + wxHyperlinkEvent(wxObject *generator, wxWindowID id, const wxString& url) + + wxString GetURL() const + void SetURL(const wxString &url) + %endclass + + %endif // %wxchkver_2_8 && wxUSE_HYPERLINKCTRL && wxLUA_USE_wxHyperlinkCtrl Index: appframe.i =================================================================== RCS file: /cvsroot/wxlua/wxLua/bindings/wxwidgets/appframe.i,v retrieving revision 1.40 retrieving revision 1.41 diff -C2 -d -r1.40 -r1.41 *** appframe.i 18 Jun 2007 02:56:23 -0000 1.40 --- appframe.i 18 Jun 2007 19:51:26 -0000 1.41 *************** *** 621,624 **** --- 621,668 ---- %endif //wxLUA_USE_wxSystemOptions + + // --------------------------------------------------------------------------- + // wxStandardPaths + + %if %wxchkver_2_8 && wxLUA_USE_wxStandardPaths + + %include "wx/stdpaths.h" + + %enum wxStandardPaths::ResourceCat + ResourceCat_None // no special category + ResourceCat_Messages // message catalog resources + ResourceCat_Max // end of enum marker + %endenum + + + %class %delete %noclassinfo %encapsulate wxStandardPaths // we ignore wxStandardPathsBase + // No constructor - use Get() function + + // return the global standard paths object + // %override static wxStandardPaths& Get(); + // C++ Func: static wxStandardPathsBase& Get(); + // We pretend that there is no wxStandardPathsBase and just use the wxStandardPaths name + static wxStandardPaths& Get(); + + // These are only for the generic version, probably not ever needed + //void SetInstallPrefix(const wxString& prefix) + //wxString GetInstallPrefix() const + + virtual wxString GetExecutablePath() const + virtual wxString GetConfigDir() const + virtual wxString GetUserConfigDir() const + virtual wxString GetDataDir() const + virtual wxString GetLocalDataDir() const + virtual wxString GetUserDataDir() const + virtual wxString GetUserLocalDataDir() const + virtual wxString GetPluginsDir() const + virtual wxString GetResourcesDir() const + virtual wxString GetLocalizedResourcesDir(const wxString& lang, wxStandardPaths::ResourceCat category = wxStandardPaths::ResourceCat_None) const + virtual wxString GetDocumentsDir() const + virtual wxString GetTempDir() const; + %endclass + + %endif // %wxchkver_2_8 && wxLUA_USE_wxStandardPaths + // --------------------------------------------------------------------------- // wxPlatformInfo Index: data.i =================================================================== RCS file: /cvsroot/wxlua/wxLua/bindings/wxwidgets/data.i,v retrieving revision 1.35 retrieving revision 1.36 diff -C2 -d -r1.35 -r1.36 *** data.i 18 Jun 2007 02:56:23 -0000 1.35 --- data.i 18 Jun 2007 19:51:26 -0000 1.36 *************** *** 22,25 **** --- 22,58 ---- // --------------------------------------------------------------------------- + // wxStringTokenizer + + %include "wx/tokenzr.h" + + %enum wxStringTokenizerMode + wxTOKEN_INVALID // set by def ctor until SetString() is called + wxTOKEN_DEFAULT // strtok() for whitespace delims, RET_EMPTY else + wxTOKEN_RET_EMPTY // return empty token in the middle of the string + wxTOKEN_RET_EMPTY_ALL // return trailing empty tokens too + wxTOKEN_RET_DELIMS // return the delim with token (implies RET_EMPTY) + wxTOKEN_STRTOK // behave exactly like strtok(3) + %endenum + + %class %delete %noclassinfo wxStringTokenizer, wxObject + wxStringTokenizer() + wxStringTokenizer(const wxString& str, const wxString& delims = wxDEFAULT_DELIMITERS, wxStringTokenizerMode mode = wxTOKEN_DEFAULT); + + void SetString(const wxString& str, const wxString& delims = wxDEFAULT_DELIMITERS, wxStringTokenizerMode mode = wxTOKEN_DEFAULT); + + void Reinit(const wxString& str); + size_t CountTokens() const; + bool HasMoreTokens() const; + wxString GetNextToken(); + //wxChar GetLastDelimiter() const + + wxString GetString() const + size_t GetPosition() const + + wxStringTokenizerMode GetMode() const + bool AllowEmpty() const + %endclass + + // --------------------------------------------------------------------------- // wxClientData |
|
From: John L. <jr...@us...> - 2007-06-18 19:51:59
|
Update of /cvsroot/wxlua/wxLua/bindings/wxstc In directory sc8-pr-cvs9.sourceforge.net:/tmp/cvs-serv21463/wxLua/bindings/wxstc Modified Files: wxstc_datatypes.lua Log Message: Add more classes from 2.8, wxStandardPaths, wxToolbook, wxTreebook... Index: wxstc_datatypes.lua =================================================================== RCS file: /cvsroot/wxlua/wxLua/bindings/wxstc/wxstc_datatypes.lua,v retrieving revision 1.61 retrieving revision 1.62 diff -C2 -d -r1.61 -r1.62 *** wxstc_datatypes.lua 18 Jun 2007 14:54:58 -0000 1.61 --- wxstc_datatypes.lua 18 Jun 2007 19:51:25 -0000 1.62 *************** *** 1747,1750 **** --- 1747,1764 ---- Name = "wxHtmlCell", }, + wxHtmlCellEvent = { + BaseClass = "wxCommandEvent", + Condition = "(wxCHECK_VERSION(2,8,0)) && (wxCHECK_VERSION(2,8,0))", + DefType = "class", + IsNumber = false, + Name = "wxHtmlCellEvent", + }, + wxHtmlColourCell = { + BaseClass = "wxHtmlCell", + Condition = "(wxLUA_USE_wxHTML && wxUSE_HTML) && (wxCHECK_VERSION(2,8,0))", + DefType = "class", + IsNumber = false, + Name = "wxHtmlColourCell", + }, wxHtmlContainerCell = { BaseClass = "wxHtmlCell", *************** *** 1768,1771 **** --- 1782,1792 ---- Name = "wxHtmlEasyPrinting", }, + wxHtmlFontCell = { + BaseClass = "wxHtmlCell", + Condition = "(wxCHECK_VERSION(2,8,0)) && (wxCHECK_VERSION(2,8,0))", + DefType = "class", + IsNumber = false, + Name = "wxHtmlFontCell", + }, wxHtmlHelpController = { BaseClass = "wxHelpControllerBase", *************** *** 1783,1787 **** }, wxHtmlLinkInfo = { ! Condition = "wxLUA_USE_wxHTML && wxUSE_HTML", DefType = "class", IsNumber = false, --- 1804,1808 ---- }, wxHtmlLinkInfo = { ! Condition = "wxCHECK_VERSION(2,8,0)", DefType = "class", IsNumber = false, *************** *** 1790,1794 **** wxHtmlParser = { BaseClass = "wxObject", ! Condition = "wxLUA_USE_wxHTML && wxUSE_HTML", DefType = "class", IsNumber = false, --- 1811,1815 ---- wxHtmlParser = { BaseClass = "wxObject", ! Condition = "wxCHECK_VERSION(2,8,0)", DefType = "class", IsNumber = false, *************** *** 1804,1808 **** wxHtmlTag = { BaseClass = "wxObject", ! Condition = "wxLUA_USE_wxHTML && wxUSE_HTML", DefType = "class", IsNumber = false, --- 1825,1829 ---- wxHtmlTag = { BaseClass = "wxObject", ! Condition = "wxCHECK_VERSION(2,8,0)", DefType = "class", IsNumber = false, *************** *** 1818,1822 **** wxHtmlWinParser = { BaseClass = "wxHtmlParser", ! Condition = "wxLUA_USE_wxHTML && wxUSE_HTML", DefType = "class", IsNumber = false, --- 1839,1843 ---- wxHtmlWinParser = { BaseClass = "wxHtmlParser", ! Condition = "wxCHECK_VERSION(2,8,0)", DefType = "class", IsNumber = false, *************** *** 1825,1829 **** wxHtmlWindow = { BaseClass = "wxScrolledWindow", ! Condition = "wxLUA_USE_wxHTML && wxUSE_HTML", DefType = "class", IsNumber = false, --- 1846,1850 ---- wxHtmlWindow = { BaseClass = "wxScrolledWindow", ! Condition = "wxCHECK_VERSION(2,8,0)", DefType = "class", IsNumber = false, *************** *** 1831,1835 **** }, wxHtmlWindowInterface = { ! Condition = "(wxLUA_USE_wxHTML && wxUSE_HTML) && (wxCHECK_VERSION(2,8,0))", DefType = "class", IsNumber = false, --- 1852,1856 ---- }, wxHtmlWindowInterface = { ! Condition = "(wxCHECK_VERSION(2,8,0)) && (wxCHECK_VERSION(2,8,0))", DefType = "class", IsNumber = false, *************** *** 1837,1845 **** }, ["wxHtmlWindowInterface::HTMLCursor"] = { ! Condition = "(wxLUA_USE_wxHTML && wxUSE_HTML) && (wxCHECK_VERSION(2,8,0))", DefType = "enum", IsNumber = true, Name = "wxHtmlWindowInterface::HTMLCursor", }, wxICOHandler = { BaseClass = "wxBMPHandler", --- 1858,1880 ---- }, ["wxHtmlWindowInterface::HTMLCursor"] = { ! Condition = "(wxCHECK_VERSION(2,8,0)) && (wxCHECK_VERSION(2,8,0))", DefType = "enum", IsNumber = true, Name = "wxHtmlWindowInterface::HTMLCursor", }, + wxHyperlinkCtrl = { + BaseClass = "wxControl", + Condition = "wxCHECK_VERSION(2,8,0) && wxUSE_HYPERLINKCTRL && wxLUA_USE_wxHyperlinkCtrl", + DefType = "class", + IsNumber = false, + Name = "wxHyperlinkCtrl", + }, + wxHyperlinkEvent = { + BaseClass = "wxCommandEvent", + Condition = "wxCHECK_VERSION(2,8,0) && wxUSE_HYPERLINKCTRL && wxLUA_USE_wxHyperlinkCtrl", + DefType = "class", + IsNumber = false, + Name = "wxHyperlinkEvent", + }, wxICOHandler = { BaseClass = "wxBMPHandler", *************** *** 3042,3046 **** wxSimpleHtmlListBox = { BaseClass = "wxHtmlWindowInterface", ! Condition = "(wxLUA_USE_wxHTML && wxUSE_HTML) && (wxCHECK_VERSION(2,8,0))", DefType = "class", IsNumber = false, --- 3077,3081 ---- wxSimpleHtmlListBox = { BaseClass = "wxHtmlWindowInterface", ! Condition = "(wxCHECK_VERSION(2,8,0)) && (wxCHECK_VERSION(2,8,0))", DefType = "class", IsNumber = false, *************** *** 3217,3220 **** --- 3252,3268 ---- Name = "wxSplitterWindow", }, + wxStandardPaths = { + Condition = "wxCHECK_VERSION(2,8,0) && wxLUA_USE_wxStandardPaths", + DefType = "class", + Encapsulate = true, + IsNumber = false, + Name = "wxStandardPaths", + }, + ["wxStandardPaths::ResourceCat"] = { + Condition = "wxCHECK_VERSION(2,8,0) && wxLUA_USE_wxStandardPaths", + DefType = "enum", + IsNumber = true, + Name = "wxStandardPaths::ResourceCat", + }, wxStaticBitmap = { BaseClass = "wxControl", *************** *** 3313,3316 **** --- 3361,3375 ---- Name = "wxStringClientData", }, + wxStringTokenizer = { + BaseClass = "wxObject", + DefType = "class", + IsNumber = false, + Name = "wxStringTokenizer", + }, + wxStringTokenizerMode = { + DefType = "enum", + IsNumber = true, + Name = "wxStringTokenizerMode", + }, wxStyledTextCtrl = { BaseClass = "wxControl", *************** *** 3552,3555 **** --- 3611,3628 ---- Name = "wxToolTip", }, + wxToolbook = { + BaseClass = "wxBookCtrlBase", + Condition = "wxCHECK_VERSION(2,8,0) && wxUSE_TOOLBOOK && wxLUA_USE_wxToolbook", + DefType = "class", + IsNumber = false, + Name = "wxToolbook", + }, + wxToolbookEvent = { + BaseClass = "wxBookCtrlBaseEvent", + Condition = "wxCHECK_VERSION(2,8,0) && wxUSE_TOOLBOOK && wxLUA_USE_wxToolbook", + DefType = "class", + IsNumber = false, + Name = "wxToolbookEvent", + }, wxTopLevelWindow = { BaseClass = "wxWindow", *************** *** 3605,3608 **** --- 3678,3695 ---- Name = "wxTreeItemIdValue", }, + wxTreebook = { + BaseClass = "wxBookCtrlBase", + Condition = "wxCHECK_VERSION(2,8,0) && wxUSE_TREEBOOK && wxLUA_USE_wxTreebook", + DefType = "class", + IsNumber = false, + Name = "wxTreebook", + }, + wxTreebookEvent = { + BaseClass = "wxBookCtrlBaseEvent", + Condition = "wxCHECK_VERSION(2,8,0) && wxUSE_TREEBOOK && wxLUA_USE_wxTreebook", + DefType = "class", + IsNumber = false, + Name = "wxTreebookEvent", + }, wxULongLong = { Condition = "wxUSE_LONGLONG", *************** *** 3991,3994 **** --- 4078,4082 ---- wxLUA_USE_wxHelpController = "wxLUA_USE_wxHelpController", wxLUA_USE_wxHtmlHelpController = "wxLUA_USE_wxHtmlHelpController", + wxLUA_USE_wxHyperlinkCtrl = "wxLUA_USE_wxHyperlinkCtrl", wxLUA_USE_wxID_XXX = "wxLUA_USE_wxID_XXX", wxLUA_USE_wxIcon = "wxLUA_USE_wxIcon", *************** *** 4033,4036 **** --- 4121,4125 ---- wxLUA_USE_wxSplashScreen = "wxLUA_USE_wxSplashScreen", wxLUA_USE_wxSplitterWindow = "wxLUA_USE_wxSplitterWindow", + wxLUA_USE_wxStandardPaths = "wxLUA_USE_wxStandardPaths", wxLUA_USE_wxStaticBitmap = "wxLUA_USE_wxStaticBitmap", wxLUA_USE_wxStaticBox = "wxLUA_USE_wxStaticBox", *************** *** 4050,4055 **** --- 4139,4146 ---- wxLUA_USE_wxToggleButton = "wxLUA_USE_wxToggleButton", wxLUA_USE_wxToolbar = "wxLUA_USE_wxToolbar", + wxLUA_USE_wxToolbook = "wxLUA_USE_wxToolbook", wxLUA_USE_wxTooltip = "wxLUA_USE_wxTooltip", wxLUA_USE_wxTreeCtrl = "wxLUA_USE_wxTreeCtrl", + wxLUA_USE_wxTreebook = "wxLUA_USE_wxTreebook", wxLUA_USE_wxValidator = "wxLUA_USE_wxValidator", wxLUA_USE_wxWave = "wxLUA_USE_wxWave", *************** *** 4126,4129 **** --- 4217,4221 ---- wxUSE_HOTKEY = "wxUSE_HOTKEY", wxUSE_HTML = "wxUSE_HTML", + wxUSE_HYPERLINKCTRL = "wxUSE_HYPERLINKCTRL", wxUSE_ICO_CUR = "wxUSE_ICO_CUR", wxUSE_IFF = "wxUSE_IFF", *************** *** 4225,4228 **** --- 4317,4321 ---- wxUSE_TOOLBAR = "wxUSE_TOOLBAR", wxUSE_TOOLBAR_NATIVE = "wxUSE_TOOLBAR_NATIVE", + wxUSE_TOOLBOOK = "wxUSE_TOOLBOOK", wxUSE_TOOLTIPS = "wxUSE_TOOLTIPS", wxUSE_TREECTRL = "wxUSE_TREECTRL", |
|
From: John L. <jr...@us...> - 2007-06-18 19:51:58
|
Update of /cvsroot/wxlua/wxLua/bindings In directory sc8-pr-cvs9.sourceforge.net:/tmp/cvs-serv21463/wxLua/bindings Modified Files: genwxbind.lua Log Message: Add more classes from 2.8, wxStandardPaths, wxToolbook, wxTreebook... Index: genwxbind.lua =================================================================== RCS file: /cvsroot/wxlua/wxLua/bindings/genwxbind.lua,v retrieving revision 1.127 retrieving revision 1.128 diff -C2 -d -r1.127 -r1.128 *** genwxbind.lua 18 Jun 2007 14:54:58 -0000 1.127 --- genwxbind.lua 18 Jun 2007 19:51:23 -0000 1.128 *************** *** 770,773 **** --- 770,774 ---- preprocConditionTable["wxUSE_HOTKEY"] = "wxUSE_HOTKEY" preprocConditionTable["wxUSE_HTML"] = "wxUSE_HTML" + preprocConditionTable["wxUSE_HYPERLINKCTRL"] = "wxUSE_HYPERLINKCTRL" preprocConditionTable["wxUSE_ICO_CUR"] = "wxUSE_ICO_CUR" preprocConditionTable["wxUSE_IFF"] = "wxUSE_IFF" *************** *** 869,872 **** --- 870,874 ---- preprocConditionTable["wxUSE_TOOLBAR"] = "wxUSE_TOOLBAR" preprocConditionTable["wxUSE_TOOLBAR_NATIVE"] = "wxUSE_TOOLBAR_NATIVE" + preprocConditionTable["wxUSE_TOOLBOOK"] = "wxUSE_TOOLBOOK" preprocConditionTable["wxUSE_TOOLTIPS"] = "wxUSE_TOOLTIPS" preprocConditionTable["wxUSE_TREECTRL"] = "wxUSE_TREECTRL" *************** *** 961,964 **** --- 963,967 ---- preprocConditionTable["wxLUA_USE_wxHTML"] = "wxLUA_USE_wxHTML" preprocConditionTable["wxLUA_USE_wxHtmlHelpController"] = "wxLUA_USE_wxHtmlHelpController" + preprocConditionTable["wxLUA_USE_wxHyperlinkCtrl"] = "wxLUA_USE_wxHyperlinkCtrl" preprocConditionTable["wxLUA_USE_wxIcon"] = "wxLUA_USE_wxIcon" preprocConditionTable["wxLUA_USE_wxID_XXX"] = "wxLUA_USE_wxID_XXX" *************** *** 1003,1006 **** --- 1006,1010 ---- preprocConditionTable["wxLUA_USE_wxSplashScreen"] = "wxLUA_USE_wxSplashScreen" preprocConditionTable["wxLUA_USE_wxSplitterWindow"] = "wxLUA_USE_wxSplitterWindow" + preprocConditionTable["wxLUA_USE_wxStandardPaths"] = "wxLUA_USE_wxStandardPaths" preprocConditionTable["wxLUA_USE_wxStaticBitmap"] = "wxLUA_USE_wxStaticBitmap" preprocConditionTable["wxLUA_USE_wxStaticBox"] = "wxLUA_USE_wxStaticBox" *************** *** 1020,1024 **** --- 1024,1030 ---- preprocConditionTable["wxLUA_USE_wxToggleButton"] = "wxLUA_USE_wxToggleButton" preprocConditionTable["wxLUA_USE_wxToolbar"] = "wxLUA_USE_wxToolbar" + preprocConditionTable["wxLUA_USE_wxToolbook"] = "wxLUA_USE_wxToolbook" preprocConditionTable["wxLUA_USE_wxTooltip"] = "wxLUA_USE_wxTooltip" + preprocConditionTable["wxLUA_USE_wxTreebook"] = "wxLUA_USE_wxTreebook" preprocConditionTable["wxLUA_USE_wxTreeCtrl"] = "wxLUA_USE_wxTreeCtrl" preprocConditionTable["wxLUA_USE_wxValidator"] = "wxLUA_USE_wxValidator" |
Update of /cvsroot/wxlua/wxLua/modules/wxbind/src In directory sc8-pr-cvs9.sourceforge.net:/tmp/cvs-serv21463/wxLua/modules/wxbind/src Modified Files: appframe.cpp controls.cpp data.cpp html.cpp windows.cpp wx_bind.cpp wxlua.cpp Log Message: Add more classes from 2.8, wxStandardPaths, wxToolbook, wxTreebook... Index: controls.cpp =================================================================== RCS file: /cvsroot/wxlua/wxLua/modules/wxbind/src/controls.cpp,v retrieving revision 1.69 retrieving revision 1.70 diff -C2 -d -r1.69 -r1.70 *** controls.cpp 18 Jun 2007 14:54:59 -0000 1.69 --- controls.cpp 18 Jun 2007 19:51:30 -0000 1.70 *************** *** 14059,14060 **** --- 14059,14535 ---- #endif // wxLUA_USE_wxGenericDirCtrl && wxUSE_DIRDLG + + #if wxCHECK_VERSION(2,8,0) && wxUSE_HYPERLINKCTRL && wxLUA_USE_wxHyperlinkCtrl + // --------------------------------------------------------------------------- + // Bind class wxHyperlinkCtrl + // --------------------------------------------------------------------------- + + // Lua MetaTable Tag for Class 'wxHyperlinkCtrl' + int s_wxluatag_wxHyperlinkCtrl = -1; + + #if (wxLUA_USE_wxPointSizeRect) && (wxCHECK_VERSION(2,8,0) && wxUSE_HYPERLINKCTRL && wxLUA_USE_wxHyperlinkCtrl) + static wxLuaArgTag s_wxluatagArray_wxLua_wxHyperlinkCtrl_Create[] = { &s_wxluatag_wxHyperlinkCtrl, &s_wxluatag_wxWindow, &s_wxluaarg_Number, &s_wxluaarg_String, &s_wxluaarg_String, &s_wxluatag_wxPoint, &s_wxluatag_wxSize, &s_wxluaarg_Number, &s_wxluaarg_String, NULL }; + static int LUACALL wxLua_wxHyperlinkCtrl_Create(lua_State *L); + static wxLuaBindCFunc s_wxluafunc_wxLua_wxHyperlinkCtrl_Create[1] = {{ wxLua_wxHyperlinkCtrl_Create, WXLUAMETHOD_METHOD, 5, 9, s_wxluatagArray_wxLua_wxHyperlinkCtrl_Create }}; + // bool Create(wxWindow *parent, wxWindowID id, const wxString& label, const wxString& url, const wxPoint& pos = wxDefaultPosition, const wxSize& size = wxDefaultSize, long style = wxHL_DEFAULT_STYLE, const wxString& name = "wxHyperlinkCtrl"); + static int LUACALL wxLua_wxHyperlinkCtrl_Create(lua_State *L) + { + wxLuaState wxlState(L); + bool returns; + // get number of arguments + int argCount = lua_gettop(L); + // const wxString name = "wxHyperlinkCtrl" + const wxString name = (argCount >= 9 ? wxlState.GetwxStringType(9) : wxString(wxT("wxHyperlinkCtrl"))); + // long style = wxHL_DEFAULT_STYLE + long style = (argCount >= 8 ? (long)wxlua_getnumbertype(L, 8) : wxHL_DEFAULT_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 url + const wxString url = wxlState.GetwxStringType(5); + // const wxString label + const wxString label = wxlState.GetwxStringType(4); + // wxWindowID id + wxWindowID id = (wxWindowID)wxlua_getnumbertype(L, 3); + // wxWindow parent + wxWindow * parent = (wxWindow *)wxlState.GetUserDataType(2, s_wxluatag_wxWindow); + // get this + wxHyperlinkCtrl * self = (wxHyperlinkCtrl *)wxlState.GetUserDataType(1, s_wxluatag_wxHyperlinkCtrl); + // call Create + returns = (self->Create(parent, id, label, url, *pos, *size, style, name)); + // push the result flag + lua_pushboolean(L, returns); + + return 1; + } + + #endif // (wxLUA_USE_wxPointSizeRect) && (wxCHECK_VERSION(2,8,0) && wxUSE_HYPERLINKCTRL && wxLUA_USE_wxHyperlinkCtrl) + + #if (wxCHECK_VERSION(2,8,0)) && (wxCHECK_VERSION(2,8,0) && wxUSE_HYPERLINKCTRL && wxLUA_USE_wxHyperlinkCtrl) + static wxLuaArgTag s_wxluatagArray_wxLua_wxHyperlinkCtrl_GetHoverColour[] = { &s_wxluatag_wxHyperlinkCtrl, NULL }; + static int LUACALL wxLua_wxHyperlinkCtrl_GetHoverColour(lua_State *L); + static wxLuaBindCFunc s_wxluafunc_wxLua_wxHyperlinkCtrl_GetHoverColour[1] = {{ wxLua_wxHyperlinkCtrl_GetHoverColour, WXLUAMETHOD_METHOD, 1, 1, s_wxluatagArray_wxLua_wxHyperlinkCtrl_GetHoverColour }}; + // wxColour GetHoverColour() const + static int LUACALL wxLua_wxHyperlinkCtrl_GetHoverColour(lua_State *L) + { + wxLuaState wxlState(L); + wxColour *returns; + // get this + wxHyperlinkCtrl * self = (wxHyperlinkCtrl *)wxlState.GetUserDataType(1, s_wxluatag_wxHyperlinkCtrl); + // call GetHoverColour + // allocate a new object using the copy constructor + returns = new wxColour(self->GetHoverColour()); + // add the new object to the tracked memory list + wxlState.AddTrackedObject((wxColour *)returns); + // push the result datatype + wxlState.PushUserDataType(s_wxluatag_wxColour, returns); + + return 1; + } + + static wxLuaArgTag s_wxluatagArray_wxLua_wxHyperlinkCtrl_GetNormalColour[] = { &s_wxluatag_wxHyperlinkCtrl, NULL }; + static int LUACALL wxLua_wxHyperlinkCtrl_GetNormalColour(lua_State *L); + static wxLuaBindCFunc s_wxluafunc_wxLua_wxHyperlinkCtrl_GetNormalColour[1] = {{ wxLua_wxHyperlinkCtrl_GetNormalColour, WXLUAMETHOD_METHOD, 1, 1, s_wxluatagArray_wxLua_wxHyperlinkCtrl_GetNormalColour }}; + // wxColour GetNormalColour() const + static int LUACALL wxLua_wxHyperlinkCtrl_GetNormalColour(lua_State *L) + { + wxLuaState wxlState(L); + wxColour *returns; + // get this + wxHyperlinkCtrl * self = (wxHyperlinkCtrl *)wxlState.GetUserDataType(1, s_wxluatag_wxHyperlinkCtrl); + // call GetNormalColour + // allocate a new object using the copy constructor + returns = new wxColour(self->GetNormalColour()); + // add the new object to the tracked memory list + wxlState.AddTrackedObject((wxColour *)returns); + // push the result datatype + wxlState.PushUserDataType(s_wxluatag_wxColour, returns); + + return 1; + } + + #endif // (wxCHECK_VERSION(2,8,0)) && (wxCHECK_VERSION(2,8,0) && wxUSE_HYPERLINKCTRL && wxLUA_USE_wxHyperlinkCtrl) + + static wxLuaArgTag s_wxluatagArray_wxLua_wxHyperlinkCtrl_GetURL[] = { &s_wxluatag_wxHyperlinkCtrl, NULL }; + static int LUACALL wxLua_wxHyperlinkCtrl_GetURL(lua_State *L); + static wxLuaBindCFunc s_wxluafunc_wxLua_wxHyperlinkCtrl_GetURL[1] = {{ wxLua_wxHyperlinkCtrl_GetURL, WXLUAMETHOD_METHOD, 1, 1, s_wxluatagArray_wxLua_wxHyperlinkCtrl_GetURL }}; + // wxString GetURL() const + static int LUACALL wxLua_wxHyperlinkCtrl_GetURL(lua_State *L) + { + wxLuaState wxlState(L); + wxString returns; + // get this + wxHyperlinkCtrl * self = (wxHyperlinkCtrl *)wxlState.GetUserDataType(1, s_wxluatag_wxHyperlinkCtrl); + // call GetURL + returns = (self->GetURL()); + // push the result string + wxlState.lua_PushString(returns); + + return 1; + } + + static wxLuaArgTag s_wxluatagArray_wxLua_wxHyperlinkCtrl_GetVisited[] = { &s_wxluatag_wxHyperlinkCtrl, NULL }; + static int LUACALL wxLua_wxHyperlinkCtrl_GetVisited(lua_State *L); + static wxLuaBindCFunc s_wxluafunc_wxLua_wxHyperlinkCtrl_GetVisited[1] = {{ wxLua_wxHyperlinkCtrl_GetVisited, WXLUAMETHOD_METHOD, 1, 1, s_wxluatagArray_wxLua_wxHyperlinkCtrl_GetVisited }}; + // bool GetVisited() const + static int LUACALL wxLua_wxHyperlinkCtrl_GetVisited(lua_State *L) + { + wxLuaState wxlState(L); + bool returns; + // get this + wxHyperlinkCtrl * self = (wxHyperlinkCtrl *)wxlState.GetUserDataType(1, s_wxluatag_wxHyperlinkCtrl); + // call GetVisited + returns = (self->GetVisited()); + // push the result flag + lua_pushboolean(L, returns); + + return 1; + } + + + #if (wxCHECK_VERSION(2,8,0)) && (wxCHECK_VERSION(2,8,0) && wxUSE_HYPERLINKCTRL && wxLUA_USE_wxHyperlinkCtrl) + static wxLuaArgTag s_wxluatagArray_wxLua_wxHyperlinkCtrl_GetVisitedColour[] = { &s_wxluatag_wxHyperlinkCtrl, NULL }; + static int LUACALL wxLua_wxHyperlinkCtrl_GetVisitedColour(lua_State *L); + static wxLuaBindCFunc s_wxluafunc_wxLua_wxHyperlinkCtrl_GetVisitedColour[1] = {{ wxLua_wxHyperlinkCtrl_GetVisitedColour, WXLUAMETHOD_METHOD, 1, 1, s_wxluatagArray_wxLua_wxHyperlinkCtrl_GetVisitedColour }}; + // wxColour GetVisitedColour() const + static int LUACALL wxLua_wxHyperlinkCtrl_GetVisitedColour(lua_State *L) + { + wxLuaState wxlState(L); + wxColour *returns; + // get this + wxHyperlinkCtrl * self = (wxHyperlinkCtrl *)wxlState.GetUserDataType(1, s_wxluatag_wxHyperlinkCtrl); + // call GetVisitedColour + // allocate a new object using the copy constructor + returns = new wxColour(self->GetVisitedColour()); + // add the new object to the tracked memory list + wxlState.AddTrackedObject((wxColour *)returns); + // push the result datatype + wxlState.PushUserDataType(s_wxluatag_wxColour, returns); + + return 1; + } + + static wxLuaArgTag s_wxluatagArray_wxLua_wxHyperlinkCtrl_SetHoverColour[] = { &s_wxluatag_wxHyperlinkCtrl, &s_wxluatag_wxColour, NULL }; + static int LUACALL wxLua_wxHyperlinkCtrl_SetHoverColour(lua_State *L); + static wxLuaBindCFunc s_wxluafunc_wxLua_wxHyperlinkCtrl_SetHoverColour[1] = {{ wxLua_wxHyperlinkCtrl_SetHoverColour, WXLUAMETHOD_METHOD, 2, 2, s_wxluatagArray_wxLua_wxHyperlinkCtrl_SetHoverColour }}; + // void SetHoverColour(const wxColour &colour) + static int LUACALL wxLua_wxHyperlinkCtrl_SetHoverColour(lua_State *L) + { + wxLuaState wxlState(L); + // const wxColour colour + const wxColour * colour = (const wxColour *)wxlState.GetUserDataType(2, s_wxluatag_wxColour); + // get this + wxHyperlinkCtrl * self = (wxHyperlinkCtrl *)wxlState.GetUserDataType(1, s_wxluatag_wxHyperlinkCtrl); + // call SetHoverColour + self->SetHoverColour(*colour); + + return 0; + } + + static wxLuaArgTag s_wxluatagArray_wxLua_wxHyperlinkCtrl_SetNormalColour[] = { &s_wxluatag_wxHyperlinkCtrl, &s_wxluatag_wxColour, NULL }; + static int LUACALL wxLua_wxHyperlinkCtrl_SetNormalColour(lua_State *L); + static wxLuaBindCFunc s_wxluafunc_wxLua_wxHyperlinkCtrl_SetNormalColour[1] = {{ wxLua_wxHyperlinkCtrl_SetNormalColour, WXLUAMETHOD_METHOD, 2, 2, s_wxluatagArray_wxLua_wxHyperlinkCtrl_SetNormalColour }}; + // void SetNormalColour(const wxColour &colour); + static int LUACALL wxLua_wxHyperlinkCtrl_SetNormalColour(lua_State *L) + { + wxLuaState wxlState(L); + // const wxColour colour + const wxColour * colour = (const wxColour *)wxlState.GetUserDataType(2, s_wxluatag_wxColour); + // get this + wxHyperlinkCtrl * self = (wxHyperlinkCtrl *)wxlState.GetUserDataType(1, s_wxluatag_wxHyperlinkCtrl); + // call SetNormalColour + self->SetNormalColour(*colour); + + return 0; + } + + #endif // (wxCHECK_VERSION(2,8,0)) && (wxCHECK_VERSION(2,8,0) && wxUSE_HYPERLINKCTRL && wxLUA_USE_wxHyperlinkCtrl) + + static wxLuaArgTag s_wxluatagArray_wxLua_wxHyperlinkCtrl_SetURL[] = { &s_wxluatag_wxHyperlinkCtrl, &s_wxluaarg_String, NULL }; + static int LUACALL wxLua_wxHyperlinkCtrl_SetURL(lua_State *L); + static wxLuaBindCFunc s_wxluafunc_wxLua_wxHyperlinkCtrl_SetURL[1] = {{ wxLua_wxHyperlinkCtrl_SetURL, WXLUAMETHOD_METHOD, 2, 2, s_wxluatagArray_wxLua_wxHyperlinkCtrl_SetURL }}; + // void SetURL (const wxString &url) + static int LUACALL wxLua_wxHyperlinkCtrl_SetURL(lua_State *L) + { + wxLuaState wxlState(L); + // const wxString url + const wxString url = wxlState.GetwxStringType(2); + // get this + wxHyperlinkCtrl * self = (wxHyperlinkCtrl *)wxlState.GetUserDataType(1, s_wxluatag_wxHyperlinkCtrl); + // call SetURL + self->SetURL(url); + + return 0; + } + + static wxLuaArgTag s_wxluatagArray_wxLua_wxHyperlinkCtrl_SetVisited[] = { &s_wxluatag_wxHyperlinkCtrl, &s_wxluaarg_Boolean, NULL }; + static int LUACALL wxLua_wxHyperlinkCtrl_SetVisited(lua_State *L); + static wxLuaBindCFunc s_wxluafunc_wxLua_wxHyperlinkCtrl_SetVisited[1] = {{ wxLua_wxHyperlinkCtrl_SetVisited, WXLUAMETHOD_METHOD, 1, 2, s_wxluatagArray_wxLua_wxHyperlinkCtrl_SetVisited }}; + // void SetVisited(bool visited = true) + static int LUACALL wxLua_wxHyperlinkCtrl_SetVisited(lua_State *L) + { + wxLuaState wxlState(L); + // get number of arguments + int argCount = lua_gettop(L); + // bool visited = true + bool visited = (argCount >= 2 ? wxlua_getbooleantype(L, 2) : true); + // get this + wxHyperlinkCtrl * self = (wxHyperlinkCtrl *)wxlState.GetUserDataType(1, s_wxluatag_wxHyperlinkCtrl); + // call SetVisited + self->SetVisited(visited); + + return 0; + } + + + #if (wxCHECK_VERSION(2,8,0)) && (wxCHECK_VERSION(2,8,0) && wxUSE_HYPERLINKCTRL && wxLUA_USE_wxHyperlinkCtrl) + static wxLuaArgTag s_wxluatagArray_wxLua_wxHyperlinkCtrl_SetVisitedColour[] = { &s_wxluatag_wxHyperlinkCtrl, &s_wxluatag_wxColour, NULL }; + static int LUACALL wxLua_wxHyperlinkCtrl_SetVisitedColour(lua_State *L); + static wxLuaBindCFunc s_wxluafunc_wxLua_wxHyperlinkCtrl_SetVisitedColour[1] = {{ wxLua_wxHyperlinkCtrl_SetVisitedColour, WXLUAMETHOD_METHOD, 2, 2, s_wxluatagArray_wxLua_wxHyperlinkCtrl_SetVisitedColour }}; + // void SetVisitedColour(const wxColour &colour); + static int LUACALL wxLua_wxHyperlinkCtrl_SetVisitedColour(lua_State *L) + { + wxLuaState wxlState(L); + // const wxColour colour + const wxColour * colour = (const wxColour *)wxlState.GetUserDataType(2, s_wxluatag_wxColour); + // get this + wxHyperlinkCtrl * self = (wxHyperlinkCtrl *)wxlState.GetUserDataType(1, s_wxluatag_wxHyperlinkCtrl); + // call SetVisitedColour + self->SetVisitedColour(*colour); + + return 0; + } + + #endif // (wxCHECK_VERSION(2,8,0)) && (wxCHECK_VERSION(2,8,0) && wxUSE_HYPERLINKCTRL && wxLUA_USE_wxHyperlinkCtrl) + + #if (wxLUA_USE_wxPointSizeRect) && (wxCHECK_VERSION(2,8,0) && wxUSE_HYPERLINKCTRL && wxLUA_USE_wxHyperlinkCtrl) + static wxLuaArgTag s_wxluatagArray_wxLua_wxHyperlinkCtrl_constructor1[] = { &s_wxluatag_wxWindow, &s_wxluaarg_Number, &s_wxluaarg_String, &s_wxluaarg_String, &s_wxluatag_wxPoint, &s_wxluatag_wxSize, &s_wxluaarg_Number, &s_wxluaarg_String, NULL }; + static int LUACALL wxLua_wxHyperlinkCtrl_constructor1(lua_State *L); + // static wxLuaBindCFunc s_wxluafunc_wxLua_wxHyperlinkCtrl_constructor1[1] = {{ wxLua_wxHyperlinkCtrl_constructor1, WXLUAMETHOD_CONSTRUCTOR, 4, 8, s_wxluatagArray_wxLua_wxHyperlinkCtrl_constructor1 }}; + // wxHyperlinkCtrl(wxWindow *parent, wxWindowID id, const wxString& label, const wxString& url, const wxPoint& pos = wxDefaultPosition, const wxSize& size = wxDefaultSize, long style = wxHL_DEFAULT_STYLE, const wxString& name = "wxHyperlinkCtrl") + static int LUACALL wxLua_wxHyperlinkCtrl_constructor1(lua_State *L) + { + wxluabind_removetableforcall(L); + wxLuaState wxlState(L); + wxHyperlinkCtrl *returns; + // get number of arguments + int argCount = lua_gettop(L); + // const wxString name = "wxHyperlinkCtrl" + const wxString name = (argCount >= 8 ? wxlState.GetwxStringType(8) : wxString(wxT("wxHyperlinkCtrl"))); + // long style = wxHL_DEFAULT_STYLE + long style = (argCount >= 7 ? (long)wxlua_getnumbertype(L, 7) : wxHL_DEFAULT_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 url + const wxString url = wxlState.GetwxStringType(4); + // const wxString label + const wxString label = wxlState.GetwxStringType(3); + // wxWindowID id + wxWindowID id = (wxWindowID)wxlua_getnumbertype(L, 2); + // wxWindow parent + wxWindow * parent = (wxWindow *)wxlState.GetUserDataType(1, s_wxluatag_wxWindow); + // call constructor + returns = new wxHyperlinkCtrl(parent, id, label, url, *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_wxHyperlinkCtrl, returns); + + return 1; + } + + #endif // (wxLUA_USE_wxPointSizeRect) && (wxCHECK_VERSION(2,8,0) && wxUSE_HYPERLINKCTRL && wxLUA_USE_wxHyperlinkCtrl) + + static int LUACALL wxLua_wxHyperlinkCtrl_constructor(lua_State *L); + // static wxLuaBindCFunc s_wxluafunc_wxLua_wxHyperlinkCtrl_constructor[1] = {{ wxLua_wxHyperlinkCtrl_constructor, WXLUAMETHOD_CONSTRUCTOR, 0, 0, s_wxluaargArray_None }}; + // wxHyperlinkCtrl() + static int LUACALL wxLua_wxHyperlinkCtrl_constructor(lua_State *L) + { + wxluabind_removetableforcall(L); + wxLuaState wxlState(L); + wxHyperlinkCtrl *returns; + // call constructor + returns = new wxHyperlinkCtrl(); + // add to tracked window list, it will check validity + wxlState.AddTrackedWindow(returns); + // push the constructed class pointer + wxlState.PushUserDataType(s_wxluatag_wxHyperlinkCtrl, returns); + + return 1; + } + + + + + #if ((wxLUA_USE_wxPointSizeRect) && (wxCHECK_VERSION(2,8,0) && wxUSE_HYPERLINKCTRL && wxLUA_USE_wxHyperlinkCtrl))||(wxCHECK_VERSION(2,8,0) && wxUSE_HYPERLINKCTRL && wxLUA_USE_wxHyperlinkCtrl) + static int LUACALL wxLua_wxHyperlinkCtrl_constructor_overload(lua_State *L); + // function overload table + static wxLuaBindCFunc s_wxluafunc_wxLua_wxHyperlinkCtrl_constructor_overload[] = + { + { wxLua_wxHyperlinkCtrl_constructor_overload, WXLUAMETHOD_METHOD|WXLUAMETHOD_OVERLOAD, 0, 8, s_wxluaargArray_None }, + + #if (wxLUA_USE_wxPointSizeRect) && (wxCHECK_VERSION(2,8,0) && wxUSE_HYPERLINKCTRL && wxLUA_USE_wxHyperlinkCtrl) + { wxLua_wxHyperlinkCtrl_constructor1, WXLUAMETHOD_CONSTRUCTOR, 4, 8, s_wxluatagArray_wxLua_wxHyperlinkCtrl_constructor1 }, + #endif // (wxLUA_USE_wxPointSizeRect) && (wxCHECK_VERSION(2,8,0) && wxUSE_HYPERLINKCTRL && wxLUA_USE_wxHyperlinkCtrl) + { wxLua_wxHyperlinkCtrl_constructor, WXLUAMETHOD_CONSTRUCTOR, 0, 0, s_wxluaargArray_None }, + }; + static int s_wxluafunc_wxLua_wxHyperlinkCtrl_constructor_overload_count = sizeof(s_wxluafunc_wxLua_wxHyperlinkCtrl_constructor_overload)/sizeof(wxLuaBindCFunc); + // Overloaded function for wxHyperlinkCtrl::wxHyperlinkCtrl + static int LUACALL wxLua_wxHyperlinkCtrl_constructor_overload(lua_State *L) + { + wxLuaState wxlState(L); + static wxLuaBindMethod overload_method = + { "wxHyperlinkCtrl", WXLUAMETHOD_CONSTRUCTOR, s_wxluafunc_wxLua_wxHyperlinkCtrl_constructor_overload, s_wxluafunc_wxLua_wxHyperlinkCtrl_constructor_overload_count, 0 }; + return wxlState.CallOverloadedFunction(&overload_method); + } + #endif // ((wxLUA_USE_wxPointSizeRect) && (wxCHECK_VERSION(2,8,0) && wxUSE_HYPERLINKCTRL && wxLUA_USE_wxHyperlinkCtrl))||(wxCHECK_VERSION(2,8,0) && wxUSE_HYPERLINKCTRL && wxLUA_USE_wxHyperlinkCtrl) + + // Map Lua Class Methods to C Binding Functions + wxLuaBindMethod wxHyperlinkCtrl_methods[] = { + #if (wxLUA_USE_wxPointSizeRect) && (wxCHECK_VERSION(2,8,0) && wxUSE_HYPERLINKCTRL && wxLUA_USE_wxHyperlinkCtrl) + { "Create", WXLUAMETHOD_METHOD, s_wxluafunc_wxLua_wxHyperlinkCtrl_Create, 1, NULL }, + #endif // (wxLUA_USE_wxPointSizeRect) && (wxCHECK_VERSION(2,8,0) && wxUSE_HYPERLINKCTRL && wxLUA_USE_wxHyperlinkCtrl) + + #if (wxCHECK_VERSION(2,8,0)) && (wxCHECK_VERSION(2,8,0) && wxUSE_HYPERLINKCTRL && wxLUA_USE_wxHyperlinkCtrl) + { "GetHoverColour", WXLUAMETHOD_METHOD, s_wxluafunc_wxLua_wxHyperlinkCtrl_GetHoverColour, 1, NULL }, + { "GetNormalColour", WXLUAMETHOD_METHOD, s_wxluafunc_wxLua_wxHyperlinkCtrl_GetNormalColour, 1, NULL }, + #endif // (wxCHECK_VERSION(2,8,0)) && (wxCHECK_VERSION(2,8,0) && wxUSE_HYPERLINKCTRL && wxLUA_USE_wxHyperlinkCtrl) + + { "GetURL", WXLUAMETHOD_METHOD, s_wxluafunc_wxLua_wxHyperlinkCtrl_GetURL, 1, NULL }, + { "GetVisited", WXLUAMETHOD_METHOD, s_wxluafunc_wxLua_wxHyperlinkCtrl_GetVisited, 1, NULL }, + + #if (wxCHECK_VERSION(2,8,0)) && (wxCHECK_VERSION(2,8,0) && wxUSE_HYPERLINKCTRL && wxLUA_USE_wxHyperlinkCtrl) + { "GetVisitedColour", WXLUAMETHOD_METHOD, s_wxluafunc_wxLua_wxHyperlinkCtrl_GetVisitedColour, 1, NULL }, + { "SetHoverColour", WXLUAMETHOD_METHOD, s_wxluafunc_wxLua_wxHyperlinkCtrl_SetHoverColour, 1, NULL }, + { "SetNormalColour", WXLUAMETHOD_METHOD, s_wxluafunc_wxLua_wxHyperlinkCtrl_SetNormalColour, 1, NULL }, + #endif // (wxCHECK_VERSION(2,8,0)) && (wxCHECK_VERSION(2,8,0) && wxUSE_HYPERLINKCTRL && wxLUA_USE_wxHyperlinkCtrl) + + { "SetURL", WXLUAMETHOD_METHOD, s_wxluafunc_wxLua_wxHyperlinkCtrl_SetURL, 1, NULL }, + { "SetVisited", WXLUAMETHOD_METHOD, s_wxluafunc_wxLua_wxHyperlinkCtrl_SetVisited, 1, NULL }, + + #if (wxCHECK_VERSION(2,8,0)) && (wxCHECK_VERSION(2,8,0) && wxUSE_HYPERLINKCTRL && wxLUA_USE_wxHyperlinkCtrl) + { "SetVisitedColour", WXLUAMETHOD_METHOD, s_wxluafunc_wxLua_wxHyperlinkCtrl_SetVisitedColour, 1, NULL }, + #endif // (wxCHECK_VERSION(2,8,0)) && (wxCHECK_VERSION(2,8,0) && wxUSE_HYPERLINKCTRL && wxLUA_USE_wxHyperlinkCtrl) + + #if ((wxLUA_USE_wxPointSizeRect) && (wxCHECK_VERSION(2,8,0) && wxUSE_HYPERLINKCTRL && wxLUA_USE_wxHyperlinkCtrl))||(wxCHECK_VERSION(2,8,0) && wxUSE_HYPERLINKCTRL && wxLUA_USE_wxHyperlinkCtrl) + { "wxHyperlinkCtrl", WXLUAMETHOD_CONSTRUCTOR, s_wxluafunc_wxLua_wxHyperlinkCtrl_constructor_overload, s_wxluafunc_wxLua_wxHyperlinkCtrl_constructor_overload_count, 0 }, + #endif // ((wxLUA_USE_wxPointSizeRect) && (wxCHECK_VERSION(2,8,0) && wxUSE_HYPERLINKCTRL && wxLUA_USE_wxHyperlinkCtrl))||(wxCHECK_VERSION(2,8,0) && wxUSE_HYPERLINKCTRL && wxLUA_USE_wxHyperlinkCtrl) + + { 0, 0, 0, 0 }, + }; + + int wxHyperlinkCtrl_methodCount = sizeof(wxHyperlinkCtrl_methods)/sizeof(wxLuaBindMethod) - 1; + + #endif // wxCHECK_VERSION(2,8,0) && wxUSE_HYPERLINKCTRL && wxLUA_USE_wxHyperlinkCtrl + + + #if wxCHECK_VERSION(2,8,0) && wxUSE_HYPERLINKCTRL && wxLUA_USE_wxHyperlinkCtrl + // --------------------------------------------------------------------------- + // Bind class wxHyperlinkEvent + // --------------------------------------------------------------------------- + + // Lua MetaTable Tag for Class 'wxHyperlinkEvent' + int s_wxluatag_wxHyperlinkEvent = -1; + + static wxLuaArgTag s_wxluatagArray_wxLua_wxHyperlinkEvent_GetURL[] = { &s_wxluatag_wxHyperlinkEvent, NULL }; + static int LUACALL wxLua_wxHyperlinkEvent_GetURL(lua_State *L); + static wxLuaBindCFunc s_wxluafunc_wxLua_wxHyperlinkEvent_GetURL[1] = {{ wxLua_wxHyperlinkEvent_GetURL, WXLUAMETHOD_METHOD, 1, 1, s_wxluatagArray_wxLua_wxHyperlinkEvent_GetURL }}; + // wxString GetURL() const + static int LUACALL wxLua_wxHyperlinkEvent_GetURL(lua_State *L) + { + wxLuaState wxlState(L); + wxString returns; + // get this + wxHyperlinkEvent * self = (wxHyperlinkEvent *)wxlState.GetUserDataType(1, s_wxluatag_wxHyperlinkEvent); + // call GetURL + returns = (self->GetURL()); + // push the result string + wxlState.lua_PushString(returns); + + return 1; + } + + static wxLuaArgTag s_wxluatagArray_wxLua_wxHyperlinkEvent_SetURL[] = { &s_wxluatag_wxHyperlinkEvent, &s_wxluaarg_String, NULL }; + static int LUACALL wxLua_wxHyperlinkEvent_SetURL(lua_State *L); + static wxLuaBindCFunc s_wxluafunc_wxLua_wxHyperlinkEvent_SetURL[1] = {{ wxLua_wxHyperlinkEvent_SetURL, WXLUAMETHOD_METHOD, 2, 2, s_wxluatagArray_wxLua_wxHyperlinkEvent_SetURL }}; + // void SetURL(const wxString &url) + static int LUACALL wxLua_wxHyperlinkEvent_SetURL(lua_State *L) + { + wxLuaState wxlState(L); + // const wxString url + const wxString url = wxlState.GetwxStringType(2); + // get this + wxHyperlinkEvent * self = (wxHyperlinkEvent *)wxlState.GetUserDataType(1, s_wxluatag_wxHyperlinkEvent); + // call SetURL + self->SetURL(url); + + return 0; + } + + static wxLuaArgTag s_wxluatagArray_wxLua_wxHyperlinkEvent_delete[] = { &s_wxluatag_wxHyperlinkEvent, NULL }; + static int LUACALL wxLua_wxHyperlinkEvent_delete(lua_State *L); + static wxLuaBindCFunc s_wxluafunc_wxLua_wxHyperlinkEvent_delete[1] = {{ wxLua_wxHyperlinkEvent_delete, WXLUAMETHOD_METHOD|WXLUAMETHOD_DELETE, 1, 1, s_wxluatagArray_wxLua_wxHyperlinkEvent_delete }}; + static int LUACALL wxLua_wxHyperlinkEvent_delete(lua_State *L) + { + wxLuaState wxlState(L); + wxHyperlinkEvent * self = (wxHyperlinkEvent *)wxlState.GetUserDataType(1, s_wxluatag_wxHyperlinkEvent); + // if removed from tracked mem list, reset the tag so that gc() is not called on this object. + if ((self != NULL) && wxlState.RemoveTrackedObject(self)) + { + lua_pushnil(L); + lua_setmetatable(L, -2); + } + return 0; + } + + + #if (wxLUA_USE_wxObject) && (wxCHECK_VERSION(2,8,0) && wxUSE_HYPERLINKCTRL && wxLUA_USE_wxHyperlinkCtrl) + static wxLuaArgTag s_wxluatagArray_wxLua_wxHyperlinkEvent_constructor[] = { &s_wxluatag_wxObject, &s_wxluaarg_Number, &s_wxluaarg_String, NULL }; + static int LUACALL wxLua_wxHyperlinkEvent_constructor(lua_State *L); + static wxLuaBindCFunc s_wxluafunc_wxLua_wxHyperlinkEvent_constructor[1] = {{ wxLua_wxHyperlinkEvent_constructor, WXLUAMETHOD_CONSTRUCTOR, 3, 3, s_wxluatagArray_wxLua_wxHyperlinkEvent_constructor }}; + // wxHyperlinkEvent(wxObject *generator, wxWindowID id, const wxString& url) + static int LUACALL wxLua_wxHyperlinkEvent_constructor(lua_State *L) + { + wxluabind_removetableforcall(L); + wxLuaState wxlState(L); + wxHyperlinkEvent *returns; + // const wxString url + const wxString url = wxlState.GetwxStringType(3); + // wxWindowID id + wxWindowID id = (wxWindowID)wxlua_getnumbertype(L, 2); + // wxObject generator + wxObject * generator = (wxObject *)wxlState.GetUserDataType(1, s_wxluatag_wxObject); + // call constructor + returns = new wxHyperlinkEvent(generator, id, url); + // add to tracked memory list + wxlState.AddTrackedObject(returns); + // push the constructed class pointer + wxlState.PushUserDataType(s_wxluatag_wxHyperlinkEvent, returns); + + return 1; + } + + #endif // (wxLUA_USE_wxObject) && (wxCHECK_VERSION(2,8,0) && wxUSE_HYPERLINKCTRL && wxLUA_USE_wxHyperlinkCtrl) + + + + // Map Lua Class Methods to C Binding Functions + wxLuaBindMethod wxHyperlinkEvent_methods[] = { + { "GetURL", WXLUAMETHOD_METHOD, s_wxluafunc_wxLua_wxHyperlinkEvent_GetURL, 1, NULL }, + { "SetURL", WXLUAMETHOD_METHOD, s_wxluafunc_wxLua_wxHyperlinkEvent_SetURL, 1, NULL }, + { "delete", WXLUAMETHOD_METHOD|WXLUAMETHOD_DELETE, s_wxluafunc_wxLua_wxHyperlinkEvent_delete, 1, NULL }, + + #if (wxLUA_USE_wxObject) && (wxCHECK_VERSION(2,8,0) && wxUSE_HYPERLINKCTRL && wxLUA_USE_wxHyperlinkCtrl) + { "wxHyperlinkEvent", WXLUAMETHOD_CONSTRUCTOR, s_wxluafunc_wxLua_wxHyperlinkEvent_constructor, 1, NULL }, + #endif // (wxLUA_USE_wxObject) && (wxCHECK_VERSION(2,8,0) && wxUSE_HYPERLINKCTRL && wxLUA_USE_wxHyperlinkCtrl) + + { 0, 0, 0, 0 }, + }; + + int wxHyperlinkEvent_methodCount = sizeof(wxHyperlinkEvent_methods)/sizeof(wxLuaBindMethod) - 1; + + #endif // wxCHECK_VERSION(2,8,0) && wxUSE_HYPERLINKCTRL && wxLUA_USE_wxHyperlinkCtrl + Index: data.cpp =================================================================== RCS file: /cvsroot/wxlua/wxLua/modules/wxbind/src/data.cpp,v retrieving revision 1.55 retrieving revision 1.56 diff -C2 -d -r1.55 -r1.56 *** data.cpp 18 Jun 2007 14:54:59 -0000 1.55 --- data.cpp 18 Jun 2007 19:51:32 -0000 1.56 *************** *** 89,92 **** --- 89,367 ---- // --------------------------------------------------------------------------- + // Bind class wxStringTokenizer + // --------------------------------------------------------------------------- + + // Lua MetaTable Tag for Class 'wxStringTokenizer' + int s_wxluatag_wxStringTokenizer = -1; + + static wxLuaArgTag s_wxluatagArray_wxLua_wxStringTokenizer_AllowEmpty[] = { &s_wxluatag_wxStringTokenizer, NULL }; + static int LUACALL wxLua_wxStringTokenizer_AllowEmpty(lua_State *L); + static wxLuaBindCFunc s_wxluafunc_wxLua_wxStringTokenizer_AllowEmpty[1] = {{ wxLua_wxStringTokenizer_AllowEmpty, WXLUAMETHOD_METHOD, 1, 1, s_wxluatagArray_wxLua_wxStringTokenizer_AllowEmpty }}; + // bool AllowEmpty() const + static int LUACALL wxLua_wxStringTokenizer_AllowEmpty(lua_State *L) + { + wxLuaState wxlState(L); + bool returns; + // get this + wxStringTokenizer * self = (wxStringTokenizer *)wxlState.GetUserDataType(1, s_wxluatag_wxStringTokenizer); + // call AllowEmpty + returns = (self->AllowEmpty()); + // push the result flag + lua_pushboolean(L, returns); + + return 1; + } + + static wxLuaArgTag s_wxluatagArray_wxLua_wxStringTokenizer_CountTokens[] = { &s_wxluatag_wxStringTokenizer, NULL }; + static int LUACALL wxLua_wxStringTokenizer_CountTokens(lua_State *L); + static wxLuaBindCFunc s_wxluafunc_wxLua_wxStringTokenizer_CountTokens[1] = {{ wxLua_wxStringTokenizer_CountTokens, WXLUAMETHOD_METHOD, 1, 1, s_wxluatagArray_wxLua_wxStringTokenizer_CountTokens }}; + // size_t CountTokens() const; + static int LUACALL wxLua_wxStringTokenizer_CountTokens(lua_State *L) + { + wxLuaState wxlState(L); + size_t returns; + // get this + wxStringTokenizer * self = (wxStringTokenizer *)wxlState.GetUserDataType(1, s_wxluatag_wxStringTokenizer); + // call CountTokens + returns = (self->CountTokens()); + // push the result number + lua_pushnumber(L, returns); + + return 1; + } + + static wxLuaArgTag s_wxluatagArray_wxLua_wxStringTokenizer_GetMode[] = { &s_wxluatag_wxStringTokenizer, NULL }; + static int LUACALL wxLua_wxStringTokenizer_GetMode(lua_State *L); + static wxLuaBindCFunc s_wxluafunc_wxLua_wxStringTokenizer_GetMode[1] = {{ wxLua_wxStringTokenizer_GetMode, WXLUAMETHOD_METHOD, 1, 1, s_wxluatagArray_wxLua_wxStringTokenizer_GetMode }}; + // wxStringTokenizerMode GetMode() const + static int LUACALL wxLua_wxStringTokenizer_GetMode(lua_State *L) + { + wxLuaState wxlState(L); + wxStringTokenizerMode returns; + // get this + wxStringTokenizer * self = (wxStringTokenizer *)wxlState.GetUserDataType(1, s_wxluatag_wxStringTokenizer); + // call GetMode + returns = (self->GetMode()); + // push the result number + lua_pushnumber(L, returns); + + return 1; + } + + static wxLuaArgTag s_wxluatagArray_wxLua_wxStringTokenizer_GetNextToken[] = { &s_wxluatag_wxStringTokenizer, NULL }; + static int LUACALL wxLua_wxStringTokenizer_GetNextToken(lua_State *L); + static wxLuaBindCFunc s_wxluafunc_wxLua_wxStringTokenizer_GetNextToken[1] = {{ wxLua_wxStringTokenizer_GetNextToken, WXLUAMETHOD_METHOD, 1, 1, s_wxluatagArray_wxLua_wxStringTokenizer_GetNextToken }}; + // wxString GetNextToken(); + static int LUACALL wxLua_wxStringTokenizer_GetNextToken(lua_State *L) + { + wxLuaState wxlState(L); + wxString returns; + // get this + wxStringTokenizer * self = (wxStringTokenizer *)wxlState.GetUserDataType(1, s_wxluatag_wxStringTokenizer); + // call GetNextToken + returns = (self->GetNextToken()); + // push the result string + wxlState.lua_PushString(returns); + + return 1; + } + + static wxLuaArgTag s_wxluatagArray_wxLua_wxStringTokenizer_GetPosition[] = { &s_wxluatag_wxStringTokenizer, NULL }; + static int LUACALL wxLua_wxStringTokenizer_GetPosition(lua_State *L); + static wxLuaBindCFunc s_wxluafunc_wxLua_wxStringTokenizer_GetPosition[1] = {{ wxLua_wxStringTokenizer_GetPosition, WXLUAMETHOD_METHOD, 1, 1, s_wxluatagArray_wxLua_wxStringTokenizer_GetPosition }}; + // size_t GetPosition() const + static int LUACALL wxLua_wxStringTokenizer_GetPosition(lua_State *L) + { + wxLuaState wxlState(L); + size_t returns; + // get this + wxStringTokenizer * self = (wxStringTokenizer *)wxlState.GetUserDataType(1, s_wxluatag_wxStringTokenizer); + // call GetPosition + returns = (self->GetPosition()); + // push the result number + lua_pushnumber(L, returns); + + return 1; + } + + static wxLuaArgTag s_wxluatagArray_wxLua_wxStringTokenizer_GetString[] = { &s_wxluatag_wxStringTokenizer, NULL }; + static int LUACALL wxLua_wxStringTokenizer_GetString(lua_State *L); + static wxLuaBindCFunc s_wxluafunc_wxLua_wxStringTokenizer_GetString[1] = {{ wxLua_wxStringTokenizer_GetString, WXLUAMETHOD_METHOD, 1, 1, s_wxluatagArray_wxLua_wxStringTokenizer_GetString }}; + // wxString GetString() const + static int LUACALL wxLua_wxStringTokenizer_GetString(lua_State *L) + { + wxLuaState wxlState(L); + wxString returns; + // get this + wxStringTokenizer * self = (wxStringTokenizer *)wxlState.GetUserDataType(1, s_wxluatag_wxStringTokenizer); + // call GetString + returns = (self->GetString()); + // push the result string + wxlState.lua_PushString(returns); + + return 1; + } + + static wxLuaArgTag s_wxluatagArray_wxLua_wxStringTokenizer_HasMoreTokens[] = { &s_wxluatag_wxStringTokenizer, NULL }; + static int LUACALL wxLua_wxStringTokenizer_HasMoreTokens(lua_State *L); + static wxLuaBindCFunc s_wxluafunc_wxLua_wxStringTokenizer_HasMoreTokens[1] = {{ wxLua_wxStringTokenizer_HasMoreTokens, WXLUAMETHOD_METHOD, 1, 1, s_wxluatagArray_wxLua_wxStringTokenizer_HasMoreTokens }}; + // bool HasMoreTokens() const; + static int LUACALL wxLua_wxStringTokenizer_HasMoreTokens(lua_State *L) + { + wxLuaState wxlState(L); + bool returns; + // get this + wxStringTokenizer * self = (wxStringTokenizer *)wxlState.GetUserDataType(1, s_wxluatag_wxStringTokenizer); + // call HasMoreTokens + returns = (self->HasMoreTokens()); + // push the result flag + lua_pushboolean(L, returns); + + return 1; + } + + static wxLuaArgTag s_wxluatagArray_wxLua_wxStringTokenizer_Reinit[] = { &s_wxluatag_wxStringTokenizer, &s_wxluaarg_String, NULL }; + static int LUACALL wxLua_wxStringTokenizer_Reinit(lua_State *L); + static wxLuaBindCFunc s_wxluafunc_wxLua_wxStringTokenizer_Reinit[1] = {{ wxLua_wxStringTokenizer_Reinit, WXLUAMETHOD_METHOD, 2, 2, s_wxluatagArray_wxLua_wxStringTokenizer_Reinit }}; + // void Reinit(const wxString& str); + static int LUACALL wxLua_wxStringTokenizer_Reinit(lua_State *L) + { + wxLuaState wxlState(L); + // const wxString str + const wxString str = wxlState.GetwxStringType(2); + // get this + wxStringTokenizer * self = (wxStringTokenizer *)wxlState.GetUserDataType(1, s_wxluatag_wxStringTokenizer); + // call Reinit + self->Reinit(str); + + return 0; + } + + static wxLuaArgTag s_wxluatagArray_wxLua_wxStringTokenizer_SetString[] = { &s_wxluatag_wxStringTokenizer, &s_wxluaarg_String, &s_wxluaarg_String, &s_wxluaarg_Integer, NULL }; + static int LUACALL wxLua_wxStringTokenizer_SetString(lua_State *L); + static wxLuaBindCFunc s_wxluafunc_wxLua_wxStringTokenizer_SetString[1] = {{ wxLua_wxStringTokenizer_SetString, WXLUAMETHOD_METHOD, 2, 4, s_wxluatagArray_wxLua_wxStringTokenizer_SetString }}; + // void SetString(const wxString& str, const wxString& delims = wxDEFAULT_DELIMITERS, wxStringTokenizerMode mode = wxTOKEN_DEFAULT); + static int LUACALL wxLua_wxStringTokenizer_SetString(lua_State *L) + { + wxLuaState wxlState(L); + // get number of arguments + int argCount = lua_gettop(L); + // wxStringTokenizerMode mode = wxTOKEN_DEFAULT + wxStringTokenizerMode mode = (argCount >= 4 ? (wxStringTokenizerMode)wxlua_getintegertype(L, 4) : wxTOKEN_DEFAULT); + // const wxString delims = wxDEFAULT_DELIMITERS + const wxString delims = (argCount >= 3 ? wxlState.GetwxStringType(3) : wxString(wxDEFAULT_DELIMITERS)); + // const wxString str + const wxString str = wxlState.GetwxStringType(2); + // get this + wxStringTokenizer * self = (wxStringTokenizer *)wxlState.GetUserDataType(1, s_wxluatag_wxStringTokenizer); + // call SetString + self->SetString(str, delims, mode); + + return 0; + } + + static wxLuaArgTag s_wxluatagArray_wxLua_wxStringTokenizer_delete[] = { &s_wxluatag_wxStringTokenizer, NULL }; + static int LUACALL wxLua_wxStringTokenizer_delete(lua_State *L); + static wxLuaBindCFunc s_wxluafunc_wxLua_wxStringTokenizer_delete[1] = {{ wxLua_wxStringTokenizer_delete, WXLUAMETHOD_METHOD|WXLUAMETHOD_DELETE, 1, 1, s_wxluatagArray_wxLua_wxStringTokenizer_delete }}; + static int LUACALL wxLua_wxStringTokenizer_delete(lua_State *L) + { + wxLuaState wxlState(L); + wxStringTokenizer * self = (wxStringTokenizer *)wxlState.GetUserDataType(1, s_wxluatag_wxStringTokenizer); + // if removed from tracked mem list, reset the tag so that gc() is not called on this object. + if ((self != NULL) && wxlState.RemoveTrackedObject(self)) + { + lua_pushnil(L); + lua_setmetatable(L, -2); + } + return 0; + } + + static int LUACALL wxLua_wxStringTokenizer_constructor(lua_State *L); + // static wxLuaBindCFunc s_wxluafunc_wxLua_wxStringTokenizer_constructor[1] = {{ wxLua_wxStringTokenizer_constructor, WXLUAMETHOD_CONSTRUCTOR, 0, 0, s_wxluaargArray_None }}; + // wxStringTokenizer() + static int LUACALL wxLua_wxStringTokenizer_constructor(lua_State *L) + { + wxluabind_removetableforcall(L); + wxLuaState wxlState(L); + wxStringTokenizer *returns; + // call constructor + returns = new wxStringTokenizer(); + // add to tracked memory list + wxlState.AddTrackedObject(returns); + // push the constructed class pointer + wxlState.PushUserDataType(s_wxluatag_wxStringTokenizer, returns); + + return 1; + } + + static wxLuaArgTag s_wxluatagArray_wxLua_wxStringTokenizer_constructor1[] = { &s_wxluaarg_String, &s_wxluaarg_String, &s_wxluaarg_Integer, NULL }; + static int LUACALL wxLua_wxStringTokenizer_constructor1(lua_State *L); + // static wxLuaBindCFunc s_wxluafunc_wxLua_wxStringTokenizer_constructor1[1] = {{ wxLua_wxStringTokenizer_constructor1, WXLUAMETHOD_CONSTRUCTOR, 1, 3, s_wxluatagArray_wxLua_wxStringTokenizer_constructor1 }}; + // wxStringTokenizer(const wxString& str, const wxString& delims = wxDEFAULT_DELIMITERS, wxStringTokenizerMode mode = wxTOKEN_DEFAULT); + static int LUACALL wxLua_wxStringTokenizer_constructor1(lua_State *L) + { + wxluabind_removetableforcall(L); + wxLuaState wxlState(L); + wxStringTokenizer *returns; + // get number of arguments + int argCount = lua_gettop(L); + // wxStringTokenizerMode mode = wxTOKEN_DEFAULT + wxStringTokenizerMode mode = (argCount >= 3 ? (wxStringTokenizerMode)wxlua_getintegertype(L, 3) : wxTOKEN_DEFAULT); + // const wxString delims = wxDEFAULT_DELIMITERS + const wxString delims = (argCount >= 2 ? wxlState.GetwxStringType(2) : wxString(wxDEFAULT_DELIMITERS)); + // const wxString str + const wxString str = wxlState.GetwxStringType(1); + // call constructor + returns = new wxStringTokenizer(str, delims, mode); + // add to tracked memory list + wxlState.AddTrackedObject(returns); + // push the constructed class pointer + wxlState.PushUserDataType(s_wxluatag_wxStringTokenizer, returns); + + return 1; + } + + + + static int LUACALL wxLua_wxStringTokenizer_constructor_overload(lua_State *L); + // function overload table + static wxLuaBindCFunc s_wxluafunc_wxLua_wxStringTokenizer_constructor_overload[] = + { + { wxLua_wxStringTokenizer_constructor_overload, WXLUAMETHOD_METHOD|WXLUAMETHOD_OVERLOAD, 0, 3, s_wxluaargArray_None }, + { wxLua_wxStringTokenizer_constructor, WXLUAMETHOD_CONSTRUCTOR, 0, 0, s_wxluaargArray_None }, + { wxLua_wxStringTokenizer_constructor1, WXLUAMETHOD_CONSTRUCTOR, 1, 3, s_wxluatagArray_wxLua_wxStringTokenizer_constructor1 }, + }; + static int s_wxluafunc_wxLua_wxStringTokenizer_constructor_overload_count = sizeof(s_wxluafunc_wxLua_wxStringTokenizer_constructor_overload)/sizeof(wxLuaBindCFunc); + // Overloaded function for wxStringTokenizer::wxStringTokenizer + static int LUACALL wxLua_wxStringTokenizer_constructor_overload(lua_State *L) + { + wxLuaState wxlState(L); + static wxLuaBindMethod overload_method = + { "wxStringTokenizer", WXLUAMETHOD_CONSTRUCTOR, s_wxluafunc_wxLua_wxStringTokenizer_constructor_overload, s_wxluafunc_wxLua_wxStringTokenizer_constructor_overload_count, 0 }; + return wxlState.CallOverloadedFunction(&overload_method); + } + + // Map Lua Class Methods to C Binding Functions + wxLuaBindMethod wxStringTokenizer_methods[] = { + { "AllowEmpty", WXLUAMETHOD_METHOD, s_wxluafunc_wxLua_wxStringTokenizer_AllowEmpty, 1, NULL }, + { "CountTokens", WXLUAMETHOD_METHOD, s_wxluafunc_wxLua_wxStringTokenizer_CountTokens, 1, NULL }, + { "GetMode", WXLUAMETHOD_METHOD, s_wxluafunc_wxLua_wxStringTokenizer_GetMode, 1, NULL }, + { "GetNextToken", WXLUAMETHOD_METHOD, s_wxluafunc_wxLua_wxStringTokenizer_GetNextToken, 1, NULL }, + { "GetPosition", WXLUAMETHOD_METHOD, s_wxluafunc_wxLua_wxStringTokenizer_GetPosition, 1, NULL }, + { "GetString", WXLUAMETHOD_METHOD, s_wxluafunc_wxLua_wxStringTokenizer_GetString, 1, NULL }, + { "HasMoreTokens", WXLUAMETHOD_METHOD, s_wxluafunc_wxLua_wxStringTokenizer_HasMoreTokens, 1, NULL }, + { "Reinit", WXLUAMETHOD_METHOD, s_wxluafunc_wxLua_wxStringTokenizer_Reinit, 1, NULL }, + { "SetString", WXLUAMETHOD_METHOD, s_wxluafunc_wxLua_wxStringTokenizer_SetString, 1, NULL }, + { "delete", WXLUAMETHOD_METHOD|WXLUAMETHOD_DELETE, s_wxluafunc_wxLua_wxStringTokenizer_delete, 1, NULL }, + + { "wxStringTokenizer", WXLUAMETHOD_CONSTRUCTOR, s_wxluafunc_wxLua_wxStringTokenizer_constructor_overload, s_wxluafunc_wxLua_wxStringTokenizer_constructor_overload_count, 0 }, + + { 0, 0, 0, 0 }, + }; + + int wxStringTokenizer_methodCount = sizeof(wxStringTokenizer_methods)/sizeof(wxLuaBindMethod) - 1; + + + // --------------------------------------------------------------------------- // Bind class wxClientData // --------------------------------------------------------------------------- Index: windows.cpp =================================================================== RCS file: /cvsroot/wxlua/wxLua/modules/wxbind/src/windows.cpp,v retrieving revision 1.64 retrieving revision 1.65 diff -C2 -d -r1.64 -r1.65 *** windows.cpp 18 Jun 2007 14:55:02 -0000 1.64 --- windows.cpp 18 Jun 2007 19:51:33 -0000 1.65 *************** *** 6710,6713 **** --- 6710,7524 ---- + #if wxCHECK_VERSION(2,8,0) && wxUSE_TREEBOOK && wxLUA_USE_wxTreebook + // --------------------------------------------------------------------------- + // Bind class wxTreebook + // --------------------------------------------------------------------------- + + // Lua MetaTable Tag for Class 'wxTreebook' + int s_wxluatag_wxTreebook = -1; + + static wxLuaArgTag s_wxluatagArray_wxLua_wxTreebook_AddPage[] = { &s_wxluatag_wxTreebook, &s_wxluatag_wxWindow, &s_wxluaarg_String, &s_wxluaarg_Boolean, &s_wxluaarg_Number, NULL }; + static int LUACALL wxLua_wxTreebook_AddPage(lua_State *L); + static wxLuaBindCFunc s_wxluafunc_wxLua_wxTreebook_AddPage[1] = {{ wxLua_wxTreebook_AddPage, WXLUAMETHOD_METHOD, 3, 5, s_wxluatagArray_wxLua_wxTreebook_AddPage }}; + // virtual bool AddPage(wxWindow *page, const wxString& text, bool bSelect = false, int imageId = wxNOT_FOUND); + static int LUACALL wxLua_wxTreebook_AddPage(lua_State *L) + { + wxLuaState wxlState(L); + bool returns; + // get number of arguments + int argCount = lua_gettop(L); + // int imageId = wxNOT_FOUND + int imageId = (argCount >= 5 ? (int)wxlua_getnumbertype(L, 5) : wxNOT_FOUND); + // bool bSelect = false + bool bSelect = (argCount >= 4 ? wxlua_getbooleantype(L, 4) : false); + // const wxString text + const wxString text = wxlState.GetwxStringType(3); + // wxWindow page + wxWindow * page = (wxWindow *)wxlState.GetUserDataType(2, s_wxluatag_wxWindow); + // get this + wxTreebook * self = (wxTreebook *)wxlState.GetUserDataType(1, s_wxluatag_wxTreebook); + // call AddPage + returns = (self->AddPage(page, text, bSelect, imageId)); + // push the result flag + lua_pushboolean(L, returns); + + return 1; + } + + static wxLuaArgTag s_wxluatagArray_wxLua_wxTreebook_AddSubPage[] = { &s_wxluatag_wxTreebook, &s_wxluatag_wxWindow, &s_wxluaarg_String, &s_wxluaarg_Boolean, &s_wxluaarg_Number, NULL }; + static int LUACALL wxLua_wxTreebook_AddSubPage(lua_State *L); + static wxLuaBindCFunc s_wxluafunc_wxLua_wxTreebook_AddSubPage[1] = {{ wxLua_wxTreebook_AddSubPage, WXLUAMETHOD_METHOD, 3, 5, s_wxluatagArray_wxLua_wxTreebook_AddSubPage }}; + // virtual bool AddSubPage(wxWindow *page, const wxString& text, bool bSelect = false, int imageId = wxNOT_FOUND); + static int LUACALL wxLua_wxTreebook_AddSubPage(lua_State *L) + { + wxLuaState wxlState(L); + bool returns; + // get number of arguments + int argCount = lua_gettop(L); + // int imageId = wxNOT_FOUND + int imageId = (argCount >= 5 ? (int)wxlua_getnumbertype(L, 5) : wxNOT_FOUND); + // bool bSelect = false + bool bSelect = (argCount >= 4 ? wxlua_getbooleantype(L, 4) : false); + // const wxString text + const wxString text = wxlState.GetwxStringType(3); + // wxWindow page + wxWindow * page = (wxWindow *)wxlState.GetUserDataType(2, s_wxluatag_wxWindow); + // get this + wxTreebook * self = (wxTreebook *)wxlState.GetUserDataType(1, s_wxluatag_wxTreebook); + // call AddSubPage + returns = (self->AddSubPage(page, text, bSelect, imageId)); + // push the result flag + lua_pushboolean(L, returns); + + return 1; + } + + static wxLuaArgTag s_wxluatagArray_wxLua_wxTreebook_CollapseNode[] = { &s_wxluatag_wxTreebook, &s_wxluaarg_Number, NULL }; + static int LUACALL wxLua_wxTreebook_CollapseNode(lua_State *L); + static wxLuaBindCFunc s_wxluafunc_wxLua_wxTreebook_CollapseNode[1] = {{ wxLua_wxTreebook_CollapseNode, WXLUAMETHOD_METHOD, 2, 2, s_wxluatagArray_wxLua_wxTreebook_CollapseNode }}; + // bool CollapseNode(size_t pos) + static int LUACALL wxLua_wxTreebook_CollapseNode(lua_State *L) + { + wxLuaState wxlState(L); + bool returns; + // size_t pos + size_t pos = (size_t)wxlua_getnumbertype(L, 2); + // get this + wxTreebook * self = (wxTreebook *)wxlState.GetUserDataType(1, s_wxluatag_wxTreebook); + // call CollapseNode + returns = (self->CollapseNode(pos)); + // push the result flag + lua_pushboolean(L, returns); + + return 1; + } + + + #if (wxLUA_USE_wxPointSizeRect) && (wxCHECK_VERSION(2,8,0) && wxUSE_TREEBOOK && wxLUA_USE_wxTreebook) + static wxLuaArgTag s_wxluatagArray_wxLua_wxTreebook_Create[] = { &s_wxluatag_wxTreebook, &s_wxluatag_wxWindow, &s_wxluaarg_Number, &s_wxluatag_wxPoint, &s_wxluatag_wxSize, &s_wxluaarg_Number, &s_wxluaarg_String, NULL }; + static int LUACALL wxLua_wxTreebook_Create(lua_State *L); + static wxLuaBindCFunc s_wxluafunc_wxLua_wxTreebook_Create[1] = {{ wxLua_wxTreebook_Create, WXLUAMETHOD_METHOD, 3, 7, s_wxluatagArray_wxLua_wxTreebook_Create }}; + // bool Create(wxWindow *parent, wxWindowID id, const wxPoint& pos = wxDefaultPosition, const wxSize& size = wxDefaultSize, long style = wxBK_DEFAULT,const wxString& name = "wxTreebook") + static int LUACALL wxLua_wxTreebook_Create(lua_State *L) + { + wxLuaState wxlState(L); + bool returns; + // get number of arguments + int argCount = lua_gettop(L); + // const wxString name = "wxTreebook" + const wxString name = (argCount >= 7 ? wxlState.GetwxStringType(7) : wxString(wxT("wxTreebook"))); + // long style = wxBK_DEFAULT + long style = (argCount >= 6 ? (long)wxlua_getnumbertype(L, 6) : wxBK_DEFAULT); + // const wxSize size = wxDefaultSize + const wxSize * size = (argCount >= 5 ? (const wxSize *)wxlState.GetUserDataType(5, s_wxluatag_wxSize) : &wxDefaultSize); + // const wxPoint pos = wxDefaultPosition + const wxPoint * pos = (argCount >= 4 ? (const wxPoint *)wxlState.GetUserDataType(4, s_wxluatag_wxPoint) : &wxDefaultPosition); + // wxWindowID id + wxWindowID id = (wxWindowID)wxlua_getnumbertype(L, 3); + // wxWindow parent + wxWindow * parent = (wxWindow *)wxlState.GetUserDataType(2, s_wxluatag_wxWindow); + // get this + wxTreebook * self = (wxTreebook *)wxlState.GetUserDataType(1, s_wxluatag_wxTreebook); + // call Create + returns = (self->Create(parent, id, *pos, *size, style, name)); + // push the result flag + lua_pushboolean(L, returns); + + return 1; + } + + #endif // (wxLUA_USE_wxPointSizeRect) && (wxCHECK_VERSION(2,8,0) && wxUSE_TREEBOOK && wxLUA_USE_wxTreebook) + + static wxLuaArgTag s_wxluatagArray_wxLua_wxTreebook_DeletePage[] = { &s_wxluatag_wxTreebook, &s_wxluaarg_Number, NULL }; + static int LUACALL wxLua_wxTreebook_DeletePage(lua_State *L); + static wxLuaBindCFunc s_wxluafunc_wxLua_wxTreebook_DeletePage[1] = {{ wxLua_wxTreebook_DeletePage, WXLUAMETHOD_METHOD, 2, 2, s_wxluatagArray_wxLua_wxTreebook_DeletePage }}; + // virtual bool DeletePage(size_t pos); + static int LUACALL wxLua_wxTreebook_DeletePage(lua_State *L) + { + wxLuaState wxlState(L); + bool returns; + // size_t pos + size_t pos = (size_t)wxlua_getnumbertype(L, 2); + // get this + wxTreebook * self = (wxTreebook *)wxlState.GetUserDataType(1, s_wxluatag_wxTreebook); + // call DeletePage + returns = (self->DeletePage(pos)); + // push the result flag + lua_pushboolean(L, returns); + + return 1; + } + + static wxLuaArgTag s_wxluatagArray_wxLua_wxTreebook_ExpandNode[] = { &s_wxluatag_wxTreebook, &s_wxluaarg_Number, &s_wxluaarg_Boolean, NULL }; + static int LUACALL wxLua_wxTreebook_ExpandNode(lua_State *L); + static wxLuaBindCFunc s_wxluafunc_wxLua_wxTreebook_ExpandNode[1] = {{ wxLua_wxTreebook_ExpandNode, WXLUAMETHOD_METHOD, 2, 3, s_wxluatagArray_wxLua_wxTreebook_ExpandNode }}; + // virtual bool ExpandNode(size_t pos, bool expand = true); + static int LUACALL wxLua_wxTreebook_ExpandNode(lua_State *L) + { + wxLuaState wxlState(L); + bool returns; + // get number of arguments + int argCount = lua_gettop(L); + // bool expand = true + bool expand = (argCount >= 3 ? wxlua_getbooleantype(L, 3) : true); + // size_t pos + size_t pos = (size_t)wxlua_getnumbertype(L, 2); + // get this + wxTreebook * self = (wxTreebook *)wxlState.GetUserDataType(1, s_wxluatag_wxTreebook); + // call ExpandNode + returns = (self->ExpandNode(pos, expand)); + // push the result flag + lua_pushboolean(L, returns); + + return 1; + } + + static wxLuaArgTag s_wxluatagArray_wxLua_wxTreebook_GetPageParent[] = { &s_wxluatag_wxTreebook, &s_wxluaarg_Number, NULL }; + static int LUACALL wxLua_wxTreebook_GetPageParent(lua_State *L); + static wxLuaBindCFunc s_wxluafunc_wxLua_wxTreebook_GetPageParent[1] = {{ wxLua_wxTreebook_GetPageParent, WXLUAMETHOD_METHOD, 2, 2, s_wxluatagArray_wxLua_wxTreebook_GetPageParent }}; + // int GetPageParent(size_t pos) const; + static int LUACALL wxLua_wxTreebook_GetPageParent(lua_State *L) + { + wxLuaState wxlState(L); + int returns; + // size_t pos + size_t pos = (size_t)wxlua_getnumbertype(L, 2); + // get this + wxTreebook * self = (wxTreebook *)wxlState.GetUserDataType(1, s_wxluatag_wxTreebook); + // call GetPageParent + returns = (self->GetPageParent(pos)); + // push the result number + lua_pushnumber(L, returns); + + return 1; + } + + + #if (wxLUA_USE_wxTreeCtrl && wxUSE_TREECTRL) && (wxCHECK_VERSION(2,8,0) && wxUSE_TREEBOOK && wxLUA_USE_wxTreebook) + static wxLuaArgTag s_wxluatagArray_wxLua_wxTreebook_GetTreeCtrl[] = { &s_wxluatag_wxTreebook, NULL }; + static int LUACALL wxLua_wxTreebook_GetTreeCtrl(lua_State *L); + static wxLuaBindCFunc s_wxluafunc_wxLua_wxTreebook_GetTreeCtrl[1] = {{ wxLua_wxTreebook_GetTreeCtrl, WXLUAMETHOD_METHOD, 1, 1, s_wxluatagArray_wxLua_wxTreebook_GetTreeCtrl }}; + // wxTreeCtrl* GetTreeCtrl() const + static int LUACALL wxLua_wxTreebook_GetTreeCtrl(lua_State *L) + { + wxLuaState wxlState(L); + wxTreeCtrl *returns; + // get this + wxTreebook * self = (wxTreebook *)wxlState.GetUserDataType(1, s_wxluatag_wxTreebook); + // call GetTreeCtrl + returns = (wxTreeCtrl *)self->GetTreeCtrl(); + // push the result datatype + wxlState.PushUserDataType(s_wxluatag_wxTreeCtrl, returns); + + return 1; + } + + #endif // (wxLUA_USE_wxTreeCtrl && wxUSE_TREECTRL) && (wxCHECK_VERSION(2,8,0) && wxUSE_TREEBOOK && wxLUA_USE_wxTreebook) + + static wxLuaArgTag s_wxluatagArray_wxLua_wxTreebook_InsertPage[] = { &s_wxluatag_wxTreebook, &s_wxluaarg_Number, &s_wxluatag_wxWindow, &s_wxluaarg_String, &s_wxluaarg_Boolean, &s_wxluaarg_Number, NULL }; + static int LUACALL wxLua_wxTreebook_InsertPage(lua_State *L); + static wxLuaBindCFunc s_wxluafunc_wxLua_wxTreebook_InsertPage[1] = {{ wxLua_wxTreebook_InsertPage, WXLUAMETHOD_METHOD, 4, 6, s_wxluatagArray_wxLua_wxTreebook_InsertPage }}; + // virtual bool InsertPage(size_t pos, wxWindow *page, const wxString& text, bool bSelect = false, int imageId = wxNOT_FOUND); + static int LUACALL wxLua_wxTreebook_InsertPage(lua_State *L) + { + wxLuaState wxlState(L); + bool returns; + // get number of arguments + int argCount = lua_gettop(L); + // int imageId = wxNOT_FOUND + int imageId = (argCount >= 6 ? (int)wxlua_getnumbertype(L, 6) : wxNOT_FOUND); + // bool bSelect = false + bool bSelect = (argCount >= 5 ? wxlua_getbooleantype(L, 5) : false); + // const wxString text + const wxString text = wxlState.GetwxStringType(4); + // wxWindow page + wxWindow * page = (wxWindow *)wxlState.GetUserDataType(3, s_wxluatag_wxWindow); + // size_t pos + size_t pos = (size_t)wxlua_getnumbertype(L, 2); + // get this + wxTreebook * self = (wxTreebook *)wxlState.GetUserDataType(1, s_wxluatag_wxTreebook); + // call InsertPage + returns = (self->InsertPage(pos, page, text, bSelect, imageId)); + // push the result flag + lua_pushboolean(L, returns); + + return 1; + } + + static wxLuaArgTag s_wxluatagArray_wxLua_wxTreebook_InsertSubPage[] = { &s_wxluatag_wxTreebook, &s_wxluaarg_Number, &s_wxluatag_wxWindow, &s_wxluaarg_String, &s_wxluaarg_Boolean, &s_wxluaarg_Number, NULL }; + static int LUACALL wxLua_wxTreebook_InsertSubPage(lua_State *L); + static wxLuaBindCFunc s_wxluafunc_wxLua_wxTreebook_InsertSubPage[1] = {{ wxLua_wxTreebook_InsertSubPage, WXLUAMETHOD_METHOD, 4, 6, s_wxluatagArray_wxLua_wxTreebook_InsertSubPage }}; + // virtual bool InsertSubPage(size_t pos, wxWindow *page, const wxString& text, bool bSelect = false, int imageId = wxNOT_FOUND); + static int LUACALL wxLua_wxTreebook_InsertSubPage(lua_State *L) + { + wxLuaState wxlState(L); + bool returns; + // get number of arguments + int argCount = lua_gettop(L); + // int imageId = wxNOT_FOUND + int imageId = (argCount >= 6 ? (int)wxlua_getnumbertype(L, 6) : wxNOT_FOUND); + // bool bSelect = false + bool bSelect = (argCount >= 5 ? wxlua_getbooleantype(L, 5) : false); + // const wxString text + const wxString text = wxlState.GetwxStringType(4); + // wxWindow page + wxWindow * page = (wxWindow *)wxlState.GetUserDataType(3, s_wxluatag_wxWindow); + // size_t pos + size_t pos = (size_t)wxlua_getnumbertype(L, 2); + // get this + wxTreebook * self = (wxTreebook *)wxlState.GetUserDataType(1, s_wxluatag_wxTreebook); + // call InsertSubPage + returns = (self->InsertSubPage(pos, page, text, bSelect, imageId)); + // push the result flag + lua_pushboolean(L, returns); + + return 1; + } + + static wxLuaArgTag s_wxluatagArray_wxLua_wxTreebook_IsNodeExpanded[] = { &s_wxluatag_wxTreebook, &s_wxluaarg_Number, NULL }; + static int LUACALL wxLua_wxTreebook_IsNodeExpanded(lua_State *L); + static wxLuaBindCFunc s_wxluafunc_wxLua_wxTreebook_IsNodeExpanded[1] = {{ wxLua_wxTreebook_IsNodeExpanded, WXLUAMETHOD_METHOD, 2, 2, s_wxluatagArray_wxLua_wxTreebook_IsNodeExpanded }}; + // virtual bool IsNodeExpanded(size_t pos) const; + static int LUACALL wxLua_wxTreebook_IsNodeExpanded(lua_State *L) + { + wxLuaState wxlState(L); + bool returns; + // size_t pos + size_t pos = (size_t)wxlua_getnumbertype(L, 2); + // get this + wxTreebook * self = (wxTreebook *)wxlState.GetUserDataType(1, s_wxluatag_wxTreebook); + // call IsNodeExpanded + returns = (self->IsNodeExpanded(pos)); + // push the result flag + lua_pushboolean(L, returns); + + return 1; + } + + + #if (wxLUA_USE_wxPointSizeRect) && (wxCHECK_VERSION(2,8,0) && wxUSE_TREEBOOK && wxLUA_USE_wxTreebook) + static wxLuaArgTag s_wxluatagArray_wxLua_wxTreebook_constructor1[] = { &s_wxluatag_wxWindow, &s_wxluaarg_Number, &s_wxluatag_wxPoint, &s_wxluatag_wxSize, &s_wxluaarg_Number, &s_wxluaarg_String, NULL }; + static int LUACALL wxLua_wxTreebook_constructor1(lua_State *L); + // static wxLuaBindCFunc s_wxluafunc_wxLua_wxTreebook_constructor1[1] = {{ wxLua_wxTreebook_constructor1, WXLUAMETHOD_CONSTRUCTOR, 2, 6, s_wxluatagArray_wxLua_wxTreebook_constructor1 }}; + // wxTreebook(wxWindow *parent, wxWindowID id, const wxPoint& pos = wxDefaultPosition, const wxSize& size = wxDefaultSize, long style = wxBK_DEFAULT, const wxString& name = "wxTreebook") + static int LUACALL wxLua_wxTreebook_constructor1(lua_State *L) + { + wxluabind_removetableforcall(L); + wxLuaState wxlState(L); + wxTreebook *returns; + // get number of arguments + int argCount = lua_gettop(L); + // const wxString name = "wxTreebook" + const wxString name = (argCount >= 6 ? wxlState.GetwxStringType(6) : wxString(wxT("wxTreebook"))); + // long style = wxBK_DEFAULT + long style = (argCount >= 5 ? (long)wxlua_getnumbertype(L, 5) : wxBK_DEFAULT); + // const wxSize size = wxDefaultSize + const wxSize * size = (argCount >= 4 ? (const wxSize *)wxlState.GetUserDataType(4, s_wxluatag_wxSize) : &wxDefaultSize); + // const wxPoint pos = wxDefaultPosition + const wxPoint * pos = (argCount >= 3 ? (const wxPoint *)wxlState.GetUserDataType(3, s_wxluatag_wxPoint) : &wxDefaultPosition); + // wxWindowID id + wxWindowID id = (wxWindowID)wxlua_getnumbertype(L, 2); + // wxWindow parent + wxWindow * parent = (wxWindow *)wxlState.GetUserDataType(1, s_wxluatag_wxWindow); + // call constructor + returns = new wxTreebook(parent, id, *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_wxTreebook, returns); + + return 1; + } + + #endif // (wxLUA_USE_wxPointSizeRect) && (wxCHECK_VERSION(2,8,0) && wxUSE_TREEBOOK && wxLUA_USE_wxTreebook) + + static int LUACALL wxLua_wxTreebook_constructor(lua_State *L); + // static wxLuaBindCFunc s_wxluafunc_wxLua_wxTreebook_constructor[1] = {{ wxLua_wxTreebook_constructor, WXLUAMETHOD_CONSTRUCTOR, 0, 0, s_wxluaargArray_None }}; + // wxTreebook() + static int LUACALL wxLua_wxTreebook_constructor(lua_State *L) + { + wxluabind_removetableforcall(L); + wxLuaState wxlState(L); + wxTreebook *returns; + // call constructor + returns = new wxTreebook(); + // add to tracked window list, it will check validity + wxlState.AddTrackedWindow(returns); + // push the constructed class pointer + wxlState.PushUserDataType(s_wxluatag_wxTreebook, returns); + + return 1; + } + + + + + #if ((wxLUA_USE_wxPointSizeRect) && (wxCHECK_VERSION(2,8,0) && wxUSE_TREEBOOK && wxLUA_USE_wxTreebook))||(wxCHECK_VERSION(2,8,0) && wxUSE_TREEBOOK && wxLUA_USE_wxTreebook) + static int LUACALL wxLua_wxTreebook_constructor_overload(lua_State *L); + // function overload table + static wxLuaBindCFunc s_wxluafunc_wxLua_wxTreebook_constructor_overload[] = + { + { wxLua_wxTreebook_constructor_overload, WXLUAMETHOD_METHOD|WXLUAMETHOD_OVERLOAD, 0, 6, s_wxluaargArray_None }, + + #if (wxLUA_USE_wxPointSizeRect) && (wxCHECK_VERSION(2,8,0) && wxUSE_TREEBOOK && wxLUA_USE_wxTreebook) + { wxLua_wxTreebook_constructor1, WXLUAMETHOD_CONSTRUCTOR, 2, 6, s_wxluatagArray_wxLua_wxTreebook_constructor1 }, + #endif // (wxLUA_USE_wxPointSizeRect) && (wxCHECK_VERSION(2,8,0) && wxUSE_TREEBOOK && wxLUA_USE_wxTreebook) + { wxLua_wxTreebook_constructor, WXLUAMETHOD_CONSTRUCTOR, 0, 0, s_wxluaargArray_None }, + }; + static int s_wxluafunc_wxLua_wxTreebook_constructor_overload_count = sizeof(s_wxluafunc_wxLua_wxTreebook_constructor_overload)/sizeof(wxLuaBindCFunc); + // Overloaded function for wxTreebook::wxTreebook + static int LUACALL wxLua_wxTreebook_constructor_overload(lua_State *L) + { + wxLuaState wxlState(L); + static wxLuaBindMethod overload_method = + { "wxTreebook", WXLUAMETHOD_CONSTRUCTOR, s_wxlu... [truncated message content] |
|
From: John L. <jr...@us...> - 2007-06-18 19:51:41
|
Update of /cvsroot/wxlua/wxLua/modules/wxlua/src In directory sc8-pr-cvs9.sourceforge.net:/tmp/cvs-serv21463/wxLua/modules/wxlua/src Modified Files: wxlbind.cpp Log Message: Add more classes from 2.8, wxStandardPaths, wxToolbook, wxTreebook... Index: wxlbind.cpp =================================================================== RCS file: /cvsroot/wxlua/wxLua/modules/wxlua/src/wxlbind.cpp,v retrieving revision 1.77 retrieving revision 1.78 diff -C2 -d -r1.77 -r1.78 *** wxlbind.cpp 16 Jun 2007 06:21:46 -0000 1.77 --- wxlbind.cpp 18 Jun 2007 19:51:38 -0000 1.78 *************** *** 259,268 **** wxCHECK_MSG(wxlState.Ok(), 0, wxT("Invalid wxLuaState")); ! key = (long)wxlua_ttouserdata(L, 1, true); wxCHECK_MSG(key != 0, 0, wxT("NULL user data in wxluabind_garbageCollect")); ! wxlState.RemoveTrackedObject((void*)key, true); ! wxlua_removederivedmethod(L, (void*)key); } --- 259,268 ---- wxCHECK_MSG(wxlState.Ok(), 0, wxT("Invalid wxLuaState")); ! void* key = wxlua_ttouserdata(L, 1, true); wxCHECK_MSG(key != 0, 0, wxT("NULL user data in wxluabind_garbageCollect")); ! wxlState.RemoveTrackedObject(key, true); ! wxlua_removederivedmethod(L, key); } |
|
From: John L. <jr...@us...> - 2007-06-18 18:37:51
|
Update of /cvsroot/wxlua/wxLua/samples In directory sc8-pr-cvs9.sourceforge.net:/tmp/cvs-serv24653/wxLua/samples Modified Files: unittest.wx.lua Log Message: Fix stack tree for MSW treectrl oddity of not being able to expand or collapse an item w/o children. Index: unittest.wx.lua =================================================================== RCS file: /cvsroot/wxlua/wxLua/samples/unittest.wx.lua,v retrieving revision 1.13 retrieving revision 1.14 diff -C2 -d -r1.13 -r1.14 *** unittest.wx.lua 16 Jun 2007 06:21:47 -0000 1.13 --- unittest.wx.lua 18 Jun 2007 18:37:47 -0000 1.14 *************** *** 216,222 **** a = wx.wxRect(1,2,3,4); function a.GetX(self) return "x" end ! PrintOk(a:GetX() == "x", "Replace wxRect:GetX with a lua function") PrintOk(a:_GetX() == 1, "Replace wxRect:GetX with a lua function, call wxRect:_GetX for original function") ! PrintOk(a:GetX() == "x", "Replace wxRect:GetX with a lua function (test recursion)") PrintOk(a:_GetX() == 1, "Replace wxRect:GetX with a lua function, call wxRect:_GetX for original function (test recursion)") --- 216,222 ---- a = wx.wxRect(1,2,3,4); function a.GetX(self) return "x" end ! PrintOk(a:GetX() == "x", "Replace wxRect:GetX with a lua function") PrintOk(a:_GetX() == 1, "Replace wxRect:GetX with a lua function, call wxRect:_GetX for original function") ! PrintOk(a:GetX() == "x", "Replace wxRect:GetX with a lua function (test recursion)") PrintOk(a:_GetX() == 1, "Replace wxRect:GetX with a lua function, call wxRect:_GetX for original function (test recursion)") *************** *** 270,274 **** PrintOk(bit.lshift(0x1, 1) == 2, "Test bit library bit.lshift.") PrintOk(bit.rshift(0x2, 1) == 1, "Test bit library bit.rshift.") ! PrintOk(bit.arshift(-2, 1) == -1, "Test bit library bit.arshift.") -- note this preserves sign PrintOk(bit.mod(7, 2) == 1, "Test bit library bit.mod.") --- 270,274 ---- PrintOk(bit.lshift(0x1, 1) == 2, "Test bit library bit.lshift.") PrintOk(bit.rshift(0x2, 1) == 1, "Test bit library bit.rshift.") ! PrintOk(bit.arshift(-2, 1) == -1, "Test bit library bit.arshift. Note, this preserves sign") PrintOk(bit.mod(7, 2) == 1, "Test bit library bit.mod.") |
|
From: John L. <jr...@us...> - 2007-06-18 18:37:50
|
Update of /cvsroot/wxlua/wxLua/modules/wxluadebug/src In directory sc8-pr-cvs9.sourceforge.net:/tmp/cvs-serv24653/wxLua/modules/wxluadebug/src Modified Files: wxlstack.cpp Log Message: Fix stack tree for MSW treectrl oddity of not being able to expand or collapse an item w/o children. Index: wxlstack.cpp =================================================================== RCS file: /cvsroot/wxlua/wxLua/modules/wxluadebug/src/wxlstack.cpp,v retrieving revision 1.7 retrieving revision 1.8 diff -C2 -d -r1.7 -r1.8 *** wxlstack.cpp 16 Jun 2007 06:39:45 -0000 1.7 --- wxlstack.cpp 18 Jun 2007 18:37:47 -0000 1.8 *************** *** 32,35 **** --- 32,44 ---- #endif + // Define our own flag to help track down where we've hacked thing to work + // equally well with the treectrl for MSW + #if defined(__WXMSW__) + #define WXLUA_STACK_MSWTREE + #endif //defined(__WXMSW__) + + #define DUMMY_TREEITEM wxT(" ") + + // ---------------------------------------------------------------------------- // wxLuaStackDialog *************** *** 188,192 **** m_treeCtrl = new wxTreeCtrl(m_splitterWin, ID_WXLUA_STACK_TREECTRL, wxDefaultPosition, wxDefaultSize, ! wxTR_HAS_BUTTONS|wxTR_SINGLE); m_treeCtrl->SetImageList(m_imageList); --- 197,201 ---- m_treeCtrl = new wxTreeCtrl(m_splitterWin, ID_WXLUA_STACK_TREECTRL, wxDefaultPosition, wxDefaultSize, ! wxTR_HAS_BUTTONS|wxTR_SINGLE|wxTR_HIDE_ROOT|wxTR_LINES_AT_ROOT); m_treeCtrl->SetImageList(m_imageList); *************** *** 367,370 **** --- 376,380 ---- m_treeCtrl->DeleteAllItems(); m_treeCtrl->AddRoot(wxT("wxLua Data"), -1, -1, NULL); + m_treeCtrl->SetItemHasChildren(m_treeCtrl->GetRootItem()); // Add the locals, fake a debug item to get it setup right *************** *** 438,441 **** --- 448,453 ---- } + m_treeCtrl->SetItemHasChildren(treeId); + size_t n, count = debugData.GetCount(); long lc_item = lc_item_; *************** *** 457,460 **** --- 469,483 ---- m_treeCtrl->SetItemHasChildren(id); stkListData->m_treeId = id; + + // add dummy item for MSW to expand properly, also it shows that + // there's nothing in this level if they try to expand it and there + // aren't any real items (see below) + m_treeCtrl->AppendItem(id, DUMMY_TREEITEM); + + // now that we've added something, remove the first dummy " " item from parent + wxTreeItemIdValue dummyCookie; + wxTreeItemId dummyId = m_treeCtrl->GetFirstChild(treeId, dummyCookie); + if (m_treeCtrl->GetItemText(dummyId) == DUMMY_TREEITEM) + m_treeCtrl->Delete(dummyId); } *************** *** 473,478 **** } ! if (treeId) m_treeCtrl->Expand(treeId); } } --- 496,508 ---- } ! // NOTE : The MSW treectrl will expand and immediately collapse a node if you call Expand() ! // from within a handler, don't do anything and it works... ! #if !defined(WXLUA_STACK_MSWTREE) ! // Cannot expand hidden root, nor can you check it ! if (treeId && ! ((treeId != m_treeCtrl->GetRootItem()) || ((m_treeCtrl->GetWindowStyle() & wxTR_HIDE_ROOT) == 0)) && ! !m_treeCtrl->IsExpanded(treeId)) m_treeCtrl->Expand(treeId); + #endif //!defined(WXLUA_STACK_MSWTREE) } } *************** *** 717,721 **** long list_item = FindListItem(stkTreeData->m_stkListData); ! if (list_item < 0) return; // oops? if (event.GetEventType() == wxEVT_COMMAND_TREE_ITEM_EXPANDED) --- 747,751 ---- long list_item = FindListItem(stkTreeData->m_stkListData); ! if (list_item < 0) return; // not an item that we can do anything with if (event.GetEventType() == wxEVT_COMMAND_TREE_ITEM_EXPANDED) *************** *** 753,759 **** --- 783,800 ---- { if (!debugItem->GetFlagBit(WXLUA_DEBUGITEM_EXPANDED)) + { ExpandItem(event.GetIndex()); + // Hack for WXLUA_STACK_MSWTREE, need children to expand + if (stkListData->m_treeId && !m_treeCtrl->IsExpanded(stkListData->m_treeId)) + m_treeCtrl->Expand(stkListData->m_treeId); + } else + { + // Hack for WXLUA_STACK_MSWTREE, need children to collapse + if (stkListData->m_treeId && m_treeCtrl->IsExpanded(stkListData->m_treeId)) + m_treeCtrl->Collapse(stkListData->m_treeId); + CollapseItem(event.GetIndex()); + } } } *************** *** 907,911 **** } ! m_treeCtrl->CollapseAndReset(stkListData->m_treeId); debugItem->SetFlagBit(WXLUA_DEBUGITEM_EXPANDED, false); m_listCtrl->SetItemImage(lc_item, IMG_TABLE); --- 948,957 ---- } ! // don't call collapse here, let MSW do it if this is called from OnTreeItem ! // else we've already collapsed it in OnListActivated ! m_treeCtrl->DeleteChildren(stkListData->m_treeId); ! // Add back our dummy item for MSW to allow it to be reexpanded ! m_treeCtrl->AppendItem(stkListData->m_treeId, DUMMY_TREEITEM); ! debugItem->SetFlagBit(WXLUA_DEBUGITEM_EXPANDED, false); m_listCtrl->SetItemImage(lc_item, IMG_TABLE); |
Update of /cvsroot/wxlua/wxLua/modules/wxbind/src In directory sc8-pr-cvs9.sourceforge.net:/tmp/cvs-serv1750/wxLua/modules/wxbind/src Modified Files: appframe.cpp clipdrag.cpp controls.cpp data.cpp datetime.cpp defsutil.cpp dialogs.cpp event.cpp gdi.cpp grid.cpp help.cpp html.cpp image.cpp menutool.cpp picker.cpp print.cpp sizer.cpp socket.cpp wave.cpp windows.cpp wx_bind.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: print.cpp =================================================================== RCS file: /cvsroot/wxlua/wxLua/modules/wxbind/src/print.cpp,v retrieving revision 1.46 retrieving revision 1.47 diff -C2 -d -r1.46 -r1.47 *** print.cpp 18 Jun 2007 02:56:32 -0000 1.46 --- print.cpp 18 Jun 2007 14:55:02 -0000 1.47 *************** *** 35,39 **** int s_wxluatag_wxPrintout = -1; ! #if (wxLUA_USE_wxDC) && (wxLUA_USE_wxPrint && wxUSE_PRINTING_ARCHITECTURE) static wxLuaArgTag s_wxluatagArray_wxLua_wxPrintout_GetDC[] = { &s_wxluatag_wxPrintout, NULL }; static int LUACALL wxLua_wxPrintout_GetDC(lua_State *L); --- 35,39 ---- int s_wxluatag_wxPrintout = -1; ! #if (wxCHECK_VERSION(2,8,0)) && (wxLUA_USE_wxPrint && wxUSE_PRINTING_ARCHITECTURE) static wxLuaArgTag s_wxluatagArray_wxLua_wxPrintout_GetDC[] = { &s_wxluatag_wxPrintout, NULL }; [...1890 lines suppressed...] { 0, 0, 0, 0 }, --- 4008,4014 ---- { "delete", WXLUAMETHOD_METHOD|WXLUAMETHOD_DELETE, s_wxluafunc_wxLua_wxPrinterDC_delete, 1, NULL }, ! #if ((wxUSE_POSTSCRIPT) && (defined(__WXMSW__) || defined(__WXMAC__))) && (wxCHECK_VERSION(2,6,0)) { "wxPrinterDC", WXLUAMETHOD_CONSTRUCTOR, s_wxluafunc_wxLua_wxPrinterDC_constructor, 1, NULL }, ! #endif // ((wxUSE_POSTSCRIPT) && (defined(__WXMSW__) || defined(__WXMAC__))) && (wxCHECK_VERSION(2,6,0)) { 0, 0, 0, 0 }, *************** *** 3954,3957 **** int wxPrinterDC_methodCount = sizeof(wxPrinterDC_methods)/sizeof(wxLuaBindMethod) - 1; ! #endif // (defined(__WXMSW__) || defined(__WXMAC__)) && (wxLUA_USE_wxPrint && wxUSE_PRINTING_ARCHITECTURE) --- 4017,4020 ---- int wxPrinterDC_methodCount = sizeof(wxPrinterDC_methods)/sizeof(wxLuaBindMethod) - 1; ! #endif // (wxUSE_POSTSCRIPT) && (defined(__WXMSW__) || defined(__WXMAC__)) Index: controls.cpp =================================================================== RCS file: /cvsroot/wxlua/wxLua/modules/wxbind/src/controls.cpp,v retrieving revision 1.68 retrieving revision 1.69 diff -C2 -d -r1.68 -r1.69 *** controls.cpp 18 Jun 2007 02:56:27 -0000 1.68 --- controls.cpp 18 Jun 2007 14:54:59 -0000 1.69 *************** *** 219,223 **** ! #if (wxLUA_USE_wxBitmapButton && wxUSE_BMPBUTTON) && (wxLUA_USE_wxButton && wxUSE_BUTTON) // --------------------------------------------------------------------------- // Bind class wxBitmapButton --- 219,223 ---- ! #if (wxLUA_USE_wxButton && wxUSE_BUTTON) && (wxLUA_USE_wxBitmapButton && wxUSE_BMPBUTTON) // --------------------------------------------------------------------------- [...1513 lines suppressed...] { "SetTextColour", WXLUAMETHOD_METHOD, s_wxluafunc_wxLua_wxTreeItemAttr_SetTextColour, 1, NULL }, ! #endif // (wxLUA_USE_wxTreeCtrl && wxUSE_TREECTRL) && (wxLUA_USE_wxColourPenBrush) ! #if ((wxLUA_USE_wxColourPenBrush) && (wxLUA_USE_wxFont)) && (wxLUA_USE_wxTreeCtrl && wxUSE_TREECTRL) { "wxTreeItemAttr", WXLUAMETHOD_CONSTRUCTOR, s_wxluafunc_wxLua_wxTreeItemAttr_constructor, 1, NULL }, ! #endif // ((wxLUA_USE_wxColourPenBrush) && (wxLUA_USE_wxFont)) && (wxLUA_USE_wxTreeCtrl && wxUSE_TREECTRL) { 0, 0, 0, 0 }, --- 12738,12748 ---- #endif // (wxLUA_USE_wxTreeCtrl && wxUSE_TREECTRL) && (wxLUA_USE_wxFont) ! #if (wxLUA_USE_wxTreeCtrl && wxUSE_TREECTRL) && (wxCHECK_VERSION(2,8,0)) { "SetTextColour", WXLUAMETHOD_METHOD, s_wxluafunc_wxLua_wxTreeItemAttr_SetTextColour, 1, NULL }, ! #endif // (wxLUA_USE_wxTreeCtrl && wxUSE_TREECTRL) && (wxCHECK_VERSION(2,8,0)) ! #if ((wxLUA_USE_wxTreeCtrl && wxUSE_TREECTRL) && (wxLUA_USE_wxFont)) && (wxCHECK_VERSION(2,8,0)) { "wxTreeItemAttr", WXLUAMETHOD_CONSTRUCTOR, s_wxluafunc_wxLua_wxTreeItemAttr_constructor, 1, NULL }, ! #endif // ((wxLUA_USE_wxTreeCtrl && wxUSE_TREECTRL) && (wxLUA_USE_wxFont)) && (wxCHECK_VERSION(2,8,0)) { 0, 0, 0, 0 }, Index: clipdrag.cpp =================================================================== RCS file: /cvsroot/wxlua/wxLua/modules/wxbind/src/clipdrag.cpp,v retrieving revision 1.48 retrieving revision 1.49 diff -C2 -d -r1.48 -r1.49 *** clipdrag.cpp 18 Jun 2007 02:56:27 -0000 1.48 --- clipdrag.cpp 18 Jun 2007 14:54:59 -0000 1.49 *************** *** 294,298 **** ! #if (wxCHECK_VERSION(2,8,0)) && (wxLUA_USE_wxClipboard && wxUSE_CLIPBOARD) // --------------------------------------------------------------------------- // Bind class wxClipboardTextEvent --- 294,298 ---- ! #if (wxLUA_USE_wxClipboard && wxUSE_CLIPBOARD) && (wxCHECK_VERSION(2,8,0)) // --------------------------------------------------------------------------- // Bind class wxClipboardTextEvent *************** *** 356,360 **** int wxClipboardTextEvent_methodCount = sizeof(wxClipboardTextEvent_methods)/sizeof(wxLuaBindMethod) - 1; ! #endif // (wxCHECK_VERSION(2,8,0)) && (wxLUA_USE_wxClipboard && wxUSE_CLIPBOARD) --- 356,360 ---- int wxClipboardTextEvent_methodCount = sizeof(wxClipboardTextEvent_methods)/sizeof(wxLuaBindMethod) - 1; ! #endif // (wxLUA_USE_wxClipboard && wxUSE_CLIPBOARD) && (wxCHECK_VERSION(2,8,0)) *************** *** 1353,1357 **** ! #if (wxCHECK_VERSION(2,8,0)) && (wxLUA_USE_wxDataObject && wxUSE_DATAOBJ) // --------------------------------------------------------------------------- // Bind class wxURLDataObject --- 1353,1357 ---- ! #if (wxLUA_USE_wxDataObject && wxUSE_DATAOBJ) && (wxCHECK_VERSION(2,8,0)) // --------------------------------------------------------------------------- // Bind class wxURLDataObject *************** *** 1431,1435 **** int wxURLDataObject_methodCount = sizeof(wxURLDataObject_methods)/sizeof(wxLuaBindMethod) - 1; ! #endif // (wxCHECK_VERSION(2,8,0)) && (wxLUA_USE_wxDataObject && wxUSE_DATAOBJ) --- 1431,1435 ---- int wxURLDataObject_methodCount = sizeof(wxURLDataObject_methods)/sizeof(wxLuaBindMethod) - 1; ! #endif // (wxLUA_USE_wxDataObject && wxUSE_DATAOBJ) && (wxCHECK_VERSION(2,8,0)) *************** *** 1525,1529 **** ! #if (wxLUA_USE_wxCursor) && (wxLUA_USE_wxDragDrop && wxUSE_DRAG_AND_DROP) static wxLuaArgTag s_wxluatagArray_wxLua_wxDropSource_SetCursor[] = { &s_wxluatag_wxDropSource, &s_wxluaarg_Integer, &s_wxluatag_wxCursor, NULL }; static int LUACALL wxLua_wxDropSource_SetCursor(lua_State *L); --- 1525,1529 ---- ! #if (defined (__X__ )) && (wxLUA_USE_wxDragDrop && wxUSE_DRAG_AND_DROP) static wxLuaArgTag s_wxluatagArray_wxLua_wxDropSource_SetCursor[] = { &s_wxluatag_wxDropSource, &s_wxluaarg_Integer, &s_wxluatag_wxCursor, NULL }; static int LUACALL wxLua_wxDropSource_SetCursor(lua_State *L); *************** *** 1545,1549 **** } ! #endif // (wxLUA_USE_wxCursor) && (wxLUA_USE_wxDragDrop && wxUSE_DRAG_AND_DROP) #if (wxLUA_USE_wxDataObject && wxUSE_DATAOBJ) && (wxLUA_USE_wxDragDrop && wxUSE_DRAG_AND_DROP) --- 1545,1549 ---- } ! #endif // (defined (__X__ )) && (wxLUA_USE_wxDragDrop && wxUSE_DRAG_AND_DROP) #if (wxLUA_USE_wxDataObject && wxUSE_DATAOBJ) && (wxLUA_USE_wxDragDrop && wxUSE_DRAG_AND_DROP) *************** *** 1618,1622 **** #endif // (((wxLUA_USE_wxIcon) && (wxLUA_USE_wxDragDrop && wxUSE_DRAG_AND_DROP)) && ((defined(__WXGTK__)) && (wxLUA_USE_wxDragDrop && wxUSE_DRAG_AND_DROP))) && (wxLUA_USE_wxDataObject && wxUSE_DATAOBJ) ! #if ((((defined(__WXMSW__)) && (wxLUA_USE_wxDragDrop && wxUSE_DRAG_AND_DROP)) && (wxLUA_USE_wxDragDrop && wxUSE_DRAG_AND_DROP)) && (wxLUA_USE_wxDataObject && wxUSE_DATAOBJ)) && (wxLUA_USE_wxCursor) static wxLuaArgTag s_wxluatagArray_wxLua_wxDropSource_constructor2[] = { &s_wxluatag_wxDataObject, &s_wxluatag_wxWindow, &s_wxluatag_wxCursor, &s_wxluatag_wxCursor, &s_wxluatag_wxCursor, NULL }; static int LUACALL wxLua_wxDropSource_constructor2(lua_State *L); --- 1618,1622 ---- #endif // (((wxLUA_USE_wxIcon) && (wxLUA_USE_wxDragDrop && wxUSE_DRAG_AND_DROP)) && ((defined(__WXGTK__)) && (wxLUA_USE_wxDragDrop && wxUSE_DRAG_AND_DROP))) && (wxLUA_USE_wxDataObject && wxUSE_DATAOBJ) ! #if ((((defined(__WXMSW__)) && (wxLUA_USE_wxDragDrop && wxUSE_DRAG_AND_DROP)) && (wxLUA_USE_wxDragDrop && wxUSE_DRAG_AND_DROP)) && (wxLUA_USE_wxDataObject && wxUSE_DATAOBJ)) && (defined (__X__ )) static wxLuaArgTag s_wxluatagArray_wxLua_wxDropSource_constructor2[] = { &s_wxluatag_wxDataObject, &s_wxluatag_wxWindow, &s_wxluatag_wxCursor, &s_wxluatag_wxCursor, &s_wxluatag_wxCursor, NULL }; static int LUACALL wxLua_wxDropSource_constructor2(lua_State *L); *************** *** 1650,1654 **** } ! #endif // ((((defined(__WXMSW__)) && (wxLUA_USE_wxDragDrop && wxUSE_DRAG_AND_DROP)) && (wxLUA_USE_wxDragDrop && wxUSE_DRAG_AND_DROP)) && (wxLUA_USE_wxDataObject && wxUSE_DATAOBJ)) && (wxLUA_USE_wxCursor) #if ((wxLUA_USE_wxIcon) && (wxLUA_USE_wxDragDrop && wxUSE_DRAG_AND_DROP)) && ((defined(__WXGTK__)) && (wxLUA_USE_wxDragDrop && wxUSE_DRAG_AND_DROP)) --- 1650,1654 ---- } ! #endif // ((((defined(__WXMSW__)) && (wxLUA_USE_wxDragDrop && wxUSE_DRAG_AND_DROP)) && (wxLUA_USE_wxDragDrop && wxUSE_DRAG_AND_DROP)) && (wxLUA_USE_wxDataObject && wxUSE_DATAOBJ)) && (defined (__X__ )) #if ((wxLUA_USE_wxIcon) && (wxLUA_USE_wxDragDrop && wxUSE_DRAG_AND_DROP)) && ((defined(__WXGTK__)) && (wxLUA_USE_wxDragDrop && wxUSE_DRAG_AND_DROP)) *************** *** 1684,1688 **** #endif // ((wxLUA_USE_wxIcon) && (wxLUA_USE_wxDragDrop && wxUSE_DRAG_AND_DROP)) && ((defined(__WXGTK__)) && (wxLUA_USE_wxDragDrop && wxUSE_DRAG_AND_DROP)) ! #if ((wxLUA_USE_wxDragDrop && wxUSE_DRAG_AND_DROP) && (wxLUA_USE_wxCursor)) && ((defined(__WXMSW__) || defined(__WXMAC__)) && (wxLUA_USE_wxDragDrop && wxUSE_DRAG_AND_DROP)) static wxLuaArgTag s_wxluatagArray_wxLua_wxDropSource_constructor[] = { &s_wxluatag_wxWindow, &s_wxluatag_wxCursor, &s_wxluatag_wxCursor, &s_wxluatag_wxCursor, NULL }; static int LUACALL wxLua_wxDropSource_constructor(lua_State *L); --- 1684,1688 ---- #endif // ((wxLUA_USE_wxIcon) && (wxLUA_USE_wxDragDrop && wxUSE_DRAG_AND_DROP)) && ((defined(__WXGTK__)) && (wxLUA_USE_wxDragDrop && wxUSE_DRAG_AND_DROP)) ! #if ((wxLUA_USE_wxDragDrop && wxUSE_DRAG_AND_DROP) && (defined (__X__ ))) && ((defined(__WXMSW__) || defined(__WXMAC__)) && (wxLUA_USE_wxDragDrop && wxUSE_DRAG_AND_DROP)) static wxLuaArgTag s_wxluatagArray_wxLua_wxDropSource_constructor[] = { &s_wxluatag_wxWindow, &s_wxluatag_wxCursor, &s_wxluatag_wxCursor, &s_wxluatag_wxCursor, NULL }; static int LUACALL wxLua_wxDropSource_constructor(lua_State *L); *************** *** 1714,1722 **** } ! #endif // ((wxLUA_USE_wxDragDrop && wxUSE_DRAG_AND_DROP) && (wxLUA_USE_wxCursor)) && ((defined(__WXMSW__) || defined(__WXMAC__)) && (wxLUA_USE_wxDragDrop && wxUSE_DRAG_AND_DROP)) ! #if ((((wxLUA_USE_wxIcon) && (wxLUA_USE_wxDragDrop && wxUSE_DRAG_AND_DROP)) && ((defined(__WXGTK__)) && (wxLUA_USE_wxDragDrop && wxUSE_DRAG_AND_DROP))) && (wxLUA_USE_wxDataObject && wxUSE_DATAOBJ))||(((((defined(__WXMSW__)) && (wxLUA_USE_wxDragDrop && wxUSE_DRAG_AND_DROP)) && (wxLUA_USE_wxDragDrop && wxUSE_DRAG_AND_DROP)) && (wxLUA_USE_wxDataObject && wxUSE_DATAOBJ)) && (wxLUA_USE_wxCursor))||(((wxLUA_USE_wxIcon) && (wxLUA_USE_wxDragDrop && wxUSE_DRAG_AND_DROP)) && ((defined(__WXGTK__)) && (wxLUA_USE_wxDragDrop && wxUSE_DRAG_AND_DROP)))||(((wxLUA_USE_wxDragDrop && wxUSE_DRAG_AND_DROP) && (wxLUA_USE_wxCursor)) && ((defined(__WXMSW__) || defined(__WXMAC__)) && (wxLUA_USE_wxDragDrop && wxUSE_DRAG_AND_DROP))) static int LUACALL wxLua_wxDropSource_constructor_overload(lua_State *L); // function overload table --- 1714,1722 ---- } ! #endif // ((wxLUA_USE_wxDragDrop && wxUSE_DRAG_AND_DROP) && (defined (__X__ ))) && ((defined(__WXMSW__) || defined(__WXMAC__)) && (wxLUA_USE_wxDragDrop && wxUSE_DRAG_AND_DROP)) ! #if ((((wxLUA_USE_wxIcon) && (wxLUA_USE_wxDragDrop && wxUSE_DRAG_AND_DROP)) && ((defined(__WXGTK__)) && (wxLUA_USE_wxDragDrop && wxUSE_DRAG_AND_DROP))) && (wxLUA_USE_wxDataObject && wxUSE_DATAOBJ))||(((((defined(__WXMSW__)) && (wxLUA_USE_wxDragDrop && wxUSE_DRAG_AND_DROP)) && (wxLUA_USE_wxDragDrop && wxUSE_DRAG_AND_DROP)) && (wxLUA_USE_wxDataObject && wxUSE_DATAOBJ)) && (defined (__X__ )))||(((wxLUA_USE_wxIcon) && (wxLUA_USE_wxDragDrop && wxUSE_DRAG_AND_DROP)) && ((defined(__WXGTK__)) && (wxLUA_USE_wxDragDrop && wxUSE_DRAG_AND_DROP)))||(((wxLUA_USE_wxDragDrop && wxUSE_DRAG_AND_DROP) && (defined (__X__ ))) && ((defined(__WXMSW__) || defined(__WXMAC__)) && (wxLUA_USE_wxDragDrop && wxUSE_DRAG_AND_DROP))) static int LUACALL wxLua_wxDropSource_constructor_overload(lua_State *L); // function overload table *************** *** 1729,1735 **** #endif // (((wxLUA_USE_wxIcon) && (wxLUA_USE_wxDragDrop && wxUSE_DRAG_AND_DROP)) && ((defined(__WXGTK__)) && (wxLUA_USE_wxDragDrop && wxUSE_DRAG_AND_DROP))) && (wxLUA_USE_wxDataObject && wxUSE_DATAOBJ) ! #if ((((defined(__WXMSW__)) && (wxLUA_USE_wxDragDrop && wxUSE_DRAG_AND_DROP)) && (wxLUA_USE_wxDragDrop && wxUSE_DRAG_AND_DROP)) && (wxLUA_USE_wxDataObject && wxUSE_DATAOBJ)) && (wxLUA_USE_wxCursor) { wxLua_wxDropSource_constructor2, WXLUAMETHOD_CONSTRUCTOR, 1, 5, s_wxluatagArray_wxLua_wxDropSource_constructor2 }, ! #endif // ((((defined(__WXMSW__)) && (wxLUA_USE_wxDragDrop && wxUSE_DRAG_AND_DROP)) && (wxLUA_USE_wxDragDrop && wxUSE_DRAG_AND_DROP)) && (wxLUA_USE_wxDataObject && wxUSE_DATAOBJ)) && (wxLUA_USE_wxCursor) #if ((wxLUA_USE_wxIcon) && (wxLUA_USE_wxDragDrop && wxUSE_DRAG_AND_DROP)) && ((defined(__WXGTK__)) && (wxLUA_USE_wxDragDrop && wxUSE_DRAG_AND_DROP)) --- 1729,1735 ---- #endif // (((wxLUA_USE_wxIcon) && (wxLUA_USE_wxDragDrop && wxUSE_DRAG_AND_DROP)) && ((defined(__WXGTK__)) && (wxLUA_USE_wxDragDrop && wxUSE_DRAG_AND_DROP))) && (wxLUA_USE_wxDataObject && wxUSE_DATAOBJ) ! #if ((((defined(__WXMSW__)) && (wxLUA_USE_wxDragDrop && wxUSE_DRAG_AND_DROP)) && (wxLUA_USE_wxDragDrop && wxUSE_DRAG_AND_DROP)) && (wxLUA_USE_wxDataObject && wxUSE_DATAOBJ)) && (defined (__X__ )) { wxLua_wxDropSource_constructor2, WXLUAMETHOD_CONSTRUCTOR, 1, 5, s_wxluatagArray_wxLua_wxDropSource_constructor2 }, ! #endif // ((((defined(__WXMSW__)) && (wxLUA_USE_wxDragDrop && wxUSE_DRAG_AND_DROP)) && (wxLUA_USE_wxDragDrop && wxUSE_DRAG_AND_DROP)) && (wxLUA_USE_wxDataObject && wxUSE_DATAOBJ)) && (defined (__X__ )) #if ((wxLUA_USE_wxIcon) && (wxLUA_USE_wxDragDrop && wxUSE_DRAG_AND_DROP)) && ((defined(__WXGTK__)) && (wxLUA_USE_wxDragDrop && wxUSE_DRAG_AND_DROP)) *************** *** 1737,1743 **** #endif // ((wxLUA_USE_wxIcon) && (wxLUA_USE_wxDragDrop && wxUSE_DRAG_AND_DROP)) && ((defined(__WXGTK__)) && (wxLUA_USE_wxDragDrop && wxUSE_DRAG_AND_DROP)) ! #if ((wxLUA_USE_wxDragDrop && wxUSE_DRAG_AND_DROP) && (wxLUA_USE_wxCursor)) && ((defined(__WXMSW__) || defined(__WXMAC__)) && (wxLUA_USE_wxDragDrop && wxUSE_DRAG_AND_DROP)) { wxLua_wxDropSource_constructor, WXLUAMETHOD_CONSTRUCTOR, 0, 4, s_wxluatagArray_wxLua_wxDropSource_constructor }, ! #endif // ((wxLUA_USE_wxDragDrop && wxUSE_DRAG_AND_DROP) && (wxLUA_USE_wxCursor)) && ((defined(__WXMSW__) || defined(__WXMAC__)) && (wxLUA_USE_wxDragDrop && wxUSE_DRAG_AND_DROP)) }; static int s_wxluafunc_wxLua_wxDropSource_constructor_overload_count = sizeof(s_wxluafunc_wxLua_wxDropSource_constructor_overload)/sizeof(wxLuaBindCFunc); --- 1737,1743 ---- #endif // ((wxLUA_USE_wxIcon) && (wxLUA_USE_wxDragDrop && wxUSE_DRAG_AND_DROP)) && ((defined(__WXGTK__)) && (wxLUA_USE_wxDragDrop && wxUSE_DRAG_AND_DROP)) ! #if ((wxLUA_USE_wxDragDrop && wxUSE_DRAG_AND_DROP) && (defined (__X__ ))) && ((defined(__WXMSW__) || defined(__WXMAC__)) && (wxLUA_USE_wxDragDrop && wxUSE_DRAG_AND_DROP)) { wxLua_wxDropSource_constructor, WXLUAMETHOD_CONSTRUCTOR, 0, 4, s_wxluatagArray_wxLua_wxDropSource_constructor }, ! #endif // ((wxLUA_USE_wxDragDrop && wxUSE_DRAG_AND_DROP) && (defined (__X__ ))) && ((defined(__WXMSW__) || defined(__WXMAC__)) && (wxLUA_USE_wxDragDrop && wxUSE_DRAG_AND_DROP)) }; static int s_wxluafunc_wxLua_wxDropSource_constructor_overload_count = sizeof(s_wxluafunc_wxLua_wxDropSource_constructor_overload)/sizeof(wxLuaBindCFunc); *************** *** 1750,1754 **** return wxlState.CallOverloadedFunction(&overload_method); } ! #endif // ((((wxLUA_USE_wxIcon) && (wxLUA_USE_wxDragDrop && wxUSE_DRAG_AND_DROP)) && ((defined(__WXGTK__)) && (wxLUA_USE_wxDragDrop && wxUSE_DRAG_AND_DROP))) && (wxLUA_USE_wxDataObject && wxUSE_DATAOBJ))||(((((defined(__WXMSW__)) && (wxLUA_USE_wxDragDrop && wxUSE_DRAG_AND_DROP)) && (wxLUA_USE_wxDragDrop && wxUSE_DRAG_AND_DROP)) && (wxLUA_USE_wxDataObject && wxUSE_DATAOBJ)) && (wxLUA_USE_wxCursor))||(((wxLUA_USE_wxIcon) && (wxLUA_USE_wxDragDrop && wxUSE_DRAG_AND_DROP)) && ((defined(__WXGTK__)) && (wxLUA_USE_wxDragDrop && wxUSE_DRAG_AND_DROP)))||(((wxLUA_USE_wxDragDrop && wxUSE_DRAG_AND_DROP) && (wxLUA_USE_wxCursor)) && ((defined(__WXMSW__) || defined(__WXMAC__)) && (wxLUA_USE_wxDragDrop && wxUSE_DRAG_AND_DROP))) // Map Lua Class Methods to C Binding Functions --- 1750,1754 ---- return wxlState.CallOverloadedFunction(&overload_method); } ! #endif // ((((wxLUA_USE_wxIcon) && (wxLUA_USE_wxDragDrop && wxUSE_DRAG_AND_DROP)) && ((defined(__WXGTK__)) && (wxLUA_USE_wxDragDrop && wxUSE_DRAG_AND_DROP))) && (wxLUA_USE_wxDataObject && wxUSE_DATAOBJ))||(((((defined(__WXMSW__)) && (wxLUA_USE_wxDragDrop && wxUSE_DRAG_AND_DROP)) && (wxLUA_USE_wxDragDrop && wxUSE_DRAG_AND_DROP)) && (wxLUA_USE_wxDataObject && wxUSE_DATAOBJ)) && (defined (__X__ )))||(((wxLUA_USE_wxIcon) && (wxLUA_USE_wxDragDrop && wxUSE_DRAG_AND_DROP)) && ((defined(__WXGTK__)) && (wxLUA_USE_wxDragDrop && wxUSE_DRAG_AND_DROP)))||(((wxLUA_USE_wxDragDrop && wxUSE_DRAG_AND_DROP) && (defined (__X__ ))) && ((defined(__WXMSW__) || defined(__WXMAC__)) && (wxLUA_USE_wxDragDrop && wxUSE_DRAG_AND_DROP))) // Map Lua Class Methods to C Binding Functions *************** *** 1760,1766 **** { "GiveFeedback", WXLUAMETHOD_METHOD, s_wxluafunc_wxLua_wxDropSource_GiveFeedback, 1, NULL }, ! #if (wxLUA_USE_wxCursor) && (wxLUA_USE_wxDragDrop && wxUSE_DRAG_AND_DROP) { "SetCursor", WXLUAMETHOD_METHOD, s_wxluafunc_wxLua_wxDropSource_SetCursor, 1, NULL }, ! #endif // (wxLUA_USE_wxCursor) && (wxLUA_USE_wxDragDrop && wxUSE_DRAG_AND_DROP) #if (wxLUA_USE_wxDataObject && wxUSE_DATAOBJ) && (wxLUA_USE_wxDragDrop && wxUSE_DRAG_AND_DROP) --- 1760,1766 ---- { "GiveFeedback", WXLUAMETHOD_METHOD, s_wxluafunc_wxLua_wxDropSource_GiveFeedback, 1, NULL }, ! #if (defined (__X__ )) && (wxLUA_USE_wxDragDrop && wxUSE_DRAG_AND_DROP) { "SetCursor", WXLUAMETHOD_METHOD, s_wxluafunc_wxLua_wxDropSource_SetCursor, 1, NULL }, ! #endif // (defined (__X__ )) && (wxLUA_USE_wxDragDrop && wxUSE_DRAG_AND_DROP) #if (wxLUA_USE_wxDataObject && wxUSE_DATAOBJ) && (wxLUA_USE_wxDragDrop && wxUSE_DRAG_AND_DROP) *************** *** 1770,1776 **** { "delete", WXLUAMETHOD_METHOD|WXLUAMETHOD_DELETE, s_wxluafunc_wxLua_wxDropSource_delete, 1, NULL }, ! #if ((((wxLUA_USE_wxIcon) && (wxLUA_USE_wxDragDrop && wxUSE_DRAG_AND_DROP)) && ((defined(__WXGTK__)) && (wxLUA_USE_wxDragDrop && wxUSE_DRAG_AND_DROP))) && (wxLUA_USE_wxDataObject && wxUSE_DATAOBJ))||(((((defined(__WXMSW__)) && (wxLUA_USE_wxDragDrop && wxUSE_DRAG_AND_DROP)) && (wxLUA_USE_wxDragDrop && wxUSE_DRAG_AND_DROP)) && (wxLUA_USE_wxDataObject && wxUSE_DATAOBJ)) && (wxLUA_USE_wxCursor))||(((wxLUA_USE_wxIcon) && (wxLUA_USE_wxDragDrop && wxUSE_DRAG_AND_DROP)) && ((defined(__WXGTK__)) && (wxLUA_USE_wxDragDrop && wxUSE_DRAG_AND_DROP)))||(((wxLUA_USE_wxDragDrop && wxUSE_DRAG_AND_DROP) && (wxLUA_USE_wxCursor)) && ((defined(__WXMSW__) || defined(__WXMAC__)) && (wxLUA_USE_wxDragDrop && wxUSE_DRAG_AND_DROP))) { "wxDropSource", WXLUAMETHOD_CONSTRUCTOR, s_wxluafunc_wxLua_wxDropSource_constructor_overload, s_wxluafunc_wxLua_wxDropSource_constructor_overload_count, 0 }, ! #endif // ((((wxLUA_USE_wxIcon) && (wxLUA_USE_wxDragDrop && wxUSE_DRAG_AND_DROP)) && ((defined(__WXGTK__)) && (wxLUA_USE_wxDragDrop && wxUSE_DRAG_AND_DROP))) && (wxLUA_USE_wxDataObject && wxUSE_DATAOBJ))||(((((defined(__WXMSW__)) && (wxLUA_USE_wxDragDrop && wxUSE_DRAG_AND_DROP)) && (wxLUA_USE_wxDragDrop && wxUSE_DRAG_AND_DROP)) && (wxLUA_USE_wxDataObject && wxUSE_DATAOBJ)) && (wxLUA_USE_wxCursor))||(((wxLUA_USE_wxIcon) && (wxLUA_USE_wxDragDrop && wxUSE_DRAG_AND_DROP)) && ((defined(__WXGTK__)) && (wxLUA_USE_wxDragDrop && wxUSE_DRAG_AND_DROP)))||(((wxLUA_USE_wxDragDrop && wxUSE_DRAG_AND_DROP) && (wxLUA_USE_wxCursor)) && ((defined(__WXMSW__) || defined(__WXMAC__)) && (wxLUA_USE_wxDragDrop && wxUSE_DRAG_AND_DROP))) { 0, 0, 0, 0 }, --- 1770,1776 ---- { "delete", WXLUAMETHOD_METHOD|WXLUAMETHOD_DELETE, s_wxluafunc_wxLua_wxDropSource_delete, 1, NULL }, ! #if ((((wxLUA_USE_wxIcon) && (wxLUA_USE_wxDragDrop && wxUSE_DRAG_AND_DROP)) && ((defined(__WXGTK__)) && (wxLUA_USE_wxDragDrop && wxUSE_DRAG_AND_DROP))) && (wxLUA_USE_wxDataObject && wxUSE_DATAOBJ))||(((((defined(__WXMSW__)) && (wxLUA_USE_wxDragDrop && wxUSE_DRAG_AND_DROP)) && (wxLUA_USE_wxDragDrop && wxUSE_DRAG_AND_DROP)) && (wxLUA_USE_wxDataObject && wxUSE_DATAOBJ)) && (defined (__X__ )))||(((wxLUA_USE_wxIcon) && (wxLUA_USE_wxDragDrop && wxUSE_DRAG_AND_DROP)) && ((defined(__WXGTK__)) && (wxLUA_USE_wxDragDrop && wxUSE_DRAG_AND_DROP)))||(((wxLUA_USE_wxDragDrop && wxUSE_DRAG_AND_DROP) && (defined (__X__ ))) && ((defined(__WXMSW__) || defined(__WXMAC__)) && (wxLUA_USE_wxDragDrop && wxUSE_DRAG_AND_DROP))) { "wxDropSource", WXLUAMETHOD_CONSTRUCTOR, s_wxluafunc_wxLua_wxDropSource_constructor_overload, s_wxluafunc_wxLua_wxDropSource_constructor_overload_count, 0 }, ! #endif // ((((wxLUA_USE_wxIcon) && (wxLUA_USE_wxDragDrop && wxUSE_DRAG_AND_DROP)) && ((defined(__WXGTK__)) && (wxLUA_USE_wxDragDrop && wxUSE_DRAG_AND_DROP))) && (wxLUA_USE_wxDataObject && wxUSE_DATAOBJ))||(((((defined(__WXMSW__)) && (wxLUA_USE_wxDragDrop && wxUSE_DRAG_AND_DROP)) && (wxLUA_USE_wxDragDrop && wxUSE_DRAG_AND_DROP)) && (wxLUA_USE_wxDataObject && wxUSE_DATAOBJ)) && (defined (__X__ )))||(((wxLUA_USE_wxIcon) && (wxLUA_USE_wxDragDrop && wxUSE_DRAG_AND_DROP)) && ((defined(__WXGTK__)) && (wxLUA_USE_wxDragDrop && wxUSE_DRAG_AND_DROP)))||(((wxLUA_USE_wxDragDrop && wxUSE_DRAG_AND_DROP) && (defined (__X__ ))) && ((defined(__WXMSW__) || defined(__WXMAC__)) && (wxLUA_USE_wxDragDrop && wxUSE_DRAG_AND_DROP))) { 0, 0, 0, 0 }, *************** *** 1925,1929 **** ! #if (wxLUA_USE_wxDC) && (wxLUA_USE_wxMetafile && wxUSE_METAFILE && (defined(__WXMSW__) || defined(__WXMAC__) || defined(__WXPM__))) static wxLuaArgTag s_wxluatagArray_wxLua_wxMetafile_Play[] = { &s_wxluatag_wxMetafile, &s_wxluatag_wxDC, NULL }; static int LUACALL wxLua_wxMetafile_Play(lua_State *L); --- 1925,1929 ---- ! #if (wxCHECK_VERSION(2,8,0)) && (wxLUA_USE_wxMetafile && wxUSE_METAFILE && (defined(__WXMSW__) || defined(__WXMAC__) || defined(__WXPM__))) static wxLuaArgTag s_wxluatagArray_wxLua_wxMetafile_Play[] = { &s_wxluatag_wxMetafile, &s_wxluatag_wxDC, NULL }; static int LUACALL wxLua_wxMetafile_Play(lua_State *L); *************** *** 1946,1950 **** } ! #endif // (wxLUA_USE_wxDC) && (wxLUA_USE_wxMetafile && wxUSE_METAFILE && (defined(__WXMSW__) || defined(__WXMAC__) || defined(__WXPM__))) static wxLuaArgTag s_wxluatagArray_wxLua_wxMetafile_SetClipboard[] = { &s_wxluatag_wxMetafile, &s_wxluaarg_Number, &s_wxluaarg_Number, NULL }; --- 1946,1950 ---- } ! #endif // (wxCHECK_VERSION(2,8,0)) && (wxLUA_USE_wxMetafile && wxUSE_METAFILE && (defined(__WXMSW__) || defined(__WXMAC__) || defined(__WXPM__))) static wxLuaArgTag s_wxluatagArray_wxLua_wxMetafile_SetClipboard[] = { &s_wxluatag_wxMetafile, &s_wxluaarg_Number, &s_wxluaarg_Number, NULL }; *************** *** 2000,2006 **** { "Ok", WXLUAMETHOD_METHOD, s_wxluafunc_wxLua_wxMetafile_Ok, 1, NULL }, ! #if (wxLUA_USE_wxDC) && (wxLUA_USE_wxMetafile && wxUSE_METAFILE && (defined(__WXMSW__) || defined(__WXMAC__) || defined(__WXPM__))) { "Play", WXLUAMETHOD_METHOD, s_wxluafunc_wxLua_wxMetafile_Play, 1, NULL }, ! #endif // (wxLUA_USE_wxDC) && (wxLUA_USE_wxMetafile && wxUSE_METAFILE && (defined(__WXMSW__) || defined(__WXMAC__) || defined(__WXPM__))) { "SetClipboard", WXLUAMETHOD_METHOD, s_wxluafunc_wxLua_wxMetafile_SetClipboard, 1, NULL }, --- 2000,2006 ---- { "Ok", WXLUAMETHOD_METHOD, s_wxluafunc_wxLua_wxMetafile_Ok, 1, NULL }, ! #if (wxCHECK_VERSION(2,8,0)) && (wxLUA_USE_wxMetafile && wxUSE_METAFILE && (defined(__WXMSW__) || defined(__WXMAC__) || defined(__WXPM__))) { "Play", WXLUAMETHOD_METHOD, s_wxluafunc_wxLua_wxMetafile_Play, 1, NULL }, ! #endif // (wxCHECK_VERSION(2,8,0)) && (wxLUA_USE_wxMetafile && wxUSE_METAFILE && (defined(__WXMSW__) || defined(__WXMAC__) || defined(__WXPM__))) { "SetClipboard", WXLUAMETHOD_METHOD, s_wxluafunc_wxLua_wxMetafile_SetClipboard, 1, NULL }, Index: picker.cpp =================================================================== RCS file: /cvsroot/wxlua/wxLua/modules/wxbind/src/picker.cpp,v retrieving revision 1.1 retrieving revision 1.2 diff -C2 -d -r1.1 -r1.2 *** picker.cpp 17 Jun 2007 18:36:24 -0000 1.1 --- picker.cpp 18 Jun 2007 14:55:02 -0000 1.2 *************** *** 335,339 **** ! #if (wxLUA_USE_wxColourPickerCtrl && wxUSE_COLOURPICKERCTRL) && (wxchkver_2_8 && wxLUA_USE_wxPicker) // --------------------------------------------------------------------------- // Bind class wxColourPickerCtrl --- 335,339 ---- ! #if (wxchkver_2_8 && wxLUA_USE_wxPicker) && (wxLUA_USE_wxColourPickerCtrl && wxUSE_COLOURPICKERCTRL) // --------------------------------------------------------------------------- // Bind class wxColourPickerCtrl *************** *** 343,347 **** int s_wxluatag_wxColourPickerCtrl = -1; ! #if (wxLUA_USE_wxColourPenBrush) && ((wxLUA_USE_wxColourPickerCtrl && wxUSE_COLOURPICKERCTRL) && (wxchkver_2_8 && wxLUA_USE_wxPicker)) static wxLuaArgTag s_wxluatagArray_wxLua_wxColourPickerCtrl_GetColour[] = { &s_wxluatag_wxColourPickerCtrl, NULL }; static int LUACALL wxLua_wxColourPickerCtrl_GetColour(lua_State *L); --- 343,347 ---- int s_wxluatag_wxColourPickerCtrl = -1; ! #if (wxCHECK_VERSION(2,8,0)) && ((wxchkver_2_8 && wxLUA_USE_wxPicker) && (wxLUA_USE_wxColourPickerCtrl && wxUSE_COLOURPICKERCTRL)) static wxLuaArgTag s_wxluatagArray_wxLua_wxColourPickerCtrl_GetColour[] = { &s_wxluatag_wxColourPickerCtrl, NULL }; static int LUACALL wxLua_wxColourPickerCtrl_GetColour(lua_State *L); *************** *** 365,369 **** } ! #endif // (wxLUA_USE_wxColourPenBrush) && ((wxLUA_USE_wxColourPickerCtrl && wxUSE_COLOURPICKERCTRL) && (wxchkver_2_8 && wxLUA_USE_wxPicker)) static wxLuaArgTag s_wxluatagArray_wxLua_wxColourPickerCtrl_SetColour1[] = { &s_wxluatag_wxColourPickerCtrl, &s_wxluaarg_String, NULL }; --- 365,369 ---- } ! #endif // (wxCHECK_VERSION(2,8,0)) && ((wxchkver_2_8 && wxLUA_USE_wxPicker) && (wxLUA_USE_wxColourPickerCtrl && wxUSE_COLOURPICKERCTRL)) static wxLuaArgTag s_wxluatagArray_wxLua_wxColourPickerCtrl_SetColour1[] = { &s_wxluatag_wxColourPickerCtrl, &s_wxluaarg_String, NULL }; *************** *** 388,392 **** ! #if (wxLUA_USE_wxColourPenBrush) && ((wxLUA_USE_wxColourPickerCtrl && wxUSE_COLOURPICKERCTRL) && (wxchkver_2_8 && wxLUA_USE_wxPicker)) static wxLuaArgTag s_wxluatagArray_wxLua_wxColourPickerCtrl_SetColour[] = { &s_wxluatag_wxColourPickerCtrl, &s_wxluatag_wxColour, NULL }; static int LUACALL wxLua_wxColourPickerCtrl_SetColour(lua_State *L); --- 388,392 ---- ! #if (wxCHECK_VERSION(2,8,0)) && ((wxchkver_2_8 && wxLUA_USE_wxPicker) && (wxLUA_USE_wxColourPickerCtrl && wxUSE_COLOURPICKERCTRL)) static wxLuaArgTag s_wxluatagArray_wxLua_wxColourPickerCtrl_SetColour[] = { &s_wxluatag_wxColourPickerCtrl, &s_wxluatag_wxColour, NULL }; static int LUACALL wxLua_wxColourPickerCtrl_SetColour(lua_State *L); *************** *** 406,412 **** } ! #endif // (wxLUA_USE_wxColourPenBrush) && ((wxLUA_USE_wxColourPickerCtrl && wxUSE_COLOURPICKERCTRL) && (wxchkver_2_8 && wxLUA_USE_wxPicker)) ! #if (((wxLUA_USE_wxColourPenBrush) && ((wxLUA_USE_wxColourPickerCtrl && wxUSE_COLOURPICKERCTRL) && (wxchkver_2_8 && wxLUA_USE_wxPicker))) && (wxLUA_USE_wxValidator && wxUSE_VALIDATORS)) && (wxLUA_USE_wxPointSizeRect) static wxLuaArgTag s_wxluatagArray_wxLua_wxColourPickerCtrl_constructor1[] = { &s_wxluatag_wxWindow, &s_wxluaarg_Number, &s_wxluatag_wxColour, &s_wxluatag_wxPoint, &s_wxluatag_wxSize, &s_wxluaarg_Number, &s_wxluatag_wxValidator, &s_wxluaarg_String, NULL }; static int LUACALL wxLua_wxColourPickerCtrl_constructor1(lua_State *L); --- 406,412 ---- } ! #endif // (wxCHECK_VERSION(2,8,0)) && ((wxchkver_2_8 && wxLUA_USE_wxPicker) && (wxLUA_USE_wxColourPickerCtrl && wxUSE_COLOURPICKERCTRL)) ! #if (((wxLUA_USE_wxValidator && wxUSE_VALIDATORS) && ((wxchkver_2_8 && wxLUA_USE_wxPicker) && (wxLUA_USE_wxColourPickerCtrl && wxUSE_COLOURPICKERCTRL))) && (wxLUA_USE_wxPointSizeRect)) && (wxCHECK_VERSION(2,8,0)) static wxLuaArgTag s_wxluatagArray_wxLua_wxColourPickerCtrl_constructor1[] = { &s_wxluatag_wxWindow, &s_wxluaarg_Number, &s_wxluatag_wxColour, &s_wxluatag_wxPoint, &s_wxluatag_wxSize, &s_wxluaarg_Number, &s_wxluatag_wxValidator, &s_wxluaarg_String, NULL }; static int LUACALL wxLua_wxColourPickerCtrl_constructor1(lua_State *L); *************** *** 446,450 **** } ! #endif // (((wxLUA_USE_wxColourPenBrush) && ((wxLUA_USE_wxColourPickerCtrl && wxUSE_COLOURPICKERCTRL) && (wxchkver_2_8 && wxLUA_USE_wxPicker))) && (wxLUA_USE_wxValidator && wxUSE_VALIDATORS)) && (wxLUA_USE_wxPointSizeRect) static int LUACALL wxLua_wxColourPickerCtrl_constructor(lua_State *L); --- 446,450 ---- } ! #endif // (((wxLUA_USE_wxValidator && wxUSE_VALIDATORS) && ((wxchkver_2_8 && wxLUA_USE_wxPicker) && (wxLUA_USE_wxColourPickerCtrl && wxUSE_COLOURPICKERCTRL))) && (wxLUA_USE_wxPointSizeRect)) && (wxCHECK_VERSION(2,8,0)) static int LUACALL wxLua_wxColourPickerCtrl_constructor(lua_State *L); *************** *** 469,473 **** ! #if ((wxLUA_USE_wxColourPickerCtrl && wxUSE_COLOURPICKERCTRL) && (wxchkver_2_8 && wxLUA_USE_wxPicker))||((wxLUA_USE_wxColourPenBrush) && ((wxLUA_USE_wxColourPickerCtrl && wxUSE_COLOURPICKERCTRL) && (wxchkver_2_8 && wxLUA_USE_wxPicker))) static int LUACALL wxLua_wxColourPickerCtrl_SetColour_overload(lua_State *L); // function overload table --- 469,473 ---- ! #if ((wxchkver_2_8 && wxLUA_USE_wxPicker) && (wxLUA_USE_wxColourPickerCtrl && wxUSE_COLOURPICKERCTRL))||((wxCHECK_VERSION(2,8,0)) && ((wxchkver_2_8 && wxLUA_USE_wxPicker) && (wxLUA_USE_wxColourPickerCtrl && wxUSE_COLOURPICKERCTRL))) static int LUACALL wxLua_wxColourPickerCtrl_SetColour_overload(lua_State *L); // function overload table *************** *** 477,483 **** { wxLua_wxColourPickerCtrl_SetColour1, WXLUAMETHOD_METHOD, 2, 2, s_wxluatagArray_wxLua_wxColourPickerCtrl_SetColour1 }, ! #if (wxLUA_USE_wxColourPenBrush) && ((wxLUA_USE_wxColourPickerCtrl && wxUSE_COLOURPICKERCTRL) && (wxchkver_2_8 && wxLUA_USE_wxPicker)) { wxLua_wxColourPickerCtrl_SetColour, WXLUAMETHOD_METHOD, 2, 2, s_wxluatagArray_wxLua_wxColourPickerCtrl_SetColour }, ! #endif // (wxLUA_USE_wxColourPenBrush) && ((wxLUA_USE_wxColourPickerCtrl && wxUSE_COLOURPICKERCTRL) && (wxchkver_2_8 && wxLUA_USE_wxPicker)) }; static int s_wxluafunc_wxLua_wxColourPickerCtrl_SetColour_overload_count = sizeof(s_wxluafunc_wxLua_wxColourPickerCtrl_SetColour_overload)/sizeof(wxLuaBindCFunc); --- 477,483 ---- { wxLua_wxColourPickerCtrl_SetColour1, WXLUAMETHOD_METHOD, 2, 2, s_wxluatagArray_wxLua_wxColourPickerCtrl_SetColour1 }, ! #if (wxCHECK_VERSION(2,8,0)) && ((wxchkver_2_8 && wxLUA_USE_wxPicker) && (wxLUA_USE_wxColourPickerCtrl && wxUSE_COLOURPICKERCTRL)) { wxLua_wxColourPickerCtrl_SetColour, WXLUAMETHOD_METHOD, 2, 2, s_wxluatagArray_wxLua_wxColourPickerCtrl_SetColour }, ! #endif // (wxCHECK_VERSION(2,8,0)) && ((wxchkver_2_8 && wxLUA_USE_wxPicker) && (wxLUA_USE_wxColourPickerCtrl && wxUSE_COLOURPICKERCTRL)) }; static int s_wxluafunc_wxLua_wxColourPickerCtrl_SetColour_overload_count = sizeof(s_wxluafunc_wxLua_wxColourPickerCtrl_SetColour_overload)/sizeof(wxLuaBindCFunc); *************** *** 490,496 **** return wxlState.CallOverloadedFunction(&overload_method); } ! #endif // ((wxLUA_USE_wxColourPickerCtrl && wxUSE_COLOURPICKERCTRL) && (wxchkver_2_8 && wxLUA_USE_wxPicker))||((wxLUA_USE_wxColourPenBrush) && ((wxLUA_USE_wxColourPickerCtrl && wxUSE_COLOURPICKERCTRL) && (wxchkver_2_8 && wxLUA_USE_wxPicker))) ! #if ((((wxLUA_USE_wxColourPenBrush) && ((wxLUA_USE_wxColourPickerCtrl && wxUSE_COLOURPICKERCTRL) && (wxchkver_2_8 && wxLUA_USE_wxPicker))) && (wxLUA_USE_wxValidator && wxUSE_VALIDATORS)) && (wxLUA_USE_wxPointSizeRect))||((wxLUA_USE_wxColourPickerCtrl && wxUSE_COLOURPICKERCTRL) && (wxchkver_2_8 && wxLUA_USE_wxPicker)) static int LUACALL wxLua_wxColourPickerCtrl_constructor_overload(lua_State *L); // function overload table --- 490,496 ---- return wxlState.CallOverloadedFunction(&overload_method); } ! #endif // ((wxchkver_2_8 && wxLUA_USE_wxPicker) && (wxLUA_USE_wxColourPickerCtrl && wxUSE_COLOURPICKERCTRL))||((wxCHECK_VERSION(2,8,0)) && ((wxchkver_2_8 && wxLUA_USE_wxPicker) && (wxLUA_USE_wxColourPickerCtrl && wxUSE_COLOURPICKERCTRL))) ! #if ((((wxLUA_USE_wxValidator && wxUSE_VALIDATORS) && ((wxchkver_2_8 && wxLUA_USE_wxPicker) && (wxLUA_USE_wxColourPickerCtrl && wxUSE_COLOURPICKERCTRL))) && (wxLUA_USE_wxPointSizeRect)) && (wxCHECK_VERSION(2,8,0)))||((wxchkver_2_8 && wxLUA_USE_wxPicker) && (wxLUA_USE_wxColourPickerCtrl && wxUSE_COLOURPICKERCTRL)) static int LUACALL wxLua_wxColourPickerCtrl_constructor_overload(lua_State *L); // function overload table *************** *** 499,505 **** { wxLua_wxColourPickerCtrl_constructor_overload, WXLUAMETHOD_METHOD|WXLUAMETHOD_OVERLOAD, 0, 8, s_wxluaargArray_None }, ! #if (((wxLUA_USE_wxColourPenBrush) && ((wxLUA_USE_wxColourPickerCtrl && wxUSE_COLOURPICKERCTRL) && (wxchkver_2_8 && wxLUA_USE_wxPicker))) && (wxLUA_USE_wxValidator && wxUSE_VALIDATORS)) && (wxLUA_USE_wxPointSizeRect) { wxLua_wxColourPickerCtrl_constructor1, WXLUAMETHOD_CONSTRUCTOR, 3, 8, s_wxluatagArray_wxLua_wxColourPickerCtrl_constructor1 }, ! #endif // (((wxLUA_USE_wxColourPenBrush) && ((wxLUA_USE_wxColourPickerCtrl && wxUSE_COLOURPICKERCTRL) && (wxchkver_2_8 && wxLUA_USE_wxPicker))) && (wxLUA_USE_wxValidator && wxUSE_VALIDATORS)) && (wxLUA_USE_wxPointSizeRect) { wxLua_wxColourPickerCtrl_constructor, WXLUAMETHOD_CONSTRUCTOR, 0, 0, s_wxluaargArray_None }, }; --- 499,505 ---- { wxLua_wxColourPickerCtrl_constructor_overload, WXLUAMETHOD_METHOD|WXLUAMETHOD_OVERLOAD, 0, 8, s_wxluaargArray_None }, ! #if (((wxLUA_USE_wxValidator && wxUSE_VALIDATORS) && ((wxchkver_2_8 && wxLUA_USE_wxPicker) && (wxLUA_USE_wxColourPickerCtrl && wxUSE_COLOURPICKERCTRL))) && (wxLUA_USE_wxPointSizeRect)) && (wxCHECK_VERSION(2,8,0)) { wxLua_wxColourPickerCtrl_constructor1, WXLUAMETHOD_CONSTRUCTOR, 3, 8, s_wxluatagArray_wxLua_wxColourPickerCtrl_constructor1 }, ! #endif // (((wxLUA_USE_wxValidator && wxUSE_VALIDATORS) && ((wxchkver_2_8 && wxLUA_USE_wxPicker) && (wxLUA_USE_wxColourPickerCtrl && wxUSE_COLOURPICKERCTRL))) && (wxLUA_USE_wxPointSizeRect)) && (wxCHECK_VERSION(2,8,0)) { wxLua_wxColourPickerCtrl_constructor, WXLUAMETHOD_CONSTRUCTOR, 0, 0, s_wxluaargArray_None }, }; *************** *** 513,531 **** return wxlState.CallOverloadedFunction(&overload_method); } ! #endif // ((((wxLUA_USE_wxColourPenBrush) && ((wxLUA_USE_wxColourPickerCtrl && wxUSE_COLOURPICKERCTRL) && (wxchkver_2_8 && wxLUA_USE_wxPicker))) && (wxLUA_USE_wxValidator && wxUSE_VALIDATORS)) && (wxLUA_USE_wxPointSizeRect))||((wxLUA_USE_wxColourPickerCtrl && wxUSE_COLOURPICKERCTRL) && (wxchkver_2_8 && wxLUA_USE_wxPicker)) // Map Lua Class Methods to C Binding Functions wxLuaBindMethod wxColourPickerCtrl_methods[] = { ! #if (wxLUA_USE_wxColourPenBrush) && ((wxLUA_USE_wxColourPickerCtrl && wxUSE_COLOURPICKERCTRL) && (wxchkver_2_8 && wxLUA_USE_wxPicker)) { "GetColour", WXLUAMETHOD_METHOD, s_wxluafunc_wxLua_wxColourPickerCtrl_GetColour, 1, NULL }, ! #endif // (wxLUA_USE_wxColourPenBrush) && ((wxLUA_USE_wxColourPickerCtrl && wxUSE_COLOURPICKERCTRL) && (wxchkver_2_8 && wxLUA_USE_wxPicker)) ! #if ((wxLUA_USE_wxColourPickerCtrl && wxUSE_COLOURPICKERCTRL) && (wxchkver_2_8 && wxLUA_USE_wxPicker))||((wxLUA_USE_wxColourPenBrush) && ((wxLUA_USE_wxColourPickerCtrl && wxUSE_COLOURPICKERCTRL) && (wxchkver_2_8 && wxLUA_USE_wxPicker))) { "SetColour", WXLUAMETHOD_METHOD, s_wxluafunc_wxLua_wxColourPickerCtrl_SetColour_overload, s_wxluafunc_wxLua_wxColourPickerCtrl_SetColour_overload_count, 0 }, ! #endif // ((wxLUA_USE_wxColourPickerCtrl && wxUSE_COLOURPICKERCTRL) && (wxchkver_2_8 && wxLUA_USE_wxPicker))||((wxLUA_USE_wxColourPenBrush) && ((wxLUA_USE_wxColourPickerCtrl && wxUSE_COLOURPICKERCTRL) && (wxchkver_2_8 && wxLUA_USE_wxPicker))) ! #if ((((wxLUA_USE_wxColourPenBrush) && ((wxLUA_USE_wxColourPickerCtrl && wxUSE_COLOURPICKERCTRL) && (wxchkver_2_8 && wxLUA_USE_wxPicker))) && (wxLUA_USE_wxValidator && wxUSE_VALIDATORS)) && (wxLUA_USE_wxPointSizeRect))||((wxLUA_USE_wxColourPickerCtrl && wxUSE_COLOURPICKERCTRL) && (wxchkver_2_8 && wxLUA_USE_wxPicker)) { "wxColourPickerCtrl", WXLUAMETHOD_CONSTRUCTOR, s_wxluafunc_wxLua_wxColourPickerCtrl_constructor_overload, s_wxluafunc_wxLua_wxColourPickerCtrl_constructor_overload_count, 0 }, ! #endif // ((((wxLUA_USE_wxColourPenBrush) && ((wxLUA_USE_wxColourPickerCtrl && wxUSE_COLOURPICKERCTRL) && (wxchkver_2_8 && wxLUA_USE_wxPicker))) && (wxLUA_USE_wxValidator && wxUSE_VALIDATORS)) && (wxLUA_USE_wxPointSizeRect))||((wxLUA_USE_wxColourPickerCtrl && wxUSE_COLOURPICKERCTRL) && (wxchkver_2_8 && wxLUA_USE_wxPicker)) { 0, 0, 0, 0 }, --- 513,531 ---- return wxlState.CallOverloadedFunction(&overload_method); } ! #endif // ((((wxLUA_USE_wxValidator && wxUSE_VALIDATORS) && ((wxchkver_2_8 && wxLUA_USE_wxPicker) && (wxLUA_USE_wxColourPickerCtrl && wxUSE_COLOURPICKERCTRL))) && (wxLUA_USE_wxPointSizeRect)) && (wxCHECK_VERSION(2,8,0)))||((wxchkver_2_8 && wxLUA_USE_wxPicker) && (wxLUA_USE_wxColourPickerCtrl && wxUSE_COLOURPICKERCTRL)) // Map Lua Class Methods to C Binding Functions wxLuaBindMethod wxColourPickerCtrl_methods[] = { ! #if (wxCHECK_VERSION(2,8,0)) && ((wxchkver_2_8 && wxLUA_USE_wxPicker) && (wxLUA_USE_wxColourPickerCtrl && wxUSE_COLOURPICKERCTRL)) { "GetColour", WXLUAMETHOD_METHOD, s_wxluafunc_wxLua_wxColourPickerCtrl_GetColour, 1, NULL }, ! #endif // (wxCHECK_VERSION(2,8,0)) && ((wxchkver_2_8 && wxLUA_USE_wxPicker) && (wxLUA_USE_wxColourPickerCtrl && wxUSE_COLOURPICKERCTRL)) ! #if ((wxchkver_2_8 && wxLUA_USE_wxPicker) && (wxLUA_USE_wxColourPickerCtrl && wxUSE_COLOURPICKERCTRL))||((wxCHECK_VERSION(2,8,0)) && ((wxchkver_2_8 && wxLUA_USE_wxPicker) && (wxLUA_USE_wxColourPickerCtrl && wxUSE_COLOURPICKERCTRL))) { "SetColour", WXLUAMETHOD_METHOD, s_wxluafunc_wxLua_wxColourPickerCtrl_SetColour_overload, s_wxluafunc_wxLua_wxColourPickerCtrl_SetColour_overload_count, 0 }, ! #endif // ((wxchkver_2_8 && wxLUA_USE_wxPicker) && (wxLUA_USE_wxColourPickerCtrl && wxUSE_COLOURPICKERCTRL))||((wxCHECK_VERSION(2,8,0)) && ((wxchkver_2_8 && wxLUA_USE_wxPicker) && (wxLUA_USE_wxColourPickerCtrl && wxUSE_COLOURPICKERCTRL))) ! #if ((((wxLUA_USE_wxValidator && wxUSE_VALIDATORS) && ((wxchkver_2_8 && wxLUA_USE_wxPicker) && (wxLUA_USE_wxColourPickerCtrl && wxUSE_COLOURPICKERCTRL))) && (wxLUA_USE_wxPointSizeRect)) && (wxCHECK_VERSION(2,8,0)))||((wxchkver_2_8 && wxLUA_USE_wxPicker) && (wxLUA_USE_wxColourPickerCtrl && wxUSE_COLOURPICKERCTRL)) { "wxColourPickerCtrl", WXLUAMETHOD_CONSTRUCTOR, s_wxluafunc_wxLua_wxColourPickerCtrl_constructor_overload, s_wxluafunc_wxLua_wxColourPickerCtrl_constructor_overload_count, 0 }, ! #endif // ((((wxLUA_USE_wxValidator && wxUSE_VALIDATORS) && ((wxchkver_2_8 && wxLUA_USE_wxPicker) && (wxLUA_USE_wxColourPickerCtrl && wxUSE_COLOURPICKERCTRL))) && (wxLUA_USE_wxPointSizeRect)) && (wxCHECK_VERSION(2,8,0)))||((wxchkver_2_8 && wxLUA_USE_wxPicker) && (wxLUA_USE_wxColourPickerCtrl && wxUSE_COLOURPICKERCTRL)) { 0, 0, 0, 0 }, *************** *** 534,541 **** int wxColourPickerCtrl_methodCount = sizeof(wxColourPickerCtrl_methods)/sizeof(wxLuaBindMethod) - 1; ! #endif // (wxLUA_USE_wxColourPickerCtrl && wxUSE_COLOURPICKERCTRL) && (wxchkver_2_8 && wxLUA_USE_wxPicker) ! #if (wxLUA_USE_wxColourPickerCtrl && wxUSE_COLOURPICKERCTRL) && (wxchkver_2_8 && wxLUA_USE_wxPicker) // --------------------------------------------------------------------------- // Bind class wxColourPickerEvent --- 534,541 ---- int wxColourPickerCtrl_methodCount = sizeof(wxColourPickerCtrl_methods)/sizeof(wxLuaBindMethod) - 1; ! #endif // (wxchkver_2_8 && wxLUA_USE_wxPicker) && (wxLUA_USE_wxColourPickerCtrl && wxUSE_COLOURPICKERCTRL) ! #if (wxchkver_2_8 && wxLUA_USE_wxPicker) && (wxLUA_USE_wxColourPickerCtrl && wxUSE_COLOURPICKERCTRL) // --------------------------------------------------------------------------- // Bind class wxColourPickerEvent *************** *** 545,549 **** int s_wxluatag_wxColourPickerEvent = -1; ! #if (wxLUA_USE_wxColourPenBrush) && ((wxLUA_USE_wxColourPickerCtrl && wxUSE_COLOURPICKERCTRL) && (wxchkver_2_8 && wxLUA_USE_wxPicker)) static wxLuaArgTag s_wxluatagArray_wxLua_wxColourPickerEvent_GetColour[] = { &s_wxluatag_wxColourPickerEvent, NULL }; static int LUACALL wxLua_wxColourPickerEvent_GetColour(lua_State *L); --- 545,549 ---- int s_wxluatag_wxColourPickerEvent = -1; ! #if (wxCHECK_VERSION(2,8,0)) && ((wxchkver_2_8 && wxLUA_USE_wxPicker) && (wxLUA_USE_wxColourPickerCtrl && wxUSE_COLOURPICKERCTRL)) static wxLuaArgTag s_wxluatagArray_wxLua_wxColourPickerEvent_GetColour[] = { &s_wxluatag_wxColourPickerEvent, NULL }; static int LUACALL wxLua_wxColourPickerEvent_GetColour(lua_State *L); *************** *** 584,588 **** } ! #endif // (wxLUA_USE_wxColourPenBrush) && ((wxLUA_USE_wxColourPickerCtrl && wxUSE_COLOURPICKERCTRL) && (wxchkver_2_8 && wxLUA_USE_wxPicker)) static wxLuaArgTag s_wxluatagArray_wxLua_wxColourPickerEvent_delete[] = { &s_wxluatag_wxColourPickerEvent, NULL }; --- 584,588 ---- } ! #endif // (wxCHECK_VERSION(2,8,0)) && ((wxchkver_2_8 && wxLUA_USE_wxPicker) && (wxLUA_USE_wxColourPickerCtrl && wxUSE_COLOURPICKERCTRL)) static wxLuaArgTag s_wxluatagArray_wxLua_wxColourPickerEvent_delete[] = { &s_wxluatag_wxColourPickerEvent, NULL }; *************** *** 603,607 **** ! #if ((wxLUA_USE_wxColourPenBrush) && ((wxLUA_USE_wxColourPickerCtrl && wxUSE_COLOURPICKERCTRL) && (wxchkver_2_8 && wxLUA_USE_wxPicker))) && (wxLUA_USE_wxObject) static wxLuaArgTag s_wxluatagArray_wxLua_wxColourPickerEvent_constructor1[] = { &s_wxluatag_wxObject, &s_wxluaarg_Number, &s_wxluatag_wxColour, NULL }; static int LUACALL wxLua_wxColourPickerEvent_constructor1(lua_State *L); --- 603,607 ---- ! #if (((wxchkver_2_8 && wxLUA_USE_wxPicker) && (wxLUA_USE_wxColourPickerCtrl && wxUSE_COLOURPICKERCTRL)) && (wxLUA_USE_wxObject)) && (wxCHECK_VERSION(2,8,0)) static wxLuaArgTag s_wxluatagArray_wxLua_wxColourPickerEvent_constructor1[] = { &s_wxluatag_wxObject, &s_wxluaarg_Number, &s_wxluatag_wxColour, NULL }; static int LUACALL wxLua_wxColourPickerEvent_constructor1(lua_State *L); *************** *** 629,633 **** } ! #endif // ((wxLUA_USE_wxColourPenBrush) && ((wxLUA_USE_wxColourPickerCtrl && wxUSE_COLOURPICKERCTRL) && (wxchkver_2_8 && wxLUA_USE_wxPicker))) && (wxLUA_USE_wxObject) static int LUACALL wxLua_wxColourPickerEvent_constructor(lua_State *L); --- 629,633 ---- } ! #endif // (((wxchkver_2_8 && wxLUA_USE_wxPicker) && (wxLUA_USE_wxColourPickerCtrl && wxUSE_COLOURPICKERCTRL)) && (wxLUA_USE_wxObject)) && (wxCHECK_VERSION(2,8,0)) static int LUACALL wxLua_wxColourPickerEvent_constructor(lua_State *L); *************** *** 652,656 **** ! #if (((wxLUA_USE_wxColourPenBrush) && ((wxLUA_USE_wxColourPickerCtrl && wxUSE_COLOURPICKERCTRL) && (wxchkver_2_8 && wxLUA_USE_wxPicker))) && (wxLUA_USE_wxObject))||((wxLUA_USE_wxColourPickerCtrl && wxUSE_COLOURPICKERCTRL) && (wxchkver_2_8 && wxLUA_USE_wxPicker)) static int LUACALL wxLua_wxColourPickerEvent_constructor_overload(lua_State *L); // function overload table --- 652,656 ---- ! #if ((((wxchkver_2_8 && wxLUA_USE_wxPicker) && (wxLUA_USE_wxColourPickerCtrl && wxUSE_COLOURPICKERCTRL)) && (wxLUA_USE_wxObject)) && (wxCHECK_VERSION(2,8,0)))||((wxchkver_2_8 && wxLUA_USE_wxPicker) && (wxLUA_USE_wxColourPickerCtrl && wxUSE_COLOURPICKERCTRL)) static int LUACALL wxLua_wxColourPickerEvent_constructor_overload(lua_State *L); // function overload table *************** *** 659,665 **** { wxLua_wxColourPickerEvent_constructor_overload, WXLUAMETHOD_METHOD|WXLUAMETHOD_OVERLOAD, 0, 3, s_wxluaargArray_None }, ! #if ((wxLUA_USE_wxColourPenBrush) && ((wxLUA_USE_wxColourPickerCtrl && wxUSE_COLOURPICKERCTRL) && (wxchkver_2_8 && wxLUA_USE_wxPicker))) && (wxLUA_USE_wxObject) { wxLua_wxColourPickerEvent_constructor1, WXLUAMETHOD_CONSTRUCTOR, 3, 3, s_wxluatagArray_wxLua_wxColourPickerEvent_constructor1 }, ! #endif // ((wxLUA_USE_wxColourPenBrush) && ((wxLUA_USE_wxColourPickerCtrl && wxUSE_COLOURPICKERCTRL) && (wxchkver_2_8 && wxLUA_USE_wxPicker))) && (wxLUA_USE_wxObject) { wxLua_wxColourPickerEvent_constructor, WXLUAMETHOD_CONSTRUCTOR, 0, 0, s_wxluaargArray_None }, }; --- 659,665 ---- { wxLua_wxColourPickerEvent_constructor_overload, WXLUAMETHOD_METHOD|WXLUAMETHOD_OVERLOAD, 0, 3, s_wxluaargArray_None }, ! #if (((wxchkver_2_8 && wxLUA_USE_wxPicker) && (wxLUA_USE_wxColourPickerCtrl && wxUSE_COLOURPICKERCTRL)) && (wxLUA_USE_wxObject)) && (wxCHECK_VERSION(2,8,0)) { wxLua_wxColourPickerEvent_constructor1, WXLUAMETHOD_CONSTRUCTOR, 3, 3, s_wxluatagArray_wxLua_wxColourPickerEvent_constructor1 }, ! #endif // (((wxchkver_2_8 && wxLUA_USE_wxPicker) && (wxLUA_USE_wxColourPickerCtrl && wxUSE_COLOURPICKERCTRL)) && (wxLUA_USE_wxObject)) && (wxCHECK_VERSION(2,8,0)) { wxLua_wxColourPickerEvent_constructor, WXLUAMETHOD_CONSTRUCTOR, 0, 0, s_wxluaargArray_None }, }; *************** *** 673,690 **** return wxlState.CallOverloadedFunction(&overload_method); } ! #endif // (((wxLUA_USE_wxColourPenBrush) && ((wxLUA_USE_wxColourPickerCtrl && wxUSE_COLOURPICKERCTRL) && (wxchkver_2_8 && wxLUA_USE_wxPicker))) && (wxLUA_USE_wxObject))||((wxLUA_USE_wxColourPickerCtrl && wxUSE_COLOURPICKERCTRL) && (wxchkver_2_8 && wxLUA_USE_wxPicker)) // Map Lua Class Methods to C Binding Functions wxLuaBindMethod wxColourPickerEvent_methods[] = { ! #if (wxLUA_USE_wxColourPenBrush) && ((wxLUA_USE_wxColourPickerCtrl && wxUSE_COLOURPICKERCTRL) && (wxchkver_2_8 && wxLUA_USE_wxPicker)) { "GetColour", WXLUAMETHOD_METHOD, s_wxluafunc_wxLua_wxColourPickerEvent_GetColour, 1, NULL }, { "SetColour", WXLUAMETHOD_METHOD, s_wxluafunc_wxLua_wxColourPickerEvent_SetColour, 1, NULL }, ! #endif // (wxLUA_USE_wxColourPenBrush) && ((wxLUA_USE_wxColourPickerCtrl && wxUSE_COLOURPICKERCTRL) && (wxchkver_2_8 && wxLUA_USE_wxPicker)) { "delete", WXLUAMETHOD_METHOD|WXLUAMETHOD_DELETE, s_wxluafunc_wxLua_wxColourPickerEvent_delete, 1, NULL }, ! #if (((wxLUA_USE_wxColourPenBrush) && ((wxLUA_USE_wxColourPickerCtrl && wxUSE_COLOURPICKERCTRL) && (wxchkver_2_8 && wxLUA_USE_wxPicker))) && (wxLUA_USE_wxObject))||((wxLUA_USE_wxColourPickerCtrl && wxUSE_COLOURPICKERCTRL) && (wxchkver_2_8 && wxLUA_USE_wxPicker)) { "wxColourPickerEvent", WXLUAMETHOD_CONSTRUCTOR, s_wxluafunc_wxLua_wxColourPickerEvent_constructor_overload, s_wxluafunc_wxLua_wxColourPickerEvent_constructor_overload_count, 0 }, ! #endif // (((wxLUA_USE_wxColourPenBrush) && ((wxLUA_USE_wxColourPickerCtrl && wxUSE_COLOURPICKERCTRL) && (wxchkver_2_8 && wxLUA_USE_wxPicker))) && (wxLUA_USE_wxObject))||((wxLUA_USE_wxColourPickerCtrl && wxUSE_COLOURPICKERCTRL) && (wxchkver_2_8 && wxLUA_USE_wxPicker)) { 0, 0, 0, 0 }, --- 673,690 ---- return wxlState.CallOverloadedFunction(&overload_method); } ! #endif // ((((wxchkver_2_8 && wxLUA_USE_wxPicker) && (wxLUA_USE_wxColourPickerCtrl && wxUSE_COLOURPICKERCTRL)) && (wxLUA_USE_wxObject)) && (wxCHECK_VERSION(2,8,0)))||((wxchkver_2_8 && wxLUA_USE_wxPicker) && (wxLUA_USE_wxColourPickerCtrl && wxUSE_COLOURPICKERCTRL)) // Map Lua Class Methods to C Binding Functions wxLuaBindMethod wxColourPickerEvent_methods[] = { ! #if (wxCHECK_VERSION(2,8,0)) && ((wxchkver_2_8 && wxLUA_USE_wxPicker) && (wxLUA_USE_wxColourPickerCtrl && wxUSE_COLOURPICKERCTRL)) { "GetColour", WXLUAMETHOD_METHOD, s_wxluafunc_wxLua_wxColourPickerEvent_GetColour, 1, NULL }, { "SetColour", WXLUAMETHOD_METHOD, s_wxluafunc_wxLua_wxColourPickerEvent_SetColour, 1, NULL }, ! #endif // (wxCHECK_VERSION(2,8,0)) && ((wxchkver_2_8 && wxLUA_USE_wxPicker) && (wxLUA_USE_wxColourPickerCtrl && wxUSE_COLOURPICKERCTRL)) { "delete", WXLUAMETHOD_METHOD|WXLUAMETHOD_DELETE, s_wxluafunc_wxLua_wxColourPickerEvent_delete, 1, NULL }, ! #if ((((wxchkver_2_8 && wxLUA_USE_wxPicker) && (wxLUA_USE_wxColourPickerCtrl && wxUSE_COLOURPICKERCTRL)) && (wxLUA_USE_wxObject)) && (wxCHECK_VERSION(2,8,0)))||((wxchkver_2_8 && wxLUA_USE_wxPicker) && (wxLUA_USE_wxColourPickerCtrl && wxUSE_COLOURPICKERCTRL)) { "wxColourPickerEvent", WXLUAMETHOD_CONSTRUCTOR, s_wxluafunc_wxLua_wxColourPickerEvent_constructor_overload, s_wxluafunc_wxLua_wxColourPickerEvent_constructor_overload_count, 0 }, ! #endif // ((((wxchkver_2_8 && wxLUA_USE_wxPicker) && (wxLUA_USE_wxColourPickerCtrl && wxUSE_COLOURPICKERCTRL)) && (wxLUA_USE_wxObject)) && (wxCHECK_VERSION(2,8,0)))||((wxchkver_2_8 && wxLUA_USE_wxPicker) && (wxLUA_USE_wxColourPickerCtrl && wxUSE_COLOURPICKERCTRL)) { 0, 0, 0, 0 }, *************** *** 693,700 **** int wxColourPickerEvent_methodCount = sizeof(wxColourPickerEvent_methods)/sizeof(wxLuaBindMethod) - 1; ! #endif // (wxLUA_USE_wxColourPickerCtrl && wxUSE_COLOURPICKERCTRL) && (wxchkver_2_8 && wxLUA_USE_wxPicker) ! #if (wxLUA_USE_wxDatePickerCtrl && wxUSE_DATEPICKCTRL) && (wxchkver_2_8 && wxLUA_USE_wxPicker) // --------------------------------------------------------------------------- // Bind class wxDatePickerCtrl --- 693,700 ---- int wxColourPickerEvent_methodCount = sizeof(wxColourPickerEvent_methods)/sizeof(wxLuaBindMethod) - 1; ! #endif // (wxchkver_2_8 && wxLUA_USE_wxPicker) && (wxLUA_USE_wxColourPickerCtrl && wxUSE_COLOURPICKERCTRL) ! #if (wxLUA_USE_wxColourPickerCtrl && wxUSE_COLOURPICKERCTRL) && (wxLUA_USE_wxDatePickerCtrl && wxUSE_DATEPICKCTRL) // --------------------------------------------------------------------------- // Bind class wxDatePickerCtrl *************** *** 730,734 **** ! #if ((wxLUA_USE_wxDatePickerCtrl && wxUSE_DATEPICKCTRL) && (wxchkver_2_8 && wxLUA_USE_wxPicker)) && (wxLUA_USE_wxDateTime && wxUSE_DATETIME) static wxLuaArgTag s_wxluatagArray_wxLua_wxDatePickerCtrl_GetValue[] = { &s_wxluatag_wxDatePickerCtrl, NULL }; static int LUACALL wxLua_wxDatePickerCtrl_GetValue(lua_State *L); --- 730,734 ---- ! #if ((wxLUA_USE_wxColourPickerCtrl && wxUSE_COLOURPICKERCTRL) && (wxLUA_USE_wxDatePickerCtrl && wxUSE_DATEPICKCTRL)) && (wxLUA_USE_wxDateTime && wxUSE_DATETIME) static wxLuaArgTag s_wxluatagArray_wxLua_wxDatePickerCtrl_GetValue[] = { &s_wxluatag_wxDatePickerCtrl, NULL }; static int LUACALL wxLua_wxDatePickerCtrl_GetValue(lua_State *L); *************** *** 788,794 **** } ! #endif // ((wxLUA_USE_wxDatePickerCtrl && wxUSE_DATEPICKCTRL) && (wxchkver_2_8 && wxLUA_USE_wxPicker)) && (wxLUA_USE_wxDateTime && wxUSE_DATETIME) ! #if ((((wxLUA_USE_wxDatePickerCtrl && wxUSE_DATEPICKCTRL) && (wxchkver_2_8 && wxLUA_USE_wxPicker)) && (wxLUA_USE_wxValidator && wxUSE_VALIDATORS)) && (wxLUA_USE_wxDateTime && wxUSE_DATETIME)) && (wxLUA_USE_wxPointSizeRect) static wxLuaArgTag s_wxluatagArray_wxLua_wxDatePickerCtrl_constructor[] = { &s_wxluatag_wxWindow, &s_wxluaarg_Number, &s_wxluatag_wxDateTime, &s_wxluatag_wxPoint, &s_wxluatag_wxSize, &s_wxluaarg_Number, &s_wxluatag_wxValidator, &s_wxluaarg_String, NULL }; static int LUACALL wxLua_wxDatePickerCtrl_constructor(lua_State *L); --- 788,794 ---- } ! #endif // ((wxLUA_USE_wxColourPickerCtrl && wxUSE_COLOURPICKERCTRL) && (wxLUA_USE_wxDatePickerCtrl && wxUSE_DATEPICKCTRL)) && (wxLUA_USE_wxDateTime && wxUSE_DATETIME) ! #if (((wxLUA_USE_wxValidator && wxUSE_VALIDATORS) && ((wxLUA_USE_wxColourPickerCtrl && wxUSE_COLOURPICKERCTRL) && (wxLUA_USE_wxDatePickerCtrl && wxUSE_DATEPICKCTRL))) && (wxLUA_USE_wxDateTime && wxUSE_DATETIME)) && (wxLUA_USE_wxPointSizeRect) static wxLuaArgTag s_wxluatagArray_wxLua_wxDatePickerCtrl_constructor[] = { &s_wxluatag_wxWindow, &s_wxluaarg_Number, &s_wxluatag_wxDateTime, &s_wxluatag_wxPoint, &s_wxluatag_wxSize, &s_wxluaarg_Number, &s_wxluatag_wxValidator, &s_wxluaarg_String, NULL }; static int LUACALL wxLua_wxDatePickerCtrl_constructor(lua_State *L); *************** *** 828,832 **** } ! #endif // ((((wxLUA_USE_wxDatePickerCtrl && wxUSE_DATEPICKCTRL) && (wxchkver_2_8 && wxLUA_USE_wxPicker)) && (wxLUA_USE_wxValidator && wxUSE_VALIDATORS)) && (wxLUA_USE_wxDateTime && wxUSE_DATETIME)) && (wxLUA_USE_wxPointSizeRect) --- 828,832 ---- } ! #endif // (((wxLUA_USE_wxValidator && wxUSE_VALIDATORS) && ((wxLUA_USE_wxColourPickerCtrl && wxUSE_COLOURPICKERCTRL) && (wxLUA_USE_wxDatePickerCtrl && wxUSE_DATEPICKCTRL))) && (wxLUA_USE_wxDateTime && wxUSE_DATETIME)) && (wxLUA_USE_wxPointSizeRect) *************** *** 836,848 **** { "GetRange", WXLUAMETHOD_METHOD, s_wxluafunc_wxLua_wxDatePickerCtrl_GetRange, 1, NULL }, ! #if ((wxLUA_USE_wxDatePickerCtrl && wxUSE_DATEPICKCTRL) && (wxchkver_2_8 && wxLUA_USE_wxPicker)) && (wxLUA_USE_wxDateTime && wxUSE_DATETIME) { "GetValue", WXLUAMETHOD_METHOD, s_wxluafunc_wxLua_wxDatePickerCtrl_GetValue, 1, NULL }, { "SetRange", WXLUAMETHOD_METHOD, s_wxluafunc_wxLua_wxDatePickerCtrl_SetRange, 1, NULL }, { "SetValue", WXLUAMETHOD_METHOD, s_wxluafunc_wxLua_wxDatePickerCtrl_SetValue, 1, NULL }, ! #endif // ((wxLUA_USE_wxDatePickerCtrl && wxUSE_DATEPICKCTRL) && (wxchkver_2_8 && wxLUA_USE_wxPicker)) && (wxLUA_USE_wxDateTime && wxUSE_DATETIME) ! #if ((((wxLUA_USE_wxDatePickerCtrl && wxUSE_DATEPICKCTRL) && (wxchkver_2_8 && wxLUA_USE_wxPicker)) && (wxLUA_USE_wxValidator && wxUSE_VALIDATORS)) && (wxLUA_USE_wxDateTime && wxUSE_DATETIME)) && (wxLUA_USE_wxPointSizeRect) { "wxDatePickerCtrl", WXLUAMETHOD_CONSTRUCTOR, s_wxluafunc_wxLua_wxDatePickerCtrl_constructor, 1, NULL }, ! #endif // ((((wxLUA_USE_wxDatePickerCtrl && wxUSE_DATEPICKCTRL) && (wxchkver_2_8 && wxLUA_USE_wxPicker)) && (wxLUA_USE_wxValidator && wxUSE_VALIDATORS)) && (wxLUA_USE_wxDateTime && wxUSE_DATETIME)) && (wxLUA_USE_wxPointSizeRect) { 0, 0, 0, 0 }, --- 836,848 ---- { "GetRange", WXLUAMETHOD_METHOD, s_wxluafunc_wxLua_wxDatePickerCtrl_GetRange, 1, NULL }, ! #if ((wxLUA_USE_wxColourPickerCtrl && wxUSE_COLOURPICKERCTRL) && (wxLUA_USE_wxDatePickerCtrl && wxUSE_DATEPICKCTRL)) && (wxLUA_USE_wxDateTime && wxUSE_DATETIME) { "GetValue", WXLUAMETHOD_METHOD, s_wxluafunc_wxLua_wxDatePickerCtrl_GetValue, 1, NULL }, { "SetRange", WXLUAMETHOD_METHOD, s_wxluafunc_wxLua_wxDatePickerCtrl_SetRange, 1, NULL }, { "SetValue", WXLUAMETHOD_METHOD, s_wxluafunc_wxLua_wxDatePickerCtrl_SetValue, 1, NULL }, ! #endif // ((wxLUA_USE_wxColourPickerCtrl && wxUSE_COLOURPICKERCTRL) && (wxLUA_USE_wxDatePickerCtrl && wxUSE_DATEPICKCTRL)) && (wxLUA_USE_wxDateTime && wxUSE_DATETIME) ! #if (((wxLUA_USE_wxValidator && wxUSE_VALIDATORS) && ((wxLUA_USE_wxColourPickerCtrl && wxUSE_COLOURPICKERCTRL) && (wxLUA_USE_wxDatePickerCtrl && wxUSE_DATEPICKCTRL))) && (wxLUA_USE_wxDateTime && wxUSE_DATETIME)) && (wxLUA_USE_wxPointSizeRect) { "wxDatePickerCtrl", WXLUAMETHOD_CONSTRUCTOR, s_wxluafunc_wxLua_wxDatePickerCtrl_constructor, 1, NULL }, ! #endif // (((wxLUA_USE_wxValidator && wxUSE_VALIDATORS) && ((wxLUA_USE_wxColourPickerCtrl && wxUSE_COLOURPICKERCTRL) && (wxLUA_USE_wxDatePickerCtrl && wxUSE_DATEPICKCTRL))) && (wxLUA_USE_wxDateTime && wxUSE_DATETIME)) && (wxLUA_USE_wxPointSizeRect) { 0, 0, 0, 0 }, *************** *** 851,858 **** int wxDatePickerCtrl_methodCount = sizeof(wxDatePickerCtrl_methods)/sizeof(wxLuaBindMethod) - 1; ! #endif // (wxLUA_USE_wxDatePickerCtrl && wxUSE_DATEPICKCTRL) && (wxchkver_2_8 && wxLUA_USE_wxPicker) ! #if ((wxLUA_USE_wxDirPickerCtrl || wxLUA_USE_wxFilePickerCtrl ) && (wxUSE_FILEPICKERCTRL || wxUSE_DIRPICKERCTRL )) && (wxchkver_2_8 && wxLUA_USE_wxPicker) // --------------------------------------------------------------------------- // Bind class wxFileDirPickerCtrlBase --- 851,858 ---- int wxDatePickerCtrl_methodCount = sizeof(wxDatePickerCtrl_methods)/sizeof(wxLuaBindMethod) - 1; ! #endif // (wxLUA_USE_wxColourPickerCtrl && wxUSE_COLOURPICKERCTRL) && (wxLUA_USE_wxDatePickerCtrl && wxUSE_DATEPICKCTRL) ! #if (wxLUA_USE_wxDatePickerCtrl && wxUSE_DATEPICKCTRL) && ((wxLUA_USE_wxDirPickerCtrl || wxLUA_USE_wxFilePickerCtrl ) && (wxUSE_FILEPICKERCTRL || wxUSE_DIRPICKERCTRL )) // --------------------------------------------------------------------------- // Bind class wxFileDirPickerCtrlBase *************** *** 950,957 **** int wxFileDirPickerCtrlBase_methodCount = sizeof(wxFileDirPickerCtrlBase_methods)/sizeof(wxLuaBindMethod) - 1; ! #endif // ((wxLUA_USE_wxDirPickerCtrl || wxLUA_USE_wxFilePickerCtrl ) && (wxUSE_FILEPICKERCTRL || wxUSE_DIRPICKERCTRL )) && (wxchkver_2_8 && wxLUA_USE_wxPicker) ! #if ((wxLUA_USE_wxDirPickerCtrl || wxLUA_USE_wxFilePickerCtrl ) && (wxUSE_FILEPICKERCTRL || wxUSE_DIRPICKERCTRL )) && (wxchkver_2_8 && wxLUA_USE_wxPicker) // --------------------------------------------------------------------------- // Bind class wxFileDirPickerEvent --- 950,957 ---- int wxFileDirPickerCtrlBase_methodCount = sizeof(wxFileDirPickerCtrlBase_methods)/sizeof(wxLuaBindMethod) - 1; ! #endif // (wxLUA_USE_wxDatePickerCtrl && wxUSE_DATEPICKCTRL) && ((wxLUA_USE_wxDirPickerCtrl || wxLUA_USE_wxFilePickerCtrl ) && (wxUSE_FILEPICKERCTRL || wxUSE_DIRPICKERCTRL )) ! #if (wxLUA_USE_wxDatePickerCtrl && wxUSE_DATEPICKCTRL) && ((wxLUA_USE_wxDirPickerCtrl || wxLUA_USE_wxFilePickerCtrl ) && (wxUSE_FILEPICKERCTRL || wxUSE_DIRPICKERCTRL )) // --------------------------------------------------------------------------- // Bind class wxFileDirPickerEvent *************** *** 1013,1017 **** ! #if (((wxLUA_USE_wxDirPickerCtrl || wxLUA_USE_wxFilePickerCtrl ) && (wxUSE_FILEPICKERCTRL || wxUSE_DIRPICKERCTRL )) && (wxchkver_2_8 && wxLUA_USE_wxPicker)) && (wxLUA_USE_wxObject) static wxLuaArgTag s_wxluatagArray_wxLua_wxFileDirPickerEvent_constructor[] = { &s_wxluaarg_Number, &s_wxluatag_wxObject, &s_wxluaarg_Number, &s_wxluaarg_String, NULL }; static int LUACALL wxLua_wxFileDirPickerEvent_constructor(lua_State *L); --- 1013,1017 ---- ! #if (wxLUA_USE_wxObject) && ((wxLUA_USE_wxDatePickerCtrl && wxUSE_DATEPICKCTRL) && ((wxLUA_USE_wxDirPickerCtrl || wxLUA_USE_wxFilePickerCtrl ) && (wxUSE_FILEPICKERCTRL || wxUSE_DIRPICKERCTRL ))) static wxLuaArgTag s_wxluatagArray_wxLua_wxFileDirPickerEvent_constructor[] = { &s_wxluaarg_Number, &s_wxluatag_wxObject, &s_wxluaarg_Number, &s_wxluaarg_String, NULL }; static int LUACALL wxLua_wxFileDirPickerEvent_constructor(lua_State *L); *************** *** 1041,1045 **** } ! #endif // (((wxLUA_USE_wxDirPickerCtrl || wxLUA_USE_wxFilePickerCtrl ) && (wxUSE_FILEPICKERCTRL || wxUSE_DIRPICKERCTRL )) && (wxchkver_2_8 && wxLUA_USE_wxPicker)) && (wxLUA_USE_wxObject) --- 1041,1045 ---- } ! #endif // (wxLUA_USE_wxObject) && ((wxLUA_USE_wxDatePickerCtrl && wxUSE_DATEPICKCTRL) && ((wxLUA_USE_wxDirPickerCtrl || wxLUA_USE_wxFilePickerCtrl ) && (wxUSE_FILEPICKERCTRL || wxUSE_DIRPICKERCTRL ))) *************** *** 1051,1057 **** { "delete", WXLUAMETHOD_METHOD|WXLUAMETHOD_DELETE, s_wxluafunc_wxLua_wxFileDirPickerEvent_delete, 1, NULL }, ! #if (((wxLUA_USE_wxDirPickerCtrl || wxLUA_USE_wxFilePickerCtrl ) && (wxUSE_FILEPICKERCTRL || wxUSE_DIRPICKERCTRL )) && (wxchkver_2_8 && wxLUA_USE_wxPicker)) && (wxLUA_USE_wxObject) { "wxFileDirPickerEvent", WXLUAMETHOD_CONSTRUCTOR, s_wxluafunc_wxLua_wxFileDirPickerEvent_constructor, 1,... [truncated message content] |
|
From: John L. <jr...@us...> - 2007-06-18 14:55:33
|
Update of /cvsroot/wxlua/wxLua/apps/wxluacan/src In directory sc8-pr-cvs9.sourceforge.net:/tmp/cvs-serv1750/wxLua/apps/wxluacan/src Modified Files: wxluacan.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: wxluacan.cpp =================================================================== RCS file: /cvsroot/wxlua/wxLua/apps/wxluacan/src/wxluacan.cpp,v retrieving revision 1.31 retrieving revision 1.32 diff -C2 -d -r1.31 -r1.32 *** wxluacan.cpp 14 Jun 2007 23:59:40 -0000 1.31 --- wxluacan.cpp 18 Jun 2007 14:54:58 -0000 1.32 *************** *** 81,85 **** ! #if wxLUA_USE_wxColourPenBrush static wxLuaArgTag s_wxluatagArray_wxLua_wxlCanObj_SetBrush[] = { &s_wxluatag_wxlCanObj, &s_wxluatag_wxBrush, NULL }; static int LUACALL wxLua_wxlCanObj_SetBrush(lua_State *L); --- 81,85 ---- ! #if wxLUA_USE_wxPenList static wxLuaArgTag s_wxluatagArray_wxLua_wxlCanObj_SetBrush[] = { &s_wxluatag_wxlCanObj, &s_wxluatag_wxBrush, NULL }; static int LUACALL wxLua_wxlCanObj_SetBrush(lua_State *L); *************** *** 99,102 **** --- 99,105 ---- } + #endif // wxLUA_USE_wxPenList + + #if wxCHECK_VERSION(2,8,0) static wxLuaArgTag s_wxluatagArray_wxLua_wxlCanObj_SetPen[] = { &s_wxluatag_wxlCanObj, &s_wxluatag_wxPen, NULL }; static int LUACALL wxLua_wxlCanObj_SetPen(lua_State *L); *************** *** 116,120 **** } ! #endif // wxLUA_USE_wxColourPenBrush static wxLuaArgTag s_wxluatagArray_wxLua_wxlCanObj_SetPending[] = { &s_wxluatag_wxlCanObj, &s_wxluaarg_Boolean, NULL }; --- 119,123 ---- } ! #endif // wxCHECK_VERSION(2,8,0) static wxLuaArgTag s_wxluatagArray_wxLua_wxlCanObj_SetPending[] = { &s_wxluatag_wxlCanObj, &s_wxluaarg_Boolean, NULL }; *************** *** 187,194 **** { "GetY", WXLUAMETHOD_METHOD, s_wxluafunc_wxLua_wxlCanObj_GetY, 1, NULL }, ! #if wxLUA_USE_wxColourPenBrush { "SetBrush", WXLUAMETHOD_METHOD, s_wxluafunc_wxLua_wxlCanObj_SetBrush, 1, NULL }, { "SetPen", WXLUAMETHOD_METHOD, s_wxluafunc_wxLua_wxlCanObj_SetPen, 1, NULL }, ! #endif // wxLUA_USE_wxColourPenBrush { "SetPending", WXLUAMETHOD_METHOD, s_wxluafunc_wxLua_wxlCanObj_SetPending, 1, NULL }, --- 190,200 ---- { "GetY", WXLUAMETHOD_METHOD, s_wxluafunc_wxLua_wxlCanObj_GetY, 1, NULL }, ! #if wxLUA_USE_wxPenList { "SetBrush", WXLUAMETHOD_METHOD, s_wxluafunc_wxLua_wxlCanObj_SetBrush, 1, NULL }, + #endif // wxLUA_USE_wxPenList + + #if wxCHECK_VERSION(2,8,0) { "SetPen", WXLUAMETHOD_METHOD, s_wxluafunc_wxLua_wxlCanObj_SetPen, 1, NULL }, ! #endif // wxCHECK_VERSION(2,8,0) { "SetPending", WXLUAMETHOD_METHOD, s_wxluafunc_wxLua_wxlCanObj_SetPending, 1, NULL }, |
