Implemented the first phase of OOR (Original Object Return). See the

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

diff --git a/wxPython/src/gtk/html.py b/wxPython/src/gtk/html.py
index 27fd7f1071d2fdc106a3fd9b3e652db999586faf..360cba1a4dd949a8ec0615cffe573a4a8a7cc831 100644 (file)
--- a/wxPython/src/gtk/html.py
+++ b/wxPython/src/gtk/html.py
@@ -41,7 +41,7 @@ from filesys import *
 
 from utils import *
 import wx
 
 from utils import *
 import wx

-class wxHtmlLinkInfoPtr :
+class wxHtmlLinkInfoPtr(wxObjectPtr):

     def __init__(self,this):
         self.this = this
         self.thisown = 0
     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)
         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
         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):
     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
     def __init__(self,this):
         self.this = this
         self.thisown = 0


@@ -109,7 +114,7 @@ class wxHtmlTag(wxHtmlTagPtr):
 
 
 
 
 
 

-class wxHtmlParserPtr :
+class wxHtmlParserPtr(wxObjectPtr):

     def __init__(self,this):
         self.this = this
         self.thisown = 0
     def __init__(self,this):
         self.this = this
         self.thisown = 0


@@ -118,7 +123,6 @@ class wxHtmlParserPtr :
         return val
     def GetFS(self, *_args, **_kwargs):
         val = apply(htmlc.wxHtmlParser_GetFS,(self,) + _args, _kwargs)
         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)
         return val
     def Parse(self, *_args, **_kwargs):
         val = apply(htmlc.wxHtmlParser_Parse,(self,) + _args, _kwargs)


@@ -162,7 +166,6 @@ class wxHtmlWinParserPtr(wxHtmlParserPtr):
         return val
     def GetDC(self, *_args, **_kwargs):
         val = apply(htmlc.wxHtmlWinParser_GetDC,(self,) + _args, _kwargs)
         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)
         return val
     def GetCharHeight(self, *_args, **_kwargs):
         val = apply(htmlc.wxHtmlWinParser_GetCharHeight,(self,) + _args, _kwargs)


@@ -172,7 +175,6 @@ class wxHtmlWinParserPtr(wxHtmlParserPtr):
         return val
     def GetWindow(self, *_args, **_kwargs):
         val = apply(htmlc.wxHtmlWinParser_GetWindow,(self,) + _args, _kwargs)
         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)
         return val
     def SetFonts(self, *_args, **_kwargs):
         val = apply(htmlc.wxHtmlWinParser_SetFonts,(self,) + _args, _kwargs)


@@ -264,7 +266,7 @@ class wxHtmlWinParser(wxHtmlWinParserPtr):
 
 
 
 
 
 

-class wxHtmlTagHandlerPtr :
+class wxHtmlTagHandlerPtr(wxObjectPtr):

     def __init__(self,this):
         self.this = this
         self.thisown = 0
     def __init__(self,this):
         self.this = this
         self.thisown = 0


@@ -320,7 +322,7 @@ class wxHtmlWinTagHandler(wxHtmlWinTagHandlerPtr):
 
 
 
 
 
 

-class wxHtmlCellPtr :
+class wxHtmlCellPtr(wxObjectPtr):

     def __init__(self,this):
         self.this = this
         self.thisown = 0
     def __init__(self,this):
         self.this = this
         self.thisown = 0


@@ -392,6 +394,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
 class wxHtmlContainerCellPtr(wxHtmlCellPtr):
     def __init__(self,this):
         self.this = this


@@ -466,41 +482,29 @@ class wxHtmlColourCell(wxHtmlColourCellPtr):
 
 
 
 
 
 

-class wxHtmlWidgetCellPtr(wxHtmlCellPtr):
+class wxHtmlFontCellPtr(wxHtmlCellPtr):

     def __init__(self,this):
         self.this = this
         self.thisown = 0
     def __repr__(self):
     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):
     def __init__(self,*_args,**_kwargs):

-        self.this = apply(htmlc.new_wxHtmlWidgetCell,_args,_kwargs)
+        self.this = apply(htmlc.new_wxHtmlFontCell,_args,_kwargs)

         self.thisown = 1
 
 
 
 
         self.thisown = 1
 
 
 
 

-class HtmlHistoryItemPtr :
+class wxHtmlWidgetCellPtr(wxHtmlCellPtr):

     def __init__(self,this):
         self.this = this
         self.thisown = 0
     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):
     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):
     def __init__(self,*_args,**_kwargs):

-        self.this = apply(htmlc.new_HtmlHistoryItem,_args,_kwargs)
+        self.this = apply(htmlc.new_wxHtmlWidgetCell,_args,_kwargs)

         self.thisown = 1
 
 
         self.thisown = 1
 
 


@@ -522,12 +526,17 @@ class wxHtmlWindowPtr(wxScrolledWindowPtr):
     def GetOpenedPage(self, *_args, **_kwargs):
         val = apply(htmlc.wxHtmlWindow_GetOpenedPage,(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)
     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)
         return val
     def SetRelatedStatusBar(self, *_args, **_kwargs):
         val = apply(htmlc.wxHtmlWindow_SetRelatedStatusBar,(self,) + _args, _kwargs)


@@ -553,6 +562,12 @@ class wxHtmlWindowPtr(wxScrolledWindowPtr):
     def HistoryForward(self, *_args, **_kwargs):
         val = apply(htmlc.wxHtmlWindow_HistoryForward,(self,) + _args, _kwargs)
         return val
     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
     def HistoryClear(self, *_args, **_kwargs):
         val = apply(htmlc.wxHtmlWindow_HistoryClear,(self,) + _args, _kwargs)
         return val


@@ -583,7 +598,7 @@ class wxHtmlWindow(wxHtmlWindowPtr):
 
 
 
 
 
 

-class wxHtmlDCRendererPtr :
+class wxHtmlDCRendererPtr(wxObjectPtr):

     def __init__(self,this):
         self.this = this
         self.thisown = 0
     def __init__(self,this):
         self.this = this
         self.thisown = 0


@@ -644,7 +659,7 @@ class wxHtmlPrintout(wxHtmlPrintoutPtr):
 
 
 
 
 
 

-class wxHtmlEasyPrintingPtr :
+class wxHtmlEasyPrintingPtr(wxObjectPtr):

     def __init__(self,this):
         self.this = this
         self.thisown = 0
     def __init__(self,this):
         self.this = this
         self.thisown = 0


@@ -742,6 +757,5 @@ wx.wxHtmlWinTagHandlerPtr   = wxHtmlWinTagHandlerPtr
 wx.wxHtmlCellPtr            = wxHtmlCellPtr
 wx.wxHtmlContainerCellPtr   = wxHtmlContainerCellPtr
 wx.wxHtmlWidgetCellPtr      = wxHtmlWidgetCellPtr
 wx.wxHtmlCellPtr            = wxHtmlCellPtr
 wx.wxHtmlContainerCellPtr   = wxHtmlContainerCellPtr
 wx.wxHtmlWidgetCellPtr      = wxHtmlWidgetCellPtr

-wx.HtmlHistoryItemPtr       = HtmlHistoryItemPtr

 wx.wxHtmlWindowPtr          = wxHtmlWindowPtr
 wx.wxHtmlLinkInfoPtr        = wxHtmlLinkInfoPtr
 wx.wxHtmlWindowPtr          = wxHtmlWindowPtr
 wx.wxHtmlLinkInfoPtr        = wxHtmlLinkInfoPtr