fix hang on startup in Unicode build if any standard GTK+ command line arguments were passed (patch 1665203; bug 1663597) [backport from HEAD]

git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/branches/WX_2_8_BRANCH@44655 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
This commit is contained in:
Vadim Zeitlin
2007-03-07 22:45:32 +00:00
parent 4c4850d399
commit 8059fb2713
2 changed files with 5 additions and 1 deletions

View File

@@ -113,6 +113,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
- Added support for the wxFRAME_FLOAT_ON_PARENT style.

View File

@@ -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));
}
}