X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/c368d904fc27d35ae1e533155e2154dc496432e4..8dba8632c5bcd64724e2e9e2d40e295555a0cb86:/wxPython/src/msw/html.py

diff --git a/wxPython/src/msw/html.py b/wxPython/src/msw/html.py
index f8795bcd53..c4103cd6e1 100644
--- a/wxPython/src/msw/html.py
+++ b/wxPython/src/msw/html.py
@@ -15,6 +15,8 @@ from events import *
 
 from streams import *
 
+from utils import *
+
 from mdi import *
 
 from frames import *
@@ -38,10 +40,8 @@ from printfw import *
 from sizers import *
 
 from filesys import *
-
-from utils import *
 import wx
-class wxHtmlLinkInfoPtr :
+class wxHtmlLinkInfoPtr(wxObjectPtr):
     def __init__(self,this):
         self.this = this
         self.thisown = 0
@@ -53,12 +53,17 @@ class wxHtmlLinkInfoPtr :
         return val
     def GetEvent(self, *_args, **_kwargs):
         val = apply(htmlc.wxHtmlLinkInfo_GetEvent,(self,) + _args, _kwargs)
-        if val: val = wxMouseEventPtr(val) 
         return val
     def GetHtmlCell(self, *_args, **_kwargs):
         val = apply(htmlc.wxHtmlLinkInfo_GetHtmlCell,(self,) + _args, _kwargs)
         if val: val = wxHtmlCellPtr(val) 
         return val
+    def SetEvent(self, *_args, **_kwargs):
+        val = apply(htmlc.wxHtmlLinkInfo_SetEvent,(self,) + _args, _kwargs)
+        return val
+    def SetHtmlCell(self, *_args, **_kwargs):
+        val = apply(htmlc.wxHtmlLinkInfo_SetHtmlCell,(self,) + _args, _kwargs)
+        return val
     def __repr__(self):
         return "<C wxHtmlLinkInfo instance at %s>" % (self.this,)
 class wxHtmlLinkInfo(wxHtmlLinkInfoPtr):
@@ -69,7 +74,7 @@ class wxHtmlLinkInfo(wxHtmlLinkInfoPtr):
 
 
 
-class wxHtmlTagPtr :
+class wxHtmlTagPtr(wxObjectPtr):
     def __init__(self,this):
         self.this = this
         self.thisown = 0
@@ -85,9 +90,6 @@ class wxHtmlTagPtr :
     def GetAllParams(self, *_args, **_kwargs):
         val = apply(htmlc.wxHtmlTag_GetAllParams,(self,) + _args, _kwargs)
         return val
-    def IsEnding(self, *_args, **_kwargs):
-        val = apply(htmlc.wxHtmlTag_IsEnding,(self,) + _args, _kwargs)
-        return val
     def HasEnding(self, *_args, **_kwargs):
         val = apply(htmlc.wxHtmlTag_HasEnding,(self,) + _args, _kwargs)
         return val
@@ -109,7 +111,7 @@ class wxHtmlTag(wxHtmlTagPtr):
 
 
 
-class wxHtmlParserPtr :
+class wxHtmlParserPtr(wxObjectPtr):
     def __init__(self,this):
         self.this = this
         self.thisown = 0
@@ -118,7 +120,6 @@ class wxHtmlParserPtr :
         return val
     def GetFS(self, *_args, **_kwargs):
         val = apply(htmlc.wxHtmlParser_GetFS,(self,) + _args, _kwargs)
-        if val: val = wxFileSystemPtr(val) 
         return val
     def Parse(self, *_args, **_kwargs):
         val = apply(htmlc.wxHtmlParser_Parse,(self,) + _args, _kwargs)
@@ -162,7 +163,6 @@ class wxHtmlWinParserPtr(wxHtmlParserPtr):
         return val
     def GetDC(self, *_args, **_kwargs):
         val = apply(htmlc.wxHtmlWinParser_GetDC,(self,) + _args, _kwargs)
-        if val: val = wxDCPtr(val) 
         return val
     def GetCharHeight(self, *_args, **_kwargs):
         val = apply(htmlc.wxHtmlWinParser_GetCharHeight,(self,) + _args, _kwargs)
@@ -172,7 +172,6 @@ class wxHtmlWinParserPtr(wxHtmlParserPtr):
         return val
     def GetWindow(self, *_args, **_kwargs):
         val = apply(htmlc.wxHtmlWinParser_GetWindow,(self,) + _args, _kwargs)
