diff options
| author | Dan Gudmundsson <[email protected]> | 2016-10-05 16:06:11 +0200 |
|---|---|---|
| committer | Dan Gudmundsson <[email protected]> | 2016-10-05 16:06:11 +0200 |
| commit | 0bac72a18e8a5f6a46baae9c9ac73bde32948ff6 (patch) | |
| tree | 8aaca3b6bc3ebc2c220e0c3786f5645e92898729 /lib/wx/src/gen/wxHtmlWindow.erl | |
| parent | 7af3910bb06433f7c9182db11d853823f202c2b6 (diff) | |
| parent | 1de609cb262ff34216dce8fbefdb9a153bdd2c93 (diff) | |
| download | otp-0bac72a18e8a5f6a46baae9c9ac73bde32948ff6.tar.gz otp-0bac72a18e8a5f6a46baae9c9ac73bde32948ff6.tar.bz2 otp-0bac72a18e8a5f6a46baae9c9ac73bde32948ff6.zip | |
Merge branch 'maint'
* maint:
wx: add wxWindowDragAcceptFiles
wx: Add simple dropfiles support
Diffstat (limited to 'lib/wx/src/gen/wxHtmlWindow.erl')
| -rw-r--r-- | lib/wx/src/gen/wxHtmlWindow.erl | 6 |
1 files changed, 4 insertions, 2 deletions
diff --git a/lib/wx/src/gen/wxHtmlWindow.erl b/lib/wx/src/gen/wxHtmlWindow.erl index f9bb135fcf..8bc317ad73 100644 --- a/lib/wx/src/gen/wxHtmlWindow.erl +++ b/lib/wx/src/gen/wxHtmlWindow.erl @@ -45,8 +45,8 @@ centreOnParent/2,clearBackground/1,clientToScreen/2,clientToScreen/3, close/1,close/2,connect/2,connect/3,convertDialogToPixels/2,convertPixelsToDialog/2, destroyChildren/1,disable/1,disconnect/1,disconnect/2,disconnect/3, - doPrepareDC/2,enable/1,enable/2,enableScrolling/3,findWindow/2,fit/1, - fitInside/1,freeze/1,getAcceleratorTable/1,getBackgroundColour/1, + doPrepareDC/2,dragAcceptFiles/2,enable/1,enable/2,enableScrolling/3, + 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, @@ -689,6 +689,8 @@ enable(This, Options) -> wxWindow:enable(This, Options). %% @hidden enable(This) -> wxWindow:enable(This). %% @hidden +dragAcceptFiles(This,Accept) -> wxWindow:dragAcceptFiles(This,Accept). +%% @hidden disable(This) -> wxWindow:disable(This). %% @hidden destroyChildren(This) -> wxWindow:destroyChildren(This). |