diff options
| author | Dan Gudmundsson <[email protected]> | 2016-10-24 13:04:15 +0200 |
|---|---|---|
| committer | Dan Gudmundsson <[email protected]> | 2016-10-24 13:04:15 +0200 |
| commit | 16b6c991cc841ced6be466eca774dba1188f8640 (patch) | |
| tree | 9b2d82c4e7572e45d8962e69b5c07e8d7da82873 /lib/wx/src/gen/wxButton.erl | |
| parent | f66073c2960a4b072e18c4e1dfed143b94cd60c6 (diff) | |
| parent | e92d0d0c4b6991dc751dcc332e11c05d304175b6 (diff) | |
| download | otp-16b6c991cc841ced6be466eca774dba1188f8640.tar.gz otp-16b6c991cc841ced6be466eca774dba1188f8640.tar.bz2 otp-16b6c991cc841ced6be466eca774dba1188f8640.zip | |
Merge branch 'dgud/wx/scale-factor' into maint
* dgud/wx/scale-factor:
wx: Improve error handling
wx: Add wxWindow:getContentScaleFactor
Diffstat (limited to 'lib/wx/src/gen/wxButton.erl')
| -rw-r--r-- | lib/wx/src/gen/wxButton.erl | 6 |
1 files changed, 4 insertions, 2 deletions
diff --git a/lib/wx/src/gen/wxButton.erl b/lib/wx/src/gen/wxButton.erl index f16e1a376e..f8e24beffa 100644 --- a/lib/wx/src/gen/wxButton.erl +++ b/lib/wx/src/gen/wxButton.erl @@ -42,8 +42,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,getId/1,getLabel/1,getMaxSize/1, getMinSize/1,getName/1,getParent/1,getPosition/1,getRect/1,getScreenPosition/1, getScreenRect/1,getScrollPos/2,getScrollRange/2,getScrollThumb/2, @@ -180,6 +180,8 @@ destroy(Obj=#wx_ref{type=Type}) -> getLabel(This) -> wxControl:getLabel(This). %% From wxWindow %% @hidden +getContentScaleFactor(This) -> wxWindow:getContentScaleFactor(This). +%% @hidden setDoubleBuffered(This,On) -> wxWindow:setDoubleBuffered(This,On). %% @hidden isDoubleBuffered(This) -> wxWindow:isDoubleBuffered(This). |