-        if val: val = wxWindowPtr(val) 
         return val
     def SetFonts(self, *_args, **_kwargs):
         val = apply(htmlc.wxHtmlWinParser_SetFonts,(self,) + _args, _kwargs)
@@ -231,14 +230,14 @@ class wxHtmlWinParserPtr(wxHtmlParserPtr):
         return val
     def GetLinkColor(self, *_args, **_kwargs):
         val = apply(htmlc.wxHtmlWinParser_GetLinkColor,(self,) + _args, _kwargs)
-        if val: val = wxColourPtr(val) 
+        if val: val = wxColourPtr(val) ; val.thisown = 1
         return val
     def SetLinkColor(self, *_args, **_kwargs):
         val = apply(htmlc.wxHtmlWinParser_SetLinkColor,(self,) + _args, _kwargs)
         return val
     def GetActualColor(self, *_args, **_kwargs):
         val = apply(htmlc.wxHtmlWinParser_GetActualColor,(self,) + _args, _kwargs)
-        if val: val = wxColourPtr(val) 
+        if val: val = wxColourPtr(val) ; val.thisown = 1
         return val
     def SetActualColor(self, *_args, **_kwargs):
         val = apply(htmlc.wxHtmlWinParser_SetActualColor,(self,) + _args, _kwargs)
@@ -264,12 +263,12 @@ class wxHtmlWinParser(wxHtmlWinParserPtr):
 
 
 
-class wxHtmlTagHandlerPtr :
+class wxHtmlTagHandlerPtr(wxObjectPtr):
     def __init__(self,this):
         self.this = this
         self.thisown = 0
-    def _setSelf(self, *_args, **_kwargs):
-        val = apply(htmlc.wxHtmlTagHandler__setSelf,(self,) + _args, _kwargs)
+    def _setCallbackInfo(self, *_args, **_kwargs):
+        val = apply(htmlc.wxHtmlTagHandler__setCallbackInfo,(self,) + _args, _kwargs)
         return val
     def SetParser(self, *_args, **_kwargs):
         val = apply(htmlc.wxHtmlTagHandler_SetParser,(self,) + _args, _kwargs)
@@ -287,7 +286,7 @@ class wxHtmlTagHandler(wxHtmlTagHandlerPtr):
     def __init__(self,*_args,**_kwargs):
         self.this = apply(htmlc.new_wxHtmlTagHandler,_args,_kwargs)
         self.thisown = 1
-        self._setSelf(self, wxHtmlTagHandler)
+        self._setCallbackInfo(self, wxHtmlTagHandler)
 
 
 
@@ -296,8 +295,8 @@ class wxHtmlWinTagHandlerPtr(wxHtmlTagHandlerPtr):
     def __init__(self,this):
         self.this = this
         self.thisown = 0
-    def _setSelf(self, *_args, **_kwargs):
-        val = apply(htmlc.wxHtmlWinTagHandler__setSelf,(self,) + _args, _kwargs)
+    def _setCallbackInfo(self, *_args, **_kwargs):
+        val = apply(htmlc.wxHtmlWinTagHandler__setCallbackInfo,(self,) + _args, _kwargs)
         return val
     def SetParser(self, *_args, **_kwargs):
         val = apply(htmlc.wxHtmlWinTagHandler_SetParser,(self,) + _args, _kwargs)
@@ -315,12 +314,12 @@ class wxHtmlWinTagHandler(wxHtmlWinTagHandlerPtr):
     def __init__(self,*_args,**_kwargs):
         self.this = apply(htmlc.new_wxHtmlWinTagHandler,_args,_kwargs)
         self.thisown = 1
-        self._setSelf(self, wxHtmlWinTagHandler)
+        self._setCallbackInfo(self, wxHtmlWinTagHandler)
 
 
 
 
-class wxHtmlCellPtr :
+class wxHtmlCellPtr(wxObjectPtr):
     def __init__(self,this):
         self.this = this
         self.thisown = 0
@@ -392,6 +391,20 @@ class wxHtmlCell(wxHtmlCellPtr):
 
 
 
+class wxHtmlWordCellPtr(wxHtmlCellPtr):
+    def __init__(self,this):
+        self.this = this
+        self.thisown = 0
+    def __repr__(self):
+        return "<C wxHtmlWordCell instance at %s>" % (self.this,)
+class wxHtmlWordCell(wxHtmlWordCellPtr):
+    def __init__(self,*_args,**_kwargs):
+        self.this = apply(htmlc.new_wxHtmlWordCell,_args,_kwargs)
+        self.thisown = 1
+
+
+
+
 class wxHtmlContainerCellPtr(wxHtmlCellPtr):
     def __init__(self,this):
         self.this = this
