Merge in from trunk r64802 - r68625

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

diff --git a/src/motif/popupwin.cpp b/src/motif/popupwin.cpp
index 30aab7ea17b2dd5e4d91533a8dd6382252139687..ffa6837734a941c9a244e1b6f082912fb0b473da 100644 (file)
--- a/src/motif/popupwin.cpp
+++ b/src/motif/popupwin.cpp
@@ -44,11 +44,19 @@ bool wxPopupWindow::Create( wxWindow *parent, int flags )
 
     m_mainWidget = (WXWidget)popup;
 
 
     m_mainWidget = (WXWidget)popup;
 

-    SetSize( 100, 100 ); // for child creation to work
+    wxAddWindowToTable( (Widget) m_mainWidget, this );
+
+    DoSetSizeIntr( -1, -1, 100, 100, 0, true );

 
     XtSetMappedWhenManaged( popup, False );
     XtRealizeWidget( popup );
 
     XtSetMappedWhenManaged( popup, False );
     XtRealizeWidget( popup );

-
+    XtManageChild ( popup );
+/*
+    XtTranslations ptr;
+    XtOverrideTranslations (popup,
+        ptr = XtParseTranslationTable ("<Configure>: resize()"));
+    XtFree ((char *) ptr);
+*/

     return true;
 }
 
     return true;
 }
 


@@ -59,7 +67,7 @@ bool wxPopupWindow::Show( bool show )
 
     if( show )
     {
 
     if( show )
     {

-        XtPopup( (Widget)GetMainWidget(), XtGrabNone );
+        XtPopup( (Widget)GetMainWidget(), XtGrabNonexclusive );

     }
     else
     {
     }
     else
     {