X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/a323d3bda70a87bdfe11c835617185dd8060724c..098d1f0c65618e49a67f567f2736ca9b4ac3102c:/wxPython/src/gtk/htmlhelp.py

diff --git a/wxPython/src/gtk/htmlhelp.py b/wxPython/src/gtk/htmlhelp.py
index 881c662aa0..778663be9f 100644
--- a/wxPython/src/gtk/htmlhelp.py
+++ b/wxPython/src/gtk/htmlhelp.py
@@ -42,48 +42,48 @@ from printfw import *
 from sizers import *
 
 from filesys import *
-class wxHtmlBookRecordPtr(wxObjectPtr):
+class wxHtmlBookRecordPtr :
     def __init__(self,this):
         self.this = this
         self.thisown = 0
     def GetBookFile(self, *_args, **_kwargs):
-        val = apply(htmlhelpc.wxHtmlBookRecord_GetBookFile,(self,) + _args, _kwargs)
+        val = htmlhelpc.wxHtmlBookRecord_GetBookFile(self, *_args, **_kwargs)
         return val
     def GetTitle(self, *_args, **_kwargs):
-        val = apply(htmlhelpc.wxHtmlBookRecord_GetTitle,(self,) + _args, _kwargs)
+        val = htmlhelpc.wxHtmlBookRecord_GetTitle(self, *_args, **_kwargs)
         return val
     def GetStart(self, *_args, **_kwargs):
-        val = apply(htmlhelpc.wxHtmlBookRecord_GetStart,(self,) + _args, _kwargs)
+        val = htmlhelpc.wxHtmlBookRecord_GetStart(self, *_args, **_kwargs)
         return val
     def GetBasePath(self, *_args, **_kwargs):
-        val = apply(htmlhelpc.wxHtmlBookRecord_GetBasePath,(self,) + _args, _kwargs)
+        val = htmlhelpc.wxHtmlBookRecord_GetBasePath(self, *_args, **_kwargs)
         return val
     def SetContentsRange(self, *_args, **_kwargs):
-        val = apply(htmlhelpc.wxHtmlBookRecord_SetContentsRange,(self,) + _args, _kwargs)
+        val = htmlhelpc.wxHtmlBookRecord_SetContentsRange(self, *_args, **_kwargs)
         return val
     def GetContentsStart(self, *_args, **_kwargs):
-        val = apply(htmlhelpc.wxHtmlBookRecord_GetContentsStart,(self,) + _args, _kwargs)
+        val = htmlhelpc.wxHtmlBookRecord_GetContentsStart(self, *_args, **_kwargs)
         return val
     def GetContentsEnd(self, *_args, **_kwargs):
-        val = apply(htmlhelpc.wxHtmlBookRecord_GetContentsEnd,(self,) + _args, _kwargs)
+        val = htmlhelpc.wxHtmlBookRecord_GetContentsEnd(self, *_args, **_kwargs)
         return val
     def SetTitle(self, *_args, **_kwargs):
-        val = apply(htmlhelpc.wxHtmlBookRecord_SetTitle,(self,) + _args, _kwargs)
+        val = htmlhelpc.wxHtmlBookRecord_SetTitle(self, *_args, **_kwargs)
         return val
     def SetBasePath(self, *_args, **_kwargs):
-        val = apply(htmlhelpc.wxHtmlBookRecord_SetBasePath,(self,) + _args, _kwargs)
+        val = htmlhelpc.wxHtmlBookRecord_SetBasePath(self, *_args, **_kwargs)
         return val
     def SetStart(self, *_args, **_kwargs):
-        val = apply(htmlhelpc.wxHtmlBookRecord_SetStart,(self,) + _args, _kwargs)
+        val = htmlhelpc.wxHtmlBookRecord_SetStart(self, *_args, **_kwargs)
         return val
     def GetFullPath(self, *_args, **_kwargs):
-        val = apply(htmlhelpc.wxHtmlBookRecord_GetFullPath,(self,) + _args, _kwargs)
+        val = htmlhelpc.wxHtmlBookRecord_GetFullPath(self, *_args, **_kwargs)
         return val
     def __repr__(self):
-        return "<C wxHtmlBookRecord instance at %s>" % (self.this,)
+        return "<%s.%s instance; proxy of C++ wxHtmlBookRecord instance at %s>" % (self.__class__.__module__, self.__class__.__name__, self.this)
 class wxHtmlBookRecord(wxHtmlBookRecordPtr):
     def __init__(self,*_args,**_kwargs):
