diff options
author | Sverker Eriksson <[email protected]> | 2016-10-05 16:11:31 +0200 |
---|---|---|
committer | Sverker Eriksson <[email protected]> | 2016-10-05 16:11:31 +0200 |
commit | 502ed5fd6bd36328d6be63c68ee2a56738ced058 (patch) | |
tree | 80cfb83dd63ffa876541740cc067ea05bb39118d /lib/wx/src/gen/wxPreviewCanvas.erl | |
parent | cf102c1b1225450e7918a6119b7d949eb7e575c4 (diff) | |
parent | 0bac72a18e8a5f6a46baae9c9ac73bde32948ff6 (diff) | |
download | otp-502ed5fd6bd36328d6be63c68ee2a56738ced058.tar.gz otp-502ed5fd6bd36328d6be63c68ee2a56738ced058.tar.bz2 otp-502ed5fd6bd36328d6be63c68ee2a56738ced058.zip |
Merge branch 'master' into sverker/master/load_nif-print-init-error
Diffstat (limited to 'lib/wx/src/gen/wxPreviewCanvas.erl')
-rw-r--r-- | lib/wx/src/gen/wxPreviewCanvas.erl | 6 |
1 files changed, 4 insertions, 2 deletions
diff --git a/lib/wx/src/gen/wxPreviewCanvas.erl b/lib/wx/src/gen/wxPreviewCanvas.erl index 67357dbd65..b1c6832aa9 100644 --- a/lib/wx/src/gen/wxPreviewCanvas.erl +++ b/lib/wx/src/gen/wxPreviewCanvas.erl @@ -40,8 +40,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, @@ -439,6 +439,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). |