fixed menubar attaching: create it first, THEN set pointer to it

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

diff --git a/src/x11/toplevel.cpp b/src/x11/toplevel.cpp
index 59b2ee7479f37aa69cd4688a976a62a14ee907ff..e139ee21a4978ff3db88e17e3fd51a20f482bb6d 100644 (file)
--- a/src/x11/toplevel.cpp
+++ b/src/x11/toplevel.cpp
@@ -38,11 +38,9 @@
 #endif //WX_PRECOMP
 
 #include "wx/x11/private.h"
 #endif //WX_PRECOMP
 
 #include "wx/x11/private.h"

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

 
 

-// list of all frames and modeless dialogs
-// wxWindowList wxModelessWindows;
+
+bool wxMWMIsRunning(Window w);

 
 // ----------------------------------------------------------------------------
 // wxTopLevelWindowX11 creation
 
 // ----------------------------------------------------------------------------
 // wxTopLevelWindowX11 creation


@@ -95,7 +93,7 @@ bool wxTopLevelWindowX11::Create(wxWindow *parent,
     XWMHints wm_hints;
     
     long xattributes_mask =
     XWMHints wm_hints;
     
     long xattributes_mask =

-        CWEventMask |
+        CWOverrideRedirect |

         CWBorderPixel | CWBackPixel;
     xattributes.background_pixel = BlackPixel( xdisplay, xscreen );
     xattributes.border_pixel = BlackPixel( xdisplay, xscreen );
         CWBorderPixel | CWBackPixel;
     xattributes.background_pixel = BlackPixel( xdisplay, xscreen );
     xattributes.border_pixel = BlackPixel( xdisplay, xscreen );


@@ -158,9 +156,6 @@ wxTopLevelWindowX11::~wxTopLevelWindowX11()
 
 bool wxTopLevelWindowX11::Show(bool show)
 {
 
 bool wxTopLevelWindowX11::Show(bool show)
 {

-    if ( !wxWindowBase::Show(show) )
-        return FALSE;
-

     return wxWindowX11::Show(show);
 }
 
     return wxWindowX11::Show(show);
 }
 


@@ -256,8 +251,7 @@ void wxTopLevelWindowX11::SetIcon(const wxIcon& icon)
             wmHints->icon_mask = (Pixmap) icon.GetMask()->GetPixmap();
         }
 
             wmHints->icon_mask = (Pixmap) icon.GetMask()->GetPixmap();
         }
 

-        XSetWMHints(wxGlobalDisplay(), (Window) GetMainWindow(),
-            wmHints);
+        XSetWMHints(wxGlobalDisplay(), (Window) GetMainWindow(), wmHints);

         XFree(wmHints);
     }
 }
         XFree(wmHints);
     }
 }