-        self.this = apply(htmlhelpc.new_wxHtmlBookRecord,_args,_kwargs)
+        self.this = htmlhelpc.new_wxHtmlBookRecord(*_args,**_kwargs)
         self.thisown = 1
 
 
@@ -94,23 +94,23 @@ class wxHtmlContentsItemPtr :
         self.this = this
         self.thisown = 0
     def GetLevel(self, *_args, **_kwargs):
-        val = apply(htmlhelpc.wxHtmlContentsItem_GetLevel,(self,) + _args, _kwargs)
+        val = htmlhelpc.wxHtmlContentsItem_GetLevel(self, *_args, **_kwargs)
         return val
     def GetID(self, *_args, **_kwargs):
-        val = apply(htmlhelpc.wxHtmlContentsItem_GetID,(self,) + _args, _kwargs)
+        val = htmlhelpc.wxHtmlContentsItem_GetID(self, *_args, **_kwargs)
         return val
     def GetName(self, *_args, **_kwargs):
-        val = apply(htmlhelpc.wxHtmlContentsItem_GetName,(self,) + _args, _kwargs)
+        val = htmlhelpc.wxHtmlContentsItem_GetName(self, *_args, **_kwargs)
         return val
     def GetPage(self, *_args, **_kwargs):
-        val = apply(htmlhelpc.wxHtmlContentsItem_GetPage,(self,) + _args, _kwargs)
+        val = htmlhelpc.wxHtmlContentsItem_GetPage(self, *_args, **_kwargs)
         return val
     def GetBook(self, *_args, **_kwargs):
-        val = apply(htmlhelpc.wxHtmlContentsItem_GetBook,(self,) + _args, _kwargs)
+        val = htmlhelpc.wxHtmlContentsItem_GetBook(self, *_args, **_kwargs)
         if val: val = wxHtmlBookRecordPtr(val) 
         return val
     def __repr__(self):
-        return "<C wxHtmlContentsItem instance at %s>" % (self.this,)
+        return "<%s.%s instance; proxy of C++ wxHtmlContentsItem instance at %s>" % (self.__class__.__module__, self.__class__.__name__, self.this)
 class wxHtmlContentsItem(wxHtmlContentsItemPtr):
     def __init__(self,this):
         self.this = this
@@ -123,26 +123,26 @@ class wxHtmlSearchStatusPtr :
         self.this = this
         self.thisown = 0
     def Search(self, *_args, **_kwargs):
-        val = apply(htmlhelpc.wxHtmlSearchStatus_Search,(self,) + _args, _kwargs)
+        val = htmlhelpc.wxHtmlSearchStatus_Search(self, *_args, **_kwargs)
         return val
     def IsActive(self, *_args, **_kwargs):
-        val = apply(htmlhelpc.wxHtmlSearchStatus_IsActive,(self,) + _args, _kwargs)
+        val = htmlhelpc.wxHtmlSearchStatus_IsActive(self, *_args, **_kwargs)
         return val
     def GetCurIndex(self, *_args, **_kwargs):
-        val = apply(htmlhelpc.wxHtmlSearchStatus_GetCurIndex,(self,) + _args, _kwargs)
+        val = htmlhelpc.wxHtmlSearchStatus_GetCurIndex(self, *_args, **_kwargs)
         return val
     def GetMaxIndex(self, *_args, **_kwargs):
-        val = apply(htmlhelpc.wxHtmlSearchStatus_GetMaxIndex,(self,) + _args, _kwargs)
+        val = htmlhelpc.wxHtmlSearchStatus_GetMaxIndex(self, *_args, **_kwargs)
         return val
     def GetName(self, *_args, **_kwargs):
-        val = apply(htmlhelpc.wxHtmlSearchStatus_GetName,(self,) + _args, _kwargs)
+        val = htmlhelpc.wxHtmlSearchStatus_GetName(self, *_args, **_kwargs)
         return val
     def GetContentsItem(self, *_args, **_kwargs):
-        val = apply(htmlhelpc.wxHtmlSearchStatus_GetContentsItem,(self,) + _args, _kwargs)
+        val = htmlhelpc.wxHtmlSearchStatus_GetContentsItem(self, *_args, **_kwargs)
         if val: val = wxHtmlContentsItemPtr(val) 
         return val
     def __repr__(self):
