diff --git a/LICENSE b/LICENSE index 1155c21..a799449 100644 --- a/LICENSE +++ b/LICENSE @@ -1,5 +1,5 @@ luawt, Lua bindings for Wt -Copyright (C) 2015-2016 Pavel Dolgov and Boris Nagaev +Copyright (C) 2015-2017 Pavel Dolgov and Boris Nagaev luawt is licensed under the GNU GPL Version 2 with the addition of the following special exception: diff --git a/docs/reference.md b/docs/reference.md index eb6499e..7728f91 100644 --- a/docs/reference.md +++ b/docs/reference.md @@ -85,13 +85,18 @@ * triggerUpdate * updatesEnabled * url + * useStyleSheet * [WAbstractItemView](https://www.webtoolkit.eu/wt/doc/reference/html/classWt_1_1WAbstractItemView.html) (abstract) * alternatingRowColors * closeEditors * column1Fixed * columnAlignment + * columnWidth * currentPage + * editOptions + * editTriggers * headerAlignment + * headerHeight * hideColumn * horizontalHeaderAlignment * isColumnHidden @@ -101,6 +106,7 @@ * pageCount * pageSize * rowHeaderCount + * rowHeight * selectionBehavior * selectionMode * setAlternatingRowColors @@ -108,11 +114,17 @@ * setColumnAlignment * setColumnHidden * setColumnResizeEnabled + * setColumnWidth * setCurrentPage * setDragEnabled * setDropsEnabled + * setEditOptions + * setEditTriggers + * setHeaderAlignment + * setHeaderHeight * setHeaderWordWrap * setRowHeaderCount + * setRowHeight * setSelectionBehavior * setSelectionMode * setSortingEnabled @@ -123,6 +135,7 @@ * validateEditors * verticalHeaderAlignment * [WAbstractMedia](https://www.webtoolkit.eu/wt/doc/reference/html/classWt_1_1WAbstractMedia.html) (abstract) + * addSource * clearSources * clicked * doubleClicked @@ -132,6 +145,7 @@ * gestureChanged * gestureEnded * gestureStarted + * getOptions * jsMediaRef * keyPressed * keyWentDown @@ -236,6 +250,7 @@ * keyPressed * keyWentDown * keyWentUp + * link * mouseDragged * mouseMoved * mouseWentDown @@ -245,6 +260,7 @@ * mouseWheel * scrolled * setImage + * setLink * setRef * setRefInternalPath * setTarget @@ -285,6 +301,7 @@ * touchMoved * touchStarted * volumeChanged + * [WBreak](https://www.webtoolkit.eu/wt/doc/reference/html/classWt_1_1WBreak.html) * [WCalendar](https://www.webtoolkit.eu/wt/doc/reference/html/classWt_1_1WCalendar.html) * browseToNextMonth * browseToNextYear @@ -343,6 +360,7 @@ * doubleClicked * enterPressed * escapePressed + * findText * focussed * gestureChanged * gestureEnded @@ -374,11 +392,13 @@ * addStyleClass * attributeValue * callJavaScriptMember + * clearSides * doJavaScript * find * findById * floatSide * hasStyleClass + * height * hiddenKeepsGeometry * id * isDisabled @@ -388,34 +408,52 @@ * isPopup * isVisible * javaScriptMember + * lineHeight * load * loaded + * margin + * maximumHeight + * maximumWidth + * minimumHeight + * minimumWidth + * offset * positionScheme * propagateSetEnabled * refresh * removeStyleClass + * resize * setAttributeValue + * setClearSides * setDisabled * setFloatSide * setHiddenKeepsGeometry * setId * setInline * setJavaScriptMember + * setLineHeight + * setMargin + * setMaximumSize + * setMinimumSize + * setOffsets * setPopup * setPositionScheme * setSelectable * setStyleClass * setTabIndex * setToolTip + * setVerticalAlignment * styleClass * tabIndex * toolTip * verticalAlignment + * verticalAlignmentLength * webWidget + * width * [WContainerWidget](https://www.webtoolkit.eu/wt/doc/reference/html/classWt_1_1WContainerWidget.html) * addWidget * clear * clicked + * contentAlignment * count * doubleClicked * enterPressed @@ -439,9 +477,13 @@ * mouseWentOver * mouseWentUp * mouseWheel + * padding * removeWidget * scrolled + * setContentAlignment * setList + * setOverflow + * setPadding * touchEnded * touchMoved * touchStarted @@ -507,6 +549,29 @@ * touchMoved * touchStarted * widget + * [WDialog](https://www.webtoolkit.eu/wt/doc/reference/html/classWt_1_1WDialog.html) (abstract) + * accept + * caption + * closable + * contents + * done + * footer + * isModal + * isTitleBarEnabled + * positionAt + * reject + * resizable + * result + * setCaption + * setClosable + * setMaximumSize + * setMinimumSize + * setModal + * setResizable + * setTitleBarEnabled + * setWindowTitle + * titleBar + * windowTitle * [WDoubleSpinBox](https://www.webtoolkit.eu/wt/doc/reference/html/classWt_1_1WDoubleSpinBox.html) * blurred * changed @@ -566,6 +631,7 @@ * uploaded * [WFlashObject](https://www.webtoolkit.eu/wt/doc/reference/html/classWt_1_1WFlashObject.html) * jsFlashRef + * resize * setAlternativeContent * setFlashParameter * setFlashVariable @@ -617,6 +683,7 @@ * blendFunc * blendFuncSeparate * bufferData + * clear * clearColor * clearDepth * clearStencil @@ -660,6 +727,8 @@ * pixelStorei * polygonOffset * renderbufferStorage + * repaintGL + * resize * sampleCoverage * scissor * setAlternativeContent @@ -736,6 +805,7 @@ * gestureChanged * gestureEnded * gestureStarted + * imageLink * imageLoaded * imageRef * keyPressed @@ -749,6 +819,7 @@ * mouseWentUp * mouseWheel * setAlternateText + * setImageLink * setImageRef * touchEnded * touchMoved @@ -859,11 +930,13 @@ * touchStarted * valueText * [WMediaPlayer](https://www.webtoolkit.eu/wt/doc/reference/html/classWt_1_1WMediaPlayer.html) + * addSource * button * clearSources * controlsWidget * currentTime * duration + * getSource * jsPlayerRef * mute * pause @@ -925,6 +998,7 @@ * keyPressed * keyWentDown * keyWentUp + * link * linkTarget * menu * mouseDragged @@ -944,6 +1018,7 @@ * setCloseable * setFromInternalPath * setIcon + * setLink * setLinkTarget * setMenu * setPathComponent @@ -955,6 +1030,16 @@ * touchEnded * touchMoved * touchStarted + * [WMessageBox](https://www.webtoolkit.eu/wt/doc/reference/html/classWt_1_1WMessageBox.html) (abstract) + * addButton + * button + * buttonResult + * icon + * setButtons + * setIcon + * setText + * text + * textWidget * [WNavigationBar](https://www.webtoolkit.eu/wt/doc/reference/html/classWt_1_1WNavigationBar.html) * addFormField * addMenu @@ -978,6 +1063,7 @@ * mouseWentUp * mouseWheel * setResponsive + * setTitle * touchEnded * touchMoved * touchStarted @@ -1024,10 +1110,12 @@ * mouseWentUp * mouseWheel * preferredMethod + * resize * setPreferredMethod * touchEnded * touchMoved * touchStarted + * update * [WPanel](https://www.webtoolkit.eu/wt/doc/reference/html/classWt_1_1WPanel.html) * centralWidget * collapse @@ -1049,6 +1137,15 @@ * result * setAutoHide * setButton + * setMaximumSize + * setMinimumSize + * [WPopupWidget](https://www.webtoolkit.eu/wt/doc/reference/html/classWt_1_1WPopupWidget.html) (abstract) + * anchorWidget + * autoHideDelay + * isTransient + * orientation + * setAnchorWidget + * setTransient * [WProgressBar](https://www.webtoolkit.eu/wt/doc/reference/html/classWt_1_1WProgressBar.html) * clicked * doubleClicked @@ -1070,6 +1167,7 @@ * mouseWentOver * mouseWentUp * mouseWheel + * resize * setFormat * setMaximum * setMinimum @@ -1094,12 +1192,14 @@ * gestureChanged * gestureEnded * gestureStarted + * icon * isCheckable * isChecked * isDefault * keyPressed * keyWentDown * keyWentUp + * link * linkTarget * menu * mouseDragged @@ -1115,6 +1215,8 @@ * setCheckable * setChecked * setDefault + * setIcon + * setLink * setLinkTarget * setMenu * setRef @@ -1129,6 +1231,33 @@ * touchStarted * unChecked * valueText + * [WRadioButton](https://www.webtoolkit.eu/wt/doc/reference/html/classWt_1_1WRadioButton.html) + * blurred + * changed + * checked + * clicked + * doubleClicked + * enterPressed + * escapePressed + * focussed + * gestureChanged + * gestureEnded + * gestureStarted + * keyPressed + * keyWentDown + * keyWentUp + * mouseDragged + * mouseMoved + * mouseWentDown + * mouseWentOut + * mouseWentOver + * mouseWentUp + * mouseWheel + * selected + * touchEnded + * touchMoved + * touchStarted + * unChecked * [WScrollArea](https://www.webtoolkit.eu/wt/doc/reference/html/classWt_1_1WScrollArea.html) * horizontalScrollBarPolicy * setHorizontalScrollBarPolicy @@ -1194,6 +1323,7 @@ * mouseWheel * nativeControl * orientation + * resize * selected * setDisabled * setHandleWidth @@ -1203,9 +1333,11 @@ * setOrientation * setRange * setTickInterval + * setTickPosition * setValue * setValueText * tickInterval + * tickPosition * touchEnded * touchMoved * touchStarted @@ -1278,6 +1410,18 @@ * touchEnded * touchMoved * touchStarted + * [WSuggestionPopup](https://www.webtoolkit.eu/wt/doc/reference/html/classWt_1_1WSuggestionPopup.html) (abstract) + * addSuggestion + * clearSuggestions + * defaultIndex + * filterLength + * forEdit + * removeEdit + * setDefaultIndex + * setFilterLength + * setGlobalPopup + * setModelColumn + * showAt * [WTabWidget](https://www.webtoolkit.eu/wt/doc/reference/html/classWt_1_1WTabWidget.html) * addTab * closeTab @@ -1336,14 +1480,47 @@ * touchEnded * touchMoved * touchStarted + * [WTableCell](https://www.webtoolkit.eu/wt/doc/reference/html/classWt_1_1WTableCell.html) (abstract) + * clicked + * column + * columnSpan + * doubleClicked + * enterPressed + * escapePressed + * gestureChanged + * gestureEnded + * gestureStarted + * keyPressed + * keyWentDown + * keyWentUp + * mouseDragged + * mouseMoved + * mouseWentDown + * mouseWentOut + * mouseWentOver + * mouseWentUp + * mouseWheel + * row + * rowSpan + * scrolled + * setColumnSpan + * setRowSpan + * table + * touchEnded + * touchMoved + * touchStarted * [WTableView](https://www.webtoolkit.eu/wt/doc/reference/html/classWt_1_1WTableView.html) * currentPage * pageCount * pageSize + * resize * setAlternatingRowColors * setColumnHidden + * setColumnWidth * setCurrentPage + * setHeaderHeight * setRowHeaderCount + * setRowHeight * [WTemplate](https://www.webtoolkit.eu/wt/doc/reference/html/classWt_1_1WTemplate.html) * bindEmpty * bindInt @@ -1379,6 +1556,27 @@ * touchEnded * touchMoved * touchStarted + * [WTemplateFormView](https://www.webtoolkit.eu/wt/doc/reference/html/classWt_1_1WTemplateFormView.html) + * clicked + * doubleClicked + * enterPressed + * escapePressed + * gestureChanged + * gestureEnded + * gestureStarted + * keyPressed + * keyWentDown + * keyWentUp + * mouseDragged + * mouseMoved + * mouseWentDown + * mouseWentOut + * mouseWentOver + * mouseWentUp + * mouseWheel + * touchEnded + * touchMoved + * touchStarted * [WText](https://www.webtoolkit.eu/wt/doc/reference/html/classWt_1_1WText.html) * clicked * doubleClicked @@ -1398,8 +1596,10 @@ * mouseWentOver * mouseWentUp * mouseWheel + * padding * refresh * setInternalPathEncoding + * setPadding * setText * setTextFormat * setWordWrap @@ -1468,6 +1668,7 @@ * mouseWentOver * mouseWentUp * mouseWheel + * resize * selected * setExtraPlugins * setStyleSheet @@ -1478,6 +1679,29 @@ * touchEnded * touchMoved * touchStarted + * [WTimerWidget](https://www.webtoolkit.eu/wt/doc/reference/html/classWt_1_1WTimerWidget.html) (abstract) + * clicked + * doubleClicked + * enterPressed + * escapePressed + * gestureChanged + * gestureEnded + * gestureStarted + * keyPressed + * keyWentDown + * keyWentUp + * mouseDragged + * mouseMoved + * mouseWentDown + * mouseWentOut + * mouseWentOver + * mouseWentUp + * mouseWheel + * timerExpired + * timerStart + * touchEnded + * touchMoved + * touchStarted * [WToolBar](https://www.webtoolkit.eu/wt/doc/reference/html/classWt_1_1WToolBar.html) * addSeparator * count @@ -1518,7 +1742,9 @@ * setSelectable * tree * [WTreeTable](https://www.webtoolkit.eu/wt/doc/reference/html/classWt_1_1WTreeTable.html) + * addColumn * columnCount + * columnWidth * header * headerWidget * setTree @@ -1538,13 +1764,17 @@ * expandToDepth * pageCount * pageSize + * resize * rootIsDecorated * setAlternatingRowColors * setColumnFormat * setColumnHidden + * setColumnWidth * setCurrentPage + * setHeaderHeight * setRootIsDecorated * setRowHeaderCount + * setRowHeight * [WValidationStatus](https://www.webtoolkit.eu/wt/doc/reference/html/classWt_1_1WValidationStatus.html) * valid * [WVideo](https://www.webtoolkit.eu/wt/doc/reference/html/classWt_1_1WVideo.html) @@ -1569,6 +1799,7 @@ * mouseWheel * playbackPaused * playbackStarted + * resize * setPoster * timeUpdated * touchEnded @@ -1578,6 +1809,7 @@ * [WViewWidget](https://www.webtoolkit.eu/wt/doc/reference/html/classWt_1_1WViewWidget.html) (abstract) * load * refresh + * render * update * [WVirtualImage](https://www.webtoolkit.eu/wt/doc/reference/html/classWt_1_1WVirtualImage.html) * currentBottomRightX @@ -1599,6 +1831,7 @@ * attributeValue * callJavaScriptMember * canOptimizeUpdates + * clearSides * doJavaScript * domElementType * escapeText @@ -1606,6 +1839,7 @@ * findById * floatSide * hasStyleClass + * height * hiddenKeepsGeometry * id * isDisabled @@ -1616,13 +1850,22 @@ * isRendered * isVisible * javaScriptMember + * lineHeight * load * loaded + * margin + * maximumHeight + * maximumWidth + * minimumHeight + * minimumWidth + * offset * positionScheme * refresh * removeStyleClass + * resize * resolveRelativeUrl * setAttributeValue + * setClearSides * setDisabled * setFloatSide * setFormObject @@ -1630,24 +1873,33 @@ * setId * setInline * setJavaScriptMember + * setLineHeight * setLoadLaterWhenInvisible + * setMargin + * setMaximumSize + * setMinimumSize + * setOffsets * setPopup * setPositionScheme * setSelectable * setStyleClass * setTabIndex * setToolTip + * setVerticalAlignment * setZIndex * styleClass * tabIndex * toolTip * verticalAlignment + * verticalAlignmentLength + * width * zIndex * [WWidget](https://www.webtoolkit.eu/wt/doc/reference/html/classWt_1_1WWidget.html) (abstract) * acceptDrops * addStyleClass * attributeValue * callJavaScriptMember + * clearSides * disable * doJavaScript * enable @@ -1655,6 +1907,7 @@ * findById * floatSide * hasStyleClass + * height * hiddenKeepsGeometry * hide * id @@ -1669,20 +1922,35 @@ * javaScriptMember * jsRef * layoutSizeAware + * lineHeight * load * loaded + * margin + * maximumHeight + * maximumWidth + * minimumHeight + * minimumWidth + * offset * parent * positionAt * positionScheme * refresh * removeStyleClass + * resize * setAttributeValue + * setClearSides * setDisabled * setFloatSide + * setHeight * setHiddenKeepsGeometry * setId * setInline * setJavaScriptMember + * setLineHeight + * setMargin + * setMaximumSize + * setMinimumSize + * setOffsets * setPopup * setPositionScheme * setSelectable @@ -1690,6 +1958,8 @@ * setTabIndex * setTabOrder * setToolTip + * setVerticalAlignment + * setWidth * show * stopAcceptDrops * styleClass @@ -1698,6 +1968,8 @@ * toolTip * tr * verticalAlignment + * verticalAlignmentLength + * width * [luawt_WServer](https://www.webtoolkit.eu/wt/doc/reference/html/classWt_1_1WServer.html) (abstract) * start * stop diff --git a/examples/common.css b/examples/common.css new file mode 100644 index 0000000..711b32f --- /dev/null +++ b/examples/common.css @@ -0,0 +1,36 @@ +.button { + border-top: 1px solid #96d1f8; + background: #65a9d7; + background: -webkit-gradient(linear, left top, left bottom, from(#1ad445), to(#65a9d7)); + background: -webkit-linear-gradient(top, #1ad445, #65a9d7); + background: -moz-linear-gradient(top, #1ad445, #65a9d7); + background: -ms-linear-gradient(top, #1ad445, #65a9d7); + background: -o-linear-gradient(top, #1ad445, #65a9d7); + padding: 1% 2.5%; + -webkit-border-radius: 16%; + -moz-border-radius: 12%; + border-radius: 12%; + -webkit-box-shadow: rgba(0,0,0,1) 0 1px 0; + -moz-box-shadow: rgba(0,0,0,1) 0 1px 0; + box-shadow: rgba(0,0,0,1) 0 1px 0; + text-shadow: rgba(0,0,0,.4) 0 1px 0; + color: #000000; + font-size: 100%; + font-family: Georgia, serif; + text-decoration: none; + vertical-align: middle; + } +.button:hover { + border-top-color: #28597a; + background: #28597a; + color: #ccc; + } +.button:active { + border-top-color: #1b435e; + background: #1b435e; + } + +.my_text { + font-weight:normal;color:#1A28A3;letter-spacing:1pt;word-spacing:2pt;font-size:160%;text-align:center;font-family:trebuchet MS, sans-serif;line-height:1; + } + diff --git a/examples/hello/hello.lua b/examples/hello/hello.lua index 15cfdb9..f178c01 100644 --- a/examples/hello/hello.lua +++ b/examples/hello/hello.lua @@ -1,16 +1,36 @@ +-- This code is executed in constructor of new application. +-- It setups widgets of a start page shown to a user. local luawt = require 'luawt' +-- app is an instance of WApplication +-- env is an instance of WEnvironment local app, env = ... -function mainApp(...) +function breakTheLine() + app:root():addWidget(luawt.WBreak()) + app:root():addWidget(luawt.WBreak()) +end + +function mainApp() + app:setTitle('Hello!') + -- Use CSS style sheet file. Note that it should be in docroot + -- specified by WServer's options. + app:useStyleSheet('./common.css') + -- Enums are treated as numbers. 4 corresponds to AlignCenter. + app:root():setContentAlignment(4) + -- Create widgets. local text = luawt.WText('Your name, please?') + breakTheLine() local name_edit = luawt.WLineEdit(app:root()) + breakTheLine() name_edit:setFocus() - name_edit:setInline(false) - local button = luawt.WPushButton("Greet me", app:root()) - local greeting = luawt.WText(app:root()) + local button = luawt.WPushButton('Greet me', app:root()) + -- Set CSS style classes (from common.css). + button:setStyleClass('button') + text:setStyleClass('my_text') + -- Setup singal handler. button:clicked():connect(function() - greeting:setText("Hello there, " .. name_edit:text()) + text:setText('Hello there, ' .. name_edit:text()) end) end diff --git a/examples/hello/main.lua b/examples/hello/main.lua index 6176cd0..3fa9377 100644 --- a/examples/hello/main.lua +++ b/examples/hello/main.lua @@ -1,13 +1,17 @@ local luawt = require 'luawt' +-- Get code of the application as a string. local module_file = io.open('./examples/hello/hello.lua', 'r') local code = module_file:read('*all') module_file:close() +-- Create and start WServer. +-- `docroot` option is needed to find static resources (CSS in our case). local server = luawt.WServer({ code = code, ip = '0.0.0.0', port = 12346, + docroot = './examples', }) server:start() server:waitForShutdown() diff --git a/examples/luacheck/luacheck.lua b/examples/luacheck/luacheck.lua new file mode 100644 index 0000000..be5f872 --- /dev/null +++ b/examples/luacheck/luacheck.lua @@ -0,0 +1,41 @@ +-- This code is executed in constructor of new application. +-- It setups widgets of a start page shown to a user. +local luacheck = require 'luacheck' +local luawt = require 'luawt' + +-- app is an instance of WApplication +-- env is an instance of WEnvironment +local app, env = ... + +app:setTitle('luacheck') +-- Use CSS style sheet file. Note that it should be in docroot +-- specified by WServer's options. +app:useStyleSheet('./common.css') + +-- Enums are treated as numbers. 4 corresponds to AlignCenter. +app:root():setContentAlignment(4) +-- Create widgets. +local textarea = luawt.WTextArea(app:root()) +app:root():addWidget(luawt.WBreak()) +local button = luawt.WPushButton(app:root()) +app:root():addWidget(luawt.WBreak()) +button:setText('Check Lua syntax') +local result = luawt.WText(app:root()) +-- Set CSS style classes (from common.css). +result:setStyleClass('my_text') +button:setStyleClass('button') + +-- Setup signal handler. +button:clicked():connect(function() + -- Play with luacheck a bit. + local c = luacheck.check_strings({textarea:text()}) + if c.fatals + c.errors + c.warnings > 0 then + local error_msg = '' + for i = 1, #c[1] do + error_msg = error_msg .. luacheck.get_message(c[1][i]) .. '\n' + end + result:setText('\nErrors: \n' .. error_msg) + else + result:setText('No errors') + end +end) diff --git a/examples/luacheck/main.lua b/examples/luacheck/main.lua index 75f53e2..4b839c9 100644 --- a/examples/luacheck/main.lua +++ b/examples/luacheck/main.lua @@ -1,32 +1,17 @@ local luawt = require 'luawt' -local code = [[ - local app, env = ... - local luacheck = require 'luacheck' - local luawt = require 'luawt' - local textarea = luawt.WTextArea(app:root()) - local button = luawt.WPushButton(app:root()) - button:setText("Check Lua syntax") - local result = luawt.WText(app:root()) - result:setStyleClass("luacheck-results") - button:clicked():connect(function() - local c = luacheck.check_strings({textarea:text()}) - if c.fatals + c.errors + c.warnings > 0 then - local error_msg = '' - for i = 1, #c[1] do - error_msg = error_msg .. luacheck.get_message(c[1][i]) .. '\n' - end - result:setText("\nErrors: \n" .. error_msg) - else - result:setText("No errors") - end - end) -]] +-- Get code of the application as a string. +local module_file = io.open('./examples/luacheck/luacheck.lua', 'r') +local code = module_file:read('*all') +module_file:close() +-- Create and start WServer. +-- `docroot` option is needed to find static resources (CSS in our case). local server = luawt.WServer({ code = code, ip = '0.0.0.0', port = 12345, + docroot = './examples', }) server:start() server:waitForShutdown() diff --git a/examples/resources b/examples/resources new file mode 120000 index 0000000..a572e81 --- /dev/null +++ b/examples/resources @@ -0,0 +1 @@ +/usr/share/Wt/resources/ \ No newline at end of file diff --git a/luawt-0.0-1.rockspec b/luawt-0.0-1.rockspec index f15a759..8aff0e0 100644 --- a/luawt-0.0-1.rockspec +++ b/luawt-0.0-1.rockspec @@ -1,5 +1,5 @@ -- luawt, Lua bindings for Wt --- Copyright (c) 2015-2016 Pavel Dolgov and Boris Nagaev +-- Copyright (c) 2015-2017 Pavel Dolgov and Boris Nagaev -- See the LICENSE file for terms of use. local function merge(...) @@ -24,6 +24,7 @@ local common = { "src/luawt/WAbstractToggleButton.cpp", "src/luawt/WAnchor.cpp", "src/luawt/WAudio.cpp", + "src/luawt/WBreak.cpp", "src/luawt/WCalendar.cpp", "src/luawt/WCheckBox.cpp", "src/luawt/WComboBox.cpp", @@ -32,6 +33,7 @@ local common = { "src/luawt/WDateEdit.cpp", "src/luawt/WDatePicker.cpp", "src/luawt/WDefaultLoadingIndicator.cpp", + "src/luawt/WDialog.cpp", "src/luawt/WDoubleSpinBox.cpp", "src/luawt/WEnvironment.cpp", "src/luawt/WFileUpload.cpp", @@ -49,26 +51,33 @@ local common = { "src/luawt/WMediaPlayer.cpp", "src/luawt/WMenu.cpp", "src/luawt/WMenuItem.cpp", + "src/luawt/WMessageBox.cpp", "src/luawt/WNavigationBar.cpp", "src/luawt/WOverlayLoadingIndicator.cpp", "src/luawt/WPaintedWidget.cpp", "src/luawt/WPanel.cpp", "src/luawt/WPopupMenu.cpp", + "src/luawt/WPopupWidget.cpp", "src/luawt/WProgressBar.cpp", "src/luawt/WPushButton.cpp", + "src/luawt/WRadioButton.cpp", "src/luawt/WScrollArea.cpp", "src/luawt/WSelectionBox.cpp", "src/luawt/WSlider.cpp", "src/luawt/WSpinBox.cpp", "src/luawt/WSplitButton.cpp", "src/luawt/WStackedWidget.cpp", + "src/luawt/WSuggestionPopup.cpp", "src/luawt/WTabWidget.cpp", "src/luawt/WTable.cpp", + "src/luawt/WTableCell.cpp", "src/luawt/WTableView.cpp", "src/luawt/WTemplate.cpp", + "src/luawt/WTemplateFormView.cpp", "src/luawt/WText.cpp", "src/luawt/WTextArea.cpp", "src/luawt/WTextEdit.cpp", + "src/luawt/WTimerWidget.cpp", "src/luawt/WToolBar.cpp", "src/luawt/WTree.cpp", "src/luawt/WTreeNode.cpp", diff --git a/spec/luawt_spec.lua b/spec/luawt_spec.lua index aba0988..6132961 100644 --- a/spec/luawt_spec.lua +++ b/spec/luawt_spec.lua @@ -1,5 +1,5 @@ -- luawt, Lua bindings for Wt --- Copyright (c) 2015-2016 Pavel Dolgov and Boris Nagaev +-- Copyright (c) 2015-2017 Pavel Dolgov and Boris Nagaev -- See the LICENSE file for terms of use. local test = require 'luawt.test' diff --git a/spec/luawtest_spec.lua b/spec/luawtest_spec.lua index a0ed061..f9ddc62 100644 --- a/spec/luawtest_spec.lua +++ b/spec/luawtest_spec.lua @@ -1,5 +1,5 @@ -- luawt, Lua bindings for Wt --- Copyright (c) 2015-2016 Pavel Dolgov and Boris Nagaev +-- Copyright (c) 2015-2017 Pavel Dolgov and Boris Nagaev -- See the LICENSE file for terms of use. if os.getenv('UNDER_VALGRIND') then diff --git a/spec/shared_spec.lua b/spec/shared_spec.lua index b407854..94746e0 100644 --- a/spec/shared_spec.lua +++ b/spec/shared_spec.lua @@ -1,5 +1,5 @@ -- luawt, Lua bindings for Wt --- Copyright (c) 2015-2016 Pavel Dolgov and Boris Nagaev +-- Copyright (c) 2015-2017 Pavel Dolgov and Boris Nagaev -- See the LICENSE file for terms of use. local test = require 'luawt.test' diff --git a/spec/widgets_spec.lua b/spec/widgets_spec.lua index 8ba4c67..29e0d8d 100644 --- a/spec/widgets_spec.lua +++ b/spec/widgets_spec.lua @@ -1,5 +1,5 @@ -- luawt, Lua bindings for Wt --- Copyright (c) 2015-2016 Pavel Dolgov and Boris Nagaev +-- Copyright (c) 2015-2017 Pavel Dolgov and Boris Nagaev -- See the LICENSE file for terms of use. local test = require 'luawt.test' @@ -7,6 +7,9 @@ local test = require 'luawt.test' describe("luawt widgets", function() -- List of widgets tests + it("creates WBreak", function() + test.testWidget("WBreak", true) + end) it("creates WCalendar", function() test.testWidget("WCalendar", true) end) @@ -79,6 +82,9 @@ describe("luawt widgets", function() it("creates WTreeView", function() test.testWidget("WTreeView", true) end) + it("creates WTemplateFormView", function() + test.testWidget("WTemplateFormView", true) + end) it("creates WSlider", function() test.testWidget("WSlider", true) end) @@ -100,6 +106,9 @@ describe("luawt widgets", function() it("creates WOverlayLoadingIndicator", function() test.testWidget("WOverlayLoadingIndicator", false) end) + it("creates WRadioButton", function() + test.testWidget("WRadioButton", true) + end) it("creates WTabWidget", function() test.testWidget("WTabWidget", true) end) diff --git a/src/luawt/MyApplication.cpp b/src/luawt/MyApplication.cpp index f05780d..930affc 100644 --- a/src/luawt/MyApplication.cpp +++ b/src/luawt/MyApplication.cpp @@ -3,6 +3,7 @@ #include #include #include +#include #include #include "globals.hpp" @@ -50,8 +51,8 @@ int luawt_MyApplication_requireJQuery(lua_State* L) { if (index == 0) { char const * raw2 = lua_tostring(L, 2); std::string url = std::string(raw2); - bool result = self->requireJQuery(url); - lua_pushboolean(L, result); + bool l_result = self->requireJQuery(url); + lua_pushboolean(L, l_result); return 1; } else { @@ -68,8 +69,8 @@ int luawt_MyApplication_makeAbsoluteUrl(lua_State* L) { if (index == 0) { char const * raw2 = lua_tostring(L, 2); std::string url = std::string(raw2); - std::string result = self->makeAbsoluteUrl(url); - lua_pushstring(L, result.c_str()); + std::string l_result = self->makeAbsoluteUrl(url); + lua_pushstring(L, l_result.c_str()); return 1; } else { @@ -84,8 +85,8 @@ int luawt_MyApplication_bodyClass(lua_State* L) { int index = luawt_getSuitableArgsGroup(L, luawt_MyApplication_bodyClass_args); MyApplication* self = luawt_checkFromLua(L, 1); if (index == 0) { - std::string result = self->bodyClass(); - lua_pushstring(L, result.c_str()); + std::string l_result = self->bodyClass(); + lua_pushstring(L, l_result.c_str()); return 1; } else { @@ -189,8 +190,8 @@ int luawt_MyApplication_docType(lua_State* L) { int index = luawt_getSuitableArgsGroup(L, luawt_MyApplication_docType_args); MyApplication* self = luawt_checkFromLua(L, 1); if (index == 0) { - std::string result = self->docType(); - lua_pushstring(L, result.c_str()); + std::string l_result = self->docType(); + lua_pushstring(L, l_result.c_str()); return 1; } else { @@ -205,8 +206,8 @@ int luawt_MyApplication_isConnected(lua_State* L) { int index = luawt_getSuitableArgsGroup(L, luawt_MyApplication_isConnected_args); MyApplication* self = luawt_checkFromLua(L, 1); if (index == 0) { - bool result = self->isConnected(); - lua_pushboolean(L, result); + bool l_result = self->isConnected(); + lua_pushboolean(L, l_result); return 1; } else { @@ -246,8 +247,8 @@ int luawt_MyApplication_domRoot(lua_State* L) { int index = luawt_getSuitableArgsGroup(L, luawt_MyApplication_domRoot_args); MyApplication* self = luawt_checkFromLua(L, 1); if (index == 0) { - Wt::WContainerWidget * result = self->domRoot(); - luawt_toLua(L, result); + Wt::WContainerWidget * l_result = self->domRoot(); + luawt_toLua(L, l_result); return 1; } else { @@ -262,8 +263,8 @@ int luawt_MyApplication_maximumRequestSize(lua_State* L) { int index = luawt_getSuitableArgsGroup(L, luawt_MyApplication_maximumRequestSize_args); MyApplication* self = luawt_checkFromLua(L, 1); if (index == 0) { - int64_t result = self->maximumRequestSize(); - lua_pushinteger(L, result); + int64_t l_result = self->maximumRequestSize(); + lua_pushinteger(L, l_result); return 1; } else { @@ -278,8 +279,8 @@ int luawt_MyApplication_internalPathValid(lua_State* L) { int index = luawt_getSuitableArgsGroup(L, luawt_MyApplication_internalPathValid_args); MyApplication* self = luawt_checkFromLua(L, 1); if (index == 0) { - bool result = self->internalPathValid(); - lua_pushboolean(L, result); + bool l_result = self->internalPathValid(); + lua_pushboolean(L, l_result); return 1; } else { @@ -294,8 +295,8 @@ int luawt_MyApplication_relativeResourcesUrl(lua_State* L) { int index = luawt_getSuitableArgsGroup(L, luawt_MyApplication_relativeResourcesUrl_args); MyApplication* self = luawt_checkFromLua(L, 1); if (index == 0) { - std::string result = self->relativeResourcesUrl(); - lua_pushstring(L, result.c_str()); + std::string l_result = self->relativeResourcesUrl(); + lua_pushstring(L, l_result.c_str()); return 1; } else { @@ -327,8 +328,8 @@ int luawt_MyApplication_internalPathDefaultValid(lua_State* L) { int index = luawt_getSuitableArgsGroup(L, luawt_MyApplication_internalPathDefaultValid_args); MyApplication* self = luawt_checkFromLua(L, 1); if (index == 0) { - bool result = self->internalPathDefaultValid(); - lua_pushboolean(L, result); + bool l_result = self->internalPathDefaultValid(); + lua_pushboolean(L, l_result); return 1; } else { @@ -343,8 +344,8 @@ int luawt_MyApplication_ajaxMethod(lua_State* L) { int index = luawt_getSuitableArgsGroup(L, luawt_MyApplication_ajaxMethod_args); MyApplication* self = luawt_checkFromLua(L, 1); if (index == 0) { - Wt::WApplication::AjaxMethod result = self->ajaxMethod(); - lua_pushinteger(L, result); + Wt::WApplication::AjaxMethod l_result = self->ajaxMethod(); + lua_pushinteger(L, l_result); return 1; } else { @@ -361,8 +362,8 @@ int luawt_MyApplication_internalPathMatches(lua_State* L) { if (index == 0) { char const * raw2 = lua_tostring(L, 2); std::string path = std::string(raw2); - bool result = self->internalPathMatches(path); - lua_pushboolean(L, result); + bool l_result = self->internalPathMatches(path); + lua_pushboolean(L, l_result); return 1; } else { @@ -533,8 +534,8 @@ int luawt_MyApplication_layoutDirection(lua_State* L) { int index = luawt_getSuitableArgsGroup(L, luawt_MyApplication_layoutDirection_args); MyApplication* self = luawt_checkFromLua(L, 1); if (index == 0) { - Wt::LayoutDirection result = self->layoutDirection(); - lua_pushinteger(L, result); + Wt::LayoutDirection l_result = self->layoutDirection(); + lua_pushinteger(L, l_result); return 1; } else { @@ -549,8 +550,8 @@ int luawt_MyApplication_title(lua_State* L) { int index = luawt_getSuitableArgsGroup(L, luawt_MyApplication_title_args); MyApplication* self = luawt_checkFromLua(L, 1); if (index == 0) { - Wt::WString const & result = self->title(); - lua_pushstring(L, result.toUTF8().c_str()); + Wt::WString const & l_result = self->title(); + lua_pushstring(L, l_result.toUTF8().c_str()); return 1; } else { @@ -565,8 +566,8 @@ int luawt_MyApplication_onePixelGifUrl(lua_State* L) { int index = luawt_getSuitableArgsGroup(L, luawt_MyApplication_onePixelGifUrl_args); MyApplication* self = luawt_checkFromLua(L, 1); if (index == 0) { - std::string result = self->onePixelGifUrl(); - lua_pushstring(L, result.c_str()); + std::string l_result = self->onePixelGifUrl(); + lua_pushstring(L, l_result.c_str()); return 1; } else { @@ -581,8 +582,8 @@ int luawt_MyApplication_sessionId(lua_State* L) { int index = luawt_getSuitableArgsGroup(L, luawt_MyApplication_sessionId_args); MyApplication* self = luawt_checkFromLua(L, 1); if (index == 0) { - std::string result = self->sessionId(); - lua_pushstring(L, result.c_str()); + std::string l_result = self->sessionId(); + lua_pushstring(L, l_result.c_str()); return 1; } else { @@ -616,8 +617,8 @@ int luawt_MyApplication_javaScriptClass(lua_State* L) { int index = luawt_getSuitableArgsGroup(L, luawt_MyApplication_javaScriptClass_args); MyApplication* self = luawt_checkFromLua(L, 1); if (index == 0) { - std::string result = self->javaScriptClass(); - lua_pushstring(L, result.c_str()); + std::string l_result = self->javaScriptClass(); + lua_pushstring(L, l_result.c_str()); return 1; } else { @@ -754,6 +755,43 @@ int luawt_MyApplication_deferRendering(lua_State* L) { } } +static const char* MyApplication_useStyleSheet_args0[] = {luawt_typeToStr(), "char const *", NULL}; +static const char* MyApplication_useStyleSheet_args1[] = {luawt_typeToStr(), "char const *", "char const *", NULL}; +static const char* MyApplication_useStyleSheet_args2[] = {luawt_typeToStr(), "char const *", "char const *", "char const *", NULL}; +static const char* const* const luawt_MyApplication_useStyleSheet_args[] = {MyApplication_useStyleSheet_args0, MyApplication_useStyleSheet_args1, MyApplication_useStyleSheet_args2, NULL}; + +int luawt_MyApplication_useStyleSheet(lua_State* L) { + int index = luawt_getSuitableArgsGroup(L, luawt_MyApplication_useStyleSheet_args); + MyApplication* self = luawt_checkFromLua(L, 1); + if (index == 0) { + char const * raw2 = lua_tostring(L, 2); + Wt::WLink link = Wt::WLink(raw2); + self->useStyleSheet(link); + return 0; + + } else if (index == 1) { + char const * raw2 = lua_tostring(L, 2); + Wt::WLink link = Wt::WLink(raw2); + char const * raw3 = lua_tostring(L, 3); + std::string media = std::string(raw3); + self->useStyleSheet(link, media); + return 0; + + } else if (index == 2) { + char const * raw2 = lua_tostring(L, 2); + Wt::WLink link = Wt::WLink(raw2); + char const * raw3 = lua_tostring(L, 3); + std::string condition = std::string(raw3); + char const * raw4 = lua_tostring(L, 4); + std::string media = std::string(raw4); + self->useStyleSheet(link, condition, media); + return 0; + + } else { + return luaL_error(L, "Wrong arguments for MyApplication.useStyleSheet"); + } +} + static const char* MyApplication_bookmarkUrl_args0[] = {luawt_typeToStr(), NULL}; static const char* MyApplication_bookmarkUrl_args1[] = {luawt_typeToStr(), "char const *", NULL}; static const char* const* const luawt_MyApplication_bookmarkUrl_args[] = {MyApplication_bookmarkUrl_args0, MyApplication_bookmarkUrl_args1, NULL}; @@ -762,15 +800,15 @@ int luawt_MyApplication_bookmarkUrl(lua_State* L) { int index = luawt_getSuitableArgsGroup(L, luawt_MyApplication_bookmarkUrl_args); MyApplication* self = luawt_checkFromLua(L, 1); if (index == 0) { - std::string result = self->bookmarkUrl(); - lua_pushstring(L, result.c_str()); + std::string l_result = self->bookmarkUrl(); + lua_pushstring(L, l_result.c_str()); return 1; } else if (index == 1) { char const * raw2 = lua_tostring(L, 2); std::string internalPath = std::string(raw2); - std::string result = self->bookmarkUrl(internalPath); - lua_pushstring(L, result.c_str()); + std::string l_result = self->bookmarkUrl(internalPath); + lua_pushstring(L, l_result.c_str()); return 1; } else { @@ -787,8 +825,8 @@ int luawt_MyApplication_findWidget(lua_State* L) { if (index == 0) { char const * raw2 = lua_tostring(L, 2); std::string name = std::string(raw2); - Wt::WWidget * result = self->findWidget(name); - luawt_toLua(L, result); + Wt::WWidget * l_result = self->findWidget(name); + luawt_toLua(L, l_result); return 1; } else { @@ -805,8 +843,8 @@ int luawt_MyApplication_resolveRelativeUrl(lua_State* L) { if (index == 0) { char const * raw2 = lua_tostring(L, 2); std::string url = std::string(raw2); - std::string result = self->resolveRelativeUrl(url); - lua_pushstring(L, result.c_str()); + std::string l_result = self->resolveRelativeUrl(url); + lua_pushstring(L, l_result.c_str()); return 1; } else { @@ -821,8 +859,8 @@ int luawt_MyApplication_resourcesUrl(lua_State* L) { int index = luawt_getSuitableArgsGroup(L, luawt_MyApplication_resourcesUrl_args); MyApplication* self = luawt_checkFromLua(L, 1); if (index == 0) { - std::string result = self->resourcesUrl(); - lua_pushstring(L, result.c_str()); + std::string l_result = self->resourcesUrl(); + lua_pushstring(L, l_result.c_str()); return 1; } else { @@ -901,8 +939,8 @@ int luawt_MyApplication_require(lua_State* L) { if (index == 0) { char const * raw2 = lua_tostring(L, 2); std::string url = std::string(raw2); - bool result = self->require(url); - lua_pushboolean(L, result); + bool l_result = self->require(url); + lua_pushboolean(L, l_result); return 1; } else if (index == 1) { @@ -910,8 +948,8 @@ int luawt_MyApplication_require(lua_State* L) { std::string url = std::string(raw2); char const * raw3 = lua_tostring(L, 3); std::string symbol = std::string(raw3); - bool result = self->require(url, symbol); - lua_pushboolean(L, result); + bool l_result = self->require(url, symbol); + lua_pushboolean(L, l_result); return 1; } else { @@ -947,8 +985,8 @@ int luawt_MyApplication_pathMatches(lua_State* L) { std::string path = std::string(raw2); char const * raw3 = lua_tostring(L, 3); std::string query = std::string(raw3); - bool result = self->pathMatches(path, query); - lua_pushboolean(L, result); + bool l_result = self->pathMatches(path, query); + lua_pushboolean(L, l_result); return 1; } else { @@ -1024,8 +1062,8 @@ int luawt_MyApplication_encodeUntrustedUrl(lua_State* L) { if (index == 0) { char const * raw2 = lua_tostring(L, 2); std::string url = std::string(raw2); - std::string result = self->encodeUntrustedUrl(url); - lua_pushstring(L, result.c_str()); + std::string l_result = self->encodeUntrustedUrl(url); + lua_pushstring(L, l_result.c_str()); return 1; } else { @@ -1055,8 +1093,8 @@ int luawt_MyApplication_hasQuit(lua_State* L) { int index = luawt_getSuitableArgsGroup(L, luawt_MyApplication_hasQuit_args); MyApplication* self = luawt_checkFromLua(L, 1); if (index == 0) { - bool result = self->hasQuit(); - lua_pushboolean(L, result); + bool l_result = self->hasQuit(); + lua_pushboolean(L, l_result); return 1; } else { @@ -1073,8 +1111,8 @@ int luawt_MyApplication_internalPathNextPart(lua_State* L) { if (index == 0) { char const * raw2 = lua_tostring(L, 2); std::string path = std::string(raw2); - std::string result = self->internalPathNextPart(path); - lua_pushstring(L, result.c_str()); + std::string l_result = self->internalPathNextPart(path); + lua_pushstring(L, l_result.c_str()); return 1; } else { @@ -1196,8 +1234,8 @@ int luawt_MyApplication_internalSubPath(lua_State* L) { if (index == 0) { char const * raw2 = lua_tostring(L, 2); std::string path = std::string(raw2); - std::string result = self->internalSubPath(path); - lua_pushstring(L, result.c_str()); + std::string l_result = self->internalSubPath(path); + lua_pushstring(L, l_result.c_str()); return 1; } else { @@ -1213,15 +1251,15 @@ int luawt_MyApplication_url(lua_State* L) { int index = luawt_getSuitableArgsGroup(L, luawt_MyApplication_url_args); MyApplication* self = luawt_checkFromLua(L, 1); if (index == 0) { - std::string result = self->url(); - lua_pushstring(L, result.c_str()); + std::string l_result = self->url(); + lua_pushstring(L, l_result.c_str()); return 1; } else if (index == 1) { char const * raw2 = lua_tostring(L, 2); std::string internalPath = std::string(raw2); - std::string result = self->url(internalPath); - lua_pushstring(L, result.c_str()); + std::string l_result = self->url(internalPath); + lua_pushstring(L, l_result.c_str()); return 1; } else { @@ -1236,8 +1274,8 @@ int luawt_MyApplication_root(lua_State* L) { int index = luawt_getSuitableArgsGroup(L, luawt_MyApplication_root_args); MyApplication* self = luawt_checkFromLua(L, 1); if (index == 0) { - Wt::WContainerWidget * result = self->root(); - luawt_toLua(L, result); + Wt::WContainerWidget * l_result = self->root(); + luawt_toLua(L, l_result); return 1; } else { @@ -1252,8 +1290,8 @@ int luawt_MyApplication_appRoot(lua_State* L) { int index = luawt_getSuitableArgsGroup(L, luawt_MyApplication_appRoot_args); MyApplication* self = luawt_checkFromLua(L, 1); if (index == 0) { - std::string result = self->appRoot(); - lua_pushstring(L, result.c_str()); + std::string l_result = self->appRoot(); + lua_pushstring(L, l_result.c_str()); return 1; } else { @@ -1268,8 +1306,8 @@ int luawt_MyApplication_customJQuery(lua_State* L) { int index = luawt_getSuitableArgsGroup(L, luawt_MyApplication_customJQuery_args); MyApplication* self = luawt_checkFromLua(L, 1); if (index == 0) { - bool result = self->customJQuery(); - lua_pushboolean(L, result); + bool l_result = self->customJQuery(); + lua_pushboolean(L, l_result); return 1; } else { @@ -1314,8 +1352,8 @@ int luawt_MyApplication_updatesEnabled(lua_State* L) { int index = luawt_getSuitableArgsGroup(L, luawt_MyApplication_updatesEnabled_args); MyApplication* self = luawt_checkFromLua(L, 1); if (index == 0) { - bool result = self->updatesEnabled(); - lua_pushboolean(L, result); + bool l_result = self->updatesEnabled(); + lua_pushboolean(L, l_result); return 1; } else { @@ -1346,8 +1384,8 @@ int luawt_MyApplication_internalPath(lua_State* L) { int index = luawt_getSuitableArgsGroup(L, luawt_MyApplication_internalPath_args); MyApplication* self = luawt_checkFromLua(L, 1); if (index == 0) { - std::string result = self->internalPath(); - lua_pushstring(L, result.c_str()); + std::string l_result = self->internalPath(); + lua_pushstring(L, l_result.c_str()); return 1; } else { @@ -1394,8 +1432,8 @@ int luawt_MyApplication_domRoot2(lua_State* L) { int index = luawt_getSuitableArgsGroup(L, luawt_MyApplication_domRoot2_args); MyApplication* self = luawt_checkFromLua(L, 1); if (index == 0) { - Wt::WContainerWidget * result = self->domRoot2(); - luawt_toLua(L, result); + Wt::WContainerWidget * l_result = self->domRoot2(); + luawt_toLua(L, l_result); return 1; } else { @@ -1438,8 +1476,8 @@ int luawt_MyApplication_debug(lua_State* L) { int index = luawt_getSuitableArgsGroup(L, luawt_MyApplication_debug_args); MyApplication* self = luawt_checkFromLua(L, 1); if (index == 0) { - bool result = self->debug(); - lua_pushboolean(L, result); + bool l_result = self->debug(); + lua_pushboolean(L, l_result); return 1; } else { @@ -1454,8 +1492,8 @@ int luawt_MyApplication_docRoot(lua_State* L) { int index = luawt_getSuitableArgsGroup(L, luawt_MyApplication_docRoot_args); MyApplication* self = luawt_checkFromLua(L, 1); if (index == 0) { - std::string result = self->docRoot(); - lua_pushstring(L, result.c_str()); + std::string l_result = self->docRoot(); + lua_pushstring(L, l_result.c_str()); return 1; } else { @@ -1470,8 +1508,8 @@ int luawt_MyApplication_isQuited(lua_State* L) { int index = luawt_getSuitableArgsGroup(L, luawt_MyApplication_isQuited_args); MyApplication* self = luawt_checkFromLua(L, 1); if (index == 0) { - bool result = self->isQuited(); - lua_pushboolean(L, result); + bool l_result = self->isQuited(); + lua_pushboolean(L, l_result); return 1; } else { @@ -1486,8 +1524,8 @@ int luawt_MyApplication_htmlClass(lua_State* L) { int index = luawt_getSuitableArgsGroup(L, luawt_MyApplication_htmlClass_args); MyApplication* self = luawt_checkFromLua(L, 1); if (index == 0) { - std::string result = self->htmlClass(); - lua_pushstring(L, result.c_str()); + std::string l_result = self->htmlClass(); + lua_pushstring(L, l_result.c_str()); return 1; } else { @@ -1502,8 +1540,8 @@ int luawt_MyApplication_closeMessage(lua_State* L) { int index = luawt_getSuitableArgsGroup(L, luawt_MyApplication_closeMessage_args); MyApplication* self = luawt_checkFromLua(L, 1); if (index == 0) { - Wt::WString const & result = self->closeMessage(); - lua_pushstring(L, result.toUTF8().c_str()); + Wt::WString const & l_result = self->closeMessage(); + lua_pushstring(L, l_result.toUTF8().c_str()); return 1; } else { @@ -1520,6 +1558,8 @@ ADD_SIGNAL(globalEscapePressed, MyApplication, Wt::NoClass) static const luaL_Reg luawt_MyApplication_methods[] = { METHOD(MyApplication, root), METHOD(MyApplication, findWidget), + METHOD(MyApplication, useStyleSheet), + METHOD(MyApplication, useStyleSheet), METHOD(MyApplication, setCssTheme), METHOD(MyApplication, setLayoutDirection), METHOD(MyApplication, layoutDirection), diff --git a/src/luawt/WAbstractItemView.cpp b/src/luawt/WAbstractItemView.cpp index 899706e..b071773 100644 --- a/src/luawt/WAbstractItemView.cpp +++ b/src/luawt/WAbstractItemView.cpp @@ -1,5 +1,6 @@ #include "boost-xtime.hpp" +#include #include #include "globals.hpp" @@ -11,8 +12,8 @@ int luawt_WAbstractItemView_sortColumn(lua_State* L) { int index = luawt_getSuitableArgsGroup(L, luawt_WAbstractItemView_sortColumn_args); WAbstractItemView* self = luawt_checkFromLua(L, 1); if (index == 0) { - int result = self->sortColumn(); - lua_pushinteger(L, result); + int l_result = self->sortColumn(); + lua_pushinteger(L, l_result); return 1; } else { @@ -20,6 +21,39 @@ int luawt_WAbstractItemView_sortColumn(lua_State* L) { } } +static const char* WAbstractItemView_setRowHeight_args0[] = {luawt_typeToStr(), "double", NULL}; +static const char* const* const luawt_WAbstractItemView_setRowHeight_args[] = {WAbstractItemView_setRowHeight_args0, NULL}; + +int luawt_WAbstractItemView_setRowHeight(lua_State* L) { + int index = luawt_getSuitableArgsGroup(L, luawt_WAbstractItemView_setRowHeight_args); + WAbstractItemView* self = luawt_checkFromLua(L, 1); + if (index == 0) { + double raw2 = lua_tonumber(L, 2); + Wt::WLength rowHeight = Wt::WLength(raw2); + self->setRowHeight(rowHeight); + return 0; + + } else { + return luaL_error(L, "Wrong arguments for WAbstractItemView.setRowHeight"); + } +} + +static const char* WAbstractItemView_editOptions_args0[] = {luawt_typeToStr(), NULL}; +static const char* const* const luawt_WAbstractItemView_editOptions_args[] = {WAbstractItemView_editOptions_args0, NULL}; + +int luawt_WAbstractItemView_editOptions(lua_State* L) { + int index = luawt_getSuitableArgsGroup(L, luawt_WAbstractItemView_editOptions_args); + WAbstractItemView* self = luawt_checkFromLua(L, 1); + if (index == 0) { + Wt::WFlags l_result = self->editOptions(); + lua_pushinteger(L, l_result); + return 1; + + } else { + return luaL_error(L, "Wrong arguments for WAbstractItemView.editOptions"); + } +} + static const char* WAbstractItemView_pageSize_args0[] = {luawt_typeToStr(), NULL}; static const char* const* const luawt_WAbstractItemView_pageSize_args[] = {WAbstractItemView_pageSize_args0, NULL}; @@ -27,8 +61,8 @@ int luawt_WAbstractItemView_pageSize(lua_State* L) { int index = luawt_getSuitableArgsGroup(L, luawt_WAbstractItemView_pageSize_args); WAbstractItemView* self = luawt_checkFromLua(L, 1); if (index == 0) { - int result = self->pageSize(); - lua_pushinteger(L, result); + int l_result = self->pageSize(); + lua_pushinteger(L, l_result); return 1; } else { @@ -43,8 +77,8 @@ int luawt_WAbstractItemView_pageCount(lua_State* L) { int index = luawt_getSuitableArgsGroup(L, luawt_WAbstractItemView_pageCount_args); WAbstractItemView* self = luawt_checkFromLua(L, 1); if (index == 0) { - int result = self->pageCount(); - lua_pushinteger(L, result); + int l_result = self->pageCount(); + lua_pushinteger(L, l_result); return 1; } else { @@ -76,8 +110,8 @@ int luawt_WAbstractItemView_columnAlignment(lua_State* L) { WAbstractItemView* self = luawt_checkFromLua(L, 1); if (index == 0) { int column = lua_tointeger(L, 2); - Wt::AlignmentFlag result = self->columnAlignment(column); - lua_pushinteger(L, result); + Wt::AlignmentFlag l_result = self->columnAlignment(column); + lua_pushinteger(L, l_result); return 1; } else { @@ -101,6 +135,24 @@ int luawt_WAbstractItemView_setDragEnabled(lua_State* L) { } } +static const char* WAbstractItemView_setColumnWidth_args0[] = {luawt_typeToStr(), "int", "double", NULL}; +static const char* const* const luawt_WAbstractItemView_setColumnWidth_args[] = {WAbstractItemView_setColumnWidth_args0, NULL}; + +int luawt_WAbstractItemView_setColumnWidth(lua_State* L) { + int index = luawt_getSuitableArgsGroup(L, luawt_WAbstractItemView_setColumnWidth_args); + WAbstractItemView* self = luawt_checkFromLua(L, 1); + if (index == 0) { + int column = lua_tointeger(L, 2); + double raw3 = lua_tonumber(L, 3); + Wt::WLength width = Wt::WLength(raw3); + self->setColumnWidth(column, width); + return 0; + + } else { + return luaL_error(L, "Wrong arguments for WAbstractItemView.setColumnWidth"); + } +} + static const char* WAbstractItemView_isEditing_args0[] = {luawt_typeToStr(), NULL}; static const char* const* const luawt_WAbstractItemView_isEditing_args[] = {WAbstractItemView_isEditing_args0, NULL}; @@ -108,8 +160,8 @@ int luawt_WAbstractItemView_isEditing(lua_State* L) { int index = luawt_getSuitableArgsGroup(L, luawt_WAbstractItemView_isEditing_args); WAbstractItemView* self = luawt_checkFromLua(L, 1); if (index == 0) { - bool result = self->isEditing(); - lua_pushboolean(L, result); + bool l_result = self->isEditing(); + lua_pushboolean(L, l_result); return 1; } else { @@ -117,19 +169,19 @@ int luawt_WAbstractItemView_isEditing(lua_State* L) { } } -static const char* WAbstractItemView_column1Fixed_args0[] = {luawt_typeToStr(), NULL}; -static const char* const* const luawt_WAbstractItemView_column1Fixed_args[] = {WAbstractItemView_column1Fixed_args0, NULL}; +static const char* WAbstractItemView_setColumn1Fixed_args0[] = {luawt_typeToStr(), "bool", NULL}; +static const char* const* const luawt_WAbstractItemView_setColumn1Fixed_args[] = {WAbstractItemView_setColumn1Fixed_args0, NULL}; -int luawt_WAbstractItemView_column1Fixed(lua_State* L) { - int index = luawt_getSuitableArgsGroup(L, luawt_WAbstractItemView_column1Fixed_args); +int luawt_WAbstractItemView_setColumn1Fixed(lua_State* L) { + int index = luawt_getSuitableArgsGroup(L, luawt_WAbstractItemView_setColumn1Fixed_args); WAbstractItemView* self = luawt_checkFromLua(L, 1); if (index == 0) { - bool result = self->column1Fixed(); - lua_pushboolean(L, result); - return 1; - + bool enable = lua_toboolean(L, 2); + self->setColumn1Fixed(enable); + return 0; + } else { - return luaL_error(L, "Wrong arguments for WAbstractItemView.column1Fixed"); + return luaL_error(L, "Wrong arguments for WAbstractItemView.setColumn1Fixed"); } } @@ -166,6 +218,22 @@ int luawt_WAbstractItemView_setHeaderWordWrap(lua_State* L) { } } +static const char* WAbstractItemView_setEditOptions_args0[] = {luawt_typeToStr(), "int", NULL}; +static const char* const* const luawt_WAbstractItemView_setEditOptions_args[] = {WAbstractItemView_setEditOptions_args0, NULL}; + +int luawt_WAbstractItemView_setEditOptions(lua_State* L) { + int index = luawt_getSuitableArgsGroup(L, luawt_WAbstractItemView_setEditOptions_args); + WAbstractItemView* self = luawt_checkFromLua(L, 1); + if (index == 0) { + Wt::WFlags options = static_cast(lua_tointeger(L, 2)); + self->setEditOptions(options); + return 0; + + } else { + return luaL_error(L, "Wrong arguments for WAbstractItemView.setEditOptions"); + } +} + static const char* WAbstractItemView_hideColumn_args0[] = {luawt_typeToStr(), "int", NULL}; static const char* const* const luawt_WAbstractItemView_hideColumn_args[] = {WAbstractItemView_hideColumn_args0, NULL}; @@ -190,8 +258,8 @@ int luawt_WAbstractItemView_headerAlignment(lua_State* L) { WAbstractItemView* self = luawt_checkFromLua(L, 1); if (index == 0) { int column = lua_tointeger(L, 2); - Wt::AlignmentFlag result = self->headerAlignment(column); - lua_pushinteger(L, result); + Wt::AlignmentFlag l_result = self->headerAlignment(column); + lua_pushinteger(L, l_result); return 1; } else { @@ -240,8 +308,8 @@ int luawt_WAbstractItemView_isColumnHidden(lua_State* L) { WAbstractItemView* self = luawt_checkFromLua(L, 1); if (index == 0) { int column = lua_tointeger(L, 2); - bool result = self->isColumnHidden(column); - lua_pushboolean(L, result); + bool l_result = self->isColumnHidden(column); + lua_pushboolean(L, l_result); return 1; } else { @@ -256,8 +324,8 @@ int luawt_WAbstractItemView_sortOrder(lua_State* L) { int index = luawt_getSuitableArgsGroup(L, luawt_WAbstractItemView_sortOrder_args); WAbstractItemView* self = luawt_checkFromLua(L, 1); if (index == 0) { - Wt::SortOrder result = self->sortOrder(); - lua_pushinteger(L, result); + Wt::SortOrder l_result = self->sortOrder(); + lua_pushinteger(L, l_result); return 1; } else { @@ -272,8 +340,8 @@ int luawt_WAbstractItemView_rowHeaderCount(lua_State* L) { int index = luawt_getSuitableArgsGroup(L, luawt_WAbstractItemView_rowHeaderCount_args); WAbstractItemView* self = luawt_checkFromLua(L, 1); if (index == 0) { - int result = self->rowHeaderCount(); - lua_pushinteger(L, result); + int l_result = self->rowHeaderCount(); + lua_pushinteger(L, l_result); return 1; } else { @@ -305,8 +373,8 @@ int luawt_WAbstractItemView_currentPage(lua_State* L) { int index = luawt_getSuitableArgsGroup(L, luawt_WAbstractItemView_currentPage_args); WAbstractItemView* self = luawt_checkFromLua(L, 1); if (index == 0) { - int result = self->currentPage(); - lua_pushinteger(L, result); + int l_result = self->currentPage(); + lua_pushinteger(L, l_result); return 1; } else { @@ -314,6 +382,22 @@ int luawt_WAbstractItemView_currentPage(lua_State* L) { } } +static const char* WAbstractItemView_headerHeight_args0[] = {luawt_typeToStr(), NULL}; +static const char* const* const luawt_WAbstractItemView_headerHeight_args[] = {WAbstractItemView_headerHeight_args0, NULL}; + +int luawt_WAbstractItemView_headerHeight(lua_State* L) { + int index = luawt_getSuitableArgsGroup(L, luawt_WAbstractItemView_headerHeight_args); + WAbstractItemView* self = luawt_checkFromLua(L, 1); + if (index == 0) { + Wt::WLength const & l_result = self->headerHeight(); + lua_pushnumber(L, l_result.value()); + return 1; + + } else { + return luaL_error(L, "Wrong arguments for WAbstractItemView.headerHeight"); + } +} + static const char* WAbstractItemView_showColumn_args0[] = {luawt_typeToStr(), "int", NULL}; static const char* const* const luawt_WAbstractItemView_showColumn_args[] = {WAbstractItemView_showColumn_args0, NULL}; @@ -338,8 +422,8 @@ int luawt_WAbstractItemView_verticalHeaderAlignment(lua_State* L) { WAbstractItemView* self = luawt_checkFromLua(L, 1); if (index == 0) { int column = lua_tointeger(L, 2); - Wt::AlignmentFlag result = self->verticalHeaderAlignment(column); - lua_pushinteger(L, result); + Wt::AlignmentFlag l_result = self->verticalHeaderAlignment(column); + lua_pushinteger(L, l_result); return 1; } else { @@ -355,14 +439,14 @@ int luawt_WAbstractItemView_isSortingEnabled(lua_State* L) { int index = luawt_getSuitableArgsGroup(L, luawt_WAbstractItemView_isSortingEnabled_args); WAbstractItemView* self = luawt_checkFromLua(L, 1); if (index == 0) { - bool result = self->isSortingEnabled(); - lua_pushboolean(L, result); + bool l_result = self->isSortingEnabled(); + lua_pushboolean(L, l_result); return 1; } else if (index == 1) { int column = lua_tointeger(L, 2); - bool result = self->isSortingEnabled(column); - lua_pushboolean(L, result); + bool l_result = self->isSortingEnabled(column); + lua_pushboolean(L, l_result); return 1; } else { @@ -377,8 +461,8 @@ int luawt_WAbstractItemView_alternatingRowColors(lua_State* L) { int index = luawt_getSuitableArgsGroup(L, luawt_WAbstractItemView_alternatingRowColors_args); WAbstractItemView* self = luawt_checkFromLua(L, 1); if (index == 0) { - bool result = self->alternatingRowColors(); - lua_pushboolean(L, result); + bool l_result = self->alternatingRowColors(); + lua_pushboolean(L, l_result); return 1; } else { @@ -407,19 +491,61 @@ int luawt_WAbstractItemView_closeEditors(lua_State* L) { } } -static const char* WAbstractItemView_setColumn1Fixed_args0[] = {luawt_typeToStr(), "bool", NULL}; -static const char* const* const luawt_WAbstractItemView_setColumn1Fixed_args[] = {WAbstractItemView_setColumn1Fixed_args0, NULL}; +static const char* WAbstractItemView_editTriggers_args0[] = {luawt_typeToStr(), NULL}; +static const char* const* const luawt_WAbstractItemView_editTriggers_args[] = {WAbstractItemView_editTriggers_args0, NULL}; -int luawt_WAbstractItemView_setColumn1Fixed(lua_State* L) { - int index = luawt_getSuitableArgsGroup(L, luawt_WAbstractItemView_setColumn1Fixed_args); +int luawt_WAbstractItemView_editTriggers(lua_State* L) { + int index = luawt_getSuitableArgsGroup(L, luawt_WAbstractItemView_editTriggers_args); WAbstractItemView* self = luawt_checkFromLua(L, 1); if (index == 0) { - bool enable = lua_toboolean(L, 2); - self->setColumn1Fixed(enable); + Wt::WFlags l_result = self->editTriggers(); + lua_pushinteger(L, l_result); + return 1; + + } else { + return luaL_error(L, "Wrong arguments for WAbstractItemView.editTriggers"); + } +} + +static const char* WAbstractItemView_setHeaderAlignment_args0[] = {luawt_typeToStr(), "int", "int", NULL}; +static const char* const* const luawt_WAbstractItemView_setHeaderAlignment_args[] = {WAbstractItemView_setHeaderAlignment_args0, NULL}; + +int luawt_WAbstractItemView_setHeaderAlignment(lua_State* L) { + int index = luawt_getSuitableArgsGroup(L, luawt_WAbstractItemView_setHeaderAlignment_args); + WAbstractItemView* self = luawt_checkFromLua(L, 1); + if (index == 0) { + int column = lua_tointeger(L, 2); + Wt::WFlags alignment = static_cast(lua_tointeger(L, 3)); + self->setHeaderAlignment(column, alignment); return 0; } else { - return luaL_error(L, "Wrong arguments for WAbstractItemView.setColumn1Fixed"); + return luaL_error(L, "Wrong arguments for WAbstractItemView.setHeaderAlignment"); + } +} + +static const char* WAbstractItemView_setHeaderHeight_args0[] = {luawt_typeToStr(), "double", NULL}; +static const char* WAbstractItemView_setHeaderHeight_args1[] = {luawt_typeToStr(), "double", "bool", NULL}; +static const char* const* const luawt_WAbstractItemView_setHeaderHeight_args[] = {WAbstractItemView_setHeaderHeight_args0, WAbstractItemView_setHeaderHeight_args1, NULL}; + +int luawt_WAbstractItemView_setHeaderHeight(lua_State* L) { + int index = luawt_getSuitableArgsGroup(L, luawt_WAbstractItemView_setHeaderHeight_args); + WAbstractItemView* self = luawt_checkFromLua(L, 1); + if (index == 0) { + double raw2 = lua_tonumber(L, 2); + Wt::WLength height = Wt::WLength(raw2); + self->setHeaderHeight(height); + return 0; + + } else if (index == 1) { + double raw2 = lua_tonumber(L, 2); + Wt::WLength height = Wt::WLength(raw2); + bool multiLine = lua_toboolean(L, 3); + self->setHeaderHeight(height, multiLine); + return 0; + + } else { + return luaL_error(L, "Wrong arguments for WAbstractItemView.setHeaderHeight"); } } @@ -430,8 +556,8 @@ int luawt_WAbstractItemView_selectionMode(lua_State* L) { int index = luawt_getSuitableArgsGroup(L, luawt_WAbstractItemView_selectionMode_args); WAbstractItemView* self = luawt_checkFromLua(L, 1); if (index == 0) { - Wt::SelectionMode result = self->selectionMode(); - lua_pushinteger(L, result); + Wt::SelectionMode l_result = self->selectionMode(); + lua_pushinteger(L, l_result); return 1; } else { @@ -455,6 +581,38 @@ int luawt_WAbstractItemView_setCurrentPage(lua_State* L) { } } +static const char* WAbstractItemView_column1Fixed_args0[] = {luawt_typeToStr(), NULL}; +static const char* const* const luawt_WAbstractItemView_column1Fixed_args[] = {WAbstractItemView_column1Fixed_args0, NULL}; + +int luawt_WAbstractItemView_column1Fixed(lua_State* L) { + int index = luawt_getSuitableArgsGroup(L, luawt_WAbstractItemView_column1Fixed_args); + WAbstractItemView* self = luawt_checkFromLua(L, 1); + if (index == 0) { + bool l_result = self->column1Fixed(); + lua_pushboolean(L, l_result); + return 1; + + } else { + return luaL_error(L, "Wrong arguments for WAbstractItemView.column1Fixed"); + } +} + +static const char* WAbstractItemView_setEditTriggers_args0[] = {luawt_typeToStr(), "int", NULL}; +static const char* const* const luawt_WAbstractItemView_setEditTriggers_args[] = {WAbstractItemView_setEditTriggers_args0, NULL}; + +int luawt_WAbstractItemView_setEditTriggers(lua_State* L) { + int index = luawt_getSuitableArgsGroup(L, luawt_WAbstractItemView_setEditTriggers_args); + WAbstractItemView* self = luawt_checkFromLua(L, 1); + if (index == 0) { + Wt::WFlags editTriggers = static_cast(lua_tointeger(L, 2)); + self->setEditTriggers(editTriggers); + return 0; + + } else { + return luaL_error(L, "Wrong arguments for WAbstractItemView.setEditTriggers"); + } +} + static const char* WAbstractItemView_horizontalHeaderAlignment_args0[] = {luawt_typeToStr(), "int", NULL}; static const char* const* const luawt_WAbstractItemView_horizontalHeaderAlignment_args[] = {WAbstractItemView_horizontalHeaderAlignment_args0, NULL}; @@ -463,8 +621,8 @@ int luawt_WAbstractItemView_horizontalHeaderAlignment(lua_State* L) { WAbstractItemView* self = luawt_checkFromLua(L, 1); if (index == 0) { int column = lua_tointeger(L, 2); - Wt::AlignmentFlag result = self->horizontalHeaderAlignment(column); - lua_pushinteger(L, result); + Wt::AlignmentFlag l_result = self->horizontalHeaderAlignment(column); + lua_pushinteger(L, l_result); return 1; } else { @@ -472,6 +630,22 @@ int luawt_WAbstractItemView_horizontalHeaderAlignment(lua_State* L) { } } +static const char* WAbstractItemView_rowHeight_args0[] = {luawt_typeToStr(), NULL}; +static const char* const* const luawt_WAbstractItemView_rowHeight_args[] = {WAbstractItemView_rowHeight_args0, NULL}; + +int luawt_WAbstractItemView_rowHeight(lua_State* L) { + int index = luawt_getSuitableArgsGroup(L, luawt_WAbstractItemView_rowHeight_args); + WAbstractItemView* self = luawt_checkFromLua(L, 1); + if (index == 0) { + Wt::WLength const & l_result = self->rowHeight(); + lua_pushnumber(L, l_result.value()); + return 1; + + } else { + return luaL_error(L, "Wrong arguments for WAbstractItemView.rowHeight"); + } +} + static const char* WAbstractItemView_setSelectionMode_args0[] = {luawt_typeToStr(), "int", NULL}; static const char* const* const luawt_WAbstractItemView_setSelectionMode_args[] = {WAbstractItemView_setSelectionMode_args0, NULL}; @@ -488,6 +662,23 @@ int luawt_WAbstractItemView_setSelectionMode(lua_State* L) { } } +static const char* WAbstractItemView_columnWidth_args0[] = {luawt_typeToStr(), "int", NULL}; +static const char* const* const luawt_WAbstractItemView_columnWidth_args[] = {WAbstractItemView_columnWidth_args0, NULL}; + +int luawt_WAbstractItemView_columnWidth(lua_State* L) { + int index = luawt_getSuitableArgsGroup(L, luawt_WAbstractItemView_columnWidth_args); + WAbstractItemView* self = luawt_checkFromLua(L, 1); + if (index == 0) { + int column = lua_tointeger(L, 2); + Wt::WLength l_result = self->columnWidth(column); + lua_pushnumber(L, l_result.value()); + return 1; + + } else { + return luaL_error(L, "Wrong arguments for WAbstractItemView.columnWidth"); + } +} + static const char* WAbstractItemView_validateEditors_args0[] = {luawt_typeToStr(), NULL}; static const char* const* const luawt_WAbstractItemView_validateEditors_args[] = {WAbstractItemView_validateEditors_args0, NULL}; @@ -495,8 +686,8 @@ int luawt_WAbstractItemView_validateEditors(lua_State* L) { int index = luawt_getSuitableArgsGroup(L, luawt_WAbstractItemView_validateEditors_args); WAbstractItemView* self = luawt_checkFromLua(L, 1); if (index == 0) { - Wt::WValidator::State result = self->validateEditors(); - lua_pushinteger(L, result); + Wt::WValidator::State l_result = self->validateEditors(); + lua_pushinteger(L, l_result); return 1; } else { @@ -567,8 +758,8 @@ int luawt_WAbstractItemView_isColumnResizeEnabled(lua_State* L) { int index = luawt_getSuitableArgsGroup(L, luawt_WAbstractItemView_isColumnResizeEnabled_args); WAbstractItemView* self = luawt_checkFromLua(L, 1); if (index == 0) { - bool result = self->isColumnResizeEnabled(); - lua_pushboolean(L, result); + bool l_result = self->isColumnResizeEnabled(); + lua_pushboolean(L, l_result); return 1; } else { @@ -583,8 +774,8 @@ int luawt_WAbstractItemView_selectionBehavior(lua_State* L) { int index = luawt_getSuitableArgsGroup(L, luawt_WAbstractItemView_selectionBehavior_args); WAbstractItemView* self = luawt_checkFromLua(L, 1); if (index == 0) { - Wt::SelectionBehavior result = self->selectionBehavior(); - lua_pushinteger(L, result); + Wt::SelectionBehavior l_result = self->selectionBehavior(); + lua_pushinteger(L, l_result); return 1; } else { @@ -612,6 +803,7 @@ int luawt_WAbstractItemView_setColumnResizeEnabled(lua_State* L) { static const luaL_Reg luawt_WAbstractItemView_methods[] = { METHOD(WAbstractItemView, setColumnAlignment), METHOD(WAbstractItemView, columnAlignment), + METHOD(WAbstractItemView, setHeaderAlignment), METHOD(WAbstractItemView, headerAlignment), METHOD(WAbstractItemView, horizontalHeaderAlignment), METHOD(WAbstractItemView, verticalHeaderAlignment), @@ -634,14 +826,25 @@ static const luaL_Reg luawt_WAbstractItemView_methods[] = { METHOD(WAbstractItemView, selectionMode), METHOD(WAbstractItemView, setDragEnabled), METHOD(WAbstractItemView, setDropsEnabled), + METHOD(WAbstractItemView, setRowHeight), + METHOD(WAbstractItemView, rowHeight), + METHOD(WAbstractItemView, setColumnWidth), + METHOD(WAbstractItemView, columnWidth), METHOD(WAbstractItemView, setColumnHidden), METHOD(WAbstractItemView, isColumnHidden), METHOD(WAbstractItemView, hideColumn), METHOD(WAbstractItemView, showColumn), + METHOD(WAbstractItemView, setHeaderHeight), + METHOD(WAbstractItemView, setHeaderHeight), + METHOD(WAbstractItemView, headerHeight), METHOD(WAbstractItemView, pageCount), METHOD(WAbstractItemView, pageSize), METHOD(WAbstractItemView, currentPage), METHOD(WAbstractItemView, setCurrentPage), + METHOD(WAbstractItemView, setEditTriggers), + METHOD(WAbstractItemView, editTriggers), + METHOD(WAbstractItemView, setEditOptions), + METHOD(WAbstractItemView, editOptions), METHOD(WAbstractItemView, closeEditors), METHOD(WAbstractItemView, validateEditors), METHOD(WAbstractItemView, isEditing), diff --git a/src/luawt/WAbstractMedia.cpp b/src/luawt/WAbstractMedia.cpp index 71b7ad1..bccaede 100644 --- a/src/luawt/WAbstractMedia.cpp +++ b/src/luawt/WAbstractMedia.cpp @@ -2,6 +2,7 @@ #include #include +#include #include "globals.hpp" @@ -35,6 +36,43 @@ int luawt_WAbstractMedia_pause(lua_State* L) { } } +static const char* WAbstractMedia_addSource_args0[] = {luawt_typeToStr(), "char const *", NULL}; +static const char* WAbstractMedia_addSource_args1[] = {luawt_typeToStr(), "char const *", "char const *", NULL}; +static const char* WAbstractMedia_addSource_args2[] = {luawt_typeToStr(), "char const *", "char const *", "char const *", NULL}; +static const char* const* const luawt_WAbstractMedia_addSource_args[] = {WAbstractMedia_addSource_args0, WAbstractMedia_addSource_args1, WAbstractMedia_addSource_args2, NULL}; + +int luawt_WAbstractMedia_addSource(lua_State* L) { + int index = luawt_getSuitableArgsGroup(L, luawt_WAbstractMedia_addSource_args); + WAbstractMedia* self = luawt_checkFromLua(L, 1); + if (index == 0) { + char const * raw2 = lua_tostring(L, 2); + Wt::WLink source = Wt::WLink(raw2); + self->addSource(source); + return 0; + + } else if (index == 1) { + char const * raw2 = lua_tostring(L, 2); + Wt::WLink source = Wt::WLink(raw2); + char const * raw3 = lua_tostring(L, 3); + std::string type = std::string(raw3); + self->addSource(source, type); + return 0; + + } else if (index == 2) { + char const * raw2 = lua_tostring(L, 2); + Wt::WLink source = Wt::WLink(raw2); + char const * raw3 = lua_tostring(L, 3); + std::string type = std::string(raw3); + char const * raw4 = lua_tostring(L, 4); + std::string media = std::string(raw4); + self->addSource(source, type, media); + return 0; + + } else { + return luaL_error(L, "Wrong arguments for WAbstractMedia.addSource"); + } +} + static const char* WAbstractMedia_readyState_args0[] = {luawt_typeToStr(), NULL}; static const char* const* const luawt_WAbstractMedia_readyState_args[] = {WAbstractMedia_readyState_args0, NULL}; @@ -42,8 +80,8 @@ int luawt_WAbstractMedia_readyState(lua_State* L) { int index = luawt_getSuitableArgsGroup(L, luawt_WAbstractMedia_readyState_args); WAbstractMedia* self = luawt_checkFromLua(L, 1); if (index == 0) { - Wt::WAbstractMedia::ReadyState result = self->readyState(); - lua_pushinteger(L, result); + Wt::WAbstractMedia::ReadyState l_result = self->readyState(); + lua_pushinteger(L, l_result); return 1; } else { @@ -73,8 +111,8 @@ int luawt_WAbstractMedia_jsMediaRef(lua_State* L) { int index = luawt_getSuitableArgsGroup(L, luawt_WAbstractMedia_jsMediaRef_args); WAbstractMedia* self = luawt_checkFromLua(L, 1); if (index == 0) { - std::string result = self->jsMediaRef(); - lua_pushstring(L, result.c_str()); + std::string l_result = self->jsMediaRef(); + lua_pushstring(L, l_result.c_str()); return 1; } else { @@ -122,8 +160,8 @@ int luawt_WAbstractMedia_playing(lua_State* L) { int index = luawt_getSuitableArgsGroup(L, luawt_WAbstractMedia_playing_args); WAbstractMedia* self = luawt_checkFromLua(L, 1); if (index == 0) { - bool result = self->playing(); - lua_pushboolean(L, result); + bool l_result = self->playing(); + lua_pushboolean(L, l_result); return 1; } else { @@ -131,6 +169,22 @@ int luawt_WAbstractMedia_playing(lua_State* L) { } } +static const char* WAbstractMedia_getOptions_args0[] = {luawt_typeToStr(), NULL}; +static const char* const* const luawt_WAbstractMedia_getOptions_args[] = {WAbstractMedia_getOptions_args0, NULL}; + +int luawt_WAbstractMedia_getOptions(lua_State* L) { + int index = luawt_getSuitableArgsGroup(L, luawt_WAbstractMedia_getOptions_args); + WAbstractMedia* self = luawt_checkFromLua(L, 1); + if (index == 0) { + Wt::WFlags l_result = self->getOptions(); + lua_pushinteger(L, l_result); + return 1; + + } else { + return luaL_error(L, "Wrong arguments for WAbstractMedia.getOptions"); + } +} + static const char* WAbstractMedia_preloadMode_args0[] = {luawt_typeToStr(), NULL}; static const char* const* const luawt_WAbstractMedia_preloadMode_args[] = {WAbstractMedia_preloadMode_args0, NULL}; @@ -138,8 +192,8 @@ int luawt_WAbstractMedia_preloadMode(lua_State* L) { int index = luawt_getSuitableArgsGroup(L, luawt_WAbstractMedia_preloadMode_args); WAbstractMedia* self = luawt_checkFromLua(L, 1); if (index == 0) { - Wt::WAbstractMedia::PreloadMode result = self->preloadMode(); - lua_pushinteger(L, result); + Wt::WAbstractMedia::PreloadMode l_result = self->preloadMode(); + lua_pushinteger(L, l_result); return 1; } else { @@ -174,9 +228,11 @@ ADD_SIGNAL(gestureChanged, WAbstractMedia, Wt::WGestureEvent) ADD_SIGNAL(gestureEnded, WAbstractMedia, Wt::WGestureEvent) static const luaL_Reg luawt_WAbstractMedia_methods[] = { + METHOD(WAbstractMedia, getOptions), METHOD(WAbstractMedia, setPreloadMode), METHOD(WAbstractMedia, preloadMode), METHOD(WAbstractMedia, clearSources), + METHOD(WAbstractMedia, addSource), METHOD(WAbstractMedia, setAlternativeContent), METHOD(WAbstractMedia, play), METHOD(WAbstractMedia, pause), diff --git a/src/luawt/WAbstractSpinBox.cpp b/src/luawt/WAbstractSpinBox.cpp index 7ee37b4..a088f8c 100644 --- a/src/luawt/WAbstractSpinBox.cpp +++ b/src/luawt/WAbstractSpinBox.cpp @@ -28,8 +28,8 @@ int luawt_WAbstractSpinBox_suffix(lua_State* L) { int index = luawt_getSuitableArgsGroup(L, luawt_WAbstractSpinBox_suffix_args); WAbstractSpinBox* self = luawt_checkFromLua(L, 1); if (index == 0) { - Wt::WString const & result = self->suffix(); - lua_pushstring(L, result.toUTF8().c_str()); + Wt::WString const & l_result = self->suffix(); + lua_pushstring(L, l_result.toUTF8().c_str()); return 1; } else { @@ -78,8 +78,8 @@ int luawt_WAbstractSpinBox_prefix(lua_State* L) { int index = luawt_getSuitableArgsGroup(L, luawt_WAbstractSpinBox_prefix_args); WAbstractSpinBox* self = luawt_checkFromLua(L, 1); if (index == 0) { - Wt::WString const & result = self->prefix(); - lua_pushstring(L, result.toUTF8().c_str()); + Wt::WString const & l_result = self->prefix(); + lua_pushstring(L, l_result.toUTF8().c_str()); return 1; } else { @@ -94,8 +94,8 @@ int luawt_WAbstractSpinBox_nativeControl(lua_State* L) { int index = luawt_getSuitableArgsGroup(L, luawt_WAbstractSpinBox_nativeControl_args); WAbstractSpinBox* self = luawt_checkFromLua(L, 1); if (index == 0) { - bool result = self->nativeControl(); - lua_pushboolean(L, result); + bool l_result = self->nativeControl(); + lua_pushboolean(L, l_result); return 1; } else { @@ -110,8 +110,8 @@ int luawt_WAbstractSpinBox_validate(lua_State* L) { int index = luawt_getSuitableArgsGroup(L, luawt_WAbstractSpinBox_validate_args); WAbstractSpinBox* self = luawt_checkFromLua(L, 1); if (index == 0) { - Wt::WValidator::State result = self->validate(); - lua_pushinteger(L, result); + Wt::WValidator::State l_result = self->validate(); + lua_pushinteger(L, l_result); return 1; } else { diff --git a/src/luawt/WAbstractToggleButton.cpp b/src/luawt/WAbstractToggleButton.cpp index bfe0c59..f7d0218 100644 --- a/src/luawt/WAbstractToggleButton.cpp +++ b/src/luawt/WAbstractToggleButton.cpp @@ -12,8 +12,8 @@ int luawt_WAbstractToggleButton_text(lua_State* L) { int index = luawt_getSuitableArgsGroup(L, luawt_WAbstractToggleButton_text_args); WAbstractToggleButton* self = luawt_checkFromLua(L, 1); if (index == 0) { - Wt::WString const result = self->text(); - lua_pushstring(L, result.toUTF8().c_str()); + Wt::WString const l_result = self->text(); + lua_pushstring(L, l_result.toUTF8().c_str()); return 1; } else { @@ -45,8 +45,8 @@ int luawt_WAbstractToggleButton_isChecked(lua_State* L) { int index = luawt_getSuitableArgsGroup(L, luawt_WAbstractToggleButton_isChecked_args); WAbstractToggleButton* self = luawt_checkFromLua(L, 1); if (index == 0) { - bool result = self->isChecked(); - lua_pushboolean(L, result); + bool l_result = self->isChecked(); + lua_pushboolean(L, l_result); return 1; } else { @@ -114,8 +114,8 @@ int luawt_WAbstractToggleButton_valueText(lua_State* L) { int index = luawt_getSuitableArgsGroup(L, luawt_WAbstractToggleButton_valueText_args); WAbstractToggleButton* self = luawt_checkFromLua(L, 1); if (index == 0) { - Wt::WString result = self->valueText(); - lua_pushstring(L, result.toUTF8().c_str()); + Wt::WString l_result = self->valueText(); + lua_pushstring(L, l_result.toUTF8().c_str()); return 1; } else { diff --git a/src/luawt/WAnchor.cpp b/src/luawt/WAnchor.cpp index 00b981c..bc2f775 100644 --- a/src/luawt/WAnchor.cpp +++ b/src/luawt/WAnchor.cpp @@ -3,33 +3,117 @@ #include #include #include +#include #include #include "globals.hpp" static const char* WAnchor_make_args0[] = {NULL}; static const char* WAnchor_make_args1[] = {luawt_typeToStr(), NULL}; -static const char* const* const luawt_WAnchor_make_args[] = {WAnchor_make_args0, WAnchor_make_args1, NULL}; +static const char* WAnchor_make_args2[] = {"char const *", NULL}; +static const char* WAnchor_make_args3[] = {"char const *", luawt_typeToStr(), NULL}; +static const char* WAnchor_make_args4[] = {"char const *", "char const *", NULL}; +static const char* WAnchor_make_args5[] = {"char const *", "char const *", luawt_typeToStr(), NULL}; +static const char* WAnchor_make_args6[] = {"char const *", luawt_typeToStr(), NULL}; +static const char* WAnchor_make_args7[] = {"char const *", luawt_typeToStr(), luawt_typeToStr(), NULL}; +static const char* const* const luawt_WAnchor_make_args[] = {WAnchor_make_args0, WAnchor_make_args1, WAnchor_make_args2, WAnchor_make_args3, WAnchor_make_args4, WAnchor_make_args5, WAnchor_make_args6, WAnchor_make_args7, NULL}; int luawt_WAnchor_make(lua_State* L) { int index = luawt_getSuitableArgsGroup(L, luawt_WAnchor_make_args); if (index == 0) { - WAnchor * result = new WAnchor(); + WAnchor * l_result = new WAnchor(); MyApplication* app = MyApplication::instance(); if (!app) { - delete result; + delete l_result; throw std::logic_error("No WApplication when creating WAnchor"); } - app->root()->addWidget(result); + app->root()->addWidget(l_result); - luawt_toLua(L, result); + luawt_toLua(L, l_result); return 1; } else if (index == 1) { Wt::WContainerWidget* parent = luawt_checkFromLua(L, 1); - WAnchor * result = new WAnchor(parent); - luawt_toLua(L, result); + WAnchor * l_result = new WAnchor(parent); + luawt_toLua(L, l_result); + return 1; + + } else if (index == 2) { + char const * raw1 = lua_tostring(L, 1); + Wt::WLink link = Wt::WLink(raw1); + WAnchor * l_result = new WAnchor(link); + MyApplication* app = MyApplication::instance(); + if (!app) { + delete l_result; + throw std::logic_error("No WApplication when creating WAnchor"); + } + app->root()->addWidget(l_result); + + luawt_toLua(L, l_result); + return 1; + + } else if (index == 3) { + char const * raw1 = lua_tostring(L, 1); + Wt::WLink link = Wt::WLink(raw1); + Wt::WContainerWidget* parent = + luawt_checkFromLua(L, 2); + WAnchor * l_result = new WAnchor(link, parent); + luawt_toLua(L, l_result); + return 1; + + } else if (index == 4) { + char const * raw1 = lua_tostring(L, 1); + Wt::WLink link = Wt::WLink(raw1); + char const * raw2 = lua_tostring(L, 2); + Wt::WString text = Wt::WString(raw2); + WAnchor * l_result = new WAnchor(link, text); + MyApplication* app = MyApplication::instance(); + if (!app) { + delete l_result; + throw std::logic_error("No WApplication when creating WAnchor"); + } + app->root()->addWidget(l_result); + + luawt_toLua(L, l_result); + return 1; + + } else if (index == 5) { + char const * raw1 = lua_tostring(L, 1); + Wt::WLink link = Wt::WLink(raw1); + char const * raw2 = lua_tostring(L, 2); + Wt::WString text = Wt::WString(raw2); + Wt::WContainerWidget* parent = + luawt_checkFromLua(L, 3); + WAnchor * l_result = new WAnchor(link, text, parent); + luawt_toLua(L, l_result); + return 1; + + } else if (index == 6) { + char const * raw1 = lua_tostring(L, 1); + Wt::WLink link = Wt::WLink(raw1); + Wt::WImage* image = + luawt_checkFromLua(L, 2); + WAnchor * l_result = new WAnchor(link, image); + MyApplication* app = MyApplication::instance(); + if (!app) { + delete l_result; + throw std::logic_error("No WApplication when creating WAnchor"); + } + app->root()->addWidget(l_result); + + luawt_toLua(L, l_result); + return 1; + + } else if (index == 7) { + char const * raw1 = lua_tostring(L, 1); + Wt::WLink link = Wt::WLink(raw1); + Wt::WImage* image = + luawt_checkFromLua(L, 2); + Wt::WContainerWidget* parent = + luawt_checkFromLua(L, 3); + WAnchor * l_result = new WAnchor(link, image, parent); + luawt_toLua(L, l_result); return 1; } else { @@ -37,19 +121,35 @@ int luawt_WAnchor_make(lua_State* L) { } } -static const char* WAnchor_target_args0[] = {luawt_typeToStr(), NULL}; -static const char* const* const luawt_WAnchor_target_args[] = {WAnchor_target_args0, NULL}; +static const char* WAnchor_wordWrap_args0[] = {luawt_typeToStr(), NULL}; +static const char* const* const luawt_WAnchor_wordWrap_args[] = {WAnchor_wordWrap_args0, NULL}; -int luawt_WAnchor_target(lua_State* L) { - int index = luawt_getSuitableArgsGroup(L, luawt_WAnchor_target_args); +int luawt_WAnchor_wordWrap(lua_State* L) { + int index = luawt_getSuitableArgsGroup(L, luawt_WAnchor_wordWrap_args); WAnchor* self = luawt_checkFromLua(L, 1); if (index == 0) { - Wt::AnchorTarget result = self->target(); - lua_pushinteger(L, result); + bool l_result = self->wordWrap(); + lua_pushboolean(L, l_result); return 1; } else { - return luaL_error(L, "Wrong arguments for WAnchor.target"); + return luaL_error(L, "Wrong arguments for WAnchor.wordWrap"); + } +} + +static const char* WAnchor_setWordWrap_args0[] = {luawt_typeToStr(), "bool", NULL}; +static const char* const* const luawt_WAnchor_setWordWrap_args[] = {WAnchor_setWordWrap_args0, NULL}; + +int luawt_WAnchor_setWordWrap(lua_State* L) { + int index = luawt_getSuitableArgsGroup(L, luawt_WAnchor_setWordWrap_args); + WAnchor* self = luawt_checkFromLua(L, 1); + if (index == 0) { + bool wordWrap = lua_toboolean(L, 2); + self->setWordWrap(wordWrap); + return 0; + + } else { + return luaL_error(L, "Wrong arguments for WAnchor.setWordWrap"); } } @@ -77,8 +177,8 @@ int luawt_WAnchor_text(lua_State* L) { int index = luawt_getSuitableArgsGroup(L, luawt_WAnchor_text_args); WAnchor* self = luawt_checkFromLua(L, 1); if (index == 0) { - Wt::WString const & result = self->text(); - lua_pushstring(L, result.toUTF8().c_str()); + Wt::WString const & l_result = self->text(); + lua_pushstring(L, l_result.toUTF8().c_str()); return 1; } else { @@ -103,20 +203,20 @@ int luawt_WAnchor_setText(lua_State* L) { } } -static const char* WAnchor_setRefInternalPath_args0[] = {luawt_typeToStr(), "char const *", NULL}; -static const char* const* const luawt_WAnchor_setRefInternalPath_args[] = {WAnchor_setRefInternalPath_args0, NULL}; +static const char* WAnchor_setLink_args0[] = {luawt_typeToStr(), "char const *", NULL}; +static const char* const* const luawt_WAnchor_setLink_args[] = {WAnchor_setLink_args0, NULL}; -int luawt_WAnchor_setRefInternalPath(lua_State* L) { - int index = luawt_getSuitableArgsGroup(L, luawt_WAnchor_setRefInternalPath_args); +int luawt_WAnchor_setLink(lua_State* L) { + int index = luawt_getSuitableArgsGroup(L, luawt_WAnchor_setLink_args); WAnchor* self = luawt_checkFromLua(L, 1); if (index == 0) { char const * raw2 = lua_tostring(L, 2); - std::string path = std::string(raw2); - self->setRefInternalPath(path); + Wt::WLink link = Wt::WLink(raw2); + self->setLink(link); return 0; } else { - return luaL_error(L, "Wrong arguments for WAnchor.setRefInternalPath"); + return luaL_error(L, "Wrong arguments for WAnchor.setLink"); } } @@ -136,19 +236,19 @@ int luawt_WAnchor_setTarget(lua_State* L) { } } -static const char* WAnchor_wordWrap_args0[] = {luawt_typeToStr(), NULL}; -static const char* const* const luawt_WAnchor_wordWrap_args[] = {WAnchor_wordWrap_args0, NULL}; +static const char* WAnchor_link_args0[] = {luawt_typeToStr(), NULL}; +static const char* const* const luawt_WAnchor_link_args[] = {WAnchor_link_args0, NULL}; -int luawt_WAnchor_wordWrap(lua_State* L) { - int index = luawt_getSuitableArgsGroup(L, luawt_WAnchor_wordWrap_args); +int luawt_WAnchor_link(lua_State* L) { + int index = luawt_getSuitableArgsGroup(L, luawt_WAnchor_link_args); WAnchor* self = luawt_checkFromLua(L, 1); if (index == 0) { - bool result = self->wordWrap(); - lua_pushboolean(L, result); + Wt::WLink const & l_result = self->link(); + lua_pushstring(L, l_result.url().c_str()); return 1; } else { - return luaL_error(L, "Wrong arguments for WAnchor.wordWrap"); + return luaL_error(L, "Wrong arguments for WAnchor.link"); } } @@ -159,8 +259,8 @@ int luawt_WAnchor_image(lua_State* L) { int index = luawt_getSuitableArgsGroup(L, luawt_WAnchor_image_args); WAnchor* self = luawt_checkFromLua(L, 1); if (index == 0) { - Wt::WImage * result = self->image(); - luawt_toLua(L, result); + Wt::WImage * l_result = self->image(); + luawt_toLua(L, l_result); return 1; } else { @@ -168,19 +268,20 @@ int luawt_WAnchor_image(lua_State* L) { } } -static const char* WAnchor_setWordWrap_args0[] = {luawt_typeToStr(), "bool", NULL}; -static const char* const* const luawt_WAnchor_setWordWrap_args[] = {WAnchor_setWordWrap_args0, NULL}; +static const char* WAnchor_setRefInternalPath_args0[] = {luawt_typeToStr(), "char const *", NULL}; +static const char* const* const luawt_WAnchor_setRefInternalPath_args[] = {WAnchor_setRefInternalPath_args0, NULL}; -int luawt_WAnchor_setWordWrap(lua_State* L) { - int index = luawt_getSuitableArgsGroup(L, luawt_WAnchor_setWordWrap_args); +int luawt_WAnchor_setRefInternalPath(lua_State* L) { + int index = luawt_getSuitableArgsGroup(L, luawt_WAnchor_setRefInternalPath_args); WAnchor* self = luawt_checkFromLua(L, 1); if (index == 0) { - bool wordWrap = lua_toboolean(L, 2); - self->setWordWrap(wordWrap); + char const * raw2 = lua_tostring(L, 2); + std::string path = std::string(raw2); + self->setRefInternalPath(path); return 0; } else { - return luaL_error(L, "Wrong arguments for WAnchor.setWordWrap"); + return luaL_error(L, "Wrong arguments for WAnchor.setRefInternalPath"); } } @@ -208,8 +309,8 @@ int luawt_WAnchor_textFormat(lua_State* L) { int index = luawt_getSuitableArgsGroup(L, luawt_WAnchor_textFormat_args); WAnchor* self = luawt_checkFromLua(L, 1); if (index == 0) { - Wt::TextFormat result = self->textFormat(); - lua_pushinteger(L, result); + Wt::TextFormat l_result = self->textFormat(); + lua_pushinteger(L, l_result); return 1; } else { @@ -233,6 +334,22 @@ int luawt_WAnchor_setTextFormat(lua_State* L) { } } +static const char* WAnchor_target_args0[] = {luawt_typeToStr(), NULL}; +static const char* const* const luawt_WAnchor_target_args[] = {WAnchor_target_args0, NULL}; + +int luawt_WAnchor_target(lua_State* L) { + int index = luawt_getSuitableArgsGroup(L, luawt_WAnchor_target_args); + WAnchor* self = luawt_checkFromLua(L, 1); + if (index == 0) { + Wt::AnchorTarget l_result = self->target(); + lua_pushinteger(L, l_result); + return 1; + + } else { + return luaL_error(L, "Wrong arguments for WAnchor.target"); + } +} + ADD_SIGNAL(scrolled, WAnchor, Wt::WScrollEvent) ADD_SIGNAL(keyWentDown, WAnchor, Wt::WKeyEvent) ADD_SIGNAL(keyPressed, WAnchor, Wt::WKeyEvent) @@ -256,6 +373,8 @@ ADD_SIGNAL(gestureChanged, WAnchor, Wt::WGestureEvent) ADD_SIGNAL(gestureEnded, WAnchor, Wt::WGestureEvent) static const luaL_Reg luawt_WAnchor_methods[] = { + METHOD(WAnchor, setLink), + METHOD(WAnchor, link), METHOD(WAnchor, setRef), METHOD(WAnchor, setRefInternalPath), //METHOD(WAnchor, ref), diff --git a/src/luawt/WAudio.cpp b/src/luawt/WAudio.cpp index f753fce..429bc29 100644 --- a/src/luawt/WAudio.cpp +++ b/src/luawt/WAudio.cpp @@ -12,22 +12,22 @@ static const char* const* const luawt_WAudio_make_args[] = {WAudio_make_args0, W int luawt_WAudio_make(lua_State* L) { int index = luawt_getSuitableArgsGroup(L, luawt_WAudio_make_args); if (index == 0) { - WAudio * result = new WAudio(); + WAudio * l_result = new WAudio(); MyApplication* app = MyApplication::instance(); if (!app) { - delete result; + delete l_result; throw std::logic_error("No WApplication when creating WAudio"); } - app->root()->addWidget(result); + app->root()->addWidget(l_result); - luawt_toLua(L, result); + luawt_toLua(L, l_result); return 1; } else if (index == 1) { Wt::WContainerWidget* parent = luawt_checkFromLua(L, 1); - WAudio * result = new WAudio(parent); - luawt_toLua(L, result); + WAudio * l_result = new WAudio(parent); + luawt_toLua(L, l_result); return 1; } else { @@ -42,8 +42,8 @@ int luawt_WAudio_jsAudioRef(lua_State* L) { int index = luawt_getSuitableArgsGroup(L, luawt_WAudio_jsAudioRef_args); WAudio* self = luawt_checkFromLua(L, 1); if (index == 0) { - std::string result = self->jsAudioRef(); - lua_pushstring(L, result.c_str()); + std::string l_result = self->jsAudioRef(); + lua_pushstring(L, l_result.c_str()); return 1; } else { diff --git a/src/luawt/WBreak.cpp b/src/luawt/WBreak.cpp new file mode 100644 index 0000000..509b0a0 --- /dev/null +++ b/src/luawt/WBreak.cpp @@ -0,0 +1,54 @@ +#include "boost-xtime.hpp" + +#include +#include + +#include "globals.hpp" + +static const char* WBreak_make_args0[] = {NULL}; +static const char* WBreak_make_args1[] = {luawt_typeToStr(), NULL}; +static const char* const* const luawt_WBreak_make_args[] = {WBreak_make_args0, WBreak_make_args1, NULL}; + +int luawt_WBreak_make(lua_State* L) { + int index = luawt_getSuitableArgsGroup(L, luawt_WBreak_make_args); + if (index == 0) { + WBreak * l_result = new WBreak(); + MyApplication* app = MyApplication::instance(); + if (!app) { + delete l_result; + throw std::logic_error("No WApplication when creating WBreak"); + } + app->root()->addWidget(l_result); + + luawt_toLua(L, l_result); + return 1; + + } else if (index == 1) { + Wt::WContainerWidget* parent = + luawt_checkFromLua(L, 1); + WBreak * l_result = new WBreak(parent); + luawt_toLua(L, l_result); + return 1; + + } else { + return luaL_error(L, "Wrong arguments for WBreak.make"); + } +} + + +static const luaL_Reg luawt_WBreak_methods[] = { + {NULL, NULL}, +}; + +void luawt_WBreak(lua_State* L) { + const char* base = luawt_typeToStr(); + assert(base); + DECLARE_CLASS( + WBreak, + L, + wrap::func, + 0, + luawt_WBreak_methods, + base + ); +} diff --git a/src/luawt/WCalendar.cpp b/src/luawt/WCalendar.cpp index 89f6da4..1b97e7f 100644 --- a/src/luawt/WCalendar.cpp +++ b/src/luawt/WCalendar.cpp @@ -12,22 +12,22 @@ static const char* const* const luawt_WCalendar_make_args[] = {WCalendar_make_ar int luawt_WCalendar_make(lua_State* L) { int index = luawt_getSuitableArgsGroup(L, luawt_WCalendar_make_args); if (index == 0) { - WCalendar * result = new WCalendar(); + WCalendar * l_result = new WCalendar(); MyApplication* app = MyApplication::instance(); if (!app) { - delete result; + delete l_result; throw std::logic_error("No WApplication when creating WCalendar"); } - app->root()->addWidget(result); + app->root()->addWidget(l_result); - luawt_toLua(L, result); + luawt_toLua(L, l_result); return 1; } else if (index == 1) { Wt::WContainerWidget* parent = luawt_checkFromLua(L, 1); - WCalendar * result = new WCalendar(parent); - luawt_toLua(L, result); + WCalendar * l_result = new WCalendar(parent); + luawt_toLua(L, l_result); return 1; } else { @@ -42,8 +42,8 @@ int luawt_WCalendar_horizontalHeaderFormat(lua_State* L) { int index = luawt_getSuitableArgsGroup(L, luawt_WCalendar_horizontalHeaderFormat_args); WCalendar* self = luawt_checkFromLua(L, 1); if (index == 0) { - Wt::WCalendar::HorizontalHeaderFormat result = self->horizontalHeaderFormat(); - lua_pushinteger(L, result); + Wt::WCalendar::HorizontalHeaderFormat l_result = self->horizontalHeaderFormat(); + lua_pushinteger(L, l_result); return 1; } else { @@ -136,8 +136,8 @@ int luawt_WCalendar_currentYear(lua_State* L) { int index = luawt_getSuitableArgsGroup(L, luawt_WCalendar_currentYear_args); WCalendar* self = luawt_checkFromLua(L, 1); if (index == 0) { - int result = self->currentYear(); - lua_pushinteger(L, result); + int l_result = self->currentYear(); + lua_pushinteger(L, l_result); return 1; } else { @@ -229,8 +229,8 @@ int luawt_WCalendar_currentMonth(lua_State* L) { int index = luawt_getSuitableArgsGroup(L, luawt_WCalendar_currentMonth_args); WCalendar* self = luawt_checkFromLua(L, 1); if (index == 0) { - int result = self->currentMonth(); - lua_pushinteger(L, result); + int l_result = self->currentMonth(); + lua_pushinteger(L, l_result); return 1; } else { diff --git a/src/luawt/WCheckBox.cpp b/src/luawt/WCheckBox.cpp index 3820c80..c5a59d8 100644 --- a/src/luawt/WCheckBox.cpp +++ b/src/luawt/WCheckBox.cpp @@ -15,36 +15,36 @@ static const char* const* const luawt_WCheckBox_make_args[] = {WCheckBox_make_ar int luawt_WCheckBox_make(lua_State* L) { int index = luawt_getSuitableArgsGroup(L, luawt_WCheckBox_make_args); if (index == 0) { - WCheckBox * result = new WCheckBox(); + WCheckBox * l_result = new WCheckBox(); MyApplication* app = MyApplication::instance(); if (!app) { - delete result; + delete l_result; throw std::logic_error("No WApplication when creating WCheckBox"); } - app->root()->addWidget(result); + app->root()->addWidget(l_result); - luawt_toLua(L, result); + luawt_toLua(L, l_result); return 1; } else if (index == 1) { Wt::WContainerWidget* parent = luawt_checkFromLua(L, 1); - WCheckBox * result = new WCheckBox(parent); - luawt_toLua(L, result); + WCheckBox * l_result = new WCheckBox(parent); + luawt_toLua(L, l_result); return 1; } else if (index == 2) { char const * raw1 = lua_tostring(L, 1); Wt::WString text = Wt::WString(raw1); - WCheckBox * result = new WCheckBox(text); + WCheckBox * l_result = new WCheckBox(text); MyApplication* app = MyApplication::instance(); if (!app) { - delete result; + delete l_result; throw std::logic_error("No WApplication when creating WCheckBox"); } - app->root()->addWidget(result); + app->root()->addWidget(l_result); - luawt_toLua(L, result); + luawt_toLua(L, l_result); return 1; } else if (index == 3) { @@ -52,8 +52,8 @@ int luawt_WCheckBox_make(lua_State* L) { Wt::WString text = Wt::WString(raw1); Wt::WContainerWidget* parent = luawt_checkFromLua(L, 2); - WCheckBox * result = new WCheckBox(text, parent); - luawt_toLua(L, result); + WCheckBox * l_result = new WCheckBox(text, parent); + luawt_toLua(L, l_result); return 1; } else { @@ -84,8 +84,8 @@ int luawt_WCheckBox_isTristate(lua_State* L) { int index = luawt_getSuitableArgsGroup(L, luawt_WCheckBox_isTristate_args); WCheckBox* self = luawt_checkFromLua(L, 1); if (index == 0) { - bool result = self->isTristate(); - lua_pushboolean(L, result); + bool l_result = self->isTristate(); + lua_pushboolean(L, l_result); return 1; } else { @@ -121,8 +121,8 @@ int luawt_WCheckBox_checkState(lua_State* L) { int index = luawt_getSuitableArgsGroup(L, luawt_WCheckBox_checkState_args); WCheckBox* self = luawt_checkFromLua(L, 1); if (index == 0) { - Wt::CheckState result = self->checkState(); - lua_pushinteger(L, result); + Wt::CheckState l_result = self->checkState(); + lua_pushinteger(L, l_result); return 1; } else { diff --git a/src/luawt/WComboBox.cpp b/src/luawt/WComboBox.cpp index 27234ff..dc1c76c 100644 --- a/src/luawt/WComboBox.cpp +++ b/src/luawt/WComboBox.cpp @@ -13,22 +13,22 @@ static const char* const* const luawt_WComboBox_make_args[] = {WComboBox_make_ar int luawt_WComboBox_make(lua_State* L) { int index = luawt_getSuitableArgsGroup(L, luawt_WComboBox_make_args); if (index == 0) { - WComboBox * result = new WComboBox(); + WComboBox * l_result = new WComboBox(); MyApplication* app = MyApplication::instance(); if (!app) { - delete result; + delete l_result; throw std::logic_error("No WApplication when creating WComboBox"); } - app->root()->addWidget(result); + app->root()->addWidget(l_result); - luawt_toLua(L, result); + luawt_toLua(L, l_result); return 1; } else if (index == 1) { Wt::WContainerWidget* parent = luawt_checkFromLua(L, 1); - WComboBox * result = new WComboBox(parent); - luawt_toLua(L, result); + WComboBox * l_result = new WComboBox(parent); + luawt_toLua(L, l_result); return 1; } else { @@ -43,8 +43,8 @@ int luawt_WComboBox_count(lua_State* L) { int index = luawt_getSuitableArgsGroup(L, luawt_WComboBox_count_args); WComboBox* self = luawt_checkFromLua(L, 1); if (index == 0) { - int result = self->count(); - lua_pushinteger(L, result); + int l_result = self->count(); + lua_pushinteger(L, l_result); return 1; } else { @@ -60,8 +60,8 @@ int luawt_WComboBox_itemText(lua_State* L) { WComboBox* self = luawt_checkFromLua(L, 1); if (index == 0) { int index = lua_tointeger(L, 2); - Wt::WString const result = self->itemText(index); - lua_pushstring(L, result.toUTF8().c_str()); + Wt::WString const l_result = self->itemText(index); + lua_pushstring(L, l_result.toUTF8().c_str()); return 1; } else { @@ -137,6 +137,33 @@ int luawt_WComboBox_addItem(lua_State* L) { } } +static const char* WComboBox_findText_args0[] = {luawt_typeToStr(), "char const *", NULL}; +static const char* WComboBox_findText_args1[] = {luawt_typeToStr(), "char const *", "int", NULL}; +static const char* const* const luawt_WComboBox_findText_args[] = {WComboBox_findText_args0, WComboBox_findText_args1, NULL}; + +int luawt_WComboBox_findText(lua_State* L) { + int index = luawt_getSuitableArgsGroup(L, luawt_WComboBox_findText_args); + WComboBox* self = luawt_checkFromLua(L, 1); + if (index == 0) { + char const * raw2 = lua_tostring(L, 2); + Wt::WString text = Wt::WString(raw2); + int l_result = self->findText(text); + lua_pushinteger(L, l_result); + return 1; + + } else if (index == 1) { + char const * raw2 = lua_tostring(L, 2); + Wt::WString text = Wt::WString(raw2); + Wt::WFlags flags = static_cast(lua_tointeger(L, 3)); + int l_result = self->findText(text, flags); + lua_pushinteger(L, l_result); + return 1; + + } else { + return luaL_error(L, "Wrong arguments for WComboBox.findText"); + } +} + static const char* WComboBox_refresh_args0[] = {luawt_typeToStr(), NULL}; static const char* const* const luawt_WComboBox_refresh_args[] = {WComboBox_refresh_args0, NULL}; @@ -159,8 +186,8 @@ int luawt_WComboBox_currentText(lua_State* L) { int index = luawt_getSuitableArgsGroup(L, luawt_WComboBox_currentText_args); WComboBox* self = luawt_checkFromLua(L, 1); if (index == 0) { - Wt::WString const result = self->currentText(); - lua_pushstring(L, result.toUTF8().c_str()); + Wt::WString const l_result = self->currentText(); + lua_pushstring(L, l_result.toUTF8().c_str()); return 1; } else { @@ -175,8 +202,8 @@ int luawt_WComboBox_currentIndex(lua_State* L) { int index = luawt_getSuitableArgsGroup(L, luawt_WComboBox_currentIndex_args); WComboBox* self = luawt_checkFromLua(L, 1); if (index == 0) { - int result = self->currentIndex(); - lua_pushinteger(L, result); + int l_result = self->currentIndex(); + lua_pushinteger(L, l_result); return 1; } else { @@ -256,8 +283,8 @@ int luawt_WComboBox_valueText(lua_State* L) { int index = luawt_getSuitableArgsGroup(L, luawt_WComboBox_valueText_args); WComboBox* self = luawt_checkFromLua(L, 1); if (index == 0) { - Wt::WString result = self->valueText(); - lua_pushstring(L, result.toUTF8().c_str()); + Wt::WString l_result = self->valueText(); + lua_pushstring(L, l_result.toUTF8().c_str()); return 1; } else { @@ -301,6 +328,7 @@ static const luaL_Reg luawt_WComboBox_methods[] = { METHOD(WComboBox, currentText), METHOD(WComboBox, itemText), METHOD(WComboBox, setModelColumn), + METHOD(WComboBox, findText), METHOD(WComboBox, valueText), METHOD(WComboBox, setValueText), METHOD(WComboBox, refresh), diff --git a/src/luawt/WCompositeWidget.cpp b/src/luawt/WCompositeWidget.cpp index 4aeab2b..10c722b 100644 --- a/src/luawt/WCompositeWidget.cpp +++ b/src/luawt/WCompositeWidget.cpp @@ -1,10 +1,11 @@ #include "boost-xtime.hpp" +#include #include +#include +#include #include #include -#include -#include #include "globals.hpp" @@ -16,22 +17,22 @@ static const char* const* const luawt_WCompositeWidget_make_args[] = {WComposite int luawt_WCompositeWidget_make(lua_State* L) { int index = luawt_getSuitableArgsGroup(L, luawt_WCompositeWidget_make_args); if (index == 0) { - WCompositeWidget * result = new WCompositeWidget(); + WCompositeWidget * l_result = new WCompositeWidget(); MyApplication* app = MyApplication::instance(); if (!app) { - delete result; + delete l_result; throw std::logic_error("No WApplication when creating WCompositeWidget"); } - app->root()->addWidget(result); + app->root()->addWidget(l_result); - luawt_toLua(L, result); + luawt_toLua(L, l_result); return 1; } else if (index == 1) { Wt::WContainerWidget* parent = luawt_checkFromLua(L, 1); - WCompositeWidget * result = new WCompositeWidget(parent); - luawt_toLua(L, result); + WCompositeWidget * l_result = new WCompositeWidget(parent); + luawt_toLua(L, l_result); return 1; } else if (index == 2) { @@ -39,8 +40,8 @@ int luawt_WCompositeWidget_make(lua_State* L) { luawt_checkFromLua(L, 1); Wt::WContainerWidget* parent = luawt_checkFromLua(L, 2); - WCompositeWidget * result = new WCompositeWidget(implementation, parent); - luawt_toLua(L, result); + WCompositeWidget * l_result = new WCompositeWidget(implementation, parent); + luawt_toLua(L, l_result); return 1; } else { @@ -80,6 +81,25 @@ int luawt_WCompositeWidget_doJavaScript(lua_State* L) { } } +static const char* WCompositeWidget_setMinimumSize_args0[] = {luawt_typeToStr(), "double", "double", NULL}; +static const char* const* const luawt_WCompositeWidget_setMinimumSize_args[] = {WCompositeWidget_setMinimumSize_args0, NULL}; + +int luawt_WCompositeWidget_setMinimumSize(lua_State* L) { + int index = luawt_getSuitableArgsGroup(L, luawt_WCompositeWidget_setMinimumSize_args); + WCompositeWidget* self = luawt_checkFromLua(L, 1); + if (index == 0) { + double raw2 = lua_tonumber(L, 2); + Wt::WLength width = Wt::WLength(raw2); + double raw3 = lua_tonumber(L, 3); + Wt::WLength height = Wt::WLength(raw3); + self->setMinimumSize(width, height); + return 0; + + } else { + return luaL_error(L, "Wrong arguments for WCompositeWidget.setMinimumSize"); + } +} + static const char* WCompositeWidget_floatSide_args0[] = {luawt_typeToStr(), NULL}; static const char* const* const luawt_WCompositeWidget_floatSide_args[] = {WCompositeWidget_floatSide_args0, NULL}; @@ -87,8 +107,8 @@ int luawt_WCompositeWidget_floatSide(lua_State* L) { int index = luawt_getSuitableArgsGroup(L, luawt_WCompositeWidget_floatSide_args); WCompositeWidget* self = luawt_checkFromLua(L, 1); if (index == 0) { - Wt::Side result = self->floatSide(); - lua_pushinteger(L, result); + Wt::Side l_result = self->floatSide(); + lua_pushinteger(L, l_result); return 1; } else { @@ -96,6 +116,22 @@ int luawt_WCompositeWidget_floatSide(lua_State* L) { } } +static const char* WCompositeWidget_webWidget_args0[] = {luawt_typeToStr(), NULL}; +static const char* const* const luawt_WCompositeWidget_webWidget_args[] = {WCompositeWidget_webWidget_args0, NULL}; + +int luawt_WCompositeWidget_webWidget(lua_State* L) { + int index = luawt_getSuitableArgsGroup(L, luawt_WCompositeWidget_webWidget_args); + WCompositeWidget* self = luawt_checkFromLua(L, 1); + if (index == 0) { + Wt::WWebWidget * l_result = self->webWidget(); + luawt_toLua(L, l_result); + return 1; + + } else { + return luaL_error(L, "Wrong arguments for WCompositeWidget.webWidget"); + } +} + static const char* WCompositeWidget_find_args0[] = {luawt_typeToStr(), "char const *", NULL}; static const char* const* const luawt_WCompositeWidget_find_args[] = {WCompositeWidget_find_args0, NULL}; @@ -105,8 +141,8 @@ int luawt_WCompositeWidget_find(lua_State* L) { if (index == 0) { char const * raw2 = lua_tostring(L, 2); std::string name = std::string(raw2); - Wt::WWidget * result = self->find(name); - luawt_toLua(L, result); + Wt::WWidget * l_result = self->find(name); + luawt_toLua(L, l_result); return 1; } else { @@ -114,19 +150,19 @@ int luawt_WCompositeWidget_find(lua_State* L) { } } -static const char* WCompositeWidget_styleClass_args0[] = {luawt_typeToStr(), NULL}; -static const char* const* const luawt_WCompositeWidget_styleClass_args[] = {WCompositeWidget_styleClass_args0, NULL}; +static const char* WCompositeWidget_height_args0[] = {luawt_typeToStr(), NULL}; +static const char* const* const luawt_WCompositeWidget_height_args[] = {WCompositeWidget_height_args0, NULL}; -int luawt_WCompositeWidget_styleClass(lua_State* L) { - int index = luawt_getSuitableArgsGroup(L, luawt_WCompositeWidget_styleClass_args); +int luawt_WCompositeWidget_height(lua_State* L) { + int index = luawt_getSuitableArgsGroup(L, luawt_WCompositeWidget_height_args); WCompositeWidget* self = luawt_checkFromLua(L, 1); if (index == 0) { - Wt::WString result = self->styleClass(); - lua_pushstring(L, result.toUTF8().c_str()); + Wt::WLength l_result = self->height(); + lua_pushnumber(L, l_result.value()); return 1; } else { - return luaL_error(L, "Wrong arguments for WCompositeWidget.styleClass"); + return luaL_error(L, "Wrong arguments for WCompositeWidget.height"); } } @@ -137,8 +173,8 @@ int luawt_WCompositeWidget_hiddenKeepsGeometry(lua_State* L) { int index = luawt_getSuitableArgsGroup(L, luawt_WCompositeWidget_hiddenKeepsGeometry_args); WCompositeWidget* self = luawt_checkFromLua(L, 1); if (index == 0) { - bool result = self->hiddenKeepsGeometry(); - lua_pushboolean(L, result); + bool l_result = self->hiddenKeepsGeometry(); + lua_pushboolean(L, l_result); return 1; } else { @@ -146,6 +182,22 @@ int luawt_WCompositeWidget_hiddenKeepsGeometry(lua_State* L) { } } +static const char* WCompositeWidget_minimumHeight_args0[] = {luawt_typeToStr(), NULL}; +static const char* const* const luawt_WCompositeWidget_minimumHeight_args[] = {WCompositeWidget_minimumHeight_args0, NULL}; + +int luawt_WCompositeWidget_minimumHeight(lua_State* L) { + int index = luawt_getSuitableArgsGroup(L, luawt_WCompositeWidget_minimumHeight_args); + WCompositeWidget* self = luawt_checkFromLua(L, 1); + if (index == 0) { + Wt::WLength l_result = self->minimumHeight(); + lua_pushnumber(L, l_result.value()); + return 1; + + } else { + return luaL_error(L, "Wrong arguments for WCompositeWidget.minimumHeight"); + } +} + static const char* WCompositeWidget_loaded_args0[] = {luawt_typeToStr(), NULL}; static const char* const* const luawt_WCompositeWidget_loaded_args[] = {WCompositeWidget_loaded_args0, NULL}; @@ -153,8 +205,8 @@ int luawt_WCompositeWidget_loaded(lua_State* L) { int index = luawt_getSuitableArgsGroup(L, luawt_WCompositeWidget_loaded_args); WCompositeWidget* self = luawt_checkFromLua(L, 1); if (index == 0) { - bool result = self->loaded(); - lua_pushboolean(L, result); + bool l_result = self->loaded(); + lua_pushboolean(L, l_result); return 1; } else { @@ -162,6 +214,41 @@ int luawt_WCompositeWidget_loaded(lua_State* L) { } } +static const char* WCompositeWidget_setMaximumSize_args0[] = {luawt_typeToStr(), "double", "double", NULL}; +static const char* const* const luawt_WCompositeWidget_setMaximumSize_args[] = {WCompositeWidget_setMaximumSize_args0, NULL}; + +int luawt_WCompositeWidget_setMaximumSize(lua_State* L) { + int index = luawt_getSuitableArgsGroup(L, luawt_WCompositeWidget_setMaximumSize_args); + WCompositeWidget* self = luawt_checkFromLua(L, 1); + if (index == 0) { + double raw2 = lua_tonumber(L, 2); + Wt::WLength width = Wt::WLength(raw2); + double raw3 = lua_tonumber(L, 3); + Wt::WLength height = Wt::WLength(raw3); + self->setMaximumSize(width, height); + return 0; + + } else { + return luaL_error(L, "Wrong arguments for WCompositeWidget.setMaximumSize"); + } +} + +static const char* WCompositeWidget_styleClass_args0[] = {luawt_typeToStr(), NULL}; +static const char* const* const luawt_WCompositeWidget_styleClass_args[] = {WCompositeWidget_styleClass_args0, NULL}; + +int luawt_WCompositeWidget_styleClass(lua_State* L) { + int index = luawt_getSuitableArgsGroup(L, luawt_WCompositeWidget_styleClass_args); + WCompositeWidget* self = luawt_checkFromLua(L, 1); + if (index == 0) { + Wt::WString l_result = self->styleClass(); + lua_pushstring(L, l_result.toUTF8().c_str()); + return 1; + + } else { + return luaL_error(L, "Wrong arguments for WCompositeWidget.styleClass"); + } +} + static const char* WCompositeWidget_id_args0[] = {luawt_typeToStr(), NULL}; static const char* const* const luawt_WCompositeWidget_id_args[] = {WCompositeWidget_id_args0, NULL}; @@ -169,8 +256,8 @@ int luawt_WCompositeWidget_id(lua_State* L) { int index = luawt_getSuitableArgsGroup(L, luawt_WCompositeWidget_id_args); WCompositeWidget* self = luawt_checkFromLua(L, 1); if (index == 0) { - std::string const result = self->id(); - lua_pushstring(L, result.c_str()); + std::string const l_result = self->id(); + lua_pushstring(L, l_result.c_str()); return 1; } else { @@ -178,6 +265,22 @@ int luawt_WCompositeWidget_id(lua_State* L) { } } +static const char* WCompositeWidget_setTabIndex_args0[] = {luawt_typeToStr(), "int", NULL}; +static const char* const* const luawt_WCompositeWidget_setTabIndex_args[] = {WCompositeWidget_setTabIndex_args0, NULL}; + +int luawt_WCompositeWidget_setTabIndex(lua_State* L) { + int index = luawt_getSuitableArgsGroup(L, luawt_WCompositeWidget_setTabIndex_args); + WCompositeWidget* self = luawt_checkFromLua(L, 1); + if (index == 0) { + int index = lua_tointeger(L, 2); + self->setTabIndex(index); + return 0; + + } else { + return luaL_error(L, "Wrong arguments for WCompositeWidget.setTabIndex"); + } +} + static const char* WCompositeWidget_isInline_args0[] = {luawt_typeToStr(), NULL}; static const char* const* const luawt_WCompositeWidget_isInline_args[] = {WCompositeWidget_isInline_args0, NULL}; @@ -185,8 +288,8 @@ int luawt_WCompositeWidget_isInline(lua_State* L) { int index = luawt_getSuitableArgsGroup(L, luawt_WCompositeWidget_isInline_args); WCompositeWidget* self = luawt_checkFromLua(L, 1); if (index == 0) { - bool result = self->isInline(); - lua_pushboolean(L, result); + bool l_result = self->isInline(); + lua_pushboolean(L, l_result); return 1; } else { @@ -194,36 +297,60 @@ int luawt_WCompositeWidget_isInline(lua_State* L) { } } -static const char* WCompositeWidget_setStyleClass_args0[] = {luawt_typeToStr(), "char const *", NULL}; -static const char* const* const luawt_WCompositeWidget_setStyleClass_args[] = {WCompositeWidget_setStyleClass_args0, NULL}; +static const char* WCompositeWidget_propagateSetEnabled_args0[] = {luawt_typeToStr(), "bool", NULL}; +static const char* const* const luawt_WCompositeWidget_propagateSetEnabled_args[] = {WCompositeWidget_propagateSetEnabled_args0, NULL}; -int luawt_WCompositeWidget_setStyleClass(lua_State* L) { - int index = luawt_getSuitableArgsGroup(L, luawt_WCompositeWidget_setStyleClass_args); +int luawt_WCompositeWidget_propagateSetEnabled(lua_State* L) { + int index = luawt_getSuitableArgsGroup(L, luawt_WCompositeWidget_propagateSetEnabled_args); WCompositeWidget* self = luawt_checkFromLua(L, 1); if (index == 0) { - char const * raw2 = lua_tostring(L, 2); - Wt::WString styleClass = Wt::WString(raw2); - self->setStyleClass(styleClass); + bool enabled = lua_toboolean(L, 2); + self->propagateSetEnabled(enabled); return 0; } else { - return luaL_error(L, "Wrong arguments for WCompositeWidget.setStyleClass"); + return luaL_error(L, "Wrong arguments for WCompositeWidget.propagateSetEnabled"); } } -static const char* WCompositeWidget_isDisabled_args0[] = {luawt_typeToStr(), NULL}; -static const char* const* const luawt_WCompositeWidget_isDisabled_args[] = {WCompositeWidget_isDisabled_args0, NULL}; +static const char* WCompositeWidget_setClearSides_args0[] = {luawt_typeToStr(), "int", NULL}; +static const char* const* const luawt_WCompositeWidget_setClearSides_args[] = {WCompositeWidget_setClearSides_args0, NULL}; -int luawt_WCompositeWidget_isDisabled(lua_State* L) { - int index = luawt_getSuitableArgsGroup(L, luawt_WCompositeWidget_isDisabled_args); +int luawt_WCompositeWidget_setClearSides(lua_State* L) { + int index = luawt_getSuitableArgsGroup(L, luawt_WCompositeWidget_setClearSides_args); WCompositeWidget* self = luawt_checkFromLua(L, 1); if (index == 0) { - bool result = self->isDisabled(); - lua_pushboolean(L, result); - return 1; + Wt::WFlags sides = static_cast(lua_tointeger(L, 2)); + self->setClearSides(sides); + return 0; + + } else { + return luaL_error(L, "Wrong arguments for WCompositeWidget.setClearSides"); + } +} +static const char* WCompositeWidget_setOffsets_args0[] = {luawt_typeToStr(), "double", NULL}; +static const char* WCompositeWidget_setOffsets_args1[] = {luawt_typeToStr(), "double", "int", NULL}; +static const char* const* const luawt_WCompositeWidget_setOffsets_args[] = {WCompositeWidget_setOffsets_args0, WCompositeWidget_setOffsets_args1, NULL}; + +int luawt_WCompositeWidget_setOffsets(lua_State* L) { + int index = luawt_getSuitableArgsGroup(L, luawt_WCompositeWidget_setOffsets_args); + WCompositeWidget* self = luawt_checkFromLua(L, 1); + if (index == 0) { + double raw2 = lua_tonumber(L, 2); + Wt::WLength offset = Wt::WLength(raw2); + self->setOffsets(offset); + return 0; + + } else if (index == 1) { + double raw2 = lua_tonumber(L, 2); + Wt::WLength offset = Wt::WLength(raw2); + Wt::WFlags sides = static_cast(lua_tointeger(L, 3)); + self->setOffsets(offset, sides); + return 0; + } else { - return luaL_error(L, "Wrong arguments for WCompositeWidget.isDisabled"); + return luaL_error(L, "Wrong arguments for WCompositeWidget.setOffsets"); } } @@ -259,19 +386,19 @@ int luawt_WCompositeWidget_setFloatSide(lua_State* L) { } } -static const char* WCompositeWidget_propagateSetEnabled_args0[] = {luawt_typeToStr(), "bool", NULL}; -static const char* const* const luawt_WCompositeWidget_propagateSetEnabled_args[] = {WCompositeWidget_propagateSetEnabled_args0, NULL}; +static const char* WCompositeWidget_width_args0[] = {luawt_typeToStr(), NULL}; +static const char* const* const luawt_WCompositeWidget_width_args[] = {WCompositeWidget_width_args0, NULL}; -int luawt_WCompositeWidget_propagateSetEnabled(lua_State* L) { - int index = luawt_getSuitableArgsGroup(L, luawt_WCompositeWidget_propagateSetEnabled_args); +int luawt_WCompositeWidget_width(lua_State* L) { + int index = luawt_getSuitableArgsGroup(L, luawt_WCompositeWidget_width_args); WCompositeWidget* self = luawt_checkFromLua(L, 1); if (index == 0) { - bool enabled = lua_toboolean(L, 2); - self->propagateSetEnabled(enabled); - return 0; - + Wt::WLength l_result = self->width(); + lua_pushnumber(L, l_result.value()); + return 1; + } else { - return luaL_error(L, "Wrong arguments for WCompositeWidget.propagateSetEnabled"); + return luaL_error(L, "Wrong arguments for WCompositeWidget.width"); } } @@ -282,8 +409,8 @@ int luawt_WCompositeWidget_verticalAlignment(lua_State* L) { int index = luawt_getSuitableArgsGroup(L, luawt_WCompositeWidget_verticalAlignment_args); WCompositeWidget* self = luawt_checkFromLua(L, 1); if (index == 0) { - Wt::AlignmentFlag result = self->verticalAlignment(); - lua_pushinteger(L, result); + Wt::AlignmentFlag l_result = self->verticalAlignment(); + lua_pushinteger(L, l_result); return 1; } else { @@ -291,6 +418,25 @@ int luawt_WCompositeWidget_verticalAlignment(lua_State* L) { } } +static const char* WCompositeWidget_resize_args0[] = {luawt_typeToStr(), "double", "double", NULL}; +static const char* const* const luawt_WCompositeWidget_resize_args[] = {WCompositeWidget_resize_args0, NULL}; + +int luawt_WCompositeWidget_resize(lua_State* L) { + int index = luawt_getSuitableArgsGroup(L, luawt_WCompositeWidget_resize_args); + WCompositeWidget* self = luawt_checkFromLua(L, 1); + if (index == 0) { + double raw2 = lua_tonumber(L, 2); + Wt::WLength width = Wt::WLength(raw2); + double raw3 = lua_tonumber(L, 3); + Wt::WLength height = Wt::WLength(raw3); + self->resize(width, height); + return 0; + + } else { + return luaL_error(L, "Wrong arguments for WCompositeWidget.resize"); + } +} + static const char* WCompositeWidget_positionScheme_args0[] = {luawt_typeToStr(), NULL}; static const char* const* const luawt_WCompositeWidget_positionScheme_args[] = {WCompositeWidget_positionScheme_args0, NULL}; @@ -298,8 +444,8 @@ int luawt_WCompositeWidget_positionScheme(lua_State* L) { int index = luawt_getSuitableArgsGroup(L, luawt_WCompositeWidget_positionScheme_args); WCompositeWidget* self = luawt_checkFromLua(L, 1); if (index == 0) { - Wt::PositionScheme result = self->positionScheme(); - lua_pushinteger(L, result); + Wt::PositionScheme l_result = self->positionScheme(); + lua_pushinteger(L, l_result); return 1; } else { @@ -307,6 +453,22 @@ int luawt_WCompositeWidget_positionScheme(lua_State* L) { } } +static const char* WCompositeWidget_lineHeight_args0[] = {luawt_typeToStr(), NULL}; +static const char* const* const luawt_WCompositeWidget_lineHeight_args[] = {WCompositeWidget_lineHeight_args0, NULL}; + +int luawt_WCompositeWidget_lineHeight(lua_State* L) { + int index = luawt_getSuitableArgsGroup(L, luawt_WCompositeWidget_lineHeight_args); + WCompositeWidget* self = luawt_checkFromLua(L, 1); + if (index == 0) { + Wt::WLength l_result = self->lineHeight(); + lua_pushnumber(L, l_result.value()); + return 1; + + } else { + return luaL_error(L, "Wrong arguments for WCompositeWidget.lineHeight"); + } +} + static const char* WCompositeWidget_tabIndex_args0[] = {luawt_typeToStr(), NULL}; static const char* const* const luawt_WCompositeWidget_tabIndex_args[] = {WCompositeWidget_tabIndex_args0, NULL}; @@ -314,8 +476,8 @@ int luawt_WCompositeWidget_tabIndex(lua_State* L) { int index = luawt_getSuitableArgsGroup(L, luawt_WCompositeWidget_tabIndex_args); WCompositeWidget* self = luawt_checkFromLua(L, 1); if (index == 0) { - int result = self->tabIndex(); - lua_pushinteger(L, result); + int l_result = self->tabIndex(); + lua_pushinteger(L, l_result); return 1; } else { @@ -330,8 +492,8 @@ int luawt_WCompositeWidget_isHidden(lua_State* L) { int index = luawt_getSuitableArgsGroup(L, luawt_WCompositeWidget_isHidden_args); WCompositeWidget* self = luawt_checkFromLua(L, 1); if (index == 0) { - bool result = self->isHidden(); - lua_pushboolean(L, result); + bool l_result = self->isHidden(); + lua_pushboolean(L, l_result); return 1; } else { @@ -355,6 +517,22 @@ int luawt_WCompositeWidget_setSelectable(lua_State* L) { } } +static const char* WCompositeWidget_minimumWidth_args0[] = {luawt_typeToStr(), NULL}; +static const char* const* const luawt_WCompositeWidget_minimumWidth_args[] = {WCompositeWidget_minimumWidth_args0, NULL}; + +int luawt_WCompositeWidget_minimumWidth(lua_State* L) { + int index = luawt_getSuitableArgsGroup(L, luawt_WCompositeWidget_minimumWidth_args); + WCompositeWidget* self = luawt_checkFromLua(L, 1); + if (index == 0) { + Wt::WLength l_result = self->minimumWidth(); + lua_pushnumber(L, l_result.value()); + return 1; + + } else { + return luaL_error(L, "Wrong arguments for WCompositeWidget.minimumWidth"); + } +} + static const char* WCompositeWidget_attributeValue_args0[] = {luawt_typeToStr(), "char const *", NULL}; static const char* const* const luawt_WCompositeWidget_attributeValue_args[] = {WCompositeWidget_attributeValue_args0, NULL}; @@ -364,8 +542,8 @@ int luawt_WCompositeWidget_attributeValue(lua_State* L) { if (index == 0) { char const * raw2 = lua_tostring(L, 2); std::string name = std::string(raw2); - Wt::WString result = self->attributeValue(name); - lua_pushstring(L, result.toUTF8().c_str()); + Wt::WString l_result = self->attributeValue(name); + lua_pushstring(L, l_result.toUTF8().c_str()); return 1; } else { @@ -389,6 +567,22 @@ int luawt_WCompositeWidget_setPositionScheme(lua_State* L) { } } +static const char* WCompositeWidget_maximumHeight_args0[] = {luawt_typeToStr(), NULL}; +static const char* const* const luawt_WCompositeWidget_maximumHeight_args[] = {WCompositeWidget_maximumHeight_args0, NULL}; + +int luawt_WCompositeWidget_maximumHeight(lua_State* L) { + int index = luawt_getSuitableArgsGroup(L, luawt_WCompositeWidget_maximumHeight_args); + WCompositeWidget* self = luawt_checkFromLua(L, 1); + if (index == 0) { + Wt::WLength l_result = self->maximumHeight(); + lua_pushnumber(L, l_result.value()); + return 1; + + } else { + return luaL_error(L, "Wrong arguments for WCompositeWidget.maximumHeight"); + } +} + static const char* WCompositeWidget_javaScriptMember_args0[] = {luawt_typeToStr(), "char const *", NULL}; static const char* const* const luawt_WCompositeWidget_javaScriptMember_args[] = {WCompositeWidget_javaScriptMember_args0, NULL}; @@ -398,8 +592,8 @@ int luawt_WCompositeWidget_javaScriptMember(lua_State* L) { if (index == 0) { char const * raw2 = lua_tostring(L, 2); std::string name = std::string(raw2); - std::string result = self->javaScriptMember(name); - lua_pushstring(L, result.c_str()); + std::string l_result = self->javaScriptMember(name); + lua_pushstring(L, l_result.c_str()); return 1; } else { @@ -407,6 +601,22 @@ int luawt_WCompositeWidget_javaScriptMember(lua_State* L) { } } +static const char* WCompositeWidget_verticalAlignmentLength_args0[] = {luawt_typeToStr(), NULL}; +static const char* const* const luawt_WCompositeWidget_verticalAlignmentLength_args[] = {WCompositeWidget_verticalAlignmentLength_args0, NULL}; + +int luawt_WCompositeWidget_verticalAlignmentLength(lua_State* L) { + int index = luawt_getSuitableArgsGroup(L, luawt_WCompositeWidget_verticalAlignmentLength_args); + WCompositeWidget* self = luawt_checkFromLua(L, 1); + if (index == 0) { + Wt::WLength l_result = self->verticalAlignmentLength(); + lua_pushnumber(L, l_result.value()); + return 1; + + } else { + return luaL_error(L, "Wrong arguments for WCompositeWidget.verticalAlignmentLength"); + } +} + static const char* WCompositeWidget_toolTip_args0[] = {luawt_typeToStr(), NULL}; static const char* const* const luawt_WCompositeWidget_toolTip_args[] = {WCompositeWidget_toolTip_args0, NULL}; @@ -414,8 +624,8 @@ int luawt_WCompositeWidget_toolTip(lua_State* L) { int index = luawt_getSuitableArgsGroup(L, luawt_WCompositeWidget_toolTip_args); WCompositeWidget* self = luawt_checkFromLua(L, 1); if (index == 0) { - Wt::WString const & result = self->toolTip(); - lua_pushstring(L, result.toUTF8().c_str()); + Wt::WString const & l_result = self->toolTip(); + lua_pushstring(L, l_result.toUTF8().c_str()); return 1; } else { @@ -423,6 +633,55 @@ int luawt_WCompositeWidget_toolTip(lua_State* L) { } } +static const char* WCompositeWidget_setVerticalAlignment_args0[] = {luawt_typeToStr(), "int", NULL}; +static const char* WCompositeWidget_setVerticalAlignment_args1[] = {luawt_typeToStr(), "int", "double", NULL}; +static const char* const* const luawt_WCompositeWidget_setVerticalAlignment_args[] = {WCompositeWidget_setVerticalAlignment_args0, WCompositeWidget_setVerticalAlignment_args1, NULL}; + +int luawt_WCompositeWidget_setVerticalAlignment(lua_State* L) { + int index = luawt_getSuitableArgsGroup(L, luawt_WCompositeWidget_setVerticalAlignment_args); + WCompositeWidget* self = luawt_checkFromLua(L, 1); + if (index == 0) { + Wt::AlignmentFlag alignment = static_cast(lua_tointeger(L, 2)); + self->setVerticalAlignment(alignment); + return 0; + + } else if (index == 1) { + Wt::AlignmentFlag alignment = static_cast(lua_tointeger(L, 2)); + double raw3 = lua_tonumber(L, 3); + Wt::WLength length = Wt::WLength(raw3); + self->setVerticalAlignment(alignment, length); + return 0; + + } else { + return luaL_error(L, "Wrong arguments for WCompositeWidget.setVerticalAlignment"); + } +} + +static const char* WCompositeWidget_setMargin_args0[] = {luawt_typeToStr(), "double", NULL}; +static const char* WCompositeWidget_setMargin_args1[] = {luawt_typeToStr(), "double", "int", NULL}; +static const char* const* const luawt_WCompositeWidget_setMargin_args[] = {WCompositeWidget_setMargin_args0, WCompositeWidget_setMargin_args1, NULL}; + +int luawt_WCompositeWidget_setMargin(lua_State* L) { + int index = luawt_getSuitableArgsGroup(L, luawt_WCompositeWidget_setMargin_args); + WCompositeWidget* self = luawt_checkFromLua(L, 1); + if (index == 0) { + double raw2 = lua_tonumber(L, 2); + Wt::WLength margin = Wt::WLength(raw2); + self->setMargin(margin); + return 0; + + } else if (index == 1) { + double raw2 = lua_tonumber(L, 2); + Wt::WLength margin = Wt::WLength(raw2); + Wt::WFlags sides = static_cast(lua_tointeger(L, 3)); + self->setMargin(margin, sides); + return 0; + + } else { + return luaL_error(L, "Wrong arguments for WCompositeWidget.setMargin"); + } +} + static const char* WCompositeWidget_setInline_args0[] = {luawt_typeToStr(), "bool", NULL}; static const char* const* const luawt_WCompositeWidget_setInline_args[] = {WCompositeWidget_setInline_args0, NULL}; @@ -439,19 +698,36 @@ int luawt_WCompositeWidget_setInline(lua_State* L) { } } -static const char* WCompositeWidget_webWidget_args0[] = {luawt_typeToStr(), NULL}; -static const char* const* const luawt_WCompositeWidget_webWidget_args[] = {WCompositeWidget_webWidget_args0, NULL}; +static const char* WCompositeWidget_offset_args0[] = {luawt_typeToStr(), "int", NULL}; +static const char* const* const luawt_WCompositeWidget_offset_args[] = {WCompositeWidget_offset_args0, NULL}; -int luawt_WCompositeWidget_webWidget(lua_State* L) { - int index = luawt_getSuitableArgsGroup(L, luawt_WCompositeWidget_webWidget_args); +int luawt_WCompositeWidget_offset(lua_State* L) { + int index = luawt_getSuitableArgsGroup(L, luawt_WCompositeWidget_offset_args); WCompositeWidget* self = luawt_checkFromLua(L, 1); if (index == 0) { - Wt::WWebWidget * result = self->webWidget(); - luawt_toLua(L, result); + Wt::Side s = static_cast(lua_tointeger(L, 2)); + Wt::WLength l_result = self->offset(s); + lua_pushnumber(L, l_result.value()); return 1; } else { - return luaL_error(L, "Wrong arguments for WCompositeWidget.webWidget"); + return luaL_error(L, "Wrong arguments for WCompositeWidget.offset"); + } +} + +static const char* WCompositeWidget_clearSides_args0[] = {luawt_typeToStr(), NULL}; +static const char* const* const luawt_WCompositeWidget_clearSides_args[] = {WCompositeWidget_clearSides_args0, NULL}; + +int luawt_WCompositeWidget_clearSides(lua_State* L) { + int index = luawt_getSuitableArgsGroup(L, luawt_WCompositeWidget_clearSides_args); + WCompositeWidget* self = luawt_checkFromLua(L, 1); + if (index == 0) { + Wt::WFlags l_result = self->clearSides(); + lua_pushinteger(L, l_result); + return 1; + + } else { + return luaL_error(L, "Wrong arguments for WCompositeWidget.clearSides"); } } @@ -472,6 +748,23 @@ int luawt_WCompositeWidget_setId(lua_State* L) { } } +static const char* WCompositeWidget_setLineHeight_args0[] = {luawt_typeToStr(), "double", NULL}; +static const char* const* const luawt_WCompositeWidget_setLineHeight_args[] = {WCompositeWidget_setLineHeight_args0, NULL}; + +int luawt_WCompositeWidget_setLineHeight(lua_State* L) { + int index = luawt_getSuitableArgsGroup(L, luawt_WCompositeWidget_setLineHeight_args); + WCompositeWidget* self = luawt_checkFromLua(L, 1); + if (index == 0) { + double raw2 = lua_tonumber(L, 2); + Wt::WLength height = Wt::WLength(raw2); + self->setLineHeight(height); + return 0; + + } else { + return luaL_error(L, "Wrong arguments for WCompositeWidget.setLineHeight"); + } +} + static const char* WCompositeWidget_hasStyleClass_args0[] = {luawt_typeToStr(), "char const *", NULL}; static const char* const* const luawt_WCompositeWidget_hasStyleClass_args[] = {WCompositeWidget_hasStyleClass_args0, NULL}; @@ -481,8 +774,8 @@ int luawt_WCompositeWidget_hasStyleClass(lua_State* L) { if (index == 0) { char const * raw2 = lua_tostring(L, 2); Wt::WString styleClass = Wt::WString(raw2); - bool result = self->hasStyleClass(styleClass); - lua_pushboolean(L, result); + bool l_result = self->hasStyleClass(styleClass); + lua_pushboolean(L, l_result); return 1; } else { @@ -499,8 +792,8 @@ int luawt_WCompositeWidget_findById(lua_State* L) { if (index == 0) { char const * raw2 = lua_tostring(L, 2); std::string name = std::string(raw2); - Wt::WWidget * result = self->findById(name); - luawt_toLua(L, result); + Wt::WWidget * l_result = self->findById(name); + luawt_toLua(L, l_result); return 1; } else { @@ -508,6 +801,22 @@ int luawt_WCompositeWidget_findById(lua_State* L) { } } +static const char* WCompositeWidget_maximumWidth_args0[] = {luawt_typeToStr(), NULL}; +static const char* const* const luawt_WCompositeWidget_maximumWidth_args[] = {WCompositeWidget_maximumWidth_args0, NULL}; + +int luawt_WCompositeWidget_maximumWidth(lua_State* L) { + int index = luawt_getSuitableArgsGroup(L, luawt_WCompositeWidget_maximumWidth_args); + WCompositeWidget* self = luawt_checkFromLua(L, 1); + if (index == 0) { + Wt::WLength l_result = self->maximumWidth(); + lua_pushnumber(L, l_result.value()); + return 1; + + } else { + return luaL_error(L, "Wrong arguments for WCompositeWidget.maximumWidth"); + } +} + static const char* WCompositeWidget_setToolTip_args0[] = {luawt_typeToStr(), "char const *", NULL}; static const char* WCompositeWidget_setToolTip_args1[] = {luawt_typeToStr(), "char const *", "int", NULL}; static const char* const* const luawt_WCompositeWidget_setToolTip_args[] = {WCompositeWidget_setToolTip_args0, WCompositeWidget_setToolTip_args1, NULL}; @@ -540,8 +849,8 @@ int luawt_WCompositeWidget_isPopup(lua_State* L) { int index = luawt_getSuitableArgsGroup(L, luawt_WCompositeWidget_isPopup_args); WCompositeWidget* self = luawt_checkFromLua(L, 1); if (index == 0) { - bool result = self->isPopup(); - lua_pushboolean(L, result); + bool l_result = self->isPopup(); + lua_pushboolean(L, l_result); return 1; } else { @@ -549,6 +858,25 @@ int luawt_WCompositeWidget_isPopup(lua_State* L) { } } +static const char* WCompositeWidget_setJavaScriptMember_args0[] = {luawt_typeToStr(), "char const *", "char const *", NULL}; +static const char* const* const luawt_WCompositeWidget_setJavaScriptMember_args[] = {WCompositeWidget_setJavaScriptMember_args0, NULL}; + +int luawt_WCompositeWidget_setJavaScriptMember(lua_State* L) { + int index = luawt_getSuitableArgsGroup(L, luawt_WCompositeWidget_setJavaScriptMember_args); + WCompositeWidget* self = luawt_checkFromLua(L, 1); + if (index == 0) { + char const * raw2 = lua_tostring(L, 2); + std::string name = std::string(raw2); + char const * raw3 = lua_tostring(L, 3); + std::string value = std::string(raw3); + self->setJavaScriptMember(name, value); + return 0; + + } else { + return luaL_error(L, "Wrong arguments for WCompositeWidget.setJavaScriptMember"); + } +} + static const char* WCompositeWidget_removeStyleClass_args0[] = {luawt_typeToStr(), "char const *", NULL}; static const char* WCompositeWidget_removeStyleClass_args1[] = {luawt_typeToStr(), "char const *", "bool", NULL}; static const char* const* const luawt_WCompositeWidget_removeStyleClass_args[] = {WCompositeWidget_removeStyleClass_args0, WCompositeWidget_removeStyleClass_args1, NULL}; @@ -589,22 +917,20 @@ int luawt_WCompositeWidget_refresh(lua_State* L) { } } -static const char* WCompositeWidget_setJavaScriptMember_args0[] = {luawt_typeToStr(), "char const *", "char const *", NULL}; -static const char* const* const luawt_WCompositeWidget_setJavaScriptMember_args[] = {WCompositeWidget_setJavaScriptMember_args0, NULL}; +static const char* WCompositeWidget_setStyleClass_args0[] = {luawt_typeToStr(), "char const *", NULL}; +static const char* const* const luawt_WCompositeWidget_setStyleClass_args[] = {WCompositeWidget_setStyleClass_args0, NULL}; -int luawt_WCompositeWidget_setJavaScriptMember(lua_State* L) { - int index = luawt_getSuitableArgsGroup(L, luawt_WCompositeWidget_setJavaScriptMember_args); +int luawt_WCompositeWidget_setStyleClass(lua_State* L) { + int index = luawt_getSuitableArgsGroup(L, luawt_WCompositeWidget_setStyleClass_args); WCompositeWidget* self = luawt_checkFromLua(L, 1); if (index == 0) { char const * raw2 = lua_tostring(L, 2); - std::string name = std::string(raw2); - char const * raw3 = lua_tostring(L, 3); - std::string value = std::string(raw3); - self->setJavaScriptMember(name, value); + Wt::WString styleClass = Wt::WString(raw2); + self->setStyleClass(styleClass); return 0; } else { - return luaL_error(L, "Wrong arguments for WCompositeWidget.setJavaScriptMember"); + return luaL_error(L, "Wrong arguments for WCompositeWidget.setStyleClass"); } } @@ -647,8 +973,8 @@ int luawt_WCompositeWidget_isVisible(lua_State* L) { int index = luawt_getSuitableArgsGroup(L, luawt_WCompositeWidget_isVisible_args); WCompositeWidget* self = luawt_checkFromLua(L, 1); if (index == 0) { - bool result = self->isVisible(); - lua_pushboolean(L, result); + bool l_result = self->isVisible(); + lua_pushboolean(L, l_result); return 1; } else { @@ -700,54 +1026,71 @@ int luawt_WCompositeWidget_setAttributeValue(lua_State* L) { } } -static const char* WCompositeWidget_setTabIndex_args0[] = {luawt_typeToStr(), "int", NULL}; -static const char* const* const luawt_WCompositeWidget_setTabIndex_args[] = {WCompositeWidget_setTabIndex_args0, NULL}; +static const char* WCompositeWidget_callJavaScriptMember_args0[] = {luawt_typeToStr(), "char const *", "char const *", NULL}; +static const char* const* const luawt_WCompositeWidget_callJavaScriptMember_args[] = {WCompositeWidget_callJavaScriptMember_args0, NULL}; -int luawt_WCompositeWidget_setTabIndex(lua_State* L) { - int index = luawt_getSuitableArgsGroup(L, luawt_WCompositeWidget_setTabIndex_args); +int luawt_WCompositeWidget_callJavaScriptMember(lua_State* L) { + int index = luawt_getSuitableArgsGroup(L, luawt_WCompositeWidget_callJavaScriptMember_args); WCompositeWidget* self = luawt_checkFromLua(L, 1); if (index == 0) { - int index = lua_tointeger(L, 2); - self->setTabIndex(index); + char const * raw2 = lua_tostring(L, 2); + std::string name = std::string(raw2); + char const * raw3 = lua_tostring(L, 3); + std::string args = std::string(raw3); + self->callJavaScriptMember(name, args); return 0; } else { - return luaL_error(L, "Wrong arguments for WCompositeWidget.setTabIndex"); + return luaL_error(L, "Wrong arguments for WCompositeWidget.callJavaScriptMember"); } } -static const char* WCompositeWidget_isEnabled_args0[] = {luawt_typeToStr(), NULL}; -static const char* const* const luawt_WCompositeWidget_isEnabled_args[] = {WCompositeWidget_isEnabled_args0, NULL}; +static const char* WCompositeWidget_margin_args0[] = {luawt_typeToStr(), "int", NULL}; +static const char* const* const luawt_WCompositeWidget_margin_args[] = {WCompositeWidget_margin_args0, NULL}; -int luawt_WCompositeWidget_isEnabled(lua_State* L) { - int index = luawt_getSuitableArgsGroup(L, luawt_WCompositeWidget_isEnabled_args); +int luawt_WCompositeWidget_margin(lua_State* L) { + int index = luawt_getSuitableArgsGroup(L, luawt_WCompositeWidget_margin_args); WCompositeWidget* self = luawt_checkFromLua(L, 1); if (index == 0) { - bool result = self->isEnabled(); - lua_pushboolean(L, result); + Wt::Side side = static_cast(lua_tointeger(L, 2)); + Wt::WLength l_result = self->margin(side); + lua_pushnumber(L, l_result.value()); return 1; } else { - return luaL_error(L, "Wrong arguments for WCompositeWidget.isEnabled"); + return luaL_error(L, "Wrong arguments for WCompositeWidget.margin"); } } -static const char* WCompositeWidget_callJavaScriptMember_args0[] = {luawt_typeToStr(), "char const *", "char const *", NULL}; -static const char* const* const luawt_WCompositeWidget_callJavaScriptMember_args[] = {WCompositeWidget_callJavaScriptMember_args0, NULL}; +static const char* WCompositeWidget_isDisabled_args0[] = {luawt_typeToStr(), NULL}; +static const char* const* const luawt_WCompositeWidget_isDisabled_args[] = {WCompositeWidget_isDisabled_args0, NULL}; -int luawt_WCompositeWidget_callJavaScriptMember(lua_State* L) { - int index = luawt_getSuitableArgsGroup(L, luawt_WCompositeWidget_callJavaScriptMember_args); +int luawt_WCompositeWidget_isDisabled(lua_State* L) { + int index = luawt_getSuitableArgsGroup(L, luawt_WCompositeWidget_isDisabled_args); WCompositeWidget* self = luawt_checkFromLua(L, 1); if (index == 0) { - char const * raw2 = lua_tostring(L, 2); - std::string name = std::string(raw2); - char const * raw3 = lua_tostring(L, 3); - std::string args = std::string(raw3); - self->callJavaScriptMember(name, args); - return 0; - + bool l_result = self->isDisabled(); + lua_pushboolean(L, l_result); + return 1; + } else { - return luaL_error(L, "Wrong arguments for WCompositeWidget.callJavaScriptMember"); + return luaL_error(L, "Wrong arguments for WCompositeWidget.isDisabled"); + } +} + +static const char* WCompositeWidget_isEnabled_args0[] = {luawt_typeToStr(), NULL}; +static const char* const* const luawt_WCompositeWidget_isEnabled_args[] = {WCompositeWidget_isEnabled_args0, NULL}; + +int luawt_WCompositeWidget_isEnabled(lua_State* L) { + int index = luawt_getSuitableArgsGroup(L, luawt_WCompositeWidget_isEnabled_args); + WCompositeWidget* self = luawt_checkFromLua(L, 1); + if (index == 0) { + bool l_result = self->isEnabled(); + lua_pushboolean(L, l_result); + return 1; + + } else { + return luaL_error(L, "Wrong arguments for WCompositeWidget.isEnabled"); } } @@ -756,8 +1099,25 @@ static const luaL_Reg luawt_WCompositeWidget_methods[] = { METHOD(WCompositeWidget, id), METHOD(WCompositeWidget, setPositionScheme), METHOD(WCompositeWidget, positionScheme), + METHOD(WCompositeWidget, setOffsets), + METHOD(WCompositeWidget, offset), + METHOD(WCompositeWidget, resize), + METHOD(WCompositeWidget, width), + METHOD(WCompositeWidget, height), + METHOD(WCompositeWidget, setMinimumSize), + METHOD(WCompositeWidget, minimumWidth), + METHOD(WCompositeWidget, minimumHeight), + METHOD(WCompositeWidget, setMaximumSize), + METHOD(WCompositeWidget, maximumWidth), + METHOD(WCompositeWidget, maximumHeight), + METHOD(WCompositeWidget, setLineHeight), + METHOD(WCompositeWidget, lineHeight), METHOD(WCompositeWidget, setFloatSide), METHOD(WCompositeWidget, floatSide), + METHOD(WCompositeWidget, setClearSides), + METHOD(WCompositeWidget, clearSides), + METHOD(WCompositeWidget, setMargin), + METHOD(WCompositeWidget, margin), METHOD(WCompositeWidget, setHiddenKeepsGeometry), METHOD(WCompositeWidget, hiddenKeepsGeometry), METHOD(WCompositeWidget, isHidden), @@ -774,7 +1134,9 @@ static const luaL_Reg luawt_WCompositeWidget_methods[] = { METHOD(WCompositeWidget, addStyleClass), METHOD(WCompositeWidget, removeStyleClass), METHOD(WCompositeWidget, hasStyleClass), + METHOD(WCompositeWidget, setVerticalAlignment), METHOD(WCompositeWidget, verticalAlignment), + METHOD(WCompositeWidget, verticalAlignmentLength), METHOD(WCompositeWidget, webWidget), METHOD(WCompositeWidget, setToolTip), METHOD(WCompositeWidget, toolTip), diff --git a/src/luawt/WContainerWidget.cpp b/src/luawt/WContainerWidget.cpp index 5872f93..7b5fb6e 100644 --- a/src/luawt/WContainerWidget.cpp +++ b/src/luawt/WContainerWidget.cpp @@ -1,6 +1,7 @@ #include "boost-xtime.hpp" #include +#include #include #include "globals.hpp" @@ -12,22 +13,22 @@ static const char* const* const luawt_WContainerWidget_make_args[] = {WContainer int luawt_WContainerWidget_make(lua_State* L) { int index = luawt_getSuitableArgsGroup(L, luawt_WContainerWidget_make_args); if (index == 0) { - WContainerWidget * result = new WContainerWidget(); + WContainerWidget * l_result = new WContainerWidget(); MyApplication* app = MyApplication::instance(); if (!app) { - delete result; + delete l_result; throw std::logic_error("No WApplication when creating WContainerWidget"); } - app->root()->addWidget(result); + app->root()->addWidget(l_result); - luawt_toLua(L, result); + luawt_toLua(L, l_result); return 1; } else if (index == 1) { Wt::WContainerWidget* parent = luawt_checkFromLua(L, 1); - WContainerWidget * result = new WContainerWidget(parent); - luawt_toLua(L, result); + WContainerWidget * l_result = new WContainerWidget(parent); + luawt_toLua(L, l_result); return 1; } else { @@ -42,8 +43,8 @@ int luawt_WContainerWidget_count(lua_State* L) { int index = luawt_getSuitableArgsGroup(L, luawt_WContainerWidget_count_args); WContainerWidget* self = luawt_checkFromLua(L, 1); if (index == 0) { - int result = self->count(); - lua_pushinteger(L, result); + int l_result = self->count(); + lua_pushinteger(L, l_result); return 1; } else { @@ -51,6 +52,23 @@ int luawt_WContainerWidget_count(lua_State* L) { } } +static const char* WContainerWidget_padding_args0[] = {luawt_typeToStr(), "int", NULL}; +static const char* const* const luawt_WContainerWidget_padding_args[] = {WContainerWidget_padding_args0, NULL}; + +int luawt_WContainerWidget_padding(lua_State* L) { + int index = luawt_getSuitableArgsGroup(L, luawt_WContainerWidget_padding_args); + WContainerWidget* self = luawt_checkFromLua(L, 1); + if (index == 0) { + Wt::Side side = static_cast(lua_tointeger(L, 2)); + Wt::WLength l_result = self->padding(side); + lua_pushnumber(L, l_result.value()); + return 1; + + } else { + return luaL_error(L, "Wrong arguments for WContainerWidget.padding"); + } +} + static const char* WContainerWidget_widget_args0[] = {luawt_typeToStr(), "int", NULL}; static const char* const* const luawt_WContainerWidget_widget_args[] = {WContainerWidget_widget_args0, NULL}; @@ -59,8 +77,8 @@ int luawt_WContainerWidget_widget(lua_State* L) { WContainerWidget* self = luawt_checkFromLua(L, 1); if (index == 0) { int index = lua_tointeger(L, 2); - Wt::WWidget * result = self->widget(index); - luawt_toLua(L, result); + Wt::WWidget * l_result = self->widget(index); + luawt_toLua(L, l_result); return 1; } else { @@ -96,8 +114,8 @@ int luawt_WContainerWidget_indexOf(lua_State* L) { if (index == 0) { Wt::WWidget* widget = luawt_checkFromLua(L, 2); - int result = self->indexOf(widget); - lua_pushinteger(L, result); + int l_result = self->indexOf(widget); + lua_pushinteger(L, l_result); return 1; } else { @@ -185,8 +203,8 @@ int luawt_WContainerWidget_isOrderedList(lua_State* L) { int index = luawt_getSuitableArgsGroup(L, luawt_WContainerWidget_isOrderedList_args); WContainerWidget* self = luawt_checkFromLua(L, 1); if (index == 0) { - bool result = self->isOrderedList(); - lua_pushboolean(L, result); + bool l_result = self->isOrderedList(); + lua_pushboolean(L, l_result); return 1; } else { @@ -201,8 +219,8 @@ int luawt_WContainerWidget_isList(lua_State* L) { int index = luawt_getSuitableArgsGroup(L, luawt_WContainerWidget_isList_args); WContainerWidget* self = luawt_checkFromLua(L, 1); if (index == 0) { - bool result = self->isList(); - lua_pushboolean(L, result); + bool l_result = self->isList(); + lua_pushboolean(L, l_result); return 1; } else { @@ -210,6 +228,29 @@ int luawt_WContainerWidget_isList(lua_State* L) { } } +static const char* WContainerWidget_setOverflow_args0[] = {luawt_typeToStr(), "int", NULL}; +static const char* WContainerWidget_setOverflow_args1[] = {luawt_typeToStr(), "int", "int", NULL}; +static const char* const* const luawt_WContainerWidget_setOverflow_args[] = {WContainerWidget_setOverflow_args0, WContainerWidget_setOverflow_args1, NULL}; + +int luawt_WContainerWidget_setOverflow(lua_State* L) { + int index = luawt_getSuitableArgsGroup(L, luawt_WContainerWidget_setOverflow_args); + WContainerWidget* self = luawt_checkFromLua(L, 1); + if (index == 0) { + Wt::WContainerWidget::Overflow overflow = static_cast(lua_tointeger(L, 2)); + self->setOverflow(overflow); + return 0; + + } else if (index == 1) { + Wt::WContainerWidget::Overflow overflow = static_cast(lua_tointeger(L, 2)); + Wt::WFlags orientation = static_cast(lua_tointeger(L, 3)); + self->setOverflow(overflow, orientation); + return 0; + + } else { + return luaL_error(L, "Wrong arguments for WContainerWidget.setOverflow"); + } +} + static const char* WContainerWidget_addWidget_args0[] = {luawt_typeToStr(), luawt_typeToStr(), NULL}; static const char* const* const luawt_WContainerWidget_addWidget_args[] = {WContainerWidget_addWidget_args0, NULL}; @@ -227,6 +268,38 @@ int luawt_WContainerWidget_addWidget(lua_State* L) { } } +static const char* WContainerWidget_setContentAlignment_args0[] = {luawt_typeToStr(), "int", NULL}; +static const char* const* const luawt_WContainerWidget_setContentAlignment_args[] = {WContainerWidget_setContentAlignment_args0, NULL}; + +int luawt_WContainerWidget_setContentAlignment(lua_State* L) { + int index = luawt_getSuitableArgsGroup(L, luawt_WContainerWidget_setContentAlignment_args); + WContainerWidget* self = luawt_checkFromLua(L, 1); + if (index == 0) { + Wt::WFlags contentAlignment = static_cast(lua_tointeger(L, 2)); + self->setContentAlignment(contentAlignment); + return 0; + + } else { + return luaL_error(L, "Wrong arguments for WContainerWidget.setContentAlignment"); + } +} + +static const char* WContainerWidget_contentAlignment_args0[] = {luawt_typeToStr(), NULL}; +static const char* const* const luawt_WContainerWidget_contentAlignment_args[] = {WContainerWidget_contentAlignment_args0, NULL}; + +int luawt_WContainerWidget_contentAlignment(lua_State* L) { + int index = luawt_getSuitableArgsGroup(L, luawt_WContainerWidget_contentAlignment_args); + WContainerWidget* self = luawt_checkFromLua(L, 1); + if (index == 0) { + Wt::WFlags l_result = self->contentAlignment(); + lua_pushinteger(L, l_result); + return 1; + + } else { + return luaL_error(L, "Wrong arguments for WContainerWidget.contentAlignment"); + } +} + static const char* WContainerWidget_isUnorderedList_args0[] = {luawt_typeToStr(), NULL}; static const char* const* const luawt_WContainerWidget_isUnorderedList_args[] = {WContainerWidget_isUnorderedList_args0, NULL}; @@ -234,8 +307,8 @@ int luawt_WContainerWidget_isUnorderedList(lua_State* L) { int index = luawt_getSuitableArgsGroup(L, luawt_WContainerWidget_isUnorderedList_args); WContainerWidget* self = luawt_checkFromLua(L, 1); if (index == 0) { - bool result = self->isUnorderedList(); - lua_pushboolean(L, result); + bool l_result = self->isUnorderedList(); + lua_pushboolean(L, l_result); return 1; } else { @@ -243,6 +316,31 @@ int luawt_WContainerWidget_isUnorderedList(lua_State* L) { } } +static const char* WContainerWidget_setPadding_args0[] = {luawt_typeToStr(), "double", NULL}; +static const char* WContainerWidget_setPadding_args1[] = {luawt_typeToStr(), "double", "int", NULL}; +static const char* const* const luawt_WContainerWidget_setPadding_args[] = {WContainerWidget_setPadding_args0, WContainerWidget_setPadding_args1, NULL}; + +int luawt_WContainerWidget_setPadding(lua_State* L) { + int index = luawt_getSuitableArgsGroup(L, luawt_WContainerWidget_setPadding_args); + WContainerWidget* self = luawt_checkFromLua(L, 1); + if (index == 0) { + double raw2 = lua_tonumber(L, 2); + Wt::WLength padding = Wt::WLength(raw2); + self->setPadding(padding); + return 0; + + } else if (index == 1) { + double raw2 = lua_tonumber(L, 2); + Wt::WLength padding = Wt::WLength(raw2); + Wt::WFlags sides = static_cast(lua_tointeger(L, 3)); + self->setPadding(padding, sides); + return 0; + + } else { + return luaL_error(L, "Wrong arguments for WContainerWidget.setPadding"); + } +} + ADD_SIGNAL(scrolled, WContainerWidget, Wt::WScrollEvent) ADD_SIGNAL(keyWentDown, WContainerWidget, Wt::WKeyEvent) ADD_SIGNAL(keyPressed, WContainerWidget, Wt::WKeyEvent) @@ -274,6 +372,11 @@ static const luaL_Reg luawt_WContainerWidget_methods[] = { METHOD(WContainerWidget, indexOf), METHOD(WContainerWidget, widget), METHOD(WContainerWidget, count), + METHOD(WContainerWidget, setContentAlignment), + METHOD(WContainerWidget, setPadding), + METHOD(WContainerWidget, padding), + METHOD(WContainerWidget, contentAlignment), + METHOD(WContainerWidget, setOverflow), METHOD(WContainerWidget, setList), METHOD(WContainerWidget, isList), METHOD(WContainerWidget, isUnorderedList), diff --git a/src/luawt/WDateEdit.cpp b/src/luawt/WDateEdit.cpp index ddf28a3..56897a1 100644 --- a/src/luawt/WDateEdit.cpp +++ b/src/luawt/WDateEdit.cpp @@ -14,22 +14,22 @@ static const char* const* const luawt_WDateEdit_make_args[] = {WDateEdit_make_ar int luawt_WDateEdit_make(lua_State* L) { int index = luawt_getSuitableArgsGroup(L, luawt_WDateEdit_make_args); if (index == 0) { - WDateEdit * result = new WDateEdit(); + WDateEdit * l_result = new WDateEdit(); MyApplication* app = MyApplication::instance(); if (!app) { - delete result; + delete l_result; throw std::logic_error("No WApplication when creating WDateEdit"); } - app->root()->addWidget(result); + app->root()->addWidget(l_result); - luawt_toLua(L, result); + luawt_toLua(L, l_result); return 1; } else if (index == 1) { Wt::WContainerWidget* parent = luawt_checkFromLua(L, 1); - WDateEdit * result = new WDateEdit(parent); - luawt_toLua(L, result); + WDateEdit * l_result = new WDateEdit(parent); + luawt_toLua(L, l_result); return 1; } else { @@ -61,8 +61,8 @@ int luawt_WDateEdit_calendar(lua_State* L) { int index = luawt_getSuitableArgsGroup(L, luawt_WDateEdit_calendar_args); WDateEdit* self = luawt_checkFromLua(L, 1); if (index == 0) { - Wt::WCalendar * result = self->calendar(); - luawt_toLua(L, result); + Wt::WCalendar * l_result = self->calendar(); + luawt_toLua(L, l_result); return 1; } else { @@ -77,8 +77,8 @@ int luawt_WDateEdit_format(lua_State* L) { int index = luawt_getSuitableArgsGroup(L, luawt_WDateEdit_format_args); WDateEdit* self = luawt_checkFromLua(L, 1); if (index == 0) { - Wt::WString result = self->format(); - lua_pushstring(L, result.toUTF8().c_str()); + Wt::WString l_result = self->format(); + lua_pushstring(L, l_result.toUTF8().c_str()); return 1; } else { diff --git a/src/luawt/WDatePicker.cpp b/src/luawt/WDatePicker.cpp index fbe1217..8fa5c25 100644 --- a/src/luawt/WDatePicker.cpp +++ b/src/luawt/WDatePicker.cpp @@ -20,36 +20,36 @@ static const char* const* const luawt_WDatePicker_make_args[] = {WDatePicker_mak int luawt_WDatePicker_make(lua_State* L) { int index = luawt_getSuitableArgsGroup(L, luawt_WDatePicker_make_args); if (index == 0) { - WDatePicker * result = new WDatePicker(); + WDatePicker * l_result = new WDatePicker(); MyApplication* app = MyApplication::instance(); if (!app) { - delete result; + delete l_result; throw std::logic_error("No WApplication when creating WDatePicker"); } - app->root()->addWidget(result); + app->root()->addWidget(l_result); - luawt_toLua(L, result); + luawt_toLua(L, l_result); return 1; } else if (index == 1) { Wt::WContainerWidget* parent = luawt_checkFromLua(L, 1); - WDatePicker * result = new WDatePicker(parent); - luawt_toLua(L, result); + WDatePicker * l_result = new WDatePicker(parent); + luawt_toLua(L, l_result); return 1; } else if (index == 2) { Wt::WLineEdit* forEdit = luawt_checkFromLua(L, 1); - WDatePicker * result = new WDatePicker(forEdit); + WDatePicker * l_result = new WDatePicker(forEdit); MyApplication* app = MyApplication::instance(); if (!app) { - delete result; + delete l_result; throw std::logic_error("No WApplication when creating WDatePicker"); } - app->root()->addWidget(result); + app->root()->addWidget(l_result); - luawt_toLua(L, result); + luawt_toLua(L, l_result); return 1; } else if (index == 3) { @@ -57,8 +57,8 @@ int luawt_WDatePicker_make(lua_State* L) { luawt_checkFromLua(L, 1); Wt::WContainerWidget* parent = luawt_checkFromLua(L, 2); - WDatePicker * result = new WDatePicker(forEdit, parent); - luawt_toLua(L, result); + WDatePicker * l_result = new WDatePicker(forEdit, parent); + luawt_toLua(L, l_result); return 1; } else if (index == 4) { @@ -66,15 +66,15 @@ int luawt_WDatePicker_make(lua_State* L) { luawt_checkFromLua(L, 1); Wt::WLineEdit* forEdit = luawt_checkFromLua(L, 2); - WDatePicker * result = new WDatePicker(displayWidget, forEdit); + WDatePicker * l_result = new WDatePicker(displayWidget, forEdit); MyApplication* app = MyApplication::instance(); if (!app) { - delete result; + delete l_result; throw std::logic_error("No WApplication when creating WDatePicker"); } - app->root()->addWidget(result); + app->root()->addWidget(l_result); - luawt_toLua(L, result); + luawt_toLua(L, l_result); return 1; } else if (index == 5) { @@ -84,8 +84,8 @@ int luawt_WDatePicker_make(lua_State* L) { luawt_checkFromLua(L, 2); Wt::WContainerWidget* parent = luawt_checkFromLua(L, 3); - WDatePicker * result = new WDatePicker(displayWidget, forEdit, parent); - luawt_toLua(L, result); + WDatePicker * l_result = new WDatePicker(displayWidget, forEdit, parent); + luawt_toLua(L, l_result); return 1; } else { @@ -132,8 +132,8 @@ int luawt_WDatePicker_format(lua_State* L) { int index = luawt_getSuitableArgsGroup(L, luawt_WDatePicker_format_args); WDatePicker* self = luawt_checkFromLua(L, 1); if (index == 0) { - Wt::WString const & result = self->format(); - lua_pushstring(L, result.toUTF8().c_str()); + Wt::WString const & l_result = self->format(); + lua_pushstring(L, l_result.toUTF8().c_str()); return 1; } else { @@ -165,8 +165,8 @@ int luawt_WDatePicker_displayWidget(lua_State* L) { int index = luawt_getSuitableArgsGroup(L, luawt_WDatePicker_displayWidget_args); WDatePicker* self = luawt_checkFromLua(L, 1); if (index == 0) { - Wt::WInteractWidget * result = self->displayWidget(); - luawt_toLua(L, result); + Wt::WInteractWidget * l_result = self->displayWidget(); + luawt_toLua(L, l_result); return 1; } else { @@ -213,8 +213,8 @@ int luawt_WDatePicker_calendar(lua_State* L) { int index = luawt_getSuitableArgsGroup(L, luawt_WDatePicker_calendar_args); WDatePicker* self = luawt_checkFromLua(L, 1); if (index == 0) { - Wt::WCalendar * result = self->calendar(); - luawt_toLua(L, result); + Wt::WCalendar * l_result = self->calendar(); + luawt_toLua(L, l_result); return 1; } else { @@ -229,8 +229,8 @@ int luawt_WDatePicker_lineEdit(lua_State* L) { int index = luawt_getSuitableArgsGroup(L, luawt_WDatePicker_lineEdit_args); WDatePicker* self = luawt_checkFromLua(L, 1); if (index == 0) { - Wt::WLineEdit * result = self->lineEdit(); - luawt_toLua(L, result); + Wt::WLineEdit * l_result = self->lineEdit(); + luawt_toLua(L, l_result); return 1; } else { diff --git a/src/luawt/WDefaultLoadingIndicator.cpp b/src/luawt/WDefaultLoadingIndicator.cpp index 601e476..0a091ea 100644 --- a/src/luawt/WDefaultLoadingIndicator.cpp +++ b/src/luawt/WDefaultLoadingIndicator.cpp @@ -12,15 +12,15 @@ static const char* const* const luawt_WDefaultLoadingIndicator_make_args[] = {WD int luawt_WDefaultLoadingIndicator_make(lua_State* L) { int index = luawt_getSuitableArgsGroup(L, luawt_WDefaultLoadingIndicator_make_args); if (index == 0) { - WDefaultLoadingIndicator * result = new WDefaultLoadingIndicator(); + WDefaultLoadingIndicator * l_result = new WDefaultLoadingIndicator(); MyApplication* app = MyApplication::instance(); if (!app) { - delete result; + delete l_result; throw std::logic_error("No WApplication when creating WDefaultLoadingIndicator"); } - app->root()->addWidget(result); + app->root()->addWidget(l_result); - luawt_toLua(L, result); + luawt_toLua(L, l_result); return 1; } else { @@ -35,8 +35,8 @@ int luawt_WDefaultLoadingIndicator_widget(lua_State* L) { int index = luawt_getSuitableArgsGroup(L, luawt_WDefaultLoadingIndicator_widget_args); WDefaultLoadingIndicator* self = luawt_checkFromLua(L, 1); if (index == 0) { - Wt::WWidget * result = self->widget(); - luawt_toLua(L, result); + Wt::WWidget * l_result = self->widget(); + luawt_toLua(L, l_result); return 1; } else { diff --git a/src/luawt/WDialog.cpp b/src/luawt/WDialog.cpp new file mode 100644 index 0000000..a32dbd6 --- /dev/null +++ b/src/luawt/WDialog.cpp @@ -0,0 +1,416 @@ +#include "boost-xtime.hpp" + +#include +#include +#include +#include +#include + +#include "globals.hpp" + +static const char* WDialog_positionAt_args0[] = {luawt_typeToStr(), luawt_typeToStr(), NULL}; +static const char* WDialog_positionAt_args1[] = {luawt_typeToStr(), luawt_typeToStr(), "int", NULL}; +static const char* const* const luawt_WDialog_positionAt_args[] = {WDialog_positionAt_args0, WDialog_positionAt_args1, NULL}; + +int luawt_WDialog_positionAt(lua_State* L) { + int index = luawt_getSuitableArgsGroup(L, luawt_WDialog_positionAt_args); + WDialog* self = luawt_checkFromLua(L, 1); + if (index == 0) { + Wt::WWidget* widget = + luawt_checkFromLua(L, 2); + self->positionAt(widget); + return 0; + + } else if (index == 1) { + Wt::WWidget* widget = + luawt_checkFromLua(L, 2); + Wt::Orientation orientation = static_cast(lua_tointeger(L, 3)); + self->positionAt(widget, orientation); + return 0; + + } else { + return luaL_error(L, "Wrong arguments for WDialog.positionAt"); + } +} + +static const char* WDialog_setMinimumSize_args0[] = {luawt_typeToStr(), "double", "double", NULL}; +static const char* const* const luawt_WDialog_setMinimumSize_args[] = {WDialog_setMinimumSize_args0, NULL}; + +int luawt_WDialog_setMinimumSize(lua_State* L) { + int index = luawt_getSuitableArgsGroup(L, luawt_WDialog_setMinimumSize_args); + WDialog* self = luawt_checkFromLua(L, 1); + if (index == 0) { + double raw2 = lua_tonumber(L, 2); + Wt::WLength width = Wt::WLength(raw2); + double raw3 = lua_tonumber(L, 3); + Wt::WLength height = Wt::WLength(raw3); + self->setMinimumSize(width, height); + return 0; + + } else { + return luaL_error(L, "Wrong arguments for WDialog.setMinimumSize"); + } +} + +static const char* WDialog_accept_args0[] = {luawt_typeToStr(), NULL}; +static const char* const* const luawt_WDialog_accept_args[] = {WDialog_accept_args0, NULL}; + +int luawt_WDialog_accept(lua_State* L) { + int index = luawt_getSuitableArgsGroup(L, luawt_WDialog_accept_args); + WDialog* self = luawt_checkFromLua(L, 1); + if (index == 0) { + self->accept(); + return 0; + + } else { + return luaL_error(L, "Wrong arguments for WDialog.accept"); + } +} + +static const char* WDialog_done_args0[] = {luawt_typeToStr(), "int", NULL}; +static const char* const* const luawt_WDialog_done_args[] = {WDialog_done_args0, NULL}; + +int luawt_WDialog_done(lua_State* L) { + int index = luawt_getSuitableArgsGroup(L, luawt_WDialog_done_args); + WDialog* self = luawt_checkFromLua(L, 1); + if (index == 0) { + Wt::WDialog::DialogCode r = static_cast(lua_tointeger(L, 2)); + self->done(r); + return 0; + + } else { + return luaL_error(L, "Wrong arguments for WDialog.done"); + } +} + +static const char* WDialog_result_args0[] = {luawt_typeToStr(), NULL}; +static const char* const* const luawt_WDialog_result_args[] = {WDialog_result_args0, NULL}; + +int luawt_WDialog_result(lua_State* L) { + int index = luawt_getSuitableArgsGroup(L, luawt_WDialog_result_args); + WDialog* self = luawt_checkFromLua(L, 1); + if (index == 0) { + Wt::WDialog::DialogCode l_result = self->result(); + lua_pushinteger(L, l_result); + return 1; + + } else { + return luaL_error(L, "Wrong arguments for WDialog.result"); + } +} + +static const char* WDialog_setModal_args0[] = {luawt_typeToStr(), "bool", NULL}; +static const char* const* const luawt_WDialog_setModal_args[] = {WDialog_setModal_args0, NULL}; + +int luawt_WDialog_setModal(lua_State* L) { + int index = luawt_getSuitableArgsGroup(L, luawt_WDialog_setModal_args); + WDialog* self = luawt_checkFromLua(L, 1); + if (index == 0) { + bool modal = lua_toboolean(L, 2); + self->setModal(modal); + return 0; + + } else { + return luaL_error(L, "Wrong arguments for WDialog.setModal"); + } +} + +static const char* WDialog_setMaximumSize_args0[] = {luawt_typeToStr(), "double", "double", NULL}; +static const char* const* const luawt_WDialog_setMaximumSize_args[] = {WDialog_setMaximumSize_args0, NULL}; + +int luawt_WDialog_setMaximumSize(lua_State* L) { + int index = luawt_getSuitableArgsGroup(L, luawt_WDialog_setMaximumSize_args); + WDialog* self = luawt_checkFromLua(L, 1); + if (index == 0) { + double raw2 = lua_tonumber(L, 2); + Wt::WLength width = Wt::WLength(raw2); + double raw3 = lua_tonumber(L, 3); + Wt::WLength height = Wt::WLength(raw3); + self->setMaximumSize(width, height); + return 0; + + } else { + return luaL_error(L, "Wrong arguments for WDialog.setMaximumSize"); + } +} + +static const char* WDialog_titleBar_args0[] = {luawt_typeToStr(), NULL}; +static const char* const* const luawt_WDialog_titleBar_args[] = {WDialog_titleBar_args0, NULL}; + +int luawt_WDialog_titleBar(lua_State* L) { + int index = luawt_getSuitableArgsGroup(L, luawt_WDialog_titleBar_args); + WDialog* self = luawt_checkFromLua(L, 1); + if (index == 0) { + Wt::WContainerWidget * l_result = self->titleBar(); + luawt_toLua(L, l_result); + return 1; + + } else { + return luaL_error(L, "Wrong arguments for WDialog.titleBar"); + } +} + +static const char* WDialog_contents_args0[] = {luawt_typeToStr(), NULL}; +static const char* const* const luawt_WDialog_contents_args[] = {WDialog_contents_args0, NULL}; + +int luawt_WDialog_contents(lua_State* L) { + int index = luawt_getSuitableArgsGroup(L, luawt_WDialog_contents_args); + WDialog* self = luawt_checkFromLua(L, 1); + if (index == 0) { + Wt::WContainerWidget * l_result = self->contents(); + luawt_toLua(L, l_result); + return 1; + + } else { + return luaL_error(L, "Wrong arguments for WDialog.contents"); + } +} + +static const char* WDialog_setResizable_args0[] = {luawt_typeToStr(), "bool", NULL}; +static const char* const* const luawt_WDialog_setResizable_args[] = {WDialog_setResizable_args0, NULL}; + +int luawt_WDialog_setResizable(lua_State* L) { + int index = luawt_getSuitableArgsGroup(L, luawt_WDialog_setResizable_args); + WDialog* self = luawt_checkFromLua(L, 1); + if (index == 0) { + bool resizable = lua_toboolean(L, 2); + self->setResizable(resizable); + return 0; + + } else { + return luaL_error(L, "Wrong arguments for WDialog.setResizable"); + } +} + +static const char* WDialog_windowTitle_args0[] = {luawt_typeToStr(), NULL}; +static const char* const* const luawt_WDialog_windowTitle_args[] = {WDialog_windowTitle_args0, NULL}; + +int luawt_WDialog_windowTitle(lua_State* L) { + int index = luawt_getSuitableArgsGroup(L, luawt_WDialog_windowTitle_args); + WDialog* self = luawt_checkFromLua(L, 1); + if (index == 0) { + Wt::WString l_result = self->windowTitle(); + lua_pushstring(L, l_result.toUTF8().c_str()); + return 1; + + } else { + return luaL_error(L, "Wrong arguments for WDialog.windowTitle"); + } +} + +static const char* WDialog_setTitleBarEnabled_args0[] = {luawt_typeToStr(), "bool", NULL}; +static const char* const* const luawt_WDialog_setTitleBarEnabled_args[] = {WDialog_setTitleBarEnabled_args0, NULL}; + +int luawt_WDialog_setTitleBarEnabled(lua_State* L) { + int index = luawt_getSuitableArgsGroup(L, luawt_WDialog_setTitleBarEnabled_args); + WDialog* self = luawt_checkFromLua(L, 1); + if (index == 0) { + bool enabled = lua_toboolean(L, 2); + self->setTitleBarEnabled(enabled); + return 0; + + } else { + return luaL_error(L, "Wrong arguments for WDialog.setTitleBarEnabled"); + } +} + +static const char* WDialog_reject_args0[] = {luawt_typeToStr(), NULL}; +static const char* const* const luawt_WDialog_reject_args[] = {WDialog_reject_args0, NULL}; + +int luawt_WDialog_reject(lua_State* L) { + int index = luawt_getSuitableArgsGroup(L, luawt_WDialog_reject_args); + WDialog* self = luawt_checkFromLua(L, 1); + if (index == 0) { + self->reject(); + return 0; + + } else { + return luaL_error(L, "Wrong arguments for WDialog.reject"); + } +} + +static const char* WDialog_setClosable_args0[] = {luawt_typeToStr(), "bool", NULL}; +static const char* const* const luawt_WDialog_setClosable_args[] = {WDialog_setClosable_args0, NULL}; + +int luawt_WDialog_setClosable(lua_State* L) { + int index = luawt_getSuitableArgsGroup(L, luawt_WDialog_setClosable_args); + WDialog* self = luawt_checkFromLua(L, 1); + if (index == 0) { + bool closable = lua_toboolean(L, 2); + self->setClosable(closable); + return 0; + + } else { + return luaL_error(L, "Wrong arguments for WDialog.setClosable"); + } +} + +static const char* WDialog_isModal_args0[] = {luawt_typeToStr(), NULL}; +static const char* const* const luawt_WDialog_isModal_args[] = {WDialog_isModal_args0, NULL}; + +int luawt_WDialog_isModal(lua_State* L) { + int index = luawt_getSuitableArgsGroup(L, luawt_WDialog_isModal_args); + WDialog* self = luawt_checkFromLua(L, 1); + if (index == 0) { + bool l_result = self->isModal(); + lua_pushboolean(L, l_result); + return 1; + + } else { + return luaL_error(L, "Wrong arguments for WDialog.isModal"); + } +} + +static const char* WDialog_setWindowTitle_args0[] = {luawt_typeToStr(), "char const *", NULL}; +static const char* const* const luawt_WDialog_setWindowTitle_args[] = {WDialog_setWindowTitle_args0, NULL}; + +int luawt_WDialog_setWindowTitle(lua_State* L) { + int index = luawt_getSuitableArgsGroup(L, luawt_WDialog_setWindowTitle_args); + WDialog* self = luawt_checkFromLua(L, 1); + if (index == 0) { + char const * raw2 = lua_tostring(L, 2); + Wt::WString title = Wt::WString(raw2); + self->setWindowTitle(title); + return 0; + + } else { + return luaL_error(L, "Wrong arguments for WDialog.setWindowTitle"); + } +} + +static const char* WDialog_resizable_args0[] = {luawt_typeToStr(), NULL}; +static const char* const* const luawt_WDialog_resizable_args[] = {WDialog_resizable_args0, NULL}; + +int luawt_WDialog_resizable(lua_State* L) { + int index = luawt_getSuitableArgsGroup(L, luawt_WDialog_resizable_args); + WDialog* self = luawt_checkFromLua(L, 1); + if (index == 0) { + bool l_result = self->resizable(); + lua_pushboolean(L, l_result); + return 1; + + } else { + return luaL_error(L, "Wrong arguments for WDialog.resizable"); + } +} + +static const char* WDialog_closable_args0[] = {luawt_typeToStr(), NULL}; +static const char* const* const luawt_WDialog_closable_args[] = {WDialog_closable_args0, NULL}; + +int luawt_WDialog_closable(lua_State* L) { + int index = luawt_getSuitableArgsGroup(L, luawt_WDialog_closable_args); + WDialog* self = luawt_checkFromLua(L, 1); + if (index == 0) { + bool l_result = self->closable(); + lua_pushboolean(L, l_result); + return 1; + + } else { + return luaL_error(L, "Wrong arguments for WDialog.closable"); + } +} + +static const char* WDialog_setCaption_args0[] = {luawt_typeToStr(), "char const *", NULL}; +static const char* const* const luawt_WDialog_setCaption_args[] = {WDialog_setCaption_args0, NULL}; + +int luawt_WDialog_setCaption(lua_State* L) { + int index = luawt_getSuitableArgsGroup(L, luawt_WDialog_setCaption_args); + WDialog* self = luawt_checkFromLua(L, 1); + if (index == 0) { + char const * raw2 = lua_tostring(L, 2); + Wt::WString caption = Wt::WString(raw2); + self->setCaption(caption); + return 0; + + } else { + return luaL_error(L, "Wrong arguments for WDialog.setCaption"); + } +} + +static const char* WDialog_isTitleBarEnabled_args0[] = {luawt_typeToStr(), NULL}; +static const char* const* const luawt_WDialog_isTitleBarEnabled_args[] = {WDialog_isTitleBarEnabled_args0, NULL}; + +int luawt_WDialog_isTitleBarEnabled(lua_State* L) { + int index = luawt_getSuitableArgsGroup(L, luawt_WDialog_isTitleBarEnabled_args); + WDialog* self = luawt_checkFromLua(L, 1); + if (index == 0) { + bool l_result = self->isTitleBarEnabled(); + lua_pushboolean(L, l_result); + return 1; + + } else { + return luaL_error(L, "Wrong arguments for WDialog.isTitleBarEnabled"); + } +} + +static const char* WDialog_footer_args0[] = {luawt_typeToStr(), NULL}; +static const char* const* const luawt_WDialog_footer_args[] = {WDialog_footer_args0, NULL}; + +int luawt_WDialog_footer(lua_State* L) { + int index = luawt_getSuitableArgsGroup(L, luawt_WDialog_footer_args); + WDialog* self = luawt_checkFromLua(L, 1); + if (index == 0) { + Wt::WContainerWidget * l_result = self->footer(); + luawt_toLua(L, l_result); + return 1; + + } else { + return luaL_error(L, "Wrong arguments for WDialog.footer"); + } +} + +static const char* WDialog_caption_args0[] = {luawt_typeToStr(), NULL}; +static const char* const* const luawt_WDialog_caption_args[] = {WDialog_caption_args0, NULL}; + +int luawt_WDialog_caption(lua_State* L) { + int index = luawt_getSuitableArgsGroup(L, luawt_WDialog_caption_args); + WDialog* self = luawt_checkFromLua(L, 1); + if (index == 0) { + Wt::WString l_result = self->caption(); + lua_pushstring(L, l_result.toUTF8().c_str()); + return 1; + + } else { + return luaL_error(L, "Wrong arguments for WDialog.caption"); + } +} + + +static const luaL_Reg luawt_WDialog_methods[] = { + METHOD(WDialog, setWindowTitle), + METHOD(WDialog, windowTitle), + METHOD(WDialog, setCaption), + METHOD(WDialog, caption), + METHOD(WDialog, setTitleBarEnabled), + METHOD(WDialog, isTitleBarEnabled), + METHOD(WDialog, titleBar), + METHOD(WDialog, contents), + METHOD(WDialog, footer), + METHOD(WDialog, done), + METHOD(WDialog, accept), + METHOD(WDialog, reject), + METHOD(WDialog, result), + METHOD(WDialog, setModal), + METHOD(WDialog, isModal), + METHOD(WDialog, setResizable), + METHOD(WDialog, resizable), + METHOD(WDialog, setClosable), + METHOD(WDialog, closable), + METHOD(WDialog, positionAt), + METHOD(WDialog, setMinimumSize), + METHOD(WDialog, setMaximumSize), + {NULL, NULL}, +}; + +void luawt_WDialog(lua_State* L) { + const char* base = luawt_typeToStr(); + assert(base); + DECLARE_CLASS( + WDialog, + L, + 0, + 0, + luawt_WDialog_methods, + base + ); +} diff --git a/src/luawt/WDoubleSpinBox.cpp b/src/luawt/WDoubleSpinBox.cpp index 550fe46..83bff35 100644 --- a/src/luawt/WDoubleSpinBox.cpp +++ b/src/luawt/WDoubleSpinBox.cpp @@ -12,22 +12,22 @@ static const char* const* const luawt_WDoubleSpinBox_make_args[] = {WDoubleSpinB int luawt_WDoubleSpinBox_make(lua_State* L) { int index = luawt_getSuitableArgsGroup(L, luawt_WDoubleSpinBox_make_args); if (index == 0) { - WDoubleSpinBox * result = new WDoubleSpinBox(); + WDoubleSpinBox * l_result = new WDoubleSpinBox(); MyApplication* app = MyApplication::instance(); if (!app) { - delete result; + delete l_result; throw std::logic_error("No WApplication when creating WDoubleSpinBox"); } - app->root()->addWidget(result); + app->root()->addWidget(l_result); - luawt_toLua(L, result); + luawt_toLua(L, l_result); return 1; } else if (index == 1) { Wt::WContainerWidget* parent = luawt_checkFromLua(L, 1); - WDoubleSpinBox * result = new WDoubleSpinBox(parent); - luawt_toLua(L, result); + WDoubleSpinBox * l_result = new WDoubleSpinBox(parent); + luawt_toLua(L, l_result); return 1; } else { @@ -74,8 +74,8 @@ int luawt_WDoubleSpinBox_maximum(lua_State* L) { int index = luawt_getSuitableArgsGroup(L, luawt_WDoubleSpinBox_maximum_args); WDoubleSpinBox* self = luawt_checkFromLua(L, 1); if (index == 0) { - double result = self->maximum(); - lua_pushnumber(L, result); + double l_result = self->maximum(); + lua_pushnumber(L, l_result); return 1; } else { @@ -90,8 +90,8 @@ int luawt_WDoubleSpinBox_value(lua_State* L) { int index = luawt_getSuitableArgsGroup(L, luawt_WDoubleSpinBox_value_args); WDoubleSpinBox* self = luawt_checkFromLua(L, 1); if (index == 0) { - double result = self->value(); - lua_pushnumber(L, result); + double l_result = self->value(); + lua_pushnumber(L, l_result); return 1; } else { @@ -106,8 +106,8 @@ int luawt_WDoubleSpinBox_singleStep(lua_State* L) { int index = luawt_getSuitableArgsGroup(L, luawt_WDoubleSpinBox_singleStep_args); WDoubleSpinBox* self = luawt_checkFromLua(L, 1); if (index == 0) { - double result = self->singleStep(); - lua_pushnumber(L, result); + double l_result = self->singleStep(); + lua_pushnumber(L, l_result); return 1; } else { @@ -122,8 +122,8 @@ int luawt_WDoubleSpinBox_minimum(lua_State* L) { int index = luawt_getSuitableArgsGroup(L, luawt_WDoubleSpinBox_minimum_args); WDoubleSpinBox* self = luawt_checkFromLua(L, 1); if (index == 0) { - double result = self->minimum(); - lua_pushnumber(L, result); + double l_result = self->minimum(); + lua_pushnumber(L, l_result); return 1; } else { @@ -170,8 +170,8 @@ int luawt_WDoubleSpinBox_decimals(lua_State* L) { int index = luawt_getSuitableArgsGroup(L, luawt_WDoubleSpinBox_decimals_args); WDoubleSpinBox* self = luawt_checkFromLua(L, 1); if (index == 0) { - int result = self->decimals(); - lua_pushinteger(L, result); + int l_result = self->decimals(); + lua_pushinteger(L, l_result); return 1; } else { diff --git a/src/luawt/WEnvironment.cpp b/src/luawt/WEnvironment.cpp index 4c03955..f40a9f5 100644 --- a/src/luawt/WEnvironment.cpp +++ b/src/luawt/WEnvironment.cpp @@ -1,5 +1,5 @@ /* luawt, Lua bindings for Wt - * Copyright (c) 2015-2016 Pavel Dolgov and Boris Nagaev + * Copyright (c) 2015-2017 Pavel Dolgov and Boris Nagaev * * See the LICENSE file for terms of use. */ diff --git a/src/luawt/WFileUpload.cpp b/src/luawt/WFileUpload.cpp index 1655cb9..7f7d73a 100644 --- a/src/luawt/WFileUpload.cpp +++ b/src/luawt/WFileUpload.cpp @@ -14,22 +14,22 @@ static const char* const* const luawt_WFileUpload_make_args[] = {WFileUpload_mak int luawt_WFileUpload_make(lua_State* L) { int index = luawt_getSuitableArgsGroup(L, luawt_WFileUpload_make_args); if (index == 0) { - WFileUpload * result = new WFileUpload(); + WFileUpload * l_result = new WFileUpload(); MyApplication* app = MyApplication::instance(); if (!app) { - delete result; + delete l_result; throw std::logic_error("No WApplication when creating WFileUpload"); } - app->root()->addWidget(result); + app->root()->addWidget(l_result); - luawt_toLua(L, result); + luawt_toLua(L, l_result); return 1; } else if (index == 1) { Wt::WContainerWidget* parent = luawt_checkFromLua(L, 1); - WFileUpload * result = new WFileUpload(parent); - luawt_toLua(L, result); + WFileUpload * l_result = new WFileUpload(parent); + luawt_toLua(L, l_result); return 1; } else { @@ -44,8 +44,8 @@ int luawt_WFileUpload_clientFileName(lua_State* L) { int index = luawt_getSuitableArgsGroup(L, luawt_WFileUpload_clientFileName_args); WFileUpload* self = luawt_checkFromLua(L, 1); if (index == 0) { - Wt::WString result = self->clientFileName(); - lua_pushstring(L, result.toUTF8().c_str()); + Wt::WString l_result = self->clientFileName(); + lua_pushstring(L, l_result.toUTF8().c_str()); return 1; } else { @@ -60,8 +60,8 @@ int luawt_WFileUpload_contentDescription(lua_State* L) { int index = luawt_getSuitableArgsGroup(L, luawt_WFileUpload_contentDescription_args); WFileUpload* self = luawt_checkFromLua(L, 1); if (index == 0) { - Wt::WString result = self->contentDescription(); - lua_pushstring(L, result.toUTF8().c_str()); + Wt::WString l_result = self->contentDescription(); + lua_pushstring(L, l_result.toUTF8().c_str()); return 1; } else { @@ -76,8 +76,8 @@ int luawt_WFileUpload_spoolFileName(lua_State* L) { int index = luawt_getSuitableArgsGroup(L, luawt_WFileUpload_spoolFileName_args); WFileUpload* self = luawt_checkFromLua(L, 1); if (index == 0) { - std::string result = self->spoolFileName(); - lua_pushstring(L, result.c_str()); + std::string l_result = self->spoolFileName(); + lua_pushstring(L, l_result.c_str()); return 1; } else { @@ -92,8 +92,8 @@ int luawt_WFileUpload_multiple(lua_State* L) { int index = luawt_getSuitableArgsGroup(L, luawt_WFileUpload_multiple_args); WFileUpload* self = luawt_checkFromLua(L, 1); if (index == 0) { - bool result = self->multiple(); - lua_pushboolean(L, result); + bool l_result = self->multiple(); + lua_pushboolean(L, l_result); return 1; } else { @@ -124,8 +124,8 @@ int luawt_WFileUpload_fileTextSize(lua_State* L) { int index = luawt_getSuitableArgsGroup(L, luawt_WFileUpload_fileTextSize_args); WFileUpload* self = luawt_checkFromLua(L, 1); if (index == 0) { - int result = self->fileTextSize(); - lua_pushinteger(L, result); + int l_result = self->fileTextSize(); + lua_pushinteger(L, l_result); return 1; } else { @@ -188,8 +188,8 @@ int luawt_WFileUpload_progressBar(lua_State* L) { int index = luawt_getSuitableArgsGroup(L, luawt_WFileUpload_progressBar_args); WFileUpload* self = luawt_checkFromLua(L, 1); if (index == 0) { - Wt::WProgressBar * result = self->progressBar(); - luawt_toLua(L, result); + Wt::WProgressBar * l_result = self->progressBar(); + luawt_toLua(L, l_result); return 1; } else { @@ -204,8 +204,8 @@ int luawt_WFileUpload_emptyFileName(lua_State* L) { int index = luawt_getSuitableArgsGroup(L, luawt_WFileUpload_emptyFileName_args); WFileUpload* self = luawt_checkFromLua(L, 1); if (index == 0) { - bool result = self->emptyFileName(); - lua_pushboolean(L, result); + bool l_result = self->emptyFileName(); + lua_pushboolean(L, l_result); return 1; } else { @@ -235,8 +235,8 @@ int luawt_WFileUpload_canUpload(lua_State* L) { int index = luawt_getSuitableArgsGroup(L, luawt_WFileUpload_canUpload_args); WFileUpload* self = luawt_checkFromLua(L, 1); if (index == 0) { - bool result = self->canUpload(); - lua_pushboolean(L, result); + bool l_result = self->canUpload(); + lua_pushboolean(L, l_result); return 1; } else { @@ -251,8 +251,8 @@ int luawt_WFileUpload_isUploaded(lua_State* L) { int index = luawt_getSuitableArgsGroup(L, luawt_WFileUpload_isUploaded_args); WFileUpload* self = luawt_checkFromLua(L, 1); if (index == 0) { - bool result = self->isUploaded(); - lua_pushboolean(L, result); + bool l_result = self->isUploaded(); + lua_pushboolean(L, l_result); return 1; } else { @@ -282,8 +282,8 @@ int luawt_WFileUpload_empty(lua_State* L) { int index = luawt_getSuitableArgsGroup(L, luawt_WFileUpload_empty_args); WFileUpload* self = luawt_checkFromLua(L, 1); if (index == 0) { - bool result = self->empty(); - lua_pushboolean(L, result); + bool l_result = self->empty(); + lua_pushboolean(L, l_result); return 1; } else { diff --git a/src/luawt/WFlashObject.cpp b/src/luawt/WFlashObject.cpp index 2503f8e..ca5b71a 100644 --- a/src/luawt/WFlashObject.cpp +++ b/src/luawt/WFlashObject.cpp @@ -1,5 +1,6 @@ #include "boost-xtime.hpp" +#include #include #include #include @@ -16,15 +17,15 @@ int luawt_WFlashObject_make(lua_State* L) { if (index == 0) { char const * raw1 = lua_tostring(L, 1); std::string url = std::string(raw1); - WFlashObject * result = new WFlashObject(url); + WFlashObject * l_result = new WFlashObject(url); MyApplication* app = MyApplication::instance(); if (!app) { - delete result; + delete l_result; throw std::logic_error("No WApplication when creating WFlashObject"); } - app->root()->addWidget(result); + app->root()->addWidget(l_result); - luawt_toLua(L, result); + luawt_toLua(L, l_result); return 1; } else if (index == 1) { @@ -32,8 +33,8 @@ int luawt_WFlashObject_make(lua_State* L) { std::string url = std::string(raw1); Wt::WContainerWidget* parent = luawt_checkFromLua(L, 2); - WFlashObject * result = new WFlashObject(url, parent); - luawt_toLua(L, result); + WFlashObject * l_result = new WFlashObject(url, parent); + luawt_toLua(L, l_result); return 1; } else { @@ -77,22 +78,6 @@ int luawt_WFlashObject_setFlashVariable(lua_State* L) { } } -static const char* WFlashObject_jsFlashRef_args0[] = {luawt_typeToStr(), NULL}; -static const char* const* const luawt_WFlashObject_jsFlashRef_args[] = {WFlashObject_jsFlashRef_args0, NULL}; - -int luawt_WFlashObject_jsFlashRef(lua_State* L) { - int index = luawt_getSuitableArgsGroup(L, luawt_WFlashObject_jsFlashRef_args); - WFlashObject* self = luawt_checkFromLua(L, 1); - if (index == 0) { - std::string result = self->jsFlashRef(); - lua_pushstring(L, result.c_str()); - return 1; - - } else { - return luaL_error(L, "Wrong arguments for WFlashObject.jsFlashRef"); - } -} - static const char* WFlashObject_setFlashParameter_args0[] = {luawt_typeToStr(), "char const *", "char const *", NULL}; static const char* const* const luawt_WFlashObject_setFlashParameter_args[] = {WFlashObject_setFlashParameter_args0, NULL}; @@ -112,8 +97,44 @@ int luawt_WFlashObject_setFlashParameter(lua_State* L) { } } +static const char* WFlashObject_resize_args0[] = {luawt_typeToStr(), "double", "double", NULL}; +static const char* const* const luawt_WFlashObject_resize_args[] = {WFlashObject_resize_args0, NULL}; + +int luawt_WFlashObject_resize(lua_State* L) { + int index = luawt_getSuitableArgsGroup(L, luawt_WFlashObject_resize_args); + WFlashObject* self = luawt_checkFromLua(L, 1); + if (index == 0) { + double raw2 = lua_tonumber(L, 2); + Wt::WLength width = Wt::WLength(raw2); + double raw3 = lua_tonumber(L, 3); + Wt::WLength height = Wt::WLength(raw3); + self->resize(width, height); + return 0; + + } else { + return luaL_error(L, "Wrong arguments for WFlashObject.resize"); + } +} + +static const char* WFlashObject_jsFlashRef_args0[] = {luawt_typeToStr(), NULL}; +static const char* const* const luawt_WFlashObject_jsFlashRef_args[] = {WFlashObject_jsFlashRef_args0, NULL}; + +int luawt_WFlashObject_jsFlashRef(lua_State* L) { + int index = luawt_getSuitableArgsGroup(L, luawt_WFlashObject_jsFlashRef_args); + WFlashObject* self = luawt_checkFromLua(L, 1); + if (index == 0) { + std::string l_result = self->jsFlashRef(); + lua_pushstring(L, l_result.c_str()); + return 1; + + } else { + return luaL_error(L, "Wrong arguments for WFlashObject.jsFlashRef"); + } +} + static const luaL_Reg luawt_WFlashObject_methods[] = { + METHOD(WFlashObject, resize), METHOD(WFlashObject, setFlashParameter), METHOD(WFlashObject, setFlashVariable), METHOD(WFlashObject, jsFlashRef), diff --git a/src/luawt/WFormWidget.cpp b/src/luawt/WFormWidget.cpp index 212b5c6..c216556 100644 --- a/src/luawt/WFormWidget.cpp +++ b/src/luawt/WFormWidget.cpp @@ -50,8 +50,8 @@ int luawt_WFormWidget_isReadOnly(lua_State* L) { int index = luawt_getSuitableArgsGroup(L, luawt_WFormWidget_isReadOnly_args); WFormWidget* self = luawt_checkFromLua(L, 1); if (index == 0) { - bool result = self->isReadOnly(); - lua_pushboolean(L, result); + bool l_result = self->isReadOnly(); + lua_pushboolean(L, l_result); return 1; } else { @@ -66,8 +66,8 @@ int luawt_WFormWidget_hasFocus(lua_State* L) { int index = luawt_getSuitableArgsGroup(L, luawt_WFormWidget_hasFocus_args); WFormWidget* self = luawt_checkFromLua(L, 1); if (index == 0) { - bool result = self->hasFocus(); - lua_pushboolean(L, result); + bool l_result = self->hasFocus(); + lua_pushboolean(L, l_result); return 1; } else { @@ -114,8 +114,8 @@ int luawt_WFormWidget_label(lua_State* L) { int index = luawt_getSuitableArgsGroup(L, luawt_WFormWidget_label_args); WFormWidget* self = luawt_checkFromLua(L, 1); if (index == 0) { - Wt::WLabel * result = self->label(); - luawt_toLua(L, result); + Wt::WLabel * l_result = self->label(); + luawt_toLua(L, l_result); return 1; } else { @@ -171,8 +171,8 @@ int luawt_WFormWidget_emptyText(lua_State* L) { int index = luawt_getSuitableArgsGroup(L, luawt_WFormWidget_emptyText_args); WFormWidget* self = luawt_checkFromLua(L, 1); if (index == 0) { - Wt::WString const & result = self->emptyText(); - lua_pushstring(L, result.toUTF8().c_str()); + Wt::WString const & l_result = self->emptyText(); + lua_pushstring(L, l_result.toUTF8().c_str()); return 1; } else { @@ -204,8 +204,8 @@ int luawt_WFormWidget_tabIndex(lua_State* L) { int index = luawt_getSuitableArgsGroup(L, luawt_WFormWidget_tabIndex_args); WFormWidget* self = luawt_checkFromLua(L, 1); if (index == 0) { - int result = self->tabIndex(); - lua_pushinteger(L, result); + int l_result = self->tabIndex(); + lua_pushinteger(L, l_result); return 1; } else { @@ -236,8 +236,8 @@ int luawt_WFormWidget_validate(lua_State* L) { int index = luawt_getSuitableArgsGroup(L, luawt_WFormWidget_validate_args); WFormWidget* self = luawt_checkFromLua(L, 1); if (index == 0) { - Wt::WValidator::State result = self->validate(); - lua_pushinteger(L, result); + Wt::WValidator::State l_result = self->validate(); + lua_pushinteger(L, l_result); return 1; } else { @@ -252,8 +252,8 @@ int luawt_WFormWidget_valueText(lua_State* L) { int index = luawt_getSuitableArgsGroup(L, luawt_WFormWidget_valueText_args); WFormWidget* self = luawt_checkFromLua(L, 1); if (index == 0) { - Wt::WString result = self->valueText(); - lua_pushstring(L, result.toUTF8().c_str()); + Wt::WString l_result = self->valueText(); + lua_pushstring(L, l_result.toUTF8().c_str()); return 1; } else { diff --git a/src/luawt/WGLWidget.cpp b/src/luawt/WGLWidget.cpp index 8ce9589..4fa82c6 100644 --- a/src/luawt/WGLWidget.cpp +++ b/src/luawt/WGLWidget.cpp @@ -1,8 +1,9 @@ #include "boost-xtime.hpp" -#include -#include +#include #include +#include +#include #include #include @@ -16,8 +17,8 @@ int luawt_WGLWidget_make(lua_State* L) { if (index == 0) { Wt::WContainerWidget* parent = luawt_checkFromLua(L, 1); - WGLWidget * result = new WGLWidget(parent); - luawt_toLua(L, result); + WGLWidget * l_result = new WGLWidget(parent); + luawt_toLua(L, l_result); return 1; } else { @@ -281,21 +282,22 @@ int luawt_WGLWidget_colorMask(lua_State* L) { } } -static const char* WGLWidget_drawArrays_args0[] = {luawt_typeToStr(), "int", "int", "int", NULL}; -static const char* const* const luawt_WGLWidget_drawArrays_args[] = {WGLWidget_drawArrays_args0, NULL}; +static const char* WGLWidget_clearColor_args0[] = {luawt_typeToStr(), "double", "double", "double", "double", NULL}; +static const char* const* const luawt_WGLWidget_clearColor_args[] = {WGLWidget_clearColor_args0, NULL}; -int luawt_WGLWidget_drawArrays(lua_State* L) { - int index = luawt_getSuitableArgsGroup(L, luawt_WGLWidget_drawArrays_args); +int luawt_WGLWidget_clearColor(lua_State* L) { + int index = luawt_getSuitableArgsGroup(L, luawt_WGLWidget_clearColor_args); WGLWidget* self = luawt_checkFromLua(L, 1); if (index == 0) { - Wt::WGLWidget::GLenum mode = static_cast(lua_tointeger(L, 2)); - int first = lua_tointeger(L, 3); - unsigned int count = lua_tointeger(L, 4); - self->drawArrays(mode, first, count); + double r = lua_tonumber(L, 2); + double g = lua_tonumber(L, 3); + double b = lua_tonumber(L, 4); + double a = lua_tonumber(L, 5); + self->clearColor(r, g, b, a); return 0; } else { - return luaL_error(L, "Wrong arguments for WGLWidget.drawArrays"); + return luaL_error(L, "Wrong arguments for WGLWidget.clearColor"); } } @@ -316,6 +318,27 @@ int luawt_WGLWidget_depthRange(lua_State* L) { } } +static const char* WGLWidget_enableClientErrorChecks_args0[] = {luawt_typeToStr(), NULL}; +static const char* WGLWidget_enableClientErrorChecks_args1[] = {luawt_typeToStr(), "bool", NULL}; +static const char* const* const luawt_WGLWidget_enableClientErrorChecks_args[] = {WGLWidget_enableClientErrorChecks_args0, WGLWidget_enableClientErrorChecks_args1, NULL}; + +int luawt_WGLWidget_enableClientErrorChecks(lua_State* L) { + int index = luawt_getSuitableArgsGroup(L, luawt_WGLWidget_enableClientErrorChecks_args); + WGLWidget* self = luawt_checkFromLua(L, 1); + if (index == 0) { + self->enableClientErrorChecks(); + return 0; + + } else if (index == 1) { + bool enable = lua_toboolean(L, 2); + self->enableClientErrorChecks(enable); + return 0; + + } else { + return luaL_error(L, "Wrong arguments for WGLWidget.enableClientErrorChecks"); + } +} + static const char* WGLWidget_generateMipmap_args0[] = {luawt_typeToStr(), "int", NULL}; static const char* const* const luawt_WGLWidget_generateMipmap_args[] = {WGLWidget_generateMipmap_args0, NULL}; @@ -332,24 +355,80 @@ int luawt_WGLWidget_generateMipmap(lua_State* L) { } } -static const char* WGLWidget_enableClientErrorChecks_args0[] = {luawt_typeToStr(), NULL}; -static const char* WGLWidget_enableClientErrorChecks_args1[] = {luawt_typeToStr(), "bool", NULL}; -static const char* const* const luawt_WGLWidget_enableClientErrorChecks_args[] = {WGLWidget_enableClientErrorChecks_args0, WGLWidget_enableClientErrorChecks_args1, NULL}; +static const char* WGLWidget_texImage2D_args0[] = {luawt_typeToStr(), "int", "int", "int", "int", "int", "int", "int", NULL}; +static const char* WGLWidget_texImage2D_args1[] = {luawt_typeToStr(), "int", "int", "int", "int", "int", luawt_typeToStr(), NULL}; +static const char* WGLWidget_texImage2D_args2[] = {luawt_typeToStr(), "int", "int", "int", "int", "int", luawt_typeToStr(), NULL}; +static const char* WGLWidget_texImage2D_args3[] = {luawt_typeToStr(), "int", "int", "int", "int", "int", "char const *", NULL}; +static const char* const* const luawt_WGLWidget_texImage2D_args[] = {WGLWidget_texImage2D_args0, WGLWidget_texImage2D_args1, WGLWidget_texImage2D_args2, WGLWidget_texImage2D_args3, NULL}; -int luawt_WGLWidget_enableClientErrorChecks(lua_State* L) { - int index = luawt_getSuitableArgsGroup(L, luawt_WGLWidget_enableClientErrorChecks_args); +int luawt_WGLWidget_texImage2D(lua_State* L) { + int index = luawt_getSuitableArgsGroup(L, luawt_WGLWidget_texImage2D_args); WGLWidget* self = luawt_checkFromLua(L, 1); if (index == 0) { - self->enableClientErrorChecks(); + Wt::WGLWidget::GLenum target = static_cast(lua_tointeger(L, 2)); + int level = lua_tointeger(L, 3); + Wt::WGLWidget::GLenum internalformat = static_cast(lua_tointeger(L, 4)); + unsigned int width = lua_tointeger(L, 5); + unsigned int height = lua_tointeger(L, 6); + int border = lua_tointeger(L, 7); + Wt::WGLWidget::GLenum format = static_cast(lua_tointeger(L, 8)); + self->texImage2D(target, level, internalformat, width, height, border, format); return 0; } else if (index == 1) { - bool enable = lua_toboolean(L, 2); - self->enableClientErrorChecks(enable); + Wt::WGLWidget::GLenum target = static_cast(lua_tointeger(L, 2)); + int level = lua_tointeger(L, 3); + Wt::WGLWidget::GLenum internalformat = static_cast(lua_tointeger(L, 4)); + Wt::WGLWidget::GLenum format = static_cast(lua_tointeger(L, 5)); + Wt::WGLWidget::GLenum type = static_cast(lua_tointeger(L, 6)); + Wt::WImage* image = + luawt_checkFromLua(L, 7); + self->texImage2D(target, level, internalformat, format, type, image); + return 0; + + } else if (index == 2) { + Wt::WGLWidget::GLenum target = static_cast(lua_tointeger(L, 2)); + int level = lua_tointeger(L, 3); + Wt::WGLWidget::GLenum internalformat = static_cast(lua_tointeger(L, 4)); + Wt::WGLWidget::GLenum format = static_cast(lua_tointeger(L, 5)); + Wt::WGLWidget::GLenum type = static_cast(lua_tointeger(L, 6)); + Wt::WVideo* video = + luawt_checkFromLua(L, 7); + self->texImage2D(target, level, internalformat, format, type, video); + return 0; + + } else if (index == 3) { + Wt::WGLWidget::GLenum target = static_cast(lua_tointeger(L, 2)); + int level = lua_tointeger(L, 3); + Wt::WGLWidget::GLenum internalformat = static_cast(lua_tointeger(L, 4)); + Wt::WGLWidget::GLenum format = static_cast(lua_tointeger(L, 5)); + Wt::WGLWidget::GLenum type = static_cast(lua_tointeger(L, 6)); + char const * raw7 = lua_tostring(L, 7); + std::string texture = std::string(raw7); + self->texImage2D(target, level, internalformat, format, type, texture); return 0; } else { - return luaL_error(L, "Wrong arguments for WGLWidget.enableClientErrorChecks"); + return luaL_error(L, "Wrong arguments for WGLWidget.texImage2D"); + } +} + +static const char* WGLWidget_viewport_args0[] = {luawt_typeToStr(), "int", "int", "int", "int", NULL}; +static const char* const* const luawt_WGLWidget_viewport_args[] = {WGLWidget_viewport_args0, NULL}; + +int luawt_WGLWidget_viewport(lua_State* L) { + int index = luawt_getSuitableArgsGroup(L, luawt_WGLWidget_viewport_args); + WGLWidget* self = luawt_checkFromLua(L, 1); + if (index == 0) { + int x = lua_tointeger(L, 2); + int y = lua_tointeger(L, 3); + unsigned int width = lua_tointeger(L, 4); + unsigned int height = lua_tointeger(L, 5); + self->viewport(x, y, width, height); + return 0; + + } else { + return luaL_error(L, "Wrong arguments for WGLWidget.viewport"); } } @@ -405,61 +484,19 @@ int luawt_WGLWidget_blendEquationSeparate(lua_State* L) { } } -static const char* WGLWidget_texImage2D_args0[] = {luawt_typeToStr(), "int", "int", "int", "int", "int", "int", "int", NULL}; -static const char* WGLWidget_texImage2D_args1[] = {luawt_typeToStr(), "int", "int", "int", "int", "int", luawt_typeToStr(), NULL}; -static const char* WGLWidget_texImage2D_args2[] = {luawt_typeToStr(), "int", "int", "int", "int", "int", luawt_typeToStr(), NULL}; -static const char* WGLWidget_texImage2D_args3[] = {luawt_typeToStr(), "int", "int", "int", "int", "int", "char const *", NULL}; -static const char* const* const luawt_WGLWidget_texImage2D_args[] = {WGLWidget_texImage2D_args0, WGLWidget_texImage2D_args1, WGLWidget_texImage2D_args2, WGLWidget_texImage2D_args3, NULL}; +static const char* WGLWidget_repaintGL_args0[] = {luawt_typeToStr(), "int", NULL}; +static const char* const* const luawt_WGLWidget_repaintGL_args[] = {WGLWidget_repaintGL_args0, NULL}; -int luawt_WGLWidget_texImage2D(lua_State* L) { - int index = luawt_getSuitableArgsGroup(L, luawt_WGLWidget_texImage2D_args); +int luawt_WGLWidget_repaintGL(lua_State* L) { + int index = luawt_getSuitableArgsGroup(L, luawt_WGLWidget_repaintGL_args); WGLWidget* self = luawt_checkFromLua(L, 1); if (index == 0) { - Wt::WGLWidget::GLenum target = static_cast(lua_tointeger(L, 2)); - int level = lua_tointeger(L, 3); - Wt::WGLWidget::GLenum internalformat = static_cast(lua_tointeger(L, 4)); - unsigned int width = lua_tointeger(L, 5); - unsigned int height = lua_tointeger(L, 6); - int border = lua_tointeger(L, 7); - Wt::WGLWidget::GLenum format = static_cast(lua_tointeger(L, 8)); - self->texImage2D(target, level, internalformat, width, height, border, format); - return 0; - - } else if (index == 1) { - Wt::WGLWidget::GLenum target = static_cast(lua_tointeger(L, 2)); - int level = lua_tointeger(L, 3); - Wt::WGLWidget::GLenum internalformat = static_cast(lua_tointeger(L, 4)); - Wt::WGLWidget::GLenum format = static_cast(lua_tointeger(L, 5)); - Wt::WGLWidget::GLenum type = static_cast(lua_tointeger(L, 6)); - Wt::WImage* image = - luawt_checkFromLua(L, 7); - self->texImage2D(target, level, internalformat, format, type, image); - return 0; - - } else if (index == 2) { - Wt::WGLWidget::GLenum target = static_cast(lua_tointeger(L, 2)); - int level = lua_tointeger(L, 3); - Wt::WGLWidget::GLenum internalformat = static_cast(lua_tointeger(L, 4)); - Wt::WGLWidget::GLenum format = static_cast(lua_tointeger(L, 5)); - Wt::WGLWidget::GLenum type = static_cast(lua_tointeger(L, 6)); - Wt::WVideo* video = - luawt_checkFromLua(L, 7); - self->texImage2D(target, level, internalformat, format, type, video); - return 0; - - } else if (index == 3) { - Wt::WGLWidget::GLenum target = static_cast(lua_tointeger(L, 2)); - int level = lua_tointeger(L, 3); - Wt::WGLWidget::GLenum internalformat = static_cast(lua_tointeger(L, 4)); - Wt::WGLWidget::GLenum format = static_cast(lua_tointeger(L, 5)); - Wt::WGLWidget::GLenum type = static_cast(lua_tointeger(L, 6)); - char const * raw7 = lua_tostring(L, 7); - std::string texture = std::string(raw7); - self->texImage2D(target, level, internalformat, format, type, texture); + Wt::WFlags which = static_cast(lua_tointeger(L, 2)); + self->repaintGL(which); return 0; } else { - return luaL_error(L, "Wrong arguments for WGLWidget.texImage2D"); + return luaL_error(L, "Wrong arguments for WGLWidget.repaintGL"); } } @@ -670,22 +707,38 @@ int luawt_WGLWidget_clearDepth(lua_State* L) { } } -static const char* WGLWidget_viewport_args0[] = {luawt_typeToStr(), "int", "int", "int", "int", NULL}; -static const char* const* const luawt_WGLWidget_viewport_args[] = {WGLWidget_viewport_args0, NULL}; +static const char* WGLWidget_resize_args0[] = {luawt_typeToStr(), "double", "double", NULL}; +static const char* const* const luawt_WGLWidget_resize_args[] = {WGLWidget_resize_args0, NULL}; -int luawt_WGLWidget_viewport(lua_State* L) { - int index = luawt_getSuitableArgsGroup(L, luawt_WGLWidget_viewport_args); +int luawt_WGLWidget_resize(lua_State* L) { + int index = luawt_getSuitableArgsGroup(L, luawt_WGLWidget_resize_args); WGLWidget* self = luawt_checkFromLua(L, 1); if (index == 0) { - int x = lua_tointeger(L, 2); - int y = lua_tointeger(L, 3); - unsigned int width = lua_tointeger(L, 4); - unsigned int height = lua_tointeger(L, 5); - self->viewport(x, y, width, height); + double raw2 = lua_tonumber(L, 2); + Wt::WLength width = Wt::WLength(raw2); + double raw3 = lua_tonumber(L, 3); + Wt::WLength height = Wt::WLength(raw3); + self->resize(width, height); return 0; } else { - return luaL_error(L, "Wrong arguments for WGLWidget.viewport"); + return luaL_error(L, "Wrong arguments for WGLWidget.resize"); + } +} + +static const char* WGLWidget_clear_args0[] = {luawt_typeToStr(), "int", NULL}; +static const char* const* const luawt_WGLWidget_clear_args[] = {WGLWidget_clear_args0, NULL}; + +int luawt_WGLWidget_clear(lua_State* L) { + int index = luawt_getSuitableArgsGroup(L, luawt_WGLWidget_clear_args); + WGLWidget* self = luawt_checkFromLua(L, 1); + if (index == 0) { + Wt::WFlags mask = static_cast(lua_tointeger(L, 2)); + self->clear(mask); + return 0; + + } else { + return luaL_error(L, "Wrong arguments for WGLWidget.clear"); } } @@ -834,22 +887,21 @@ int luawt_WGLWidget_copyTexSubImage2D(lua_State* L) { } } -static const char* WGLWidget_clearColor_args0[] = {luawt_typeToStr(), "double", "double", "double", "double", NULL}; -static const char* const* const luawt_WGLWidget_clearColor_args[] = {WGLWidget_clearColor_args0, NULL}; +static const char* WGLWidget_drawArrays_args0[] = {luawt_typeToStr(), "int", "int", "int", NULL}; +static const char* const* const luawt_WGLWidget_drawArrays_args[] = {WGLWidget_drawArrays_args0, NULL}; -int luawt_WGLWidget_clearColor(lua_State* L) { - int index = luawt_getSuitableArgsGroup(L, luawt_WGLWidget_clearColor_args); +int luawt_WGLWidget_drawArrays(lua_State* L) { + int index = luawt_getSuitableArgsGroup(L, luawt_WGLWidget_drawArrays_args); WGLWidget* self = luawt_checkFromLua(L, 1); if (index == 0) { - double r = lua_tonumber(L, 2); - double g = lua_tonumber(L, 3); - double b = lua_tonumber(L, 4); - double a = lua_tonumber(L, 5); - self->clearColor(r, g, b, a); + Wt::WGLWidget::GLenum mode = static_cast(lua_tointeger(L, 2)); + int first = lua_tointeger(L, 3); + unsigned int count = lua_tointeger(L, 4); + self->drawArrays(mode, first, count); return 0; } else { - return luaL_error(L, "Wrong arguments for WGLWidget.clearColor"); + return luaL_error(L, "Wrong arguments for WGLWidget.drawArrays"); } } @@ -875,6 +927,8 @@ ADD_SIGNAL(gestureChanged, WGLWidget, Wt::WGestureEvent) ADD_SIGNAL(gestureEnded, WGLWidget, Wt::WGestureEvent) static const luaL_Reg luawt_WGLWidget_methods[] = { + METHOD(WGLWidget, repaintGL), + METHOD(WGLWidget, resize), METHOD(WGLWidget, debugger), METHOD(WGLWidget, activeTexture), METHOD(WGLWidget, blendColor), @@ -883,6 +937,7 @@ static const luaL_Reg luawt_WGLWidget_methods[] = { METHOD(WGLWidget, blendFunc), METHOD(WGLWidget, blendFuncSeparate), METHOD(WGLWidget, bufferData), + METHOD(WGLWidget, clear), METHOD(WGLWidget, clearColor), METHOD(WGLWidget, clearDepth), METHOD(WGLWidget, clearStencil), diff --git a/src/luawt/WGoogleMap.cpp b/src/luawt/WGoogleMap.cpp index 2ef4ffa..c21f053 100644 --- a/src/luawt/WGoogleMap.cpp +++ b/src/luawt/WGoogleMap.cpp @@ -15,42 +15,42 @@ int luawt_WGoogleMap_make(lua_State* L) { int index = luawt_getSuitableArgsGroup(L, luawt_WGoogleMap_make_args); if (index == 0) { Wt::WGoogleMap::ApiVersion version = static_cast(lua_tointeger(L, 1)); - WGoogleMap * result = new WGoogleMap(version); + WGoogleMap * l_result = new WGoogleMap(version); MyApplication* app = MyApplication::instance(); if (!app) { - delete result; + delete l_result; throw std::logic_error("No WApplication when creating WGoogleMap"); } - app->root()->addWidget(result); + app->root()->addWidget(l_result); - luawt_toLua(L, result); + luawt_toLua(L, l_result); return 1; } else if (index == 1) { Wt::WGoogleMap::ApiVersion version = static_cast(lua_tointeger(L, 1)); Wt::WContainerWidget* parent = luawt_checkFromLua(L, 2); - WGoogleMap * result = new WGoogleMap(version, parent); - luawt_toLua(L, result); + WGoogleMap * l_result = new WGoogleMap(version, parent); + luawt_toLua(L, l_result); return 1; } else if (index == 2) { - WGoogleMap * result = new WGoogleMap(); + WGoogleMap * l_result = new WGoogleMap(); MyApplication* app = MyApplication::instance(); if (!app) { - delete result; + delete l_result; throw std::logic_error("No WApplication when creating WGoogleMap"); } - app->root()->addWidget(result); + app->root()->addWidget(l_result); - luawt_toLua(L, result); + luawt_toLua(L, l_result); return 1; } else if (index == 3) { Wt::WContainerWidget* parent = luawt_checkFromLua(L, 1); - WGoogleMap * result = new WGoogleMap(parent); - luawt_toLua(L, result); + WGoogleMap * l_result = new WGoogleMap(parent); + luawt_toLua(L, l_result); return 1; } else { @@ -95,8 +95,8 @@ int luawt_WGoogleMap_apiVersion(lua_State* L) { int index = luawt_getSuitableArgsGroup(L, luawt_WGoogleMap_apiVersion_args); WGoogleMap* self = luawt_checkFromLua(L, 1); if (index == 0) { - Wt::WGoogleMap::ApiVersion result = self->apiVersion(); - lua_pushinteger(L, result); + Wt::WGoogleMap::ApiVersion l_result = self->apiVersion(); + lua_pushinteger(L, l_result); return 1; } else { diff --git a/src/luawt/WGroupBox.cpp b/src/luawt/WGroupBox.cpp index ed48899..edef8af 100644 --- a/src/luawt/WGroupBox.cpp +++ b/src/luawt/WGroupBox.cpp @@ -15,36 +15,36 @@ static const char* const* const luawt_WGroupBox_make_args[] = {WGroupBox_make_ar int luawt_WGroupBox_make(lua_State* L) { int index = luawt_getSuitableArgsGroup(L, luawt_WGroupBox_make_args); if (index == 0) { - WGroupBox * result = new WGroupBox(); + WGroupBox * l_result = new WGroupBox(); MyApplication* app = MyApplication::instance(); if (!app) { - delete result; + delete l_result; throw std::logic_error("No WApplication when creating WGroupBox"); } - app->root()->addWidget(result); + app->root()->addWidget(l_result); - luawt_toLua(L, result); + luawt_toLua(L, l_result); return 1; } else if (index == 1) { Wt::WContainerWidget* parent = luawt_checkFromLua(L, 1); - WGroupBox * result = new WGroupBox(parent); - luawt_toLua(L, result); + WGroupBox * l_result = new WGroupBox(parent); + luawt_toLua(L, l_result); return 1; } else if (index == 2) { char const * raw1 = lua_tostring(L, 1); Wt::WString title = Wt::WString(raw1); - WGroupBox * result = new WGroupBox(title); + WGroupBox * l_result = new WGroupBox(title); MyApplication* app = MyApplication::instance(); if (!app) { - delete result; + delete l_result; throw std::logic_error("No WApplication when creating WGroupBox"); } - app->root()->addWidget(result); + app->root()->addWidget(l_result); - luawt_toLua(L, result); + luawt_toLua(L, l_result); return 1; } else if (index == 3) { @@ -52,8 +52,8 @@ int luawt_WGroupBox_make(lua_State* L) { Wt::WString title = Wt::WString(raw1); Wt::WContainerWidget* parent = luawt_checkFromLua(L, 2); - WGroupBox * result = new WGroupBox(title, parent); - luawt_toLua(L, result); + WGroupBox * l_result = new WGroupBox(title, parent); + luawt_toLua(L, l_result); return 1; } else { @@ -100,8 +100,8 @@ int luawt_WGroupBox_title(lua_State* L) { int index = luawt_getSuitableArgsGroup(L, luawt_WGroupBox_title_args); WGroupBox* self = luawt_checkFromLua(L, 1); if (index == 0) { - Wt::WString const & result = self->title(); - lua_pushstring(L, result.toUTF8().c_str()); + Wt::WString const & l_result = self->title(); + lua_pushstring(L, l_result.toUTF8().c_str()); return 1; } else { diff --git a/src/luawt/WIconPair.cpp b/src/luawt/WIconPair.cpp index 2986291..a196a2d 100644 --- a/src/luawt/WIconPair.cpp +++ b/src/luawt/WIconPair.cpp @@ -18,15 +18,15 @@ int luawt_WIconPair_make(lua_State* L) { std::string icon1URL = std::string(raw1); char const * raw2 = lua_tostring(L, 2); std::string icon2URL = std::string(raw2); - WIconPair * result = new WIconPair(icon1URL, icon2URL); + WIconPair * l_result = new WIconPair(icon1URL, icon2URL); MyApplication* app = MyApplication::instance(); if (!app) { - delete result; + delete l_result; throw std::logic_error("No WApplication when creating WIconPair"); } - app->root()->addWidget(result); + app->root()->addWidget(l_result); - luawt_toLua(L, result); + luawt_toLua(L, l_result); return 1; } else if (index == 1) { @@ -35,15 +35,15 @@ int luawt_WIconPair_make(lua_State* L) { char const * raw2 = lua_tostring(L, 2); std::string icon2URL = std::string(raw2); bool clickIsSwitch = lua_toboolean(L, 3); - WIconPair * result = new WIconPair(icon1URL, icon2URL, clickIsSwitch); + WIconPair * l_result = new WIconPair(icon1URL, icon2URL, clickIsSwitch); MyApplication* app = MyApplication::instance(); if (!app) { - delete result; + delete l_result; throw std::logic_error("No WApplication when creating WIconPair"); } - app->root()->addWidget(result); + app->root()->addWidget(l_result); - luawt_toLua(L, result); + luawt_toLua(L, l_result); return 1; } else if (index == 2) { @@ -54,8 +54,8 @@ int luawt_WIconPair_make(lua_State* L) { bool clickIsSwitch = lua_toboolean(L, 3); Wt::WContainerWidget* parent = luawt_checkFromLua(L, 4); - WIconPair * result = new WIconPair(icon1URL, icon2URL, clickIsSwitch, parent); - luawt_toLua(L, result); + WIconPair * l_result = new WIconPair(icon1URL, icon2URL, clickIsSwitch, parent); + luawt_toLua(L, l_result); return 1; } else { @@ -70,8 +70,8 @@ int luawt_WIconPair_icon1(lua_State* L) { int index = luawt_getSuitableArgsGroup(L, luawt_WIconPair_icon1_args); WIconPair* self = luawt_checkFromLua(L, 1); if (index == 0) { - Wt::WImage * result = self->icon1(); - luawt_toLua(L, result); + Wt::WImage * l_result = self->icon1(); + luawt_toLua(L, l_result); return 1; } else { @@ -86,8 +86,8 @@ int luawt_WIconPair_icon2(lua_State* L) { int index = luawt_getSuitableArgsGroup(L, luawt_WIconPair_icon2_args); WIconPair* self = luawt_checkFromLua(L, 1); if (index == 0) { - Wt::WImage * result = self->icon2(); - luawt_toLua(L, result); + Wt::WImage * l_result = self->icon2(); + luawt_toLua(L, l_result); return 1; } else { @@ -132,8 +132,8 @@ int luawt_WIconPair_state(lua_State* L) { int index = luawt_getSuitableArgsGroup(L, luawt_WIconPair_state_args); WIconPair* self = luawt_checkFromLua(L, 1); if (index == 0) { - int result = self->state(); - lua_pushinteger(L, result); + int l_result = self->state(); + lua_pushinteger(L, l_result); return 1; } else { diff --git a/src/luawt/WImage.cpp b/src/luawt/WImage.cpp index e35314b..14cc352 100644 --- a/src/luawt/WImage.cpp +++ b/src/luawt/WImage.cpp @@ -2,53 +2,92 @@ #include #include +#include #include #include "globals.hpp" static const char* WImage_make_args0[] = {NULL}; static const char* WImage_make_args1[] = {luawt_typeToStr(), NULL}; -static const char* const* const luawt_WImage_make_args[] = {WImage_make_args0, WImage_make_args1, NULL}; +static const char* WImage_make_args2[] = {"char const *", NULL}; +static const char* WImage_make_args3[] = {"char const *", luawt_typeToStr(), NULL}; +static const char* WImage_make_args4[] = {"char const *", "char const *", NULL}; +static const char* WImage_make_args5[] = {"char const *", "char const *", luawt_typeToStr(), NULL}; +static const char* const* const luawt_WImage_make_args[] = {WImage_make_args0, WImage_make_args1, WImage_make_args2, WImage_make_args3, WImage_make_args4, WImage_make_args5, NULL}; int luawt_WImage_make(lua_State* L) { int index = luawt_getSuitableArgsGroup(L, luawt_WImage_make_args); if (index == 0) { - WImage * result = new WImage(); + WImage * l_result = new WImage(); MyApplication* app = MyApplication::instance(); if (!app) { - delete result; + delete l_result; throw std::logic_error("No WApplication when creating WImage"); } - app->root()->addWidget(result); + app->root()->addWidget(l_result); - luawt_toLua(L, result); + luawt_toLua(L, l_result); return 1; } else if (index == 1) { Wt::WContainerWidget* parent = luawt_checkFromLua(L, 1); - WImage * result = new WImage(parent); - luawt_toLua(L, result); + WImage * l_result = new WImage(parent); + luawt_toLua(L, l_result); return 1; - } else { - return luaL_error(L, "Wrong arguments for WImage.make"); + } else if (index == 2) { + char const * raw1 = lua_tostring(L, 1); + Wt::WLink imageLink = Wt::WLink(raw1); + WImage * l_result = new WImage(imageLink); + MyApplication* app = MyApplication::instance(); + if (!app) { + delete l_result; + throw std::logic_error("No WApplication when creating WImage"); } -} + app->root()->addWidget(l_result); + + luawt_toLua(L, l_result); + return 1; -static const char* WImage_alternateText_args0[] = {luawt_typeToStr(), NULL}; -static const char* const* const luawt_WImage_alternateText_args[] = {WImage_alternateText_args0, NULL}; + } else if (index == 3) { + char const * raw1 = lua_tostring(L, 1); + Wt::WLink imageLink = Wt::WLink(raw1); + Wt::WContainerWidget* parent = + luawt_checkFromLua(L, 2); + WImage * l_result = new WImage(imageLink, parent); + luawt_toLua(L, l_result); + return 1; -int luawt_WImage_alternateText(lua_State* L) { - int index = luawt_getSuitableArgsGroup(L, luawt_WImage_alternateText_args); - WImage* self = luawt_checkFromLua(L, 1); - if (index == 0) { - Wt::WString const & result = self->alternateText(); - lua_pushstring(L, result.toUTF8().c_str()); + } else if (index == 4) { + char const * raw1 = lua_tostring(L, 1); + Wt::WLink imageLink = Wt::WLink(raw1); + char const * raw2 = lua_tostring(L, 2); + Wt::WString altText = Wt::WString(raw2); + WImage * l_result = new WImage(imageLink, altText); + MyApplication* app = MyApplication::instance(); + if (!app) { + delete l_result; + throw std::logic_error("No WApplication when creating WImage"); + } + app->root()->addWidget(l_result); + + luawt_toLua(L, l_result); + return 1; + + } else if (index == 5) { + char const * raw1 = lua_tostring(L, 1); + Wt::WLink imageLink = Wt::WLink(raw1); + char const * raw2 = lua_tostring(L, 2); + Wt::WString altText = Wt::WString(raw2); + Wt::WContainerWidget* parent = + luawt_checkFromLua(L, 3); + WImage * l_result = new WImage(imageLink, altText, parent); + luawt_toLua(L, l_result); return 1; } else { - return luaL_error(L, "Wrong arguments for WImage.alternateText"); + return luaL_error(L, "Wrong arguments for WImage.make"); } } @@ -76,8 +115,8 @@ int luawt_WImage_imageRef(lua_State* L) { int index = luawt_getSuitableArgsGroup(L, luawt_WImage_imageRef_args); WImage* self = luawt_checkFromLua(L, 1); if (index == 0) { - std::string const result = self->imageRef(); - lua_pushstring(L, result.c_str()); + std::string const l_result = self->imageRef(); + lua_pushstring(L, l_result.c_str()); return 1; } else { @@ -102,6 +141,55 @@ int luawt_WImage_setAlternateText(lua_State* L) { } } +static const char* WImage_imageLink_args0[] = {luawt_typeToStr(), NULL}; +static const char* const* const luawt_WImage_imageLink_args[] = {WImage_imageLink_args0, NULL}; + +int luawt_WImage_imageLink(lua_State* L) { + int index = luawt_getSuitableArgsGroup(L, luawt_WImage_imageLink_args); + WImage* self = luawt_checkFromLua(L, 1); + if (index == 0) { + Wt::WLink const & l_result = self->imageLink(); + lua_pushstring(L, l_result.url().c_str()); + return 1; + + } else { + return luaL_error(L, "Wrong arguments for WImage.imageLink"); + } +} + +static const char* WImage_setImageLink_args0[] = {luawt_typeToStr(), "char const *", NULL}; +static const char* const* const luawt_WImage_setImageLink_args[] = {WImage_setImageLink_args0, NULL}; + +int luawt_WImage_setImageLink(lua_State* L) { + int index = luawt_getSuitableArgsGroup(L, luawt_WImage_setImageLink_args); + WImage* self = luawt_checkFromLua(L, 1); + if (index == 0) { + char const * raw2 = lua_tostring(L, 2); + Wt::WLink link = Wt::WLink(raw2); + self->setImageLink(link); + return 0; + + } else { + return luaL_error(L, "Wrong arguments for WImage.setImageLink"); + } +} + +static const char* WImage_alternateText_args0[] = {luawt_typeToStr(), NULL}; +static const char* const* const luawt_WImage_alternateText_args[] = {WImage_alternateText_args0, NULL}; + +int luawt_WImage_alternateText(lua_State* L) { + int index = luawt_getSuitableArgsGroup(L, luawt_WImage_alternateText_args); + WImage* self = luawt_checkFromLua(L, 1); + if (index == 0) { + Wt::WString const & l_result = self->alternateText(); + lua_pushstring(L, l_result.toUTF8().c_str()); + return 1; + + } else { + return luaL_error(L, "Wrong arguments for WImage.alternateText"); + } +} + ADD_SIGNAL(imageLoaded, WImage, Wt::NoClass) ADD_SIGNAL(keyWentDown, WImage, Wt::WKeyEvent) ADD_SIGNAL(keyPressed, WImage, Wt::WKeyEvent) @@ -127,6 +215,8 @@ ADD_SIGNAL(gestureEnded, WImage, Wt::WGestureEvent) static const luaL_Reg luawt_WImage_methods[] = { METHOD(WImage, setAlternateText), METHOD(WImage, alternateText), + METHOD(WImage, setImageLink), + METHOD(WImage, imageLink), METHOD(WImage, setImageRef), METHOD(WImage, imageRef), METHOD(WImage, imageLoaded), diff --git a/src/luawt/WInPlaceEdit.cpp b/src/luawt/WInPlaceEdit.cpp index 3aea8cf..123e89a 100644 --- a/src/luawt/WInPlaceEdit.cpp +++ b/src/luawt/WInPlaceEdit.cpp @@ -18,15 +18,15 @@ int luawt_WInPlaceEdit_make(lua_State* L) { if (index == 0) { char const * raw1 = lua_tostring(L, 1); Wt::WString text = Wt::WString(raw1); - WInPlaceEdit * result = new WInPlaceEdit(text); + WInPlaceEdit * l_result = new WInPlaceEdit(text); MyApplication* app = MyApplication::instance(); if (!app) { - delete result; + delete l_result; throw std::logic_error("No WApplication when creating WInPlaceEdit"); } - app->root()->addWidget(result); + app->root()->addWidget(l_result); - luawt_toLua(L, result); + luawt_toLua(L, l_result); return 1; } else if (index == 1) { @@ -34,8 +34,8 @@ int luawt_WInPlaceEdit_make(lua_State* L) { Wt::WString text = Wt::WString(raw1); Wt::WContainerWidget* parent = luawt_checkFromLua(L, 2); - WInPlaceEdit * result = new WInPlaceEdit(text, parent); - luawt_toLua(L, result); + WInPlaceEdit * l_result = new WInPlaceEdit(text, parent); + luawt_toLua(L, l_result); return 1; } else { @@ -71,8 +71,8 @@ int luawt_WInPlaceEdit_text(lua_State* L) { int index = luawt_getSuitableArgsGroup(L, luawt_WInPlaceEdit_text_args); WInPlaceEdit* self = luawt_checkFromLua(L, 1); if (index == 0) { - Wt::WString const & result = self->text(); - lua_pushstring(L, result.toUTF8().c_str()); + Wt::WString const & l_result = self->text(); + lua_pushstring(L, l_result.toUTF8().c_str()); return 1; } else { @@ -104,8 +104,8 @@ int luawt_WInPlaceEdit_cancelButton(lua_State* L) { int index = luawt_getSuitableArgsGroup(L, luawt_WInPlaceEdit_cancelButton_args); WInPlaceEdit* self = luawt_checkFromLua(L, 1); if (index == 0) { - Wt::WPushButton * result = self->cancelButton(); - luawt_toLua(L, result); + Wt::WPushButton * l_result = self->cancelButton(); + luawt_toLua(L, l_result); return 1; } else { @@ -120,8 +120,8 @@ int luawt_WInPlaceEdit_textWidget(lua_State* L) { int index = luawt_getSuitableArgsGroup(L, luawt_WInPlaceEdit_textWidget_args); WInPlaceEdit* self = luawt_checkFromLua(L, 1); if (index == 0) { - Wt::WText * result = self->textWidget(); - luawt_toLua(L, result); + Wt::WText * l_result = self->textWidget(); + luawt_toLua(L, l_result); return 1; } else { @@ -136,8 +136,8 @@ int luawt_WInPlaceEdit_saveButton(lua_State* L) { int index = luawt_getSuitableArgsGroup(L, luawt_WInPlaceEdit_saveButton_args); WInPlaceEdit* self = luawt_checkFromLua(L, 1); if (index == 0) { - Wt::WPushButton * result = self->saveButton(); - luawt_toLua(L, result); + Wt::WPushButton * l_result = self->saveButton(); + luawt_toLua(L, l_result); return 1; } else { @@ -152,8 +152,8 @@ int luawt_WInPlaceEdit_lineEdit(lua_State* L) { int index = luawt_getSuitableArgsGroup(L, luawt_WInPlaceEdit_lineEdit_args); WInPlaceEdit* self = luawt_checkFromLua(L, 1); if (index == 0) { - Wt::WLineEdit * result = self->lineEdit(); - luawt_toLua(L, result); + Wt::WLineEdit * l_result = self->lineEdit(); + luawt_toLua(L, l_result); return 1; } else { @@ -168,8 +168,8 @@ int luawt_WInPlaceEdit_emptyText(lua_State* L) { int index = luawt_getSuitableArgsGroup(L, luawt_WInPlaceEdit_emptyText_args); WInPlaceEdit* self = luawt_checkFromLua(L, 1); if (index == 0) { - Wt::WString const & result = self->emptyText(); - lua_pushstring(L, result.toUTF8().c_str()); + Wt::WString const & l_result = self->emptyText(); + lua_pushstring(L, l_result.toUTF8().c_str()); return 1; } else { diff --git a/src/luawt/WInteractWidget.cpp b/src/luawt/WInteractWidget.cpp index 44294bf..ba7a508 100644 --- a/src/luawt/WInteractWidget.cpp +++ b/src/luawt/WInteractWidget.cpp @@ -26,8 +26,8 @@ int luawt_WInteractWidget_mouseOverDelay(lua_State* L) { int index = luawt_getSuitableArgsGroup(L, luawt_WInteractWidget_mouseOverDelay_args); WInteractWidget* self = luawt_checkFromLua(L, 1); if (index == 0) { - int result = self->mouseOverDelay(); - lua_pushinteger(L, result); + int l_result = self->mouseOverDelay(); + lua_pushinteger(L, l_result); return 1; } else { @@ -42,8 +42,8 @@ int luawt_WInteractWidget_isEnabled(lua_State* L) { int index = luawt_getSuitableArgsGroup(L, luawt_WInteractWidget_isEnabled_args); WInteractWidget* self = luawt_checkFromLua(L, 1); if (index == 0) { - bool result = self->isEnabled(); - lua_pushboolean(L, result); + bool l_result = self->isEnabled(); + lua_pushboolean(L, l_result); return 1; } else { diff --git a/src/luawt/WLabel.cpp b/src/luawt/WLabel.cpp index 98355c3..4f0a8a5 100644 --- a/src/luawt/WLabel.cpp +++ b/src/luawt/WLabel.cpp @@ -19,36 +19,36 @@ static const char* const* const luawt_WLabel_make_args[] = {WLabel_make_args0, W int luawt_WLabel_make(lua_State* L) { int index = luawt_getSuitableArgsGroup(L, luawt_WLabel_make_args); if (index == 0) { - WLabel * result = new WLabel(); + WLabel * l_result = new WLabel(); MyApplication* app = MyApplication::instance(); if (!app) { - delete result; + delete l_result; throw std::logic_error("No WApplication when creating WLabel"); } - app->root()->addWidget(result); + app->root()->addWidget(l_result); - luawt_toLua(L, result); + luawt_toLua(L, l_result); return 1; } else if (index == 1) { Wt::WContainerWidget* parent = luawt_checkFromLua(L, 1); - WLabel * result = new WLabel(parent); - luawt_toLua(L, result); + WLabel * l_result = new WLabel(parent); + luawt_toLua(L, l_result); return 1; } else if (index == 2) { char const * raw1 = lua_tostring(L, 1); Wt::WString text = Wt::WString(raw1); - WLabel * result = new WLabel(text); + WLabel * l_result = new WLabel(text); MyApplication* app = MyApplication::instance(); if (!app) { - delete result; + delete l_result; throw std::logic_error("No WApplication when creating WLabel"); } - app->root()->addWidget(result); + app->root()->addWidget(l_result); - luawt_toLua(L, result); + luawt_toLua(L, l_result); return 1; } else if (index == 3) { @@ -56,22 +56,22 @@ int luawt_WLabel_make(lua_State* L) { Wt::WString text = Wt::WString(raw1); Wt::WContainerWidget* parent = luawt_checkFromLua(L, 2); - WLabel * result = new WLabel(text, parent); - luawt_toLua(L, result); + WLabel * l_result = new WLabel(text, parent); + luawt_toLua(L, l_result); return 1; } else if (index == 4) { Wt::WImage* image = luawt_checkFromLua(L, 1); - WLabel * result = new WLabel(image); + WLabel * l_result = new WLabel(image); MyApplication* app = MyApplication::instance(); if (!app) { - delete result; + delete l_result; throw std::logic_error("No WApplication when creating WLabel"); } - app->root()->addWidget(result); + app->root()->addWidget(l_result); - luawt_toLua(L, result); + luawt_toLua(L, l_result); return 1; } else if (index == 5) { @@ -79,8 +79,8 @@ int luawt_WLabel_make(lua_State* L) { luawt_checkFromLua(L, 1); Wt::WContainerWidget* parent = luawt_checkFromLua(L, 2); - WLabel * result = new WLabel(image, parent); - luawt_toLua(L, result); + WLabel * l_result = new WLabel(image, parent); + luawt_toLua(L, l_result); return 1; } else { @@ -95,8 +95,8 @@ int luawt_WLabel_buddy(lua_State* L) { int index = luawt_getSuitableArgsGroup(L, luawt_WLabel_buddy_args); WLabel* self = luawt_checkFromLua(L, 1); if (index == 0) { - Wt::WFormWidget * result = self->buddy(); - luawt_toLua(L, result); + Wt::WFormWidget * l_result = self->buddy(); + luawt_toLua(L, l_result); return 1; } else { @@ -153,8 +153,8 @@ int luawt_WLabel_text(lua_State* L) { int index = luawt_getSuitableArgsGroup(L, luawt_WLabel_text_args); WLabel* self = luawt_checkFromLua(L, 1); if (index == 0) { - Wt::WString const & result = self->text(); - lua_pushstring(L, result.toUTF8().c_str()); + Wt::WString const & l_result = self->text(); + lua_pushstring(L, l_result.toUTF8().c_str()); return 1; } else { @@ -186,8 +186,8 @@ int luawt_WLabel_wordWrap(lua_State* L) { int index = luawt_getSuitableArgsGroup(L, luawt_WLabel_wordWrap_args); WLabel* self = luawt_checkFromLua(L, 1); if (index == 0) { - bool result = self->wordWrap(); - lua_pushboolean(L, result); + bool l_result = self->wordWrap(); + lua_pushboolean(L, l_result); return 1; } else { @@ -202,8 +202,8 @@ int luawt_WLabel_image(lua_State* L) { int index = luawt_getSuitableArgsGroup(L, luawt_WLabel_image_args); WLabel* self = luawt_checkFromLua(L, 1); if (index == 0) { - Wt::WImage * result = self->image(); - luawt_toLua(L, result); + Wt::WImage * l_result = self->image(); + luawt_toLua(L, l_result); return 1; } else { @@ -234,8 +234,8 @@ int luawt_WLabel_textFormat(lua_State* L) { int index = luawt_getSuitableArgsGroup(L, luawt_WLabel_textFormat_args); WLabel* self = luawt_checkFromLua(L, 1); if (index == 0) { - Wt::TextFormat result = self->textFormat(); - lua_pushinteger(L, result); + Wt::TextFormat l_result = self->textFormat(); + lua_pushinteger(L, l_result); return 1; } else { @@ -251,8 +251,8 @@ int luawt_WLabel_setTextFormat(lua_State* L) { WLabel* self = luawt_checkFromLua(L, 1); if (index == 0) { Wt::TextFormat format = static_cast(lua_tointeger(L, 2)); - bool result = self->setTextFormat(format); - lua_pushboolean(L, result); + bool l_result = self->setTextFormat(format); + lua_pushboolean(L, l_result); return 1; } else { diff --git a/src/luawt/WLineEdit.cpp b/src/luawt/WLineEdit.cpp index 6574df2..0a60512 100644 --- a/src/luawt/WLineEdit.cpp +++ b/src/luawt/WLineEdit.cpp @@ -15,36 +15,36 @@ static const char* const* const luawt_WLineEdit_make_args[] = {WLineEdit_make_ar int luawt_WLineEdit_make(lua_State* L) { int index = luawt_getSuitableArgsGroup(L, luawt_WLineEdit_make_args); if (index == 0) { - WLineEdit * result = new WLineEdit(); + WLineEdit * l_result = new WLineEdit(); MyApplication* app = MyApplication::instance(); if (!app) { - delete result; + delete l_result; throw std::logic_error("No WApplication when creating WLineEdit"); } - app->root()->addWidget(result); + app->root()->addWidget(l_result); - luawt_toLua(L, result); + luawt_toLua(L, l_result); return 1; } else if (index == 1) { Wt::WContainerWidget* parent = luawt_checkFromLua(L, 1); - WLineEdit * result = new WLineEdit(parent); - luawt_toLua(L, result); + WLineEdit * l_result = new WLineEdit(parent); + luawt_toLua(L, l_result); return 1; } else if (index == 2) { char const * raw1 = lua_tostring(L, 1); Wt::WString content = Wt::WString(raw1); - WLineEdit * result = new WLineEdit(content); + WLineEdit * l_result = new WLineEdit(content); MyApplication* app = MyApplication::instance(); if (!app) { - delete result; + delete l_result; throw std::logic_error("No WApplication when creating WLineEdit"); } - app->root()->addWidget(result); + app->root()->addWidget(l_result); - luawt_toLua(L, result); + luawt_toLua(L, l_result); return 1; } else if (index == 3) { @@ -52,8 +52,8 @@ int luawt_WLineEdit_make(lua_State* L) { Wt::WString content = Wt::WString(raw1); Wt::WContainerWidget* parent = luawt_checkFromLua(L, 2); - WLineEdit * result = new WLineEdit(content, parent); - luawt_toLua(L, result); + WLineEdit * l_result = new WLineEdit(content, parent); + luawt_toLua(L, l_result); return 1; } else { @@ -84,8 +84,8 @@ int luawt_WLineEdit_textSize(lua_State* L) { int index = luawt_getSuitableArgsGroup(L, luawt_WLineEdit_textSize_args); WLineEdit* self = luawt_checkFromLua(L, 1); if (index == 0) { - int result = self->textSize(); - lua_pushinteger(L, result); + int l_result = self->textSize(); + lua_pushinteger(L, l_result); return 1; } else { @@ -116,8 +116,8 @@ int luawt_WLineEdit_text(lua_State* L) { int index = luawt_getSuitableArgsGroup(L, luawt_WLineEdit_text_args); WLineEdit* self = luawt_checkFromLua(L, 1); if (index == 0) { - Wt::WString const & result = self->text(); - lua_pushstring(L, result.toUTF8().c_str()); + Wt::WString const & l_result = self->text(); + lua_pushstring(L, l_result.toUTF8().c_str()); return 1; } else { @@ -149,8 +149,8 @@ int luawt_WLineEdit_echoMode(lua_State* L) { int index = luawt_getSuitableArgsGroup(L, luawt_WLineEdit_echoMode_args); WLineEdit* self = luawt_checkFromLua(L, 1); if (index == 0) { - Wt::WLineEdit::EchoMode result = self->echoMode(); - lua_pushinteger(L, result); + Wt::WLineEdit::EchoMode l_result = self->echoMode(); + lua_pushinteger(L, l_result); return 1; } else { @@ -181,8 +181,8 @@ int luawt_WLineEdit_selectionStart(lua_State* L) { int index = luawt_getSuitableArgsGroup(L, luawt_WLineEdit_selectionStart_args); WLineEdit* self = luawt_checkFromLua(L, 1); if (index == 0) { - int result = self->selectionStart(); - lua_pushinteger(L, result); + int l_result = self->selectionStart(); + lua_pushinteger(L, l_result); return 1; } else { @@ -197,8 +197,8 @@ int luawt_WLineEdit_maxLength(lua_State* L) { int index = luawt_getSuitableArgsGroup(L, luawt_WLineEdit_maxLength_args); WLineEdit* self = luawt_checkFromLua(L, 1); if (index == 0) { - int result = self->maxLength(); - lua_pushinteger(L, result); + int l_result = self->maxLength(); + lua_pushinteger(L, l_result); return 1; } else { @@ -213,8 +213,8 @@ int luawt_WLineEdit_selectedText(lua_State* L) { int index = luawt_getSuitableArgsGroup(L, luawt_WLineEdit_selectedText_args); WLineEdit* self = luawt_checkFromLua(L, 1); if (index == 0) { - Wt::WString result = self->selectedText(); - lua_pushstring(L, result.toUTF8().c_str()); + Wt::WString l_result = self->selectedText(); + lua_pushstring(L, l_result.toUTF8().c_str()); return 1; } else { @@ -229,8 +229,8 @@ int luawt_WLineEdit_hasSelectedText(lua_State* L) { int index = luawt_getSuitableArgsGroup(L, luawt_WLineEdit_hasSelectedText_args); WLineEdit* self = luawt_checkFromLua(L, 1); if (index == 0) { - bool result = self->hasSelectedText(); - lua_pushboolean(L, result); + bool l_result = self->hasSelectedText(); + lua_pushboolean(L, l_result); return 1; } else { @@ -262,8 +262,8 @@ int luawt_WLineEdit_cursorPosition(lua_State* L) { int index = luawt_getSuitableArgsGroup(L, luawt_WLineEdit_cursorPosition_args); WLineEdit* self = luawt_checkFromLua(L, 1); if (index == 0) { - int result = self->cursorPosition(); - lua_pushinteger(L, result); + int l_result = self->cursorPosition(); + lua_pushinteger(L, l_result); return 1; } else { @@ -278,8 +278,8 @@ int luawt_WLineEdit_valueText(lua_State* L) { int index = luawt_getSuitableArgsGroup(L, luawt_WLineEdit_valueText_args); WLineEdit* self = luawt_checkFromLua(L, 1); if (index == 0) { - Wt::WString result = self->valueText(); - lua_pushstring(L, result.toUTF8().c_str()); + Wt::WString l_result = self->valueText(); + lua_pushstring(L, l_result.toUTF8().c_str()); return 1; } else { diff --git a/src/luawt/WMediaPlayer.cpp b/src/luawt/WMediaPlayer.cpp index aa6c253..de59182 100644 --- a/src/luawt/WMediaPlayer.cpp +++ b/src/luawt/WMediaPlayer.cpp @@ -1,6 +1,7 @@ #include "boost-xtime.hpp" #include +#include #include #include #include @@ -18,23 +19,23 @@ int luawt_WMediaPlayer_make(lua_State* L) { int index = luawt_getSuitableArgsGroup(L, luawt_WMediaPlayer_make_args); if (index == 0) { Wt::WMediaPlayer::MediaType mediaType = static_cast(lua_tointeger(L, 1)); - WMediaPlayer * result = new WMediaPlayer(mediaType); + WMediaPlayer * l_result = new WMediaPlayer(mediaType); MyApplication* app = MyApplication::instance(); if (!app) { - delete result; + delete l_result; throw std::logic_error("No WApplication when creating WMediaPlayer"); } - app->root()->addWidget(result); + app->root()->addWidget(l_result); - luawt_toLua(L, result); + luawt_toLua(L, l_result); return 1; } else if (index == 1) { Wt::WMediaPlayer::MediaType mediaType = static_cast(lua_tointeger(L, 1)); Wt::WContainerWidget* parent = luawt_checkFromLua(L, 2); - WMediaPlayer * result = new WMediaPlayer(mediaType, parent); - luawt_toLua(L, result); + WMediaPlayer * l_result = new WMediaPlayer(mediaType, parent); + luawt_toLua(L, l_result); return 1; } else { @@ -66,8 +67,8 @@ int luawt_WMediaPlayer_text(lua_State* L) { WMediaPlayer* self = luawt_checkFromLua(L, 1); if (index == 0) { Wt::WMediaPlayer::TextId id = static_cast(lua_tointeger(L, 2)); - Wt::WText * result = self->text(id); - luawt_toLua(L, result); + Wt::WText * l_result = self->text(id); + luawt_toLua(L, l_result); return 1; } else { @@ -133,8 +134,8 @@ int luawt_WMediaPlayer_duration(lua_State* L) { int index = luawt_getSuitableArgsGroup(L, luawt_WMediaPlayer_duration_args); WMediaPlayer* self = luawt_checkFromLua(L, 1); if (index == 0) { - double result = self->duration(); - lua_pushnumber(L, result); + double l_result = self->duration(); + lua_pushnumber(L, l_result); return 1; } else { @@ -173,6 +174,24 @@ int luawt_WMediaPlayer_pause(lua_State* L) { } } +static const char* WMediaPlayer_addSource_args0[] = {luawt_typeToStr(), "int", "char const *", NULL}; +static const char* const* const luawt_WMediaPlayer_addSource_args[] = {WMediaPlayer_addSource_args0, NULL}; + +int luawt_WMediaPlayer_addSource(lua_State* L) { + int index = luawt_getSuitableArgsGroup(L, luawt_WMediaPlayer_addSource_args); + WMediaPlayer* self = luawt_checkFromLua(L, 1); + if (index == 0) { + Wt::WMediaPlayer::Encoding encoding = static_cast(lua_tointeger(L, 2)); + char const * raw3 = lua_tostring(L, 3); + Wt::WLink link = Wt::WLink(raw3); + self->addSource(encoding, link); + return 0; + + } else { + return luaL_error(L, "Wrong arguments for WMediaPlayer.addSource"); + } +} + static const char* WMediaPlayer_button_args0[] = {luawt_typeToStr(), "int", NULL}; static const char* const* const luawt_WMediaPlayer_button_args[] = {WMediaPlayer_button_args0, NULL}; @@ -181,8 +200,8 @@ int luawt_WMediaPlayer_button(lua_State* L) { WMediaPlayer* self = luawt_checkFromLua(L, 1); if (index == 0) { Wt::WMediaPlayer::ButtonControlId id = static_cast(lua_tointeger(L, 2)); - Wt::WInteractWidget * result = self->button(id); - luawt_toLua(L, result); + Wt::WInteractWidget * l_result = self->button(id); + luawt_toLua(L, l_result); return 1; } else { @@ -197,8 +216,8 @@ int luawt_WMediaPlayer_jsPlayerRef(lua_State* L) { int index = luawt_getSuitableArgsGroup(L, luawt_WMediaPlayer_jsPlayerRef_args); WMediaPlayer* self = luawt_checkFromLua(L, 1); if (index == 0) { - std::string result = self->jsPlayerRef(); - lua_pushstring(L, result.c_str()); + std::string l_result = self->jsPlayerRef(); + lua_pushstring(L, l_result.c_str()); return 1; } else { @@ -213,8 +232,8 @@ int luawt_WMediaPlayer_playing(lua_State* L) { int index = luawt_getSuitableArgsGroup(L, luawt_WMediaPlayer_playing_args); WMediaPlayer* self = luawt_checkFromLua(L, 1); if (index == 0) { - bool result = self->playing(); - lua_pushboolean(L, result); + bool l_result = self->playing(); + lua_pushboolean(L, l_result); return 1; } else { @@ -229,8 +248,8 @@ int luawt_WMediaPlayer_videoWidth(lua_State* L) { int index = luawt_getSuitableArgsGroup(L, luawt_WMediaPlayer_videoWidth_args); WMediaPlayer* self = luawt_checkFromLua(L, 1); if (index == 0) { - int result = self->videoWidth(); - lua_pushinteger(L, result); + int l_result = self->videoWidth(); + lua_pushinteger(L, l_result); return 1; } else { @@ -276,8 +295,8 @@ int luawt_WMediaPlayer_controlsWidget(lua_State* L) { int index = luawt_getSuitableArgsGroup(L, luawt_WMediaPlayer_controlsWidget_args); WMediaPlayer* self = luawt_checkFromLua(L, 1); if (index == 0) { - Wt::WWidget * result = self->controlsWidget(); - luawt_toLua(L, result); + Wt::WWidget * l_result = self->controlsWidget(); + luawt_toLua(L, l_result); return 1; } else { @@ -326,8 +345,8 @@ int luawt_WMediaPlayer_progressBar(lua_State* L) { WMediaPlayer* self = luawt_checkFromLua(L, 1); if (index == 0) { Wt::WMediaPlayer::BarControlId id = static_cast(lua_tointeger(L, 2)); - Wt::WProgressBar * result = self->progressBar(id); - luawt_toLua(L, result); + Wt::WProgressBar * l_result = self->progressBar(id); + luawt_toLua(L, l_result); return 1; } else { @@ -342,8 +361,8 @@ int luawt_WMediaPlayer_volume(lua_State* L) { int index = luawt_getSuitableArgsGroup(L, luawt_WMediaPlayer_volume_args); WMediaPlayer* self = luawt_checkFromLua(L, 1); if (index == 0) { - double result = self->volume(); - lua_pushnumber(L, result); + double l_result = self->volume(); + lua_pushnumber(L, l_result); return 1; } else { @@ -358,8 +377,8 @@ int luawt_WMediaPlayer_videoHeight(lua_State* L) { int index = luawt_getSuitableArgsGroup(L, luawt_WMediaPlayer_videoHeight_args); WMediaPlayer* self = luawt_checkFromLua(L, 1); if (index == 0) { - int result = self->videoHeight(); - lua_pushinteger(L, result); + int l_result = self->videoHeight(); + lua_pushinteger(L, l_result); return 1; } else { @@ -374,8 +393,8 @@ int luawt_WMediaPlayer_readyState(lua_State* L) { int index = luawt_getSuitableArgsGroup(L, luawt_WMediaPlayer_readyState_args); WMediaPlayer* self = luawt_checkFromLua(L, 1); if (index == 0) { - Wt::WMediaPlayer::ReadyState result = self->readyState(); - lua_pushinteger(L, result); + Wt::WMediaPlayer::ReadyState l_result = self->readyState(); + lua_pushinteger(L, l_result); return 1; } else { @@ -390,8 +409,8 @@ int luawt_WMediaPlayer_currentTime(lua_State* L) { int index = luawt_getSuitableArgsGroup(L, luawt_WMediaPlayer_currentTime_args); WMediaPlayer* self = luawt_checkFromLua(L, 1); if (index == 0) { - double result = self->currentTime(); - lua_pushnumber(L, result); + double l_result = self->currentTime(); + lua_pushnumber(L, l_result); return 1; } else { @@ -424,8 +443,8 @@ int luawt_WMediaPlayer_playbackRate(lua_State* L) { int index = luawt_getSuitableArgsGroup(L, luawt_WMediaPlayer_playbackRate_args); WMediaPlayer* self = luawt_checkFromLua(L, 1); if (index == 0) { - double result = self->playbackRate(); - lua_pushnumber(L, result); + double l_result = self->playbackRate(); + lua_pushnumber(L, l_result); return 1; } else { @@ -448,6 +467,23 @@ int luawt_WMediaPlayer_clearSources(lua_State* L) { } } +static const char* WMediaPlayer_getSource_args0[] = {luawt_typeToStr(), "int", NULL}; +static const char* const* const luawt_WMediaPlayer_getSource_args[] = {WMediaPlayer_getSource_args0, NULL}; + +int luawt_WMediaPlayer_getSource(lua_State* L) { + int index = luawt_getSuitableArgsGroup(L, luawt_WMediaPlayer_getSource_args); + WMediaPlayer* self = luawt_checkFromLua(L, 1); + if (index == 0) { + Wt::WMediaPlayer::Encoding encoding = static_cast(lua_tointeger(L, 2)); + Wt::WLink l_result = self->getSource(encoding); + lua_pushstring(L, l_result.url().c_str()); + return 1; + + } else { + return luaL_error(L, "Wrong arguments for WMediaPlayer.getSource"); + } +} + static const char* WMediaPlayer_setControlsWidget_args0[] = {luawt_typeToStr(), luawt_typeToStr(), NULL}; static const char* const* const luawt_WMediaPlayer_setControlsWidget_args[] = {WMediaPlayer_setControlsWidget_args0, NULL}; @@ -490,6 +526,8 @@ static const luaL_Reg luawt_WMediaPlayer_methods[] = { METHOD(WMediaPlayer, setControlsWidget), METHOD(WMediaPlayer, controlsWidget), METHOD(WMediaPlayer, setTitle), + METHOD(WMediaPlayer, addSource), + METHOD(WMediaPlayer, getSource), METHOD(WMediaPlayer, clearSources), METHOD(WMediaPlayer, setButton), METHOD(WMediaPlayer, button), diff --git a/src/luawt/WMenuItem.cpp b/src/luawt/WMenuItem.cpp index 0ed79c7..f556bb2 100644 --- a/src/luawt/WMenuItem.cpp +++ b/src/luawt/WMenuItem.cpp @@ -1,10 +1,11 @@ #include "boost-xtime.hpp" +#include +#include +#include #include #include -#include #include -#include #include "globals.hpp" @@ -21,15 +22,15 @@ int luawt_WMenuItem_make(lua_State* L) { if (index == 0) { char const * raw1 = lua_tostring(L, 1); Wt::WString label = Wt::WString(raw1); - WMenuItem * result = new WMenuItem(label); + WMenuItem * l_result = new WMenuItem(label); MyApplication* app = MyApplication::instance(); if (!app) { - delete result; + delete l_result; throw std::logic_error("No WApplication when creating WMenuItem"); } - app->root()->addWidget(result); + app->root()->addWidget(l_result); - luawt_toLua(L, result); + luawt_toLua(L, l_result); return 1; } else if (index == 1) { @@ -37,15 +38,15 @@ int luawt_WMenuItem_make(lua_State* L) { Wt::WString label = Wt::WString(raw1); Wt::WWidget* contents = luawt_checkFromLua(L, 2); - WMenuItem * result = new WMenuItem(label, contents); + WMenuItem * l_result = new WMenuItem(label, contents); MyApplication* app = MyApplication::instance(); if (!app) { - delete result; + delete l_result; throw std::logic_error("No WApplication when creating WMenuItem"); } - app->root()->addWidget(result); + app->root()->addWidget(l_result); - luawt_toLua(L, result); + luawt_toLua(L, l_result); return 1; } else if (index == 2) { @@ -54,15 +55,15 @@ int luawt_WMenuItem_make(lua_State* L) { Wt::WWidget* contents = luawt_checkFromLua(L, 2); Wt::WMenuItem::LoadPolicy policy = static_cast(lua_tointeger(L, 3)); - WMenuItem * result = new WMenuItem(label, contents, policy); + WMenuItem * l_result = new WMenuItem(label, contents, policy); MyApplication* app = MyApplication::instance(); if (!app) { - delete result; + delete l_result; throw std::logic_error("No WApplication when creating WMenuItem"); } - app->root()->addWidget(result); + app->root()->addWidget(l_result); - luawt_toLua(L, result); + luawt_toLua(L, l_result); return 1; } else if (index == 3) { @@ -70,15 +71,15 @@ int luawt_WMenuItem_make(lua_State* L) { std::string iconPath = std::string(raw1); char const * raw2 = lua_tostring(L, 2); Wt::WString label = Wt::WString(raw2); - WMenuItem * result = new WMenuItem(iconPath, label); + WMenuItem * l_result = new WMenuItem(iconPath, label); MyApplication* app = MyApplication::instance(); if (!app) { - delete result; + delete l_result; throw std::logic_error("No WApplication when creating WMenuItem"); } - app->root()->addWidget(result); + app->root()->addWidget(l_result); - luawt_toLua(L, result); + luawt_toLua(L, l_result); return 1; } else if (index == 4) { @@ -88,15 +89,15 @@ int luawt_WMenuItem_make(lua_State* L) { Wt::WString label = Wt::WString(raw2); Wt::WWidget* contents = luawt_checkFromLua(L, 3); - WMenuItem * result = new WMenuItem(iconPath, label, contents); + WMenuItem * l_result = new WMenuItem(iconPath, label, contents); MyApplication* app = MyApplication::instance(); if (!app) { - delete result; + delete l_result; throw std::logic_error("No WApplication when creating WMenuItem"); } - app->root()->addWidget(result); + app->root()->addWidget(l_result); - luawt_toLua(L, result); + luawt_toLua(L, l_result); return 1; } else if (index == 5) { @@ -107,15 +108,15 @@ int luawt_WMenuItem_make(lua_State* L) { Wt::WWidget* contents = luawt_checkFromLua(L, 3); Wt::WMenuItem::LoadPolicy policy = static_cast(lua_tointeger(L, 4)); - WMenuItem * result = new WMenuItem(iconPath, label, contents, policy); + WMenuItem * l_result = new WMenuItem(iconPath, label, contents, policy); MyApplication* app = MyApplication::instance(); if (!app) { - delete result; + delete l_result; throw std::logic_error("No WApplication when creating WMenuItem"); } - app->root()->addWidget(result); + app->root()->addWidget(l_result); - luawt_toLua(L, result); + luawt_toLua(L, l_result); return 1; } else { @@ -194,8 +195,8 @@ int luawt_WMenuItem_isCheckable(lua_State* L) { int index = luawt_getSuitableArgsGroup(L, luawt_WMenuItem_isCheckable_args); WMenuItem* self = luawt_checkFromLua(L, 1); if (index == 0) { - bool result = self->isCheckable(); - lua_pushboolean(L, result); + bool l_result = self->isCheckable(); + lua_pushboolean(L, l_result); return 1; } else { @@ -210,8 +211,8 @@ int luawt_WMenuItem_isSelectable(lua_State* L) { int index = luawt_getSuitableArgsGroup(L, luawt_WMenuItem_isSelectable_args); WMenuItem* self = luawt_checkFromLua(L, 1); if (index == 0) { - bool result = self->isSelectable(); - lua_pushboolean(L, result); + bool l_result = self->isSelectable(); + lua_pushboolean(L, l_result); return 1; } else { @@ -226,8 +227,8 @@ int luawt_WMenuItem_itemWidget(lua_State* L) { int index = luawt_getSuitableArgsGroup(L, luawt_WMenuItem_itemWidget_args); WMenuItem* self = luawt_checkFromLua(L, 1); if (index == 0) { - Wt::WWidget * result = self->itemWidget(); - luawt_toLua(L, result); + Wt::WWidget * l_result = self->itemWidget(); + luawt_toLua(L, l_result); return 1; } else { @@ -257,8 +258,8 @@ int luawt_WMenuItem_contents(lua_State* L) { int index = luawt_getSuitableArgsGroup(L, luawt_WMenuItem_contents_args); WMenuItem* self = luawt_checkFromLua(L, 1); if (index == 0) { - Wt::WWidget * result = self->contents(); - luawt_toLua(L, result); + Wt::WWidget * l_result = self->contents(); + luawt_toLua(L, l_result); return 1; } else { @@ -273,8 +274,8 @@ int luawt_WMenuItem_menu(lua_State* L) { int index = luawt_getSuitableArgsGroup(L, luawt_WMenuItem_menu_args); WMenuItem* self = luawt_checkFromLua(L, 1); if (index == 0) { - Wt::WMenu * result = self->menu(); - luawt_toLua(L, result); + Wt::WMenu * l_result = self->menu(); + luawt_toLua(L, l_result); return 1; } else { @@ -306,8 +307,8 @@ int luawt_WMenuItem_isChecked(lua_State* L) { int index = luawt_getSuitableArgsGroup(L, luawt_WMenuItem_isChecked_args); WMenuItem* self = luawt_checkFromLua(L, 1); if (index == 0) { - bool result = self->isChecked(); - lua_pushboolean(L, result); + bool l_result = self->isChecked(); + lua_pushboolean(L, l_result); return 1; } else { @@ -337,8 +338,8 @@ int luawt_WMenuItem_text(lua_State* L) { int index = luawt_getSuitableArgsGroup(L, luawt_WMenuItem_text_args); WMenuItem* self = luawt_checkFromLua(L, 1); if (index == 0) { - Wt::WString const & result = self->text(); - lua_pushstring(L, result.toUTF8().c_str()); + Wt::WString const & l_result = self->text(); + lua_pushstring(L, l_result.toUTF8().c_str()); return 1; } else { @@ -353,8 +354,8 @@ int luawt_WMenuItem_linkTarget(lua_State* L) { int index = luawt_getSuitableArgsGroup(L, luawt_WMenuItem_linkTarget_args); WMenuItem* self = luawt_checkFromLua(L, 1); if (index == 0) { - Wt::AnchorTarget result = self->linkTarget(); - lua_pushinteger(L, result); + Wt::AnchorTarget l_result = self->linkTarget(); + lua_pushinteger(L, l_result); return 1; } else { @@ -369,8 +370,8 @@ int luawt_WMenuItem_takeContents(lua_State* L) { int index = luawt_getSuitableArgsGroup(L, luawt_WMenuItem_takeContents_args); WMenuItem* self = luawt_checkFromLua(L, 1); if (index == 0) { - Wt::WWidget * result = self->takeContents(); - luawt_toLua(L, result); + Wt::WWidget * l_result = self->takeContents(); + luawt_toLua(L, l_result); return 1; } else { @@ -417,8 +418,8 @@ int luawt_WMenuItem_parentMenu(lua_State* L) { int index = luawt_getSuitableArgsGroup(L, luawt_WMenuItem_parentMenu_args); WMenuItem* self = luawt_checkFromLua(L, 1); if (index == 0) { - Wt::WMenu * result = self->parentMenu(); - luawt_toLua(L, result); + Wt::WMenu * l_result = self->parentMenu(); + luawt_toLua(L, l_result); return 1; } else { @@ -433,8 +434,8 @@ int luawt_WMenuItem_isCloseable(lua_State* L) { int index = luawt_getSuitableArgsGroup(L, luawt_WMenuItem_isCloseable_args); WMenuItem* self = luawt_checkFromLua(L, 1); if (index == 0) { - bool result = self->isCloseable(); - lua_pushboolean(L, result); + bool l_result = self->isCloseable(); + lua_pushboolean(L, l_result); return 1; } else { @@ -459,6 +460,22 @@ int luawt_WMenuItem_setFromInternalPath(lua_State* L) { } } +static const char* WMenuItem_link_args0[] = {luawt_typeToStr(), NULL}; +static const char* const* const luawt_WMenuItem_link_args[] = {WMenuItem_link_args0, NULL}; + +int luawt_WMenuItem_link(lua_State* L) { + int index = luawt_getSuitableArgsGroup(L, luawt_WMenuItem_link_args); + WMenuItem* self = luawt_checkFromLua(L, 1); + if (index == 0) { + Wt::WLink l_result = self->link(); + lua_pushstring(L, l_result.url().c_str()); + return 1; + + } else { + return luaL_error(L, "Wrong arguments for WMenuItem.link"); + } +} + static const char* WMenuItem_setCloseable_args0[] = {luawt_typeToStr(), "bool", NULL}; static const char* const* const luawt_WMenuItem_setCloseable_args[] = {WMenuItem_setCloseable_args0, NULL}; @@ -482,8 +499,8 @@ int luawt_WMenuItem_pathComponent(lua_State* L) { int index = luawt_getSuitableArgsGroup(L, luawt_WMenuItem_pathComponent_args); WMenuItem* self = luawt_checkFromLua(L, 1); if (index == 0) { - std::string result = self->pathComponent(); - lua_pushstring(L, result.c_str()); + std::string l_result = self->pathComponent(); + lua_pushstring(L, l_result.c_str()); return 1; } else { @@ -514,8 +531,8 @@ int luawt_WMenuItem_icon(lua_State* L) { int index = luawt_getSuitableArgsGroup(L, luawt_WMenuItem_icon_args); WMenuItem* self = luawt_checkFromLua(L, 1); if (index == 0) { - std::string result = self->icon(); - lua_pushstring(L, result.c_str()); + std::string l_result = self->icon(); + lua_pushstring(L, l_result.c_str()); return 1; } else { @@ -530,8 +547,8 @@ int luawt_WMenuItem_checkBox(lua_State* L) { int index = luawt_getSuitableArgsGroup(L, luawt_WMenuItem_checkBox_args); WMenuItem* self = luawt_checkFromLua(L, 1); if (index == 0) { - Wt::WCheckBox * result = self->checkBox(); - luawt_toLua(L, result); + Wt::WCheckBox * l_result = self->checkBox(); + luawt_toLua(L, l_result); return 1; } else { @@ -597,8 +614,8 @@ int luawt_WMenuItem_isSectionHeader(lua_State* L) { int index = luawt_getSuitableArgsGroup(L, luawt_WMenuItem_isSectionHeader_args); WMenuItem* self = luawt_checkFromLua(L, 1); if (index == 0) { - bool result = self->isSectionHeader(); - lua_pushboolean(L, result); + bool l_result = self->isSectionHeader(); + lua_pushboolean(L, l_result); return 1; } else { @@ -613,8 +630,8 @@ int luawt_WMenuItem_isSeparator(lua_State* L) { int index = luawt_getSuitableArgsGroup(L, luawt_WMenuItem_isSeparator_args); WMenuItem* self = luawt_checkFromLua(L, 1); if (index == 0) { - bool result = self->isSeparator(); - lua_pushboolean(L, result); + bool l_result = self->isSeparator(); + lua_pushboolean(L, l_result); return 1; } else { @@ -622,6 +639,23 @@ int luawt_WMenuItem_isSeparator(lua_State* L) { } } +static const char* WMenuItem_setLink_args0[] = {luawt_typeToStr(), "char const *", NULL}; +static const char* const* const luawt_WMenuItem_setLink_args[] = {WMenuItem_setLink_args0, NULL}; + +int luawt_WMenuItem_setLink(lua_State* L) { + int index = luawt_getSuitableArgsGroup(L, luawt_WMenuItem_setLink_args); + WMenuItem* self = luawt_checkFromLua(L, 1); + if (index == 0) { + char const * raw2 = lua_tostring(L, 2); + Wt::WLink link = Wt::WLink(raw2); + self->setLink(link); + return 0; + + } else { + return luaL_error(L, "Wrong arguments for WMenuItem.setLink"); + } +} + ADD_SIGNAL(scrolled, WMenuItem, Wt::WScrollEvent) ADD_SIGNAL(keyWentDown, WMenuItem, Wt::WKeyEvent) ADD_SIGNAL(keyPressed, WMenuItem, Wt::WKeyEvent) @@ -653,6 +687,8 @@ static const luaL_Reg luawt_WMenuItem_methods[] = { METHOD(WMenuItem, isCheckable), METHOD(WMenuItem, setPathComponent), METHOD(WMenuItem, pathComponent), + METHOD(WMenuItem, setLink), + METHOD(WMenuItem, link), METHOD(WMenuItem, setLinkTarget), METHOD(WMenuItem, linkTarget), METHOD(WMenuItem, setMenu), diff --git a/src/luawt/WMessageBox.cpp b/src/luawt/WMessageBox.cpp new file mode 100644 index 0000000..d87686a --- /dev/null +++ b/src/luawt/WMessageBox.cpp @@ -0,0 +1,184 @@ +#include "boost-xtime.hpp" + +#include +#include +#include +#include + +#include "globals.hpp" + +static const char* WMessageBox_text_args0[] = {luawt_typeToStr(), NULL}; +static const char* const* const luawt_WMessageBox_text_args[] = {WMessageBox_text_args0, NULL}; + +int luawt_WMessageBox_text(lua_State* L) { + int index = luawt_getSuitableArgsGroup(L, luawt_WMessageBox_text_args); + WMessageBox* self = luawt_checkFromLua(L, 1); + if (index == 0) { + Wt::WString const & l_result = self->text(); + lua_pushstring(L, l_result.toUTF8().c_str()); + return 1; + + } else { + return luaL_error(L, "Wrong arguments for WMessageBox.text"); + } +} + +static const char* WMessageBox_setText_args0[] = {luawt_typeToStr(), "char const *", NULL}; +static const char* const* const luawt_WMessageBox_setText_args[] = {WMessageBox_setText_args0, NULL}; + +int luawt_WMessageBox_setText(lua_State* L) { + int index = luawt_getSuitableArgsGroup(L, luawt_WMessageBox_setText_args); + WMessageBox* self = luawt_checkFromLua(L, 1); + if (index == 0) { + char const * raw2 = lua_tostring(L, 2); + Wt::WString text = Wt::WString(raw2); + self->setText(text); + return 0; + + } else { + return luaL_error(L, "Wrong arguments for WMessageBox.setText"); + } +} + +static const char* WMessageBox_textWidget_args0[] = {luawt_typeToStr(), NULL}; +static const char* const* const luawt_WMessageBox_textWidget_args[] = {WMessageBox_textWidget_args0, NULL}; + +int luawt_WMessageBox_textWidget(lua_State* L) { + int index = luawt_getSuitableArgsGroup(L, luawt_WMessageBox_textWidget_args); + WMessageBox* self = luawt_checkFromLua(L, 1); + if (index == 0) { + Wt::WText * l_result = self->textWidget(); + luawt_toLua(L, l_result); + return 1; + + } else { + return luaL_error(L, "Wrong arguments for WMessageBox.textWidget"); + } +} + +static const char* WMessageBox_addButton_args0[] = {luawt_typeToStr(), "char const *", "int", NULL}; +static const char* const* const luawt_WMessageBox_addButton_args[] = {WMessageBox_addButton_args0, NULL}; + +int luawt_WMessageBox_addButton(lua_State* L) { + int index = luawt_getSuitableArgsGroup(L, luawt_WMessageBox_addButton_args); + WMessageBox* self = luawt_checkFromLua(L, 1); + if (index == 0) { + char const * raw2 = lua_tostring(L, 2); + Wt::WString text = Wt::WString(raw2); + Wt::StandardButton result = static_cast(lua_tointeger(L, 3)); + Wt::WPushButton * l_result = self->addButton(text, result); + luawt_toLua(L, l_result); + return 1; + + } else { + return luaL_error(L, "Wrong arguments for WMessageBox.addButton"); + } +} + +static const char* WMessageBox_buttonResult_args0[] = {luawt_typeToStr(), NULL}; +static const char* const* const luawt_WMessageBox_buttonResult_args[] = {WMessageBox_buttonResult_args0, NULL}; + +int luawt_WMessageBox_buttonResult(lua_State* L) { + int index = luawt_getSuitableArgsGroup(L, luawt_WMessageBox_buttonResult_args); + WMessageBox* self = luawt_checkFromLua(L, 1); + if (index == 0) { + Wt::StandardButton l_result = self->buttonResult(); + lua_pushinteger(L, l_result); + return 1; + + } else { + return luaL_error(L, "Wrong arguments for WMessageBox.buttonResult"); + } +} + +static const char* WMessageBox_button_args0[] = {luawt_typeToStr(), "int", NULL}; +static const char* const* const luawt_WMessageBox_button_args[] = {WMessageBox_button_args0, NULL}; + +int luawt_WMessageBox_button(lua_State* L) { + int index = luawt_getSuitableArgsGroup(L, luawt_WMessageBox_button_args); + WMessageBox* self = luawt_checkFromLua(L, 1); + if (index == 0) { + Wt::StandardButton b = static_cast(lua_tointeger(L, 2)); + Wt::WPushButton * l_result = self->button(b); + luawt_toLua(L, l_result); + return 1; + + } else { + return luaL_error(L, "Wrong arguments for WMessageBox.button"); + } +} + +static const char* WMessageBox_setIcon_args0[] = {luawt_typeToStr(), "int", NULL}; +static const char* const* const luawt_WMessageBox_setIcon_args[] = {WMessageBox_setIcon_args0, NULL}; + +int luawt_WMessageBox_setIcon(lua_State* L) { + int index = luawt_getSuitableArgsGroup(L, luawt_WMessageBox_setIcon_args); + WMessageBox* self = luawt_checkFromLua(L, 1); + if (index == 0) { + Wt::Icon icon = static_cast(lua_tointeger(L, 2)); + self->setIcon(icon); + return 0; + + } else { + return luaL_error(L, "Wrong arguments for WMessageBox.setIcon"); + } +} + +static const char* WMessageBox_setButtons_args0[] = {luawt_typeToStr(), "int", NULL}; +static const char* const* const luawt_WMessageBox_setButtons_args[] = {WMessageBox_setButtons_args0, NULL}; + +int luawt_WMessageBox_setButtons(lua_State* L) { + int index = luawt_getSuitableArgsGroup(L, luawt_WMessageBox_setButtons_args); + WMessageBox* self = luawt_checkFromLua(L, 1); + if (index == 0) { + Wt::WFlags buttons = static_cast(lua_tointeger(L, 2)); + self->setButtons(buttons); + return 0; + + } else { + return luaL_error(L, "Wrong arguments for WMessageBox.setButtons"); + } +} + +static const char* WMessageBox_icon_args0[] = {luawt_typeToStr(), NULL}; +static const char* const* const luawt_WMessageBox_icon_args[] = {WMessageBox_icon_args0, NULL}; + +int luawt_WMessageBox_icon(lua_State* L) { + int index = luawt_getSuitableArgsGroup(L, luawt_WMessageBox_icon_args); + WMessageBox* self = luawt_checkFromLua(L, 1); + if (index == 0) { + Wt::Icon l_result = self->icon(); + lua_pushinteger(L, l_result); + return 1; + + } else { + return luaL_error(L, "Wrong arguments for WMessageBox.icon"); + } +} + + +static const luaL_Reg luawt_WMessageBox_methods[] = { + METHOD(WMessageBox, setText), + METHOD(WMessageBox, text), + METHOD(WMessageBox, textWidget), + METHOD(WMessageBox, setIcon), + METHOD(WMessageBox, icon), + METHOD(WMessageBox, addButton), + METHOD(WMessageBox, setButtons), + METHOD(WMessageBox, button), + METHOD(WMessageBox, buttonResult), + {NULL, NULL}, +}; + +void luawt_WMessageBox(lua_State* L) { + const char* base = luawt_typeToStr(); + assert(base); + DECLARE_CLASS( + WMessageBox, + L, + 0, + 0, + luawt_WMessageBox_methods, + base + ); +} diff --git a/src/luawt/WNavigationBar.cpp b/src/luawt/WNavigationBar.cpp index eb78425..9fea5a8 100644 --- a/src/luawt/WNavigationBar.cpp +++ b/src/luawt/WNavigationBar.cpp @@ -1,7 +1,9 @@ #include "boost-xtime.hpp" -#include #include +#include +#include +#include #include #include #include @@ -15,22 +17,22 @@ static const char* const* const luawt_WNavigationBar_make_args[] = {WNavigationB int luawt_WNavigationBar_make(lua_State* L) { int index = luawt_getSuitableArgsGroup(L, luawt_WNavigationBar_make_args); if (index == 0) { - WNavigationBar * result = new WNavigationBar(); + WNavigationBar * l_result = new WNavigationBar(); MyApplication* app = MyApplication::instance(); if (!app) { - delete result; + delete l_result; throw std::logic_error("No WApplication when creating WNavigationBar"); } - app->root()->addWidget(result); + app->root()->addWidget(l_result); - luawt_toLua(L, result); + luawt_toLua(L, l_result); return 1; } else if (index == 1) { Wt::WContainerWidget* parent = luawt_checkFromLua(L, 1); - WNavigationBar * result = new WNavigationBar(parent); - luawt_toLua(L, result); + WNavigationBar * l_result = new WNavigationBar(parent); + luawt_toLua(L, l_result); return 1; } else { @@ -63,28 +65,29 @@ int luawt_WNavigationBar_addSearch(lua_State* L) { } } -static const char* WNavigationBar_addWidget_args0[] = {luawt_typeToStr(), luawt_typeToStr(), NULL}; -static const char* WNavigationBar_addWidget_args1[] = {luawt_typeToStr(), luawt_typeToStr(), "int", NULL}; -static const char* const* const luawt_WNavigationBar_addWidget_args[] = {WNavigationBar_addWidget_args0, WNavigationBar_addWidget_args1, NULL}; +static const char* WNavigationBar_setTitle_args0[] = {luawt_typeToStr(), "char const *", NULL}; +static const char* WNavigationBar_setTitle_args1[] = {luawt_typeToStr(), "char const *", "char const *", NULL}; +static const char* const* const luawt_WNavigationBar_setTitle_args[] = {WNavigationBar_setTitle_args0, WNavigationBar_setTitle_args1, NULL}; -int luawt_WNavigationBar_addWidget(lua_State* L) { - int index = luawt_getSuitableArgsGroup(L, luawt_WNavigationBar_addWidget_args); +int luawt_WNavigationBar_setTitle(lua_State* L) { + int index = luawt_getSuitableArgsGroup(L, luawt_WNavigationBar_setTitle_args); WNavigationBar* self = luawt_checkFromLua(L, 1); if (index == 0) { - Wt::WWidget* widget = - luawt_checkFromLua(L, 2); - self->addWidget(widget); + char const * raw2 = lua_tostring(L, 2); + Wt::WString title = Wt::WString(raw2); + self->setTitle(title); return 0; } else if (index == 1) { - Wt::WWidget* widget = - luawt_checkFromLua(L, 2); - Wt::AlignmentFlag alignment = static_cast(lua_tointeger(L, 3)); - self->addWidget(widget, alignment); + char const * raw2 = lua_tostring(L, 2); + Wt::WString title = Wt::WString(raw2); + char const * raw3 = lua_tostring(L, 3); + Wt::WLink link = Wt::WLink(raw3); + self->setTitle(title, link); return 0; } else { - return luaL_error(L, "Wrong arguments for WNavigationBar.addWidget"); + return luaL_error(L, "Wrong arguments for WNavigationBar.setTitle"); } } @@ -138,6 +141,31 @@ int luawt_WNavigationBar_addFormField(lua_State* L) { } } +static const char* WNavigationBar_addWidget_args0[] = {luawt_typeToStr(), luawt_typeToStr(), NULL}; +static const char* WNavigationBar_addWidget_args1[] = {luawt_typeToStr(), luawt_typeToStr(), "int", NULL}; +static const char* const* const luawt_WNavigationBar_addWidget_args[] = {WNavigationBar_addWidget_args0, WNavigationBar_addWidget_args1, NULL}; + +int luawt_WNavigationBar_addWidget(lua_State* L) { + int index = luawt_getSuitableArgsGroup(L, luawt_WNavigationBar_addWidget_args); + WNavigationBar* self = luawt_checkFromLua(L, 1); + if (index == 0) { + Wt::WWidget* widget = + luawt_checkFromLua(L, 2); + self->addWidget(widget); + return 0; + + } else if (index == 1) { + Wt::WWidget* widget = + luawt_checkFromLua(L, 2); + Wt::AlignmentFlag alignment = static_cast(lua_tointeger(L, 3)); + self->addWidget(widget, alignment); + return 0; + + } else { + return luaL_error(L, "Wrong arguments for WNavigationBar.addWidget"); + } +} + static const char* WNavigationBar_setResponsive_args0[] = {luawt_typeToStr(), "bool", NULL}; static const char* const* const luawt_WNavigationBar_setResponsive_args[] = {WNavigationBar_setResponsive_args0, NULL}; @@ -176,6 +204,7 @@ ADD_SIGNAL(gestureChanged, WNavigationBar, Wt::WGestureEvent) ADD_SIGNAL(gestureEnded, WNavigationBar, Wt::WGestureEvent) static const luaL_Reg luawt_WNavigationBar_methods[] = { + METHOD(WNavigationBar, setTitle), METHOD(WNavigationBar, setResponsive), METHOD(WNavigationBar, addMenu), METHOD(WNavigationBar, addFormField), diff --git a/src/luawt/WOverlayLoadingIndicator.cpp b/src/luawt/WOverlayLoadingIndicator.cpp index 65c42e9..c001ef2 100644 --- a/src/luawt/WOverlayLoadingIndicator.cpp +++ b/src/luawt/WOverlayLoadingIndicator.cpp @@ -15,29 +15,29 @@ static const char* const* const luawt_WOverlayLoadingIndicator_make_args[] = {WO int luawt_WOverlayLoadingIndicator_make(lua_State* L) { int index = luawt_getSuitableArgsGroup(L, luawt_WOverlayLoadingIndicator_make_args); if (index == 0) { - WOverlayLoadingIndicator * result = new WOverlayLoadingIndicator(); + WOverlayLoadingIndicator * l_result = new WOverlayLoadingIndicator(); MyApplication* app = MyApplication::instance(); if (!app) { - delete result; + delete l_result; throw std::logic_error("No WApplication when creating WOverlayLoadingIndicator"); } - app->root()->addWidget(result); + app->root()->addWidget(l_result); - luawt_toLua(L, result); + luawt_toLua(L, l_result); return 1; } else if (index == 1) { char const * raw1 = lua_tostring(L, 1); Wt::WString styleClass = Wt::WString(raw1); - WOverlayLoadingIndicator * result = new WOverlayLoadingIndicator(styleClass); + WOverlayLoadingIndicator * l_result = new WOverlayLoadingIndicator(styleClass); MyApplication* app = MyApplication::instance(); if (!app) { - delete result; + delete l_result; throw std::logic_error("No WApplication when creating WOverlayLoadingIndicator"); } - app->root()->addWidget(result); + app->root()->addWidget(l_result); - luawt_toLua(L, result); + luawt_toLua(L, l_result); return 1; } else if (index == 2) { @@ -45,15 +45,15 @@ int luawt_WOverlayLoadingIndicator_make(lua_State* L) { Wt::WString styleClass = Wt::WString(raw1); char const * raw2 = lua_tostring(L, 2); Wt::WString backgroundStyleClass = Wt::WString(raw2); - WOverlayLoadingIndicator * result = new WOverlayLoadingIndicator(styleClass, backgroundStyleClass); + WOverlayLoadingIndicator * l_result = new WOverlayLoadingIndicator(styleClass, backgroundStyleClass); MyApplication* app = MyApplication::instance(); if (!app) { - delete result; + delete l_result; throw std::logic_error("No WApplication when creating WOverlayLoadingIndicator"); } - app->root()->addWidget(result); + app->root()->addWidget(l_result); - luawt_toLua(L, result); + luawt_toLua(L, l_result); return 1; } else if (index == 3) { @@ -63,15 +63,15 @@ int luawt_WOverlayLoadingIndicator_make(lua_State* L) { Wt::WString backgroundStyleClass = Wt::WString(raw2); char const * raw3 = lua_tostring(L, 3); Wt::WString textStyleClass = Wt::WString(raw3); - WOverlayLoadingIndicator * result = new WOverlayLoadingIndicator(styleClass, backgroundStyleClass, textStyleClass); + WOverlayLoadingIndicator * l_result = new WOverlayLoadingIndicator(styleClass, backgroundStyleClass, textStyleClass); MyApplication* app = MyApplication::instance(); if (!app) { - delete result; + delete l_result; throw std::logic_error("No WApplication when creating WOverlayLoadingIndicator"); } - app->root()->addWidget(result); + app->root()->addWidget(l_result); - luawt_toLua(L, result); + luawt_toLua(L, l_result); return 1; } else { @@ -86,8 +86,8 @@ int luawt_WOverlayLoadingIndicator_widget(lua_State* L) { int index = luawt_getSuitableArgsGroup(L, luawt_WOverlayLoadingIndicator_widget_args); WOverlayLoadingIndicator* self = luawt_checkFromLua(L, 1); if (index == 0) { - Wt::WWidget * result = self->widget(); - luawt_toLua(L, result); + Wt::WWidget * l_result = self->widget(); + luawt_toLua(L, l_result); return 1; } else { diff --git a/src/luawt/WPaintedWidget.cpp b/src/luawt/WPaintedWidget.cpp index 7e38f35..0cfea9c 100644 --- a/src/luawt/WPaintedWidget.cpp +++ b/src/luawt/WPaintedWidget.cpp @@ -1,5 +1,6 @@ #include "boost-xtime.hpp" +#include #include #include "globals.hpp" @@ -20,6 +21,46 @@ int luawt_WPaintedWidget_setPreferredMethod(lua_State* L) { } } +static const char* WPaintedWidget_update_args0[] = {luawt_typeToStr(), NULL}; +static const char* WPaintedWidget_update_args1[] = {luawt_typeToStr(), "int", NULL}; +static const char* const* const luawt_WPaintedWidget_update_args[] = {WPaintedWidget_update_args0, WPaintedWidget_update_args1, NULL}; + +int luawt_WPaintedWidget_update(lua_State* L) { + int index = luawt_getSuitableArgsGroup(L, luawt_WPaintedWidget_update_args); + WPaintedWidget* self = luawt_checkFromLua(L, 1); + if (index == 0) { + self->update(); + return 0; + + } else if (index == 1) { + Wt::WFlags flags = static_cast(lua_tointeger(L, 2)); + self->update(flags); + return 0; + + } else { + return luaL_error(L, "Wrong arguments for WPaintedWidget.update"); + } +} + +static const char* WPaintedWidget_resize_args0[] = {luawt_typeToStr(), "double", "double", NULL}; +static const char* const* const luawt_WPaintedWidget_resize_args[] = {WPaintedWidget_resize_args0, NULL}; + +int luawt_WPaintedWidget_resize(lua_State* L) { + int index = luawt_getSuitableArgsGroup(L, luawt_WPaintedWidget_resize_args); + WPaintedWidget* self = luawt_checkFromLua(L, 1); + if (index == 0) { + double raw2 = lua_tonumber(L, 2); + Wt::WLength width = Wt::WLength(raw2); + double raw3 = lua_tonumber(L, 3); + Wt::WLength height = Wt::WLength(raw3); + self->resize(width, height); + return 0; + + } else { + return luaL_error(L, "Wrong arguments for WPaintedWidget.resize"); + } +} + static const char* WPaintedWidget_preferredMethod_args0[] = {luawt_typeToStr(), NULL}; static const char* const* const luawt_WPaintedWidget_preferredMethod_args[] = {WPaintedWidget_preferredMethod_args0, NULL}; @@ -27,8 +68,8 @@ int luawt_WPaintedWidget_preferredMethod(lua_State* L) { int index = luawt_getSuitableArgsGroup(L, luawt_WPaintedWidget_preferredMethod_args); WPaintedWidget* self = luawt_checkFromLua(L, 1); if (index == 0) { - Wt::WPaintedWidget::Method result = self->preferredMethod(); - lua_pushinteger(L, result); + Wt::WPaintedWidget::Method l_result = self->preferredMethod(); + lua_pushinteger(L, l_result); return 1; } else { @@ -60,6 +101,8 @@ ADD_SIGNAL(gestureEnded, WPaintedWidget, Wt::WGestureEvent) static const luaL_Reg luawt_WPaintedWidget_methods[] = { METHOD(WPaintedWidget, setPreferredMethod), METHOD(WPaintedWidget, preferredMethod), + METHOD(WPaintedWidget, update), + METHOD(WPaintedWidget, resize), METHOD(WPaintedWidget, keyWentDown), METHOD(WPaintedWidget, keyPressed), METHOD(WPaintedWidget, keyWentUp), diff --git a/src/luawt/WPanel.cpp b/src/luawt/WPanel.cpp index 278e979..3704b46 100644 --- a/src/luawt/WPanel.cpp +++ b/src/luawt/WPanel.cpp @@ -15,22 +15,22 @@ static const char* const* const luawt_WPanel_make_args[] = {WPanel_make_args0, W int luawt_WPanel_make(lua_State* L) { int index = luawt_getSuitableArgsGroup(L, luawt_WPanel_make_args); if (index == 0) { - WPanel * result = new WPanel(); + WPanel * l_result = new WPanel(); MyApplication* app = MyApplication::instance(); if (!app) { - delete result; + delete l_result; throw std::logic_error("No WApplication when creating WPanel"); } - app->root()->addWidget(result); + app->root()->addWidget(l_result); - luawt_toLua(L, result); + luawt_toLua(L, l_result); return 1; } else if (index == 1) { Wt::WContainerWidget* parent = luawt_checkFromLua(L, 1); - WPanel * result = new WPanel(parent); - luawt_toLua(L, result); + WPanel * l_result = new WPanel(parent); + luawt_toLua(L, l_result); return 1; } else { @@ -45,8 +45,8 @@ int luawt_WPanel_isCollapsed(lua_State* L) { int index = luawt_getSuitableArgsGroup(L, luawt_WPanel_isCollapsed_args); WPanel* self = luawt_checkFromLua(L, 1); if (index == 0) { - bool result = self->isCollapsed(); - lua_pushboolean(L, result); + bool l_result = self->isCollapsed(); + lua_pushboolean(L, l_result); return 1; } else { @@ -109,8 +109,8 @@ int luawt_WPanel_title(lua_State* L) { int index = luawt_getSuitableArgsGroup(L, luawt_WPanel_title_args); WPanel* self = luawt_checkFromLua(L, 1); if (index == 0) { - Wt::WString result = self->title(); - lua_pushstring(L, result.toUTF8().c_str()); + Wt::WString l_result = self->title(); + lua_pushstring(L, l_result.toUTF8().c_str()); return 1; } else { @@ -142,8 +142,8 @@ int luawt_WPanel_collapseIcon(lua_State* L) { int index = luawt_getSuitableArgsGroup(L, luawt_WPanel_collapseIcon_args); WPanel* self = luawt_checkFromLua(L, 1); if (index == 0) { - Wt::WIconPair * result = self->collapseIcon(); - luawt_toLua(L, result); + Wt::WIconPair * l_result = self->collapseIcon(); + luawt_toLua(L, l_result); return 1; } else { @@ -158,8 +158,8 @@ int luawt_WPanel_isCollapsible(lua_State* L) { int index = luawt_getSuitableArgsGroup(L, luawt_WPanel_isCollapsible_args); WPanel* self = luawt_checkFromLua(L, 1); if (index == 0) { - bool result = self->isCollapsible(); - lua_pushboolean(L, result); + bool l_result = self->isCollapsible(); + lua_pushboolean(L, l_result); return 1; } else { @@ -174,8 +174,8 @@ int luawt_WPanel_titleBarWidget(lua_State* L) { int index = luawt_getSuitableArgsGroup(L, luawt_WPanel_titleBarWidget_args); WPanel* self = luawt_checkFromLua(L, 1); if (index == 0) { - Wt::WContainerWidget * result = self->titleBarWidget(); - luawt_toLua(L, result); + Wt::WContainerWidget * l_result = self->titleBarWidget(); + luawt_toLua(L, l_result); return 1; } else { @@ -205,8 +205,8 @@ int luawt_WPanel_centralWidget(lua_State* L) { int index = luawt_getSuitableArgsGroup(L, luawt_WPanel_centralWidget_args); WPanel* self = luawt_checkFromLua(L, 1); if (index == 0) { - Wt::WWidget * result = self->centralWidget(); - luawt_toLua(L, result); + Wt::WWidget * l_result = self->centralWidget(); + luawt_toLua(L, l_result); return 1; } else { @@ -237,8 +237,8 @@ int luawt_WPanel_titleBar(lua_State* L) { int index = luawt_getSuitableArgsGroup(L, luawt_WPanel_titleBar_args); WPanel* self = luawt_checkFromLua(L, 1); if (index == 0) { - bool result = self->titleBar(); - lua_pushboolean(L, result); + bool l_result = self->titleBar(); + lua_pushboolean(L, l_result); return 1; } else { diff --git a/src/luawt/WPopupMenu.cpp b/src/luawt/WPopupMenu.cpp index 69c59a7..1abe167 100644 --- a/src/luawt/WPopupMenu.cpp +++ b/src/luawt/WPopupMenu.cpp @@ -1,10 +1,11 @@ #include "boost-xtime.hpp" +#include +#include +#include #include #include -#include #include -#include #include "globals.hpp" @@ -15,29 +16,29 @@ static const char* const* const luawt_WPopupMenu_make_args[] = {WPopupMenu_make_ int luawt_WPopupMenu_make(lua_State* L) { int index = luawt_getSuitableArgsGroup(L, luawt_WPopupMenu_make_args); if (index == 0) { - WPopupMenu * result = new WPopupMenu(); + WPopupMenu * l_result = new WPopupMenu(); MyApplication* app = MyApplication::instance(); if (!app) { - delete result; + delete l_result; throw std::logic_error("No WApplication when creating WPopupMenu"); } - app->root()->addWidget(result); + app->root()->addWidget(l_result); - luawt_toLua(L, result); + luawt_toLua(L, l_result); return 1; } else if (index == 1) { Wt::WStackedWidget* contentsStack = luawt_checkFromLua(L, 1); - WPopupMenu * result = new WPopupMenu(contentsStack); + WPopupMenu * l_result = new WPopupMenu(contentsStack); MyApplication* app = MyApplication::instance(); if (!app) { - delete result; + delete l_result; throw std::logic_error("No WApplication when creating WPopupMenu"); } - app->root()->addWidget(result); + app->root()->addWidget(l_result); - luawt_toLua(L, result); + luawt_toLua(L, l_result); return 1; } else { @@ -45,22 +46,6 @@ int luawt_WPopupMenu_make(lua_State* L) { } } -static const char* WPopupMenu_result_args0[] = {luawt_typeToStr(), NULL}; -static const char* const* const luawt_WPopupMenu_result_args[] = {WPopupMenu_result_args0, NULL}; - -int luawt_WPopupMenu_result(lua_State* L) { - int index = luawt_getSuitableArgsGroup(L, luawt_WPopupMenu_result_args); - WPopupMenu* self = luawt_checkFromLua(L, 1); - if (index == 0) { - Wt::WMenuItem * result = self->result(); - luawt_toLua(L, result); - return 1; - - } else { - return luaL_error(L, "Wrong arguments for WPopupMenu.result"); - } -} - static const char* WPopupMenu_popup_args0[] = {luawt_typeToStr(), luawt_typeToStr(), NULL}; static const char* WPopupMenu_popup_args1[] = {luawt_typeToStr(), luawt_typeToStr(), "int", NULL}; static const char* const* const luawt_WPopupMenu_popup_args[] = {WPopupMenu_popup_args0, WPopupMenu_popup_args1, NULL}; @@ -103,6 +88,68 @@ int luawt_WPopupMenu_setButton(lua_State* L) { } } +static const char* WPopupMenu_exec_args0[] = {luawt_typeToStr(), luawt_typeToStr(), NULL}; +static const char* WPopupMenu_exec_args1[] = {luawt_typeToStr(), luawt_typeToStr(), "int", NULL}; +static const char* const* const luawt_WPopupMenu_exec_args[] = {WPopupMenu_exec_args0, WPopupMenu_exec_args1, NULL}; + +int luawt_WPopupMenu_exec(lua_State* L) { + int index = luawt_getSuitableArgsGroup(L, luawt_WPopupMenu_exec_args); + WPopupMenu* self = luawt_checkFromLua(L, 1); + if (index == 0) { + Wt::WWidget* location = + luawt_checkFromLua(L, 2); + Wt::WMenuItem * l_result = self->exec(location); + luawt_toLua(L, l_result); + return 1; + + } else if (index == 1) { + Wt::WWidget* location = + luawt_checkFromLua(L, 2); + Wt::Orientation orientation = static_cast(lua_tointeger(L, 3)); + Wt::WMenuItem * l_result = self->exec(location, orientation); + luawt_toLua(L, l_result); + return 1; + + } else { + return luaL_error(L, "Wrong arguments for WPopupMenu.exec"); + } +} + +static const char* WPopupMenu_setMinimumSize_args0[] = {luawt_typeToStr(), "double", "double", NULL}; +static const char* const* const luawt_WPopupMenu_setMinimumSize_args[] = {WPopupMenu_setMinimumSize_args0, NULL}; + +int luawt_WPopupMenu_setMinimumSize(lua_State* L) { + int index = luawt_getSuitableArgsGroup(L, luawt_WPopupMenu_setMinimumSize_args); + WPopupMenu* self = luawt_checkFromLua(L, 1); + if (index == 0) { + double raw2 = lua_tonumber(L, 2); + Wt::WLength width = Wt::WLength(raw2); + double raw3 = lua_tonumber(L, 3); + Wt::WLength height = Wt::WLength(raw3); + self->setMinimumSize(width, height); + return 0; + + } else { + return luaL_error(L, "Wrong arguments for WPopupMenu.setMinimumSize"); + } +} + +static const char* WPopupMenu_result_args0[] = {luawt_typeToStr(), NULL}; +static const char* const* const luawt_WPopupMenu_result_args[] = {WPopupMenu_result_args0, NULL}; + +int luawt_WPopupMenu_result(lua_State* L) { + int index = luawt_getSuitableArgsGroup(L, luawt_WPopupMenu_result_args); + WPopupMenu* self = luawt_checkFromLua(L, 1); + if (index == 0) { + Wt::WMenuItem * l_result = self->result(); + luawt_toLua(L, l_result); + return 1; + + } else { + return luaL_error(L, "Wrong arguments for WPopupMenu.result"); + } +} + static const char* WPopupMenu_setAutoHide_args0[] = {luawt_typeToStr(), "bool", NULL}; static const char* WPopupMenu_setAutoHide_args1[] = {luawt_typeToStr(), "bool", "int", NULL}; static const char* const* const luawt_WPopupMenu_setAutoHide_args[] = {WPopupMenu_setAutoHide_args0, WPopupMenu_setAutoHide_args1, NULL}; @@ -126,30 +173,22 @@ int luawt_WPopupMenu_setAutoHide(lua_State* L) { } } -static const char* WPopupMenu_exec_args0[] = {luawt_typeToStr(), luawt_typeToStr(), NULL}; -static const char* WPopupMenu_exec_args1[] = {luawt_typeToStr(), luawt_typeToStr(), "int", NULL}; -static const char* const* const luawt_WPopupMenu_exec_args[] = {WPopupMenu_exec_args0, WPopupMenu_exec_args1, NULL}; +static const char* WPopupMenu_setMaximumSize_args0[] = {luawt_typeToStr(), "double", "double", NULL}; +static const char* const* const luawt_WPopupMenu_setMaximumSize_args[] = {WPopupMenu_setMaximumSize_args0, NULL}; -int luawt_WPopupMenu_exec(lua_State* L) { - int index = luawt_getSuitableArgsGroup(L, luawt_WPopupMenu_exec_args); +int luawt_WPopupMenu_setMaximumSize(lua_State* L) { + int index = luawt_getSuitableArgsGroup(L, luawt_WPopupMenu_setMaximumSize_args); WPopupMenu* self = luawt_checkFromLua(L, 1); if (index == 0) { - Wt::WWidget* location = - luawt_checkFromLua(L, 2); - Wt::WMenuItem * result = self->exec(location); - luawt_toLua(L, result); - return 1; - - } else if (index == 1) { - Wt::WWidget* location = - luawt_checkFromLua(L, 2); - Wt::Orientation orientation = static_cast(lua_tointeger(L, 3)); - Wt::WMenuItem * result = self->exec(location, orientation); - luawt_toLua(L, result); - return 1; - + double raw2 = lua_tonumber(L, 2); + Wt::WLength width = Wt::WLength(raw2); + double raw3 = lua_tonumber(L, 3); + Wt::WLength height = Wt::WLength(raw3); + self->setMaximumSize(width, height); + return 0; + } else { - return luaL_error(L, "Wrong arguments for WPopupMenu.exec"); + return luaL_error(L, "Wrong arguments for WPopupMenu.setMaximumSize"); } } @@ -159,6 +198,8 @@ static const luaL_Reg luawt_WPopupMenu_methods[] = { METHOD(WPopupMenu, popup), METHOD(WPopupMenu, exec), METHOD(WPopupMenu, result), + METHOD(WPopupMenu, setMaximumSize), + METHOD(WPopupMenu, setMinimumSize), METHOD(WPopupMenu, setAutoHide), {NULL, NULL}, }; diff --git a/src/luawt/WPopupWidget.cpp b/src/luawt/WPopupWidget.cpp new file mode 100644 index 0000000..804b435 --- /dev/null +++ b/src/luawt/WPopupWidget.cpp @@ -0,0 +1,142 @@ +#include "boost-xtime.hpp" + +#include +#include + +#include "globals.hpp" + +static const char* WPopupWidget_orientation_args0[] = {luawt_typeToStr(), NULL}; +static const char* const* const luawt_WPopupWidget_orientation_args[] = {WPopupWidget_orientation_args0, NULL}; + +int luawt_WPopupWidget_orientation(lua_State* L) { + int index = luawt_getSuitableArgsGroup(L, luawt_WPopupWidget_orientation_args); + WPopupWidget* self = luawt_checkFromLua(L, 1); + if (index == 0) { + Wt::Orientation l_result = self->orientation(); + lua_pushinteger(L, l_result); + return 1; + + } else { + return luaL_error(L, "Wrong arguments for WPopupWidget.orientation"); + } +} + +static const char* WPopupWidget_isTransient_args0[] = {luawt_typeToStr(), NULL}; +static const char* const* const luawt_WPopupWidget_isTransient_args[] = {WPopupWidget_isTransient_args0, NULL}; + +int luawt_WPopupWidget_isTransient(lua_State* L) { + int index = luawt_getSuitableArgsGroup(L, luawt_WPopupWidget_isTransient_args); + WPopupWidget* self = luawt_checkFromLua(L, 1); + if (index == 0) { + bool l_result = self->isTransient(); + lua_pushboolean(L, l_result); + return 1; + + } else { + return luaL_error(L, "Wrong arguments for WPopupWidget.isTransient"); + } +} + +static const char* WPopupWidget_autoHideDelay_args0[] = {luawt_typeToStr(), NULL}; +static const char* const* const luawt_WPopupWidget_autoHideDelay_args[] = {WPopupWidget_autoHideDelay_args0, NULL}; + +int luawt_WPopupWidget_autoHideDelay(lua_State* L) { + int index = luawt_getSuitableArgsGroup(L, luawt_WPopupWidget_autoHideDelay_args); + WPopupWidget* self = luawt_checkFromLua(L, 1); + if (index == 0) { + int l_result = self->autoHideDelay(); + lua_pushinteger(L, l_result); + return 1; + + } else { + return luaL_error(L, "Wrong arguments for WPopupWidget.autoHideDelay"); + } +} + +static const char* WPopupWidget_setTransient_args0[] = {luawt_typeToStr(), "bool", NULL}; +static const char* WPopupWidget_setTransient_args1[] = {luawt_typeToStr(), "bool", "int", NULL}; +static const char* const* const luawt_WPopupWidget_setTransient_args[] = {WPopupWidget_setTransient_args0, WPopupWidget_setTransient_args1, NULL}; + +int luawt_WPopupWidget_setTransient(lua_State* L) { + int index = luawt_getSuitableArgsGroup(L, luawt_WPopupWidget_setTransient_args); + WPopupWidget* self = luawt_checkFromLua(L, 1); + if (index == 0) { + bool transient = lua_toboolean(L, 2); + self->setTransient(transient); + return 0; + + } else if (index == 1) { + bool transient = lua_toboolean(L, 2); + int autoHideDelay = lua_tointeger(L, 3); + self->setTransient(transient, autoHideDelay); + return 0; + + } else { + return luaL_error(L, "Wrong arguments for WPopupWidget.setTransient"); + } +} + +static const char* WPopupWidget_setAnchorWidget_args0[] = {luawt_typeToStr(), luawt_typeToStr(), NULL}; +static const char* WPopupWidget_setAnchorWidget_args1[] = {luawt_typeToStr(), luawt_typeToStr(), "int", NULL}; +static const char* const* const luawt_WPopupWidget_setAnchorWidget_args[] = {WPopupWidget_setAnchorWidget_args0, WPopupWidget_setAnchorWidget_args1, NULL}; + +int luawt_WPopupWidget_setAnchorWidget(lua_State* L) { + int index = luawt_getSuitableArgsGroup(L, luawt_WPopupWidget_setAnchorWidget_args); + WPopupWidget* self = luawt_checkFromLua(L, 1); + if (index == 0) { + Wt::WWidget* widget = + luawt_checkFromLua(L, 2); + self->setAnchorWidget(widget); + return 0; + + } else if (index == 1) { + Wt::WWidget* widget = + luawt_checkFromLua(L, 2); + Wt::Orientation orientation = static_cast(lua_tointeger(L, 3)); + self->setAnchorWidget(widget, orientation); + return 0; + + } else { + return luaL_error(L, "Wrong arguments for WPopupWidget.setAnchorWidget"); + } +} + +static const char* WPopupWidget_anchorWidget_args0[] = {luawt_typeToStr(), NULL}; +static const char* const* const luawt_WPopupWidget_anchorWidget_args[] = {WPopupWidget_anchorWidget_args0, NULL}; + +int luawt_WPopupWidget_anchorWidget(lua_State* L) { + int index = luawt_getSuitableArgsGroup(L, luawt_WPopupWidget_anchorWidget_args); + WPopupWidget* self = luawt_checkFromLua(L, 1); + if (index == 0) { + Wt::WWidget * l_result = self->anchorWidget(); + luawt_toLua(L, l_result); + return 1; + + } else { + return luaL_error(L, "Wrong arguments for WPopupWidget.anchorWidget"); + } +} + + +static const luaL_Reg luawt_WPopupWidget_methods[] = { + METHOD(WPopupWidget, setAnchorWidget), + METHOD(WPopupWidget, anchorWidget), + METHOD(WPopupWidget, orientation), + METHOD(WPopupWidget, setTransient), + METHOD(WPopupWidget, isTransient), + METHOD(WPopupWidget, autoHideDelay), + {NULL, NULL}, +}; + +void luawt_WPopupWidget(lua_State* L) { + const char* base = luawt_typeToStr(); + assert(base); + DECLARE_CLASS( + WPopupWidget, + L, + 0, + 0, + luawt_WPopupWidget_methods, + base + ); +} diff --git a/src/luawt/WProgressBar.cpp b/src/luawt/WProgressBar.cpp index ddee55c..566a340 100644 --- a/src/luawt/WProgressBar.cpp +++ b/src/luawt/WProgressBar.cpp @@ -1,5 +1,6 @@ #include "boost-xtime.hpp" +#include #include #include #include @@ -13,22 +14,22 @@ static const char* const* const luawt_WProgressBar_make_args[] = {WProgressBar_m int luawt_WProgressBar_make(lua_State* L) { int index = luawt_getSuitableArgsGroup(L, luawt_WProgressBar_make_args); if (index == 0) { - WProgressBar * result = new WProgressBar(); + WProgressBar * l_result = new WProgressBar(); MyApplication* app = MyApplication::instance(); if (!app) { - delete result; + delete l_result; throw std::logic_error("No WApplication when creating WProgressBar"); } - app->root()->addWidget(result); + app->root()->addWidget(l_result); - luawt_toLua(L, result); + luawt_toLua(L, l_result); return 1; } else if (index == 1) { Wt::WContainerWidget* parent = luawt_checkFromLua(L, 1); - WProgressBar * result = new WProgressBar(parent); - luawt_toLua(L, result); + WProgressBar * l_result = new WProgressBar(parent); + luawt_toLua(L, l_result); return 1; } else { @@ -92,8 +93,8 @@ int luawt_WProgressBar_format(lua_State* L) { int index = luawt_getSuitableArgsGroup(L, luawt_WProgressBar_format_args); WProgressBar* self = luawt_checkFromLua(L, 1); if (index == 0) { - Wt::WString const & result = self->format(); - lua_pushstring(L, result.toUTF8().c_str()); + Wt::WString const & l_result = self->format(); + lua_pushstring(L, l_result.toUTF8().c_str()); return 1; } else { @@ -125,8 +126,8 @@ int luawt_WProgressBar_text(lua_State* L) { int index = luawt_getSuitableArgsGroup(L, luawt_WProgressBar_text_args); WProgressBar* self = luawt_checkFromLua(L, 1); if (index == 0) { - Wt::WString result = self->text(); - lua_pushstring(L, result.toUTF8().c_str()); + Wt::WString l_result = self->text(); + lua_pushstring(L, l_result.toUTF8().c_str()); return 1; } else { @@ -141,8 +142,8 @@ int luawt_WProgressBar_maximum(lua_State* L) { int index = luawt_getSuitableArgsGroup(L, luawt_WProgressBar_maximum_args); WProgressBar* self = luawt_checkFromLua(L, 1); if (index == 0) { - double result = self->maximum(); - lua_pushnumber(L, result); + double l_result = self->maximum(); + lua_pushnumber(L, l_result); return 1; } else { @@ -157,8 +158,8 @@ int luawt_WProgressBar_value(lua_State* L) { int index = luawt_getSuitableArgsGroup(L, luawt_WProgressBar_value_args); WProgressBar* self = luawt_checkFromLua(L, 1); if (index == 0) { - double result = self->value(); - lua_pushnumber(L, result); + double l_result = self->value(); + lua_pushnumber(L, l_result); return 1; } else { @@ -173,8 +174,8 @@ int luawt_WProgressBar_minimum(lua_State* L) { int index = luawt_getSuitableArgsGroup(L, luawt_WProgressBar_minimum_args); WProgressBar* self = luawt_checkFromLua(L, 1); if (index == 0) { - double result = self->minimum(); - lua_pushnumber(L, result); + double l_result = self->minimum(); + lua_pushnumber(L, l_result); return 1; } else { @@ -182,6 +183,25 @@ int luawt_WProgressBar_minimum(lua_State* L) { } } +static const char* WProgressBar_resize_args0[] = {luawt_typeToStr(), "double", "double", NULL}; +static const char* const* const luawt_WProgressBar_resize_args[] = {WProgressBar_resize_args0, NULL}; + +int luawt_WProgressBar_resize(lua_State* L) { + int index = luawt_getSuitableArgsGroup(L, luawt_WProgressBar_resize_args); + WProgressBar* self = luawt_checkFromLua(L, 1); + if (index == 0) { + double raw2 = lua_tonumber(L, 2); + Wt::WLength width = Wt::WLength(raw2); + double raw3 = lua_tonumber(L, 3); + Wt::WLength height = Wt::WLength(raw3); + self->resize(width, height); + return 0; + + } else { + return luaL_error(L, "Wrong arguments for WProgressBar.resize"); + } +} + static const char* WProgressBar_setState_args0[] = {luawt_typeToStr(), "double", "double", "double", NULL}; static const char* const* const luawt_WProgressBar_setState_args[] = {WProgressBar_setState_args0, NULL}; @@ -265,6 +285,7 @@ static const luaL_Reg luawt_WProgressBar_methods[] = { METHOD(WProgressBar, setFormat), METHOD(WProgressBar, format), METHOD(WProgressBar, text), + METHOD(WProgressBar, resize), METHOD(WProgressBar, setValueStyleClass), METHOD(WProgressBar, setState), METHOD(WProgressBar, keyWentDown), diff --git a/src/luawt/WPushButton.cpp b/src/luawt/WPushButton.cpp index c8bde3e..6409d5f 100644 --- a/src/luawt/WPushButton.cpp +++ b/src/luawt/WPushButton.cpp @@ -3,6 +3,7 @@ #include #include #include +#include #include #include "globals.hpp" @@ -16,36 +17,36 @@ static const char* const* const luawt_WPushButton_make_args[] = {WPushButton_mak int luawt_WPushButton_make(lua_State* L) { int index = luawt_getSuitableArgsGroup(L, luawt_WPushButton_make_args); if (index == 0) { - WPushButton * result = new WPushButton(); + WPushButton * l_result = new WPushButton(); MyApplication* app = MyApplication::instance(); if (!app) { - delete result; + delete l_result; throw std::logic_error("No WApplication when creating WPushButton"); } - app->root()->addWidget(result); + app->root()->addWidget(l_result); - luawt_toLua(L, result); + luawt_toLua(L, l_result); return 1; } else if (index == 1) { Wt::WContainerWidget* parent = luawt_checkFromLua(L, 1); - WPushButton * result = new WPushButton(parent); - luawt_toLua(L, result); + WPushButton * l_result = new WPushButton(parent); + luawt_toLua(L, l_result); return 1; } else if (index == 2) { char const * raw1 = lua_tostring(L, 1); Wt::WString text = Wt::WString(raw1); - WPushButton * result = new WPushButton(text); + WPushButton * l_result = new WPushButton(text); MyApplication* app = MyApplication::instance(); if (!app) { - delete result; + delete l_result; throw std::logic_error("No WApplication when creating WPushButton"); } - app->root()->addWidget(result); + app->root()->addWidget(l_result); - luawt_toLua(L, result); + luawt_toLua(L, l_result); return 1; } else if (index == 3) { @@ -53,8 +54,8 @@ int luawt_WPushButton_make(lua_State* L) { Wt::WString text = Wt::WString(raw1); Wt::WContainerWidget* parent = luawt_checkFromLua(L, 2); - WPushButton * result = new WPushButton(text, parent); - luawt_toLua(L, result); + WPushButton * l_result = new WPushButton(text, parent); + luawt_toLua(L, l_result); return 1; } else { @@ -62,138 +63,138 @@ int luawt_WPushButton_make(lua_State* L) { } } -static const char* WPushButton_refresh_args0[] = {luawt_typeToStr(), NULL}; -static const char* const* const luawt_WPushButton_refresh_args[] = {WPushButton_refresh_args0, NULL}; +static const char* WPushButton_setChecked_args0[] = {luawt_typeToStr(), "bool", NULL}; +static const char* WPushButton_setChecked_args1[] = {luawt_typeToStr(), NULL}; +static const char* const* const luawt_WPushButton_setChecked_args[] = {WPushButton_setChecked_args0, WPushButton_setChecked_args1, NULL}; -int luawt_WPushButton_refresh(lua_State* L) { - int index = luawt_getSuitableArgsGroup(L, luawt_WPushButton_refresh_args); +int luawt_WPushButton_setChecked(lua_State* L) { + int index = luawt_getSuitableArgsGroup(L, luawt_WPushButton_setChecked_args); WPushButton* self = luawt_checkFromLua(L, 1); if (index == 0) { - self->refresh(); + bool checked = lua_toboolean(L, 2); + self->setChecked(checked); + return 0; + + } else if (index == 1) { + self->setChecked(); return 0; } else { - return luaL_error(L, "Wrong arguments for WPushButton.refresh"); + return luaL_error(L, "Wrong arguments for WPushButton.setChecked"); } } -static const char* WPushButton_ref_args0[] = {luawt_typeToStr(), NULL}; -static const char* const* const luawt_WPushButton_ref_args[] = {WPushButton_ref_args0, NULL}; +static const char* WPushButton_setMenu_args0[] = {luawt_typeToStr(), luawt_typeToStr(), NULL}; +static const char* const* const luawt_WPushButton_setMenu_args[] = {WPushButton_setMenu_args0, NULL}; -int luawt_WPushButton_ref(lua_State* L) { - int index = luawt_getSuitableArgsGroup(L, luawt_WPushButton_ref_args); +int luawt_WPushButton_setMenu(lua_State* L) { + int index = luawt_getSuitableArgsGroup(L, luawt_WPushButton_setMenu_args); WPushButton* self = luawt_checkFromLua(L, 1); if (index == 0) { - std::string result = self->ref(); - lua_pushstring(L, result.c_str()); - return 1; - + Wt::WPopupMenu* menu = + luawt_checkFromLua(L, 2); + self->setMenu(menu); + return 0; + } else { - return luaL_error(L, "Wrong arguments for WPushButton.ref"); + return luaL_error(L, "Wrong arguments for WPushButton.setMenu"); } } -static const char* WPushButton_setDefault_args0[] = {luawt_typeToStr(), "bool", NULL}; -static const char* const* const luawt_WPushButton_setDefault_args[] = {WPushButton_setDefault_args0, NULL}; +static const char* WPushButton_isCheckable_args0[] = {luawt_typeToStr(), NULL}; +static const char* const* const luawt_WPushButton_isCheckable_args[] = {WPushButton_isCheckable_args0, NULL}; -int luawt_WPushButton_setDefault(lua_State* L) { - int index = luawt_getSuitableArgsGroup(L, luawt_WPushButton_setDefault_args); +int luawt_WPushButton_isCheckable(lua_State* L) { + int index = luawt_getSuitableArgsGroup(L, luawt_WPushButton_isCheckable_args); WPushButton* self = luawt_checkFromLua(L, 1); if (index == 0) { - bool enabled = lua_toboolean(L, 2); - self->setDefault(enabled); - return 0; - + bool l_result = self->isCheckable(); + lua_pushboolean(L, l_result); + return 1; + } else { - return luaL_error(L, "Wrong arguments for WPushButton.setDefault"); + return luaL_error(L, "Wrong arguments for WPushButton.isCheckable"); } } -static const char* WPushButton_setChecked_args0[] = {luawt_typeToStr(), "bool", NULL}; -static const char* WPushButton_setChecked_args1[] = {luawt_typeToStr(), NULL}; -static const char* const* const luawt_WPushButton_setChecked_args[] = {WPushButton_setChecked_args0, WPushButton_setChecked_args1, NULL}; +static const char* WPushButton_setUnChecked_args0[] = {luawt_typeToStr(), NULL}; +static const char* const* const luawt_WPushButton_setUnChecked_args[] = {WPushButton_setUnChecked_args0, NULL}; -int luawt_WPushButton_setChecked(lua_State* L) { - int index = luawt_getSuitableArgsGroup(L, luawt_WPushButton_setChecked_args); +int luawt_WPushButton_setUnChecked(lua_State* L) { + int index = luawt_getSuitableArgsGroup(L, luawt_WPushButton_setUnChecked_args); WPushButton* self = luawt_checkFromLua(L, 1); if (index == 0) { - bool checked = lua_toboolean(L, 2); - self->setChecked(checked); - return 0; - - } else if (index == 1) { - self->setChecked(); + self->setUnChecked(); return 0; } else { - return luaL_error(L, "Wrong arguments for WPushButton.setChecked"); + return luaL_error(L, "Wrong arguments for WPushButton.setUnChecked"); } } -static const char* WPushButton_setText_args0[] = {luawt_typeToStr(), "char const *", NULL}; -static const char* const* const luawt_WPushButton_setText_args[] = {WPushButton_setText_args0, NULL}; +static const char* WPushButton_setRef_args0[] = {luawt_typeToStr(), "char const *", NULL}; +static const char* const* const luawt_WPushButton_setRef_args[] = {WPushButton_setRef_args0, NULL}; -int luawt_WPushButton_setText(lua_State* L) { - int index = luawt_getSuitableArgsGroup(L, luawt_WPushButton_setText_args); +int luawt_WPushButton_setRef(lua_State* L) { + int index = luawt_getSuitableArgsGroup(L, luawt_WPushButton_setRef_args); WPushButton* self = luawt_checkFromLua(L, 1); if (index == 0) { char const * raw2 = lua_tostring(L, 2); - Wt::WString text = Wt::WString(raw2); - bool result = self->setText(text); - lua_pushboolean(L, result); - return 1; - + std::string url = std::string(raw2); + self->setRef(url); + return 0; + } else { - return luaL_error(L, "Wrong arguments for WPushButton.setText"); + return luaL_error(L, "Wrong arguments for WPushButton.setRef"); } } -static const char* WPushButton_menu_args0[] = {luawt_typeToStr(), NULL}; -static const char* const* const luawt_WPushButton_menu_args[] = {WPushButton_menu_args0, NULL}; +static const char* WPushButton_setTextFormat_args0[] = {luawt_typeToStr(), "int", NULL}; +static const char* const* const luawt_WPushButton_setTextFormat_args[] = {WPushButton_setTextFormat_args0, NULL}; -int luawt_WPushButton_menu(lua_State* L) { - int index = luawt_getSuitableArgsGroup(L, luawt_WPushButton_menu_args); +int luawt_WPushButton_setTextFormat(lua_State* L) { + int index = luawt_getSuitableArgsGroup(L, luawt_WPushButton_setTextFormat_args); WPushButton* self = luawt_checkFromLua(L, 1); if (index == 0) { - Wt::WPopupMenu * result = self->menu(); - luawt_toLua(L, result); + Wt::TextFormat format = static_cast(lua_tointeger(L, 2)); + bool l_result = self->setTextFormat(format); + lua_pushboolean(L, l_result); return 1; } else { - return luaL_error(L, "Wrong arguments for WPushButton.menu"); + return luaL_error(L, "Wrong arguments for WPushButton.setTextFormat"); } } -static const char* WPushButton_linkTarget_args0[] = {luawt_typeToStr(), NULL}; -static const char* const* const luawt_WPushButton_linkTarget_args[] = {WPushButton_linkTarget_args0, NULL}; +static const char* WPushButton_valueText_args0[] = {luawt_typeToStr(), NULL}; +static const char* const* const luawt_WPushButton_valueText_args[] = {WPushButton_valueText_args0, NULL}; -int luawt_WPushButton_linkTarget(lua_State* L) { - int index = luawt_getSuitableArgsGroup(L, luawt_WPushButton_linkTarget_args); +int luawt_WPushButton_valueText(lua_State* L) { + int index = luawt_getSuitableArgsGroup(L, luawt_WPushButton_valueText_args); WPushButton* self = luawt_checkFromLua(L, 1); if (index == 0) { - Wt::AnchorTarget result = self->linkTarget(); - lua_pushinteger(L, result); + Wt::WString l_result = self->valueText(); + lua_pushstring(L, l_result.toUTF8().c_str()); return 1; } else { - return luaL_error(L, "Wrong arguments for WPushButton.linkTarget"); + return luaL_error(L, "Wrong arguments for WPushButton.valueText"); } } -static const char* WPushButton_setMenu_args0[] = {luawt_typeToStr(), luawt_typeToStr(), NULL}; -static const char* const* const luawt_WPushButton_setMenu_args[] = {WPushButton_setMenu_args0, NULL}; +static const char* WPushButton_menu_args0[] = {luawt_typeToStr(), NULL}; +static const char* const* const luawt_WPushButton_menu_args[] = {WPushButton_menu_args0, NULL}; -int luawt_WPushButton_setMenu(lua_State* L) { - int index = luawt_getSuitableArgsGroup(L, luawt_WPushButton_setMenu_args); +int luawt_WPushButton_menu(lua_State* L) { + int index = luawt_getSuitableArgsGroup(L, luawt_WPushButton_menu_args); WPushButton* self = luawt_checkFromLua(L, 1); if (index == 0) { - Wt::WPopupMenu* menu = - luawt_checkFromLua(L, 2); - self->setMenu(menu); - return 0; - + Wt::WPopupMenu * l_result = self->menu(); + luawt_toLua(L, l_result); + return 1; + } else { - return luaL_error(L, "Wrong arguments for WPushButton.setMenu"); + return luaL_error(L, "Wrong arguments for WPushButton.menu"); } } @@ -204,8 +205,8 @@ int luawt_WPushButton_isChecked(lua_State* L) { int index = luawt_getSuitableArgsGroup(L, luawt_WPushButton_isChecked_args); WPushButton* self = luawt_checkFromLua(L, 1); if (index == 0) { - bool result = self->isChecked(); - lua_pushboolean(L, result); + bool l_result = self->isChecked(); + lua_pushboolean(L, l_result); return 1; } else { @@ -213,35 +214,36 @@ int luawt_WPushButton_isChecked(lua_State* L) { } } -static const char* WPushButton_isCheckable_args0[] = {luawt_typeToStr(), NULL}; -static const char* const* const luawt_WPushButton_isCheckable_args[] = {WPushButton_isCheckable_args0, NULL}; +static const char* WPushButton_setLink_args0[] = {luawt_typeToStr(), "char const *", NULL}; +static const char* const* const luawt_WPushButton_setLink_args[] = {WPushButton_setLink_args0, NULL}; -int luawt_WPushButton_isCheckable(lua_State* L) { - int index = luawt_getSuitableArgsGroup(L, luawt_WPushButton_isCheckable_args); +int luawt_WPushButton_setLink(lua_State* L) { + int index = luawt_getSuitableArgsGroup(L, luawt_WPushButton_setLink_args); WPushButton* self = luawt_checkFromLua(L, 1); if (index == 0) { - bool result = self->isCheckable(); - lua_pushboolean(L, result); - return 1; - + char const * raw2 = lua_tostring(L, 2); + Wt::WLink link = Wt::WLink(raw2); + self->setLink(link); + return 0; + } else { - return luaL_error(L, "Wrong arguments for WPushButton.isCheckable"); + return luaL_error(L, "Wrong arguments for WPushButton.setLink"); } } -static const char* WPushButton_setLinkTarget_args0[] = {luawt_typeToStr(), "int", NULL}; -static const char* const* const luawt_WPushButton_setLinkTarget_args[] = {WPushButton_setLinkTarget_args0, NULL}; +static const char* WPushButton_linkTarget_args0[] = {luawt_typeToStr(), NULL}; +static const char* const* const luawt_WPushButton_linkTarget_args[] = {WPushButton_linkTarget_args0, NULL}; -int luawt_WPushButton_setLinkTarget(lua_State* L) { - int index = luawt_getSuitableArgsGroup(L, luawt_WPushButton_setLinkTarget_args); +int luawt_WPushButton_linkTarget(lua_State* L) { + int index = luawt_getSuitableArgsGroup(L, luawt_WPushButton_linkTarget_args); WPushButton* self = luawt_checkFromLua(L, 1); if (index == 0) { - Wt::AnchorTarget target = static_cast(lua_tointeger(L, 2)); - self->setLinkTarget(target); - return 0; - + Wt::AnchorTarget l_result = self->linkTarget(); + lua_pushinteger(L, l_result); + return 1; + } else { - return luaL_error(L, "Wrong arguments for WPushButton.setLinkTarget"); + return luaL_error(L, "Wrong arguments for WPushButton.linkTarget"); } } @@ -262,67 +264,116 @@ int luawt_WPushButton_setValueText(lua_State* L) { } } -static const char* WPushButton_text_args0[] = {luawt_typeToStr(), NULL}; -static const char* const* const luawt_WPushButton_text_args[] = {WPushButton_text_args0, NULL}; +static const char* WPushButton_ref_args0[] = {luawt_typeToStr(), NULL}; +static const char* const* const luawt_WPushButton_ref_args[] = {WPushButton_ref_args0, NULL}; -int luawt_WPushButton_text(lua_State* L) { - int index = luawt_getSuitableArgsGroup(L, luawt_WPushButton_text_args); +int luawt_WPushButton_ref(lua_State* L) { + int index = luawt_getSuitableArgsGroup(L, luawt_WPushButton_ref_args); WPushButton* self = luawt_checkFromLua(L, 1); if (index == 0) { - Wt::WString const & result = self->text(); - lua_pushstring(L, result.toUTF8().c_str()); + std::string l_result = self->ref(); + lua_pushstring(L, l_result.c_str()); return 1; } else { - return luaL_error(L, "Wrong arguments for WPushButton.text"); + return luaL_error(L, "Wrong arguments for WPushButton.ref"); } } -static const char* WPushButton_setUnChecked_args0[] = {luawt_typeToStr(), NULL}; -static const char* const* const luawt_WPushButton_setUnChecked_args[] = {WPushButton_setUnChecked_args0, NULL}; +static const char* WPushButton_isDefault_args0[] = {luawt_typeToStr(), NULL}; +static const char* const* const luawt_WPushButton_isDefault_args[] = {WPushButton_isDefault_args0, NULL}; -int luawt_WPushButton_setUnChecked(lua_State* L) { - int index = luawt_getSuitableArgsGroup(L, luawt_WPushButton_setUnChecked_args); +int luawt_WPushButton_isDefault(lua_State* L) { + int index = luawt_getSuitableArgsGroup(L, luawt_WPushButton_isDefault_args); WPushButton* self = luawt_checkFromLua(L, 1); if (index == 0) { - self->setUnChecked(); + bool l_result = self->isDefault(); + lua_pushboolean(L, l_result); + return 1; + + } else { + return luaL_error(L, "Wrong arguments for WPushButton.isDefault"); + } +} + +static const char* WPushButton_setIcon_args0[] = {luawt_typeToStr(), "char const *", NULL}; +static const char* const* const luawt_WPushButton_setIcon_args[] = {WPushButton_setIcon_args0, NULL}; + +int luawt_WPushButton_setIcon(lua_State* L) { + int index = luawt_getSuitableArgsGroup(L, luawt_WPushButton_setIcon_args); + WPushButton* self = luawt_checkFromLua(L, 1); + if (index == 0) { + char const * raw2 = lua_tostring(L, 2); + Wt::WLink link = Wt::WLink(raw2); + self->setIcon(link); return 0; } else { - return luaL_error(L, "Wrong arguments for WPushButton.setUnChecked"); + return luaL_error(L, "Wrong arguments for WPushButton.setIcon"); } } -static const char* WPushButton_setRef_args0[] = {luawt_typeToStr(), "char const *", NULL}; -static const char* const* const luawt_WPushButton_setRef_args[] = {WPushButton_setRef_args0, NULL}; +static const char* WPushButton_setDefault_args0[] = {luawt_typeToStr(), "bool", NULL}; +static const char* const* const luawt_WPushButton_setDefault_args[] = {WPushButton_setDefault_args0, NULL}; -int luawt_WPushButton_setRef(lua_State* L) { - int index = luawt_getSuitableArgsGroup(L, luawt_WPushButton_setRef_args); +int luawt_WPushButton_setDefault(lua_State* L) { + int index = luawt_getSuitableArgsGroup(L, luawt_WPushButton_setDefault_args); WPushButton* self = luawt_checkFromLua(L, 1); if (index == 0) { - char const * raw2 = lua_tostring(L, 2); - std::string url = std::string(raw2); - self->setRef(url); + bool enabled = lua_toboolean(L, 2); + self->setDefault(enabled); return 0; } else { - return luaL_error(L, "Wrong arguments for WPushButton.setRef"); + return luaL_error(L, "Wrong arguments for WPushButton.setDefault"); } } -static const char* WPushButton_textFormat_args0[] = {luawt_typeToStr(), NULL}; -static const char* const* const luawt_WPushButton_textFormat_args[] = {WPushButton_textFormat_args0, NULL}; +static const char* WPushButton_link_args0[] = {luawt_typeToStr(), NULL}; +static const char* const* const luawt_WPushButton_link_args[] = {WPushButton_link_args0, NULL}; -int luawt_WPushButton_textFormat(lua_State* L) { - int index = luawt_getSuitableArgsGroup(L, luawt_WPushButton_textFormat_args); +int luawt_WPushButton_link(lua_State* L) { + int index = luawt_getSuitableArgsGroup(L, luawt_WPushButton_link_args); WPushButton* self = luawt_checkFromLua(L, 1); if (index == 0) { - Wt::TextFormat result = self->textFormat(); - lua_pushinteger(L, result); + Wt::WLink const & l_result = self->link(); + lua_pushstring(L, l_result.url().c_str()); return 1; } else { - return luaL_error(L, "Wrong arguments for WPushButton.textFormat"); + return luaL_error(L, "Wrong arguments for WPushButton.link"); + } +} + +static const char* WPushButton_setLinkTarget_args0[] = {luawt_typeToStr(), "int", NULL}; +static const char* const* const luawt_WPushButton_setLinkTarget_args[] = {WPushButton_setLinkTarget_args0, NULL}; + +int luawt_WPushButton_setLinkTarget(lua_State* L) { + int index = luawt_getSuitableArgsGroup(L, luawt_WPushButton_setLinkTarget_args); + WPushButton* self = luawt_checkFromLua(L, 1); + if (index == 0) { + Wt::AnchorTarget target = static_cast(lua_tointeger(L, 2)); + self->setLinkTarget(target); + return 0; + + } else { + return luaL_error(L, "Wrong arguments for WPushButton.setLinkTarget"); + } +} + +static const char* WPushButton_icon_args0[] = {luawt_typeToStr(), NULL}; +static const char* const* const luawt_WPushButton_icon_args[] = {WPushButton_icon_args0, NULL}; + +int luawt_WPushButton_icon(lua_State* L) { + int index = luawt_getSuitableArgsGroup(L, luawt_WPushButton_icon_args); + WPushButton* self = luawt_checkFromLua(L, 1); + if (index == 0) { + Wt::WLink l_result = self->icon(); + lua_pushstring(L, l_result.url().c_str()); + return 1; + + } else { + return luaL_error(L, "Wrong arguments for WPushButton.icon"); } } @@ -342,52 +393,68 @@ int luawt_WPushButton_setCheckable(lua_State* L) { } } -static const char* WPushButton_setTextFormat_args0[] = {luawt_typeToStr(), "int", NULL}; -static const char* const* const luawt_WPushButton_setTextFormat_args[] = {WPushButton_setTextFormat_args0, NULL}; +static const char* WPushButton_setText_args0[] = {luawt_typeToStr(), "char const *", NULL}; +static const char* const* const luawt_WPushButton_setText_args[] = {WPushButton_setText_args0, NULL}; -int luawt_WPushButton_setTextFormat(lua_State* L) { - int index = luawt_getSuitableArgsGroup(L, luawt_WPushButton_setTextFormat_args); +int luawt_WPushButton_setText(lua_State* L) { + int index = luawt_getSuitableArgsGroup(L, luawt_WPushButton_setText_args); WPushButton* self = luawt_checkFromLua(L, 1); if (index == 0) { - Wt::TextFormat format = static_cast(lua_tointeger(L, 2)); - bool result = self->setTextFormat(format); - lua_pushboolean(L, result); + char const * raw2 = lua_tostring(L, 2); + Wt::WString text = Wt::WString(raw2); + bool l_result = self->setText(text); + lua_pushboolean(L, l_result); return 1; } else { - return luaL_error(L, "Wrong arguments for WPushButton.setTextFormat"); + return luaL_error(L, "Wrong arguments for WPushButton.setText"); } } -static const char* WPushButton_isDefault_args0[] = {luawt_typeToStr(), NULL}; -static const char* const* const luawt_WPushButton_isDefault_args[] = {WPushButton_isDefault_args0, NULL}; +static const char* WPushButton_refresh_args0[] = {luawt_typeToStr(), NULL}; +static const char* const* const luawt_WPushButton_refresh_args[] = {WPushButton_refresh_args0, NULL}; -int luawt_WPushButton_isDefault(lua_State* L) { - int index = luawt_getSuitableArgsGroup(L, luawt_WPushButton_isDefault_args); +int luawt_WPushButton_refresh(lua_State* L) { + int index = luawt_getSuitableArgsGroup(L, luawt_WPushButton_refresh_args); + WPushButton* self = luawt_checkFromLua(L, 1); + if (index == 0) { + self->refresh(); + return 0; + + } else { + return luaL_error(L, "Wrong arguments for WPushButton.refresh"); + } +} + +static const char* WPushButton_text_args0[] = {luawt_typeToStr(), NULL}; +static const char* const* const luawt_WPushButton_text_args[] = {WPushButton_text_args0, NULL}; + +int luawt_WPushButton_text(lua_State* L) { + int index = luawt_getSuitableArgsGroup(L, luawt_WPushButton_text_args); WPushButton* self = luawt_checkFromLua(L, 1); if (index == 0) { - bool result = self->isDefault(); - lua_pushboolean(L, result); + Wt::WString const & l_result = self->text(); + lua_pushstring(L, l_result.toUTF8().c_str()); return 1; } else { - return luaL_error(L, "Wrong arguments for WPushButton.isDefault"); + return luaL_error(L, "Wrong arguments for WPushButton.text"); } } -static const char* WPushButton_valueText_args0[] = {luawt_typeToStr(), NULL}; -static const char* const* const luawt_WPushButton_valueText_args[] = {WPushButton_valueText_args0, NULL}; +static const char* WPushButton_textFormat_args0[] = {luawt_typeToStr(), NULL}; +static const char* const* const luawt_WPushButton_textFormat_args[] = {WPushButton_textFormat_args0, NULL}; -int luawt_WPushButton_valueText(lua_State* L) { - int index = luawt_getSuitableArgsGroup(L, luawt_WPushButton_valueText_args); +int luawt_WPushButton_textFormat(lua_State* L) { + int index = luawt_getSuitableArgsGroup(L, luawt_WPushButton_textFormat_args); WPushButton* self = luawt_checkFromLua(L, 1); if (index == 0) { - Wt::WString result = self->valueText(); - lua_pushstring(L, result.toUTF8().c_str()); + Wt::TextFormat l_result = self->textFormat(); + lua_pushinteger(L, l_result); return 1; } else { - return luaL_error(L, "Wrong arguments for WPushButton.valueText"); + return luaL_error(L, "Wrong arguments for WPushButton.textFormat"); } } @@ -431,6 +498,10 @@ static const luaL_Reg luawt_WPushButton_methods[] = { METHOD(WPushButton, text), METHOD(WPushButton, setTextFormat), METHOD(WPushButton, textFormat), + METHOD(WPushButton, setIcon), + METHOD(WPushButton, icon), + METHOD(WPushButton, setLink), + METHOD(WPushButton, link), METHOD(WPushButton, setRef), METHOD(WPushButton, ref), METHOD(WPushButton, valueText), diff --git a/src/luawt/WRadioButton.cpp b/src/luawt/WRadioButton.cpp new file mode 100644 index 0000000..b768d33 --- /dev/null +++ b/src/luawt/WRadioButton.cpp @@ -0,0 +1,132 @@ +#include "boost-xtime.hpp" + +#include +#include +#include + +#include "globals.hpp" + +static const char* WRadioButton_make_args0[] = {NULL}; +static const char* WRadioButton_make_args1[] = {luawt_typeToStr(), NULL}; +static const char* WRadioButton_make_args2[] = {"char const *", NULL}; +static const char* WRadioButton_make_args3[] = {"char const *", luawt_typeToStr(), NULL}; +static const char* const* const luawt_WRadioButton_make_args[] = {WRadioButton_make_args0, WRadioButton_make_args1, WRadioButton_make_args2, WRadioButton_make_args3, NULL}; + +int luawt_WRadioButton_make(lua_State* L) { + int index = luawt_getSuitableArgsGroup(L, luawt_WRadioButton_make_args); + if (index == 0) { + WRadioButton * l_result = new WRadioButton(); + MyApplication* app = MyApplication::instance(); + if (!app) { + delete l_result; + throw std::logic_error("No WApplication when creating WRadioButton"); + } + app->root()->addWidget(l_result); + + luawt_toLua(L, l_result); + return 1; + + } else if (index == 1) { + Wt::WContainerWidget* parent = + luawt_checkFromLua(L, 1); + WRadioButton * l_result = new WRadioButton(parent); + luawt_toLua(L, l_result); + return 1; + + } else if (index == 2) { + char const * raw1 = lua_tostring(L, 1); + Wt::WString text = Wt::WString(raw1); + WRadioButton * l_result = new WRadioButton(text); + MyApplication* app = MyApplication::instance(); + if (!app) { + delete l_result; + throw std::logic_error("No WApplication when creating WRadioButton"); + } + app->root()->addWidget(l_result); + + luawt_toLua(L, l_result); + return 1; + + } else if (index == 3) { + char const * raw1 = lua_tostring(L, 1); + Wt::WString text = Wt::WString(raw1); + Wt::WContainerWidget* parent = + luawt_checkFromLua(L, 2); + WRadioButton * l_result = new WRadioButton(text, parent); + luawt_toLua(L, l_result); + return 1; + + } else { + return luaL_error(L, "Wrong arguments for WRadioButton.make"); + } +} + +ADD_SIGNAL(checked, WRadioButton, Wt::NoClass) +ADD_SIGNAL(unChecked, WRadioButton, Wt::NoClass) +ADD_SIGNAL(changed, WRadioButton, Wt::NoClass) +ADD_SIGNAL(selected, WRadioButton, Wt::NoClass) +ADD_SIGNAL(blurred, WRadioButton, Wt::NoClass) +ADD_SIGNAL(focussed, WRadioButton, Wt::NoClass) +ADD_SIGNAL(keyWentDown, WRadioButton, Wt::WKeyEvent) +ADD_SIGNAL(keyPressed, WRadioButton, Wt::WKeyEvent) +ADD_SIGNAL(keyWentUp, WRadioButton, Wt::WKeyEvent) +ADD_SIGNAL(enterPressed, WRadioButton, Wt::NoClass) +ADD_SIGNAL(escapePressed, WRadioButton, Wt::NoClass) +ADD_SIGNAL(clicked, WRadioButton, Wt::WMouseEvent) +ADD_SIGNAL(doubleClicked, WRadioButton, Wt::WMouseEvent) +ADD_SIGNAL(mouseWentDown, WRadioButton, Wt::WMouseEvent) +ADD_SIGNAL(mouseWentUp, WRadioButton, Wt::WMouseEvent) +ADD_SIGNAL(mouseWentOut, WRadioButton, Wt::WMouseEvent) +ADD_SIGNAL(mouseWentOver, WRadioButton, Wt::WMouseEvent) +ADD_SIGNAL(mouseMoved, WRadioButton, Wt::WMouseEvent) +ADD_SIGNAL(mouseDragged, WRadioButton, Wt::WMouseEvent) +ADD_SIGNAL(mouseWheel, WRadioButton, Wt::WMouseEvent) +ADD_SIGNAL(touchStarted, WRadioButton, Wt::WTouchEvent) +ADD_SIGNAL(touchEnded, WRadioButton, Wt::WTouchEvent) +ADD_SIGNAL(touchMoved, WRadioButton, Wt::WTouchEvent) +ADD_SIGNAL(gestureStarted, WRadioButton, Wt::WGestureEvent) +ADD_SIGNAL(gestureChanged, WRadioButton, Wt::WGestureEvent) +ADD_SIGNAL(gestureEnded, WRadioButton, Wt::WGestureEvent) + +static const luaL_Reg luawt_WRadioButton_methods[] = { + METHOD(WRadioButton, checked), + METHOD(WRadioButton, unChecked), + METHOD(WRadioButton, changed), + METHOD(WRadioButton, selected), + METHOD(WRadioButton, blurred), + METHOD(WRadioButton, focussed), + METHOD(WRadioButton, keyWentDown), + METHOD(WRadioButton, keyPressed), + METHOD(WRadioButton, keyWentUp), + METHOD(WRadioButton, enterPressed), + METHOD(WRadioButton, escapePressed), + METHOD(WRadioButton, clicked), + METHOD(WRadioButton, doubleClicked), + METHOD(WRadioButton, mouseWentDown), + METHOD(WRadioButton, mouseWentUp), + METHOD(WRadioButton, mouseWentOut), + METHOD(WRadioButton, mouseWentOver), + METHOD(WRadioButton, mouseMoved), + METHOD(WRadioButton, mouseDragged), + METHOD(WRadioButton, mouseWheel), + METHOD(WRadioButton, touchStarted), + METHOD(WRadioButton, touchEnded), + METHOD(WRadioButton, touchMoved), + METHOD(WRadioButton, gestureStarted), + METHOD(WRadioButton, gestureChanged), + METHOD(WRadioButton, gestureEnded), + {NULL, NULL}, +}; + +void luawt_WRadioButton(lua_State* L) { + const char* base = luawt_typeToStr(); + assert(base); + DECLARE_CLASS( + WRadioButton, + L, + wrap::func, + 0, + luawt_WRadioButton_methods, + base + ); +} diff --git a/src/luawt/WScrollArea.cpp b/src/luawt/WScrollArea.cpp index a867ec0..098f5b4 100644 --- a/src/luawt/WScrollArea.cpp +++ b/src/luawt/WScrollArea.cpp @@ -13,22 +13,22 @@ static const char* const* const luawt_WScrollArea_make_args[] = {WScrollArea_mak int luawt_WScrollArea_make(lua_State* L) { int index = luawt_getSuitableArgsGroup(L, luawt_WScrollArea_make_args); if (index == 0) { - WScrollArea * result = new WScrollArea(); + WScrollArea * l_result = new WScrollArea(); MyApplication* app = MyApplication::instance(); if (!app) { - delete result; + delete l_result; throw std::logic_error("No WApplication when creating WScrollArea"); } - app->root()->addWidget(result); + app->root()->addWidget(l_result); - luawt_toLua(L, result); + luawt_toLua(L, l_result); return 1; } else if (index == 1) { Wt::WContainerWidget* parent = luawt_checkFromLua(L, 1); - WScrollArea * result = new WScrollArea(parent); - luawt_toLua(L, result); + WScrollArea * l_result = new WScrollArea(parent); + luawt_toLua(L, l_result); return 1; } else { @@ -43,8 +43,8 @@ int luawt_WScrollArea_widget(lua_State* L) { int index = luawt_getSuitableArgsGroup(L, luawt_WScrollArea_widget_args); WScrollArea* self = luawt_checkFromLua(L, 1); if (index == 0) { - Wt::WWidget * result = self->widget(); - luawt_toLua(L, result); + Wt::WWidget * l_result = self->widget(); + luawt_toLua(L, l_result); return 1; } else { @@ -59,8 +59,8 @@ int luawt_WScrollArea_verticalScrollBarPolicy(lua_State* L) { int index = luawt_getSuitableArgsGroup(L, luawt_WScrollArea_verticalScrollBarPolicy_args); WScrollArea* self = luawt_checkFromLua(L, 1); if (index == 0) { - Wt::WScrollArea::ScrollBarPolicy result = self->verticalScrollBarPolicy(); - lua_pushinteger(L, result); + Wt::WScrollArea::ScrollBarPolicy l_result = self->verticalScrollBarPolicy(); + lua_pushinteger(L, l_result); return 1; } else { @@ -91,8 +91,8 @@ int luawt_WScrollArea_horizontalScrollBarPolicy(lua_State* L) { int index = luawt_getSuitableArgsGroup(L, luawt_WScrollArea_horizontalScrollBarPolicy_args); WScrollArea* self = luawt_checkFromLua(L, 1); if (index == 0) { - Wt::WScrollArea::ScrollBarPolicy result = self->horizontalScrollBarPolicy(); - lua_pushinteger(L, result); + Wt::WScrollArea::ScrollBarPolicy l_result = self->horizontalScrollBarPolicy(); + lua_pushinteger(L, l_result); return 1; } else { @@ -156,8 +156,8 @@ int luawt_WScrollArea_takeWidget(lua_State* L) { int index = luawt_getSuitableArgsGroup(L, luawt_WScrollArea_takeWidget_args); WScrollArea* self = luawt_checkFromLua(L, 1); if (index == 0) { - Wt::WWidget * result = self->takeWidget(); - luawt_toLua(L, result); + Wt::WWidget * l_result = self->takeWidget(); + luawt_toLua(L, l_result); return 1; } else { diff --git a/src/luawt/WSelectionBox.cpp b/src/luawt/WSelectionBox.cpp index 6ac4648..d0d0556 100644 --- a/src/luawt/WSelectionBox.cpp +++ b/src/luawt/WSelectionBox.cpp @@ -12,22 +12,22 @@ static const char* const* const luawt_WSelectionBox_make_args[] = {WSelectionBox int luawt_WSelectionBox_make(lua_State* L) { int index = luawt_getSuitableArgsGroup(L, luawt_WSelectionBox_make_args); if (index == 0) { - WSelectionBox * result = new WSelectionBox(); + WSelectionBox * l_result = new WSelectionBox(); MyApplication* app = MyApplication::instance(); if (!app) { - delete result; + delete l_result; throw std::logic_error("No WApplication when creating WSelectionBox"); } - app->root()->addWidget(result); + app->root()->addWidget(l_result); - luawt_toLua(L, result); + luawt_toLua(L, l_result); return 1; } else if (index == 1) { Wt::WContainerWidget* parent = luawt_checkFromLua(L, 1); - WSelectionBox * result = new WSelectionBox(parent); - luawt_toLua(L, result); + WSelectionBox * l_result = new WSelectionBox(parent); + luawt_toLua(L, l_result); return 1; } else { @@ -57,8 +57,8 @@ int luawt_WSelectionBox_selectionMode(lua_State* L) { int index = luawt_getSuitableArgsGroup(L, luawt_WSelectionBox_selectionMode_args); WSelectionBox* self = luawt_checkFromLua(L, 1); if (index == 0) { - Wt::SelectionMode result = self->selectionMode(); - lua_pushinteger(L, result); + Wt::SelectionMode l_result = self->selectionMode(); + lua_pushinteger(L, l_result); return 1; } else { @@ -73,8 +73,8 @@ int luawt_WSelectionBox_verticalSize(lua_State* L) { int index = luawt_getSuitableArgsGroup(L, luawt_WSelectionBox_verticalSize_args); WSelectionBox* self = luawt_checkFromLua(L, 1); if (index == 0) { - int result = self->verticalSize(); - lua_pushinteger(L, result); + int l_result = self->verticalSize(); + lua_pushinteger(L, l_result); return 1; } else { diff --git a/src/luawt/WServer.cpp b/src/luawt/WServer.cpp index 018ab1f..e8a74c4 100644 --- a/src/luawt/WServer.cpp +++ b/src/luawt/WServer.cpp @@ -1,5 +1,5 @@ /* luawt, Lua bindings for Wt - * Copyright (c) 2015-2016 Pavel Dolgov and Boris Nagaev + * Copyright (c) 2015-2017 Pavel Dolgov and Boris Nagaev * * See the LICENSE file for terms of use. */ @@ -63,6 +63,12 @@ int luawt_WServer_make(lua_State* L) { if (!lua_isnil(L, -1)) { config = luaL_checkstring(L, -1); } + // get document root for static files + const char* docroot = 0; + lua_getfield(L, 1, "docroot"); + if (!lua_isnil(L, -1)) { + docroot = luaL_checkstring(L, -1); + } // make argc, argv typedef std::vector Options; Options opt; @@ -71,11 +77,16 @@ int luawt_WServer_make(lua_State* L) { opt.push_back(ip); opt.push_back("--http-port"); opt.push_back(port); - opt.push_back("--docroot=/usr/share/Wt"); if (config) { opt.push_back("--config"); opt.push_back(config); } + if (docroot) { + opt.push_back("--docroot"); + opt.push_back(docroot); + } else { + opt.push_back("--docroot=/usr/include/Wt"); + } opt.push_back(0); WServer* server = reinterpret_cast( lua_newuserdata(L, sizeof(WServer)) diff --git a/src/luawt/WSlider.cpp b/src/luawt/WSlider.cpp index f4634c3..a384e5f 100644 --- a/src/luawt/WSlider.cpp +++ b/src/luawt/WSlider.cpp @@ -1,5 +1,6 @@ #include "boost-xtime.hpp" +#include #include #include #include @@ -15,43 +16,43 @@ static const char* const* const luawt_WSlider_make_args[] = {WSlider_make_args0, int luawt_WSlider_make(lua_State* L) { int index = luawt_getSuitableArgsGroup(L, luawt_WSlider_make_args); if (index == 0) { - WSlider * result = new WSlider(); + WSlider * l_result = new WSlider(); MyApplication* app = MyApplication::instance(); if (!app) { - delete result; + delete l_result; throw std::logic_error("No WApplication when creating WSlider"); } - app->root()->addWidget(result); + app->root()->addWidget(l_result); - luawt_toLua(L, result); + luawt_toLua(L, l_result); return 1; } else if (index == 1) { Wt::WContainerWidget* parent = luawt_checkFromLua(L, 1); - WSlider * result = new WSlider(parent); - luawt_toLua(L, result); + WSlider * l_result = new WSlider(parent); + luawt_toLua(L, l_result); return 1; } else if (index == 2) { Wt::Orientation orientation = static_cast(lua_tointeger(L, 1)); - WSlider * result = new WSlider(orientation); + WSlider * l_result = new WSlider(orientation); MyApplication* app = MyApplication::instance(); if (!app) { - delete result; + delete l_result; throw std::logic_error("No WApplication when creating WSlider"); } - app->root()->addWidget(result); + app->root()->addWidget(l_result); - luawt_toLua(L, result); + luawt_toLua(L, l_result); return 1; } else if (index == 3) { Wt::Orientation orientation = static_cast(lua_tointeger(L, 1)); Wt::WContainerWidget* parent = luawt_checkFromLua(L, 2); - WSlider * result = new WSlider(orientation, parent); - luawt_toLua(L, result); + WSlider * l_result = new WSlider(orientation, parent); + luawt_toLua(L, l_result); return 1; } else { @@ -130,8 +131,8 @@ int luawt_WSlider_orientation(lua_State* L) { int index = luawt_getSuitableArgsGroup(L, luawt_WSlider_orientation_args); WSlider* self = luawt_checkFromLua(L, 1); if (index == 0) { - Wt::Orientation result = self->orientation(); - lua_pushinteger(L, result); + Wt::Orientation l_result = self->orientation(); + lua_pushinteger(L, l_result); return 1; } else { @@ -146,8 +147,8 @@ int luawt_WSlider_valueText(lua_State* L) { int index = luawt_getSuitableArgsGroup(L, luawt_WSlider_valueText_args); WSlider* self = luawt_checkFromLua(L, 1); if (index == 0) { - Wt::WString result = self->valueText(); - lua_pushstring(L, result.toUTF8().c_str()); + Wt::WString l_result = self->valueText(); + lua_pushstring(L, l_result.toUTF8().c_str()); return 1; } else { @@ -162,8 +163,8 @@ int luawt_WSlider_maximum(lua_State* L) { int index = luawt_getSuitableArgsGroup(L, luawt_WSlider_maximum_args); WSlider* self = luawt_checkFromLua(L, 1); if (index == 0) { - int result = self->maximum(); - lua_pushinteger(L, result); + int l_result = self->maximum(); + lua_pushinteger(L, l_result); return 1; } else { @@ -178,8 +179,8 @@ int luawt_WSlider_value(lua_State* L) { int index = luawt_getSuitableArgsGroup(L, luawt_WSlider_value_args); WSlider* self = luawt_checkFromLua(L, 1); if (index == 0) { - int result = self->value(); - lua_pushinteger(L, result); + int l_result = self->value(); + lua_pushinteger(L, l_result); return 1; } else { @@ -187,6 +188,22 @@ int luawt_WSlider_value(lua_State* L) { } } +static const char* WSlider_setDisabled_args0[] = {luawt_typeToStr(), "bool", NULL}; +static const char* const* const luawt_WSlider_setDisabled_args[] = {WSlider_setDisabled_args0, NULL}; + +int luawt_WSlider_setDisabled(lua_State* L) { + int index = luawt_getSuitableArgsGroup(L, luawt_WSlider_setDisabled_args); + WSlider* self = luawt_checkFromLua(L, 1); + if (index == 0) { + bool disabled = lua_toboolean(L, 2); + self->setDisabled(disabled); + return 0; + + } else { + return luaL_error(L, "Wrong arguments for WSlider.setDisabled"); + } +} + static const char* WSlider_minimum_args0[] = {luawt_typeToStr(), NULL}; static const char* const* const luawt_WSlider_minimum_args[] = {WSlider_minimum_args0, NULL}; @@ -194,8 +211,8 @@ int luawt_WSlider_minimum(lua_State* L) { int index = luawt_getSuitableArgsGroup(L, luawt_WSlider_minimum_args); WSlider* self = luawt_checkFromLua(L, 1); if (index == 0) { - int result = self->minimum(); - lua_pushinteger(L, result); + int l_result = self->minimum(); + lua_pushinteger(L, l_result); return 1; } else { @@ -203,19 +220,55 @@ int luawt_WSlider_minimum(lua_State* L) { } } -static const char* WSlider_setDisabled_args0[] = {luawt_typeToStr(), "bool", NULL}; -static const char* const* const luawt_WSlider_setDisabled_args[] = {WSlider_setDisabled_args0, NULL}; +static const char* WSlider_resize_args0[] = {luawt_typeToStr(), "double", "double", NULL}; +static const char* const* const luawt_WSlider_resize_args[] = {WSlider_resize_args0, NULL}; -int luawt_WSlider_setDisabled(lua_State* L) { - int index = luawt_getSuitableArgsGroup(L, luawt_WSlider_setDisabled_args); +int luawt_WSlider_resize(lua_State* L) { + int index = luawt_getSuitableArgsGroup(L, luawt_WSlider_resize_args); WSlider* self = luawt_checkFromLua(L, 1); if (index == 0) { - bool disabled = lua_toboolean(L, 2); - self->setDisabled(disabled); + double raw2 = lua_tonumber(L, 2); + Wt::WLength width = Wt::WLength(raw2); + double raw3 = lua_tonumber(L, 3); + Wt::WLength height = Wt::WLength(raw3); + self->resize(width, height); return 0; } else { - return luaL_error(L, "Wrong arguments for WSlider.setDisabled"); + return luaL_error(L, "Wrong arguments for WSlider.resize"); + } +} + +static const char* WSlider_setValueText_args0[] = {luawt_typeToStr(), "char const *", NULL}; +static const char* const* const luawt_WSlider_setValueText_args[] = {WSlider_setValueText_args0, NULL}; + +int luawt_WSlider_setValueText(lua_State* L) { + int index = luawt_getSuitableArgsGroup(L, luawt_WSlider_setValueText_args); + WSlider* self = luawt_checkFromLua(L, 1); + if (index == 0) { + char const * raw2 = lua_tostring(L, 2); + Wt::WString value = Wt::WString(raw2); + self->setValueText(value); + return 0; + + } else { + return luaL_error(L, "Wrong arguments for WSlider.setValueText"); + } +} + +static const char* WSlider_setTickPosition_args0[] = {luawt_typeToStr(), "int", NULL}; +static const char* const* const luawt_WSlider_setTickPosition_args[] = {WSlider_setTickPosition_args0, NULL}; + +int luawt_WSlider_setTickPosition(lua_State* L) { + int index = luawt_getSuitableArgsGroup(L, luawt_WSlider_setTickPosition_args); + WSlider* self = luawt_checkFromLua(L, 1); + if (index == 0) { + Wt::WFlags tickPosition = static_cast(lua_tointeger(L, 2)); + self->setTickPosition(tickPosition); + return 0; + + } else { + return luaL_error(L, "Wrong arguments for WSlider.setTickPosition"); } } @@ -242,8 +295,8 @@ int luawt_WSlider_nativeControl(lua_State* L) { int index = luawt_getSuitableArgsGroup(L, luawt_WSlider_nativeControl_args); WSlider* self = luawt_checkFromLua(L, 1); if (index == 0) { - bool result = self->nativeControl(); - lua_pushboolean(L, result); + bool l_result = self->nativeControl(); + lua_pushboolean(L, l_result); return 1; } else { @@ -251,20 +304,19 @@ int luawt_WSlider_nativeControl(lua_State* L) { } } -static const char* WSlider_setValueText_args0[] = {luawt_typeToStr(), "char const *", NULL}; -static const char* const* const luawt_WSlider_setValueText_args[] = {WSlider_setValueText_args0, NULL}; +static const char* WSlider_tickPosition_args0[] = {luawt_typeToStr(), NULL}; +static const char* const* const luawt_WSlider_tickPosition_args[] = {WSlider_tickPosition_args0, NULL}; -int luawt_WSlider_setValueText(lua_State* L) { - int index = luawt_getSuitableArgsGroup(L, luawt_WSlider_setValueText_args); +int luawt_WSlider_tickPosition(lua_State* L) { + int index = luawt_getSuitableArgsGroup(L, luawt_WSlider_tickPosition_args); WSlider* self = luawt_checkFromLua(L, 1); if (index == 0) { - char const * raw2 = lua_tostring(L, 2); - Wt::WString value = Wt::WString(raw2); - self->setValueText(value); - return 0; - + Wt::WFlags l_result = self->tickPosition(); + lua_pushinteger(L, l_result); + return 1; + } else { - return luaL_error(L, "Wrong arguments for WSlider.setValueText"); + return luaL_error(L, "Wrong arguments for WSlider.tickPosition"); } } @@ -292,8 +344,8 @@ int luawt_WSlider_tickInterval(lua_State* L) { int index = luawt_getSuitableArgsGroup(L, luawt_WSlider_tickInterval_args); WSlider* self = luawt_checkFromLua(L, 1); if (index == 0) { - int result = self->tickInterval(); - lua_pushinteger(L, result); + int l_result = self->tickInterval(); + lua_pushinteger(L, l_result); return 1; } else { @@ -308,8 +360,8 @@ int luawt_WSlider_handleWidth(lua_State* L) { int index = luawt_getSuitableArgsGroup(L, luawt_WSlider_handleWidth_args); WSlider* self = luawt_checkFromLua(L, 1); if (index == 0) { - int result = self->handleWidth(); - lua_pushinteger(L, result); + int l_result = self->handleWidth(); + lua_pushinteger(L, l_result); return 1; } else { @@ -381,6 +433,8 @@ static const luaL_Reg luawt_WSlider_methods[] = { METHOD(WSlider, orientation), METHOD(WSlider, setTickInterval), METHOD(WSlider, tickInterval), + METHOD(WSlider, setTickPosition), + METHOD(WSlider, tickPosition), METHOD(WSlider, setValue), METHOD(WSlider, value), METHOD(WSlider, setMaximum), @@ -391,6 +445,7 @@ static const luaL_Reg luawt_WSlider_methods[] = { METHOD(WSlider, setHandleWidth), METHOD(WSlider, handleWidth), METHOD(WSlider, setDisabled), + METHOD(WSlider, resize), METHOD(WSlider, valueText), METHOD(WSlider, setValueText), METHOD(WSlider, changed), diff --git a/src/luawt/WSpinBox.cpp b/src/luawt/WSpinBox.cpp index 792ef87..31bf188 100644 --- a/src/luawt/WSpinBox.cpp +++ b/src/luawt/WSpinBox.cpp @@ -12,22 +12,22 @@ static const char* const* const luawt_WSpinBox_make_args[] = {WSpinBox_make_args int luawt_WSpinBox_make(lua_State* L) { int index = luawt_getSuitableArgsGroup(L, luawt_WSpinBox_make_args); if (index == 0) { - WSpinBox * result = new WSpinBox(); + WSpinBox * l_result = new WSpinBox(); MyApplication* app = MyApplication::instance(); if (!app) { - delete result; + delete l_result; throw std::logic_error("No WApplication when creating WSpinBox"); } - app->root()->addWidget(result); + app->root()->addWidget(l_result); - luawt_toLua(L, result); + luawt_toLua(L, l_result); return 1; } else if (index == 1) { Wt::WContainerWidget* parent = luawt_checkFromLua(L, 1); - WSpinBox * result = new WSpinBox(parent); - luawt_toLua(L, result); + WSpinBox * l_result = new WSpinBox(parent); + luawt_toLua(L, l_result); return 1; } else { @@ -74,8 +74,8 @@ int luawt_WSpinBox_maximum(lua_State* L) { int index = luawt_getSuitableArgsGroup(L, luawt_WSpinBox_maximum_args); WSpinBox* self = luawt_checkFromLua(L, 1); if (index == 0) { - int result = self->maximum(); - lua_pushinteger(L, result); + int l_result = self->maximum(); + lua_pushinteger(L, l_result); return 1; } else { @@ -90,8 +90,8 @@ int luawt_WSpinBox_value(lua_State* L) { int index = luawt_getSuitableArgsGroup(L, luawt_WSpinBox_value_args); WSpinBox* self = luawt_checkFromLua(L, 1); if (index == 0) { - int result = self->value(); - lua_pushinteger(L, result); + int l_result = self->value(); + lua_pushinteger(L, l_result); return 1; } else { @@ -106,8 +106,8 @@ int luawt_WSpinBox_singleStep(lua_State* L) { int index = luawt_getSuitableArgsGroup(L, luawt_WSpinBox_singleStep_args); WSpinBox* self = luawt_checkFromLua(L, 1); if (index == 0) { - int result = self->singleStep(); - lua_pushinteger(L, result); + int l_result = self->singleStep(); + lua_pushinteger(L, l_result); return 1; } else { @@ -122,8 +122,8 @@ int luawt_WSpinBox_minimum(lua_State* L) { int index = luawt_getSuitableArgsGroup(L, luawt_WSpinBox_minimum_args); WSpinBox* self = luawt_checkFromLua(L, 1); if (index == 0) { - int result = self->minimum(); - lua_pushinteger(L, result); + int l_result = self->minimum(); + lua_pushinteger(L, l_result); return 1; } else { diff --git a/src/luawt/WSplitButton.cpp b/src/luawt/WSplitButton.cpp index 0bbcc8b..d873a47 100644 --- a/src/luawt/WSplitButton.cpp +++ b/src/luawt/WSplitButton.cpp @@ -17,36 +17,36 @@ static const char* const* const luawt_WSplitButton_make_args[] = {WSplitButton_m int luawt_WSplitButton_make(lua_State* L) { int index = luawt_getSuitableArgsGroup(L, luawt_WSplitButton_make_args); if (index == 0) { - WSplitButton * result = new WSplitButton(); + WSplitButton * l_result = new WSplitButton(); MyApplication* app = MyApplication::instance(); if (!app) { - delete result; + delete l_result; throw std::logic_error("No WApplication when creating WSplitButton"); } - app->root()->addWidget(result); + app->root()->addWidget(l_result); - luawt_toLua(L, result); + luawt_toLua(L, l_result); return 1; } else if (index == 1) { Wt::WContainerWidget* parent = luawt_checkFromLua(L, 1); - WSplitButton * result = new WSplitButton(parent); - luawt_toLua(L, result); + WSplitButton * l_result = new WSplitButton(parent); + luawt_toLua(L, l_result); return 1; } else if (index == 2) { char const * raw1 = lua_tostring(L, 1); Wt::WString label = Wt::WString(raw1); - WSplitButton * result = new WSplitButton(label); + WSplitButton * l_result = new WSplitButton(label); MyApplication* app = MyApplication::instance(); if (!app) { - delete result; + delete l_result; throw std::logic_error("No WApplication when creating WSplitButton"); } - app->root()->addWidget(result); + app->root()->addWidget(l_result); - luawt_toLua(L, result); + luawt_toLua(L, l_result); return 1; } else if (index == 3) { @@ -54,8 +54,8 @@ int luawt_WSplitButton_make(lua_State* L) { Wt::WString label = Wt::WString(raw1); Wt::WContainerWidget* parent = luawt_checkFromLua(L, 2); - WSplitButton * result = new WSplitButton(label, parent); - luawt_toLua(L, result); + WSplitButton * l_result = new WSplitButton(label, parent); + luawt_toLua(L, l_result); return 1; } else { @@ -70,8 +70,8 @@ int luawt_WSplitButton_menu(lua_State* L) { int index = luawt_getSuitableArgsGroup(L, luawt_WSplitButton_menu_args); WSplitButton* self = luawt_checkFromLua(L, 1); if (index == 0) { - Wt::WPopupMenu * result = self->menu(); - luawt_toLua(L, result); + Wt::WPopupMenu * l_result = self->menu(); + luawt_toLua(L, l_result); return 1; } else { @@ -86,8 +86,8 @@ int luawt_WSplitButton_actionButton(lua_State* L) { int index = luawt_getSuitableArgsGroup(L, luawt_WSplitButton_actionButton_args); WSplitButton* self = luawt_checkFromLua(L, 1); if (index == 0) { - Wt::WPushButton * result = self->actionButton(); - luawt_toLua(L, result); + Wt::WPushButton * l_result = self->actionButton(); + luawt_toLua(L, l_result); return 1; } else { @@ -102,8 +102,8 @@ int luawt_WSplitButton_dropDownButton(lua_State* L) { int index = luawt_getSuitableArgsGroup(L, luawt_WSplitButton_dropDownButton_args); WSplitButton* self = luawt_checkFromLua(L, 1); if (index == 0) { - Wt::WPushButton * result = self->dropDownButton(); - luawt_toLua(L, result); + Wt::WPushButton * l_result = self->dropDownButton(); + luawt_toLua(L, l_result); return 1; } else { diff --git a/src/luawt/WStackedWidget.cpp b/src/luawt/WStackedWidget.cpp index 37e7c24..d3d5e28 100644 --- a/src/luawt/WStackedWidget.cpp +++ b/src/luawt/WStackedWidget.cpp @@ -13,22 +13,22 @@ static const char* const* const luawt_WStackedWidget_make_args[] = {WStackedWidg int luawt_WStackedWidget_make(lua_State* L) { int index = luawt_getSuitableArgsGroup(L, luawt_WStackedWidget_make_args); if (index == 0) { - WStackedWidget * result = new WStackedWidget(); + WStackedWidget * l_result = new WStackedWidget(); MyApplication* app = MyApplication::instance(); if (!app) { - delete result; + delete l_result; throw std::logic_error("No WApplication when creating WStackedWidget"); } - app->root()->addWidget(result); + app->root()->addWidget(l_result); - luawt_toLua(L, result); + luawt_toLua(L, l_result); return 1; } else if (index == 1) { Wt::WContainerWidget* parent = luawt_checkFromLua(L, 1); - WStackedWidget * result = new WStackedWidget(parent); - luawt_toLua(L, result); + WStackedWidget * l_result = new WStackedWidget(parent); + luawt_toLua(L, l_result); return 1; } else { @@ -78,8 +78,8 @@ int luawt_WStackedWidget_currentIndex(lua_State* L) { int index = luawt_getSuitableArgsGroup(L, luawt_WStackedWidget_currentIndex_args); WStackedWidget* self = luawt_checkFromLua(L, 1); if (index == 0) { - int result = self->currentIndex(); - lua_pushinteger(L, result); + int l_result = self->currentIndex(); + lua_pushinteger(L, l_result); return 1; } else { @@ -127,8 +127,8 @@ int luawt_WStackedWidget_currentWidget(lua_State* L) { int index = luawt_getSuitableArgsGroup(L, luawt_WStackedWidget_currentWidget_args); WStackedWidget* self = luawt_checkFromLua(L, 1); if (index == 0) { - Wt::WWidget * result = self->currentWidget(); - luawt_toLua(L, result); + Wt::WWidget * l_result = self->currentWidget(); + luawt_toLua(L, l_result); return 1; } else { diff --git a/src/luawt/WSuggestionPopup.cpp b/src/luawt/WSuggestionPopup.cpp new file mode 100644 index 0000000..f92196e --- /dev/null +++ b/src/luawt/WSuggestionPopup.cpp @@ -0,0 +1,232 @@ +#include "boost-xtime.hpp" + +#include +#include +#include + +#include "globals.hpp" + +static const char* WSuggestionPopup_setGlobalPopup_args0[] = {luawt_typeToStr(), "bool", NULL}; +static const char* const* const luawt_WSuggestionPopup_setGlobalPopup_args[] = {WSuggestionPopup_setGlobalPopup_args0, NULL}; + +int luawt_WSuggestionPopup_setGlobalPopup(lua_State* L) { + int index = luawt_getSuitableArgsGroup(L, luawt_WSuggestionPopup_setGlobalPopup_args); + WSuggestionPopup* self = luawt_checkFromLua(L, 1); + if (index == 0) { + bool global = lua_toboolean(L, 2); + self->setGlobalPopup(global); + return 0; + + } else { + return luaL_error(L, "Wrong arguments for WSuggestionPopup.setGlobalPopup"); + } +} + +static const char* WSuggestionPopup_addSuggestion_args0[] = {luawt_typeToStr(), "char const *", NULL}; +static const char* WSuggestionPopup_addSuggestion_args1[] = {luawt_typeToStr(), "char const *", "char const *", NULL}; +static const char* const* const luawt_WSuggestionPopup_addSuggestion_args[] = {WSuggestionPopup_addSuggestion_args0, WSuggestionPopup_addSuggestion_args1, NULL}; + +int luawt_WSuggestionPopup_addSuggestion(lua_State* L) { + int index = luawt_getSuitableArgsGroup(L, luawt_WSuggestionPopup_addSuggestion_args); + WSuggestionPopup* self = luawt_checkFromLua(L, 1); + if (index == 0) { + char const * raw2 = lua_tostring(L, 2); + Wt::WString suggestionText = Wt::WString(raw2); + self->addSuggestion(suggestionText); + return 0; + + } else if (index == 1) { + char const * raw2 = lua_tostring(L, 2); + Wt::WString suggestionText = Wt::WString(raw2); + char const * raw3 = lua_tostring(L, 3); + Wt::WString suggestionValue = Wt::WString(raw3); + self->addSuggestion(suggestionText, suggestionValue); + return 0; + + } else { + return luaL_error(L, "Wrong arguments for WSuggestionPopup.addSuggestion"); + } +} + +static const char* WSuggestionPopup_forEdit_args0[] = {luawt_typeToStr(), luawt_typeToStr(), NULL}; +static const char* WSuggestionPopup_forEdit_args1[] = {luawt_typeToStr(), luawt_typeToStr(), "int", NULL}; +static const char* const* const luawt_WSuggestionPopup_forEdit_args[] = {WSuggestionPopup_forEdit_args0, WSuggestionPopup_forEdit_args1, NULL}; + +int luawt_WSuggestionPopup_forEdit(lua_State* L) { + int index = luawt_getSuitableArgsGroup(L, luawt_WSuggestionPopup_forEdit_args); + WSuggestionPopup* self = luawt_checkFromLua(L, 1); + if (index == 0) { + Wt::WFormWidget* edit = + luawt_checkFromLua(L, 2); + self->forEdit(edit); + return 0; + + } else if (index == 1) { + Wt::WFormWidget* edit = + luawt_checkFromLua(L, 2); + Wt::WFlags popupTriggers = static_cast(lua_tointeger(L, 3)); + self->forEdit(edit, popupTriggers); + return 0; + + } else { + return luaL_error(L, "Wrong arguments for WSuggestionPopup.forEdit"); + } +} + +static const char* WSuggestionPopup_clearSuggestions_args0[] = {luawt_typeToStr(), NULL}; +static const char* const* const luawt_WSuggestionPopup_clearSuggestions_args[] = {WSuggestionPopup_clearSuggestions_args0, NULL}; + +int luawt_WSuggestionPopup_clearSuggestions(lua_State* L) { + int index = luawt_getSuitableArgsGroup(L, luawt_WSuggestionPopup_clearSuggestions_args); + WSuggestionPopup* self = luawt_checkFromLua(L, 1); + if (index == 0) { + self->clearSuggestions(); + return 0; + + } else { + return luaL_error(L, "Wrong arguments for WSuggestionPopup.clearSuggestions"); + } +} + +static const char* WSuggestionPopup_showAt_args0[] = {luawt_typeToStr(), luawt_typeToStr(), NULL}; +static const char* const* const luawt_WSuggestionPopup_showAt_args[] = {WSuggestionPopup_showAt_args0, NULL}; + +int luawt_WSuggestionPopup_showAt(lua_State* L) { + int index = luawt_getSuitableArgsGroup(L, luawt_WSuggestionPopup_showAt_args); + WSuggestionPopup* self = luawt_checkFromLua(L, 1); + if (index == 0) { + Wt::WFormWidget* edit = + luawt_checkFromLua(L, 2); + self->showAt(edit); + return 0; + + } else { + return luaL_error(L, "Wrong arguments for WSuggestionPopup.showAt"); + } +} + +static const char* WSuggestionPopup_removeEdit_args0[] = {luawt_typeToStr(), luawt_typeToStr(), NULL}; +static const char* const* const luawt_WSuggestionPopup_removeEdit_args[] = {WSuggestionPopup_removeEdit_args0, NULL}; + +int luawt_WSuggestionPopup_removeEdit(lua_State* L) { + int index = luawt_getSuitableArgsGroup(L, luawt_WSuggestionPopup_removeEdit_args); + WSuggestionPopup* self = luawt_checkFromLua(L, 1); + if (index == 0) { + Wt::WFormWidget* edit = + luawt_checkFromLua(L, 2); + self->removeEdit(edit); + return 0; + + } else { + return luaL_error(L, "Wrong arguments for WSuggestionPopup.removeEdit"); + } +} + +static const char* WSuggestionPopup_setFilterLength_args0[] = {luawt_typeToStr(), "int", NULL}; +static const char* const* const luawt_WSuggestionPopup_setFilterLength_args[] = {WSuggestionPopup_setFilterLength_args0, NULL}; + +int luawt_WSuggestionPopup_setFilterLength(lua_State* L) { + int index = luawt_getSuitableArgsGroup(L, luawt_WSuggestionPopup_setFilterLength_args); + WSuggestionPopup* self = luawt_checkFromLua(L, 1); + if (index == 0) { + int count = lua_tointeger(L, 2); + self->setFilterLength(count); + return 0; + + } else { + return luaL_error(L, "Wrong arguments for WSuggestionPopup.setFilterLength"); + } +} + +static const char* WSuggestionPopup_filterLength_args0[] = {luawt_typeToStr(), NULL}; +static const char* const* const luawt_WSuggestionPopup_filterLength_args[] = {WSuggestionPopup_filterLength_args0, NULL}; + +int luawt_WSuggestionPopup_filterLength(lua_State* L) { + int index = luawt_getSuitableArgsGroup(L, luawt_WSuggestionPopup_filterLength_args); + WSuggestionPopup* self = luawt_checkFromLua(L, 1); + if (index == 0) { + int l_result = self->filterLength(); + lua_pushinteger(L, l_result); + return 1; + + } else { + return luaL_error(L, "Wrong arguments for WSuggestionPopup.filterLength"); + } +} + +static const char* WSuggestionPopup_setModelColumn_args0[] = {luawt_typeToStr(), "int", NULL}; +static const char* const* const luawt_WSuggestionPopup_setModelColumn_args[] = {WSuggestionPopup_setModelColumn_args0, NULL}; + +int luawt_WSuggestionPopup_setModelColumn(lua_State* L) { + int index = luawt_getSuitableArgsGroup(L, luawt_WSuggestionPopup_setModelColumn_args); + WSuggestionPopup* self = luawt_checkFromLua(L, 1); + if (index == 0) { + int index = lua_tointeger(L, 2); + self->setModelColumn(index); + return 0; + + } else { + return luaL_error(L, "Wrong arguments for WSuggestionPopup.setModelColumn"); + } +} + +static const char* WSuggestionPopup_defaultIndex_args0[] = {luawt_typeToStr(), NULL}; +static const char* const* const luawt_WSuggestionPopup_defaultIndex_args[] = {WSuggestionPopup_defaultIndex_args0, NULL}; + +int luawt_WSuggestionPopup_defaultIndex(lua_State* L) { + int index = luawt_getSuitableArgsGroup(L, luawt_WSuggestionPopup_defaultIndex_args); + WSuggestionPopup* self = luawt_checkFromLua(L, 1); + if (index == 0) { + int l_result = self->defaultIndex(); + lua_pushinteger(L, l_result); + return 1; + + } else { + return luaL_error(L, "Wrong arguments for WSuggestionPopup.defaultIndex"); + } +} + +static const char* WSuggestionPopup_setDefaultIndex_args0[] = {luawt_typeToStr(), "int", NULL}; +static const char* const* const luawt_WSuggestionPopup_setDefaultIndex_args[] = {WSuggestionPopup_setDefaultIndex_args0, NULL}; + +int luawt_WSuggestionPopup_setDefaultIndex(lua_State* L) { + int index = luawt_getSuitableArgsGroup(L, luawt_WSuggestionPopup_setDefaultIndex_args); + WSuggestionPopup* self = luawt_checkFromLua(L, 1); + if (index == 0) { + int row = lua_tointeger(L, 2); + self->setDefaultIndex(row); + return 0; + + } else { + return luaL_error(L, "Wrong arguments for WSuggestionPopup.setDefaultIndex"); + } +} + + +static const luaL_Reg luawt_WSuggestionPopup_methods[] = { + METHOD(WSuggestionPopup, forEdit), + METHOD(WSuggestionPopup, removeEdit), + METHOD(WSuggestionPopup, showAt), + METHOD(WSuggestionPopup, clearSuggestions), + METHOD(WSuggestionPopup, addSuggestion), + METHOD(WSuggestionPopup, setModelColumn), + METHOD(WSuggestionPopup, setDefaultIndex), + METHOD(WSuggestionPopup, defaultIndex), + METHOD(WSuggestionPopup, setFilterLength), + METHOD(WSuggestionPopup, filterLength), + METHOD(WSuggestionPopup, setGlobalPopup), + {NULL, NULL}, +}; + +void luawt_WSuggestionPopup(lua_State* L) { + const char* base = luawt_typeToStr(); + assert(base); + DECLARE_CLASS( + WSuggestionPopup, + L, + 0, + 0, + luawt_WSuggestionPopup_methods, + base + ); +} diff --git a/src/luawt/WTabWidget.cpp b/src/luawt/WTabWidget.cpp index 9e4465a..4580cd3 100644 --- a/src/luawt/WTabWidget.cpp +++ b/src/luawt/WTabWidget.cpp @@ -16,22 +16,22 @@ static const char* const* const luawt_WTabWidget_make_args[] = {WTabWidget_make_ int luawt_WTabWidget_make(lua_State* L) { int index = luawt_getSuitableArgsGroup(L, luawt_WTabWidget_make_args); if (index == 0) { - WTabWidget * result = new WTabWidget(); + WTabWidget * l_result = new WTabWidget(); MyApplication* app = MyApplication::instance(); if (!app) { - delete result; + delete l_result; throw std::logic_error("No WApplication when creating WTabWidget"); } - app->root()->addWidget(result); + app->root()->addWidget(l_result); - luawt_toLua(L, result); + luawt_toLua(L, l_result); return 1; } else if (index == 1) { Wt::WContainerWidget* parent = luawt_checkFromLua(L, 1); - WTabWidget * result = new WTabWidget(parent); - luawt_toLua(L, result); + WTabWidget * l_result = new WTabWidget(parent); + luawt_toLua(L, l_result); return 1; } else { @@ -47,8 +47,8 @@ int luawt_WTabWidget_tabToolTip(lua_State* L) { WTabWidget* self = luawt_checkFromLua(L, 1); if (index == 0) { int index = lua_tointeger(L, 2); - Wt::WString const & result = self->tabToolTip(index); - lua_pushstring(L, result.toUTF8().c_str()); + Wt::WString const & l_result = self->tabToolTip(index); + lua_pushstring(L, l_result.toUTF8().c_str()); return 1; } else { @@ -64,8 +64,8 @@ int luawt_WTabWidget_isTabEnabled(lua_State* L) { WTabWidget* self = luawt_checkFromLua(L, 1); if (index == 0) { int index = lua_tointeger(L, 2); - bool result = self->isTabEnabled(index); - lua_pushboolean(L, result); + bool l_result = self->isTabEnabled(index); + lua_pushboolean(L, l_result); return 1; } else { @@ -80,8 +80,8 @@ int luawt_WTabWidget_internalBasePath(lua_State* L) { int index = luawt_getSuitableArgsGroup(L, luawt_WTabWidget_internalBasePath_args); WTabWidget* self = luawt_checkFromLua(L, 1); if (index == 0) { - std::string const & result = self->internalBasePath(); - lua_pushstring(L, result.c_str()); + std::string const & l_result = self->internalBasePath(); + lua_pushstring(L, l_result.c_str()); return 1; } else { @@ -112,8 +112,8 @@ int luawt_WTabWidget_currentWidget(lua_State* L) { int index = luawt_getSuitableArgsGroup(L, luawt_WTabWidget_currentWidget_args); WTabWidget* self = luawt_checkFromLua(L, 1); if (index == 0) { - Wt::WWidget * result = self->currentWidget(); - luawt_toLua(L, result); + Wt::WWidget * l_result = self->currentWidget(); + luawt_toLua(L, l_result); return 1; } else { @@ -184,8 +184,8 @@ int luawt_WTabWidget_isTabCloseable(lua_State* L) { WTabWidget* self = luawt_checkFromLua(L, 1); if (index == 0) { int index = lua_tointeger(L, 2); - bool result = self->isTabCloseable(index); - lua_pushboolean(L, result); + bool l_result = self->isTabCloseable(index); + lua_pushboolean(L, l_result); return 1; } else { @@ -201,8 +201,8 @@ int luawt_WTabWidget_widget(lua_State* L) { WTabWidget* self = luawt_checkFromLua(L, 1); if (index == 0) { int index = lua_tointeger(L, 2); - Wt::WWidget * result = self->widget(index); - luawt_toLua(L, result); + Wt::WWidget * l_result = self->widget(index); + luawt_toLua(L, l_result); return 1; } else { @@ -236,8 +236,8 @@ int luawt_WTabWidget_indexOf(lua_State* L) { if (index == 0) { Wt::WWidget* widget = luawt_checkFromLua(L, 2); - int result = self->indexOf(widget); - lua_pushinteger(L, result); + int l_result = self->indexOf(widget); + lua_pushinteger(L, l_result); return 1; } else { @@ -252,8 +252,8 @@ int luawt_WTabWidget_internalPathEnabled(lua_State* L) { int index = luawt_getSuitableArgsGroup(L, luawt_WTabWidget_internalPathEnabled_args); WTabWidget* self = luawt_checkFromLua(L, 1); if (index == 0) { - bool result = self->internalPathEnabled(); - lua_pushboolean(L, result); + bool l_result = self->internalPathEnabled(); + lua_pushboolean(L, l_result); return 1; } else { @@ -269,8 +269,8 @@ int luawt_WTabWidget_tabText(lua_State* L) { WTabWidget* self = luawt_checkFromLua(L, 1); if (index == 0) { int index = lua_tointeger(L, 2); - Wt::WString const & result = self->tabText(index); - lua_pushstring(L, result.toUTF8().c_str()); + Wt::WString const & l_result = self->tabText(index); + lua_pushstring(L, l_result.toUTF8().c_str()); return 1; } else { @@ -290,8 +290,8 @@ int luawt_WTabWidget_addTab(lua_State* L) { luawt_checkFromLua(L, 2); char const * raw3 = lua_tostring(L, 3); Wt::WString label = Wt::WString(raw3); - Wt::WMenuItem * result = self->addTab(child, label); - luawt_toLua(L, result); + Wt::WMenuItem * l_result = self->addTab(child, label); + luawt_toLua(L, l_result); return 1; } else if (index == 1) { @@ -300,8 +300,8 @@ int luawt_WTabWidget_addTab(lua_State* L) { char const * raw3 = lua_tostring(L, 3); Wt::WString label = Wt::WString(raw3); Wt::WTabWidget::LoadPolicy arg2 = static_cast(lua_tointeger(L, 4)); - Wt::WMenuItem * result = self->addTab(child, label, arg2); - luawt_toLua(L, result); + Wt::WMenuItem * l_result = self->addTab(child, label, arg2); + luawt_toLua(L, l_result); return 1; } else { @@ -333,8 +333,8 @@ int luawt_WTabWidget_contentsStack(lua_State* L) { int index = luawt_getSuitableArgsGroup(L, luawt_WTabWidget_contentsStack_args); WTabWidget* self = luawt_checkFromLua(L, 1); if (index == 0) { - Wt::WStackedWidget * result = self->contentsStack(); - luawt_toLua(L, result); + Wt::WStackedWidget * l_result = self->contentsStack(); + luawt_toLua(L, l_result); return 1; } else { @@ -349,8 +349,8 @@ int luawt_WTabWidget_count(lua_State* L) { int index = luawt_getSuitableArgsGroup(L, luawt_WTabWidget_count_args); WTabWidget* self = luawt_checkFromLua(L, 1); if (index == 0) { - int result = self->count(); - lua_pushinteger(L, result); + int l_result = self->count(); + lua_pushinteger(L, l_result); return 1; } else { @@ -435,8 +435,8 @@ int luawt_WTabWidget_currentIndex(lua_State* L) { int index = luawt_getSuitableArgsGroup(L, luawt_WTabWidget_currentIndex_args); WTabWidget* self = luawt_checkFromLua(L, 1); if (index == 0) { - int result = self->currentIndex(); - lua_pushinteger(L, result); + int l_result = self->currentIndex(); + lua_pushinteger(L, l_result); return 1; } else { @@ -452,8 +452,8 @@ int luawt_WTabWidget_isTabHidden(lua_State* L) { WTabWidget* self = luawt_checkFromLua(L, 1); if (index == 0) { int index = lua_tointeger(L, 2); - bool result = self->isTabHidden(index); - lua_pushboolean(L, result); + bool l_result = self->isTabHidden(index); + lua_pushboolean(L, l_result); return 1; } else { diff --git a/src/luawt/WTable.cpp b/src/luawt/WTable.cpp index 6854882..aad44f5 100644 --- a/src/luawt/WTable.cpp +++ b/src/luawt/WTable.cpp @@ -13,22 +13,22 @@ static const char* const* const luawt_WTable_make_args[] = {WTable_make_args0, W int luawt_WTable_make(lua_State* L) { int index = luawt_getSuitableArgsGroup(L, luawt_WTable_make_args); if (index == 0) { - WTable * result = new WTable(); + WTable * l_result = new WTable(); MyApplication* app = MyApplication::instance(); if (!app) { - delete result; + delete l_result; throw std::logic_error("No WApplication when creating WTable"); } - app->root()->addWidget(result); + app->root()->addWidget(l_result); - luawt_toLua(L, result); + luawt_toLua(L, l_result); return 1; } else if (index == 1) { Wt::WContainerWidget* parent = luawt_checkFromLua(L, 1); - WTable * result = new WTable(parent); - luawt_toLua(L, result); + WTable * l_result = new WTable(parent); + luawt_toLua(L, l_result); return 1; } else { @@ -43,8 +43,8 @@ int luawt_WTable_columnCount(lua_State* L) { int index = luawt_getSuitableArgsGroup(L, luawt_WTable_columnCount_args); WTable* self = luawt_checkFromLua(L, 1); if (index == 0) { - int result = self->columnCount(); - lua_pushinteger(L, result); + int l_result = self->columnCount(); + lua_pushinteger(L, l_result); return 1; } else { @@ -84,8 +84,8 @@ int luawt_WTable_elementAt(lua_State* L) { if (index == 0) { int row = lua_tointeger(L, 2); int column = lua_tointeger(L, 3); - Wt::WTableCell * result = self->elementAt(row, column); - luawt_toLua(L, result); + Wt::WTableCell * l_result = self->elementAt(row, column); + luawt_toLua(L, l_result); return 1; } else { @@ -118,14 +118,14 @@ int luawt_WTable_headerCount(lua_State* L) { int index = luawt_getSuitableArgsGroup(L, luawt_WTable_headerCount_args); WTable* self = luawt_checkFromLua(L, 1); if (index == 0) { - int result = self->headerCount(); - lua_pushinteger(L, result); + int l_result = self->headerCount(); + lua_pushinteger(L, l_result); return 1; } else if (index == 1) { Wt::Orientation orientation = static_cast(lua_tointeger(L, 2)); - int result = self->headerCount(orientation); - lua_pushinteger(L, result); + int l_result = self->headerCount(orientation); + lua_pushinteger(L, l_result); return 1; } else { @@ -172,8 +172,8 @@ int luawt_WTable_rowCount(lua_State* L) { int index = luawt_getSuitableArgsGroup(L, luawt_WTable_rowCount_args); WTable* self = luawt_checkFromLua(L, 1); if (index == 0) { - int result = self->rowCount(); - lua_pushinteger(L, result); + int l_result = self->rowCount(); + lua_pushinteger(L, l_result); return 1; } else { diff --git a/src/luawt/WTableCell.cpp b/src/luawt/WTableCell.cpp new file mode 100644 index 0000000..368de94 --- /dev/null +++ b/src/luawt/WTableCell.cpp @@ -0,0 +1,185 @@ +#include "boost-xtime.hpp" + +#include +#include + +#include "globals.hpp" + +static const char* WTableCell_rowSpan_args0[] = {luawt_typeToStr(), NULL}; +static const char* const* const luawt_WTableCell_rowSpan_args[] = {WTableCell_rowSpan_args0, NULL}; + +int luawt_WTableCell_rowSpan(lua_State* L) { + int index = luawt_getSuitableArgsGroup(L, luawt_WTableCell_rowSpan_args); + WTableCell* self = luawt_checkFromLua(L, 1); + if (index == 0) { + int l_result = self->rowSpan(); + lua_pushinteger(L, l_result); + return 1; + + } else { + return luaL_error(L, "Wrong arguments for WTableCell.rowSpan"); + } +} + +static const char* WTableCell_column_args0[] = {luawt_typeToStr(), NULL}; +static const char* const* const luawt_WTableCell_column_args[] = {WTableCell_column_args0, NULL}; + +int luawt_WTableCell_column(lua_State* L) { + int index = luawt_getSuitableArgsGroup(L, luawt_WTableCell_column_args); + WTableCell* self = luawt_checkFromLua(L, 1); + if (index == 0) { + int l_result = self->column(); + lua_pushinteger(L, l_result); + return 1; + + } else { + return luaL_error(L, "Wrong arguments for WTableCell.column"); + } +} + +static const char* WTableCell_setRowSpan_args0[] = {luawt_typeToStr(), "int", NULL}; +static const char* const* const luawt_WTableCell_setRowSpan_args[] = {WTableCell_setRowSpan_args0, NULL}; + +int luawt_WTableCell_setRowSpan(lua_State* L) { + int index = luawt_getSuitableArgsGroup(L, luawt_WTableCell_setRowSpan_args); + WTableCell* self = luawt_checkFromLua(L, 1); + if (index == 0) { + int rowSpan = lua_tointeger(L, 2); + self->setRowSpan(rowSpan); + return 0; + + } else { + return luaL_error(L, "Wrong arguments for WTableCell.setRowSpan"); + } +} + +static const char* WTableCell_setColumnSpan_args0[] = {luawt_typeToStr(), "int", NULL}; +static const char* const* const luawt_WTableCell_setColumnSpan_args[] = {WTableCell_setColumnSpan_args0, NULL}; + +int luawt_WTableCell_setColumnSpan(lua_State* L) { + int index = luawt_getSuitableArgsGroup(L, luawt_WTableCell_setColumnSpan_args); + WTableCell* self = luawt_checkFromLua(L, 1); + if (index == 0) { + int colSpan = lua_tointeger(L, 2); + self->setColumnSpan(colSpan); + return 0; + + } else { + return luaL_error(L, "Wrong arguments for WTableCell.setColumnSpan"); + } +} + +static const char* WTableCell_columnSpan_args0[] = {luawt_typeToStr(), NULL}; +static const char* const* const luawt_WTableCell_columnSpan_args[] = {WTableCell_columnSpan_args0, NULL}; + +int luawt_WTableCell_columnSpan(lua_State* L) { + int index = luawt_getSuitableArgsGroup(L, luawt_WTableCell_columnSpan_args); + WTableCell* self = luawt_checkFromLua(L, 1); + if (index == 0) { + int l_result = self->columnSpan(); + lua_pushinteger(L, l_result); + return 1; + + } else { + return luaL_error(L, "Wrong arguments for WTableCell.columnSpan"); + } +} + +static const char* WTableCell_table_args0[] = {luawt_typeToStr(), NULL}; +static const char* const* const luawt_WTableCell_table_args[] = {WTableCell_table_args0, NULL}; + +int luawt_WTableCell_table(lua_State* L) { + int index = luawt_getSuitableArgsGroup(L, luawt_WTableCell_table_args); + WTableCell* self = luawt_checkFromLua(L, 1); + if (index == 0) { + Wt::WTable * l_result = self->table(); + luawt_toLua(L, l_result); + return 1; + + } else { + return luaL_error(L, "Wrong arguments for WTableCell.table"); + } +} + +static const char* WTableCell_row_args0[] = {luawt_typeToStr(), NULL}; +static const char* const* const luawt_WTableCell_row_args[] = {WTableCell_row_args0, NULL}; + +int luawt_WTableCell_row(lua_State* L) { + int index = luawt_getSuitableArgsGroup(L, luawt_WTableCell_row_args); + WTableCell* self = luawt_checkFromLua(L, 1); + if (index == 0) { + int l_result = self->row(); + lua_pushinteger(L, l_result); + return 1; + + } else { + return luaL_error(L, "Wrong arguments for WTableCell.row"); + } +} + +ADD_SIGNAL(scrolled, WTableCell, Wt::WScrollEvent) +ADD_SIGNAL(keyWentDown, WTableCell, Wt::WKeyEvent) +ADD_SIGNAL(keyPressed, WTableCell, Wt::WKeyEvent) +ADD_SIGNAL(keyWentUp, WTableCell, Wt::WKeyEvent) +ADD_SIGNAL(enterPressed, WTableCell, Wt::NoClass) +ADD_SIGNAL(escapePressed, WTableCell, Wt::NoClass) +ADD_SIGNAL(clicked, WTableCell, Wt::WMouseEvent) +ADD_SIGNAL(doubleClicked, WTableCell, Wt::WMouseEvent) +ADD_SIGNAL(mouseWentDown, WTableCell, Wt::WMouseEvent) +ADD_SIGNAL(mouseWentUp, WTableCell, Wt::WMouseEvent) +ADD_SIGNAL(mouseWentOut, WTableCell, Wt::WMouseEvent) +ADD_SIGNAL(mouseWentOver, WTableCell, Wt::WMouseEvent) +ADD_SIGNAL(mouseMoved, WTableCell, Wt::WMouseEvent) +ADD_SIGNAL(mouseDragged, WTableCell, Wt::WMouseEvent) +ADD_SIGNAL(mouseWheel, WTableCell, Wt::WMouseEvent) +ADD_SIGNAL(touchStarted, WTableCell, Wt::WTouchEvent) +ADD_SIGNAL(touchEnded, WTableCell, Wt::WTouchEvent) +ADD_SIGNAL(touchMoved, WTableCell, Wt::WTouchEvent) +ADD_SIGNAL(gestureStarted, WTableCell, Wt::WGestureEvent) +ADD_SIGNAL(gestureChanged, WTableCell, Wt::WGestureEvent) +ADD_SIGNAL(gestureEnded, WTableCell, Wt::WGestureEvent) + +static const luaL_Reg luawt_WTableCell_methods[] = { + METHOD(WTableCell, setRowSpan), + METHOD(WTableCell, rowSpan), + METHOD(WTableCell, setColumnSpan), + METHOD(WTableCell, columnSpan), + METHOD(WTableCell, row), + METHOD(WTableCell, column), + METHOD(WTableCell, table), + METHOD(WTableCell, scrolled), + METHOD(WTableCell, keyWentDown), + METHOD(WTableCell, keyPressed), + METHOD(WTableCell, keyWentUp), + METHOD(WTableCell, enterPressed), + METHOD(WTableCell, escapePressed), + METHOD(WTableCell, clicked), + METHOD(WTableCell, doubleClicked), + METHOD(WTableCell, mouseWentDown), + METHOD(WTableCell, mouseWentUp), + METHOD(WTableCell, mouseWentOut), + METHOD(WTableCell, mouseWentOver), + METHOD(WTableCell, mouseMoved), + METHOD(WTableCell, mouseDragged), + METHOD(WTableCell, mouseWheel), + METHOD(WTableCell, touchStarted), + METHOD(WTableCell, touchEnded), + METHOD(WTableCell, touchMoved), + METHOD(WTableCell, gestureStarted), + METHOD(WTableCell, gestureChanged), + METHOD(WTableCell, gestureEnded), + {NULL, NULL}, +}; + +void luawt_WTableCell(lua_State* L) { + const char* base = luawt_typeToStr(); + assert(base); + DECLARE_CLASS( + WTableCell, + L, + 0, + 0, + luawt_WTableCell_methods, + base + ); +} diff --git a/src/luawt/WTableView.cpp b/src/luawt/WTableView.cpp index eb55393..c5b9d06 100644 --- a/src/luawt/WTableView.cpp +++ b/src/luawt/WTableView.cpp @@ -1,5 +1,6 @@ #include "boost-xtime.hpp" +#include #include #include @@ -12,22 +13,22 @@ static const char* const* const luawt_WTableView_make_args[] = {WTableView_make_ int luawt_WTableView_make(lua_State* L) { int index = luawt_getSuitableArgsGroup(L, luawt_WTableView_make_args); if (index == 0) { - WTableView * result = new WTableView(); + WTableView * l_result = new WTableView(); MyApplication* app = MyApplication::instance(); if (!app) { - delete result; + delete l_result; throw std::logic_error("No WApplication when creating WTableView"); } - app->root()->addWidget(result); + app->root()->addWidget(l_result); - luawt_toLua(L, result); + luawt_toLua(L, l_result); return 1; } else if (index == 1) { Wt::WContainerWidget* parent = luawt_checkFromLua(L, 1); - WTableView * result = new WTableView(parent); - luawt_toLua(L, result); + WTableView * l_result = new WTableView(parent); + luawt_toLua(L, l_result); return 1; } else { @@ -35,6 +36,39 @@ int luawt_WTableView_make(lua_State* L) { } } +static const char* WTableView_setRowHeight_args0[] = {luawt_typeToStr(), "double", NULL}; +static const char* const* const luawt_WTableView_setRowHeight_args[] = {WTableView_setRowHeight_args0, NULL}; + +int luawt_WTableView_setRowHeight(lua_State* L) { + int index = luawt_getSuitableArgsGroup(L, luawt_WTableView_setRowHeight_args); + WTableView* self = luawt_checkFromLua(L, 1); + if (index == 0) { + double raw2 = lua_tonumber(L, 2); + Wt::WLength rowHeight = Wt::WLength(raw2); + self->setRowHeight(rowHeight); + return 0; + + } else { + return luaL_error(L, "Wrong arguments for WTableView.setRowHeight"); + } +} + +static const char* WTableView_currentPage_args0[] = {luawt_typeToStr(), NULL}; +static const char* const* const luawt_WTableView_currentPage_args[] = {WTableView_currentPage_args0, NULL}; + +int luawt_WTableView_currentPage(lua_State* L) { + int index = luawt_getSuitableArgsGroup(L, luawt_WTableView_currentPage_args); + WTableView* self = luawt_checkFromLua(L, 1); + if (index == 0) { + int l_result = self->currentPage(); + lua_pushinteger(L, l_result); + return 1; + + } else { + return luaL_error(L, "Wrong arguments for WTableView.currentPage"); + } +} + static const char* WTableView_pageSize_args0[] = {luawt_typeToStr(), NULL}; static const char* const* const luawt_WTableView_pageSize_args[] = {WTableView_pageSize_args0, NULL}; @@ -42,8 +76,8 @@ int luawt_WTableView_pageSize(lua_State* L) { int index = luawt_getSuitableArgsGroup(L, luawt_WTableView_pageSize_args); WTableView* self = luawt_checkFromLua(L, 1); if (index == 0) { - int result = self->pageSize(); - lua_pushinteger(L, result); + int l_result = self->pageSize(); + lua_pushinteger(L, l_result); return 1; } else { @@ -58,8 +92,8 @@ int luawt_WTableView_pageCount(lua_State* L) { int index = luawt_getSuitableArgsGroup(L, luawt_WTableView_pageCount_args); WTableView* self = luawt_checkFromLua(L, 1); if (index == 0) { - int result = self->pageCount(); - lua_pushinteger(L, result); + int l_result = self->pageCount(); + lua_pushinteger(L, l_result); return 1; } else { @@ -100,6 +134,24 @@ int luawt_WTableView_setAlternatingRowColors(lua_State* L) { } } +static const char* WTableView_setColumnWidth_args0[] = {luawt_typeToStr(), "int", "double", NULL}; +static const char* const* const luawt_WTableView_setColumnWidth_args[] = {WTableView_setColumnWidth_args0, NULL}; + +int luawt_WTableView_setColumnWidth(lua_State* L) { + int index = luawt_getSuitableArgsGroup(L, luawt_WTableView_setColumnWidth_args); + WTableView* self = luawt_checkFromLua(L, 1); + if (index == 0) { + int column = lua_tointeger(L, 2); + double raw3 = lua_tonumber(L, 3); + Wt::WLength width = Wt::WLength(raw3); + self->setColumnWidth(column, width); + return 0; + + } else { + return luaL_error(L, "Wrong arguments for WTableView.setColumnWidth"); + } +} + static const char* WTableView_setRowHeaderCount_args0[] = {luawt_typeToStr(), "int", NULL}; static const char* const* const luawt_WTableView_setRowHeaderCount_args[] = {WTableView_setRowHeaderCount_args0, NULL}; @@ -116,19 +168,20 @@ int luawt_WTableView_setRowHeaderCount(lua_State* L) { } } -static const char* WTableView_currentPage_args0[] = {luawt_typeToStr(), NULL}; -static const char* const* const luawt_WTableView_currentPage_args[] = {WTableView_currentPage_args0, NULL}; +static const char* WTableView_setHeaderHeight_args0[] = {luawt_typeToStr(), "double", NULL}; +static const char* const* const luawt_WTableView_setHeaderHeight_args[] = {WTableView_setHeaderHeight_args0, NULL}; -int luawt_WTableView_currentPage(lua_State* L) { - int index = luawt_getSuitableArgsGroup(L, luawt_WTableView_currentPage_args); +int luawt_WTableView_setHeaderHeight(lua_State* L) { + int index = luawt_getSuitableArgsGroup(L, luawt_WTableView_setHeaderHeight_args); WTableView* self = luawt_checkFromLua(L, 1); if (index == 0) { - int result = self->currentPage(); - lua_pushinteger(L, result); - return 1; - + double raw2 = lua_tonumber(L, 2); + Wt::WLength height = Wt::WLength(raw2); + self->setHeaderHeight(height); + return 0; + } else { - return luaL_error(L, "Wrong arguments for WTableView.currentPage"); + return luaL_error(L, "Wrong arguments for WTableView.setHeaderHeight"); } } @@ -148,9 +201,32 @@ int luawt_WTableView_setCurrentPage(lua_State* L) { } } +static const char* WTableView_resize_args0[] = {luawt_typeToStr(), "double", "double", NULL}; +static const char* const* const luawt_WTableView_resize_args[] = {WTableView_resize_args0, NULL}; + +int luawt_WTableView_resize(lua_State* L) { + int index = luawt_getSuitableArgsGroup(L, luawt_WTableView_resize_args); + WTableView* self = luawt_checkFromLua(L, 1); + if (index == 0) { + double raw2 = lua_tonumber(L, 2); + Wt::WLength width = Wt::WLength(raw2); + double raw3 = lua_tonumber(L, 3); + Wt::WLength height = Wt::WLength(raw3); + self->resize(width, height); + return 0; + + } else { + return luaL_error(L, "Wrong arguments for WTableView.resize"); + } +} + static const luaL_Reg luawt_WTableView_methods[] = { + METHOD(WTableView, setColumnWidth), METHOD(WTableView, setAlternatingRowColors), + METHOD(WTableView, setRowHeight), + METHOD(WTableView, setHeaderHeight), + METHOD(WTableView, resize), METHOD(WTableView, setColumnHidden), METHOD(WTableView, setRowHeaderCount), METHOD(WTableView, pageCount), diff --git a/src/luawt/WTemplate.cpp b/src/luawt/WTemplate.cpp index 78968b4..5ed9065 100644 --- a/src/luawt/WTemplate.cpp +++ b/src/luawt/WTemplate.cpp @@ -16,36 +16,36 @@ static const char* const* const luawt_WTemplate_make_args[] = {WTemplate_make_ar int luawt_WTemplate_make(lua_State* L) { int index = luawt_getSuitableArgsGroup(L, luawt_WTemplate_make_args); if (index == 0) { - WTemplate * result = new WTemplate(); + WTemplate * l_result = new WTemplate(); MyApplication* app = MyApplication::instance(); if (!app) { - delete result; + delete l_result; throw std::logic_error("No WApplication when creating WTemplate"); } - app->root()->addWidget(result); + app->root()->addWidget(l_result); - luawt_toLua(L, result); + luawt_toLua(L, l_result); return 1; } else if (index == 1) { Wt::WContainerWidget* parent = luawt_checkFromLua(L, 1); - WTemplate * result = new WTemplate(parent); - luawt_toLua(L, result); + WTemplate * l_result = new WTemplate(parent); + luawt_toLua(L, l_result); return 1; } else if (index == 2) { char const * raw1 = lua_tostring(L, 1); Wt::WString text = Wt::WString(raw1); - WTemplate * result = new WTemplate(text); + WTemplate * l_result = new WTemplate(text); MyApplication* app = MyApplication::instance(); if (!app) { - delete result; + delete l_result; throw std::logic_error("No WApplication when creating WTemplate"); } - app->root()->addWidget(result); + app->root()->addWidget(l_result); - luawt_toLua(L, result); + luawt_toLua(L, l_result); return 1; } else if (index == 3) { @@ -53,8 +53,8 @@ int luawt_WTemplate_make(lua_State* L) { Wt::WString text = Wt::WString(raw1); Wt::WContainerWidget* parent = luawt_checkFromLua(L, 2); - WTemplate * result = new WTemplate(text, parent); - luawt_toLua(L, result); + WTemplate * l_result = new WTemplate(text, parent); + luawt_toLua(L, l_result); return 1; } else { @@ -71,8 +71,8 @@ int luawt_WTemplate_conditionValue(lua_State* L) { if (index == 0) { char const * raw2 = lua_tostring(L, 2); std::string name = std::string(raw2); - bool result = self->conditionValue(name); - lua_pushboolean(L, result); + bool l_result = self->conditionValue(name); + lua_pushboolean(L, l_result); return 1; } else { @@ -147,8 +147,8 @@ int luawt_WTemplate_hasInternalPathEncoding(lua_State* L) { int index = luawt_getSuitableArgsGroup(L, luawt_WTemplate_hasInternalPathEncoding_args); WTemplate* self = luawt_checkFromLua(L, 1); if (index == 0) { - bool result = self->hasInternalPathEncoding(); - lua_pushboolean(L, result); + bool l_result = self->hasInternalPathEncoding(); + lua_pushboolean(L, l_result); return 1; } else { @@ -163,8 +163,8 @@ int luawt_WTemplate_templateText(lua_State* L) { int index = luawt_getSuitableArgsGroup(L, luawt_WTemplate_templateText_args); WTemplate* self = luawt_checkFromLua(L, 1); if (index == 0) { - Wt::WString const & result = self->templateText(); - lua_pushstring(L, result.toUTF8().c_str()); + Wt::WString const & l_result = self->templateText(); + lua_pushstring(L, l_result.toUTF8().c_str()); return 1; } else { @@ -259,8 +259,8 @@ int luawt_WTemplate_takeWidget(lua_State* L) { if (index == 0) { char const * raw2 = lua_tostring(L, 2); std::string varName = std::string(raw2); - Wt::WWidget * result = self->takeWidget(varName); - luawt_toLua(L, result); + Wt::WWidget * l_result = self->takeWidget(varName); + luawt_toLua(L, l_result); return 1; } else { @@ -277,8 +277,8 @@ int luawt_WTemplate_resolveWidget(lua_State* L) { if (index == 0) { char const * raw2 = lua_tostring(L, 2); std::string varName = std::string(raw2); - Wt::WWidget * result = self->resolveWidget(varName); - luawt_toLua(L, result); + Wt::WWidget * l_result = self->resolveWidget(varName); + luawt_toLua(L, l_result); return 1; } else { diff --git a/src/luawt/WTemplateFormView.cpp b/src/luawt/WTemplateFormView.cpp new file mode 100644 index 0000000..304f289 --- /dev/null +++ b/src/luawt/WTemplateFormView.cpp @@ -0,0 +1,120 @@ +#include "boost-xtime.hpp" + +#include +#include +#include + +#include "globals.hpp" + +static const char* WTemplateFormView_make_args0[] = {NULL}; +static const char* WTemplateFormView_make_args1[] = {luawt_typeToStr(), NULL}; +static const char* WTemplateFormView_make_args2[] = {"char const *", NULL}; +static const char* WTemplateFormView_make_args3[] = {"char const *", luawt_typeToStr(), NULL}; +static const char* const* const luawt_WTemplateFormView_make_args[] = {WTemplateFormView_make_args0, WTemplateFormView_make_args1, WTemplateFormView_make_args2, WTemplateFormView_make_args3, NULL}; + +int luawt_WTemplateFormView_make(lua_State* L) { + int index = luawt_getSuitableArgsGroup(L, luawt_WTemplateFormView_make_args); + if (index == 0) { + WTemplateFormView * l_result = new WTemplateFormView(); + MyApplication* app = MyApplication::instance(); + if (!app) { + delete l_result; + throw std::logic_error("No WApplication when creating WTemplateFormView"); + } + app->root()->addWidget(l_result); + + luawt_toLua(L, l_result); + return 1; + + } else if (index == 1) { + Wt::WContainerWidget* parent = + luawt_checkFromLua(L, 1); + WTemplateFormView * l_result = new WTemplateFormView(parent); + luawt_toLua(L, l_result); + return 1; + + } else if (index == 2) { + char const * raw1 = lua_tostring(L, 1); + Wt::WString text = Wt::WString(raw1); + WTemplateFormView * l_result = new WTemplateFormView(text); + MyApplication* app = MyApplication::instance(); + if (!app) { + delete l_result; + throw std::logic_error("No WApplication when creating WTemplateFormView"); + } + app->root()->addWidget(l_result); + + luawt_toLua(L, l_result); + return 1; + + } else if (index == 3) { + char const * raw1 = lua_tostring(L, 1); + Wt::WString text = Wt::WString(raw1); + Wt::WContainerWidget* parent = + luawt_checkFromLua(L, 2); + WTemplateFormView * l_result = new WTemplateFormView(text, parent); + luawt_toLua(L, l_result); + return 1; + + } else { + return luaL_error(L, "Wrong arguments for WTemplateFormView.make"); + } +} + +ADD_SIGNAL(keyWentDown, WTemplateFormView, Wt::WKeyEvent) +ADD_SIGNAL(keyPressed, WTemplateFormView, Wt::WKeyEvent) +ADD_SIGNAL(keyWentUp, WTemplateFormView, Wt::WKeyEvent) +ADD_SIGNAL(enterPressed, WTemplateFormView, Wt::NoClass) +ADD_SIGNAL(escapePressed, WTemplateFormView, Wt::NoClass) +ADD_SIGNAL(clicked, WTemplateFormView, Wt::WMouseEvent) +ADD_SIGNAL(doubleClicked, WTemplateFormView, Wt::WMouseEvent) +ADD_SIGNAL(mouseWentDown, WTemplateFormView, Wt::WMouseEvent) +ADD_SIGNAL(mouseWentUp, WTemplateFormView, Wt::WMouseEvent) +ADD_SIGNAL(mouseWentOut, WTemplateFormView, Wt::WMouseEvent) +ADD_SIGNAL(mouseWentOver, WTemplateFormView, Wt::WMouseEvent) +ADD_SIGNAL(mouseMoved, WTemplateFormView, Wt::WMouseEvent) +ADD_SIGNAL(mouseDragged, WTemplateFormView, Wt::WMouseEvent) +ADD_SIGNAL(mouseWheel, WTemplateFormView, Wt::WMouseEvent) +ADD_SIGNAL(touchStarted, WTemplateFormView, Wt::WTouchEvent) +ADD_SIGNAL(touchEnded, WTemplateFormView, Wt::WTouchEvent) +ADD_SIGNAL(touchMoved, WTemplateFormView, Wt::WTouchEvent) +ADD_SIGNAL(gestureStarted, WTemplateFormView, Wt::WGestureEvent) +ADD_SIGNAL(gestureChanged, WTemplateFormView, Wt::WGestureEvent) +ADD_SIGNAL(gestureEnded, WTemplateFormView, Wt::WGestureEvent) + +static const luaL_Reg luawt_WTemplateFormView_methods[] = { + METHOD(WTemplateFormView, keyWentDown), + METHOD(WTemplateFormView, keyPressed), + METHOD(WTemplateFormView, keyWentUp), + METHOD(WTemplateFormView, enterPressed), + METHOD(WTemplateFormView, escapePressed), + METHOD(WTemplateFormView, clicked), + METHOD(WTemplateFormView, doubleClicked), + METHOD(WTemplateFormView, mouseWentDown), + METHOD(WTemplateFormView, mouseWentUp), + METHOD(WTemplateFormView, mouseWentOut), + METHOD(WTemplateFormView, mouseWentOver), + METHOD(WTemplateFormView, mouseMoved), + METHOD(WTemplateFormView, mouseDragged), + METHOD(WTemplateFormView, mouseWheel), + METHOD(WTemplateFormView, touchStarted), + METHOD(WTemplateFormView, touchEnded), + METHOD(WTemplateFormView, touchMoved), + METHOD(WTemplateFormView, gestureStarted), + METHOD(WTemplateFormView, gestureChanged), + METHOD(WTemplateFormView, gestureEnded), + {NULL, NULL}, +}; + +void luawt_WTemplateFormView(lua_State* L) { + const char* base = luawt_typeToStr(); + assert(base); + DECLARE_CLASS( + WTemplateFormView, + L, + wrap::func, + 0, + luawt_WTemplateFormView_methods, + base + ); +} diff --git a/src/luawt/WTestEnvironment.cpp b/src/luawt/WTestEnvironment.cpp index 4abd5bb..b269b92 100644 --- a/src/luawt/WTestEnvironment.cpp +++ b/src/luawt/WTestEnvironment.cpp @@ -1,5 +1,5 @@ /* luawt, Lua bindings for Wt - * Copyright (c) 2015-2016 Pavel Dolgov and Boris Nagaev + * Copyright (c) 2015-2017 Pavel Dolgov and Boris Nagaev * * See the LICENSE file for terms of use. */ diff --git a/src/luawt/WText.cpp b/src/luawt/WText.cpp index 5b3ce29..7ee1256 100644 --- a/src/luawt/WText.cpp +++ b/src/luawt/WText.cpp @@ -1,5 +1,6 @@ #include "boost-xtime.hpp" +#include #include #include #include @@ -17,36 +18,36 @@ static const char* const* const luawt_WText_make_args[] = {WText_make_args0, WTe int luawt_WText_make(lua_State* L) { int index = luawt_getSuitableArgsGroup(L, luawt_WText_make_args); if (index == 0) { - WText * result = new WText(); + WText * l_result = new WText(); MyApplication* app = MyApplication::instance(); if (!app) { - delete result; + delete l_result; throw std::logic_error("No WApplication when creating WText"); } - app->root()->addWidget(result); + app->root()->addWidget(l_result); - luawt_toLua(L, result); + luawt_toLua(L, l_result); return 1; } else if (index == 1) { Wt::WContainerWidget* parent = luawt_checkFromLua(L, 1); - WText * result = new WText(parent); - luawt_toLua(L, result); + WText * l_result = new WText(parent); + luawt_toLua(L, l_result); return 1; } else if (index == 2) { char const * raw1 = lua_tostring(L, 1); Wt::WString text = Wt::WString(raw1); - WText * result = new WText(text); + WText * l_result = new WText(text); MyApplication* app = MyApplication::instance(); if (!app) { - delete result; + delete l_result; throw std::logic_error("No WApplication when creating WText"); } - app->root()->addWidget(result); + app->root()->addWidget(l_result); - luawt_toLua(L, result); + luawt_toLua(L, l_result); return 1; } else if (index == 3) { @@ -54,23 +55,23 @@ int luawt_WText_make(lua_State* L) { Wt::WString text = Wt::WString(raw1); Wt::WContainerWidget* parent = luawt_checkFromLua(L, 2); - WText * result = new WText(text, parent); - luawt_toLua(L, result); + WText * l_result = new WText(text, parent); + luawt_toLua(L, l_result); return 1; } else if (index == 4) { char const * raw1 = lua_tostring(L, 1); Wt::WString text = Wt::WString(raw1); Wt::TextFormat textFormat = static_cast(lua_tointeger(L, 2)); - WText * result = new WText(text, textFormat); + WText * l_result = new WText(text, textFormat); MyApplication* app = MyApplication::instance(); if (!app) { - delete result; + delete l_result; throw std::logic_error("No WApplication when creating WText"); } - app->root()->addWidget(result); + app->root()->addWidget(l_result); - luawt_toLua(L, result); + luawt_toLua(L, l_result); return 1; } else if (index == 5) { @@ -79,8 +80,8 @@ int luawt_WText_make(lua_State* L) { Wt::TextFormat textFormat = static_cast(lua_tointeger(L, 2)); Wt::WContainerWidget* parent = luawt_checkFromLua(L, 3); - WText * result = new WText(text, textFormat, parent); - luawt_toLua(L, result); + WText * l_result = new WText(text, textFormat, parent); + luawt_toLua(L, l_result); return 1; } else { @@ -95,8 +96,8 @@ int luawt_WText_hasInternalPathEncoding(lua_State* L) { int index = luawt_getSuitableArgsGroup(L, luawt_WText_hasInternalPathEncoding_args); WText* self = luawt_checkFromLua(L, 1); if (index == 0) { - bool result = self->hasInternalPathEncoding(); - lua_pushboolean(L, result); + bool l_result = self->hasInternalPathEncoding(); + lua_pushboolean(L, l_result); return 1; } else { @@ -111,8 +112,8 @@ int luawt_WText_text(lua_State* L) { int index = luawt_getSuitableArgsGroup(L, luawt_WText_text_args); WText* self = luawt_checkFromLua(L, 1); if (index == 0) { - Wt::WString const & result = self->text(); - lua_pushstring(L, result.toUTF8().c_str()); + Wt::WString const & l_result = self->text(); + lua_pushstring(L, l_result.toUTF8().c_str()); return 1; } else { @@ -129,8 +130,8 @@ int luawt_WText_setText(lua_State* L) { if (index == 0) { char const * raw2 = lua_tostring(L, 2); Wt::WString text = Wt::WString(raw2); - bool result = self->setText(text); - lua_pushboolean(L, result); + bool l_result = self->setText(text); + lua_pushboolean(L, l_result); return 1; } else { @@ -153,6 +154,48 @@ int luawt_WText_refresh(lua_State* L) { } } +static const char* WText_setPadding_args0[] = {luawt_typeToStr(), "double", NULL}; +static const char* WText_setPadding_args1[] = {luawt_typeToStr(), "double", "int", NULL}; +static const char* const* const luawt_WText_setPadding_args[] = {WText_setPadding_args0, WText_setPadding_args1, NULL}; + +int luawt_WText_setPadding(lua_State* L) { + int index = luawt_getSuitableArgsGroup(L, luawt_WText_setPadding_args); + WText* self = luawt_checkFromLua(L, 1); + if (index == 0) { + double raw2 = lua_tonumber(L, 2); + Wt::WLength padding = Wt::WLength(raw2); + self->setPadding(padding); + return 0; + + } else if (index == 1) { + double raw2 = lua_tonumber(L, 2); + Wt::WLength padding = Wt::WLength(raw2); + Wt::WFlags sides = static_cast(lua_tointeger(L, 3)); + self->setPadding(padding, sides); + return 0; + + } else { + return luaL_error(L, "Wrong arguments for WText.setPadding"); + } +} + +static const char* WText_padding_args0[] = {luawt_typeToStr(), "int", NULL}; +static const char* const* const luawt_WText_padding_args[] = {WText_padding_args0, NULL}; + +int luawt_WText_padding(lua_State* L) { + int index = luawt_getSuitableArgsGroup(L, luawt_WText_padding_args); + WText* self = luawt_checkFromLua(L, 1); + if (index == 0) { + Wt::Side side = static_cast(lua_tointeger(L, 2)); + Wt::WLength l_result = self->padding(side); + lua_pushnumber(L, l_result.value()); + return 1; + + } else { + return luaL_error(L, "Wrong arguments for WText.padding"); + } +} + static const char* WText_wordWrap_args0[] = {luawt_typeToStr(), NULL}; static const char* const* const luawt_WText_wordWrap_args[] = {WText_wordWrap_args0, NULL}; @@ -160,8 +203,8 @@ int luawt_WText_wordWrap(lua_State* L) { int index = luawt_getSuitableArgsGroup(L, luawt_WText_wordWrap_args); WText* self = luawt_checkFromLua(L, 1); if (index == 0) { - bool result = self->wordWrap(); - lua_pushboolean(L, result); + bool l_result = self->wordWrap(); + lua_pushboolean(L, l_result); return 1; } else { @@ -192,8 +235,8 @@ int luawt_WText_textFormat(lua_State* L) { int index = luawt_getSuitableArgsGroup(L, luawt_WText_textFormat_args); WText* self = luawt_checkFromLua(L, 1); if (index == 0) { - Wt::TextFormat result = self->textFormat(); - lua_pushinteger(L, result); + Wt::TextFormat l_result = self->textFormat(); + lua_pushinteger(L, l_result); return 1; } else { @@ -209,8 +252,8 @@ int luawt_WText_setTextFormat(lua_State* L) { WText* self = luawt_checkFromLua(L, 1); if (index == 0) { Wt::TextFormat format = static_cast(lua_tointeger(L, 2)); - bool result = self->setTextFormat(format); - lua_pushboolean(L, result); + bool l_result = self->setTextFormat(format); + lua_pushboolean(L, l_result); return 1; } else { @@ -262,6 +305,8 @@ static const luaL_Reg luawt_WText_methods[] = { METHOD(WText, textFormat), METHOD(WText, setWordWrap), METHOD(WText, wordWrap), + METHOD(WText, setPadding), + METHOD(WText, padding), METHOD(WText, setInternalPathEncoding), METHOD(WText, hasInternalPathEncoding), METHOD(WText, refresh), diff --git a/src/luawt/WTextArea.cpp b/src/luawt/WTextArea.cpp index 023276a..3616f0e 100644 --- a/src/luawt/WTextArea.cpp +++ b/src/luawt/WTextArea.cpp @@ -15,36 +15,36 @@ static const char* const* const luawt_WTextArea_make_args[] = {WTextArea_make_ar int luawt_WTextArea_make(lua_State* L) { int index = luawt_getSuitableArgsGroup(L, luawt_WTextArea_make_args); if (index == 0) { - WTextArea * result = new WTextArea(); + WTextArea * l_result = new WTextArea(); MyApplication* app = MyApplication::instance(); if (!app) { - delete result; + delete l_result; throw std::logic_error("No WApplication when creating WTextArea"); } - app->root()->addWidget(result); + app->root()->addWidget(l_result); - luawt_toLua(L, result); + luawt_toLua(L, l_result); return 1; } else if (index == 1) { Wt::WContainerWidget* parent = luawt_checkFromLua(L, 1); - WTextArea * result = new WTextArea(parent); - luawt_toLua(L, result); + WTextArea * l_result = new WTextArea(parent); + luawt_toLua(L, l_result); return 1; } else if (index == 2) { char const * raw1 = lua_tostring(L, 1); Wt::WString content = Wt::WString(raw1); - WTextArea * result = new WTextArea(content); + WTextArea * l_result = new WTextArea(content); MyApplication* app = MyApplication::instance(); if (!app) { - delete result; + delete l_result; throw std::logic_error("No WApplication when creating WTextArea"); } - app->root()->addWidget(result); + app->root()->addWidget(l_result); - luawt_toLua(L, result); + luawt_toLua(L, l_result); return 1; } else if (index == 3) { @@ -52,8 +52,8 @@ int luawt_WTextArea_make(lua_State* L) { Wt::WString content = Wt::WString(raw1); Wt::WContainerWidget* parent = luawt_checkFromLua(L, 2); - WTextArea * result = new WTextArea(content, parent); - luawt_toLua(L, result); + WTextArea * l_result = new WTextArea(content, parent); + luawt_toLua(L, l_result); return 1; } else { @@ -84,8 +84,8 @@ int luawt_WTextArea_cursorPosition(lua_State* L) { int index = luawt_getSuitableArgsGroup(L, luawt_WTextArea_cursorPosition_args); WTextArea* self = luawt_checkFromLua(L, 1); if (index == 0) { - int result = self->cursorPosition(); - lua_pushinteger(L, result); + int l_result = self->cursorPosition(); + lua_pushinteger(L, l_result); return 1; } else { @@ -100,8 +100,8 @@ int luawt_WTextArea_rows(lua_State* L) { int index = luawt_getSuitableArgsGroup(L, luawt_WTextArea_rows_args); WTextArea* self = luawt_checkFromLua(L, 1); if (index == 0) { - int result = self->rows(); - lua_pushinteger(L, result); + int l_result = self->rows(); + lua_pushinteger(L, l_result); return 1; } else { @@ -116,8 +116,8 @@ int luawt_WTextArea_text(lua_State* L) { int index = luawt_getSuitableArgsGroup(L, luawt_WTextArea_text_args); WTextArea* self = luawt_checkFromLua(L, 1); if (index == 0) { - Wt::WString const & result = self->text(); - lua_pushstring(L, result.toUTF8().c_str()); + Wt::WString const & l_result = self->text(); + lua_pushstring(L, l_result.toUTF8().c_str()); return 1; } else { @@ -149,8 +149,8 @@ int luawt_WTextArea_selectedText(lua_State* L) { int index = luawt_getSuitableArgsGroup(L, luawt_WTextArea_selectedText_args); WTextArea* self = luawt_checkFromLua(L, 1); if (index == 0) { - Wt::WString result = self->selectedText(); - lua_pushstring(L, result.toUTF8().c_str()); + Wt::WString l_result = self->selectedText(); + lua_pushstring(L, l_result.toUTF8().c_str()); return 1; } else { @@ -181,8 +181,8 @@ int luawt_WTextArea_selectionStart(lua_State* L) { int index = luawt_getSuitableArgsGroup(L, luawt_WTextArea_selectionStart_args); WTextArea* self = luawt_checkFromLua(L, 1); if (index == 0) { - int result = self->selectionStart(); - lua_pushinteger(L, result); + int l_result = self->selectionStart(); + lua_pushinteger(L, l_result); return 1; } else { @@ -197,8 +197,8 @@ int luawt_WTextArea_hasSelectedText(lua_State* L) { int index = luawt_getSuitableArgsGroup(L, luawt_WTextArea_hasSelectedText_args); WTextArea* self = luawt_checkFromLua(L, 1); if (index == 0) { - bool result = self->hasSelectedText(); - lua_pushboolean(L, result); + bool l_result = self->hasSelectedText(); + lua_pushboolean(L, l_result); return 1; } else { @@ -230,8 +230,8 @@ int luawt_WTextArea_columns(lua_State* L) { int index = luawt_getSuitableArgsGroup(L, luawt_WTextArea_columns_args); WTextArea* self = luawt_checkFromLua(L, 1); if (index == 0) { - int result = self->columns(); - lua_pushinteger(L, result); + int l_result = self->columns(); + lua_pushinteger(L, l_result); return 1; } else { @@ -246,8 +246,8 @@ int luawt_WTextArea_valueText(lua_State* L) { int index = luawt_getSuitableArgsGroup(L, luawt_WTextArea_valueText_args); WTextArea* self = luawt_checkFromLua(L, 1); if (index == 0) { - Wt::WString result = self->valueText(); - lua_pushstring(L, result.toUTF8().c_str()); + Wt::WString l_result = self->valueText(); + lua_pushstring(L, l_result.toUTF8().c_str()); return 1; } else { diff --git a/src/luawt/WTextEdit.cpp b/src/luawt/WTextEdit.cpp index 8f97ada..7070ba3 100644 --- a/src/luawt/WTextEdit.cpp +++ b/src/luawt/WTextEdit.cpp @@ -1,5 +1,6 @@ #include "boost-xtime.hpp" +#include #include #include #include @@ -15,36 +16,36 @@ static const char* const* const luawt_WTextEdit_make_args[] = {WTextEdit_make_ar int luawt_WTextEdit_make(lua_State* L) { int index = luawt_getSuitableArgsGroup(L, luawt_WTextEdit_make_args); if (index == 0) { - WTextEdit * result = new WTextEdit(); + WTextEdit * l_result = new WTextEdit(); MyApplication* app = MyApplication::instance(); if (!app) { - delete result; + delete l_result; throw std::logic_error("No WApplication when creating WTextEdit"); } - app->root()->addWidget(result); + app->root()->addWidget(l_result); - luawt_toLua(L, result); + luawt_toLua(L, l_result); return 1; } else if (index == 1) { Wt::WContainerWidget* parent = luawt_checkFromLua(L, 1); - WTextEdit * result = new WTextEdit(parent); - luawt_toLua(L, result); + WTextEdit * l_result = new WTextEdit(parent); + luawt_toLua(L, l_result); return 1; } else if (index == 2) { char const * raw1 = lua_tostring(L, 1); Wt::WString text = Wt::WString(raw1); - WTextEdit * result = new WTextEdit(text); + WTextEdit * l_result = new WTextEdit(text); MyApplication* app = MyApplication::instance(); if (!app) { - delete result; + delete l_result; throw std::logic_error("No WApplication when creating WTextEdit"); } - app->root()->addWidget(result); + app->root()->addWidget(l_result); - luawt_toLua(L, result); + luawt_toLua(L, l_result); return 1; } else if (index == 3) { @@ -52,8 +53,8 @@ int luawt_WTextEdit_make(lua_State* L) { Wt::WString text = Wt::WString(raw1); Wt::WContainerWidget* parent = luawt_checkFromLua(L, 2); - WTextEdit * result = new WTextEdit(text, parent); - luawt_toLua(L, result); + WTextEdit * l_result = new WTextEdit(text, parent); + luawt_toLua(L, l_result); return 1; } else { @@ -102,8 +103,8 @@ int luawt_WTextEdit_extraPlugins(lua_State* L) { int index = luawt_getSuitableArgsGroup(L, luawt_WTextEdit_extraPlugins_args); WTextEdit* self = luawt_checkFromLua(L, 1); if (index == 0) { - std::string const result = self->extraPlugins(); - lua_pushstring(L, result.c_str()); + std::string const l_result = self->extraPlugins(); + lua_pushstring(L, l_result.c_str()); return 1; } else { @@ -118,8 +119,8 @@ int luawt_WTextEdit_styleSheet(lua_State* L) { int index = luawt_getSuitableArgsGroup(L, luawt_WTextEdit_styleSheet_args); WTextEdit* self = luawt_checkFromLua(L, 1); if (index == 0) { - std::string const result = self->styleSheet(); - lua_pushstring(L, result.c_str()); + std::string const l_result = self->styleSheet(); + lua_pushstring(L, l_result.c_str()); return 1; } else { @@ -145,6 +146,25 @@ int luawt_WTextEdit_setToolBar(lua_State* L) { } } +static const char* WTextEdit_resize_args0[] = {luawt_typeToStr(), "double", "double", NULL}; +static const char* const* const luawt_WTextEdit_resize_args[] = {WTextEdit_resize_args0, NULL}; + +int luawt_WTextEdit_resize(lua_State* L) { + int index = luawt_getSuitableArgsGroup(L, luawt_WTextEdit_resize_args); + WTextEdit* self = luawt_checkFromLua(L, 1); + if (index == 0) { + double raw2 = lua_tonumber(L, 2); + Wt::WLength width = Wt::WLength(raw2); + double raw3 = lua_tonumber(L, 3); + Wt::WLength height = Wt::WLength(raw3); + self->resize(width, height); + return 0; + + } else { + return luaL_error(L, "Wrong arguments for WTextEdit.resize"); + } +} + static const char* WTextEdit_setStyleSheet_args0[] = {luawt_typeToStr(), "char const *", NULL}; static const char* const* const luawt_WTextEdit_setStyleSheet_args[] = {WTextEdit_setStyleSheet_args0, NULL}; @@ -170,8 +190,8 @@ int luawt_WTextEdit_toolBar(lua_State* L) { WTextEdit* self = luawt_checkFromLua(L, 1); if (index == 0) { int i = lua_tointeger(L, 2); - std::string const result = self->toolBar(i); - lua_pushstring(L, result.c_str()); + std::string const l_result = self->toolBar(i); + lua_pushstring(L, l_result.c_str()); return 1; } else { @@ -212,6 +232,7 @@ static const luaL_Reg luawt_WTextEdit_methods[] = { METHOD(WTextEdit, extraPlugins), METHOD(WTextEdit, setToolBar), METHOD(WTextEdit, toolBar), + METHOD(WTextEdit, resize), METHOD(WTextEdit, changed), METHOD(WTextEdit, selected), METHOD(WTextEdit, blurred), diff --git a/src/luawt/WTimerWidget.cpp b/src/luawt/WTimerWidget.cpp new file mode 100644 index 0000000..b9545b7 --- /dev/null +++ b/src/luawt/WTimerWidget.cpp @@ -0,0 +1,97 @@ +#include "boost-xtime.hpp" + +#include + +#include "globals.hpp" + +static const char* WTimerWidget_timerStart_args0[] = {luawt_typeToStr(), "bool", NULL}; +static const char* const* const luawt_WTimerWidget_timerStart_args[] = {WTimerWidget_timerStart_args0, NULL}; + +int luawt_WTimerWidget_timerStart(lua_State* L) { + int index = luawt_getSuitableArgsGroup(L, luawt_WTimerWidget_timerStart_args); + WTimerWidget* self = luawt_checkFromLua(L, 1); + if (index == 0) { + bool jsRepeat = lua_toboolean(L, 2); + self->timerStart(jsRepeat); + return 0; + + } else { + return luaL_error(L, "Wrong arguments for WTimerWidget.timerStart"); + } +} + +static const char* WTimerWidget_timerExpired_args0[] = {luawt_typeToStr(), NULL}; +static const char* const* const luawt_WTimerWidget_timerExpired_args[] = {WTimerWidget_timerExpired_args0, NULL}; + +int luawt_WTimerWidget_timerExpired(lua_State* L) { + int index = luawt_getSuitableArgsGroup(L, luawt_WTimerWidget_timerExpired_args); + WTimerWidget* self = luawt_checkFromLua(L, 1); + if (index == 0) { + bool l_result = self->timerExpired(); + lua_pushboolean(L, l_result); + return 1; + + } else { + return luaL_error(L, "Wrong arguments for WTimerWidget.timerExpired"); + } +} + +ADD_SIGNAL(keyWentDown, WTimerWidget, Wt::WKeyEvent) +ADD_SIGNAL(keyPressed, WTimerWidget, Wt::WKeyEvent) +ADD_SIGNAL(keyWentUp, WTimerWidget, Wt::WKeyEvent) +ADD_SIGNAL(enterPressed, WTimerWidget, Wt::NoClass) +ADD_SIGNAL(escapePressed, WTimerWidget, Wt::NoClass) +ADD_SIGNAL(clicked, WTimerWidget, Wt::WMouseEvent) +ADD_SIGNAL(doubleClicked, WTimerWidget, Wt::WMouseEvent) +ADD_SIGNAL(mouseWentDown, WTimerWidget, Wt::WMouseEvent) +ADD_SIGNAL(mouseWentUp, WTimerWidget, Wt::WMouseEvent) +ADD_SIGNAL(mouseWentOut, WTimerWidget, Wt::WMouseEvent) +ADD_SIGNAL(mouseWentOver, WTimerWidget, Wt::WMouseEvent) +ADD_SIGNAL(mouseMoved, WTimerWidget, Wt::WMouseEvent) +ADD_SIGNAL(mouseDragged, WTimerWidget, Wt::WMouseEvent) +ADD_SIGNAL(mouseWheel, WTimerWidget, Wt::WMouseEvent) +ADD_SIGNAL(touchStarted, WTimerWidget, Wt::WTouchEvent) +ADD_SIGNAL(touchEnded, WTimerWidget, Wt::WTouchEvent) +ADD_SIGNAL(touchMoved, WTimerWidget, Wt::WTouchEvent) +ADD_SIGNAL(gestureStarted, WTimerWidget, Wt::WGestureEvent) +ADD_SIGNAL(gestureChanged, WTimerWidget, Wt::WGestureEvent) +ADD_SIGNAL(gestureEnded, WTimerWidget, Wt::WGestureEvent) + +static const luaL_Reg luawt_WTimerWidget_methods[] = { + METHOD(WTimerWidget, timerStart), + METHOD(WTimerWidget, timerExpired), + METHOD(WTimerWidget, keyWentDown), + METHOD(WTimerWidget, keyPressed), + METHOD(WTimerWidget, keyWentUp), + METHOD(WTimerWidget, enterPressed), + METHOD(WTimerWidget, escapePressed), + METHOD(WTimerWidget, clicked), + METHOD(WTimerWidget, doubleClicked), + METHOD(WTimerWidget, mouseWentDown), + METHOD(WTimerWidget, mouseWentUp), + METHOD(WTimerWidget, mouseWentOut), + METHOD(WTimerWidget, mouseWentOver), + METHOD(WTimerWidget, mouseMoved), + METHOD(WTimerWidget, mouseDragged), + METHOD(WTimerWidget, mouseWheel), + METHOD(WTimerWidget, touchStarted), + METHOD(WTimerWidget, touchEnded), + METHOD(WTimerWidget, touchMoved), + METHOD(WTimerWidget, gestureStarted), + METHOD(WTimerWidget, gestureChanged), + METHOD(WTimerWidget, gestureEnded), + {NULL, NULL}, +}; + +void luawt_WTimerWidget(lua_State* L) { + const char* base = luawt_typeToStr(); + assert(base); + DECLARE_CLASS( + WTimerWidget, + L, + 0, + 0, + luawt_WTimerWidget_methods, + base + ); +} diff --git a/src/luawt/WToolBar.cpp b/src/luawt/WToolBar.cpp index 9549dcd..9af4f5c 100644 --- a/src/luawt/WToolBar.cpp +++ b/src/luawt/WToolBar.cpp @@ -13,22 +13,22 @@ static const char* const* const luawt_WToolBar_make_args[] = {WToolBar_make_args int luawt_WToolBar_make(lua_State* L) { int index = luawt_getSuitableArgsGroup(L, luawt_WToolBar_make_args); if (index == 0) { - WToolBar * result = new WToolBar(); + WToolBar * l_result = new WToolBar(); MyApplication* app = MyApplication::instance(); if (!app) { - delete result; + delete l_result; throw std::logic_error("No WApplication when creating WToolBar"); } - app->root()->addWidget(result); + app->root()->addWidget(l_result); - luawt_toLua(L, result); + luawt_toLua(L, l_result); return 1; } else if (index == 1) { Wt::WContainerWidget* parent = luawt_checkFromLua(L, 1); - WToolBar * result = new WToolBar(parent); - luawt_toLua(L, result); + WToolBar * l_result = new WToolBar(parent); + luawt_toLua(L, l_result); return 1; } else { @@ -43,8 +43,8 @@ int luawt_WToolBar_count(lua_State* L) { int index = luawt_getSuitableArgsGroup(L, luawt_WToolBar_count_args); WToolBar* self = luawt_checkFromLua(L, 1); if (index == 0) { - int result = self->count(); - lua_pushinteger(L, result); + int l_result = self->count(); + lua_pushinteger(L, l_result); return 1; } else { @@ -60,8 +60,8 @@ int luawt_WToolBar_widget(lua_State* L) { WToolBar* self = luawt_checkFromLua(L, 1); if (index == 0) { int index = lua_tointeger(L, 2); - Wt::WWidget * result = self->widget(index); - luawt_toLua(L, result); + Wt::WWidget * l_result = self->widget(index); + luawt_toLua(L, l_result); return 1; } else { @@ -76,8 +76,8 @@ int luawt_WToolBar_isCompact(lua_State* L) { int index = luawt_getSuitableArgsGroup(L, luawt_WToolBar_isCompact_args); WToolBar* self = luawt_checkFromLua(L, 1); if (index == 0) { - bool result = self->isCompact(); - lua_pushboolean(L, result); + bool l_result = self->isCompact(); + lua_pushboolean(L, l_result); return 1; } else { diff --git a/src/luawt/WTree.cpp b/src/luawt/WTree.cpp index 68d6e13..2da78ec 100644 --- a/src/luawt/WTree.cpp +++ b/src/luawt/WTree.cpp @@ -13,22 +13,22 @@ static const char* const* const luawt_WTree_make_args[] = {WTree_make_args0, WTr int luawt_WTree_make(lua_State* L) { int index = luawt_getSuitableArgsGroup(L, luawt_WTree_make_args); if (index == 0) { - WTree * result = new WTree(); + WTree * l_result = new WTree(); MyApplication* app = MyApplication::instance(); if (!app) { - delete result; + delete l_result; throw std::logic_error("No WApplication when creating WTree"); } - app->root()->addWidget(result); + app->root()->addWidget(l_result); - luawt_toLua(L, result); + luawt_toLua(L, l_result); return 1; } else if (index == 1) { Wt::WContainerWidget* parent = luawt_checkFromLua(L, 1); - WTree * result = new WTree(parent); - luawt_toLua(L, result); + WTree * l_result = new WTree(parent); + luawt_toLua(L, l_result); return 1; } else { @@ -74,8 +74,8 @@ int luawt_WTree_treeRoot(lua_State* L) { int index = luawt_getSuitableArgsGroup(L, luawt_WTree_treeRoot_args); WTree* self = luawt_checkFromLua(L, 1); if (index == 0) { - Wt::WTreeNode * result = self->treeRoot(); - luawt_toLua(L, result); + Wt::WTreeNode * l_result = self->treeRoot(); + luawt_toLua(L, l_result); return 1; } else { @@ -109,8 +109,8 @@ int luawt_WTree_isSelected(lua_State* L) { if (index == 0) { Wt::WTreeNode* node = luawt_checkFromLua(L, 2); - bool result = self->isSelected(node); - lua_pushboolean(L, result); + bool l_result = self->isSelected(node); + lua_pushboolean(L, l_result); return 1; } else { @@ -125,8 +125,8 @@ int luawt_WTree_selectionMode(lua_State* L) { int index = luawt_getSuitableArgsGroup(L, luawt_WTree_selectionMode_args); WTree* self = luawt_checkFromLua(L, 1); if (index == 0) { - Wt::SelectionMode result = self->selectionMode(); - lua_pushinteger(L, result); + Wt::SelectionMode l_result = self->selectionMode(); + lua_pushinteger(L, l_result); return 1; } else { diff --git a/src/luawt/WTreeNode.cpp b/src/luawt/WTreeNode.cpp index 2e78f28..b8d7932 100644 --- a/src/luawt/WTreeNode.cpp +++ b/src/luawt/WTreeNode.cpp @@ -18,15 +18,15 @@ int luawt_WTreeNode_make(lua_State* L) { if (index == 0) { char const * raw1 = lua_tostring(L, 1); Wt::WString labelText = Wt::WString(raw1); - WTreeNode * result = new WTreeNode(labelText); + WTreeNode * l_result = new WTreeNode(labelText); MyApplication* app = MyApplication::instance(); if (!app) { - delete result; + delete l_result; throw std::logic_error("No WApplication when creating WTreeNode"); } - app->root()->addWidget(result); + app->root()->addWidget(l_result); - luawt_toLua(L, result); + luawt_toLua(L, l_result); return 1; } else if (index == 1) { @@ -34,15 +34,15 @@ int luawt_WTreeNode_make(lua_State* L) { Wt::WString labelText = Wt::WString(raw1); Wt::WIconPair* labelIcon = luawt_checkFromLua(L, 2); - WTreeNode * result = new WTreeNode(labelText, labelIcon); + WTreeNode * l_result = new WTreeNode(labelText, labelIcon); MyApplication* app = MyApplication::instance(); if (!app) { - delete result; + delete l_result; throw std::logic_error("No WApplication when creating WTreeNode"); } - app->root()->addWidget(result); + app->root()->addWidget(l_result); - luawt_toLua(L, result); + luawt_toLua(L, l_result); return 1; } else if (index == 2) { @@ -52,15 +52,15 @@ int luawt_WTreeNode_make(lua_State* L) { luawt_checkFromLua(L, 2); Wt::WTreeNode* parentNode = luawt_checkFromLua(L, 3); - WTreeNode * result = new WTreeNode(labelText, labelIcon, parentNode); + WTreeNode * l_result = new WTreeNode(labelText, labelIcon, parentNode); MyApplication* app = MyApplication::instance(); if (!app) { - delete result; + delete l_result; throw std::logic_error("No WApplication when creating WTreeNode"); } - app->root()->addWidget(result); + app->root()->addWidget(l_result); - luawt_toLua(L, result); + luawt_toLua(L, l_result); return 1; } else { @@ -91,8 +91,8 @@ int luawt_WTreeNode_isSelectable(lua_State* L) { int index = luawt_getSuitableArgsGroup(L, luawt_WTreeNode_isSelectable_args); WTreeNode* self = luawt_checkFromLua(L, 1); if (index == 0) { - bool result = self->isSelectable(); - lua_pushboolean(L, result); + bool l_result = self->isSelectable(); + lua_pushboolean(L, l_result); return 1; } else { @@ -140,8 +140,8 @@ int luawt_WTreeNode_hasParent(lua_State* L) { int index = luawt_getSuitableArgsGroup(L, luawt_WTreeNode_hasParent_args); WTreeNode* self = luawt_checkFromLua(L, 1); if (index == 0) { - bool result = self->hasParent(); - lua_pushboolean(L, result); + bool l_result = self->hasParent(); + lua_pushboolean(L, l_result); return 1; } else { @@ -156,8 +156,8 @@ int luawt_WTreeNode_label(lua_State* L) { int index = luawt_getSuitableArgsGroup(L, luawt_WTreeNode_label_args); WTreeNode* self = luawt_checkFromLua(L, 1); if (index == 0) { - Wt::WText * result = self->label(); - luawt_toLua(L, result); + Wt::WText * l_result = self->label(); + luawt_toLua(L, l_result); return 1; } else { @@ -205,8 +205,8 @@ int luawt_WTreeNode_childCountPolicy(lua_State* L) { int index = luawt_getSuitableArgsGroup(L, luawt_WTreeNode_childCountPolicy_args); WTreeNode* self = luawt_checkFromLua(L, 1); if (index == 0) { - Wt::WTreeNode::ChildCountPolicy result = self->childCountPolicy(); - lua_pushinteger(L, result); + Wt::WTreeNode::ChildCountPolicy l_result = self->childCountPolicy(); + lua_pushinteger(L, l_result); return 1; } else { @@ -270,8 +270,8 @@ int luawt_WTreeNode_labelIcon(lua_State* L) { int index = luawt_getSuitableArgsGroup(L, luawt_WTreeNode_labelIcon_args); WTreeNode* self = luawt_checkFromLua(L, 1); if (index == 0) { - Wt::WIconPair * result = self->labelIcon(); - luawt_toLua(L, result); + Wt::WIconPair * l_result = self->labelIcon(); + luawt_toLua(L, l_result); return 1; } else { @@ -286,8 +286,8 @@ int luawt_WTreeNode_displayedChildCount(lua_State* L) { int index = luawt_getSuitableArgsGroup(L, luawt_WTreeNode_displayedChildCount_args); WTreeNode* self = luawt_checkFromLua(L, 1); if (index == 0) { - int result = self->displayedChildCount(); - lua_pushinteger(L, result); + int l_result = self->displayedChildCount(); + lua_pushinteger(L, l_result); return 1; } else { @@ -349,8 +349,8 @@ int luawt_WTreeNode_isExpanded(lua_State* L) { int index = luawt_getSuitableArgsGroup(L, luawt_WTreeNode_isExpanded_args); WTreeNode* self = luawt_checkFromLua(L, 1); if (index == 0) { - bool result = self->isExpanded(); - lua_pushboolean(L, result); + bool l_result = self->isExpanded(); + lua_pushboolean(L, l_result); return 1; } else { @@ -382,8 +382,8 @@ int luawt_WTreeNode_tree(lua_State* L) { int index = luawt_getSuitableArgsGroup(L, luawt_WTreeNode_tree_args); WTreeNode* self = luawt_checkFromLua(L, 1); if (index == 0) { - Wt::WTree * result = self->tree(); - luawt_toLua(L, result); + Wt::WTree * l_result = self->tree(); + luawt_toLua(L, l_result); return 1; } else { @@ -398,8 +398,8 @@ int luawt_WTreeNode_parentNode(lua_State* L) { int index = luawt_getSuitableArgsGroup(L, luawt_WTreeNode_parentNode_args); WTreeNode* self = luawt_checkFromLua(L, 1); if (index == 0) { - Wt::WTreeNode * result = self->parentNode(); - luawt_toLua(L, result); + Wt::WTreeNode * l_result = self->parentNode(); + luawt_toLua(L, l_result); return 1; } else { diff --git a/src/luawt/WTreeTable.cpp b/src/luawt/WTreeTable.cpp index 7f62d7f..b425456 100644 --- a/src/luawt/WTreeTable.cpp +++ b/src/luawt/WTreeTable.cpp @@ -1,5 +1,6 @@ #include "boost-xtime.hpp" +#include #include #include #include @@ -17,22 +18,22 @@ static const char* const* const luawt_WTreeTable_make_args[] = {WTreeTable_make_ int luawt_WTreeTable_make(lua_State* L) { int index = luawt_getSuitableArgsGroup(L, luawt_WTreeTable_make_args); if (index == 0) { - WTreeTable * result = new WTreeTable(); + WTreeTable * l_result = new WTreeTable(); MyApplication* app = MyApplication::instance(); if (!app) { - delete result; + delete l_result; throw std::logic_error("No WApplication when creating WTreeTable"); } - app->root()->addWidget(result); + app->root()->addWidget(l_result); - luawt_toLua(L, result); + luawt_toLua(L, l_result); return 1; } else if (index == 1) { Wt::WContainerWidget* parent = luawt_checkFromLua(L, 1); - WTreeTable * result = new WTreeTable(parent); - luawt_toLua(L, result); + WTreeTable * l_result = new WTreeTable(parent); + luawt_toLua(L, l_result); return 1; } else { @@ -47,8 +48,8 @@ int luawt_WTreeTable_columnCount(lua_State* L) { int index = luawt_getSuitableArgsGroup(L, luawt_WTreeTable_columnCount_args); WTreeTable* self = luawt_checkFromLua(L, 1); if (index == 0) { - int result = self->columnCount(); - lua_pushinteger(L, result); + int l_result = self->columnCount(); + lua_pushinteger(L, l_result); return 1; } else { @@ -63,8 +64,8 @@ int luawt_WTreeTable_treeRoot(lua_State* L) { int index = luawt_getSuitableArgsGroup(L, luawt_WTreeTable_treeRoot_args); WTreeTable* self = luawt_checkFromLua(L, 1); if (index == 0) { - Wt::WTreeTableNode * result = self->treeRoot(); - luawt_toLua(L, result); + Wt::WTreeTableNode * l_result = self->treeRoot(); + luawt_toLua(L, l_result); return 1; } else { @@ -72,6 +73,23 @@ int luawt_WTreeTable_treeRoot(lua_State* L) { } } +static const char* WTreeTable_columnWidth_args0[] = {luawt_typeToStr(), "int", NULL}; +static const char* const* const luawt_WTreeTable_columnWidth_args[] = {WTreeTable_columnWidth_args0, NULL}; + +int luawt_WTreeTable_columnWidth(lua_State* L) { + int index = luawt_getSuitableArgsGroup(L, luawt_WTreeTable_columnWidth_args); + WTreeTable* self = luawt_checkFromLua(L, 1); + if (index == 0) { + int column = lua_tointeger(L, 2); + Wt::WLength l_result = self->columnWidth(column); + lua_pushnumber(L, l_result.value()); + return 1; + + } else { + return luaL_error(L, "Wrong arguments for WTreeTable.columnWidth"); + } +} + static const char* WTreeTable_setTreeRoot_args0[] = {luawt_typeToStr(), luawt_typeToStr(), "char const *", NULL}; static const char* const* const luawt_WTreeTable_setTreeRoot_args[] = {WTreeTable_setTreeRoot_args0, NULL}; @@ -98,8 +116,8 @@ int luawt_WTreeTable_tree(lua_State* L) { int index = luawt_getSuitableArgsGroup(L, luawt_WTreeTable_tree_args); WTreeTable* self = luawt_checkFromLua(L, 1); if (index == 0) { - Wt::WTree * result = self->tree(); - luawt_toLua(L, result); + Wt::WTree * l_result = self->tree(); + luawt_toLua(L, l_result); return 1; } else { @@ -134,8 +152,8 @@ int luawt_WTreeTable_header(lua_State* L) { WTreeTable* self = luawt_checkFromLua(L, 1); if (index == 0) { int column = lua_tointeger(L, 2); - Wt::WText * result = self->header(column); - luawt_toLua(L, result); + Wt::WText * l_result = self->header(column); + luawt_toLua(L, l_result); return 1; } else { @@ -143,6 +161,25 @@ int luawt_WTreeTable_header(lua_State* L) { } } +static const char* WTreeTable_addColumn_args0[] = {luawt_typeToStr(), "char const *", "double", NULL}; +static const char* const* const luawt_WTreeTable_addColumn_args[] = {WTreeTable_addColumn_args0, NULL}; + +int luawt_WTreeTable_addColumn(lua_State* L) { + int index = luawt_getSuitableArgsGroup(L, luawt_WTreeTable_addColumn_args); + WTreeTable* self = luawt_checkFromLua(L, 1); + if (index == 0) { + char const * raw2 = lua_tostring(L, 2); + Wt::WString header = Wt::WString(raw2); + double raw3 = lua_tonumber(L, 3); + Wt::WLength width = Wt::WLength(raw3); + self->addColumn(header, width); + return 0; + + } else { + return luaL_error(L, "Wrong arguments for WTreeTable.addColumn"); + } +} + static const char* WTreeTable_headerWidget_args0[] = {luawt_typeToStr(), NULL}; static const char* const* const luawt_WTreeTable_headerWidget_args[] = {WTreeTable_headerWidget_args0, NULL}; @@ -150,8 +187,8 @@ int luawt_WTreeTable_headerWidget(lua_State* L) { int index = luawt_getSuitableArgsGroup(L, luawt_WTreeTable_headerWidget_args); WTreeTable* self = luawt_checkFromLua(L, 1); if (index == 0) { - Wt::WWidget * result = self->headerWidget(); - luawt_toLua(L, result); + Wt::WWidget * l_result = self->headerWidget(); + luawt_toLua(L, l_result); return 1; } else { @@ -161,11 +198,13 @@ int luawt_WTreeTable_headerWidget(lua_State* L) { static const luaL_Reg luawt_WTreeTable_methods[] = { + METHOD(WTreeTable, addColumn), METHOD(WTreeTable, columnCount), METHOD(WTreeTable, setTreeRoot), METHOD(WTreeTable, treeRoot), METHOD(WTreeTable, setTree), METHOD(WTreeTable, tree), + METHOD(WTreeTable, columnWidth), METHOD(WTreeTable, header), METHOD(WTreeTable, headerWidget), {NULL, NULL}, diff --git a/src/luawt/WTreeTableNode.cpp b/src/luawt/WTreeTableNode.cpp index 155aa13..e5b2cce 100644 --- a/src/luawt/WTreeTableNode.cpp +++ b/src/luawt/WTreeTableNode.cpp @@ -19,15 +19,15 @@ int luawt_WTreeTableNode_make(lua_State* L) { if (index == 0) { char const * raw1 = lua_tostring(L, 1); Wt::WString labelText = Wt::WString(raw1); - WTreeTableNode * result = new WTreeTableNode(labelText); + WTreeTableNode * l_result = new WTreeTableNode(labelText); MyApplication* app = MyApplication::instance(); if (!app) { - delete result; + delete l_result; throw std::logic_error("No WApplication when creating WTreeTableNode"); } - app->root()->addWidget(result); + app->root()->addWidget(l_result); - luawt_toLua(L, result); + luawt_toLua(L, l_result); return 1; } else if (index == 1) { @@ -35,15 +35,15 @@ int luawt_WTreeTableNode_make(lua_State* L) { Wt::WString labelText = Wt::WString(raw1); Wt::WIconPair* labelIcon = luawt_checkFromLua(L, 2); - WTreeTableNode * result = new WTreeTableNode(labelText, labelIcon); + WTreeTableNode * l_result = new WTreeTableNode(labelText, labelIcon); MyApplication* app = MyApplication::instance(); if (!app) { - delete result; + delete l_result; throw std::logic_error("No WApplication when creating WTreeTableNode"); } - app->root()->addWidget(result); + app->root()->addWidget(l_result); - luawt_toLua(L, result); + luawt_toLua(L, l_result); return 1; } else if (index == 2) { @@ -53,15 +53,15 @@ int luawt_WTreeTableNode_make(lua_State* L) { luawt_checkFromLua(L, 2); Wt::WTreeTableNode* parentNode = luawt_checkFromLua(L, 3); - WTreeTableNode * result = new WTreeTableNode(labelText, labelIcon, parentNode); + WTreeTableNode * l_result = new WTreeTableNode(labelText, labelIcon, parentNode); MyApplication* app = MyApplication::instance(); if (!app) { - delete result; + delete l_result; throw std::logic_error("No WApplication when creating WTreeTableNode"); } - app->root()->addWidget(result); + app->root()->addWidget(l_result); - luawt_toLua(L, result); + luawt_toLua(L, l_result); return 1; } else { @@ -94,8 +94,8 @@ int luawt_WTreeTableNode_table(lua_State* L) { int index = luawt_getSuitableArgsGroup(L, luawt_WTreeTableNode_table_args); WTreeTableNode* self = luawt_checkFromLua(L, 1); if (index == 0) { - Wt::WTreeTable * result = self->table(); - luawt_toLua(L, result); + Wt::WTreeTable * l_result = self->table(); + luawt_toLua(L, l_result); return 1; } else { @@ -129,8 +129,8 @@ int luawt_WTreeTableNode_columnWidget(lua_State* L) { WTreeTableNode* self = luawt_checkFromLua(L, 1); if (index == 0) { int column = lua_tointeger(L, 2); - Wt::WWidget * result = self->columnWidget(column); - luawt_toLua(L, result); + Wt::WWidget * l_result = self->columnWidget(column); + luawt_toLua(L, l_result); return 1; } else { diff --git a/src/luawt/WTreeView.cpp b/src/luawt/WTreeView.cpp index 57b659c..7cb7482 100644 --- a/src/luawt/WTreeView.cpp +++ b/src/luawt/WTreeView.cpp @@ -1,5 +1,6 @@ #include "boost-xtime.hpp" +#include #include #include #include @@ -13,22 +14,22 @@ static const char* const* const luawt_WTreeView_make_args[] = {WTreeView_make_ar int luawt_WTreeView_make(lua_State* L) { int index = luawt_getSuitableArgsGroup(L, luawt_WTreeView_make_args); if (index == 0) { - WTreeView * result = new WTreeView(); + WTreeView * l_result = new WTreeView(); MyApplication* app = MyApplication::instance(); if (!app) { - delete result; + delete l_result; throw std::logic_error("No WApplication when creating WTreeView"); } - app->root()->addWidget(result); + app->root()->addWidget(l_result); - luawt_toLua(L, result); + luawt_toLua(L, l_result); return 1; } else if (index == 1) { Wt::WContainerWidget* parent = luawt_checkFromLua(L, 1); - WTreeView * result = new WTreeView(parent); - luawt_toLua(L, result); + WTreeView * l_result = new WTreeView(parent); + luawt_toLua(L, l_result); return 1; } else { @@ -36,6 +37,39 @@ int luawt_WTreeView_make(lua_State* L) { } } +static const char* WTreeView_setRowHeight_args0[] = {luawt_typeToStr(), "double", NULL}; +static const char* const* const luawt_WTreeView_setRowHeight_args[] = {WTreeView_setRowHeight_args0, NULL}; + +int luawt_WTreeView_setRowHeight(lua_State* L) { + int index = luawt_getSuitableArgsGroup(L, luawt_WTreeView_setRowHeight_args); + WTreeView* self = luawt_checkFromLua(L, 1); + if (index == 0) { + double raw2 = lua_tonumber(L, 2); + Wt::WLength rowHeight = Wt::WLength(raw2); + self->setRowHeight(rowHeight); + return 0; + + } else { + return luaL_error(L, "Wrong arguments for WTreeView.setRowHeight"); + } +} + +static const char* WTreeView_currentPage_args0[] = {luawt_typeToStr(), NULL}; +static const char* const* const luawt_WTreeView_currentPage_args[] = {WTreeView_currentPage_args0, NULL}; + +int luawt_WTreeView_currentPage(lua_State* L) { + int index = luawt_getSuitableArgsGroup(L, luawt_WTreeView_currentPage_args); + WTreeView* self = luawt_checkFromLua(L, 1); + if (index == 0) { + int l_result = self->currentPage(); + lua_pushinteger(L, l_result); + return 1; + + } else { + return luaL_error(L, "Wrong arguments for WTreeView.currentPage"); + } +} + static const char* WTreeView_pageSize_args0[] = {luawt_typeToStr(), NULL}; static const char* const* const luawt_WTreeView_pageSize_args[] = {WTreeView_pageSize_args0, NULL}; @@ -43,8 +77,8 @@ int luawt_WTreeView_pageSize(lua_State* L) { int index = luawt_getSuitableArgsGroup(L, luawt_WTreeView_pageSize_args); WTreeView* self = luawt_checkFromLua(L, 1); if (index == 0) { - int result = self->pageSize(); - lua_pushinteger(L, result); + int l_result = self->pageSize(); + lua_pushinteger(L, l_result); return 1; } else { @@ -59,8 +93,8 @@ int luawt_WTreeView_pageCount(lua_State* L) { int index = luawt_getSuitableArgsGroup(L, luawt_WTreeView_pageCount_args); WTreeView* self = luawt_checkFromLua(L, 1); if (index == 0) { - int result = self->pageCount(); - lua_pushinteger(L, result); + int l_result = self->pageCount(); + lua_pushinteger(L, l_result); return 1; } else { @@ -102,6 +136,24 @@ int luawt_WTreeView_setAlternatingRowColors(lua_State* L) { } } +static const char* WTreeView_setColumnWidth_args0[] = {luawt_typeToStr(), "int", "double", NULL}; +static const char* const* const luawt_WTreeView_setColumnWidth_args[] = {WTreeView_setColumnWidth_args0, NULL}; + +int luawt_WTreeView_setColumnWidth(lua_State* L) { + int index = luawt_getSuitableArgsGroup(L, luawt_WTreeView_setColumnWidth_args); + WTreeView* self = luawt_checkFromLua(L, 1); + if (index == 0) { + int column = lua_tointeger(L, 2); + double raw3 = lua_tonumber(L, 3); + Wt::WLength width = Wt::WLength(raw3); + self->setColumnWidth(column, width); + return 0; + + } else { + return luaL_error(L, "Wrong arguments for WTreeView.setColumnWidth"); + } +} + static const char* WTreeView_rootIsDecorated_args0[] = {luawt_typeToStr(), NULL}; static const char* const* const luawt_WTreeView_rootIsDecorated_args[] = {WTreeView_rootIsDecorated_args0, NULL}; @@ -109,8 +161,8 @@ int luawt_WTreeView_rootIsDecorated(lua_State* L) { int index = luawt_getSuitableArgsGroup(L, luawt_WTreeView_rootIsDecorated_args); WTreeView* self = luawt_checkFromLua(L, 1); if (index == 0) { - bool result = self->rootIsDecorated(); - lua_pushboolean(L, result); + bool l_result = self->rootIsDecorated(); + lua_pushboolean(L, l_result); return 1; } else { @@ -183,19 +235,20 @@ int luawt_WTreeView_setColumnHidden(lua_State* L) { } } -static const char* WTreeView_currentPage_args0[] = {luawt_typeToStr(), NULL}; -static const char* const* const luawt_WTreeView_currentPage_args[] = {WTreeView_currentPage_args0, NULL}; +static const char* WTreeView_setHeaderHeight_args0[] = {luawt_typeToStr(), "double", NULL}; +static const char* const* const luawt_WTreeView_setHeaderHeight_args[] = {WTreeView_setHeaderHeight_args0, NULL}; -int luawt_WTreeView_currentPage(lua_State* L) { - int index = luawt_getSuitableArgsGroup(L, luawt_WTreeView_currentPage_args); +int luawt_WTreeView_setHeaderHeight(lua_State* L) { + int index = luawt_getSuitableArgsGroup(L, luawt_WTreeView_setHeaderHeight_args); WTreeView* self = luawt_checkFromLua(L, 1); if (index == 0) { - int result = self->currentPage(); - lua_pushinteger(L, result); - return 1; - + double raw2 = lua_tonumber(L, 2); + Wt::WLength height = Wt::WLength(raw2); + self->setHeaderHeight(height); + return 0; + } else { - return luaL_error(L, "Wrong arguments for WTreeView.currentPage"); + return luaL_error(L, "Wrong arguments for WTreeView.setHeaderHeight"); } } @@ -207,8 +260,8 @@ int luawt_WTreeView_columnFormat(lua_State* L) { WTreeView* self = luawt_checkFromLua(L, 1); if (index == 0) { int column = lua_tointeger(L, 2); - Wt::WString result = self->columnFormat(column); - lua_pushstring(L, result.toUTF8().c_str()); + Wt::WString l_result = self->columnFormat(column); + lua_pushstring(L, l_result.toUTF8().c_str()); return 1; } else { @@ -232,6 +285,25 @@ int luawt_WTreeView_setCurrentPage(lua_State* L) { } } +static const char* WTreeView_resize_args0[] = {luawt_typeToStr(), "double", "double", NULL}; +static const char* const* const luawt_WTreeView_resize_args[] = {WTreeView_resize_args0, NULL}; + +int luawt_WTreeView_resize(lua_State* L) { + int index = luawt_getSuitableArgsGroup(L, luawt_WTreeView_resize_args); + WTreeView* self = luawt_checkFromLua(L, 1); + if (index == 0) { + double raw2 = lua_tonumber(L, 2); + Wt::WLength width = Wt::WLength(raw2); + double raw3 = lua_tonumber(L, 3); + Wt::WLength height = Wt::WLength(raw3); + self->resize(width, height); + return 0; + + } else { + return luaL_error(L, "Wrong arguments for WTreeView.resize"); + } +} + static const luaL_Reg luawt_WTreeView_methods[] = { METHOD(WTreeView, setColumnFormat), @@ -239,7 +311,11 @@ static const luaL_Reg luawt_WTreeView_methods[] = { METHOD(WTreeView, expandToDepth), METHOD(WTreeView, setRootIsDecorated), METHOD(WTreeView, rootIsDecorated), + METHOD(WTreeView, resize), + METHOD(WTreeView, setColumnWidth), METHOD(WTreeView, setAlternatingRowColors), + METHOD(WTreeView, setRowHeight), + METHOD(WTreeView, setHeaderHeight), METHOD(WTreeView, setColumnHidden), METHOD(WTreeView, setRowHeaderCount), METHOD(WTreeView, pageCount), diff --git a/src/luawt/WValidationStatus.cpp b/src/luawt/WValidationStatus.cpp index 2101477..2023ab1 100644 --- a/src/luawt/WValidationStatus.cpp +++ b/src/luawt/WValidationStatus.cpp @@ -19,15 +19,15 @@ int luawt_WValidationStatus_make(lua_State* L) { if (index == 0) { Wt::WFormWidget* field = luawt_checkFromLua(L, 1); - WValidationStatus * result = new WValidationStatus(field); + WValidationStatus * l_result = new WValidationStatus(field); MyApplication* app = MyApplication::instance(); if (!app) { - delete result; + delete l_result; throw std::logic_error("No WApplication when creating WValidationStatus"); } - app->root()->addWidget(result); + app->root()->addWidget(l_result); - luawt_toLua(L, result); + luawt_toLua(L, l_result); return 1; } else if (index == 1) { @@ -35,15 +35,15 @@ int luawt_WValidationStatus_make(lua_State* L) { luawt_checkFromLua(L, 1); Wt::WWidget* validStateWidget = luawt_checkFromLua(L, 2); - WValidationStatus * result = new WValidationStatus(field, validStateWidget); + WValidationStatus * l_result = new WValidationStatus(field, validStateWidget); MyApplication* app = MyApplication::instance(); if (!app) { - delete result; + delete l_result; throw std::logic_error("No WApplication when creating WValidationStatus"); } - app->root()->addWidget(result); + app->root()->addWidget(l_result); - luawt_toLua(L, result); + luawt_toLua(L, l_result); return 1; } else if (index == 2) { @@ -53,15 +53,15 @@ int luawt_WValidationStatus_make(lua_State* L) { luawt_checkFromLua(L, 2); Wt::WWidget* invalidStateWidget = luawt_checkFromLua(L, 3); - WValidationStatus * result = new WValidationStatus(field, validStateWidget, invalidStateWidget); + WValidationStatus * l_result = new WValidationStatus(field, validStateWidget, invalidStateWidget); MyApplication* app = MyApplication::instance(); if (!app) { - delete result; + delete l_result; throw std::logic_error("No WApplication when creating WValidationStatus"); } - app->root()->addWidget(result); + app->root()->addWidget(l_result); - luawt_toLua(L, result); + luawt_toLua(L, l_result); return 1; } else if (index == 3) { @@ -73,15 +73,15 @@ int luawt_WValidationStatus_make(lua_State* L) { luawt_checkFromLua(L, 3); Wt::WWidget* invalidEmptyStateWidget = luawt_checkFromLua(L, 4); - WValidationStatus * result = new WValidationStatus(field, validStateWidget, invalidStateWidget, invalidEmptyStateWidget); + WValidationStatus * l_result = new WValidationStatus(field, validStateWidget, invalidStateWidget, invalidEmptyStateWidget); MyApplication* app = MyApplication::instance(); if (!app) { - delete result; + delete l_result; throw std::logic_error("No WApplication when creating WValidationStatus"); } - app->root()->addWidget(result); + app->root()->addWidget(l_result); - luawt_toLua(L, result); + luawt_toLua(L, l_result); return 1; } else if (index == 4) { @@ -95,8 +95,8 @@ int luawt_WValidationStatus_make(lua_State* L) { luawt_checkFromLua(L, 4); Wt::WContainerWidget* parent = luawt_checkFromLua(L, 5); - WValidationStatus * result = new WValidationStatus(field, validStateWidget, invalidStateWidget, invalidEmptyStateWidget, parent); - luawt_toLua(L, result); + WValidationStatus * l_result = new WValidationStatus(field, validStateWidget, invalidStateWidget, invalidEmptyStateWidget, parent); + luawt_toLua(L, l_result); return 1; } else { @@ -111,8 +111,8 @@ int luawt_WValidationStatus_valid(lua_State* L) { int index = luawt_getSuitableArgsGroup(L, luawt_WValidationStatus_valid_args); WValidationStatus* self = luawt_checkFromLua(L, 1); if (index == 0) { - bool result = self->valid(); - lua_pushboolean(L, result); + bool l_result = self->valid(); + lua_pushboolean(L, l_result); return 1; } else { diff --git a/src/luawt/WVideo.cpp b/src/luawt/WVideo.cpp index d974b78..14110c7 100644 --- a/src/luawt/WVideo.cpp +++ b/src/luawt/WVideo.cpp @@ -1,5 +1,6 @@ #include "boost-xtime.hpp" +#include #include #include @@ -12,22 +13,22 @@ static const char* const* const luawt_WVideo_make_args[] = {WVideo_make_args0, W int luawt_WVideo_make(lua_State* L) { int index = luawt_getSuitableArgsGroup(L, luawt_WVideo_make_args); if (index == 0) { - WVideo * result = new WVideo(); + WVideo * l_result = new WVideo(); MyApplication* app = MyApplication::instance(); if (!app) { - delete result; + delete l_result; throw std::logic_error("No WApplication when creating WVideo"); } - app->root()->addWidget(result); + app->root()->addWidget(l_result); - luawt_toLua(L, result); + luawt_toLua(L, l_result); return 1; } else if (index == 1) { Wt::WContainerWidget* parent = luawt_checkFromLua(L, 1); - WVideo * result = new WVideo(parent); - luawt_toLua(L, result); + WVideo * l_result = new WVideo(parent); + luawt_toLua(L, l_result); return 1; } else { @@ -42,8 +43,8 @@ int luawt_WVideo_jsVideoRef(lua_State* L) { int index = luawt_getSuitableArgsGroup(L, luawt_WVideo_jsVideoRef_args); WVideo* self = luawt_checkFromLua(L, 1); if (index == 0) { - std::string result = self->jsVideoRef(); - lua_pushstring(L, result.c_str()); + std::string l_result = self->jsVideoRef(); + lua_pushstring(L, l_result.c_str()); return 1; } else { @@ -51,6 +52,25 @@ int luawt_WVideo_jsVideoRef(lua_State* L) { } } +static const char* WVideo_resize_args0[] = {luawt_typeToStr(), "double", "double", NULL}; +static const char* const* const luawt_WVideo_resize_args[] = {WVideo_resize_args0, NULL}; + +int luawt_WVideo_resize(lua_State* L) { + int index = luawt_getSuitableArgsGroup(L, luawt_WVideo_resize_args); + WVideo* self = luawt_checkFromLua(L, 1); + if (index == 0) { + double raw2 = lua_tonumber(L, 2); + Wt::WLength width = Wt::WLength(raw2); + double raw3 = lua_tonumber(L, 3); + Wt::WLength height = Wt::WLength(raw3); + self->resize(width, height); + return 0; + + } else { + return luaL_error(L, "Wrong arguments for WVideo.resize"); + } +} + static const char* WVideo_setPoster_args0[] = {luawt_typeToStr(), "char const *", NULL}; static const char* const* const luawt_WVideo_setPoster_args[] = {WVideo_setPoster_args0, NULL}; @@ -97,6 +117,7 @@ ADD_SIGNAL(gestureEnded, WVideo, Wt::WGestureEvent) static const luaL_Reg luawt_WVideo_methods[] = { METHOD(WVideo, setPoster), METHOD(WVideo, jsVideoRef), + METHOD(WVideo, resize), METHOD(WVideo, playbackStarted), METHOD(WVideo, playbackPaused), METHOD(WVideo, ended), diff --git a/src/luawt/WViewWidget.cpp b/src/luawt/WViewWidget.cpp index 81c21f1..179ad27 100644 --- a/src/luawt/WViewWidget.cpp +++ b/src/luawt/WViewWidget.cpp @@ -19,6 +19,21 @@ int luawt_WViewWidget_load(lua_State* L) { } } +static const char* WViewWidget_refresh_args0[] = {luawt_typeToStr(), NULL}; +static const char* const* const luawt_WViewWidget_refresh_args[] = {WViewWidget_refresh_args0, NULL}; + +int luawt_WViewWidget_refresh(lua_State* L) { + int index = luawt_getSuitableArgsGroup(L, luawt_WViewWidget_refresh_args); + WViewWidget* self = luawt_checkFromLua(L, 1); + if (index == 0) { + self->refresh(); + return 0; + + } else { + return luaL_error(L, "Wrong arguments for WViewWidget.refresh"); + } +} + static const char* WViewWidget_update_args0[] = {luawt_typeToStr(), NULL}; static const char* const* const luawt_WViewWidget_update_args[] = {WViewWidget_update_args0, NULL}; @@ -34,18 +49,19 @@ int luawt_WViewWidget_update(lua_State* L) { } } -static const char* WViewWidget_refresh_args0[] = {luawt_typeToStr(), NULL}; -static const char* const* const luawt_WViewWidget_refresh_args[] = {WViewWidget_refresh_args0, NULL}; +static const char* WViewWidget_render_args0[] = {luawt_typeToStr(), "int", NULL}; +static const char* const* const luawt_WViewWidget_render_args[] = {WViewWidget_render_args0, NULL}; -int luawt_WViewWidget_refresh(lua_State* L) { - int index = luawt_getSuitableArgsGroup(L, luawt_WViewWidget_refresh_args); +int luawt_WViewWidget_render(lua_State* L) { + int index = luawt_getSuitableArgsGroup(L, luawt_WViewWidget_render_args); WViewWidget* self = luawt_checkFromLua(L, 1); if (index == 0) { - self->refresh(); + Wt::WFlags flags = static_cast(lua_tointeger(L, 2)); + self->render(flags); return 0; } else { - return luaL_error(L, "Wrong arguments for WViewWidget.refresh"); + return luaL_error(L, "Wrong arguments for WViewWidget.render"); } } @@ -53,6 +69,7 @@ int luawt_WViewWidget_refresh(lua_State* L) { static const luaL_Reg luawt_WViewWidget_methods[] = { METHOD(WViewWidget, update), METHOD(WViewWidget, load), + METHOD(WViewWidget, render), METHOD(WViewWidget, refresh), {NULL, NULL}, }; diff --git a/src/luawt/WVirtualImage.cpp b/src/luawt/WVirtualImage.cpp index 9f6c023..3a3bbe7 100644 --- a/src/luawt/WVirtualImage.cpp +++ b/src/luawt/WVirtualImage.cpp @@ -17,15 +17,15 @@ int luawt_WVirtualImage_make(lua_State* L) { int viewPortHeight = lua_tointeger(L, 2); int64_t imageWidth = lua_tointeger(L, 3); int64_t imageHeight = lua_tointeger(L, 4); - WVirtualImage * result = new WVirtualImage(viewPortWidth, viewPortHeight, imageWidth, imageHeight); + WVirtualImage * l_result = new WVirtualImage(viewPortWidth, viewPortHeight, imageWidth, imageHeight); MyApplication* app = MyApplication::instance(); if (!app) { - delete result; + delete l_result; throw std::logic_error("No WApplication when creating WVirtualImage"); } - app->root()->addWidget(result); + app->root()->addWidget(l_result); - luawt_toLua(L, result); + luawt_toLua(L, l_result); return 1; } else if (index == 1) { @@ -34,15 +34,15 @@ int luawt_WVirtualImage_make(lua_State* L) { int64_t imageWidth = lua_tointeger(L, 3); int64_t imageHeight = lua_tointeger(L, 4); int gridImageSize = lua_tointeger(L, 5); - WVirtualImage * result = new WVirtualImage(viewPortWidth, viewPortHeight, imageWidth, imageHeight, gridImageSize); + WVirtualImage * l_result = new WVirtualImage(viewPortWidth, viewPortHeight, imageWidth, imageHeight, gridImageSize); MyApplication* app = MyApplication::instance(); if (!app) { - delete result; + delete l_result; throw std::logic_error("No WApplication when creating WVirtualImage"); } - app->root()->addWidget(result); + app->root()->addWidget(l_result); - luawt_toLua(L, result); + luawt_toLua(L, l_result); return 1; } else if (index == 2) { @@ -53,8 +53,8 @@ int luawt_WVirtualImage_make(lua_State* L) { int gridImageSize = lua_tointeger(L, 5); Wt::WContainerWidget* parent = luawt_checkFromLua(L, 6); - WVirtualImage * result = new WVirtualImage(viewPortWidth, viewPortHeight, imageWidth, imageHeight, gridImageSize, parent); - luawt_toLua(L, result); + WVirtualImage * l_result = new WVirtualImage(viewPortWidth, viewPortHeight, imageWidth, imageHeight, gridImageSize, parent); + luawt_toLua(L, l_result); return 1; } else { @@ -69,8 +69,8 @@ int luawt_WVirtualImage_currentBottomRightY(lua_State* L) { int index = luawt_getSuitableArgsGroup(L, luawt_WVirtualImage_currentBottomRightY_args); WVirtualImage* self = luawt_checkFromLua(L, 1); if (index == 0) { - int64_t result = self->currentBottomRightY(); - lua_pushinteger(L, result); + int64_t l_result = self->currentBottomRightY(); + lua_pushinteger(L, l_result); return 1; } else { @@ -85,8 +85,8 @@ int luawt_WVirtualImage_currentBottomRightX(lua_State* L) { int index = luawt_getSuitableArgsGroup(L, luawt_WVirtualImage_currentBottomRightX_args); WVirtualImage* self = luawt_checkFromLua(L, 1); if (index == 0) { - int64_t result = self->currentBottomRightX(); - lua_pushinteger(L, result); + int64_t l_result = self->currentBottomRightX(); + lua_pushinteger(L, l_result); return 1; } else { @@ -101,8 +101,8 @@ int luawt_WVirtualImage_gridImageSize(lua_State* L) { int index = luawt_getSuitableArgsGroup(L, luawt_WVirtualImage_gridImageSize_args); WVirtualImage* self = luawt_checkFromLua(L, 1); if (index == 0) { - int result = self->gridImageSize(); - lua_pushinteger(L, result); + int l_result = self->gridImageSize(); + lua_pushinteger(L, l_result); return 1; } else { @@ -132,8 +132,8 @@ int luawt_WVirtualImage_viewPortWidth(lua_State* L) { int index = luawt_getSuitableArgsGroup(L, luawt_WVirtualImage_viewPortWidth_args); WVirtualImage* self = luawt_checkFromLua(L, 1); if (index == 0) { - int result = self->viewPortWidth(); - lua_pushinteger(L, result); + int l_result = self->viewPortWidth(); + lua_pushinteger(L, l_result); return 1; } else { @@ -180,8 +180,8 @@ int luawt_WVirtualImage_imageHeight(lua_State* L) { int index = luawt_getSuitableArgsGroup(L, luawt_WVirtualImage_imageHeight_args); WVirtualImage* self = luawt_checkFromLua(L, 1); if (index == 0) { - int64_t result = self->imageHeight(); - lua_pushinteger(L, result); + int64_t l_result = self->imageHeight(); + lua_pushinteger(L, l_result); return 1; } else { @@ -196,8 +196,8 @@ int luawt_WVirtualImage_imageWidth(lua_State* L) { int index = luawt_getSuitableArgsGroup(L, luawt_WVirtualImage_imageWidth_args); WVirtualImage* self = luawt_checkFromLua(L, 1); if (index == 0) { - int64_t result = self->imageWidth(); - lua_pushinteger(L, result); + int64_t l_result = self->imageWidth(); + lua_pushinteger(L, l_result); return 1; } else { @@ -212,8 +212,8 @@ int luawt_WVirtualImage_currentTopLeftX(lua_State* L) { int index = luawt_getSuitableArgsGroup(L, luawt_WVirtualImage_currentTopLeftX_args); WVirtualImage* self = luawt_checkFromLua(L, 1); if (index == 0) { - int64_t result = self->currentTopLeftX(); - lua_pushinteger(L, result); + int64_t l_result = self->currentTopLeftX(); + lua_pushinteger(L, l_result); return 1; } else { @@ -228,8 +228,8 @@ int luawt_WVirtualImage_currentTopLeftY(lua_State* L) { int index = luawt_getSuitableArgsGroup(L, luawt_WVirtualImage_currentTopLeftY_args); WVirtualImage* self = luawt_checkFromLua(L, 1); if (index == 0) { - int64_t result = self->currentTopLeftY(); - lua_pushinteger(L, result); + int64_t l_result = self->currentTopLeftY(); + lua_pushinteger(L, l_result); return 1; } else { @@ -278,8 +278,8 @@ int luawt_WVirtualImage_viewPortHeight(lua_State* L) { int index = luawt_getSuitableArgsGroup(L, luawt_WVirtualImage_viewPortHeight_args); WVirtualImage* self = luawt_checkFromLua(L, 1); if (index == 0) { - int result = self->viewPortHeight(); - lua_pushinteger(L, result); + int l_result = self->viewPortHeight(); + lua_pushinteger(L, l_result); return 1; } else { diff --git a/src/luawt/WWebWidget.cpp b/src/luawt/WWebWidget.cpp index 2eb36fe..c4a23a5 100644 --- a/src/luawt/WWebWidget.cpp +++ b/src/luawt/WWebWidget.cpp @@ -1,7 +1,8 @@ #include "boost-xtime.hpp" -#include +#include #include +#include #include #include "globals.hpp" @@ -70,6 +71,25 @@ int luawt_WWebWidget_setFormObject(lua_State* L) { } } +static const char* WWebWidget_setMinimumSize_args0[] = {luawt_typeToStr(), "double", "double", NULL}; +static const char* const* const luawt_WWebWidget_setMinimumSize_args[] = {WWebWidget_setMinimumSize_args0, NULL}; + +int luawt_WWebWidget_setMinimumSize(lua_State* L) { + int index = luawt_getSuitableArgsGroup(L, luawt_WWebWidget_setMinimumSize_args); + WWebWidget* self = luawt_checkFromLua(L, 1); + if (index == 0) { + double raw2 = lua_tonumber(L, 2); + Wt::WLength width = Wt::WLength(raw2); + double raw3 = lua_tonumber(L, 3); + Wt::WLength height = Wt::WLength(raw3); + self->setMinimumSize(width, height); + return 0; + + } else { + return luaL_error(L, "Wrong arguments for WWebWidget.setMinimumSize"); + } +} + static const char* WWebWidget_floatSide_args0[] = {luawt_typeToStr(), NULL}; static const char* const* const luawt_WWebWidget_floatSide_args[] = {WWebWidget_floatSide_args0, NULL}; @@ -77,8 +97,8 @@ int luawt_WWebWidget_floatSide(lua_State* L) { int index = luawt_getSuitableArgsGroup(L, luawt_WWebWidget_floatSide_args); WWebWidget* self = luawt_checkFromLua(L, 1); if (index == 0) { - Wt::Side result = self->floatSide(); - lua_pushinteger(L, result); + Wt::Side l_result = self->floatSide(); + lua_pushinteger(L, l_result); return 1; } else { @@ -95,8 +115,8 @@ int luawt_WWebWidget_resolveRelativeUrl(lua_State* L) { if (index == 0) { char const * raw2 = lua_tostring(L, 2); std::string url = std::string(raw2); - std::string result = self->resolveRelativeUrl(url); - lua_pushstring(L, result.c_str()); + std::string l_result = self->resolveRelativeUrl(url); + lua_pushstring(L, l_result.c_str()); return 1; } else { @@ -104,19 +124,19 @@ int luawt_WWebWidget_resolveRelativeUrl(lua_State* L) { } } -static const char* WWebWidget_styleClass_args0[] = {luawt_typeToStr(), NULL}; -static const char* const* const luawt_WWebWidget_styleClass_args[] = {WWebWidget_styleClass_args0, NULL}; +static const char* WWebWidget_height_args0[] = {luawt_typeToStr(), NULL}; +static const char* const* const luawt_WWebWidget_height_args[] = {WWebWidget_height_args0, NULL}; -int luawt_WWebWidget_styleClass(lua_State* L) { - int index = luawt_getSuitableArgsGroup(L, luawt_WWebWidget_styleClass_args); +int luawt_WWebWidget_height(lua_State* L) { + int index = luawt_getSuitableArgsGroup(L, luawt_WWebWidget_height_args); WWebWidget* self = luawt_checkFromLua(L, 1); if (index == 0) { - Wt::WString result = self->styleClass(); - lua_pushstring(L, result.toUTF8().c_str()); + Wt::WLength l_result = self->height(); + lua_pushnumber(L, l_result.value()); return 1; } else { - return luaL_error(L, "Wrong arguments for WWebWidget.styleClass"); + return luaL_error(L, "Wrong arguments for WWebWidget.height"); } } @@ -127,8 +147,8 @@ int luawt_WWebWidget_hiddenKeepsGeometry(lua_State* L) { int index = luawt_getSuitableArgsGroup(L, luawt_WWebWidget_hiddenKeepsGeometry_args); WWebWidget* self = luawt_checkFromLua(L, 1); if (index == 0) { - bool result = self->hiddenKeepsGeometry(); - lua_pushboolean(L, result); + bool l_result = self->hiddenKeepsGeometry(); + lua_pushboolean(L, l_result); return 1; } else { @@ -136,19 +156,19 @@ int luawt_WWebWidget_hiddenKeepsGeometry(lua_State* L) { } } -static const char* WWebWidget_id_args0[] = {luawt_typeToStr(), NULL}; -static const char* const* const luawt_WWebWidget_id_args[] = {WWebWidget_id_args0, NULL}; +static const char* WWebWidget_minimumHeight_args0[] = {luawt_typeToStr(), NULL}; +static const char* const* const luawt_WWebWidget_minimumHeight_args[] = {WWebWidget_minimumHeight_args0, NULL}; -int luawt_WWebWidget_id(lua_State* L) { - int index = luawt_getSuitableArgsGroup(L, luawt_WWebWidget_id_args); +int luawt_WWebWidget_minimumHeight(lua_State* L) { + int index = luawt_getSuitableArgsGroup(L, luawt_WWebWidget_minimumHeight_args); WWebWidget* self = luawt_checkFromLua(L, 1); if (index == 0) { - std::string const result = self->id(); - lua_pushstring(L, result.c_str()); + Wt::WLength l_result = self->minimumHeight(); + lua_pushnumber(L, l_result.value()); return 1; } else { - return luaL_error(L, "Wrong arguments for WWebWidget.id"); + return luaL_error(L, "Wrong arguments for WWebWidget.minimumHeight"); } } @@ -159,8 +179,8 @@ int luawt_WWebWidget_loaded(lua_State* L) { int index = luawt_getSuitableArgsGroup(L, luawt_WWebWidget_loaded_args); WWebWidget* self = luawt_checkFromLua(L, 1); if (index == 0) { - bool result = self->loaded(); - lua_pushboolean(L, result); + bool l_result = self->loaded(); + lua_pushboolean(L, l_result); return 1; } else { @@ -168,6 +188,41 @@ int luawt_WWebWidget_loaded(lua_State* L) { } } +static const char* WWebWidget_setMaximumSize_args0[] = {luawt_typeToStr(), "double", "double", NULL}; +static const char* const* const luawt_WWebWidget_setMaximumSize_args[] = {WWebWidget_setMaximumSize_args0, NULL}; + +int luawt_WWebWidget_setMaximumSize(lua_State* L) { + int index = luawt_getSuitableArgsGroup(L, luawt_WWebWidget_setMaximumSize_args); + WWebWidget* self = luawt_checkFromLua(L, 1); + if (index == 0) { + double raw2 = lua_tonumber(L, 2); + Wt::WLength width = Wt::WLength(raw2); + double raw3 = lua_tonumber(L, 3); + Wt::WLength height = Wt::WLength(raw3); + self->setMaximumSize(width, height); + return 0; + + } else { + return luaL_error(L, "Wrong arguments for WWebWidget.setMaximumSize"); + } +} + +static const char* WWebWidget_styleClass_args0[] = {luawt_typeToStr(), NULL}; +static const char* const* const luawt_WWebWidget_styleClass_args[] = {WWebWidget_styleClass_args0, NULL}; + +int luawt_WWebWidget_styleClass(lua_State* L) { + int index = luawt_getSuitableArgsGroup(L, luawt_WWebWidget_styleClass_args); + WWebWidget* self = luawt_checkFromLua(L, 1); + if (index == 0) { + Wt::WString l_result = self->styleClass(); + lua_pushstring(L, l_result.toUTF8().c_str()); + return 1; + + } else { + return luaL_error(L, "Wrong arguments for WWebWidget.styleClass"); + } +} + static const char* WWebWidget_find_args0[] = {luawt_typeToStr(), "char const *", NULL}; static const char* const* const luawt_WWebWidget_find_args[] = {WWebWidget_find_args0, NULL}; @@ -177,8 +232,8 @@ int luawt_WWebWidget_find(lua_State* L) { if (index == 0) { char const * raw2 = lua_tostring(L, 2); std::string name = std::string(raw2); - Wt::WWidget * result = self->find(name); - luawt_toLua(L, result); + Wt::WWidget * l_result = self->find(name); + luawt_toLua(L, l_result); return 1; } else { @@ -186,6 +241,22 @@ int luawt_WWebWidget_find(lua_State* L) { } } +static const char* WWebWidget_setTabIndex_args0[] = {luawt_typeToStr(), "int", NULL}; +static const char* const* const luawt_WWebWidget_setTabIndex_args[] = {WWebWidget_setTabIndex_args0, NULL}; + +int luawt_WWebWidget_setTabIndex(lua_State* L) { + int index = luawt_getSuitableArgsGroup(L, luawt_WWebWidget_setTabIndex_args); + WWebWidget* self = luawt_checkFromLua(L, 1); + if (index == 0) { + int index = lua_tointeger(L, 2); + self->setTabIndex(index); + return 0; + + } else { + return luaL_error(L, "Wrong arguments for WWebWidget.setTabIndex"); + } +} + static const char* WWebWidget_isInline_args0[] = {luawt_typeToStr(), NULL}; static const char* const* const luawt_WWebWidget_isInline_args[] = {WWebWidget_isInline_args0, NULL}; @@ -193,8 +264,8 @@ int luawt_WWebWidget_isInline(lua_State* L) { int index = luawt_getSuitableArgsGroup(L, luawt_WWebWidget_isInline_args); WWebWidget* self = luawt_checkFromLua(L, 1); if (index == 0) { - bool result = self->isInline(); - lua_pushboolean(L, result); + bool l_result = self->isInline(); + lua_pushboolean(L, l_result); return 1; } else { @@ -209,8 +280,8 @@ int luawt_WWebWidget_canOptimizeUpdates(lua_State* L) { int index = luawt_getSuitableArgsGroup(L, luawt_WWebWidget_canOptimizeUpdates_args); WWebWidget* self = luawt_checkFromLua(L, 1); if (index == 0) { - bool result = self->canOptimizeUpdates(); - lua_pushboolean(L, result); + bool l_result = self->canOptimizeUpdates(); + lua_pushboolean(L, l_result); return 1; } else { @@ -218,20 +289,19 @@ int luawt_WWebWidget_canOptimizeUpdates(lua_State* L) { } } -static const char* WWebWidget_setStyleClass_args0[] = {luawt_typeToStr(), "char const *", NULL}; -static const char* const* const luawt_WWebWidget_setStyleClass_args[] = {WWebWidget_setStyleClass_args0, NULL}; +static const char* WWebWidget_setClearSides_args0[] = {luawt_typeToStr(), "int", NULL}; +static const char* const* const luawt_WWebWidget_setClearSides_args[] = {WWebWidget_setClearSides_args0, NULL}; -int luawt_WWebWidget_setStyleClass(lua_State* L) { - int index = luawt_getSuitableArgsGroup(L, luawt_WWebWidget_setStyleClass_args); +int luawt_WWebWidget_setClearSides(lua_State* L) { + int index = luawt_getSuitableArgsGroup(L, luawt_WWebWidget_setClearSides_args); WWebWidget* self = luawt_checkFromLua(L, 1); if (index == 0) { - char const * raw2 = lua_tostring(L, 2); - Wt::WString styleClass = Wt::WString(raw2); - self->setStyleClass(styleClass); + Wt::WFlags sides = static_cast(lua_tointeger(L, 2)); + self->setClearSides(sides); return 0; } else { - return luaL_error(L, "Wrong arguments for WWebWidget.setStyleClass"); + return luaL_error(L, "Wrong arguments for WWebWidget.setClearSides"); } } @@ -242,8 +312,8 @@ int luawt_WWebWidget_isRendered(lua_State* L) { int index = luawt_getSuitableArgsGroup(L, luawt_WWebWidget_isRendered_args); WWebWidget* self = luawt_checkFromLua(L, 1); if (index == 0) { - bool result = self->isRendered(); - lua_pushboolean(L, result); + bool l_result = self->isRendered(); + lua_pushboolean(L, l_result); return 1; } else { @@ -251,19 +321,28 @@ int luawt_WWebWidget_isRendered(lua_State* L) { } } -static const char* WWebWidget_isDisabled_args0[] = {luawt_typeToStr(), NULL}; -static const char* const* const luawt_WWebWidget_isDisabled_args[] = {WWebWidget_isDisabled_args0, NULL}; +static const char* WWebWidget_setOffsets_args0[] = {luawt_typeToStr(), "double", NULL}; +static const char* WWebWidget_setOffsets_args1[] = {luawt_typeToStr(), "double", "int", NULL}; +static const char* const* const luawt_WWebWidget_setOffsets_args[] = {WWebWidget_setOffsets_args0, WWebWidget_setOffsets_args1, NULL}; -int luawt_WWebWidget_isDisabled(lua_State* L) { - int index = luawt_getSuitableArgsGroup(L, luawt_WWebWidget_isDisabled_args); +int luawt_WWebWidget_setOffsets(lua_State* L) { + int index = luawt_getSuitableArgsGroup(L, luawt_WWebWidget_setOffsets_args); WWebWidget* self = luawt_checkFromLua(L, 1); if (index == 0) { - bool result = self->isDisabled(); - lua_pushboolean(L, result); - return 1; - + double raw2 = lua_tonumber(L, 2); + Wt::WLength offset = Wt::WLength(raw2); + self->setOffsets(offset); + return 0; + + } else if (index == 1) { + double raw2 = lua_tonumber(L, 2); + Wt::WLength offset = Wt::WLength(raw2); + Wt::WFlags sides = static_cast(lua_tointeger(L, 3)); + self->setOffsets(offset, sides); + return 0; + } else { - return luaL_error(L, "Wrong arguments for WWebWidget.isDisabled"); + return luaL_error(L, "Wrong arguments for WWebWidget.setOffsets"); } } @@ -299,6 +378,22 @@ int luawt_WWebWidget_setFloatSide(lua_State* L) { } } +static const char* WWebWidget_width_args0[] = {luawt_typeToStr(), NULL}; +static const char* const* const luawt_WWebWidget_width_args[] = {WWebWidget_width_args0, NULL}; + +int luawt_WWebWidget_width(lua_State* L) { + int index = luawt_getSuitableArgsGroup(L, luawt_WWebWidget_width_args); + WWebWidget* self = luawt_checkFromLua(L, 1); + if (index == 0) { + Wt::WLength l_result = self->width(); + lua_pushnumber(L, l_result.value()); + return 1; + + } else { + return luaL_error(L, "Wrong arguments for WWebWidget.width"); + } +} + static const char* WWebWidget_verticalAlignment_args0[] = {luawt_typeToStr(), NULL}; static const char* const* const luawt_WWebWidget_verticalAlignment_args[] = {WWebWidget_verticalAlignment_args0, NULL}; @@ -306,8 +401,8 @@ int luawt_WWebWidget_verticalAlignment(lua_State* L) { int index = luawt_getSuitableArgsGroup(L, luawt_WWebWidget_verticalAlignment_args); WWebWidget* self = luawt_checkFromLua(L, 1); if (index == 0) { - Wt::AlignmentFlag result = self->verticalAlignment(); - lua_pushinteger(L, result); + Wt::AlignmentFlag l_result = self->verticalAlignment(); + lua_pushinteger(L, l_result); return 1; } else { @@ -315,6 +410,25 @@ int luawt_WWebWidget_verticalAlignment(lua_State* L) { } } +static const char* WWebWidget_resize_args0[] = {luawt_typeToStr(), "double", "double", NULL}; +static const char* const* const luawt_WWebWidget_resize_args[] = {WWebWidget_resize_args0, NULL}; + +int luawt_WWebWidget_resize(lua_State* L) { + int index = luawt_getSuitableArgsGroup(L, luawt_WWebWidget_resize_args); + WWebWidget* self = luawt_checkFromLua(L, 1); + if (index == 0) { + double raw2 = lua_tonumber(L, 2); + Wt::WLength width = Wt::WLength(raw2); + double raw3 = lua_tonumber(L, 3); + Wt::WLength height = Wt::WLength(raw3); + self->resize(width, height); + return 0; + + } else { + return luaL_error(L, "Wrong arguments for WWebWidget.resize"); + } +} + static const char* WWebWidget_positionScheme_args0[] = {luawt_typeToStr(), NULL}; static const char* const* const luawt_WWebWidget_positionScheme_args[] = {WWebWidget_positionScheme_args0, NULL}; @@ -322,8 +436,8 @@ int luawt_WWebWidget_positionScheme(lua_State* L) { int index = luawt_getSuitableArgsGroup(L, luawt_WWebWidget_positionScheme_args); WWebWidget* self = luawt_checkFromLua(L, 1); if (index == 0) { - Wt::PositionScheme result = self->positionScheme(); - lua_pushinteger(L, result); + Wt::PositionScheme l_result = self->positionScheme(); + lua_pushinteger(L, l_result); return 1; } else { @@ -331,6 +445,38 @@ int luawt_WWebWidget_positionScheme(lua_State* L) { } } +static const char* WWebWidget_lineHeight_args0[] = {luawt_typeToStr(), NULL}; +static const char* const* const luawt_WWebWidget_lineHeight_args[] = {WWebWidget_lineHeight_args0, NULL}; + +int luawt_WWebWidget_lineHeight(lua_State* L) { + int index = luawt_getSuitableArgsGroup(L, luawt_WWebWidget_lineHeight_args); + WWebWidget* self = luawt_checkFromLua(L, 1); + if (index == 0) { + Wt::WLength l_result = self->lineHeight(); + lua_pushnumber(L, l_result.value()); + return 1; + + } else { + return luaL_error(L, "Wrong arguments for WWebWidget.lineHeight"); + } +} + +static const char* WWebWidget_id_args0[] = {luawt_typeToStr(), NULL}; +static const char* const* const luawt_WWebWidget_id_args[] = {WWebWidget_id_args0, NULL}; + +int luawt_WWebWidget_id(lua_State* L) { + int index = luawt_getSuitableArgsGroup(L, luawt_WWebWidget_id_args); + WWebWidget* self = luawt_checkFromLua(L, 1); + if (index == 0) { + std::string const l_result = self->id(); + lua_pushstring(L, l_result.c_str()); + return 1; + + } else { + return luaL_error(L, "Wrong arguments for WWebWidget.id"); + } +} + static const char* WWebWidget_tabIndex_args0[] = {luawt_typeToStr(), NULL}; static const char* const* const luawt_WWebWidget_tabIndex_args[] = {WWebWidget_tabIndex_args0, NULL}; @@ -338,8 +484,8 @@ int luawt_WWebWidget_tabIndex(lua_State* L) { int index = luawt_getSuitableArgsGroup(L, luawt_WWebWidget_tabIndex_args); WWebWidget* self = luawt_checkFromLua(L, 1); if (index == 0) { - int result = self->tabIndex(); - lua_pushinteger(L, result); + int l_result = self->tabIndex(); + lua_pushinteger(L, l_result); return 1; } else { @@ -354,8 +500,8 @@ int luawt_WWebWidget_isHidden(lua_State* L) { int index = luawt_getSuitableArgsGroup(L, luawt_WWebWidget_isHidden_args); WWebWidget* self = luawt_checkFromLua(L, 1); if (index == 0) { - bool result = self->isHidden(); - lua_pushboolean(L, result); + bool l_result = self->isHidden(); + lua_pushboolean(L, l_result); return 1; } else { @@ -379,6 +525,22 @@ int luawt_WWebWidget_setSelectable(lua_State* L) { } } +static const char* WWebWidget_minimumWidth_args0[] = {luawt_typeToStr(), NULL}; +static const char* const* const luawt_WWebWidget_minimumWidth_args[] = {WWebWidget_minimumWidth_args0, NULL}; + +int luawt_WWebWidget_minimumWidth(lua_State* L) { + int index = luawt_getSuitableArgsGroup(L, luawt_WWebWidget_minimumWidth_args); + WWebWidget* self = luawt_checkFromLua(L, 1); + if (index == 0) { + Wt::WLength l_result = self->minimumWidth(); + lua_pushnumber(L, l_result.value()); + return 1; + + } else { + return luaL_error(L, "Wrong arguments for WWebWidget.minimumWidth"); + } +} + static const char* WWebWidget_attributeValue_args0[] = {luawt_typeToStr(), "char const *", NULL}; static const char* const* const luawt_WWebWidget_attributeValue_args[] = {WWebWidget_attributeValue_args0, NULL}; @@ -388,8 +550,8 @@ int luawt_WWebWidget_attributeValue(lua_State* L) { if (index == 0) { char const * raw2 = lua_tostring(L, 2); std::string name = std::string(raw2); - Wt::WString result = self->attributeValue(name); - lua_pushstring(L, result.toUTF8().c_str()); + Wt::WString l_result = self->attributeValue(name); + lua_pushstring(L, l_result.toUTF8().c_str()); return 1; } else { @@ -397,6 +559,22 @@ int luawt_WWebWidget_attributeValue(lua_State* L) { } } +static const char* WWebWidget_domElementType_args0[] = {luawt_typeToStr(), NULL}; +static const char* const* const luawt_WWebWidget_domElementType_args[] = {WWebWidget_domElementType_args0, NULL}; + +int luawt_WWebWidget_domElementType(lua_State* L) { + int index = luawt_getSuitableArgsGroup(L, luawt_WWebWidget_domElementType_args); + WWebWidget* self = luawt_checkFromLua(L, 1); + if (index == 0) { + Wt::DomElementType l_result = self->domElementType(); + lua_pushinteger(L, l_result); + return 1; + + } else { + return luaL_error(L, "Wrong arguments for WWebWidget.domElementType"); + } +} + static const char* WWebWidget_setPositionScheme_args0[] = {luawt_typeToStr(), "int", NULL}; static const char* const* const luawt_WWebWidget_setPositionScheme_args[] = {WWebWidget_setPositionScheme_args0, NULL}; @@ -413,19 +591,19 @@ int luawt_WWebWidget_setPositionScheme(lua_State* L) { } } -static const char* WWebWidget_domElementType_args0[] = {luawt_typeToStr(), NULL}; -static const char* const* const luawt_WWebWidget_domElementType_args[] = {WWebWidget_domElementType_args0, NULL}; +static const char* WWebWidget_maximumHeight_args0[] = {luawt_typeToStr(), NULL}; +static const char* const* const luawt_WWebWidget_maximumHeight_args[] = {WWebWidget_maximumHeight_args0, NULL}; -int luawt_WWebWidget_domElementType(lua_State* L) { - int index = luawt_getSuitableArgsGroup(L, luawt_WWebWidget_domElementType_args); +int luawt_WWebWidget_maximumHeight(lua_State* L) { + int index = luawt_getSuitableArgsGroup(L, luawt_WWebWidget_maximumHeight_args); WWebWidget* self = luawt_checkFromLua(L, 1); if (index == 0) { - Wt::DomElementType result = self->domElementType(); - lua_pushinteger(L, result); + Wt::WLength l_result = self->maximumHeight(); + lua_pushnumber(L, l_result.value()); return 1; } else { - return luaL_error(L, "Wrong arguments for WWebWidget.domElementType"); + return luaL_error(L, "Wrong arguments for WWebWidget.maximumHeight"); } } @@ -438,8 +616,8 @@ int luawt_WWebWidget_javaScriptMember(lua_State* L) { if (index == 0) { char const * raw2 = lua_tostring(L, 2); std::string name = std::string(raw2); - std::string result = self->javaScriptMember(name); - lua_pushstring(L, result.c_str()); + std::string l_result = self->javaScriptMember(name); + lua_pushstring(L, l_result.c_str()); return 1; } else { @@ -447,6 +625,22 @@ int luawt_WWebWidget_javaScriptMember(lua_State* L) { } } +static const char* WWebWidget_verticalAlignmentLength_args0[] = {luawt_typeToStr(), NULL}; +static const char* const* const luawt_WWebWidget_verticalAlignmentLength_args[] = {WWebWidget_verticalAlignmentLength_args0, NULL}; + +int luawt_WWebWidget_verticalAlignmentLength(lua_State* L) { + int index = luawt_getSuitableArgsGroup(L, luawt_WWebWidget_verticalAlignmentLength_args); + WWebWidget* self = luawt_checkFromLua(L, 1); + if (index == 0) { + Wt::WLength l_result = self->verticalAlignmentLength(); + lua_pushnumber(L, l_result.value()); + return 1; + + } else { + return luaL_error(L, "Wrong arguments for WWebWidget.verticalAlignmentLength"); + } +} + static const char* WWebWidget_toolTip_args0[] = {luawt_typeToStr(), NULL}; static const char* const* const luawt_WWebWidget_toolTip_args[] = {WWebWidget_toolTip_args0, NULL}; @@ -454,8 +648,8 @@ int luawt_WWebWidget_toolTip(lua_State* L) { int index = luawt_getSuitableArgsGroup(L, luawt_WWebWidget_toolTip_args); WWebWidget* self = luawt_checkFromLua(L, 1); if (index == 0) { - Wt::WString const & result = self->toolTip(); - lua_pushstring(L, result.toUTF8().c_str()); + Wt::WString const & l_result = self->toolTip(); + lua_pushstring(L, l_result.toUTF8().c_str()); return 1; } else { @@ -470,8 +664,8 @@ int luawt_WWebWidget_zIndex(lua_State* L) { int index = luawt_getSuitableArgsGroup(L, luawt_WWebWidget_zIndex_args); WWebWidget* self = luawt_checkFromLua(L, 1); if (index == 0) { - int result = self->zIndex(); - lua_pushinteger(L, result); + int l_result = self->zIndex(); + lua_pushinteger(L, l_result); return 1; } else { @@ -479,6 +673,55 @@ int luawt_WWebWidget_zIndex(lua_State* L) { } } +static const char* WWebWidget_setVerticalAlignment_args0[] = {luawt_typeToStr(), "int", NULL}; +static const char* WWebWidget_setVerticalAlignment_args1[] = {luawt_typeToStr(), "int", "double", NULL}; +static const char* const* const luawt_WWebWidget_setVerticalAlignment_args[] = {WWebWidget_setVerticalAlignment_args0, WWebWidget_setVerticalAlignment_args1, NULL}; + +int luawt_WWebWidget_setVerticalAlignment(lua_State* L) { + int index = luawt_getSuitableArgsGroup(L, luawt_WWebWidget_setVerticalAlignment_args); + WWebWidget* self = luawt_checkFromLua(L, 1); + if (index == 0) { + Wt::AlignmentFlag alignment = static_cast(lua_tointeger(L, 2)); + self->setVerticalAlignment(alignment); + return 0; + + } else if (index == 1) { + Wt::AlignmentFlag alignment = static_cast(lua_tointeger(L, 2)); + double raw3 = lua_tonumber(L, 3); + Wt::WLength length = Wt::WLength(raw3); + self->setVerticalAlignment(alignment, length); + return 0; + + } else { + return luaL_error(L, "Wrong arguments for WWebWidget.setVerticalAlignment"); + } +} + +static const char* WWebWidget_setMargin_args0[] = {luawt_typeToStr(), "double", NULL}; +static const char* WWebWidget_setMargin_args1[] = {luawt_typeToStr(), "double", "int", NULL}; +static const char* const* const luawt_WWebWidget_setMargin_args[] = {WWebWidget_setMargin_args0, WWebWidget_setMargin_args1, NULL}; + +int luawt_WWebWidget_setMargin(lua_State* L) { + int index = luawt_getSuitableArgsGroup(L, luawt_WWebWidget_setMargin_args); + WWebWidget* self = luawt_checkFromLua(L, 1); + if (index == 0) { + double raw2 = lua_tonumber(L, 2); + Wt::WLength margin = Wt::WLength(raw2); + self->setMargin(margin); + return 0; + + } else if (index == 1) { + double raw2 = lua_tonumber(L, 2); + Wt::WLength margin = Wt::WLength(raw2); + Wt::WFlags sides = static_cast(lua_tointeger(L, 3)); + self->setMargin(margin, sides); + return 0; + + } else { + return luaL_error(L, "Wrong arguments for WWebWidget.setMargin"); + } +} + static const char* WWebWidget_setLoadLaterWhenInvisible_args0[] = {luawt_typeToStr(), "bool", NULL}; static const char* const* const luawt_WWebWidget_setLoadLaterWhenInvisible_args[] = {WWebWidget_setLoadLaterWhenInvisible_args0, NULL}; @@ -511,6 +754,39 @@ int luawt_WWebWidget_setInline(lua_State* L) { } } +static const char* WWebWidget_offset_args0[] = {luawt_typeToStr(), "int", NULL}; +static const char* const* const luawt_WWebWidget_offset_args[] = {WWebWidget_offset_args0, NULL}; + +int luawt_WWebWidget_offset(lua_State* L) { + int index = luawt_getSuitableArgsGroup(L, luawt_WWebWidget_offset_args); + WWebWidget* self = luawt_checkFromLua(L, 1); + if (index == 0) { + Wt::Side s = static_cast(lua_tointeger(L, 2)); + Wt::WLength l_result = self->offset(s); + lua_pushnumber(L, l_result.value()); + return 1; + + } else { + return luaL_error(L, "Wrong arguments for WWebWidget.offset"); + } +} + +static const char* WWebWidget_clearSides_args0[] = {luawt_typeToStr(), NULL}; +static const char* const* const luawt_WWebWidget_clearSides_args[] = {WWebWidget_clearSides_args0, NULL}; + +int luawt_WWebWidget_clearSides(lua_State* L) { + int index = luawt_getSuitableArgsGroup(L, luawt_WWebWidget_clearSides_args); + WWebWidget* self = luawt_checkFromLua(L, 1); + if (index == 0) { + Wt::WFlags l_result = self->clearSides(); + lua_pushinteger(L, l_result); + return 1; + + } else { + return luaL_error(L, "Wrong arguments for WWebWidget.clearSides"); + } +} + static const char* WWebWidget_setId_args0[] = {luawt_typeToStr(), "char const *", NULL}; static const char* const* const luawt_WWebWidget_setId_args[] = {WWebWidget_setId_args0, NULL}; @@ -528,6 +804,23 @@ int luawt_WWebWidget_setId(lua_State* L) { } } +static const char* WWebWidget_setLineHeight_args0[] = {luawt_typeToStr(), "double", NULL}; +static const char* const* const luawt_WWebWidget_setLineHeight_args[] = {WWebWidget_setLineHeight_args0, NULL}; + +int luawt_WWebWidget_setLineHeight(lua_State* L) { + int index = luawt_getSuitableArgsGroup(L, luawt_WWebWidget_setLineHeight_args); + WWebWidget* self = luawt_checkFromLua(L, 1); + if (index == 0) { + double raw2 = lua_tonumber(L, 2); + Wt::WLength height = Wt::WLength(raw2); + self->setLineHeight(height); + return 0; + + } else { + return luaL_error(L, "Wrong arguments for WWebWidget.setLineHeight"); + } +} + static const char* WWebWidget_hasStyleClass_args0[] = {luawt_typeToStr(), "char const *", NULL}; static const char* const* const luawt_WWebWidget_hasStyleClass_args[] = {WWebWidget_hasStyleClass_args0, NULL}; @@ -537,8 +830,8 @@ int luawt_WWebWidget_hasStyleClass(lua_State* L) { if (index == 0) { char const * raw2 = lua_tostring(L, 2); Wt::WString styleClass = Wt::WString(raw2); - bool result = self->hasStyleClass(styleClass); - lua_pushboolean(L, result); + bool l_result = self->hasStyleClass(styleClass); + lua_pushboolean(L, l_result); return 1; } else { @@ -555,8 +848,8 @@ int luawt_WWebWidget_findById(lua_State* L) { if (index == 0) { char const * raw2 = lua_tostring(L, 2); std::string id = std::string(raw2); - Wt::WWidget * result = self->findById(id); - luawt_toLua(L, result); + Wt::WWidget * l_result = self->findById(id); + luawt_toLua(L, l_result); return 1; } else { @@ -564,6 +857,22 @@ int luawt_WWebWidget_findById(lua_State* L) { } } +static const char* WWebWidget_maximumWidth_args0[] = {luawt_typeToStr(), NULL}; +static const char* const* const luawt_WWebWidget_maximumWidth_args[] = {WWebWidget_maximumWidth_args0, NULL}; + +int luawt_WWebWidget_maximumWidth(lua_State* L) { + int index = luawt_getSuitableArgsGroup(L, luawt_WWebWidget_maximumWidth_args); + WWebWidget* self = luawt_checkFromLua(L, 1); + if (index == 0) { + Wt::WLength l_result = self->maximumWidth(); + lua_pushnumber(L, l_result.value()); + return 1; + + } else { + return luaL_error(L, "Wrong arguments for WWebWidget.maximumWidth"); + } +} + static const char* WWebWidget_setToolTip_args0[] = {luawt_typeToStr(), "char const *", NULL}; static const char* WWebWidget_setToolTip_args1[] = {luawt_typeToStr(), "char const *", "int", NULL}; static const char* const* const luawt_WWebWidget_setToolTip_args[] = {WWebWidget_setToolTip_args0, WWebWidget_setToolTip_args1, NULL}; @@ -599,16 +908,16 @@ int luawt_WWebWidget_escapeText(lua_State* L) { if (index == 0) { char const * raw2 = lua_tostring(L, 2); Wt::WString text = Wt::WString(raw2); - Wt::WString result = self->escapeText(text); - lua_pushstring(L, result.toUTF8().c_str()); + Wt::WString l_result = self->escapeText(text); + lua_pushstring(L, l_result.toUTF8().c_str()); return 1; } else if (index == 1) { char const * raw2 = lua_tostring(L, 2); Wt::WString text = Wt::WString(raw2); bool newlinesToo = lua_toboolean(L, 3); - Wt::WString result = self->escapeText(text, newlinesToo); - lua_pushstring(L, result.toUTF8().c_str()); + Wt::WString l_result = self->escapeText(text, newlinesToo); + lua_pushstring(L, l_result.toUTF8().c_str()); return 1; } else { @@ -623,8 +932,8 @@ int luawt_WWebWidget_isPopup(lua_State* L) { int index = luawt_getSuitableArgsGroup(L, luawt_WWebWidget_isPopup_args); WWebWidget* self = luawt_checkFromLua(L, 1); if (index == 0) { - bool result = self->isPopup(); - lua_pushboolean(L, result); + bool l_result = self->isPopup(); + lua_pushboolean(L, l_result); return 1; } else { @@ -632,6 +941,25 @@ int luawt_WWebWidget_isPopup(lua_State* L) { } } +static const char* WWebWidget_setJavaScriptMember_args0[] = {luawt_typeToStr(), "char const *", "char const *", NULL}; +static const char* const* const luawt_WWebWidget_setJavaScriptMember_args[] = {WWebWidget_setJavaScriptMember_args0, NULL}; + +int luawt_WWebWidget_setJavaScriptMember(lua_State* L) { + int index = luawt_getSuitableArgsGroup(L, luawt_WWebWidget_setJavaScriptMember_args); + WWebWidget* self = luawt_checkFromLua(L, 1); + if (index == 0) { + char const * raw2 = lua_tostring(L, 2); + std::string name = std::string(raw2); + char const * raw3 = lua_tostring(L, 3); + std::string value = std::string(raw3); + self->setJavaScriptMember(name, value); + return 0; + + } else { + return luaL_error(L, "Wrong arguments for WWebWidget.setJavaScriptMember"); + } +} + static const char* WWebWidget_removeStyleClass_args0[] = {luawt_typeToStr(), "char const *", NULL}; static const char* WWebWidget_removeStyleClass_args1[] = {luawt_typeToStr(), "char const *", "bool", NULL}; static const char* const* const luawt_WWebWidget_removeStyleClass_args[] = {WWebWidget_removeStyleClass_args0, WWebWidget_removeStyleClass_args1, NULL}; @@ -672,22 +1000,20 @@ int luawt_WWebWidget_refresh(lua_State* L) { } } -static const char* WWebWidget_setJavaScriptMember_args0[] = {luawt_typeToStr(), "char const *", "char const *", NULL}; -static const char* const* const luawt_WWebWidget_setJavaScriptMember_args[] = {WWebWidget_setJavaScriptMember_args0, NULL}; +static const char* WWebWidget_setStyleClass_args0[] = {luawt_typeToStr(), "char const *", NULL}; +static const char* const* const luawt_WWebWidget_setStyleClass_args[] = {WWebWidget_setStyleClass_args0, NULL}; -int luawt_WWebWidget_setJavaScriptMember(lua_State* L) { - int index = luawt_getSuitableArgsGroup(L, luawt_WWebWidget_setJavaScriptMember_args); +int luawt_WWebWidget_setStyleClass(lua_State* L) { + int index = luawt_getSuitableArgsGroup(L, luawt_WWebWidget_setStyleClass_args); WWebWidget* self = luawt_checkFromLua(L, 1); if (index == 0) { char const * raw2 = lua_tostring(L, 2); - std::string name = std::string(raw2); - char const * raw3 = lua_tostring(L, 3); - std::string value = std::string(raw3); - self->setJavaScriptMember(name, value); + Wt::WString styleClass = Wt::WString(raw2); + self->setStyleClass(styleClass); return 0; } else { - return luaL_error(L, "Wrong arguments for WWebWidget.setJavaScriptMember"); + return luaL_error(L, "Wrong arguments for WWebWidget.setStyleClass"); } } @@ -730,8 +1056,8 @@ int luawt_WWebWidget_isVisible(lua_State* L) { int index = luawt_getSuitableArgsGroup(L, luawt_WWebWidget_isVisible_args); WWebWidget* self = luawt_checkFromLua(L, 1); if (index == 0) { - bool result = self->isVisible(); - lua_pushboolean(L, result); + bool l_result = self->isVisible(); + lua_pushboolean(L, l_result); return 1; } else { @@ -783,54 +1109,71 @@ int luawt_WWebWidget_setAttributeValue(lua_State* L) { } } -static const char* WWebWidget_setTabIndex_args0[] = {luawt_typeToStr(), "int", NULL}; -static const char* const* const luawt_WWebWidget_setTabIndex_args[] = {WWebWidget_setTabIndex_args0, NULL}; +static const char* WWebWidget_callJavaScriptMember_args0[] = {luawt_typeToStr(), "char const *", "char const *", NULL}; +static const char* const* const luawt_WWebWidget_callJavaScriptMember_args[] = {WWebWidget_callJavaScriptMember_args0, NULL}; -int luawt_WWebWidget_setTabIndex(lua_State* L) { - int index = luawt_getSuitableArgsGroup(L, luawt_WWebWidget_setTabIndex_args); +int luawt_WWebWidget_callJavaScriptMember(lua_State* L) { + int index = luawt_getSuitableArgsGroup(L, luawt_WWebWidget_callJavaScriptMember_args); WWebWidget* self = luawt_checkFromLua(L, 1); if (index == 0) { - int index = lua_tointeger(L, 2); - self->setTabIndex(index); + char const * raw2 = lua_tostring(L, 2); + std::string name = std::string(raw2); + char const * raw3 = lua_tostring(L, 3); + std::string args = std::string(raw3); + self->callJavaScriptMember(name, args); return 0; } else { - return luaL_error(L, "Wrong arguments for WWebWidget.setTabIndex"); + return luaL_error(L, "Wrong arguments for WWebWidget.callJavaScriptMember"); } } -static const char* WWebWidget_isEnabled_args0[] = {luawt_typeToStr(), NULL}; -static const char* const* const luawt_WWebWidget_isEnabled_args[] = {WWebWidget_isEnabled_args0, NULL}; +static const char* WWebWidget_margin_args0[] = {luawt_typeToStr(), "int", NULL}; +static const char* const* const luawt_WWebWidget_margin_args[] = {WWebWidget_margin_args0, NULL}; -int luawt_WWebWidget_isEnabled(lua_State* L) { - int index = luawt_getSuitableArgsGroup(L, luawt_WWebWidget_isEnabled_args); +int luawt_WWebWidget_margin(lua_State* L) { + int index = luawt_getSuitableArgsGroup(L, luawt_WWebWidget_margin_args); WWebWidget* self = luawt_checkFromLua(L, 1); if (index == 0) { - bool result = self->isEnabled(); - lua_pushboolean(L, result); + Wt::Side side = static_cast(lua_tointeger(L, 2)); + Wt::WLength l_result = self->margin(side); + lua_pushnumber(L, l_result.value()); return 1; } else { - return luaL_error(L, "Wrong arguments for WWebWidget.isEnabled"); + return luaL_error(L, "Wrong arguments for WWebWidget.margin"); } } -static const char* WWebWidget_callJavaScriptMember_args0[] = {luawt_typeToStr(), "char const *", "char const *", NULL}; -static const char* const* const luawt_WWebWidget_callJavaScriptMember_args[] = {WWebWidget_callJavaScriptMember_args0, NULL}; +static const char* WWebWidget_isDisabled_args0[] = {luawt_typeToStr(), NULL}; +static const char* const* const luawt_WWebWidget_isDisabled_args[] = {WWebWidget_isDisabled_args0, NULL}; -int luawt_WWebWidget_callJavaScriptMember(lua_State* L) { - int index = luawt_getSuitableArgsGroup(L, luawt_WWebWidget_callJavaScriptMember_args); +int luawt_WWebWidget_isDisabled(lua_State* L) { + int index = luawt_getSuitableArgsGroup(L, luawt_WWebWidget_isDisabled_args); WWebWidget* self = luawt_checkFromLua(L, 1); if (index == 0) { - char const * raw2 = lua_tostring(L, 2); - std::string name = std::string(raw2); - char const * raw3 = lua_tostring(L, 3); - std::string args = std::string(raw3); - self->callJavaScriptMember(name, args); - return 0; - + bool l_result = self->isDisabled(); + lua_pushboolean(L, l_result); + return 1; + } else { - return luaL_error(L, "Wrong arguments for WWebWidget.callJavaScriptMember"); + return luaL_error(L, "Wrong arguments for WWebWidget.isDisabled"); + } +} + +static const char* WWebWidget_isEnabled_args0[] = {luawt_typeToStr(), NULL}; +static const char* const* const luawt_WWebWidget_isEnabled_args[] = {WWebWidget_isEnabled_args0, NULL}; + +int luawt_WWebWidget_isEnabled(lua_State* L) { + int index = luawt_getSuitableArgsGroup(L, luawt_WWebWidget_isEnabled_args); + WWebWidget* self = luawt_checkFromLua(L, 1); + if (index == 0) { + bool l_result = self->isEnabled(); + lua_pushboolean(L, l_result); + return 1; + + } else { + return luaL_error(L, "Wrong arguments for WWebWidget.isEnabled"); } } @@ -838,8 +1181,25 @@ int luawt_WWebWidget_callJavaScriptMember(lua_State* L) { static const luaL_Reg luawt_WWebWidget_methods[] = { METHOD(WWebWidget, setPositionScheme), METHOD(WWebWidget, positionScheme), + METHOD(WWebWidget, setOffsets), + METHOD(WWebWidget, offset), + METHOD(WWebWidget, resize), + METHOD(WWebWidget, width), + METHOD(WWebWidget, height), + METHOD(WWebWidget, setMinimumSize), + METHOD(WWebWidget, minimumWidth), + METHOD(WWebWidget, minimumHeight), + METHOD(WWebWidget, setMaximumSize), + METHOD(WWebWidget, maximumWidth), + METHOD(WWebWidget, maximumHeight), + METHOD(WWebWidget, setLineHeight), + METHOD(WWebWidget, lineHeight), METHOD(WWebWidget, setFloatSide), METHOD(WWebWidget, floatSide), + METHOD(WWebWidget, setClearSides), + METHOD(WWebWidget, clearSides), + METHOD(WWebWidget, setMargin), + METHOD(WWebWidget, margin), METHOD(WWebWidget, setHiddenKeepsGeometry), METHOD(WWebWidget, hiddenKeepsGeometry), METHOD(WWebWidget, isHidden), @@ -856,7 +1216,9 @@ static const luaL_Reg luawt_WWebWidget_methods[] = { METHOD(WWebWidget, addStyleClass), METHOD(WWebWidget, removeStyleClass), METHOD(WWebWidget, hasStyleClass), + METHOD(WWebWidget, setVerticalAlignment), METHOD(WWebWidget, verticalAlignment), + METHOD(WWebWidget, verticalAlignmentLength), METHOD(WWebWidget, setToolTip), METHOD(WWebWidget, toolTip), METHOD(WWebWidget, refresh), diff --git a/src/luawt/WWidget.cpp b/src/luawt/WWidget.cpp index b72100c..7b63c69 100644 --- a/src/luawt/WWidget.cpp +++ b/src/luawt/WWidget.cpp @@ -1,6 +1,7 @@ #include "boost-xtime.hpp" #include +#include #include #include "globals.hpp" @@ -44,18 +45,22 @@ int luawt_WWidget_doJavaScript(lua_State* L) { } } -static const char* WWidget_show_args0[] = {luawt_typeToStr(), NULL}; -static const char* const* const luawt_WWidget_show_args[] = {WWidget_show_args0, NULL}; +static const char* WWidget_callJavaScriptMember_args0[] = {luawt_typeToStr(), "char const *", "char const *", NULL}; +static const char* const* const luawt_WWidget_callJavaScriptMember_args[] = {WWidget_callJavaScriptMember_args0, NULL}; -int luawt_WWidget_show(lua_State* L) { - int index = luawt_getSuitableArgsGroup(L, luawt_WWidget_show_args); +int luawt_WWidget_callJavaScriptMember(lua_State* L) { + int index = luawt_getSuitableArgsGroup(L, luawt_WWidget_callJavaScriptMember_args); WWidget* self = luawt_checkFromLua(L, 1); if (index == 0) { - self->show(); + char const * raw2 = lua_tostring(L, 2); + std::string name = std::string(raw2); + char const * raw3 = lua_tostring(L, 3); + std::string args = std::string(raw3); + self->callJavaScriptMember(name, args); return 0; } else { - return luaL_error(L, "Wrong arguments for WWidget.show"); + return luaL_error(L, "Wrong arguments for WWidget.callJavaScriptMember"); } } @@ -84,6 +89,25 @@ int luawt_WWidget_positionAt(lua_State* L) { } } +static const char* WWidget_setMinimumSize_args0[] = {luawt_typeToStr(), "double", "double", NULL}; +static const char* const* const luawt_WWidget_setMinimumSize_args[] = {WWidget_setMinimumSize_args0, NULL}; + +int luawt_WWidget_setMinimumSize(lua_State* L) { + int index = luawt_getSuitableArgsGroup(L, luawt_WWidget_setMinimumSize_args); + WWidget* self = luawt_checkFromLua(L, 1); + if (index == 0) { + double raw2 = lua_tonumber(L, 2); + Wt::WLength width = Wt::WLength(raw2); + double raw3 = lua_tonumber(L, 3); + Wt::WLength height = Wt::WLength(raw3); + self->setMinimumSize(width, height); + return 0; + + } else { + return luaL_error(L, "Wrong arguments for WWidget.setMinimumSize"); + } +} + static const char* WWidget_floatSide_args0[] = {luawt_typeToStr(), NULL}; static const char* const* const luawt_WWidget_floatSide_args[] = {WWidget_floatSide_args0, NULL}; @@ -91,8 +115,8 @@ int luawt_WWidget_floatSide(lua_State* L) { int index = luawt_getSuitableArgsGroup(L, luawt_WWidget_floatSide_args); WWidget* self = luawt_checkFromLua(L, 1); if (index == 0) { - Wt::Side result = self->floatSide(); - lua_pushinteger(L, result); + Wt::Side l_result = self->floatSide(); + lua_pushinteger(L, l_result); return 1; } else { @@ -107,8 +131,8 @@ int luawt_WWidget_jsRef(lua_State* L) { int index = luawt_getSuitableArgsGroup(L, luawt_WWidget_jsRef_args); WWidget* self = luawt_checkFromLua(L, 1); if (index == 0) { - std::string result = self->jsRef(); - lua_pushstring(L, result.c_str()); + std::string l_result = self->jsRef(); + lua_pushstring(L, l_result.c_str()); return 1; } else { @@ -116,19 +140,19 @@ int luawt_WWidget_jsRef(lua_State* L) { } } -static const char* WWidget_styleClass_args0[] = {luawt_typeToStr(), NULL}; -static const char* const* const luawt_WWidget_styleClass_args[] = {WWidget_styleClass_args0, NULL}; +static const char* WWidget_height_args0[] = {luawt_typeToStr(), NULL}; +static const char* const* const luawt_WWidget_height_args[] = {WWidget_height_args0, NULL}; -int luawt_WWidget_styleClass(lua_State* L) { - int index = luawt_getSuitableArgsGroup(L, luawt_WWidget_styleClass_args); +int luawt_WWidget_height(lua_State* L) { + int index = luawt_getSuitableArgsGroup(L, luawt_WWidget_height_args); WWidget* self = luawt_checkFromLua(L, 1); if (index == 0) { - Wt::WString result = self->styleClass(); - lua_pushstring(L, result.toUTF8().c_str()); + Wt::WLength l_result = self->height(); + lua_pushnumber(L, l_result.value()); return 1; } else { - return luaL_error(L, "Wrong arguments for WWidget.styleClass"); + return luaL_error(L, "Wrong arguments for WWidget.height"); } } @@ -139,8 +163,8 @@ int luawt_WWidget_hiddenKeepsGeometry(lua_State* L) { int index = luawt_getSuitableArgsGroup(L, luawt_WWidget_hiddenKeepsGeometry_args); WWidget* self = luawt_checkFromLua(L, 1); if (index == 0) { - bool result = self->hiddenKeepsGeometry(); - lua_pushboolean(L, result); + bool l_result = self->hiddenKeepsGeometry(); + lua_pushboolean(L, l_result); return 1; } else { @@ -148,18 +172,19 @@ int luawt_WWidget_hiddenKeepsGeometry(lua_State* L) { } } -static const char* WWidget_enable_args0[] = {luawt_typeToStr(), NULL}; -static const char* const* const luawt_WWidget_enable_args[] = {WWidget_enable_args0, NULL}; +static const char* WWidget_minimumHeight_args0[] = {luawt_typeToStr(), NULL}; +static const char* const* const luawt_WWidget_minimumHeight_args[] = {WWidget_minimumHeight_args0, NULL}; -int luawt_WWidget_enable(lua_State* L) { - int index = luawt_getSuitableArgsGroup(L, luawt_WWidget_enable_args); +int luawt_WWidget_minimumHeight(lua_State* L) { + int index = luawt_getSuitableArgsGroup(L, luawt_WWidget_minimumHeight_args); WWidget* self = luawt_checkFromLua(L, 1); if (index == 0) { - self->enable(); - return 0; - + Wt::WLength l_result = self->minimumHeight(); + lua_pushnumber(L, l_result.value()); + return 1; + } else { - return luaL_error(L, "Wrong arguments for WWidget.enable"); + return luaL_error(L, "Wrong arguments for WWidget.minimumHeight"); } } @@ -170,8 +195,8 @@ int luawt_WWidget_loaded(lua_State* L) { int index = luawt_getSuitableArgsGroup(L, luawt_WWidget_loaded_args); WWidget* self = luawt_checkFromLua(L, 1); if (index == 0) { - bool result = self->loaded(); - lua_pushboolean(L, result); + bool l_result = self->loaded(); + lua_pushboolean(L, l_result); return 1; } else { @@ -179,6 +204,42 @@ int luawt_WWidget_loaded(lua_State* L) { } } +static const char* WWidget_setMaximumSize_args0[] = {luawt_typeToStr(), "double", "double", NULL}; +static const char* const* const luawt_WWidget_setMaximumSize_args[] = {WWidget_setMaximumSize_args0, NULL}; + +int luawt_WWidget_setMaximumSize(lua_State* L) { + int index = luawt_getSuitableArgsGroup(L, luawt_WWidget_setMaximumSize_args); + WWidget* self = luawt_checkFromLua(L, 1); + if (index == 0) { + double raw2 = lua_tonumber(L, 2); + Wt::WLength width = Wt::WLength(raw2); + double raw3 = lua_tonumber(L, 3); + Wt::WLength height = Wt::WLength(raw3); + self->setMaximumSize(width, height); + return 0; + + } else { + return luaL_error(L, "Wrong arguments for WWidget.setMaximumSize"); + } +} + +static const char* WWidget_setWidth_args0[] = {luawt_typeToStr(), "double", NULL}; +static const char* const* const luawt_WWidget_setWidth_args[] = {WWidget_setWidth_args0, NULL}; + +int luawt_WWidget_setWidth(lua_State* L) { + int index = luawt_getSuitableArgsGroup(L, luawt_WWidget_setWidth_args); + WWidget* self = luawt_checkFromLua(L, 1); + if (index == 0) { + double raw2 = lua_tonumber(L, 2); + Wt::WLength width = Wt::WLength(raw2); + self->setWidth(width); + return 0; + + } else { + return luaL_error(L, "Wrong arguments for WWidget.setWidth"); + } +} + static const char* WWidget_find_args0[] = {luawt_typeToStr(), "char const *", NULL}; static const char* const* const luawt_WWidget_find_args[] = {WWidget_find_args0, NULL}; @@ -188,8 +249,8 @@ int luawt_WWidget_find(lua_State* L) { if (index == 0) { char const * raw2 = lua_tostring(L, 2); std::string name = std::string(raw2); - Wt::WWidget * result = self->find(name); - luawt_toLua(L, result); + Wt::WWidget * l_result = self->find(name); + luawt_toLua(L, l_result); return 1; } else { @@ -197,6 +258,22 @@ int luawt_WWidget_find(lua_State* L) { } } +static const char* WWidget_setTabIndex_args0[] = {luawt_typeToStr(), "int", NULL}; +static const char* const* const luawt_WWidget_setTabIndex_args[] = {WWidget_setTabIndex_args0, NULL}; + +int luawt_WWidget_setTabIndex(lua_State* L) { + int index = luawt_getSuitableArgsGroup(L, luawt_WWidget_setTabIndex_args); + WWidget* self = luawt_checkFromLua(L, 1); + if (index == 0) { + int index = lua_tointeger(L, 2); + self->setTabIndex(index); + return 0; + + } else { + return luaL_error(L, "Wrong arguments for WWidget.setTabIndex"); + } +} + static const char* WWidget_isInline_args0[] = {luawt_typeToStr(), NULL}; static const char* const* const luawt_WWidget_isInline_args[] = {WWidget_isInline_args0, NULL}; @@ -204,8 +281,8 @@ int luawt_WWidget_isInline(lua_State* L) { int index = luawt_getSuitableArgsGroup(L, luawt_WWidget_isInline_args); WWidget* self = luawt_checkFromLua(L, 1); if (index == 0) { - bool result = self->isInline(); - lua_pushboolean(L, result); + bool l_result = self->isInline(); + lua_pushboolean(L, l_result); return 1; } else { @@ -220,8 +297,8 @@ int luawt_WWidget_layoutSizeAware(lua_State* L) { int index = luawt_getSuitableArgsGroup(L, luawt_WWidget_layoutSizeAware_args); WWidget* self = luawt_checkFromLua(L, 1); if (index == 0) { - bool result = self->layoutSizeAware(); - lua_pushboolean(L, result); + bool l_result = self->layoutSizeAware(); + lua_pushboolean(L, l_result); return 1; } else { @@ -244,20 +321,50 @@ int luawt_WWidget_hide(lua_State* L) { } } -static const char* WWidget_setStyleClass_args0[] = {luawt_typeToStr(), "char const *", NULL}; -static const char* const* const luawt_WWidget_setStyleClass_args[] = {WWidget_setStyleClass_args0, NULL}; +static const char* WWidget_disable_args0[] = {luawt_typeToStr(), NULL}; +static const char* const* const luawt_WWidget_disable_args[] = {WWidget_disable_args0, NULL}; -int luawt_WWidget_setStyleClass(lua_State* L) { - int index = luawt_getSuitableArgsGroup(L, luawt_WWidget_setStyleClass_args); +int luawt_WWidget_disable(lua_State* L) { + int index = luawt_getSuitableArgsGroup(L, luawt_WWidget_disable_args); WWidget* self = luawt_checkFromLua(L, 1); if (index == 0) { - char const * raw2 = lua_tostring(L, 2); - Wt::WString styleClass = Wt::WString(raw2); - self->setStyleClass(styleClass); + self->disable(); return 0; } else { - return luaL_error(L, "Wrong arguments for WWidget.setStyleClass"); + return luaL_error(L, "Wrong arguments for WWidget.disable"); + } +} + +static const char* WWidget_inlineCssStyle_args0[] = {luawt_typeToStr(), NULL}; +static const char* const* const luawt_WWidget_inlineCssStyle_args[] = {WWidget_inlineCssStyle_args0, NULL}; + +int luawt_WWidget_inlineCssStyle(lua_State* L) { + int index = luawt_getSuitableArgsGroup(L, luawt_WWidget_inlineCssStyle_args); + WWidget* self = luawt_checkFromLua(L, 1); + if (index == 0) { + std::string l_result = self->inlineCssStyle(); + lua_pushstring(L, l_result.c_str()); + return 1; + + } else { + return luaL_error(L, "Wrong arguments for WWidget.inlineCssStyle"); + } +} + +static const char* WWidget_setClearSides_args0[] = {luawt_typeToStr(), "int", NULL}; +static const char* const* const luawt_WWidget_setClearSides_args[] = {WWidget_setClearSides_args0, NULL}; + +int luawt_WWidget_setClearSides(lua_State* L) { + int index = luawt_getSuitableArgsGroup(L, luawt_WWidget_setClearSides_args); + WWidget* self = luawt_checkFromLua(L, 1); + if (index == 0) { + Wt::WFlags sides = static_cast(lua_tointeger(L, 2)); + self->setClearSides(sides); + return 0; + + } else { + return luaL_error(L, "Wrong arguments for WWidget.setClearSides"); } } @@ -268,8 +375,8 @@ int luawt_WWidget_isRendered(lua_State* L) { int index = luawt_getSuitableArgsGroup(L, luawt_WWidget_isRendered_args); WWidget* self = luawt_checkFromLua(L, 1); if (index == 0) { - bool result = self->isRendered(); - lua_pushboolean(L, result); + bool l_result = self->isRendered(); + lua_pushboolean(L, l_result); return 1; } else { @@ -277,19 +384,44 @@ int luawt_WWidget_isRendered(lua_State* L) { } } -static const char* WWidget_isDisabled_args0[] = {luawt_typeToStr(), NULL}; -static const char* const* const luawt_WWidget_isDisabled_args[] = {WWidget_isDisabled_args0, NULL}; +static const char* WWidget_setOffsets_args0[] = {luawt_typeToStr(), "double", NULL}; +static const char* WWidget_setOffsets_args1[] = {luawt_typeToStr(), "double", "int", NULL}; +static const char* const* const luawt_WWidget_setOffsets_args[] = {WWidget_setOffsets_args0, WWidget_setOffsets_args1, NULL}; -int luawt_WWidget_isDisabled(lua_State* L) { - int index = luawt_getSuitableArgsGroup(L, luawt_WWidget_isDisabled_args); +int luawt_WWidget_setOffsets(lua_State* L) { + int index = luawt_getSuitableArgsGroup(L, luawt_WWidget_setOffsets_args); WWidget* self = luawt_checkFromLua(L, 1); if (index == 0) { - bool result = self->isDisabled(); - lua_pushboolean(L, result); + double raw2 = lua_tonumber(L, 2); + Wt::WLength offset = Wt::WLength(raw2); + self->setOffsets(offset); + return 0; + + } else if (index == 1) { + double raw2 = lua_tonumber(L, 2); + Wt::WLength offset = Wt::WLength(raw2); + Wt::WFlags sides = static_cast(lua_tointeger(L, 3)); + self->setOffsets(offset, sides); + return 0; + + } else { + return luaL_error(L, "Wrong arguments for WWidget.setOffsets"); + } +} + +static const char* WWidget_styleClass_args0[] = {luawt_typeToStr(), NULL}; +static const char* const* const luawt_WWidget_styleClass_args[] = {WWidget_styleClass_args0, NULL}; + +int luawt_WWidget_styleClass(lua_State* L) { + int index = luawt_getSuitableArgsGroup(L, luawt_WWidget_styleClass_args); + WWidget* self = luawt_checkFromLua(L, 1); + if (index == 0) { + Wt::WString l_result = self->styleClass(); + lua_pushstring(L, l_result.toUTF8().c_str()); return 1; } else { - return luaL_error(L, "Wrong arguments for WWidget.isDisabled"); + return luaL_error(L, "Wrong arguments for WWidget.styleClass"); } } @@ -302,8 +434,8 @@ int luawt_WWidget_tr(lua_State* L) { if (index == 0) { char const * raw2 = lua_tostring(L, 2); std::string key = std::string(raw2); - Wt::WString result = self->tr(key); - lua_pushstring(L, result.toUTF8().c_str()); + Wt::WString l_result = self->tr(key); + lua_pushstring(L, l_result.toUTF8().c_str()); return 1; } else { @@ -343,19 +475,19 @@ int luawt_WWidget_setFloatSide(lua_State* L) { } } -static const char* WWidget_inlineCssStyle_args0[] = {luawt_typeToStr(), NULL}; -static const char* const* const luawt_WWidget_inlineCssStyle_args[] = {WWidget_inlineCssStyle_args0, NULL}; +static const char* WWidget_width_args0[] = {luawt_typeToStr(), NULL}; +static const char* const* const luawt_WWidget_width_args[] = {WWidget_width_args0, NULL}; -int luawt_WWidget_inlineCssStyle(lua_State* L) { - int index = luawt_getSuitableArgsGroup(L, luawt_WWidget_inlineCssStyle_args); +int luawt_WWidget_width(lua_State* L) { + int index = luawt_getSuitableArgsGroup(L, luawt_WWidget_width_args); WWidget* self = luawt_checkFromLua(L, 1); if (index == 0) { - std::string result = self->inlineCssStyle(); - lua_pushstring(L, result.c_str()); + Wt::WLength l_result = self->width(); + lua_pushnumber(L, l_result.value()); return 1; } else { - return luaL_error(L, "Wrong arguments for WWidget.inlineCssStyle"); + return luaL_error(L, "Wrong arguments for WWidget.width"); } } @@ -366,8 +498,8 @@ int luawt_WWidget_verticalAlignment(lua_State* L) { int index = luawt_getSuitableArgsGroup(L, luawt_WWidget_verticalAlignment_args); WWidget* self = luawt_checkFromLua(L, 1); if (index == 0) { - Wt::AlignmentFlag result = self->verticalAlignment(); - lua_pushinteger(L, result); + Wt::AlignmentFlag l_result = self->verticalAlignment(); + lua_pushinteger(L, l_result); return 1; } else { @@ -375,6 +507,25 @@ int luawt_WWidget_verticalAlignment(lua_State* L) { } } +static const char* WWidget_resize_args0[] = {luawt_typeToStr(), "double", "double", NULL}; +static const char* const* const luawt_WWidget_resize_args[] = {WWidget_resize_args0, NULL}; + +int luawt_WWidget_resize(lua_State* L) { + int index = luawt_getSuitableArgsGroup(L, luawt_WWidget_resize_args); + WWidget* self = luawt_checkFromLua(L, 1); + if (index == 0) { + double raw2 = lua_tonumber(L, 2); + Wt::WLength width = Wt::WLength(raw2); + double raw3 = lua_tonumber(L, 3); + Wt::WLength height = Wt::WLength(raw3); + self->resize(width, height); + return 0; + + } else { + return luaL_error(L, "Wrong arguments for WWidget.resize"); + } +} + static const char* WWidget_positionScheme_args0[] = {luawt_typeToStr(), NULL}; static const char* const* const luawt_WWidget_positionScheme_args[] = {WWidget_positionScheme_args0, NULL}; @@ -382,8 +533,8 @@ int luawt_WWidget_positionScheme(lua_State* L) { int index = luawt_getSuitableArgsGroup(L, luawt_WWidget_positionScheme_args); WWidget* self = luawt_checkFromLua(L, 1); if (index == 0) { - Wt::PositionScheme result = self->positionScheme(); - lua_pushinteger(L, result); + Wt::PositionScheme l_result = self->positionScheme(); + lua_pushinteger(L, l_result); return 1; } else { @@ -391,6 +542,37 @@ int luawt_WWidget_positionScheme(lua_State* L) { } } +static const char* WWidget_show_args0[] = {luawt_typeToStr(), NULL}; +static const char* const* const luawt_WWidget_show_args[] = {WWidget_show_args0, NULL}; + +int luawt_WWidget_show(lua_State* L) { + int index = luawt_getSuitableArgsGroup(L, luawt_WWidget_show_args); + WWidget* self = luawt_checkFromLua(L, 1); + if (index == 0) { + self->show(); + return 0; + + } else { + return luaL_error(L, "Wrong arguments for WWidget.show"); + } +} + +static const char* WWidget_lineHeight_args0[] = {luawt_typeToStr(), NULL}; +static const char* const* const luawt_WWidget_lineHeight_args[] = {WWidget_lineHeight_args0, NULL}; + +int luawt_WWidget_lineHeight(lua_State* L) { + int index = luawt_getSuitableArgsGroup(L, luawt_WWidget_lineHeight_args); + WWidget* self = luawt_checkFromLua(L, 1); + if (index == 0) { + Wt::WLength l_result = self->lineHeight(); + lua_pushnumber(L, l_result.value()); + return 1; + + } else { + return luaL_error(L, "Wrong arguments for WWidget.lineHeight"); + } +} + static const char* WWidget_tabIndex_args0[] = {luawt_typeToStr(), NULL}; static const char* const* const luawt_WWidget_tabIndex_args[] = {WWidget_tabIndex_args0, NULL}; @@ -398,8 +580,8 @@ int luawt_WWidget_tabIndex(lua_State* L) { int index = luawt_getSuitableArgsGroup(L, luawt_WWidget_tabIndex_args); WWidget* self = luawt_checkFromLua(L, 1); if (index == 0) { - int result = self->tabIndex(); - lua_pushinteger(L, result); + int l_result = self->tabIndex(); + lua_pushinteger(L, l_result); return 1; } else { @@ -414,8 +596,8 @@ int luawt_WWidget_isHidden(lua_State* L) { int index = luawt_getSuitableArgsGroup(L, luawt_WWidget_isHidden_args); WWidget* self = luawt_checkFromLua(L, 1); if (index == 0) { - bool result = self->isHidden(); - lua_pushboolean(L, result); + bool l_result = self->isHidden(); + lua_pushboolean(L, l_result); return 1; } else { @@ -439,38 +621,52 @@ int luawt_WWidget_setSelectable(lua_State* L) { } } -static const char* WWidget_stopAcceptDrops_args0[] = {luawt_typeToStr(), "char const *", NULL}; -static const char* const* const luawt_WWidget_stopAcceptDrops_args[] = {WWidget_stopAcceptDrops_args0, NULL}; +static const char* WWidget_hasStyleClass_args0[] = {luawt_typeToStr(), "char const *", NULL}; +static const char* const* const luawt_WWidget_hasStyleClass_args[] = {WWidget_hasStyleClass_args0, NULL}; -int luawt_WWidget_stopAcceptDrops(lua_State* L) { - int index = luawt_getSuitableArgsGroup(L, luawt_WWidget_stopAcceptDrops_args); +int luawt_WWidget_hasStyleClass(lua_State* L) { + int index = luawt_getSuitableArgsGroup(L, luawt_WWidget_hasStyleClass_args); WWidget* self = luawt_checkFromLua(L, 1); if (index == 0) { char const * raw2 = lua_tostring(L, 2); - std::string mimeType = std::string(raw2); - self->stopAcceptDrops(mimeType); + Wt::WString styleClass = Wt::WString(raw2); + bool l_result = self->hasStyleClass(styleClass); + lua_pushboolean(L, l_result); + return 1; + + } else { + return luaL_error(L, "Wrong arguments for WWidget.hasStyleClass"); + } +} + +static const char* WWidget_enable_args0[] = {luawt_typeToStr(), NULL}; +static const char* const* const luawt_WWidget_enable_args[] = {WWidget_enable_args0, NULL}; + +int luawt_WWidget_enable(lua_State* L) { + int index = luawt_getSuitableArgsGroup(L, luawt_WWidget_enable_args); + WWidget* self = luawt_checkFromLua(L, 1); + if (index == 0) { + self->enable(); return 0; } else { - return luaL_error(L, "Wrong arguments for WWidget.stopAcceptDrops"); + return luaL_error(L, "Wrong arguments for WWidget.enable"); } } -static const char* WWidget_javaScriptMember_args0[] = {luawt_typeToStr(), "char const *", NULL}; -static const char* const* const luawt_WWidget_javaScriptMember_args[] = {WWidget_javaScriptMember_args0, NULL}; +static const char* WWidget_minimumWidth_args0[] = {luawt_typeToStr(), NULL}; +static const char* const* const luawt_WWidget_minimumWidth_args[] = {WWidget_minimumWidth_args0, NULL}; -int luawt_WWidget_javaScriptMember(lua_State* L) { - int index = luawt_getSuitableArgsGroup(L, luawt_WWidget_javaScriptMember_args); +int luawt_WWidget_minimumWidth(lua_State* L) { + int index = luawt_getSuitableArgsGroup(L, luawt_WWidget_minimumWidth_args); WWidget* self = luawt_checkFromLua(L, 1); if (index == 0) { - char const * raw2 = lua_tostring(L, 2); - std::string name = std::string(raw2); - std::string result = self->javaScriptMember(name); - lua_pushstring(L, result.c_str()); + Wt::WLength l_result = self->minimumWidth(); + lua_pushnumber(L, l_result.value()); return 1; } else { - return luaL_error(L, "Wrong arguments for WWidget.javaScriptMember"); + return luaL_error(L, "Wrong arguments for WWidget.minimumWidth"); } } @@ -483,8 +679,8 @@ int luawt_WWidget_attributeValue(lua_State* L) { if (index == 0) { char const * raw2 = lua_tostring(L, 2); std::string name = std::string(raw2); - Wt::WString result = self->attributeValue(name); - lua_pushstring(L, result.toUTF8().c_str()); + Wt::WString l_result = self->attributeValue(name); + lua_pushstring(L, l_result.toUTF8().c_str()); return 1; } else { @@ -499,8 +695,8 @@ int luawt_WWidget_parent(lua_State* L) { int index = luawt_getSuitableArgsGroup(L, luawt_WWidget_parent_args); WWidget* self = luawt_checkFromLua(L, 1); if (index == 0) { - Wt::WWidget * result = self->parent(); - luawt_toLua(L, result); + Wt::WWidget * l_result = self->parent(); + luawt_toLua(L, l_result); return 1; } else { @@ -508,6 +704,23 @@ int luawt_WWidget_parent(lua_State* L) { } } +static const char* WWidget_stopAcceptDrops_args0[] = {luawt_typeToStr(), "char const *", NULL}; +static const char* const* const luawt_WWidget_stopAcceptDrops_args[] = {WWidget_stopAcceptDrops_args0, NULL}; + +int luawt_WWidget_stopAcceptDrops(lua_State* L) { + int index = luawt_getSuitableArgsGroup(L, luawt_WWidget_stopAcceptDrops_args); + WWidget* self = luawt_checkFromLua(L, 1); + if (index == 0) { + char const * raw2 = lua_tostring(L, 2); + std::string mimeType = std::string(raw2); + self->stopAcceptDrops(mimeType); + return 0; + + } else { + return luaL_error(L, "Wrong arguments for WWidget.stopAcceptDrops"); + } +} + static const char* WWidget_setPositionScheme_args0[] = {luawt_typeToStr(), "int", NULL}; static const char* const* const luawt_WWidget_setPositionScheme_args[] = {WWidget_setPositionScheme_args0, NULL}; @@ -524,19 +737,69 @@ int luawt_WWidget_setPositionScheme(lua_State* L) { } } -static const char* WWidget_isVisible_args0[] = {luawt_typeToStr(), NULL}; -static const char* const* const luawt_WWidget_isVisible_args[] = {WWidget_isVisible_args0, NULL}; +static const char* WWidget_maximumHeight_args0[] = {luawt_typeToStr(), NULL}; +static const char* const* const luawt_WWidget_maximumHeight_args[] = {WWidget_maximumHeight_args0, NULL}; -int luawt_WWidget_isVisible(lua_State* L) { - int index = luawt_getSuitableArgsGroup(L, luawt_WWidget_isVisible_args); +int luawt_WWidget_maximumHeight(lua_State* L) { + int index = luawt_getSuitableArgsGroup(L, luawt_WWidget_maximumHeight_args); WWidget* self = luawt_checkFromLua(L, 1); if (index == 0) { - bool result = self->isVisible(); - lua_pushboolean(L, result); + Wt::WLength l_result = self->maximumHeight(); + lua_pushnumber(L, l_result.value()); return 1; } else { - return luaL_error(L, "Wrong arguments for WWidget.isVisible"); + return luaL_error(L, "Wrong arguments for WWidget.maximumHeight"); + } +} + +static const char* WWidget_javaScriptMember_args0[] = {luawt_typeToStr(), "char const *", NULL}; +static const char* const* const luawt_WWidget_javaScriptMember_args[] = {WWidget_javaScriptMember_args0, NULL}; + +int luawt_WWidget_javaScriptMember(lua_State* L) { + int index = luawt_getSuitableArgsGroup(L, luawt_WWidget_javaScriptMember_args); + WWidget* self = luawt_checkFromLua(L, 1); + if (index == 0) { + char const * raw2 = lua_tostring(L, 2); + std::string name = std::string(raw2); + std::string l_result = self->javaScriptMember(name); + lua_pushstring(L, l_result.c_str()); + return 1; + + } else { + return luaL_error(L, "Wrong arguments for WWidget.javaScriptMember"); + } +} + +static const char* WWidget_verticalAlignmentLength_args0[] = {luawt_typeToStr(), NULL}; +static const char* const* const luawt_WWidget_verticalAlignmentLength_args[] = {WWidget_verticalAlignmentLength_args0, NULL}; + +int luawt_WWidget_verticalAlignmentLength(lua_State* L) { + int index = luawt_getSuitableArgsGroup(L, luawt_WWidget_verticalAlignmentLength_args); + WWidget* self = luawt_checkFromLua(L, 1); + if (index == 0) { + Wt::WLength l_result = self->verticalAlignmentLength(); + lua_pushnumber(L, l_result.value()); + return 1; + + } else { + return luaL_error(L, "Wrong arguments for WWidget.verticalAlignmentLength"); + } +} + +static const char* WWidget_toolTip_args0[] = {luawt_typeToStr(), NULL}; +static const char* const* const luawt_WWidget_toolTip_args[] = {WWidget_toolTip_args0, NULL}; + +int luawt_WWidget_toolTip(lua_State* L) { + int index = luawt_getSuitableArgsGroup(L, luawt_WWidget_toolTip_args); + WWidget* self = luawt_checkFromLua(L, 1); + if (index == 0) { + Wt::WString const & l_result = self->toolTip(); + lua_pushstring(L, l_result.toUTF8().c_str()); + return 1; + + } else { + return luaL_error(L, "Wrong arguments for WWidget.toolTip"); } } @@ -566,34 +829,52 @@ int luawt_WWidget_acceptDrops(lua_State* L) { } } -static const char* WWidget_toolTip_args0[] = {luawt_typeToStr(), NULL}; -static const char* const* const luawt_WWidget_toolTip_args[] = {WWidget_toolTip_args0, NULL}; +static const char* WWidget_setVerticalAlignment_args0[] = {luawt_typeToStr(), "int", NULL}; +static const char* WWidget_setVerticalAlignment_args1[] = {luawt_typeToStr(), "int", "double", NULL}; +static const char* const* const luawt_WWidget_setVerticalAlignment_args[] = {WWidget_setVerticalAlignment_args0, WWidget_setVerticalAlignment_args1, NULL}; -int luawt_WWidget_toolTip(lua_State* L) { - int index = luawt_getSuitableArgsGroup(L, luawt_WWidget_toolTip_args); +int luawt_WWidget_setVerticalAlignment(lua_State* L) { + int index = luawt_getSuitableArgsGroup(L, luawt_WWidget_setVerticalAlignment_args); WWidget* self = luawt_checkFromLua(L, 1); if (index == 0) { - Wt::WString const & result = self->toolTip(); - lua_pushstring(L, result.toUTF8().c_str()); - return 1; - + Wt::AlignmentFlag alignment = static_cast(lua_tointeger(L, 2)); + self->setVerticalAlignment(alignment); + return 0; + + } else if (index == 1) { + Wt::AlignmentFlag alignment = static_cast(lua_tointeger(L, 2)); + double raw3 = lua_tonumber(L, 3); + Wt::WLength length = Wt::WLength(raw3); + self->setVerticalAlignment(alignment, length); + return 0; + } else { - return luaL_error(L, "Wrong arguments for WWidget.toolTip"); + return luaL_error(L, "Wrong arguments for WWidget.setVerticalAlignment"); } } -static const char* WWidget_disable_args0[] = {luawt_typeToStr(), NULL}; -static const char* const* const luawt_WWidget_disable_args[] = {WWidget_disable_args0, NULL}; +static const char* WWidget_setMargin_args0[] = {luawt_typeToStr(), "double", NULL}; +static const char* WWidget_setMargin_args1[] = {luawt_typeToStr(), "double", "int", NULL}; +static const char* const* const luawt_WWidget_setMargin_args[] = {WWidget_setMargin_args0, WWidget_setMargin_args1, NULL}; -int luawt_WWidget_disable(lua_State* L) { - int index = luawt_getSuitableArgsGroup(L, luawt_WWidget_disable_args); +int luawt_WWidget_setMargin(lua_State* L) { + int index = luawt_getSuitableArgsGroup(L, luawt_WWidget_setMargin_args); WWidget* self = luawt_checkFromLua(L, 1); if (index == 0) { - self->disable(); + double raw2 = lua_tonumber(L, 2); + Wt::WLength margin = Wt::WLength(raw2); + self->setMargin(margin); + return 0; + + } else if (index == 1) { + double raw2 = lua_tonumber(L, 2); + Wt::WLength margin = Wt::WLength(raw2); + Wt::WFlags sides = static_cast(lua_tointeger(L, 3)); + self->setMargin(margin, sides); return 0; } else { - return luaL_error(L, "Wrong arguments for WWidget.disable"); + return luaL_error(L, "Wrong arguments for WWidget.setMargin"); } } @@ -613,6 +894,39 @@ int luawt_WWidget_setInline(lua_State* L) { } } +static const char* WWidget_offset_args0[] = {luawt_typeToStr(), "int", NULL}; +static const char* const* const luawt_WWidget_offset_args[] = {WWidget_offset_args0, NULL}; + +int luawt_WWidget_offset(lua_State* L) { + int index = luawt_getSuitableArgsGroup(L, luawt_WWidget_offset_args); + WWidget* self = luawt_checkFromLua(L, 1); + if (index == 0) { + Wt::Side side = static_cast(lua_tointeger(L, 2)); + Wt::WLength l_result = self->offset(side); + lua_pushnumber(L, l_result.value()); + return 1; + + } else { + return luaL_error(L, "Wrong arguments for WWidget.offset"); + } +} + +static const char* WWidget_clearSides_args0[] = {luawt_typeToStr(), NULL}; +static const char* const* const luawt_WWidget_clearSides_args[] = {WWidget_clearSides_args0, NULL}; + +int luawt_WWidget_clearSides(lua_State* L) { + int index = luawt_getSuitableArgsGroup(L, luawt_WWidget_clearSides_args); + WWidget* self = luawt_checkFromLua(L, 1); + if (index == 0) { + Wt::WFlags l_result = self->clearSides(); + lua_pushinteger(L, l_result); + return 1; + + } else { + return luaL_error(L, "Wrong arguments for WWidget.clearSides"); + } +} + static const char* WWidget_setId_args0[] = {luawt_typeToStr(), "char const *", NULL}; static const char* const* const luawt_WWidget_setId_args[] = {WWidget_setId_args0, NULL}; @@ -630,21 +944,37 @@ int luawt_WWidget_setId(lua_State* L) { } } -static const char* WWidget_hasStyleClass_args0[] = {luawt_typeToStr(), "char const *", NULL}; -static const char* const* const luawt_WWidget_hasStyleClass_args[] = {WWidget_hasStyleClass_args0, NULL}; +static const char* WWidget_setLineHeight_args0[] = {luawt_typeToStr(), "double", NULL}; +static const char* const* const luawt_WWidget_setLineHeight_args[] = {WWidget_setLineHeight_args0, NULL}; -int luawt_WWidget_hasStyleClass(lua_State* L) { - int index = luawt_getSuitableArgsGroup(L, luawt_WWidget_hasStyleClass_args); +int luawt_WWidget_setLineHeight(lua_State* L) { + int index = luawt_getSuitableArgsGroup(L, luawt_WWidget_setLineHeight_args); WWidget* self = luawt_checkFromLua(L, 1); if (index == 0) { - char const * raw2 = lua_tostring(L, 2); - Wt::WString styleClass = Wt::WString(raw2); - bool result = self->hasStyleClass(styleClass); - lua_pushboolean(L, result); - return 1; + double raw2 = lua_tonumber(L, 2); + Wt::WLength height = Wt::WLength(raw2); + self->setLineHeight(height); + return 0; + + } else { + return luaL_error(L, "Wrong arguments for WWidget.setLineHeight"); + } +} +static const char* WWidget_setHeight_args0[] = {luawt_typeToStr(), "double", NULL}; +static const char* const* const luawt_WWidget_setHeight_args[] = {WWidget_setHeight_args0, NULL}; + +int luawt_WWidget_setHeight(lua_State* L) { + int index = luawt_getSuitableArgsGroup(L, luawt_WWidget_setHeight_args); + WWidget* self = luawt_checkFromLua(L, 1); + if (index == 0) { + double raw2 = lua_tonumber(L, 2); + Wt::WLength height = Wt::WLength(raw2); + self->setHeight(height); + return 0; + } else { - return luaL_error(L, "Wrong arguments for WWidget.hasStyleClass"); + return luaL_error(L, "Wrong arguments for WWidget.setHeight"); } } @@ -657,8 +987,8 @@ int luawt_WWidget_findById(lua_State* L) { if (index == 0) { char const * raw2 = lua_tostring(L, 2); std::string id = std::string(raw2); - Wt::WWidget * result = self->findById(id); - luawt_toLua(L, result); + Wt::WWidget * l_result = self->findById(id); + luawt_toLua(L, l_result); return 1; } else { @@ -666,6 +996,22 @@ int luawt_WWidget_findById(lua_State* L) { } } +static const char* WWidget_maximumWidth_args0[] = {luawt_typeToStr(), NULL}; +static const char* const* const luawt_WWidget_maximumWidth_args[] = {WWidget_maximumWidth_args0, NULL}; + +int luawt_WWidget_maximumWidth(lua_State* L) { + int index = luawt_getSuitableArgsGroup(L, luawt_WWidget_maximumWidth_args); + WWidget* self = luawt_checkFromLua(L, 1); + if (index == 0) { + Wt::WLength l_result = self->maximumWidth(); + lua_pushnumber(L, l_result.value()); + return 1; + + } else { + return luaL_error(L, "Wrong arguments for WWidget.maximumWidth"); + } +} + static const char* WWidget_setToolTip_args0[] = {luawt_typeToStr(), "char const *", NULL}; static const char* WWidget_setToolTip_args1[] = {luawt_typeToStr(), "char const *", "int", NULL}; static const char* const* const luawt_WWidget_setToolTip_args[] = {WWidget_setToolTip_args0, WWidget_setToolTip_args1, NULL}; @@ -698,8 +1044,8 @@ int luawt_WWidget_isPopup(lua_State* L) { int index = luawt_getSuitableArgsGroup(L, luawt_WWidget_isPopup_args); WWidget* self = luawt_checkFromLua(L, 1); if (index == 0) { - bool result = self->isPopup(); - lua_pushboolean(L, result); + bool l_result = self->isPopup(); + lua_pushboolean(L, l_result); return 1; } else { @@ -707,6 +1053,25 @@ int luawt_WWidget_isPopup(lua_State* L) { } } +static const char* WWidget_setJavaScriptMember_args0[] = {luawt_typeToStr(), "char const *", "char const *", NULL}; +static const char* const* const luawt_WWidget_setJavaScriptMember_args[] = {WWidget_setJavaScriptMember_args0, NULL}; + +int luawt_WWidget_setJavaScriptMember(lua_State* L) { + int index = luawt_getSuitableArgsGroup(L, luawt_WWidget_setJavaScriptMember_args); + WWidget* self = luawt_checkFromLua(L, 1); + if (index == 0) { + char const * raw2 = lua_tostring(L, 2); + std::string name = std::string(raw2); + char const * raw3 = lua_tostring(L, 3); + std::string value = std::string(raw3); + self->setJavaScriptMember(name, value); + return 0; + + } else { + return luaL_error(L, "Wrong arguments for WWidget.setJavaScriptMember"); + } +} + static const char* WWidget_removeStyleClass_args0[] = {luawt_typeToStr(), "char const *", NULL}; static const char* WWidget_removeStyleClass_args1[] = {luawt_typeToStr(), "char const *", "bool", NULL}; static const char* const* const luawt_WWidget_removeStyleClass_args[] = {WWidget_removeStyleClass_args0, WWidget_removeStyleClass_args1, NULL}; @@ -766,22 +1131,20 @@ int luawt_WWidget_setTabOrder(lua_State* L) { } } -static const char* WWidget_setJavaScriptMember_args0[] = {luawt_typeToStr(), "char const *", "char const *", NULL}; -static const char* const* const luawt_WWidget_setJavaScriptMember_args[] = {WWidget_setJavaScriptMember_args0, NULL}; +static const char* WWidget_setStyleClass_args0[] = {luawt_typeToStr(), "char const *", NULL}; +static const char* const* const luawt_WWidget_setStyleClass_args[] = {WWidget_setStyleClass_args0, NULL}; -int luawt_WWidget_setJavaScriptMember(lua_State* L) { - int index = luawt_getSuitableArgsGroup(L, luawt_WWidget_setJavaScriptMember_args); +int luawt_WWidget_setStyleClass(lua_State* L) { + int index = luawt_getSuitableArgsGroup(L, luawt_WWidget_setStyleClass_args); WWidget* self = luawt_checkFromLua(L, 1); if (index == 0) { char const * raw2 = lua_tostring(L, 2); - std::string name = std::string(raw2); - char const * raw3 = lua_tostring(L, 3); - std::string value = std::string(raw3); - self->setJavaScriptMember(name, value); + Wt::WString styleClass = Wt::WString(raw2); + self->setStyleClass(styleClass); return 0; } else { - return luaL_error(L, "Wrong arguments for WWidget.setJavaScriptMember"); + return luaL_error(L, "Wrong arguments for WWidget.setStyleClass"); } } @@ -817,30 +1180,19 @@ int luawt_WWidget_setHiddenKeepsGeometry(lua_State* L) { } } -static const char* WWidget_toggleStyleClass_args0[] = {luawt_typeToStr(), "char const *", "bool", NULL}; -static const char* WWidget_toggleStyleClass_args1[] = {luawt_typeToStr(), "char const *", "bool", "bool", NULL}; -static const char* const* const luawt_WWidget_toggleStyleClass_args[] = {WWidget_toggleStyleClass_args0, WWidget_toggleStyleClass_args1, NULL}; +static const char* WWidget_isVisible_args0[] = {luawt_typeToStr(), NULL}; +static const char* const* const luawt_WWidget_isVisible_args[] = {WWidget_isVisible_args0, NULL}; -int luawt_WWidget_toggleStyleClass(lua_State* L) { - int index = luawt_getSuitableArgsGroup(L, luawt_WWidget_toggleStyleClass_args); +int luawt_WWidget_isVisible(lua_State* L) { + int index = luawt_getSuitableArgsGroup(L, luawt_WWidget_isVisible_args); WWidget* self = luawt_checkFromLua(L, 1); if (index == 0) { - char const * raw2 = lua_tostring(L, 2); - Wt::WString styleClass = Wt::WString(raw2); - bool add = lua_toboolean(L, 3); - self->toggleStyleClass(styleClass, add); - return 0; - - } else if (index == 1) { - char const * raw2 = lua_tostring(L, 2); - Wt::WString styleClass = Wt::WString(raw2); - bool add = lua_toboolean(L, 3); - bool force = lua_toboolean(L, 4); - self->toggleStyleClass(styleClass, add, force); - return 0; - + bool l_result = self->isVisible(); + lua_pushboolean(L, l_result); + return 1; + } else { - return luaL_error(L, "Wrong arguments for WWidget.toggleStyleClass"); + return luaL_error(L, "Wrong arguments for WWidget.isVisible"); } } @@ -888,54 +1240,79 @@ int luawt_WWidget_setAttributeValue(lua_State* L) { } } -static const char* WWidget_setTabIndex_args0[] = {luawt_typeToStr(), "int", NULL}; -static const char* const* const luawt_WWidget_setTabIndex_args[] = {WWidget_setTabIndex_args0, NULL}; +static const char* WWidget_toggleStyleClass_args0[] = {luawt_typeToStr(), "char const *", "bool", NULL}; +static const char* WWidget_toggleStyleClass_args1[] = {luawt_typeToStr(), "char const *", "bool", "bool", NULL}; +static const char* const* const luawt_WWidget_toggleStyleClass_args[] = {WWidget_toggleStyleClass_args0, WWidget_toggleStyleClass_args1, NULL}; -int luawt_WWidget_setTabIndex(lua_State* L) { - int index = luawt_getSuitableArgsGroup(L, luawt_WWidget_setTabIndex_args); +int luawt_WWidget_toggleStyleClass(lua_State* L) { + int index = luawt_getSuitableArgsGroup(L, luawt_WWidget_toggleStyleClass_args); WWidget* self = luawt_checkFromLua(L, 1); if (index == 0) { - int index = lua_tointeger(L, 2); - self->setTabIndex(index); + char const * raw2 = lua_tostring(L, 2); + Wt::WString styleClass = Wt::WString(raw2); + bool add = lua_toboolean(L, 3); + self->toggleStyleClass(styleClass, add); + return 0; + + } else if (index == 1) { + char const * raw2 = lua_tostring(L, 2); + Wt::WString styleClass = Wt::WString(raw2); + bool add = lua_toboolean(L, 3); + bool force = lua_toboolean(L, 4); + self->toggleStyleClass(styleClass, add, force); return 0; } else { - return luaL_error(L, "Wrong arguments for WWidget.setTabIndex"); + return luaL_error(L, "Wrong arguments for WWidget.toggleStyleClass"); } } -static const char* WWidget_isEnabled_args0[] = {luawt_typeToStr(), NULL}; -static const char* const* const luawt_WWidget_isEnabled_args[] = {WWidget_isEnabled_args0, NULL}; +static const char* WWidget_margin_args0[] = {luawt_typeToStr(), "int", NULL}; +static const char* const* const luawt_WWidget_margin_args[] = {WWidget_margin_args0, NULL}; -int luawt_WWidget_isEnabled(lua_State* L) { - int index = luawt_getSuitableArgsGroup(L, luawt_WWidget_isEnabled_args); +int luawt_WWidget_margin(lua_State* L) { + int index = luawt_getSuitableArgsGroup(L, luawt_WWidget_margin_args); WWidget* self = luawt_checkFromLua(L, 1); if (index == 0) { - bool result = self->isEnabled(); - lua_pushboolean(L, result); + Wt::Side side = static_cast(lua_tointeger(L, 2)); + Wt::WLength l_result = self->margin(side); + lua_pushnumber(L, l_result.value()); return 1; } else { - return luaL_error(L, "Wrong arguments for WWidget.isEnabled"); + return luaL_error(L, "Wrong arguments for WWidget.margin"); } } -static const char* WWidget_callJavaScriptMember_args0[] = {luawt_typeToStr(), "char const *", "char const *", NULL}; -static const char* const* const luawt_WWidget_callJavaScriptMember_args[] = {WWidget_callJavaScriptMember_args0, NULL}; +static const char* WWidget_isDisabled_args0[] = {luawt_typeToStr(), NULL}; +static const char* const* const luawt_WWidget_isDisabled_args[] = {WWidget_isDisabled_args0, NULL}; -int luawt_WWidget_callJavaScriptMember(lua_State* L) { - int index = luawt_getSuitableArgsGroup(L, luawt_WWidget_callJavaScriptMember_args); +int luawt_WWidget_isDisabled(lua_State* L) { + int index = luawt_getSuitableArgsGroup(L, luawt_WWidget_isDisabled_args); WWidget* self = luawt_checkFromLua(L, 1); if (index == 0) { - char const * raw2 = lua_tostring(L, 2); - std::string name = std::string(raw2); - char const * raw3 = lua_tostring(L, 3); - std::string args = std::string(raw3); - self->callJavaScriptMember(name, args); - return 0; - + bool l_result = self->isDisabled(); + lua_pushboolean(L, l_result); + return 1; + } else { - return luaL_error(L, "Wrong arguments for WWidget.callJavaScriptMember"); + return luaL_error(L, "Wrong arguments for WWidget.isDisabled"); + } +} + +static const char* WWidget_isEnabled_args0[] = {luawt_typeToStr(), NULL}; +static const char* const* const luawt_WWidget_isEnabled_args[] = {WWidget_isEnabled_args0, NULL}; + +int luawt_WWidget_isEnabled(lua_State* L) { + int index = luawt_getSuitableArgsGroup(L, luawt_WWidget_isEnabled_args); + WWidget* self = luawt_checkFromLua(L, 1); + if (index == 0) { + bool l_result = self->isEnabled(); + lua_pushboolean(L, l_result); + return 1; + + } else { + return luaL_error(L, "Wrong arguments for WWidget.isEnabled"); } } @@ -945,9 +1322,28 @@ static const luaL_Reg luawt_WWidget_methods[] = { METHOD(WWidget, parent), METHOD(WWidget, setPositionScheme), METHOD(WWidget, positionScheme), + METHOD(WWidget, setOffsets), + METHOD(WWidget, offset), + METHOD(WWidget, resize), + METHOD(WWidget, width), + METHOD(WWidget, setWidth), + METHOD(WWidget, height), + METHOD(WWidget, setHeight), + METHOD(WWidget, setMinimumSize), + METHOD(WWidget, minimumWidth), + METHOD(WWidget, minimumHeight), + METHOD(WWidget, setMaximumSize), + METHOD(WWidget, maximumWidth), + METHOD(WWidget, maximumHeight), METHOD(WWidget, positionAt), + METHOD(WWidget, setLineHeight), + METHOD(WWidget, lineHeight), METHOD(WWidget, setFloatSide), METHOD(WWidget, floatSide), + METHOD(WWidget, setClearSides), + METHOD(WWidget, clearSides), + METHOD(WWidget, setMargin), + METHOD(WWidget, margin), METHOD(WWidget, setHiddenKeepsGeometry), METHOD(WWidget, hiddenKeepsGeometry), METHOD(WWidget, isHidden), @@ -965,7 +1361,9 @@ static const luaL_Reg luawt_WWidget_methods[] = { METHOD(WWidget, removeStyleClass), METHOD(WWidget, toggleStyleClass), METHOD(WWidget, hasStyleClass), + METHOD(WWidget, setVerticalAlignment), METHOD(WWidget, verticalAlignment), + METHOD(WWidget, verticalAlignmentLength), METHOD(WWidget, setToolTip), METHOD(WWidget, toolTip), METHOD(WWidget, refresh), diff --git a/src/luawt/globals.hpp b/src/luawt/globals.hpp index b64900a..2967492 100644 --- a/src/luawt/globals.hpp +++ b/src/luawt/globals.hpp @@ -1,5 +1,5 @@ /* luawt, Lua bindings for Wt - * Copyright (c) 2015-2016 Pavel Dolgov and Boris Nagaev + * Copyright (c) 2015-2017 Pavel Dolgov and Boris Nagaev * * See the LICENSE file for terms of use. */ @@ -551,6 +551,7 @@ void luawt_WAbstractSpinBox(lua_State* L); void luawt_WAbstractToggleButton(lua_State* L); void luawt_WAnchor(lua_State* L); void luawt_WAudio(lua_State* L); +void luawt_WBreak(lua_State* L); void luawt_WCalendar(lua_State* L); void luawt_WCheckBox(lua_State* L); void luawt_WComboBox(lua_State* L); @@ -559,6 +560,7 @@ void luawt_WContainerWidget(lua_State* L); void luawt_WDateEdit(lua_State* L); void luawt_WDatePicker(lua_State* L); void luawt_WDefaultLoadingIndicator(lua_State* L); +void luawt_WDialog(lua_State* L); void luawt_WDoubleSpinBox(lua_State* L); void luawt_WEnvironment(lua_State* L); void luawt_WFileUpload(lua_State* L); @@ -576,21 +578,26 @@ void luawt_WLineEdit(lua_State* L); void luawt_WMediaPlayer(lua_State* L); void luawt_WMenu(lua_State* L); void luawt_WMenuItem(lua_State* L); +void luawt_WMessageBox(lua_State* L); void luawt_WNavigationBar(lua_State* L); void luawt_WOverlayLoadingIndicator(lua_State* L); void luawt_WPaintedWidget(lua_State* L); void luawt_WPanel(lua_State* L); void luawt_WPopupMenu(lua_State* L); +void luawt_WPopupWidget(lua_State* L); void luawt_WProgressBar(lua_State* L); void luawt_WPushButton(lua_State* L); +void luawt_WRadioButton(lua_State* L); void luawt_WScrollArea(lua_State* L); void luawt_WSelectionBox(lua_State* L); void luawt_WSlider(lua_State* L); void luawt_WSpinBox(lua_State* L); void luawt_WSplitButton(lua_State* L); void luawt_WStackedWidget(lua_State* L); +void luawt_WSuggestionPopup(lua_State* L); void luawt_WTabWidget(lua_State* L); void luawt_WTable(lua_State* L); +void luawt_WTableCell(lua_State* L); void luawt_WTableView(lua_State* L); void luawt_WTemplate(lua_State* L); #ifdef LUAWTEST @@ -598,9 +605,11 @@ void luawt_WTestEnvironment(lua_State* L); #else void luawt_WServer(lua_State* L); #endif +void luawt_WTemplateFormView(lua_State* L); void luawt_WText(lua_State* L); void luawt_WTextArea(lua_State* L); void luawt_WTextEdit(lua_State* L); +void luawt_WTimerWidget(lua_State* L); void luawt_WToolBar(lua_State* L); void luawt_WTree(lua_State* L); void luawt_WTreeNode(lua_State* L); diff --git a/src/luawt/init.cpp b/src/luawt/init.cpp index 286b5e6..701df28 100644 --- a/src/luawt/init.cpp +++ b/src/luawt/init.cpp @@ -1,5 +1,5 @@ /* luawt, Lua bindings for Wt - * Copyright (c) 2015-2016 Pavel Dolgov and Boris Nagaev + * Copyright (c) 2015-2017 Pavel Dolgov and Boris Nagaev * * See the LICENSE file for terms of use. */ @@ -27,6 +27,10 @@ static const luawt_Reg luawt_modules[] = { #endif MODULE(WWidget), MODULE(WCompositeWidget), + MODULE(WPopupWidget), + MODULE(WDialog), + MODULE(WSuggestionPopup), + MODULE(WMessageBox), MODULE(WValidationStatus), MODULE(WToolBar), MODULE(WSplitButton), @@ -42,11 +46,14 @@ static const luawt_Reg luawt_modules[] = { MODULE(WIconPair), MODULE(WGoogleMap), MODULE(WWebWidget), + MODULE(WBreak), MODULE(WInteractWidget), + MODULE(WTimerWidget), MODULE(WAbstractMedia), MODULE(WVideo), MODULE(WAudio), MODULE(WTemplate), + MODULE(WTemplateFormView), MODULE(WNavigationBar), MODULE(WGLWidget), MODULE(WProgressBar), @@ -65,6 +72,7 @@ static const luawt_Reg luawt_modules[] = { MODULE(WFileUpload), MODULE(WTree), MODULE(WContainerWidget), + MODULE(WTableCell), MODULE(WMenuItem), MODULE(WFormWidget), MODULE(WLineEdit), @@ -74,6 +82,7 @@ static const luawt_Reg luawt_modules[] = { MODULE(WAbstractSpinBox), MODULE(WSpinBox), MODULE(WAbstractToggleButton), + MODULE(WRadioButton), MODULE(WCheckBox), MODULE(WSlider), MODULE(WSelectionBox), diff --git a/src/luawt/shared.cpp b/src/luawt/shared.cpp index 0b56899..03f8d0f 100644 --- a/src/luawt/shared.cpp +++ b/src/luawt/shared.cpp @@ -1,5 +1,5 @@ /* luawt, Lua bindings for Wt - * Copyright (c) 2015-2016 Pavel Dolgov and Boris Nagaev + * Copyright (c) 2015-2017 Pavel Dolgov and Boris Nagaev * * See the LICENSE file for terms of use. */ diff --git a/src/luawt/test.cpp b/src/luawt/test.cpp index 2dba922..cc7ab86 100644 --- a/src/luawt/test.cpp +++ b/src/luawt/test.cpp @@ -1,5 +1,5 @@ /* luawt, Lua bindings for Wt - * Copyright (c) 2015-2016 Pavel Dolgov and Boris Nagaev + * Copyright (c) 2015-2017 Pavel Dolgov and Boris Nagaev * * See the LICENSE file for terms of use. */ diff --git a/src/luawt/test.lua b/src/luawt/test.lua index 9d26d8d..e0ca9d3 100644 --- a/src/luawt/test.lua +++ b/src/luawt/test.lua @@ -1,5 +1,5 @@ -- luawt, Lua bindings for Wt --- Copyright (c) 2015-2016 Pavel Dolgov and Boris Nagaev +-- Copyright (c) 2015-2017 Pavel Dolgov and Boris Nagaev -- See the LICENSE file for terms of use. local test = {} diff --git a/tools/automate_bindings.py b/tools/automate_bindings.py index da4b192..32e3395 100755 --- a/tools/automate_bindings.py +++ b/tools/automate_bindings.py @@ -25,11 +25,15 @@ PROBLEMATIC_FROM_BUILTIN_CONVERSIONS = { 'std::string' : ('std::string', 'char const *'), 'Wt::WString' : ('Wt::WString', 'char const *'), + 'Wt::WLink' : ('Wt::WLink', 'char const *'), + 'Wt::WLength' : ('Wt::WLength', 'double'), } PROBLEMATIC_TO_BUILTIN_CONVERSIONS = { 'std::string' : ('c_str', 'char const *'), 'Wt::WString' : ('toUTF8', 'std::string'), + 'Wt::WLink' : ('url', 'std::string'), + 'Wt::WLength' : ('value', 'double'), } XML_CACHE = 'src/luawt/xml' @@ -73,12 +77,18 @@ def loadAdditionalChunk(module_str): def isTemplate(method_name, decl_str): # Luawt doesn't support C++ templates. if pygccxml.declarations.templates.is_instantiation(decl_str): - logging.warning( - "Its impossible to bind method %s because luawt " + - "doesn't support C++ templates", - method_name, - ) - return True + name = pygccxml.declarations.templates.name(decl_str) + temp_args = pygccxml.declarations.templates.args(decl_str) + if (len(temp_args) == 1) and (name == 'Wt::WFlags'): + # WFlags is an exception. Treated as enum. + addEnumByStr(decl_str, temp_args[0]) + else: + logging.warning( + "Its impossible to bind method %s because luawt " + + "doesn't support C++ templates", + method_name, + ) + return True return False def isConstReference(checked_type): @@ -190,14 +200,17 @@ def checkReturnType(method_name, raw_return_type, Wt): ) return False +def addEnumByStr(type_str, enum_str): + enum_converters = ( + 'static_cast<%s>(lua_tointeger' % enum_str, + 'lua_pushinteger', + ) + BUILTIN_TYPES_CONVERTERS[type_str] = enum_converters + def addEnum(type_obj): if pygccxml.declarations.is_enum(type_obj): enum_str = str(clearType(type_obj)) - enum_converters = ( - 'static_cast<%s>(lua_tointeger' % enum_str, - 'lua_pushinteger', - ) - BUILTIN_TYPES_CONVERTERS[enum_str] = enum_converters + addEnumByStr(enum_str, enum_str) def getArgType(arg): # For compatibility with pygccxml v1.7.1 @@ -207,8 +220,8 @@ def getArgType(arg): def checkWtFunction(is_constructor, func, Wt): if func.access_type != 'public': return False - if isTemplate(func.name, func.decl_string): - return False + #if isTemplate(func.name, func.decl_string): + # return False for arg in func.arguments: arg_field = getArgType(arg) addEnum(arg_field) @@ -285,6 +298,7 @@ def getMembers(global_namespace, module_name, blacklisted): methods = main_class.member_functions( function=custom_matcher, recursive=False, + allow_empty=True, ).to_list() methods = [ method @@ -338,15 +352,16 @@ def getConstructors(global_namespace, module_name, blacklisted): constructors = main_class.constructors( function=custom_matcher, recursive=False, + allow_empty=True, ) result = [] for constructor in constructors: if not constructor.is_artificial: if not inBlacklist(constructor, blacklisted): result.append(constructor) - if result: - return result, getConstructorsType(result) - raise Exception('Unable to bind any constructors of %s' % module_name) + if not result: + logging.warning('Unable to bind any constructors of %s' % module_name) + return result, getConstructorsType(result) def isModule(module_str): path = '%s/%s' % (INCLUDE_WT, module_str) @@ -533,10 +548,10 @@ def addWidgetToContainer(module_name): frame = r''' MyApplication* app = MyApplication::instance(); if (!app) { - delete result; + delete l_result; throw std::logic_error("No WApplication when creating %s"); } - app->root()->addWidget(result); + app->root()->addWidget(l_result); ''' return frame % module_name @@ -544,7 +559,7 @@ def callWtConstructor(return_type, args, module_name): call_s = 'new %s(' % module_name args_s = getArgsStr(args) constructor_s = call_s + args_s + ');' - return '%s result = %s' % (return_type, constructor_s) + return '%s l_result = %s' % (return_type, constructor_s) def callWtFunction(return_type, args, method_name): call_s = 'self->%s(' % method_name @@ -553,10 +568,10 @@ def callWtFunction(return_type, args, method_name): if return_type == 'void': return func_s else: - return '%s result = %s' % (return_type, func_s) + return '%s l_result = %s' % (return_type, func_s) RETURN_CALLS_TEMPLATE = r''' - %s(L, %sresult%s); + %s(L, %sl_result%s); return 1; ''' diff --git a/tools/blacklist.yaml b/tools/blacklist.yaml index cd2cbc1..0f9731f 100644 --- a/tools/blacklist.yaml +++ b/tools/blacklist.yaml @@ -21,6 +21,7 @@ WAnchor: - tabIndex WApplication: methods: + - removeStyleSheet - setConnectionMonitor - waitForEvent signatures: @@ -52,6 +53,13 @@ WDateEdit: WDatePicker: methods: - popupWidget +WDialog: + methods: + - raiseToFront + - setAutoFocus + signatures: + - rejectWhenEscapePressed() + - rejectWhenEscapePressed(bool) WDoubleSpinBox: methods: - refresh @@ -96,6 +104,7 @@ WGLWidget: - resizeGL - restoringContext - setClientSideMouseHandler + - setRenderOptions - shaderSource - uniform1f - uniform1i @@ -129,11 +138,36 @@ WInPlaceEdit: WMediaPlayer: methods: - refresh +WMessageBox: + methods: + - buttons + - defaultButton + - escapeButton + - iconImage + - setDefaultButton + - setEscapeButton + - setStandardButtons + - standardButtons + signatures: + - addButton(StandardButton) + - addButton(WPushButton*,StandardButton) +WSuggestionPopup: + methods: + - currentItem + - editRole + - setDropDownIconUnfiltered + - setEditRole +WTabWidget: + methods: + - setOverflow WTableCell: - whole class: true + methods: + - WTableCell + - isVisible WTableView: methods: - scrollTo + - setOverflow WTemplate: methods: - encodeTemplateText