fix hang on startup in Unicode build if any standard GTK+ command line arguments...

git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@44654 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775

diff --git a/docs/changes.txt b/docs/changes.txt
index 51f7f7a44450e66d895a2e8c718ecc3c16aa290e..b4a742c05b7f7d832d7649c91c0002def76351da 100644 (file)
--- a/docs/changes.txt
+++ b/docs/changes.txt
@@ -69,6 +69,10 @@ wxMSW
 - Fix lack of spin control update event when control lost focus.
 - Corrected drawing of bitmaps for disabled menu items.
 
+wxGTK
+
+- Fix hang on startup when using GTK+ options in Unicode build
+
 wxMac
 
 - Fix position of the centered windows (didn't take menu bar size into account)

diff --git a/src/gtk/app.cpp b/src/gtk/app.cpp
index 1aee54439b1919e3b9e1f4272927e70d0b3aaada..780924b4ebf3bc921b491fafe6a0a90079a030de 100644 (file)
--- a/src/gtk/app.cpp
+++ b/src/gtk/app.cpp
@@ -478,7 +478,7 @@ bool wxApp::Initialize(int& argc, wxChar **argv)
         {
             while ( strcmp(wxConvUTF8.cWX2MB(argv[i]), argvGTK[i]) != 0 )
             {
-                memmove(argv + i, argv + i + 1, argc - i);
+                memmove(argv + i, argv + i + 1, (argc - i)*sizeof(*argv));
             }
         }