Don't take hidden wxGrid row/columns into account when auto-sizing.

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

diff --git a/src/motif/popupwin.cpp b/src/motif/popupwin.cpp
index b3ce905e525b49226c9a2157d31ca2a696ac0aba..f4b1c6e9f249de1b749a742f40553ad5f8e0be08 100644 (file)
--- a/src/motif/popupwin.cpp
+++ b/src/motif/popupwin.cpp
@@ -1,20 +1,21 @@
 /////////////////////////////////////////////////////////////////////////////
-// Name:        popupwin.cpp
+// Name:        src/motif/popupwin.cpp
 // Purpose:     wxPopupWindow implementation
 // Author:      Mattia barbon
 // Modified by:
 // Created:     28.08.03
-// RCS-ID:      $Id$
 // Copyright:   (c) Mattia barbon
-// Licence:    wxWindows licence
+// Licence:     wxWindows licence
 /////////////////////////////////////////////////////////////////////////////
 
-#if defined(__GNUG__) && !defined(NO_GCC_PRAGMA)
-#pragma implementation "popup.h"
-#endif
+// For compilers that support precompilation, includes "wx.h".
+#include "wx/wxprec.h"
 
 #include "wx/popupwin.h"
-#include "wx/app.h"
+
+#ifndef WX_PRECOMP
+    #include "wx/app.h"
+#endif
 
 #ifdef __VMS__
 #pragma message disable nosimpint
@@ -26,8 +27,6 @@
 
 #include "wx/motif/private.h"
 
-IMPLEMENT_DYNAMIC_CLASS( wxPopupWindow, wxWindow );
-
 bool wxPopupWindow::Create( wxWindow *parent, int flags )
 {
     if( !wxPopupWindowBase::Create( parent, flags ) )
@@ -44,11 +43,19 @@ bool wxPopupWindow::Create( wxWindow *parent, int flags )
 
     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 );
-
+    XtManageChild ( popup );
+/*
+    XtTranslations ptr;
+    XtOverrideTranslations (popup,
+        ptr = XtParseTranslationTable ("<Configure>: resize()"));
+    XtFree ((char *) ptr);
+*/
     return true;
 }
 
@@ -59,7 +66,7 @@ bool wxPopupWindow::Show( bool show )
 
     if( show )
     {
-        XtPopup( (Widget)GetMainWidget(), XtGrabNone );
+        XtPopup( (Widget)GetMainWidget(), XtGrabNonexclusive );
     }
     else
     {