X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/dc2f8a65c0675433c73500558d7792afab4b81e2..406005d21b612ca71c2066db8f9d4873ab8cd51a:/utils/wxPython/modules/html/html.py

diff --git a/utils/wxPython/modules/html/html.py b/utils/wxPython/modules/html/html.py
index d416cbe864..9361004286 100644
--- a/utils/wxPython/modules/html/html.py
+++ b/utils/wxPython/modules/html/html.py
@@ -9,6 +9,8 @@ from windows import *
 
 from gdi import *
 
+from clip_dnd import *
+
 from events import *
 
 from mdi import *
@@ -33,7 +35,26 @@ from printfw import *
 
 from sizers import *
 import wx
-widget = htmlc
+class wxHtmlLinkInfoPtr :
+    def __init__(self,this):
+        self.this = this
+        self.thisown = 0
+    def GetHref(self, *_args, **_kwargs):
+        val = apply(htmlc.wxHtmlLinkInfo_GetHref,(self,) + _args, _kwargs)
+        return val
+    def GetTarget(self, *_args, **_kwargs):
+        val = apply(htmlc.wxHtmlLinkInfo_GetTarget,(self,) + _args, _kwargs)
+        return val
+    def __repr__(self):
+        return "<C wxHtmlLinkInfo instance at %s>" % (self.this,)
+class wxHtmlLinkInfo(wxHtmlLinkInfoPtr):
+    def __init__(self,*_args,**_kwargs):
+        self.this = apply(htmlc.new_wxHtmlLinkInfo,_args,_kwargs)
+        self.thisown = 1
+
+
+
+
 class wxHtmlTagPtr :
     def __init__(self,this):
         self.this = this
@@ -207,9 +228,6 @@ class wxHtmlWinParserPtr(wxHtmlParserPtr):
     def SetActualColor(self, *_args, **_kwargs):
         val = apply(htmlc.wxHtmlWinParser_SetActualColor,(self,) + _args, _kwargs)
         return val
-    def GetLink(self, *_args, **_kwargs):
-        val = apply(htmlc.wxHtmlWinParser_GetLink,(self,) + _args, _kwargs)
-        return val
     def SetLink(self, *_args, **_kwargs):
         val = apply(htmlc.wxHtmlWinParser_SetLink,(self,) + _args, _kwargs)
         return val
@@ -217,6 +235,10 @@ class wxHtmlWinParserPtr(wxHtmlParserPtr):
         val = apply(htmlc.wxHtmlWinParser_CreateCurrentFont,(self,) + _args, _kwargs)
         if val: val = wxFontPtr(val) 
         return val
+    def GetLink(self, *_args, **_kwargs):
+        val = apply(htmlc.wxHtmlWinParser_GetLink,(self,) + _args, _kwargs)
+        if val: val = wxHtmlLinkInfoPtr(val) ; val.thisown = 1
+        return val
     def __repr__(self):
         return "<C wxHtmlWinParser instance at %s>" % (self.this,)
 class wxHtmlWinParser(wxHtmlWinParserPtr):
@@ -287,13 +309,6 @@ class wxHtmlCellPtr :
     def __init__(self,this):
         self.this = this
         self.thisown = 0
-    def SetParent(self, *_args, **_kwargs):
-        val = apply(htmlc.wxHtmlCell_SetParent,(self,) + _args, _kwargs)
-        return val
-    def GetParent(self, *_args, **_kwargs):
-        val = apply(htmlc.wxHtmlCell_GetParent,(self,) + _args, _kwargs)
-        if val: val = wxHtmlContainerCellPtr(val) 
-        return val
     def GetPosX(self, *_args, **_kwargs):
         val = apply(htmlc.wxHtmlCell_GetPosX,(self,) + _args, _kwargs)
         return val
@@ -311,13 +326,15 @@ class wxHtmlCellPtr :
         return val
     def GetLink(self, *_args, **_kwargs):
         val = apply(htmlc.wxHtmlCell_GetLink,(self,) + _args, _kwargs)
+        if val: val = wxHtmlLinkInfoPtr(val) 
         return val
     def GetNext(self, *_args, **_kwargs):
         val = apply(htmlc.wxHtmlCell_GetNext,(self,) + _args, _kwargs)
         if val: val = wxHtmlCellPtr(val) 
         return val
