X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/5e29f97a3c55598b9310a4643f9073b6b926672c..2e7b0a1617dbdada26531371627a1cd8a72e9149:/src/x11/popupwin.cpp diff --git a/src/x11/popupwin.cpp b/src/x11/popupwin.cpp index 4c62f44df5..818b86fc64 100644 --- a/src/x11/popupwin.cpp +++ b/src/x11/popupwin.cpp @@ -49,27 +49,26 @@ bool wxPopupWindow::Create( wxWindow *parent, int style ) m_parent = parent; if (m_parent) m_parent->AddChild( this ); - wxTopLevelWindows.Append(this); - Display *xdisplay = wxGlobalDisplay(); int xscreen = DefaultScreen( xdisplay ); Visual *xvisual = DefaultVisual( xdisplay, xscreen ); Window xparent = RootWindow( xdisplay, xscreen ); +#if wxUSE_NANOX + long xattributes_mask = 0; +#else XSetWindowAttributes xattributes; - XSizeHints size_hints; - XWMHints wm_hints; long xattributes_mask = CWOverrideRedirect | + CWSaveUnder | CWBorderPixel | CWBackPixel; xattributes.background_pixel = BlackPixel( xdisplay, xscreen ); xattributes.border_pixel = BlackPixel( xdisplay, xscreen ); - - // Trying True in order to stop WM decorating it - //xattributes.override_redirect = False; - xattributes.override_redirect = TRUE; - + xattributes.override_redirect = True; + xattributes.save_under = True; +#endif + Window xwindow = XCreateWindow( xdisplay, xparent, pos.x, pos.y, size.x, size.y, 0, DefaultDepth(xdisplay,xscreen), InputOutput, xvisual, xattributes_mask, &xattributes ); @@ -82,35 +81,29 @@ bool wxPopupWindow::Create( wxWindow *parent, int style ) m_mainWidget = (WXWindow) xwindow; wxAddWindowToTable( xwindow, (wxWindow*) this ); - // Probably shouldn't be here for an unmanaged window - //XSetTransientForHint( xdisplay, xwindow, xparent ); + // Set background to None which will prevent X11 from clearing the + // background comletely. + XSetWindowBackgroundPixmap( xdisplay, xwindow, None ); - // TODO: Will these calls cause decoration?? + XSetTransientForHint( xdisplay, xwindow, xparent ); - size_hints.flags = PSize; - size_hints.width = size.x; - size_hints.height = size.y; - XSetWMNormalHints( xdisplay, xwindow, &size_hints); - +#if wxUSE_NANOX + // Switch off WM + wxSetWMDecorations(xwindow, 0); +#else + XWMHints wm_hints; wm_hints.flags = InputHint | StateHint /* | WindowGroupHint */; wm_hints.input = True; wm_hints.initial_state = NormalState; XSetWMHints( xdisplay, xwindow, &wm_hints); - - // No decorations for this window -#if 0 - Atom wm_delete_window = XInternAtom( xdisplay, "WM_DELETE_WINDOW", False); - XSetWMProtocols( xdisplay, xwindow, &wm_delete_window, 1); - - wxSetWMDecorations((Window) GetMainWindow(), style); #endif - + return TRUE; } -void wxPopupWindow::DoMoveWindow(int WXUNUSED(x), int WXUNUSED(y), int WXUNUSED(width), int WXUNUSED(height) ) +void wxPopupWindow::DoMoveWindow(int x, int y, int width, int height ) { - wxFAIL_MSG( wxT("DoMoveWindow called for wxPopupWindow") ); + wxWindowX11::DoMoveWindow( x, y, width, height ); } void wxPopupWindow::DoSetSize( int x, int y, int width, int height, int sizeFlags ) @@ -120,7 +113,11 @@ void wxPopupWindow::DoSetSize( int x, int y, int width, int height, int sizeFlag bool wxPopupWindow::Show( bool show ) { - return wxWindowX11::Show( show ); + bool ret = wxWindowX11::Show( show ); + + Raise(); + + return ret; } #endif // wxUSE_POPUPWIN