Amebis/wxWidgets
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

going private with userpane info

Browse Source 
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@67243 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
This commit is contained in:
Stefan Csomor
2011-03-19 08:36:23 +00:00
parent 0a761908f2
commit d15694e8ca
35 changed files with 264 additions and 182 deletions
Download Patch File Download Diff File Expand all files Collapse all files

16
src/html/htmlctrl/webkit/webkit.mm
View File

@@ -406,7 +406,6 @@ bool wxWebKitCtrl::Create(wxWindow *parent,
const wxValidator& validator,
const wxString& name)
{
m_currentURL = strURL;
//m_pageTitle = _("Untitled Page");
@@ -427,6 +426,7 @@ bool wxWebKitCtrl::Create(wxWindow *parent,
}
*/
// now create and attach WebKit view...
DontCreatePeer();
#ifdef __WXCOCOA__
wxControl::Create(parent, m_windowID, pos, sizeInstance, style , validator , name);
SetSize(pos.x, pos.y, sizeInstance.x, sizeInstance.y);
@@ -445,22 +445,24 @@ bool wxWebKitCtrl::Create(wxWindow *parent,
if(m_parent) m_parent->CocoaAddChild(this);
SetInitialFrameRect(pos,sizeInstance);
#else
m_macIsUserPane = false;
DontCreatePeer();
wxControl::Create(parent, winID, pos, size, style , validator , name);
#if wxOSX_USE_CARBON
SetPeer(new wxMacControl(this));
wxMacControl* peer = new wxMacControl(this);
WebInitForCarbon();
HIWebViewCreate( GetPeer()->GetControlRefAddr() );
HIWebViewCreate( peer->GetControlRefAddr() );
m_webView = (WebView*) HIWebViewGetWebView( GetPeer()->GetControlRef() );
m_webView = (WebView*) HIWebViewGetWebView( peer->GetControlRef() );
#if MAC_OS_X_VERSION_MAX_ALLOWED >= MAC_OS_X_VERSION_10_3
if ( UMAGetSystemVersion() >= 0x1030 )
HIViewChangeFeatures( GetPeer()->GetControlRef() , kHIViewIsOpaque , 0 ) ;
HIViewChangeFeatures( peer->GetControlRef() , kHIViewIsOpaque , 0 ) ;
#endif
InstallControlEventHandler( GetPeer()->GetControlRef() , GetwxWebKitCtrlEventHandlerUPP(),
InstallControlEventHandler( peer->GetControlRef() , GetwxWebKitCtrlEventHandlerUPP(),
GetEventTypeCount(eventList), eventList, this,
(EventHandlerRef *)&m_webKitCtrlEventHandler);
SetPeer(peer);
#else
NSRect r = wxOSXGetFrameForControl( this, pos , size ) ;
m_webView = [[WebView alloc] initWithFrame:r frameName:@"webkitFrame" groupName:@"webkitGroup"];