Move wxContextMenuEvent back into the core

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

diff --git a/wxPython/src/help.i b/wxPython/src/help.i
index 66d3bf858fd61576ee71b2585c3dbabb64092de3..54f431b47c3aec1522a20347b3950667034c3153 100644 (file)
--- a/wxPython/src/help.i
+++ b/wxPython/src/help.i
@@ -13,7 +13,7 @@
 %module help
 
 %{
 %module help
 
 %{

-#include "export.h"
+#include "wxPython.h"

 #include <wx/cshelp.h>
 %}
 
 #include <wx/cshelp.h>
 %}
 


@@ -37,7 +37,6 @@ enum {
     wxID_CONTEXT_HELP,
     wxEVT_HELP,
     wxEVT_DETAILED_HELP,
     wxID_CONTEXT_HELP,
     wxEVT_HELP,
     wxEVT_DETAILED_HELP,

-    wxEVT_CONTEXT_MENU,

 };
 
 
 };
 
 


@@ -54,9 +53,6 @@ def EVT_DETAILED_HELP(win, id, func):
 
 def EVT_DETAILED_HELP_RANGE(win, id, id2, func):
     win.Connect(id, id2, wxEVT_DETAILED_HELP, func)
 
 def EVT_DETAILED_HELP_RANGE(win, id, id2, func):
     win.Connect(id, id2, wxEVT_DETAILED_HELP, func)

-
-def EVT_CONTEXT_MENU(win, func):
-    win.Connect(-1, -1, wxEVT_CONTEXT_MENU, func)

 "
 
 //----------------------------------------------------------------------
 "
 
 //----------------------------------------------------------------------


@@ -77,21 +73,6 @@ public:
 
 //---------------------------------------------------------------------------
 
 
 //---------------------------------------------------------------------------
 

-
-class wxContextMenuEvent : public wxCommandEvent
-{
-public:
-    wxContextMenuEvent(wxEventType type = wxEVT_NULL,
-                       wxWindowID id = 0,
-                       const wxPoint& pt = wxDefaultPosition);
-    const wxPoint& GetPosition();
-    void SetPosition(const wxPoint& pos);
-};
-
-
-
-//----------------------------------------------------------------------
-

 class wxContextHelp : public wxObject {
 public:
     wxContextHelp(wxWindow* window = NULL, bool doNow = TRUE);
 class wxContextHelp : public wxObject {
 public:
     wxContextHelp(wxWindow* window = NULL, bool doNow = TRUE);


@@ -110,6 +91,7 @@ public:
                         const wxPoint& pos = wxDefaultPosition,
                         const wxSize& size = wxDefaultSize,
                         long style = wxBU_AUTODRAW);
                         const wxPoint& pos = wxDefaultPosition,
                         const wxSize& size = wxDefaultSize,
                         long style = wxBU_AUTODRAW);

+    %pragma(python) addtomethod = "__init__:self._setOORInfo(self)"

 };
 
 
 };