revert some stuff for 1.6

[wxWidgets.git] / include / wx / html / webkit.h

diff --git a/include/wx/html/webkit.h b/include/wx/html/webkit.h
index a5258f1e995c01297726d950d8c00dd2e182cebc..4b7b2fc79575f6395345681290af0ec59be89821 100755 (executable)
--- a/include/wx/html/webkit.h
+++ b/include/wx/html/webkit.h
@@ -67,6 +67,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 +81,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.
 };
 
 // ----------------------------------------------------------------------------