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

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

diff --git a/src/x11/app.cpp b/src/x11/app.cpp
index 9e840d40a57e0aff953d042be7f9c8823e320d1c..c21c217a82574af1ce79911b25f5c88878ceecd0 100644 (file)
--- a/src/x11/app.cpp
+++ b/src/x11/app.cpp
@@ -293,8 +293,17 @@ void wxApp::ProcessXEvent(WXEvent* _event)
     // Find the first wxWindow that corresponds to this event window
     // TODO: may need to translate coordinates from actualWindow
     // to window, if the receiving window != wxWindow window
     // Find the first wxWindow that corresponds to this event window
     // TODO: may need to translate coordinates from actualWindow
     // to window, if the receiving window != wxWindow window

-    while (window && !(win = wxGetWindowFromTable(window)))
-        window = wxGetWindowParent(window);
+    //    while (window && !(win = wxGetWindowFromTable(window)))
+    //        window = wxGetWindowParent(window);
+
+    // Because we're receiving events after a window
+    // has been destroyed, assume a 1:1 match between
+    // Window and wxWindow, so if it's not in the table,
+    // it must have been destroyed.
+
+    win = wxGetWindowFromTable(window);
+    if (!win)
+       return;

 
     switch (event->type)
     {
 
     switch (event->type)
     {


@@ -349,7 +358,7 @@ void wxApp::ProcessXEvent(WXEvent* _event)
 
             if (event->xclient.message_type == wm_protocols)
             {
 
             if (event->xclient.message_type == wm_protocols)
             {

-                if (event->xclient.data.l[0] == wm_delete_window)
+                if ((Atom) (event->xclient.data.l[0]) == wm_delete_window)

                 {
                     if (win)
                     {
                 {
                     if (win)
                     {


@@ -359,6 +368,16 @@ void wxApp::ProcessXEvent(WXEvent* _event)
             }
             return;
         }
             }
             return;
         }

+        case ConfigureNotify:
+        {
+            if (win)
+            {
+                wxSizeEvent sizeEvent( wxSize(event->xconfigure.width,event->xconfigure.height), win->GetId() );
+                sizeEvent.SetEventObject( win );
+                
+                win->GetEventHandler()->ProcessEvent( sizeEvent );
+            }
+        }

         case ResizeRequest:
         {
             /* Terry Gitnick <terryg@scientech.com> - 1/21/98
         case ResizeRequest:
         {
             /* Terry Gitnick <terryg@scientech.com> - 1/21/98


@@ -598,6 +617,13 @@ void wxApp::DeletePendingObjects()
 // Create an application context
 bool wxApp::OnInitGui()
 {
 // Create an application context
 bool wxApp::OnInitGui()
 {

+    // Eventually this line will be removed, but for
+    // now we don't want to try popping up a dialog
+    // for error messages.
+    delete wxLog::SetActiveTarget(new wxLogStderr);
+    if (!wxAppBase::OnInitGui())
+       return FALSE;
+    

     // TODO: parse argv and get display to pass to XOpenDisplay
     Display* dpy = XOpenDisplay(NULL);
     m_initialDisplay = (WXDisplay*) dpy;
     // TODO: parse argv and get display to pass to XOpenDisplay
     Display* dpy = XOpenDisplay(NULL);
     m_initialDisplay = (WXDisplay*) dpy;


@@ -643,8 +669,12 @@ Window wxGetWindowParent(Window window)
 {
     Window parent, root = 0;
     unsigned int noChildren = 0;
 {
     Window parent, root = 0;
     unsigned int noChildren = 0;

-    if (XQueryTree((Display*) wxGetDisplay(), window, & root, & parent,
-        NULL, & noChildren))
+    Window* children = NULL;
+    int res = XQueryTree((Display*) wxGetDisplay(), window, & root, & parent,
+                        & children, & noChildren);
+    if (children)
+        XFree(children);
+    if (res)

         return parent;
     else
         return (Window) 0;
         return parent;
     else
         return (Window) 0;