@@ -466,41 +479,29 @@ class wxHtmlColourCell(wxHtmlColourCellPtr):
 
 
 
-class wxHtmlWidgetCellPtr(wxHtmlCellPtr):
+class wxHtmlFontCellPtr(wxHtmlCellPtr):
     def __init__(self,this):
         self.this = this
         self.thisown = 0
     def __repr__(self):
-        return "<C wxHtmlWidgetCell instance at %s>" % (self.this,)
-class wxHtmlWidgetCell(wxHtmlWidgetCellPtr):
+        return "<C wxHtmlFontCell instance at %s>" % (self.this,)
+class wxHtmlFontCell(wxHtmlFontCellPtr):
     def __init__(self,*_args,**_kwargs):
-        self.this = apply(htmlc.new_wxHtmlWidgetCell,_args,_kwargs)
+        self.this = apply(htmlc.new_wxHtmlFontCell,_args,_kwargs)
         self.thisown = 1
 
 
 
 
-class HtmlHistoryItemPtr :
+class wxHtmlWidgetCellPtr(wxHtmlCellPtr):
     def __init__(self,this):
         self.this = this
         self.thisown = 0
-    def GetPos(self, *_args, **_kwargs):
-        val = apply(htmlc.HtmlHistoryItem_GetPos,(self,) + _args, _kwargs)
-        return val
-    def SetPos(self, *_args, **_kwargs):
-        val = apply(htmlc.HtmlHistoryItem_SetPos,(self,) + _args, _kwargs)
-        return val
-    def GetPage(self, *_args, **_kwargs):
-        val = apply(htmlc.HtmlHistoryItem_GetPage,(self,) + _args, _kwargs)
-        return val
-    def GetAnchor(self, *_args, **_kwargs):
-        val = apply(htmlc.HtmlHistoryItem_GetAnchor,(self,) + _args, _kwargs)
-        return val
     def __repr__(self):
-        return "<C HtmlHistoryItem instance at %s>" % (self.this,)
-class HtmlHistoryItem(HtmlHistoryItemPtr):
+        return "<C wxHtmlWidgetCell instance at %s>" % (self.this,)
+class wxHtmlWidgetCell(wxHtmlWidgetCellPtr):
     def __init__(self,*_args,**_kwargs):
-        self.this = apply(htmlc.new_HtmlHistoryItem,_args,_kwargs)
+        self.this = apply(htmlc.new_wxHtmlWidgetCell,_args,_kwargs)
         self.thisown = 1
 
 
@@ -510,8 +511,11 @@ class wxHtmlWindowPtr(wxScrolledWindowPtr):
     def __init__(self,this):
         self.this = this
         self.thisown = 0
-    def _setSelf(self, *_args, **_kwargs):
-        val = apply(htmlc.wxHtmlWindow__setSelf,(self,) + _args, _kwargs)
+    def Create(self, *_args, **_kwargs):
+        val = apply(htmlc.wxHtmlWindow_Create,(self,) + _args, _kwargs)
+        return val
+    def _setCallbackInfo(self, *_args, **_kwargs):
+        val = apply(htmlc.wxHtmlWindow__setCallbackInfo,(self,) + _args, _kwargs)
         return val
     def SetPage(self, *_args, **_kwargs):
         val = apply(htmlc.wxHtmlWindow_SetPage,(self,) + _args, _kwargs)
@@ -519,15 +523,23 @@ class wxHtmlWindowPtr(wxScrolledWindowPtr):
     def LoadPage(self, *_args, **_kwargs):
         val = apply(htmlc.wxHtmlWindow_LoadPage,(self,) + _args, _kwargs)
         return val
+    def AppendToPage(self, *_args, **_kwargs):
+        val = apply(htmlc.wxHtmlWindow_AppendToPage,(self,) + _args, _kwargs)
+        return val
     def GetOpenedPage(self, *_args, **_kwargs):
         val = apply(htmlc.wxHtmlWindow_GetOpenedPage,(self,) + _args, _kwargs)
         return val
+    def GetOpenedAnchor(self, *_args, **_kwargs):
+        val = apply(htmlc.wxHtmlWindow_GetOpenedAnchor,(self,) + _args, _kwargs)
+        return val
+    def GetOpenedPageTitle(self, *_args, **_kwargs):
+        val = apply(htmlc.wxHtmlWindow_GetOpenedPageTitle,(self,) + _args, _kwargs)
+        return val
     def SetRelatedFrame(self, *_args, **_kwargs):
         val = apply(htmlc.wxHtmlWindow_SetRelatedFrame,(self,) + _args, _kwargs)
         return val
     def GetRelatedFrame(self, *_args, **_kwargs):
         val = apply(htmlc.wxHtmlWindow_GetRelatedFrame,(self,) + _args, _kwargs)
