Easier platform testing class and function

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

diff --git a/include/wx/html/webkit.h b/include/wx/html/webkit.h
index 55bf86fac978d4efc480ff004d818facc0a98442..3611b8fe485b43f6bfa050c145a23f91e44267ac 100755 (executable)
--- 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__)
@@ -55,18 +51,20 @@ public:
                 const wxValidator& validator = wxDefaultValidator,
                 const wxString& name = wxT("webkitctrl"));
     virtual ~wxWebKitCtrl();
-    
+
     void LoadURL(const wxString &url);
-    
+
     bool CanGoBack();
     bool CanGoForward();
     bool GoBack();
     bool GoForward();
-    void Reload(); 
+    void Reload();
     void Stop();
     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.
 };
 
 // ----------------------------------------------------------------------------
@@ -118,13 +116,13 @@ protected:
 typedef void (wxEvtHandler::*wxWebKitStateChangedEventFunction)(wxWebKitStateChangedEvent&);
 
 BEGIN_DECLARE_EVENT_TYPES()
-    DECLARE_LOCAL_EVENT_TYPE(wxEVT_WEBKIT_STATE_CHANGED, -1)
+    DECLARE_LOCAL_EVENT_TYPE(wxEVT_WEBKIT_STATE_CHANGED, wxID_ANY)
 END_DECLARE_EVENT_TYPES()
 
 #define EVT_WEBKIT_STATE_CHANGED(func) \
             DECLARE_EVENT_TABLE_ENTRY( wxEVT_WEBKIT_STATE_CHANGED, \
-                            -1,                       \
-                            -1,                       \
+                            wxID_ANY, \
+                            wxID_ANY, \
                             (wxObjectEventFunction)   \
                             (wxWebKitStateChangedEventFunction) & func, \
                             (wxObject *) NULL ),