diff options
| author | Dan Gudmundsson <[email protected]> | 2011-09-21 12:17:13 +0200 |
|---|---|---|
| committer | Dan Gudmundsson <[email protected]> | 2011-09-21 12:17:13 +0200 |
| commit | a192733e4d2b4d74a1ce11bd75c9e59da8f41e0d (patch) | |
| tree | a8d38b6ebe970252b2de2e83e2812f499b8f3e89 /lib/wx/c_src/wxe_impl.h | |
| parent | e58fa57a4936ad16e81ed05441fc5c85fabafb5d (diff) | |
| parent | 7b6012a75f26219e5a8c803a0509d97d1b00c73a (diff) | |
| download | otp-a192733e4d2b4d74a1ce11bd75c9e59da8f41e0d.tar.gz otp-a192733e4d2b4d74a1ce11bd75c9e59da8f41e0d.tar.bz2 otp-a192733e4d2b4d74a1ce11bd75c9e59da8f41e0d.zip | |
Merge branch 'dev' into major
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; |