X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/6953da00886c52a9e1d9183e1f1f27e75843cfa4..cb7d73757f9e8771e7d8fc6b22f1acf27aac35bd:/include/wx/html/webkit.h?ds=sidebyside diff --git a/include/wx/html/webkit.h b/include/wx/html/webkit.h index a5258f1e99..3611b8fe48 100755 --- a/include/wx/html/webkit.h +++ b/include/wx/html/webkit.h @@ -12,10 +12,6 @@ #ifndef _WX_WEBKIT_H #define _WX_WEBKIT_H -#if defined(__GNUG__) && !defined(NO_GCC_PRAGMA) -#pragma interface "webkit.h" -#endif - #if wxUSE_WEBKIT #if !defined(__WXMAC__) && !defined(__WXCOCOA__) @@ -67,6 +63,8 @@ public: bool CanGetPageSource(); wxString GetPageSource(); void SetPageSource(wxString& source, const wxString& baseUrl = wxEmptyString); + wxString GetPageURL(){ return m_currentURL; } + wxString GetPageTitle(){ return m_pageTitle; } //we need to resize the webview when the control size changes void OnSize(wxSizeEvent &event); @@ -79,9 +77,9 @@ private: wxWindowID m_windowID; wxString m_currentURL; wxString m_pageTitle; - objc_object* m_webView; - //It should be WebView, but WebView is Cocoa only, so any class which included - //this header would have to link to Cocoa, so for now use void* instead. + struct objc_object *m_webView; + //It should be WebView*, but WebView is an Objective-C class + //TODO: look into using DECLARE_WXCOCOA_OBJC_CLASS rather than this. }; // ----------------------------------------------------------------------------