X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/9416aa89ca06d0fb20b1002e026d2c7ac7aa6a17..a4353f07c6b37712634d4b2d86527b647a08044f:/wxPython/src/msw/html.py diff --git a/wxPython/src/msw/html.py b/wxPython/src/msw/html.py index 360cba1a4d..09c3573b15 100644 --- a/wxPython/src/msw/html.py +++ b/wxPython/src/msw/html.py @@ -9,12 +9,16 @@ from windows import * from gdi import * +from fonts import * + from clip_dnd import * from events import * from streams import * +from utils import * + from mdi import * from frames import * @@ -38,8 +42,6 @@ from printfw import * from sizers import * from filesys import * - -from utils import * import wx class wxHtmlLinkInfoPtr(wxObjectPtr): def __init__(self,this): @@ -90,9 +92,6 @@ class wxHtmlTagPtr(wxObjectPtr): 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 @@ -233,14 +232,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) @@ -270,8 +269,8 @@ 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) @@ -289,7 +288,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) @@ -298,8 +297,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) @@ -317,7 +316,7 @@ 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) @@ -514,8 +513,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) @@ -523,6 +525,9 @@ 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 @@ -579,23 +584,40 @@ class wxHtmlWindowPtr(wxScrolledWindowPtr): val = apply(htmlc.wxHtmlWindow_GetParser,(self,) + _args, _kwargs) if val: val = wxHtmlWinParserPtr(val) return val + def ScrollToAnchor(self, *_args, **_kwargs): + val = apply(htmlc.wxHtmlWindow_ScrollToAnchor,(self,) + _args, _kwargs) + return val + def HasAnchor(self, *_args, **_kwargs): + val = apply(htmlc.wxHtmlWindow_HasAnchor,(self,) + _args, _kwargs) + return val def base_OnLinkClicked(self, *_args, **_kwargs): val = apply(htmlc.wxHtmlWindow_base_OnLinkClicked,(self,) + _args, _kwargs) return val 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 "" % (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(wxObjectPtr): @@ -739,6 +761,14 @@ wxHTML_INDENT_ALL = htmlc.wxHTML_INDENT_ALL wxHTML_COND_ISANCHOR = htmlc.wxHTML_COND_ISANCHOR wxHTML_COND_ISIMAGEMAP = htmlc.wxHTML_COND_ISIMAGEMAP wxHTML_COND_USER = htmlc.wxHTML_COND_USER +wxHW_SCROLLBAR_NEVER = htmlc.wxHW_SCROLLBAR_NEVER +wxHW_SCROLLBAR_AUTO = htmlc.wxHW_SCROLLBAR_AUTO +wxHTML_OPEN = htmlc.wxHTML_OPEN +wxHTML_BLOCK = htmlc.wxHTML_BLOCK +wxHTML_REDIRECT = htmlc.wxHTML_REDIRECT +wxHTML_URL_PAGE = htmlc.wxHTML_URL_PAGE +wxHTML_URL_IMAGE = htmlc.wxHTML_URL_IMAGE +wxHTML_URL_OTHER = htmlc.wxHTML_URL_OTHER wxPAGE_ODD = htmlc.wxPAGE_ODD wxPAGE_EVEN = htmlc.wxPAGE_EVEN wxPAGE_ALL = htmlc.wxPAGE_ALL @@ -759,3 +789,4 @@ wx.wxHtmlContainerCellPtr = wxHtmlContainerCellPtr wx.wxHtmlWidgetCellPtr = wxHtmlWidgetCellPtr wx.wxHtmlWindowPtr = wxHtmlWindowPtr wx.wxHtmlLinkInfoPtr = wxHtmlLinkInfoPtr +