Don't use hidden items for size calc (patch 1698314)

[wxWidgets.git] / wxPython / src / _popupwin.i

diff --git a/wxPython/src/_popupwin.i b/wxPython/src/_popupwin.i
index 330b1dc3cb15f7ecbeb6fef98e48267546d4a60f..43fcd6c511f1c944e30a4eaa043f1abf323b08c3 100644 (file)
--- a/wxPython/src/_popupwin.i
+++ b/wxPython/src/_popupwin.i
@@ -23,16 +23,19 @@
 #ifndef __WXMAC__
 %newgroup;
 
+MustHaveApp(wxPopupWindow);
 
 // wxPopupWindow: a special kind of top level window used for popup menus,
 // combobox popups and such.
+MustHaveApp(wxPopupWindow);
+
 class wxPopupWindow : public wxWindow {
 public:
-    %addtofunc wxPopupWindow         "self._setOORInfo(self)"
-    %addtofunc wxPopupWindow()       ""
+    %pythonAppend wxPopupWindow         "self._setOORInfo(self)"
+    %pythonAppend wxPopupWindow()       ""
     
     wxPopupWindow(wxWindow *parent, int flags = wxBORDER_NONE);
-    %name(PrePopupWindow)wxPopupWindow();
+    %RenameCtor(PrePopupWindow, wxPopupWindow());
 
     bool Create(wxWindow *parent, int flags = wxBORDER_NONE);
 
@@ -73,17 +76,20 @@ IMP_PYCALLBACK_BOOL_(wxPyPopupTransientWindow, wxPopupTransientWindow, CanDismis
 %}
 
 
+MustHaveApp(wxPyPopupTransientWindow);
 
 // wxPopupTransientWindow: a wxPopupWindow which disappears automatically
 // when the user clicks mouse outside it or if it loses focus in any other way
-%name(PopupTransientWindow) class wxPyPopupTransientWindow : public wxPopupWindow
+
+%rename(PopupTransientWindow) wxPyPopupTransientWindow;
+class wxPyPopupTransientWindow : public wxPopupWindow
 {
 public:
-    %addtofunc wxPyPopupTransientWindow         "self._setOORInfo(self);self._setCallbackInfo(self, PopupTransientWindow)"
-    %addtofunc wxPyPopupTransientWindow()       ""
+    %pythonAppend wxPyPopupTransientWindow         "self._setOORInfo(self);" setCallbackInfo(PopupTransientWindow)
+    %pythonAppend wxPyPopupTransientWindow()       ""
     
     wxPyPopupTransientWindow(wxWindow *parent, int style = wxBORDER_NONE);
-    %name(PrePopupTransientWindow)wxPyPopupTransientWindow();
+    %RenameCtor(PrePopupTransientWindow, wxPyPopupTransientWindow());
 
     void _setCallbackInfo(PyObject* self, PyObject* _class);
 
@@ -119,14 +125,15 @@ public:
 class wxPopupWindow : public wxWindow {
 public:
     wxPopupWindow(wxWindow *parent, int flags = wxBORDER_NONE);
-    %name(PrePopupWindow)wxPopupWindow();
+    %RenameCtor(PrePopupWindow, wxPopupWindow());
 };
 
-%name(PopupTransientWindow) class wxPyPopupTransientWindow : public wxPopupWindow
+%rename(PopupTransientWindow) wxPyPopupTransientWindow;
+class wxPyPopupTransientWindow : public wxPopupWindow
 {
 public:
     wxPyPopupTransientWindow(wxWindow *parent, int style = wxBORDER_NONE);
-    %name(PrePopupTransientWindow)wxPyPopupTransientWindow();
+    %RenameCtor(PrePopupTransientWindow, wxPyPopupTransientWindow());
 };