X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/a0e9a5dfdeebc1d5e2d7e6e2146e63a26c8645a1..9869c26285dc51d13607cddaa04f65ce983653a5:/include/wx/html/webkit.h?ds=inline diff --git a/include/wx/html/webkit.h b/include/wx/html/webkit.h index d927a8b182..87003672b4 100644 --- a/include/wx/html/webkit.h +++ b/include/wx/html/webkit.h @@ -4,7 +4,6 @@ // Author: Jethro Grassie / Kevin Ollivier // Modified by: // Created: 2004-4-16 -// RCS-ID: $Id$ // Copyright: (c) Jethro Grassie / Kevin Ollivier // Licence: wxWindows licence ///////////////////////////////////////////////////////////////////////////// @@ -19,6 +18,7 @@ #endif #include "wx/control.h" +DECLARE_WXCOCOA_OBJC_CLASS(WebView); // ---------------------------------------------------------------------------- // Web Kit Control @@ -31,7 +31,7 @@ class WXDLLIMPEXP_CORE wxWebKitCtrl : public wxControl public: DECLARE_DYNAMIC_CLASS(wxWebKitCtrl) - wxWebKitCtrl() {}; + wxWebKitCtrl() {} wxWebKitCtrl(wxWindow *parent, wxWindowID winID, const wxString& strURL, @@ -41,7 +41,7 @@ public: const wxString& name = wxWebKitCtrlNameStr) { Create(parent, winID, strURL, pos, size, style, validator, name); - }; + } bool Create(wxWindow *parent, wxWindowID winID, const wxString& strURL, @@ -107,13 +107,11 @@ private: wxString m_currentURL; wxString m_pageTitle; - struct objc_object *m_webView; + WX_WebView m_webView; // we may use this later to setup our own mouse events, // so leave it in for now. void* m_webKitCtrlEventHandler; - //It should be WebView*, but WebView is an Objective-C class - //TODO: look into using DECLARE_WXCOCOA_OBJC_CLASS rather than this. }; // ---------------------------------------------------------------------------- @@ -183,7 +181,7 @@ protected: class WXDLLIMPEXP_CORE wxWebKitNewWindowEvent : public wxCommandEvent { - DECLARE_DYNAMIC_CLASS( wxWebViewNewWindowEvent ) + DECLARE_DYNAMIC_CLASS( wxWebKitNewWindowEvent ) public: wxString GetURL() const { return m_url; } void SetURL(const wxString& url) { m_url = url; } @@ -233,7 +231,7 @@ wxDECLARE_EXPORTED_EVENT( WXDLLIMPEXP_CORE, wxEVT_WEBKIT_NEW_WINDOW, wxWebKitNew wxDECLARE_EVENT_TABLE_ENTRY( wxEVT_WEBKIT_NEW_WINDOW, \ wxID_ANY, \ wxID_ANY, \ - wxWebKitNewWindowEventFunction( func ), \ + wxWebKitNewWindowEventHandler( func ), \ NULL ), #endif // wxUSE_WEBKIT