Merge correction

git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@14126 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
This commit is contained in:
Julian Smart 2002-02-11 12:15:59 +00:00
parent ea59668704
commit 68dc6d2ae7

View File

@ -67,9 +67,7 @@ bool wxPopupWindow::Create( wxWindow *parent, int style )
xattributes.border_pixel = BlackPixel( xdisplay, xscreen ); xattributes.border_pixel = BlackPixel( xdisplay, xscreen );
xattributes.override_redirect = False; xattributes.override_redirect = False;
wxSize size(2, 2); Window xwindow = XCreateWindow( xdisplay, xparent, pos.x, pos.y, size.x, size.y,
Window xwindow = XCreateWindow( xdisplay, xparent, 0, 0, size.x, size.y,
0, DefaultDepth(xdisplay,xscreen), InputOutput, xvisual, xattributes_mask, &xattributes ); 0, DefaultDepth(xdisplay,xscreen), InputOutput, xvisual, xattributes_mask, &xattributes );
XSelectInput( xdisplay, xwindow, XSelectInput( xdisplay, xwindow,