-    def SetPos(self, *_args, **_kwargs):
-        val = apply(htmlc.wxHtmlCell_SetPos,(self,) + _args, _kwargs)
+    def GetParent(self, *_args, **_kwargs):
+        val = apply(htmlc.wxHtmlCell_GetParent,(self,) + _args, _kwargs)
+        if val: val = wxHtmlContainerCellPtr(val) 
         return val
     def SetLink(self, *_args, **_kwargs):
         val = apply(htmlc.wxHtmlCell_SetLink,(self,) + _args, _kwargs)
@@ -325,6 +342,12 @@ class wxHtmlCellPtr :
     def SetNext(self, *_args, **_kwargs):
         val = apply(htmlc.wxHtmlCell_SetNext,(self,) + _args, _kwargs)
         return val
+    def SetParent(self, *_args, **_kwargs):
+        val = apply(htmlc.wxHtmlCell_SetParent,(self,) + _args, _kwargs)
+        return val
+    def SetPos(self, *_args, **_kwargs):
+        val = apply(htmlc.wxHtmlCell_SetPos,(self,) + _args, _kwargs)
+        return val
     def Layout(self, *_args, **_kwargs):
         val = apply(htmlc.wxHtmlCell_Layout,(self,) + _args, _kwargs)
         return val
@@ -417,6 +440,20 @@ class wxHtmlContainerCell(wxHtmlContainerCellPtr):
 
 
 
+class wxHtmlColourCellPtr(wxHtmlCellPtr):
+    def __init__(self,this):
+        self.this = this
+        self.thisown = 0
+    def __repr__(self):
+        return "<C wxHtmlColourCell instance at %s>" % (self.this,)
+class wxHtmlColourCell(wxHtmlColourCellPtr):
+    def __init__(self,*_args,**_kwargs):
+        self.this = apply(htmlc.new_wxHtmlColourCell,_args,_kwargs)
+        self.thisown = 1
+
+
+
+
 class wxHtmlWidgetCellPtr(wxHtmlCellPtr):
     def __init__(self,this):
         self.this = this
@@ -515,8 +552,8 @@ class wxHtmlWindowPtr(wxScrolledWindowPtr):
         val = apply(htmlc.wxHtmlWindow_GetParser,(self,) + _args, _kwargs)
         if val: val = wxHtmlWinParserPtr(val) 
         return val
-    def base_OnLinkClicked(self, *_args, **_kwargs):
-        val = apply(htmlc.wxHtmlWindow_base_OnLinkClicked,(self,) + _args, _kwargs)
+    def base_OnSetTitle(self, *_args, **_kwargs):
+        val = apply(htmlc.wxHtmlWindow_base_OnSetTitle,(self,) + _args, _kwargs)
         return val
     def __repr__(self):
         return "<C wxHtmlWindow instance at %s>" % (self.this,)
@@ -685,7 +722,7 @@ wxPAGE_ALL = htmlc.wxPAGE_ALL
 
 # Stuff these names into the wx namespace so wxPyConstructObject can find them
 import wx
-wx.wxHtmlTagPtr             = wxHtmlTag
+wx.wxHtmlTagPtr             = wxHtmlTagPtr
 wx.wxHtmlParserPtr          = wxHtmlParserPtr
 wx.wxHtmlWinParserPtr       = wxHtmlWinParserPtr
 wx.wxHtmlTagHandlerPtr      = wxHtmlTagHandlerPtr
@@ -693,5 +730,6 @@ wx.wxHtmlWinTagHandlerPtr   = wxHtmlWinTagHandlerPtr
 wx.wxHtmlCellPtr            = wxHtmlCellPtr
 wx.wxHtmlContainerCellPtr   = wxHtmlContainerCellPtr
 wx.wxHtmlWidgetCellPtr      = wxHtmlWidgetCellPtr
-wx.HtmlHistoryItemPtr     = HtmlHistoryItemPtr
+wx.HtmlHistoryItemPtr       = HtmlHistoryItemPtr
 wx.wxHtmlWindowPtr          = wxHtmlWindowPtr
+wx.wxHtmlLinkInfoPtr        = wxHtmlLinkInfo