From c8db4e1560d3118540b6c2c6cda367dfb33dff51 Mon Sep 17 00:00:00 2001
From: Vadim Zeitlin <vadim@wxwidgets.org>
Date: Wed, 7 Mar 2007 22:43:30 +0000
Subject: [PATCH] fix hang on startup in Unicode build if any standard GTK+
 command line arguments were passed (patch 1665203; bug 1663597)

git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@44654 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
---
 docs/changes.txt | 4 ++++
 src/gtk/app.cpp  | 2 +-
 2 files changed, 5 insertions(+), 1 deletion(-)

diff --git a/docs/changes.txt b/docs/changes.txt
index 51f7f7a444..b4a742c05b 100644
--- 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 1aee54439b..780924b4eb 100644
--- 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));
             }
         }
 
-- 
2.45.2