diff options
| author | Dan Gudmundsson <[email protected]> | 2011-09-21 11:59:57 +0200 |
|---|---|---|
| committer | Dan Gudmundsson <[email protected]> | 2011-09-21 11:59:57 +0200 |
| commit | 41f5777aea48b2eec358c342b7fd8610bf13601c (patch) | |
| tree | 4c7aebfe02c240043e5a3eb9a25e22f3117d5080 /lib/wx/c_src/wxe_impl.h | |
| parent | 0cc4d4d12020310c98f9583e612074e26821163c (diff) | |
| parent | 30283e3136c22444a2ecb1263a77654e6f1bd48d (diff) | |
| download | otp-41f5777aea48b2eec358c342b7fd8610bf13601c.tar.gz otp-41f5777aea48b2eec358c342b7fd8610bf13601c.tar.bz2 otp-41f5777aea48b2eec358c342b7fd8610bf13601c.zip | |
Merge branch 'dgud/wx/virtual-listctrl/OTP-9415' into dev
* dgud/wx/virtual-listctrl/OTP-9415:
Handle overloading callbacks the same as events
Fix documentation and callback options in wxListCtrl:create/3
Add example and testcase
Add wxListItemAttr
Generated code of previous commit
Add support for virtual listctrls
Re-generated with new doxygen
Diffstat (limited to 'lib/wx/c_src/wxe_impl.h')
| -rw-r--r-- | lib/wx/c_src/wxe_impl.h | 11 |
1 files changed, 6 insertions, 5 deletions
diff --git a/lib/wx/c_src/wxe_impl.h b/lib/wx/c_src/wxe_impl.h index 39c02f8c1a..ee31068d5d 100644 --- a/lib/wx/c_src/wxe_impl.h +++ b/lib/wx/c_src/wxe_impl.h @@ -1,7 +1,7 @@ /* * %CopyrightBegin% * - * Copyright Ericsson AB 2008-2010. All Rights Reserved. + * Copyright Ericsson AB 2008-2011. All Rights Reserved. * * The contents of this file are subject to the Erlang Public License, * Version 1.1, (the "License"); you may not use this file except in @@ -178,7 +178,8 @@ public: wxeMemEnv * global_me; // Temp container for callbacks - char cb_buff[256]; + char *cb_buff; + int cb_len; }; class wxETreeItemData : public wxTreeItemData @@ -194,7 +195,6 @@ class wxETreeItemData : public wxTreeItemData bool sendevent(wxEvent * event, ErlDrvPort port); void pre_callback(); -void handle_callback_batch(ErlDrvPort port); // For wxePrintout void handle_event_callback(ErlDrvPort port, ErlDrvTermData process); void activateGL(ErlDrvTermData caller); @@ -232,8 +232,6 @@ class wxEPrintout : public wxPrintout bool OnPrintPage(int page); void GetPageInfo(int *minPage, int *maxPage, int *pageFrom, int *pageTo); - void clear_cb(int callback); - int onPrintPage; int onPreparePrinting; int onBeginPrinting; @@ -246,6 +244,9 @@ class wxEPrintout : public wxPrintout ErlDrvPort port; }; +void clear_cb(ErlDrvPort port, int callback); + + // Implementation of wxListCtrlCompare struct callbackInfo { ErlDrvPort port; |