changed image.h include to be correct in all (precomp and non-precomp) cases

[wxWidgets.git] / src / x11 / popupwin.cpp

diff --git a/src/x11/popupwin.cpp b/src/x11/popupwin.cpp
index a030e98cc6e9d396bb3581e3bf3c31ba2c416b0d..9161a1e64198b646ce4692fb4251ae371a968877 100644 (file)
--- a/src/x11/popupwin.cpp
+++ b/src/x11/popupwin.cpp
@@ -16,11 +16,11 @@
 #if wxUSE_POPUPWIN
 
 #include "wx/popupwin.h"
 #if wxUSE_POPUPWIN
 
 #include "wx/popupwin.h"

-#include "wx/frame.h"

 #include "wx/app.h"
 #include "wx/app.h"

-#include "wx/cursor.h"

 
 #include "wx/x11/private.h"
 
 #include "wx/x11/private.h"

+#include "X11/Xatom.h"
+#include "X11/Xutil.h"

 
 //-----------------------------------------------------------------------------
 // wxPopupWindow
 
 //-----------------------------------------------------------------------------
 // wxPopupWindow


@@ -33,8 +33,6 @@ IMPLEMENT_DYNAMIC_CLASS(wxPopupWindow, wxWindow)
 
 bool wxPopupWindow::Create( wxWindow *parent, int style )
 {
 
 bool wxPopupWindow::Create( wxWindow *parent, int style )
 {

-    m_needParent = FALSE;
-

     if (!CreateBase( parent, -1, wxDefaultPosition, wxDefaultSize, style, wxDefaultValidator, "popup" ))
     {
         wxFAIL_MSG( wxT("wxPopupWindow creation failed") );
     if (!CreateBase( parent, -1, wxDefaultPosition, wxDefaultSize, style, wxDefaultValidator, "popup" ))
     {
         wxFAIL_MSG( wxT("wxPopupWindow creation failed") );


@@ -42,29 +40,84 @@ bool wxPopupWindow::Create( wxWindow *parent, int style )
     }
 
     // All dialogs should really have this style
     }
 
     // All dialogs should really have this style

+    m_windowStyle = style;

     m_windowStyle |= wxTAB_TRAVERSAL;
     m_windowStyle |= wxTAB_TRAVERSAL;

+    
+    wxPoint pos( 20,20 );
+    wxSize size( 20,20 );

 
 

+    m_parent = parent;

     if (m_parent) m_parent->AddChild( this );
 
     if (m_parent) m_parent->AddChild( this );
 

-    // TODO: implementation
-
+    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;
+    
+    long xattributes_mask =
+        CWOverrideRedirect |
+        CWSaveUnder |
+        CWBorderPixel | CWBackPixel;
+    xattributes.background_pixel = BlackPixel( xdisplay, xscreen );
+    xattributes.border_pixel = BlackPixel( xdisplay, xscreen );
+    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 );
+    
+    XSelectInput( xdisplay, xwindow,
+        ExposureMask | KeyPressMask | KeyReleaseMask | ButtonPressMask | ButtonReleaseMask |
+        ButtonMotionMask | EnterWindowMask | LeaveWindowMask | PointerMotionMask |
+        KeymapStateMask | FocusChangeMask | ColormapChangeMask | StructureNotifyMask |
+        PropertyChangeMask );
+
+    m_mainWindow = (WXWindow) xwindow;
+    m_clientWindow = (WXWindow) xwindow;
+    wxAddWindowToTable( xwindow, (wxWindow*) this );
+
+    // Set background to None which will prevent X11 from clearing the
+    // background comletely.
+    XSetWindowBackgroundPixmap( xdisplay, xwindow, None );
+
+    XSetTransientForHint( xdisplay, xwindow, xparent );
+
+#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);
+#endif
+    

     return TRUE;
 }
 
     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 )
 {
 }
 
 void wxPopupWindow::DoSetSize( int x, int y, int width, int height, int sizeFlags )
 {

-    // TODO
+    wxWindowX11::DoSetSize(x, y, width, height, sizeFlags);

 }
 }

+

 bool wxPopupWindow::Show( bool show )
 {
 bool wxPopupWindow::Show( bool show )
 {

-    // TODO?
-    bool ret = wxWindow::Show( show );
+    bool ret = wxWindowX11::Show( show );

 
 

+    Raise();
+    

     return ret;
 }
 
     return ret;
 }