-        return "<C wxHtmlSearchStatus instance at %s>" % (self.this,)
+        return "<%s.%s instance; proxy of C++ wxHtmlSearchStatus instance at %s>" % (self.__class__.__module__, self.__class__.__name__, self.this)
 class wxHtmlSearchStatus(wxHtmlSearchStatusPtr):
     def __init__(self,this):
         self.this = this
@@ -154,43 +154,46 @@ class wxHtmlHelpDataPtr :
     def __init__(self,this):
         self.this = this
         self.thisown = 0
-    def __del__(self,htmlhelpc=htmlhelpc):
-        if self.thisown == 1 :
-            htmlhelpc.delete_wxHtmlHelpData(self)
+    def __del__(self, delfunc=htmlhelpc.delete_wxHtmlHelpData):
+        if self.thisown == 1:
+            try:
+                delfunc(self)
+            except:
+                pass
     def SetTempDir(self, *_args, **_kwargs):
-        val = apply(htmlhelpc.wxHtmlHelpData_SetTempDir,(self,) + _args, _kwargs)
+        val = htmlhelpc.wxHtmlHelpData_SetTempDir(self, *_args, **_kwargs)
         return val
     def AddBook(self, *_args, **_kwargs):
-        val = apply(htmlhelpc.wxHtmlHelpData_AddBook,(self,) + _args, _kwargs)
+        val = htmlhelpc.wxHtmlHelpData_AddBook(self, *_args, **_kwargs)
         return val
     def FindPageByName(self, *_args, **_kwargs):
-        val = apply(htmlhelpc.wxHtmlHelpData_FindPageByName,(self,) + _args, _kwargs)
+        val = htmlhelpc.wxHtmlHelpData_FindPageByName(self, *_args, **_kwargs)
         return val
     def FindPageById(self, *_args, **_kwargs):
-        val = apply(htmlhelpc.wxHtmlHelpData_FindPageById,(self,) + _args, _kwargs)
+        val = htmlhelpc.wxHtmlHelpData_FindPageById(self, *_args, **_kwargs)
         return val
     def GetBookRecArray(self, *_args, **_kwargs):
-        val = apply(htmlhelpc.wxHtmlHelpData_GetBookRecArray,(self,) + _args, _kwargs)
+        val = htmlhelpc.wxHtmlHelpData_GetBookRecArray(self, *_args, **_kwargs)
         return val
     def GetContents(self, *_args, **_kwargs):
-        val = apply(htmlhelpc.wxHtmlHelpData_GetContents,(self,) + _args, _kwargs)
+        val = htmlhelpc.wxHtmlHelpData_GetContents(self, *_args, **_kwargs)
         if val: val = wxHtmlContentsItemPtr(val) 
         return val
     def GetContentsCnt(self, *_args, **_kwargs):
-        val = apply(htmlhelpc.wxHtmlHelpData_GetContentsCnt,(self,) + _args, _kwargs)
+        val = htmlhelpc.wxHtmlHelpData_GetContentsCnt(self, *_args, **_kwargs)
         return val
     def GetIndex(self, *_args, **_kwargs):
-        val = apply(htmlhelpc.wxHtmlHelpData_GetIndex,(self,) + _args, _kwargs)
+        val = htmlhelpc.wxHtmlHelpData_GetIndex(self, *_args, **_kwargs)
         if val: val = wxHtmlContentsItemPtr(val) 
         return val
     def GetIndexCnt(self, *_args, **_kwargs):
-        val = apply(htmlhelpc.wxHtmlHelpData_GetIndexCnt,(self,) + _args, _kwargs)
+        val = htmlhelpc.wxHtmlHelpData_GetIndexCnt(self, *_args, **_kwargs)
         return val
     def __repr__(self):
-        return "<C wxHtmlHelpData instance at %s>" % (self.this,)
+        return "<%s.%s instance; proxy of C++ wxHtmlHelpData instance at %s>" % (self.__class__.__module__, self.__class__.__name__, self.this)
 class wxHtmlHelpData(wxHtmlHelpDataPtr):
     def __init__(self,*_args,**_kwargs):
-        self.this = apply(htmlhelpc.new_wxHtmlHelpData,_args,_kwargs)
+        self.this = htmlhelpc.new_wxHtmlHelpData(*_args,**_kwargs)
         self.thisown = 1
 
 
