diff options
| author | Dan Gudmundsson <[email protected]> | 2018-08-13 15:04:09 +0200 |
|---|---|---|
| committer | Dan Gudmundsson <[email protected]> | 2018-08-13 15:04:09 +0200 |
| commit | 8442906fca8f52757e473e82c72c9b04d98ad996 (patch) | |
| tree | c4755ac85ee27937816bb6b2f9fa96993ffdefcc /lib/wx/c_src/wxe_main.cpp | |
| parent | 0a9239a447e8ba1298104eeca6004f903fe1e82b (diff) | |
| parent | eca0be547954e92489a0b67f27f2ecf3a5eec158 (diff) | |
| download | otp-8442906fca8f52757e473e82c72c9b04d98ad996.tar.gz otp-8442906fca8f52757e473e82c72c9b04d98ad996.tar.bz2 otp-8442906fca8f52757e473e82c72c9b04d98ad996.zip | |
Merge remote-tracking branch 'upstream/pr/1860' into maint
* upstream/pr/1860:
Replace for loop with strchr
Fix typos
Clean unused wxe_driver callbacks
Remove wx c_src compilation warning on Darwin
OTP-15230
Diffstat (limited to 'lib/wx/c_src/wxe_main.cpp')
| -rw-r--r-- | lib/wx/c_src/wxe_main.cpp | 15 |
1 files changed, 2 insertions, 13 deletions
diff --git a/lib/wx/c_src/wxe_main.cpp b/lib/wx/c_src/wxe_main.cpp index c7565e33bd..5b65d8a59b 100644 --- a/lib/wx/c_src/wxe_main.cpp +++ b/lib/wx/c_src/wxe_main.cpp @@ -1,7 +1,7 @@ /* * %CopyrightBegin% * - * Copyright Ericsson AB 2014-2016. All Rights Reserved. + * Copyright Ericsson AB 2014-2018. All Rights Reserved. * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. @@ -59,15 +59,9 @@ void *wxe_main_loop(void * ); * START AND STOP of driver thread * ************************************************************/ -int load_native_gui() -{ - return 1; -} - int start_native_gui(wxe_data *sd) { int res; - ErlDrvThreadOpts *opts = NULL; wxe_status_m = erl_drv_mutex_create((char *) "wxe_status_m"); wxe_status_c = erl_drv_cond_create((char *)"wxe_status_c"); @@ -79,7 +73,7 @@ int start_native_gui(wxe_data *sd) res = erl_drv_steal_main_thread((char *)"wxwidgets", &wxe_thread,wxe_main_loop,(void *) sd->pdl,NULL); #else - opts = erl_drv_thread_opts_create((char *)"wx thread"); + ErlDrvThreadOpts *opts = erl_drv_thread_opts_create((char *)"wx thread"); opts->suggested_stack_size = 8192; res = erl_drv_thread_create((char *)"wxwidgets", &wxe_thread,wxe_main_loop,(void *) sd->pdl,opts); @@ -116,11 +110,6 @@ void stop_native_gui(wxe_data *sd) erl_drv_cond_destroy(wxe_batch_locker_c); } -void unload_native_gui() -{ - -} - /* ************************************************************ * wxWidgets Thread * ************************************************************/ |