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

wxWebKikStateChangedEvent should now return proper values for GetURL(). Also updated the sample to update the text URL when a link is clicked.

Browse Source 
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@27449 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
This commit is contained in:
Kevin Ollivier
2004-05-26 04:11:43 +00:00
parent f96a747517
commit fba8e95e92
2 changed files with 4 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

1
samples/html/htmlctrl/htmlctrl.cpp
View File

@@ -219,6 +219,7 @@ void MyFrame::OnStateChanged(wxWebKitStateChangedEvent& myEvent){
if (GetStatusBar() != NULL){ if (GetStatusBar() != NULL){
if (myEvent.GetState() == wxWEBKIT_STATE_NEGOTIATING){ if (myEvent.GetState() == wxWEBKIT_STATE_NEGOTIATING){
GetStatusBar()->SetStatusText(_("Contacting ") + myEvent.GetURL()); GetStatusBar()->SetStatusText(_("Contacting ") + myEvent.GetURL());
urlText->SetValue(myEvent.GetURL());
} }
else if (myEvent.GetState() == wxWEBKIT_STATE_TRANSFERRING){ else if (myEvent.GetState() == wxWEBKIT_STATE_TRANSFERRING){
GetStatusBar()->SetStatusText(_("Loading ") + myEvent.GetURL()); GetStatusBar()->SetStatusText(_("Loading ") + myEvent.GetURL());

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

@@ -284,7 +284,7 @@ void wxWebKitCtrl::OnSize(wxSizeEvent &event){
- (void)webView:(WebView *)sender didCommitLoadForFrame:(WebFrame *)frame - (void)webView:(WebView *)sender didCommitLoadForFrame:(WebFrame *)frame
{ {
if (frame == [sender mainFrame]){ if (frame == [sender mainFrame]){
NSString *url = [[[[frame provisionalDataSource] request] URL] absoluteString]; NSString *url = [[[[frame dataSource] request] URL] absoluteString];
wxWebKitStateChangedEvent thisEvent(webKitWindow); wxWebKitStateChangedEvent thisEvent(webKitWindow);
thisEvent.SetState(wxWEBKIT_STATE_TRANSFERRING); thisEvent.SetState(wxWEBKIT_STATE_TRANSFERRING);
thisEvent.SetURL( wxStringWithNSString( url ) ); thisEvent.SetURL( wxStringWithNSString( url ) );
@@ -295,7 +295,7 @@ void wxWebKitCtrl::OnSize(wxSizeEvent &event){
- (void)webView:(WebView *)sender didFinishLoadForFrame:(WebFrame *)frame - (void)webView:(WebView *)sender didFinishLoadForFrame:(WebFrame *)frame
{ {
if (frame == [sender mainFrame]){ if (frame == [sender mainFrame]){
NSString *url = [[[[frame provisionalDataSource] request] URL] absoluteString]; NSString *url = [[[[frame dataSource] request] URL] absoluteString];
wxWebKitStateChangedEvent thisEvent(webKitWindow); wxWebKitStateChangedEvent thisEvent(webKitWindow);
thisEvent.SetState(wxWEBKIT_STATE_STOP); thisEvent.SetState(wxWEBKIT_STATE_STOP);
thisEvent.SetURL( wxStringWithNSString( url ) ); thisEvent.SetURL( wxStringWithNSString( url ) );
@@ -306,7 +306,7 @@ void wxWebKitCtrl::OnSize(wxSizeEvent &event){
- (void)webView:(WebView *)sender didFailLoadWithError:(NSError*) error forFrame:(WebFrame *)frame - (void)webView:(WebView *)sender didFailLoadWithError:(NSError*) error forFrame:(WebFrame *)frame
{ {
if (frame == [sender mainFrame]){ if (frame == [sender mainFrame]){
NSString *url = [[[[frame provisionalDataSource] request] URL] absoluteString]; NSString *url = [[[[frame dataSource] request] URL] absoluteString];
wxWebKitStateChangedEvent thisEvent(webKitWindow); wxWebKitStateChangedEvent thisEvent(webKitWindow);
thisEvent.SetState(wxWEBKIT_STATE_FAILED); thisEvent.SetState(wxWEBKIT_STATE_FAILED);
thisEvent.SetURL( wxStringWithNSString( url ) ); thisEvent.SetURL( wxStringWithNSString( url ) );