1 files changed, 17 insertions, 23 deletions

diff --git a/lib/wx/c_src/wxe_main.cpp b/lib/wx/c_src/wxe_main.cpp
index 2bec2422c9..5b65d8a59b 100644
--- a/lib/wx/c_src/wxe_main.cpp
+++ b/lib/wx/c_src/wxe_main.cpp
@@ -1,18 +1,19 @@
 /*
  * %CopyrightBegin%
  *
- * Copyright Ericsson AB 2014. All Rights Reserved.
+ * Copyright Ericsson AB 2014-2018. 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
- * compliance with the License. You should have received a copy of the
- * Erlang Public License along with this software. If not, it can be
- * retrieved online at http://www.erlang.org/.
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
  *
- * Software distributed under the License is distributed on an "AS IS"
- * basis, WITHOUT WARRANTY OF ANY KIND, either express or implied. See
- * the License for the specific language governing rights and limitations
- * under the License.
+ *     http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
  *
  * %CopyrightEnd%
  */
@@ -58,11 +59,6 @@ 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;
@@ -77,8 +73,11 @@ 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
+  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,NULL);
+			      &wxe_thread,wxe_main_loop,(void *) sd->pdl,opts);
+  erl_drv_thread_opts_destroy(opts);
 #endif
   if(res == 0) {
     erl_drv_mutex_lock(wxe_status_m);
@@ -111,11 +110,6 @@ void stop_native_gui(wxe_data *sd)
   erl_drv_cond_destroy(wxe_batch_locker_c);
 }
 
-void unload_native_gui()
-{
-
-}
-
 /* ************************************************************
  *  wxWidgets Thread
  * ************************************************************/
@@ -124,8 +118,8 @@ void *wxe_main_loop(void *vpdl)
 {
   int result;
   int  argc = 1;
-  char * temp = (char *) "Erlang";
-  char * argv[] = {temp,NULL};
+  const wxChar temp[10] = L"Erlang";
+  wxChar * argv[] = {(wxChar *)temp, NULL};
   ErlDrvPDL pdl = (ErlDrvPDL) vpdl;
 
   driver_pdl_inc_refc(pdl);