Merged modifications from the 2.6 branch

git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@36607 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
This commit is contained in:
Robin Dunn
2005-12-30 23:02:03 +00:00
parent a780a8dc19
commit 02b800ce7c
104 changed files with 14102 additions and 46560 deletions

View File

@@ -436,13 +436,13 @@ window's *best size* values. Also set's the minsize for use with sizers.", "");
DocDeclStr(
virtual void , Raise(),
"Raises the window to the top of the window hierarchy if it is a
managed window (dialog or frame).", "");
"Raises the window to the top of the window hierarchy. In current
version of wxWidgets this works both for manage and child windows.", "");
DocDeclStr(
virtual void , Lower(),
"Lowers the window to the bottom of the window hierarchy if it is a
managed window (dialog or frame).", "");
"Lowers the window to the bottom of the window hierarchy. In current
version of wxWidgets this works both for manage and child windows.", "");
@@ -2060,7 +2060,8 @@ wxWindow* wxFindWindowByLabel( const wxString& label,
WXHWND hWnd = (WXHWND)_hWnd;
long id = wxGetWindowId(hWnd);
wxWindow* win = new wxWindow;
parent->AddChild(win);
if (parent)
parent->AddChild(win);
win->SetEventHandler(win);
win->SetHWND(hWnd);
win->SetId(id);