From: Vadim Zeitlin Date: Fri, 17 Jun 2005 20:17:50 +0000 (+0000) Subject: undid last commit, it's not needed after fixing the real bug in wxNotebook registrati... X-Git-Url: https://git.saurik.com/wxWidgets.git/commitdiff_plain/7862127b7b31e31a33973e2c6385588400c6cf89 undid last commit, it's not needed after fixing the real bug in wxNotebook registration code git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@34697 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775 --- diff --git a/src/msw/control.cpp b/src/msw/control.cpp index a020137ad7..8b27babb06 100644 --- a/src/msw/control.cpp +++ b/src/msw/control.cpp @@ -139,25 +139,11 @@ bool wxControl::MSWCreateControl(const wxChar *classname, // ... and adjust it to account for a possible parent frames toolbar AdjustForParentClientOrigin(x, y); - // notice the apparently unnecessary label.empty() test: without it wse get - // crashes when creating controls (notebook to be precise) with empty - // labels as for some reason Windows looks not only at first but also at - // the second byte of the string which is not NUL in the buffer pointed to - // by label.c_str() and if the buffer contains "00 cc cc cc ..." (this is - // what happens in debug build where 0xcc is used as uninitialized memory - // marker) it creates a window not with empty label but with label - // consisting of many Unicode (!) 0xcccc characters - // - // this is not fatal in itself, but becomes so when wxGetWindowText() is - // called because GetWindowTextA() overwrites ASCII buffer with Unicode (!) - // characters without any qualms and so crashes the program... m_hWnd = (WXHWND)::CreateWindowEx ( exstyle, // extended style classname, // the kind of control to create - label.empty() // the window name - ? _T("\0") - : label.c_str(), + label, // the window name style, // the window style x, y, w, h, // the window position and size GetHwndOf(GetParent()), // parent