rearrainging a few things

git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@14477 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775

diff --git a/wxPython/src/_defs.i b/wxPython/src/_defs.i
index e85d989f9a29404fa8fff2daf709dab8fb5d4d3a..8438ac27837ca064711670261ca166bd04b9523d 100644 (file)
--- a/wxPython/src/_defs.i
+++ b/wxPython/src/_defs.i
@@ -998,6 +998,7 @@ enum wxEventType {
  wxEVT_MENU_OPEN,
  wxEVT_MENU_CLOSE,
  wxEVT_MENU_HIGHLIGHT,
  wxEVT_MENU_OPEN,
  wxEVT_MENU_CLOSE,
  wxEVT_MENU_HIGHLIGHT,

+ wxEVT_CONTEXT_MENU,

  wxEVT_SYS_COLOUR_CHANGED,
  wxEVT_DISPLAY_CHANGED,
  wxEVT_SETTING_CHANGED,
  wxEVT_SYS_COLOUR_CHANGED,
  wxEVT_DISPLAY_CHANGED,
  wxEVT_SETTING_CHANGED,

diff --git a/wxPython/src/_extras.py b/wxPython/src/_extras.py
index 6f61d91b81e7a9403aaed9b86da8a1648069bcaa..708d1fd586d96d9b59afc4c287d1800d6ad19b7c 100644 (file)
--- a/wxPython/src/_extras.py
+++ b/wxPython/src/_extras.py
@@ -551,19 +551,6 @@ def EVT_TOGGLEBUTTON(win, id, func):
 
 
 
 
 
 

-# Help events
-def EVT_HELP(win, id, func):
-    win.Connect(id, -1, wxEVT_HELP, func)
-
-def EVT_HELP_RANGE(win, id, id2, func):
-    win.Connect(id, id2, wxEVT_HELP, func)
-
-def EVT_DETAILED_HELP(win, id, func):
-    win.Connect(id, -1, 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)
 
 def EVT_CONTEXT_MENU(win, func):
     win.Connect(-1, -1, wxEVT_CONTEXT_MENU, func)
 

diff --git a/wxPython/src/help.i b/wxPython/src/help.i
index 634058fd2c074a341ffe173e7aecfac5ee2acd7a..f7f6c5a7be307e548d5bb7da0bfabd27e4f9643f 100644 (file)
--- a/wxPython/src/help.i
+++ b/wxPython/src/help.i
@@ -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)

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

diff --git a/wxPython/src/wx.i b/wxPython/src/wx.i
index 05a13607772b91717e20283134169e782a88004c..d9f79e70414f9686500afd91286fce945b84266e 100644 (file)
--- a/wxPython/src/wx.i
+++ b/wxPython/src/wx.i
@@ -12,7 +12,6 @@
 
 %module wx
 
 
 %module wx
 

-

 %{
 #include "helpers.h"
 %}
 %{
 #include "helpers.h"
 %}