@@ -201,41 +204,41 @@ class wxHtmlHelpFramePtr(wxFramePtr):
         self.this = this
         self.thisown = 0
     def GetData(self, *_args, **_kwargs):
-        val = apply(htmlhelpc.wxHtmlHelpFrame_GetData,(self,) + _args, _kwargs)
+        val = htmlhelpc.wxHtmlHelpFrame_GetData(self, *_args, **_kwargs)
         if val: val = wxHtmlHelpDataPtr(val) 
         return val
     def SetTitleFormat(self, *_args, **_kwargs):
-        val = apply(htmlhelpc.wxHtmlHelpFrame_SetTitleFormat,(self,) + _args, _kwargs)
+        val = htmlhelpc.wxHtmlHelpFrame_SetTitleFormat(self, *_args, **_kwargs)
         return val
     def Display(self, *_args, **_kwargs):
-        val = apply(htmlhelpc.wxHtmlHelpFrame_Display,(self,) + _args, _kwargs)
+        val = htmlhelpc.wxHtmlHelpFrame_Display(self, *_args, **_kwargs)
         return val
     def DisplayID(self, *_args, **_kwargs):
-        val = apply(htmlhelpc.wxHtmlHelpFrame_DisplayID,(self,) + _args, _kwargs)
+        val = htmlhelpc.wxHtmlHelpFrame_DisplayID(self, *_args, **_kwargs)
         return val
     def DisplayContents(self, *_args, **_kwargs):
-        val = apply(htmlhelpc.wxHtmlHelpFrame_DisplayContents,(self,) + _args, _kwargs)
+        val = htmlhelpc.wxHtmlHelpFrame_DisplayContents(self, *_args, **_kwargs)
         return val
     def DisplayIndex(self, *_args, **_kwargs):
-        val = apply(htmlhelpc.wxHtmlHelpFrame_DisplayIndex,(self,) + _args, _kwargs)
+        val = htmlhelpc.wxHtmlHelpFrame_DisplayIndex(self, *_args, **_kwargs)
         return val
     def KeywordSearch(self, *_args, **_kwargs):
-        val = apply(htmlhelpc.wxHtmlHelpFrame_KeywordSearch,(self,) + _args, _kwargs)
+        val = htmlhelpc.wxHtmlHelpFrame_KeywordSearch(self, *_args, **_kwargs)
         return val
     def UseConfig(self, *_args, **_kwargs):
-        val = apply(htmlhelpc.wxHtmlHelpFrame_UseConfig,(self,) + _args, _kwargs)
+        val = htmlhelpc.wxHtmlHelpFrame_UseConfig(self, *_args, **_kwargs)
         return val
     def ReadCustomization(self, *_args, **_kwargs):
-        val = apply(htmlhelpc.wxHtmlHelpFrame_ReadCustomization,(self,) + _args, _kwargs)
+        val = htmlhelpc.wxHtmlHelpFrame_ReadCustomization(self, *_args, **_kwargs)
         return val
     def WriteCustomization(self, *_args, **_kwargs):
-        val = apply(htmlhelpc.wxHtmlHelpFrame_WriteCustomization,(self,) + _args, _kwargs)
+        val = htmlhelpc.wxHtmlHelpFrame_WriteCustomization(self, *_args, **_kwargs)
         return val
     def __repr__(self):
-        return "<C wxHtmlHelpFrame instance at %s>" % (self.this,)
+        return "<%s.%s instance; proxy of C++ wxHtmlHelpFrame instance at %s>" % (self.__class__.__module__, self.__class__.__name__, self.this)
 class wxHtmlHelpFrame(wxHtmlHelpFramePtr):
     def __init__(self,*_args,**_kwargs):
-        self.this = apply(htmlhelpc.new_wxHtmlHelpFrame,_args,_kwargs)
+        self.this = htmlhelpc.new_wxHtmlHelpFrame(*_args,**_kwargs)
         self.thisown = 1
         self._setOORInfo(self)
 
@@ -246,51 +249,54 @@ class wxHtmlHelpControllerPtr(wxEvtHandlerPtr):
     def __init__(self,this):
         self.this = this
         self.thisown = 0
-    def __del__(self,htmlhelpc=htmlhelpc):
-        if self.thisown == 1 :
-            htmlhelpc.delete_wxHtmlHelpController(self)
+    def __del__(self, delfunc=htmlhelpc.delete_wxHtmlHelpController):
+        if self.thisown == 1:
+            try:
+                delfunc(self)
+            except:
+                pass
     def SetTitleFormat(self, *_args, **_kwargs):
