Fixes for the stubbed version so it will compile

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

diff --git a/wxPython/src/_popupwin.i b/wxPython/src/_popupwin.i
index bf382364525ec4ebfc3c94a93ad4c09f1c02e5be..706fbccab0b9f3b44b14dc42938bbd4c25bd995f 100644 (file)
--- a/wxPython/src/_popupwin.i
+++ b/wxPython/src/_popupwin.i
@@ -23,13 +23,16 @@
 #ifndef __WXMAC__
 %newgroup;
 
 #ifndef __WXMAC__
 %newgroup;
 

+MustHaveApp(wxPopupWindow);

 
 // wxPopupWindow: a special kind of top level window used for popup menus,
 // combobox popups and such.
 
 // wxPopupWindow: a special kind of top level window used for popup menus,
 // combobox popups and such.

+MustHaveApp(wxPopupWindow);
+

 class wxPopupWindow : public wxWindow {
 public:
 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();
     
     wxPopupWindow(wxWindow *parent, int flags = wxBORDER_NONE);
     %name(PrePopupWindow)wxPopupWindow();


@@ -73,14 +76,16 @@ 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
 
 // 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
 {
 public:
 %name(PopupTransientWindow) class wxPyPopupTransientWindow : public wxPopupWindow
 {
 public:

-    %addtofunc wxPyPopupTransientWindow         "self._setOORInfo(self);self._setCallbackInfo(self, PopupTransientWindow)"
-    %addtofunc wxPyPopupTransientWindow()       ""
+    %pythonAppend wxPyPopupTransientWindow         "self._setOORInfo(self);self._setCallbackInfo(self, PopupTransientWindow)"
+    %pythonAppend wxPyPopupTransientWindow()       ""

     
     wxPyPopupTransientWindow(wxWindow *parent, int style = wxBORDER_NONE);
     %name(PrePopupTransientWindow)wxPyPopupTransientWindow();
     
     wxPyPopupTransientWindow(wxWindow *parent, int style = wxBORDER_NONE);
     %name(PrePopupTransientWindow)wxPyPopupTransientWindow();


@@ -103,15 +108,15 @@ public:
 %{
 class wxPopupWindow : public wxWindow {
 public:
 %{
 class wxPopupWindow : public wxWindow {
 public:

-    wxPopupWindow(wxWindow *, int)  { PyErr_SetNone(PyExc_NotImplementedError); }
-    wxPopupWindow()                 { PyErr_SetNone(PyExc_NotImplementedError); }
+    wxPopupWindow(wxWindow *, int)  { wxPyRaiseNotImplemented(); }
+    wxPopupWindow()                 { wxPyRaiseNotImplemented(); }

 };
 
 class wxPyPopupTransientWindow : public wxPopupWindow
 {
 public:
 };
 
 class wxPyPopupTransientWindow : public wxPopupWindow
 {
 public:

-    wxPyPopupTransientWindow(wxWindow *, int)  { PyErr_SetNone(PyExc_NotImplementedError); }
-    wxPyPopupTransientWindow()                 { PyErr_SetNone(PyExc_NotImplementedError); }
+    wxPyPopupTransientWindow(wxWindow *, int)  { wxPyRaiseNotImplemented(); }
+    wxPyPopupTransientWindow()                 { wxPyRaiseNotImplemented(); }

 };
 %}
 
 };
 %}