Since wxGTK's wxGauge doesn't derive from wxGaugeBase it needs to have

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

diff --git a/wxPython/src/gtk/help.py b/wxPython/src/gtk/help.py
index 9da1a4e53245a548993120fb82960c7a9f160749..3e4ae411aacfe033c02ca58bacbccfa518e94187 100644 (file)
--- a/wxPython/src/gtk/help.py
+++ b/wxPython/src/gtk/help.py
@@ -7,6 +7,8 @@ from misc import *
 
 from gdi import *
 
+from fonts import *
+
 from clip_dnd import *
 
 from controls import *
@@ -26,58 +28,34 @@ 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_CONTEXT_MENU(win, func):
-    win.Connect(-1, -1, wxEVT_CONTEXT_MENU, func)
-
 class wxHelpEventPtr(wxCommandEventPtr):
     def __init__(self,this):
         self.this = this
         self.thisown = 0
     def GetPosition(self, *_args, **_kwargs):
-        val = apply(helpc.wxHelpEvent_GetPosition,(self,) + _args, _kwargs)
+        val = helpc.wxHelpEvent_GetPosition(self, *_args, **_kwargs)
         if val: val = wxPointPtr(val) 
         return val
     def SetPosition(self, *_args, **_kwargs):
-        val = apply(helpc.wxHelpEvent_SetPosition,(self,) + _args, _kwargs)
+        val = helpc.wxHelpEvent_SetPosition(self, *_args, **_kwargs)
         return val
     def GetLink(self, *_args, **_kwargs):
-        val = apply(helpc.wxHelpEvent_GetLink,(self,) + _args, _kwargs)
+        val = helpc.wxHelpEvent_GetLink(self, *_args, **_kwargs)
         return val
     def SetLink(self, *_args, **_kwargs):
-        val = apply(helpc.wxHelpEvent_SetLink,(self,) + _args, _kwargs)
+        val = helpc.wxHelpEvent_SetLink(self, *_args, **_kwargs)
         return val
     def GetTarget(self, *_args, **_kwargs):
-        val = apply(helpc.wxHelpEvent_GetTarget,(self,) + _args, _kwargs)
+        val = helpc.wxHelpEvent_GetTarget(self, *_args, **_kwargs)
         return val
     def SetTarget(self, *_args, **_kwargs):
-        val = apply(helpc.wxHelpEvent_SetTarget,(self,) + _args, _kwargs)
+        val = helpc.wxHelpEvent_SetTarget(self, *_args, **_kwargs)
         return val
     def __repr__(self):
-        return "<C wxHelpEvent instance at %s>" % (self.this,)
+        return "<%s.%s instance; proxy of C++ wxHelpEvent instance at %s>" % (self.__class__.__module__, self.__class__.__name__, self.this)
 class wxHelpEvent(wxHelpEventPtr):
     def __init__(self,*_args,**_kwargs):
-        self.this = apply(helpc.new_wxHelpEvent,_args,_kwargs)
-        self.thisown = 1
-
-
-
-
-class wxContextMenuEventPtr(wxCommandEventPtr):
-    def __init__(self,this):
-        self.this = this
-        self.thisown = 0
-    def GetPosition(self, *_args, **_kwargs):
-        val = apply(helpc.wxContextMenuEvent_GetPosition,(self,) + _args, _kwargs)
-        if val: val = wxPointPtr(val) 
-        return val
-    def SetPosition(self, *_args, **_kwargs):
-        val = apply(helpc.wxContextMenuEvent_SetPosition,(self,) + _args, _kwargs)
-        return val
-    def __repr__(self):
-        return "<C wxContextMenuEvent instance at %s>" % (self.this,)
-class wxContextMenuEvent(wxContextMenuEventPtr):
-    def __init__(self,*_args,**_kwargs):
-        self.this = apply(helpc.new_wxContextMenuEvent,_args,_kwargs)
+        self.this = helpc.new_wxHelpEvent(*_args,**_kwargs)
         self.thisown = 1
 
 
@@ -87,20 +65,23 @@ class wxContextHelpPtr(wxObjectPtr):
     def __init__(self,this):
         self.this = this
         self.thisown = 0
-    def __del__(self,helpc=helpc):
-        if self.thisown == 1 :
-            helpc.delete_wxContextHelp(self)
+    def __del__(self, delfunc=helpc.delete_wxContextHelp):
+        if self.thisown == 1:
+            try:
+                delfunc(self)
+            except:
+                pass
     def BeginContextHelp(self, *_args, **_kwargs):
-        val = apply(helpc.wxContextHelp_BeginContextHelp,(self,) + _args, _kwargs)
+        val = helpc.wxContextHelp_BeginContextHelp(self, *_args, **_kwargs)
         return val
     def EndContextHelp(self, *_args, **_kwargs):
-        val = apply(helpc.wxContextHelp_EndContextHelp,(self,) + _args, _kwargs)
+        val = helpc.wxContextHelp_EndContextHelp(self, *_args, **_kwargs)
         return val
     def __repr__(self):