-        val = apply(htmlhelpc.wxHtmlHelpController_SetTitleFormat,(self,) + _args, _kwargs)
+        val = htmlhelpc.wxHtmlHelpController_SetTitleFormat(self, *_args, **_kwargs)
         return val
     def SetTempDir(self, *_args, **_kwargs):
-        val = apply(htmlhelpc.wxHtmlHelpController_SetTempDir,(self,) + _args, _kwargs)
+        val = htmlhelpc.wxHtmlHelpController_SetTempDir(self, *_args, **_kwargs)
         return val
     def AddBook(self, *_args, **_kwargs):
-        val = apply(htmlhelpc.wxHtmlHelpController_AddBook,(self,) + _args, _kwargs)
+        val = htmlhelpc.wxHtmlHelpController_AddBook(self, *_args, **_kwargs)
         return val
     def Display(self, *_args, **_kwargs):
-        val = apply(htmlhelpc.wxHtmlHelpController_Display,(self,) + _args, _kwargs)
+        val = htmlhelpc.wxHtmlHelpController_Display(self, *_args, **_kwargs)
         return val
     def DisplayID(self, *_args, **_kwargs):
-        val = apply(htmlhelpc.wxHtmlHelpController_DisplayID,(self,) + _args, _kwargs)
+        val = htmlhelpc.wxHtmlHelpController_DisplayID(self, *_args, **_kwargs)
         return val
     def DisplayContents(self, *_args, **_kwargs):
-        val = apply(htmlhelpc.wxHtmlHelpController_DisplayContents,(self,) + _args, _kwargs)
+        val = htmlhelpc.wxHtmlHelpController_DisplayContents(self, *_args, **_kwargs)
         return val
     def DisplayIndex(self, *_args, **_kwargs):
-        val = apply(htmlhelpc.wxHtmlHelpController_DisplayIndex,(self,) + _args, _kwargs)
+        val = htmlhelpc.wxHtmlHelpController_DisplayIndex(self, *_args, **_kwargs)
         return val
     def KeywordSearch(self, *_args, **_kwargs):
-        val = apply(htmlhelpc.wxHtmlHelpController_KeywordSearch,(self,) + _args, _kwargs)
+        val = htmlhelpc.wxHtmlHelpController_KeywordSearch(self, *_args, **_kwargs)
         return val
     def UseConfig(self, *_args, **_kwargs):
-        val = apply(htmlhelpc.wxHtmlHelpController_UseConfig,(self,) + _args, _kwargs)
+        val = htmlhelpc.wxHtmlHelpController_UseConfig(self, *_args, **_kwargs)
         return val
     def ReadCustomization(self, *_args, **_kwargs):
-        val = apply(htmlhelpc.wxHtmlHelpController_ReadCustomization,(self,) + _args, _kwargs)
+        val = htmlhelpc.wxHtmlHelpController_ReadCustomization(self, *_args, **_kwargs)
         return val
     def WriteCustomization(self, *_args, **_kwargs):
-        val = apply(htmlhelpc.wxHtmlHelpController_WriteCustomization,(self,) + _args, _kwargs)
+        val = htmlhelpc.wxHtmlHelpController_WriteCustomization(self, *_args, **_kwargs)
         return val
     def GetFrame(self, *_args, **_kwargs):
-        val = apply(htmlhelpc.wxHtmlHelpController_GetFrame,(self,) + _args, _kwargs)
+        val = htmlhelpc.wxHtmlHelpController_GetFrame(self, *_args, **_kwargs)
         if val: val = wxHtmlHelpFramePtr(val) 
         return val
     def __repr__(self):
-        return "<C wxHtmlHelpController instance at %s>" % (self.this,)
+        return "<%s.%s instance; proxy of C++ wxHtmlHelpController instance at %s>" % (self.__class__.__module__, self.__class__.__name__, self.this)
 class wxHtmlHelpController(wxHtmlHelpControllerPtr):
     def __init__(self,*_args,**_kwargs):
-        self.this = apply(htmlhelpc.new_wxHtmlHelpController,_args,_kwargs)
+        self.this = htmlhelpc.new_wxHtmlHelpController(*_args,**_kwargs)
         self.thisown = 1
         self._setOORInfo(self)