wxUniversal fixes:

[wxWidgets.git] / wxPython / src / msw / help.py

diff --git a/wxPython/src/msw/help.py b/wxPython/src/msw/help.py
index 7f7f764c04a123ceccb5a2e308efe63f823cd95b..ef92ad9ad48d8a6f03d3cf7e38763bc61c627cbe 100644 (file)
--- a/wxPython/src/msw/help.py
+++ b/wxPython/src/msw/help.py
@@ -7,6 +7,8 @@ from misc import *
 
 from gdi import *
 
 
 from gdi import *
 

+from fonts import *
+

 from clip_dnd import *
 
 from controls import *
 from clip_dnd import *
 
 from controls import *


@@ -26,9 +28,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)
-

 class wxHelpEventPtr(wxCommandEventPtr):
     def __init__(self,this):
         self.this = this
 class wxHelpEventPtr(wxCommandEventPtr):
     def __init__(self,this):
         self.this = this


@@ -116,6 +115,7 @@ class wxContextHelpButton(wxContextHelpButtonPtr):
     def __init__(self,*_args,**_kwargs):
         self.this = apply(helpc.new_wxContextHelpButton,_args,_kwargs)
         self.thisown = 1
     def __init__(self,*_args,**_kwargs):
         self.this = apply(helpc.new_wxContextHelpButton,_args,_kwargs)
         self.thisown = 1

+        self._setOORInfo(self)

 
 
 
 
 
 


@@ -185,7 +185,6 @@ wxDIALOG_EX_CONTEXTHELP = helpc.wxDIALOG_EX_CONTEXTHELP
 wxID_CONTEXT_HELP = helpc.wxID_CONTEXT_HELP
 wxEVT_HELP = helpc.wxEVT_HELP
 wxEVT_DETAILED_HELP = helpc.wxEVT_DETAILED_HELP
 wxID_CONTEXT_HELP = helpc.wxID_CONTEXT_HELP
 wxEVT_HELP = helpc.wxEVT_HELP
 wxEVT_DETAILED_HELP = helpc.wxEVT_DETAILED_HELP

-wxEVT_CONTEXT_MENU = helpc.wxEVT_CONTEXT_MENU

 
 
 #-------------- USER INCLUDE -----------------------
 
 
 #-------------- USER INCLUDE -----------------------