-        return "<C wxContextHelp instance at %s>" % (self.this,)
+        return "<%s.%s instance; proxy of C++ wxContextHelp instance at %s>" % (self.__class__.__module__, self.__class__.__name__, self.this)
 class wxContextHelp(wxContextHelpPtr):
     def __init__(self,*_args,**_kwargs):
-        self.this = apply(helpc.new_wxContextHelp,_args,_kwargs)
+        self.this = helpc.new_wxContextHelp(*_args,**_kwargs)
         self.thisown = 1
 
 
@@ -111,10 +92,10 @@ class wxContextHelpButtonPtr(wxBitmapButtonPtr):
         self.this = this
         self.thisown = 0
     def __repr__(self):
-        return "<C wxContextHelpButton instance at %s>" % (self.this,)
+        return "<%s.%s instance; proxy of C++ wxContextHelpButton instance at %s>" % (self.__class__.__module__, self.__class__.__name__, self.this)
 class wxContextHelpButton(wxContextHelpButtonPtr):
     def __init__(self,*_args,**_kwargs):
-        self.this = apply(helpc.new_wxContextHelpButton,_args,_kwargs)
+        self.this = helpc.new_wxContextHelpButton(*_args,**_kwargs)
         self.thisown = 1
         self._setOORInfo(self)
 
@@ -126,22 +107,22 @@ class wxHelpProviderPtr :
         self.this = this
         self.thisown = 0
     def GetHelp(self, *_args, **_kwargs):
-        val = apply(helpc.wxHelpProvider_GetHelp,(self,) + _args, _kwargs)
+        val = helpc.wxHelpProvider_GetHelp(self, *_args, **_kwargs)
         return val
     def ShowHelp(self, *_args, **_kwargs):
-        val = apply(helpc.wxHelpProvider_ShowHelp,(self,) + _args, _kwargs)
+        val = helpc.wxHelpProvider_ShowHelp(self, *_args, **_kwargs)
         return val
     def AddHelp(self, *_args, **_kwargs):
-        val = apply(helpc.wxHelpProvider_AddHelp,(self,) + _args, _kwargs)
+        val = helpc.wxHelpProvider_AddHelp(self, *_args, **_kwargs)
         return val
     def AddHelpById(self, *_args, **_kwargs):
-        val = apply(helpc.wxHelpProvider_AddHelpById,(self,) + _args, _kwargs)
+        val = helpc.wxHelpProvider_AddHelpById(self, *_args, **_kwargs)
         return val
     def Destroy(self, *_args, **_kwargs):
-        val = apply(helpc.wxHelpProvider_Destroy,(self,) + _args, _kwargs)
+        val = helpc.wxHelpProvider_Destroy(self, *_args, **_kwargs)
         return val
     def __repr__(self):
-        return "<C wxHelpProvider instance at %s>" % (self.this,)
+        return "<%s.%s instance; proxy of C++ wxHelpProvider instance at %s>" % (self.__class__.__module__, self.__class__.__name__, self.this)
 class wxHelpProvider(wxHelpProviderPtr):
     def __init__(self,this):
         self.this = this
@@ -154,10 +135,10 @@ class wxSimpleHelpProviderPtr(wxHelpProviderPtr):
         self.this = this
         self.thisown = 0
     def __repr__(self):
-        return "<C wxSimpleHelpProvider instance at %s>" % (self.this,)
+        return "<%s.%s instance; proxy of C++ wxSimpleHelpProvider instance at %s>" % (self.__class__.__module__, self.__class__.__name__, self.this)
 class wxSimpleHelpProvider(wxSimpleHelpProviderPtr):
     def __init__(self,*_args,**_kwargs):
-        self.this = apply(helpc.new_wxSimpleHelpProvider,_args,_kwargs)
+        self.this = helpc.new_wxSimpleHelpProvider(*_args,**_kwargs)
         self.thisown = 1
 
 
@@ -168,12 +149,12 @@ class wxSimpleHelpProvider(wxSimpleHelpProviderPtr):
 #-------------- FUNCTION WRAPPERS ------------------
 
 def wxHelpProvider_Set(*_args, **_kwargs):
-    val = apply(helpc.wxHelpProvider_Set,_args,_kwargs)
+    val = helpc.wxHelpProvider_Set(*_args,**_kwargs)
     if val: val = wxHelpProviderPtr(val)
     return val
 
 def wxHelpProvider_Get(*_args, **_kwargs):
-    val = apply(helpc.wxHelpProvider_Get,_args,_kwargs)
+    val = helpc.wxHelpProvider_Get(*_args,**_kwargs)
     if val: val = wxHelpProviderPtr(val)
     return val
 
@@ -186,7 +167,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
-wxEVT_CONTEXT_MENU = helpc.wxEVT_CONTEXT_MENU
 
 
 #-------------- USER INCLUDE -----------------------
@@ -194,4 +174,4 @@ wxEVT_CONTEXT_MENU = helpc.wxEVT_CONTEXT_MENU
 # Stuff these names into the wx namespace so wxPyConstructObject can find them
 import wx
 wx.wxHelpEventPtr         = wxHelpEventPtr
-wx.wxContextMenuEventPtr  = wxContextMenuEventPtr
+wx.wxContextHelpButtonPtr = wxContextHelpButtonPtr