-        if val: val = wxFramePtr(val) 
         return val
     def SetRelatedStatusBar(self, *_args, **_kwargs):
         val = apply(htmlc.wxHtmlWindow_SetRelatedStatusBar,(self,) + _args, _kwargs)
@@ -553,6 +565,12 @@ class wxHtmlWindowPtr(wxScrolledWindowPtr):
     def HistoryForward(self, *_args, **_kwargs):
         val = apply(htmlc.wxHtmlWindow_HistoryForward,(self,) + _args, _kwargs)
         return val
+    def HistoryCanBack(self, *_args, **_kwargs):
+        val = apply(htmlc.wxHtmlWindow_HistoryCanBack,(self,) + _args, _kwargs)
+        return val
+    def HistoryCanForward(self, *_args, **_kwargs):
+        val = apply(htmlc.wxHtmlWindow_HistoryCanForward,(self,) + _args, _kwargs)
+        return val
     def HistoryClear(self, *_args, **_kwargs):
         val = apply(htmlc.wxHtmlWindow_HistoryClear,(self,) + _args, _kwargs)
         return val
@@ -570,20 +588,31 @@ class wxHtmlWindowPtr(wxScrolledWindowPtr):
     def base_OnSetTitle(self, *_args, **_kwargs):
         val = apply(htmlc.wxHtmlWindow_base_OnSetTitle,(self,) + _args, _kwargs)
         return val
+    def base_OnCellMouseHover(self, *_args, **_kwargs):
+        val = apply(htmlc.wxHtmlWindow_base_OnCellMouseHover,(self,) + _args, _kwargs)
+        return val
+    def base_OnCellClicked(self, *_args, **_kwargs):
+        val = apply(htmlc.wxHtmlWindow_base_OnCellClicked,(self,) + _args, _kwargs)
+        return val
     def __repr__(self):
         return "<C wxHtmlWindow instance at %s>" % (self.this,)
 class wxHtmlWindow(wxHtmlWindowPtr):
     def __init__(self,*_args,**_kwargs):
         self.this = apply(htmlc.new_wxHtmlWindow,_args,_kwargs)
         self.thisown = 1
-        self._setSelf(self, wxHtmlWindow)
-        #wx._StdWindowCallbacks(self)
-        #wx._StdOnScrollCallbacks(self)
+        self._setCallbackInfo(self, wxHtmlWindow)
+        self._setOORInfo(self)
+
 
 
+def wxPreHtmlWindow(*_args,**_kwargs):
+    val = wxHtmlWindowPtr(apply(htmlc.new_wxPreHtmlWindow,_args,_kwargs))
+    val.thisown = 1
+    val._setOORInfo(val)
+    return val
 
 
-class wxHtmlDCRendererPtr :
+class wxHtmlDCRendererPtr(wxObjectPtr):
     def __init__(self,this):
         self.this = this
         self.thisown = 0
@@ -619,9 +648,6 @@ class wxHtmlPrintoutPtr(wxPrintoutPtr):
     def __init__(self,this):
         self.this = this
         self.thisown = 0
-    def __del__(self,htmlc=htmlc):
-        if self.thisown == 1 :
-            htmlc.delete_wxHtmlPrintout(self)
     def SetHtmlText(self, *_args, **_kwargs):
         val = apply(htmlc.wxHtmlPrintout_SetHtmlText,(self,) + _args, _kwargs)
         return val
@@ -647,7 +673,7 @@ class wxHtmlPrintout(wxHtmlPrintoutPtr):
 
 
 
-class wxHtmlEasyPrintingPtr :
+class wxHtmlEasyPrintingPtr(wxObjectPtr):
     def __init__(self,this):
         self.this = this
         self.thisown = 0
@@ -745,6 +771,6 @@ wx.wxHtmlWinTagHandlerPtr   = wxHtmlWinTagHandlerPtr
 wx.wxHtmlCellPtr            = wxHtmlCellPtr
 wx.wxHtmlContainerCellPtr   = wxHtmlContainerCellPtr
 wx.wxHtmlWidgetCellPtr      = wxHtmlWidgetCellPtr
-wx.HtmlHistoryItemPtr       = HtmlHistoryItemPtr
 wx.wxHtmlWindowPtr          = wxHtmlWindowPtr
 wx.wxHtmlLinkInfoPtr        = wxHtmlLinkInfoPtr
+