diff options
| author | Dan Gudmundsson <[email protected]> | 2016-10-24 13:05:52 +0200 |
|---|---|---|
| committer | Dan Gudmundsson <[email protected]> | 2016-10-24 13:05:52 +0200 |
| commit | 1a812284999c8f38d84f380775b88f7bdc1f1432 (patch) | |
| tree | d94aac6989e1d3c40563327f8dabc9122d71d51d /lib/wx/src/gen/wxDialog.erl | |
| parent | adf1e9efdfb979d55b2f4dfec7188dd8f0a640c9 (diff) | |
| parent | 16b6c991cc841ced6be466eca774dba1188f8640 (diff) | |
| download | otp-1a812284999c8f38d84f380775b88f7bdc1f1432.tar.gz otp-1a812284999c8f38d84f380775b88f7bdc1f1432.tar.bz2 otp-1a812284999c8f38d84f380775b88f7bdc1f1432.zip | |
Merge branch 'maint'
* maint:
Fix whitespace setting in test files
Avoid some error reports when stopping mnesia
wx: Improve error handling
Fix all whitespace-related issues in erlang.el
mnesia: Fix double blocked tables which could cause a crash
wx: Add wxWindow:getContentScaleFactor
Diffstat (limited to 'lib/wx/src/gen/wxDialog.erl')
| -rw-r--r-- | lib/wx/src/gen/wxDialog.erl | 6 |
1 files changed, 4 insertions, 2 deletions
diff --git a/lib/wx/src/gen/wxDialog.erl b/lib/wx/src/gen/wxDialog.erl index 178efde5c6..72f37df178 100644 --- a/lib/wx/src/gen/wxDialog.erl +++ b/lib/wx/src/gen/wxDialog.erl @@ -44,8 +44,8 @@ dragAcceptFiles/2,enable/1,enable/2,findWindow/2,fit/1,fitInside/1, freeze/1,getAcceleratorTable/1,getBackgroundColour/1,getBackgroundStyle/1, getBestSize/1,getCaret/1,getCharHeight/1,getCharWidth/1,getChildren/1, - getClientSize/1,getContainingSizer/1,getCursor/1,getDropTarget/1, - getEventHandler/1,getExtraStyle/1,getFont/1,getForegroundColour/1, + getClientSize/1,getContainingSizer/1,getContentScaleFactor/1,getCursor/1, + getDropTarget/1,getEventHandler/1,getExtraStyle/1,getFont/1,getForegroundColour/1, getGrandParent/1,getHandle/1,getHelpText/1,getIcon/1,getIcons/1,getId/1, getLabel/1,getMaxSize/1,getMinSize/1,getName/1,getParent/1,getPosition/1, getRect/1,getScreenPosition/1,getScreenRect/1,getScrollPos/2,getScrollRange/2, @@ -298,6 +298,8 @@ getIcons(This) -> wxTopLevelWindow:getIcons(This). getIcon(This) -> wxTopLevelWindow:getIcon(This). %% From wxWindow %% @hidden +getContentScaleFactor(This) -> wxWindow:getContentScaleFactor(This). +%% @hidden setDoubleBuffered(This,On) -> wxWindow:setDoubleBuffered(This,On). %% @hidden isDoubleBuffered(This) -> wxWindow:isDoubleBuffered(This). |