In bitmap.cpp, CreateFromImage, took GetWidth and GetHeight out of loop.

Fixed wxWindowX11::FindFocus so text selections work again.


git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@14849 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
This commit is contained in:
Julian Smart
2002-03-28 21:42:35 +00:00
parent e121a72a52
commit 288efe84da
2 changed files with 13 additions and 5 deletions

View File

@@ -379,6 +379,10 @@ wxWindow *wxWindowBase::FindFocus()
if (xfocus)
{
wxWindow *win = wxGetWindowFromTable( xfocus );
if (!win)
{
win = wxGetClientWindowFromTable( xfocus );
}
return win;
}
@@ -901,7 +905,7 @@ void wxWindowX11::DoMoveWindow(int x, int y, int width, int height)
width -= size.x;
}
XMoveResizeWindow( wxGlobalDisplay(), xwindow, x, y, width, height );
XMoveResizeWindow( wxGlobalDisplay(), xwindow, x, y, wxMax(1, width), wxMax(1, height) );
}
#else